diff options
| author | Lukas Larsson <[email protected]> | 2019-06-28 10:48:43 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2019-06-28 10:48:43 +0200 |
| commit | c29006892cdddd95f32a7b6fc41eb3d8065c0f39 (patch) | |
| tree | 5795e9d5f0bec9333b6c8d458149420efdae4834 /erts/etc | |
| parent | 42ab20bfe6cfaf7e08b97ba0fbfffa86da6dc821 (diff) | |
| parent | b942df8593b6295e61eb767008d6e93a2cc34665 (diff) | |
| download | otp-c29006892cdddd95f32a7b6fc41eb3d8065c0f39.tar.gz otp-c29006892cdddd95f32a7b6fc41eb3d8065c0f39.tar.bz2 otp-c29006892cdddd95f32a7b6fc41eb3d8065c0f39.zip | |
Merge branch 'lukas/erts/cleanup_scheduler_start' into maint
* lukas/erts/cleanup_scheduler_start:
erts: Reduce test time for multi_load in valgrind
erts: Randomize valgrind taskset CPU
erts: Make dump_SUITE:free_dump tc more robust to different systems
erts: Fix distr SUITE latency testcases
erts: Fix gc disable when terminating process
erts: Cleanup start of all erts threads to ABORT when failing
Diffstat (limited to 'erts/etc')
| -rw-r--r-- | erts/etc/unix/cerl.src | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/erts/etc/unix/cerl.src b/erts/etc/unix/cerl.src index 710a7a9ef6..59de9bdec8 100644 --- a/erts/etc/unix/cerl.src +++ b/erts/etc/unix/cerl.src @@ -312,8 +312,11 @@ if [ "x$GDB" = "x" ]; then # on multiple cores (especially with async threads). Valgrind only run one pthread # at a time anyway so there is no point letting it utilize more than one core. # Use $sched_arg to force all schedulers online to emulate multicore. - taskset1="taskset 1" ncpu=`cat /proc/cpuinfo | grep -w processor | wc -l` + # Choose a random core in order to not collide with any other valgrind + # run on the same machine. + taskset1=$((1 << (`shuf -i 1-$ncpu -n 1` - 1) )) + taskset1="taskset $taskset1" sched_arg="-S$ncpu:$ncpu" else taskset1= |