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/rbtree.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/rbtree.c')
| -rw-r--r-- | erts/emulator/test/alloc_SUITE_data/rbtree.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/erts/emulator/test/alloc_SUITE_data/rbtree.c b/erts/emulator/test/alloc_SUITE_data/rbtree.c index 8d4d5535a8..38bbbdf90c 100644 --- a/erts/emulator/test/alloc_SUITE_data/rbtree.c +++ b/erts/emulator/test/alloc_SUITE_data/rbtree.c @@ -20,7 +20,7 @@ #include "testcase_driver.h" #include "allocator_test.h" -#define NO_BLOCKS 100000 +int NO_BLOCKS; #define RIGHT_VISITED (1 << 0) #define LEFT_VISITED (1 << 1) @@ -265,9 +265,10 @@ check_tree(TestCaseState_t *tcs, Allctr_t *alc, Ulong size) ASSERT(tcs, curr_blacks == 0); ASSERT(tcs, i == -1); + /* testcase_printf(tcs, "Red-Black Tree OK! Max depth = %d; " "Black depth = %d\n", max_i+1, blacks < 0 ? 0 : blacks); - + */ return res; } @@ -468,6 +469,12 @@ testcase_run(TestCaseState_t *tcs) Allctr_t *a; rbtree_test_data *td; + NO_BLOCKS = 100*1000; + if (enif_is_identical(tcs->build_type, + enif_make_atom(tcs->curr_env,"valgrind"))) { + NO_BLOCKS /= 10; + } + /* Best fit... */ testcase_printf(tcs, "Setup...\n"); @@ -577,3 +584,6 @@ testcase_run(TestCaseState_t *tcs) testcase_printf(tcs, "aoffcaobf test succeeded!\n"); } + +ERL_NIF_INIT(rbtree, testcase_nif_funcs, testcase_nif_init, + NULL, NULL, NULL); |