diff options
| author | Jason Evans <je@fb.com> | 2014-01-17 01:38:01 (GMT) |
|---|---|---|
| committer | Jason Evans <je@fb.com> | 2014-01-17 01:38:01 (GMT) |
| commit | f234dc51b9740242d8ba69307db7c5a1312f5a03 (patch) | |
| tree | 905932c235c70e6cf79c91126633cfbb40c98c92 /test | |
| parent | 4f37ef693e3d5903ce07dc0b61c0da320b35e3d9 (diff) | |
| download | jemalloc-f234dc51b9740242d8ba69307db7c5a1312f5a03.zip jemalloc-f234dc51b9740242d8ba69307db7c5a1312f5a03.tar.gz jemalloc-f234dc51b9740242d8ba69307db7c5a1312f5a03.tar.bz2 | |
Fix name mangling for stress tests.
Fix stress tests such that testlib code uses the jet_ allocator, but
test code uses libjemalloc.
Generate jemalloc_{rename,mangle}.h, the former because it's needed for
the stress test name mangling fix, and the latter for consistency. As
an artifact of this change, some (but not all) definitions related to
the experimental API are absent from the headers unless the feature is
enabled at configure time.
Diffstat (limited to 'test')
| -rw-r--r-- | test/include/test/jemalloc_test.h.in | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/test/include/test/jemalloc_test.h.in b/test/include/test/jemalloc_test.h.in index 38db000..730a55d 100644 --- a/test/include/test/jemalloc_test.h.in +++ b/test/include/test/jemalloc_test.h.in @@ -102,10 +102,7 @@ * a separate allocator for their internal data structures. */ #elif defined(JEMALLOC_STRESS_TEST) -# define JEMALLOC_NO_DEMANGLE # include "jemalloc/jemalloc@install_suffix@.h" -# include "jemalloc/internal/public_unnamespace.h" -# undef JEMALLOC_NO_DEMANGLE # include "jemalloc/jemalloc_protos_jet.h" @@ -114,8 +111,13 @@ # include "jemalloc/internal/public_unnamespace.h" # undef JEMALLOC_JET +# include "jemalloc/jemalloc_rename.h" # define JEMALLOC_MANGLE -# include "jemalloc/jemalloc_mangle@install_suffix@.h" +# ifdef JEMALLOC_STRESS_TESTLIB +# include "jemalloc/jemalloc_mangle_jet.h" +# else +# include "jemalloc/jemalloc_mangle.h" +# endif /******************************************************************************/ /* |