project-base/server-skynet-source-3rd-jemalloc
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid NULL check in free() and malloc_usable_size().

Browse Source 
Generalize isalloc() to handle NULL pointers in such a way that the NULL
checking overhead is only paid when introspecting huge allocations (or
NULL).  This allows free() and malloc_usable_size() to no longer check
for NULL.

Submitted by Igor Bukanov and Mike Hommey.
This commit is contained in:
Jason Evans
2012-04-02 14:50:03 -07:00
parent 80b25932ca
commit 96d4120ac0
5 changed files with 37 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/jemalloc.c
View File

@@ -1100,22 +1100,18 @@ JEMALLOC_ATTR(visibility("default"))
void
je_free(void *ptr)
{
size_t usize;
if (ptr != NULL) {
size_t usize;
assert(malloc_initialized || IS_INITIALIZER);
assert(malloc_initialized || IS_INITIALIZER);
if (config_prof && opt_prof) {
usize = isalloc(ptr);
prof_free(ptr, usize);
} else if (config_stats) {
usize = isalloc(ptr);
}
if (config_stats)
thread_allocated_tsd_get()->deallocated += usize;
idalloc(ptr);
}
if (config_prof && opt_prof) {
usize = isalloc(ptr);
prof_free(ptr, usize);
} else if (config_stats)
usize = isalloc(ptr);
if (config_stats)
thread_allocated_tsd_get()->deallocated += usize;
idalloc(ptr);
}
/*
@@ -1200,7 +1196,7 @@ je_malloc_usable_size(const void *ptr)
if (config_ivsalloc)
ret = ivsalloc(ptr);
else
ret = (ptr != NULL) ? isalloc(ptr) : 0;
ret = isalloc(ptr);
return (ret);
}