Commit d174eed5 authored by antirez's avatar antirez
Browse files

define zlibc_free() in a way that is not shadowed by jemalloc.

parent 23c0cdd2
...@@ -30,6 +30,15 @@ ...@@ -30,6 +30,15 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
/* This function provide us access to the original libc free(). This is useful
* for instance to free results obtained by backtrace_symbols(). We need
* to define this function before including zmalloc.h that may shadow the
* free implementation if we use jemalloc or another non standard allocator. */
void zlibc_free(void *ptr) {
free(ptr);
}
#include <string.h> #include <string.h>
#include <pthread.h> #include <pthread.h>
#include "config.h" #include "config.h"
...@@ -227,10 +236,6 @@ void zmalloc_enable_thread_safeness(void) { ...@@ -227,10 +236,6 @@ void zmalloc_enable_thread_safeness(void) {
zmalloc_thread_safe = 1; zmalloc_thread_safe = 1;
} }
void zlibc_free(void *ptr) {
free(ptr);
}
/* Get the RSS information in an OS-specific way. /* Get the RSS information in an OS-specific way.
* *
* WARNING: the function zmalloc_get_rss() is not designed to be fast * WARNING: the function zmalloc_get_rss() is not designed to be fast
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment