diff options
| author | Rickard Green <[email protected]> | 2011-12-08 15:18:51 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2011-12-08 15:18:51 +0100 |
| commit | 9bc76f48bfbd9773d77d75b1a94cf1097cca9fb6 (patch) | |
| tree | 9e6ec33806e1a6cf1dd96754d0f5b52b83011ac4 /erts/emulator/test | |
| parent | 18589c852aa7a535bb518cf79a2c510caa830110 (diff) | |
| parent | d51b42b76fb9d6826ee282352ca878c02a7b459d (diff) | |
| download | otp-9bc76f48bfbd9773d77d75b1a94cf1097cca9fb6.tar.gz otp-9bc76f48bfbd9773d77d75b1a94cf1097cca9fb6.tar.bz2 otp-9bc76f48bfbd9773d77d75b1a94cf1097cca9fb6.zip | |
Merge branch 'rickard/generic-thr-queue/OTP-9632'
* rickard/generic-thr-queue/OTP-9632:
Give elements of lock-free queues some time to be deallocated
Fix cleanup of elements in lock-free queues
Diffstat (limited to 'erts/emulator/test')
| -rw-r--r-- | erts/emulator/test/driver_SUITE.erl | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/erts/emulator/test/driver_SUITE.erl b/erts/emulator/test/driver_SUITE.erl index e159c37d2c..d64ec2e97b 100644 --- a/erts/emulator/test/driver_SUITE.erl +++ b/erts/emulator/test/driver_SUITE.erl @@ -2185,6 +2185,14 @@ wait_deallocations() -> end. driver_alloc_size() -> + case erlang:system_info(smp_support) of + true -> + ok; + false -> + %% driver_alloc also used by elements in lock-free queues, + %% give these some time to be deallocated... + receive after 100 -> ok end + end, wait_deallocations(), case erlang:system_info({allocator_sizes, driver_alloc}) of false -> |