diff options
| author | Mike Hommey <mh@glandium.org> | 2012-04-22 04:27:46 (GMT) |
|---|---|---|
| committer | Jason Evans <jasone@canonware.com> | 2012-04-22 04:27:46 (GMT) |
| commit | a19e87fbad020e8dd3d26682032929e8e5ae71c1 (patch) | |
| tree | 78db633ec277d7d2e3096c8d6f038fad429dd929 /src/jemalloc.c | |
| parent | a8f8d7540d66ddee7337db80c92890916e1063ca (diff) | |
| download | jemalloc-a19e87fbad020e8dd3d26682032929e8e5ae71c1.zip jemalloc-a19e87fbad020e8dd3d26682032929e8e5ae71c1.tar.gz jemalloc-a19e87fbad020e8dd3d26682032929e8e5ae71c1.tar.bz2 | |
Add support for Mingw
Diffstat (limited to 'src/jemalloc.c')
| -rw-r--r-- | src/jemalloc.c | 32 |
1 files changed, 27 insertions, 5 deletions
diff --git a/src/jemalloc.c b/src/jemalloc.c index f9c8916..67ac90b 100644 --- a/src/jemalloc.c +++ b/src/jemalloc.c @@ -52,7 +52,19 @@ static bool malloc_initializer = NO_INITIALIZER; #endif /* Used to avoid initialization races. */ +#ifdef _WIN32 +static malloc_mutex_t init_lock; + +JEMALLOC_ATTR(constructor) +static void +init_init_lock() +{ + + malloc_mutex_init(&init_lock); +} +#else static malloc_mutex_t init_lock = MALLOC_MUTEX_INITIALIZER; +#endif typedef struct { void *p; /* Input pointer (as in realloc(p, s)). */ @@ -229,11 +241,17 @@ malloc_ncpus(void) unsigned ret; long result; +#ifdef _WIN32 + SYSTEM_INFO si; + GetSystemInfo(&si); + result = si.dwNumberOfProcessors; +#else result = sysconf(_SC_NPROCESSORS_ONLN); if (result == -1) { /* Error. */ ret = 1; } +#endif ret = (unsigned)result; return (ret); @@ -369,13 +387,14 @@ malloc_conf_init(void) } break; case 1: { +#ifndef _WIN32 int linklen; const char *linkname = -#ifdef JEMALLOC_PREFIX +# ifdef JEMALLOC_PREFIX "/etc/"JEMALLOC_PREFIX"malloc.conf" -#else +# else "/etc/malloc.conf" -#endif +# endif ; if ((linklen = readlink(linkname, buf, @@ -386,7 +405,9 @@ malloc_conf_init(void) */ buf[linklen] = '\0'; opts = buf; - } else { + } else +#endif + { /* No configuration specified. */ buf[0] = '\0'; opts = buf; @@ -610,7 +631,8 @@ malloc_init_hard(void) malloc_conf_init(); -#if (!defined(JEMALLOC_MUTEX_INIT_CB) && !defined(JEMALLOC_ZONE)) +#if (!defined(JEMALLOC_MUTEX_INIT_CB) && !defined(JEMALLOC_ZONE) \ + && !defined(_WIN32)) /* Register fork handlers. */ if (pthread_atfork(jemalloc_prefork, jemalloc_postfork_parent, jemalloc_postfork_child) != 0) { |