Don't use prefix when malloc_size() can be called

Also, use tcmalloc functions explicitly via macros to prevent symbol
lookups to resolve to native malloc/free on OSX.
This commit is contained in:
Pieter Noordhuis
2010-10-23 09:59:28 +02:00
parent da47440d44
commit 7cdc98b630
2 changed files with 26 additions and 6 deletions

View File

@ -32,13 +32,24 @@
#include <stdlib.h>
#include <string.h>
#include <pthread.h>
#include "config.h"
#if defined(__sun)
#define PREFIX_SIZE sizeof(long long)
#ifdef HAVE_MALLOC_SIZE
#define PREFIX_SIZE (0)
#else
#define PREFIX_SIZE sizeof(size_t)
#if defined(__sun)
#define PREFIX_SIZE (sizeof(long long))
#else
#define PREFIX_SIZE (sizeof(size_t))
#endif
#endif
/* Explicitly override malloc/free etc when using tcmalloc. */
#if defined(USE_TCMALLOC)
#define malloc(size) tc_malloc(size)
#define calloc(count,size) tc_calloc(count,size)
#define realloc(ptr,size) tc_realloc(ptr,size)
#define free(ptr) tc_free(ptr)
#endif
#define increment_used_memory(__n) do { \