collabvm/r3
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix linking issue

Browse source
This commit is contained in:
c9s 2014-05-21 23:14:19 +08:00
parent 2c4236f5b8
commit 4d0c22d8ec
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/zmalloc.h
View file

@ -48,12 +48,14 @@
#elif defined(USE_JEMALLOC) #elif defined(USE_JEMALLOC)
#define ZMALLOC_LIB ("jemalloc-" __xstr(JEMALLOC_VERSION_MAJOR) "." __xstr(JEMALLOC_VERSION_MINOR) "." __xstr(JEMALLOC_VERSION_BUGFIX)) #define ZMALLOC_LIB ("jemalloc-" __xstr(JEMALLOC_VERSION_MAJOR) "." __xstr(JEMALLOC_VERSION_MINOR) "." __xstr(JEMALLOC_VERSION_BUGFIX))
#include <jemalloc/jemalloc.h> #include <jemalloc/jemalloc.h>
/*
#if (JEMALLOC_VERSION_MAJOR == 2 && JEMALLOC_VERSION_MINOR >= 1) || (JEMALLOC_VERSION_MAJOR > 2) #if (JEMALLOC_VERSION_MAJOR == 2 && JEMALLOC_VERSION_MINOR >= 1) || (JEMALLOC_VERSION_MAJOR > 2)
#define HAVE_MALLOC_SIZE 1 #define HAVE_MALLOC_SIZE 1
#define zmalloc_size(p) je_malloc_usable_size(p) #define zmalloc_size(p) je_malloc_usable_size(p)
#else #else
#error "Newer version of jemalloc required" #error "Newer version of jemalloc required"
#endif #endif
*/
#elif defined(__APPLE__) #elif defined(__APPLE__)
#include <malloc/malloc.h> #include <malloc/malloc.h>

1
tests/bench_str.csv
View file

@ -441,3 +441,4 @@
1400659046,19754150.71 1400659046,19754150.71
1400668268,13174604.57 1400668268,13174604.57
1400668574,13632260.72 1400668574,13632260.72
1400681414,10832905.89

1 1400242718 5649455.80
441 1400659046 19754150.71
442 1400668268 13174604.57
443 1400668574 13632260.72
444 1400681414 10832905.89