diff options
| author | Sverker Eriksson <[email protected]> | 2013-11-11 17:46:53 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2013-11-11 17:46:53 +0100 |
| commit | 22f3be086a9aa6376f72122d0214fc84673a35d6 (patch) | |
| tree | 02bea59c4b200f43103c1b1e98b50f2bf4b08cd1 /erts/emulator/beam | |
| parent | a2d97b6405066c702678e891d0d3c7640b81d621 (diff) | |
| parent | e94f730bdda9137ce5f436256ac7fdbdcd0be14a (diff) | |
| download | otp-22f3be086a9aa6376f72122d0214fc84673a35d6.tar.gz otp-22f3be086a9aa6376f72122d0214fc84673a35d6.tar.bz2 otp-22f3be086a9aa6376f72122d0214fc84673a35d6.zip | |
Merge branch 'sverk/valgrind-added-leak-check' into maint
* sverk/valgrind-added-leak-check:
erts: Prevent valgrind from repeating same memory leaks reports
Diffstat (limited to 'erts/emulator/beam')
| -rwxr-xr-x | erts/emulator/beam/erl_bif_info.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c index 5fbcbbe250..d7f1e2d971 100755 --- a/erts/emulator/beam/erl_bif_info.c +++ b/erts/emulator/beam/erl_bif_info.c @@ -1771,7 +1771,11 @@ info_1_tuple(Process* BIF_P, /* Pointer to current process. */ #if defined(PURIFY) BIF_RET(erts_make_integer(purify_new_leaks(), BIF_P)); #elif defined(VALGRIND) +# ifdef VALGRIND_DO_ADDED_LEAK_CHECK + VALGRIND_DO_ADDED_LEAK_CHECK; +# else VALGRIND_DO_LEAK_CHECK; +# endif BIF_RET(make_small(0)); #endif } else if (*tp == am_fd) { |