diff options
author | Sverker Eriksson <[email protected]> | 2015-11-27 12:12:01 +0100 |
---|---|---|
committer | Sverker Eriksson <[email protected]> | 2015-11-27 12:12:01 +0100 |
commit | b916edc72a8eb82068229222abde1b9ff43dbad2 (patch) | |
tree | 2c8647bdecb229bd430066507e00e1ac710e7109 /erts/emulator/test/alloc_SUITE_data/cpool.c | |
parent | a838b671ef9cc7582f0768778a0447df614b71dd (diff) | |
parent | 64d1a7397c53d6cca32c49af9f833cdf6d26fc6e (diff) | |
download | otp-b916edc72a8eb82068229222abde1b9ff43dbad2.tar.gz otp-b916edc72a8eb82068229222abde1b9ff43dbad2.tar.bz2 otp-b916edc72a8eb82068229222abde1b9ff43dbad2.zip |
Merge branch 'sverk/cpool_fetch-dc_list-fix' into maint
OTP-13147
* sverk/cpool_fetch-dc_list-fix:
erts: Reduce alloc_SUITE:rbtree runtime for valgrind
erts: Remove double free in efile_drv
erts: Improve alloc_SUITE:migration test
erts: Pass free mem and build type to alloc_SUITE tests
erts: Fix snprintf in alloc_SUITE for windows
erts: Workaround for strange crash on win64 in alloc_SUITE test code
erts: Refactor alloc_SUITE to use NIFs instead of drivers
erts: Add enif_getenv
erts: Make key argument constant for erl_drv_{get|put}env
erts: Add alloc_SUITE:migration
erts: Add TEST allocator
erts: Fix confusion of callbacks destroying_mbc() vs remove_mbc()
erts: Fix resurrection of carriers from dc_list
Diffstat (limited to 'erts/emulator/test/alloc_SUITE_data/cpool.c')
-rw-r--r-- | erts/emulator/test/alloc_SUITE_data/cpool.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/erts/emulator/test/alloc_SUITE_data/cpool.c b/erts/emulator/test/alloc_SUITE_data/cpool.c index 75c2bc13ae..73026cc758 100644 --- a/erts/emulator/test/alloc_SUITE_data/cpool.c +++ b/erts/emulator/test/alloc_SUITE_data/cpool.c @@ -86,13 +86,13 @@ thread_func(void *arg) for (i = 0; i < (TEST_NO_CARRIERS_PER_THREAD+TEST_CARRIERS_OFFSET); i++) { int d; if (i < TEST_NO_CARRIERS_PER_THREAD) { - CPOOL_INSERT(alloc, crr[i]); + (void) CPOOL_INSERT(alloc, crr[i]); if ((i & 0x7) == 0) FATAL_ASSERT(CPOOL_IS_IN_POOL(alloc, crr[i])); } d = i-TEST_CARRIERS_OFFSET; if (d >= 0) { - CPOOL_DELETE(alloc, crr[d]); + (void) CPOOL_DELETE(alloc, crr[d]); if ((d & 0x7) == 0) FATAL_ASSERT(!CPOOL_IS_IN_POOL(alloc, crr[d])); } @@ -129,7 +129,7 @@ testcase_run(TestCaseState_t *tcs) for (c = 0; c < TEST_NO_CARRIERS_PER_THREAD; c++) { Carrier_t *crr = (Carrier_t *) p; p += zcrr_sz; - ZERO_CRR_INIT(alloc, crr); + (void) ZERO_CRR_INIT(alloc, crr); threads[t].crr[c] = crr; } } @@ -156,3 +156,6 @@ testcase_run(TestCaseState_t *tcs) ASSERT(tcs, no_threads == TEST_NO_THREADS); } + +ERL_NIF_INIT(cpool, testcase_nif_funcs, testcase_nif_init, + NULL, NULL, NULL); |