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

s/chunk_lookup/extent_lookup/g, s/chunks_rtree/extents_rtree/g

Browse Source
This commit is contained in:
Jason Evans
2016-06-01 12:10:39 -07:00
parent 4a55daa363
commit 0c4932eb1e
8 changed files with 55 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/jemalloc/internal/chunk.h
View File

@@ -22,8 +22,6 @@
extern size_t opt_lg_chunk;
extern const char *opt_dss;
extern rtree_t chunks_rtree;
extern size_t chunksize;
extern size_t chunksize_mask; /* (chunksize - 1). */
extern size_t chunk_npages;
@@ -67,19 +65,6 @@ void chunk_postfork_child(tsdn_t *tsdn);
/******************************************************************************/
#ifdef JEMALLOC_H_INLINES
#ifndef JEMALLOC_ENABLE_INLINE
extent_t *chunk_lookup(tsdn_t *tsdn, const void *chunk, bool dependent);
#endif
#if (defined(JEMALLOC_ENABLE_INLINE) || defined(JEMALLOC_CHUNK_C_))
JEMALLOC_INLINE extent_t *
chunk_lookup(tsdn_t *tsdn, const void *ptr, bool dependent)
{
return (rtree_read(tsdn, &chunks_rtree, (uintptr_t)ptr, dependent));
}
#endif
#endif /* JEMALLOC_H_INLINES */
/******************************************************************************/

12
include/jemalloc/internal/extent.h
View File

@@ -87,6 +87,8 @@ typedef ph(extent_t) extent_heap_t;
/******************************************************************************/
#ifdef JEMALLOC_H_EXTERNS
extern rtree_t extents_rtree;
extent_t *extent_alloc(tsdn_t *tsdn, arena_t *arena);
void extent_dalloc(tsdn_t *tsdn, arena_t *arena, extent_t *extent);
@@ -101,11 +103,14 @@ size_t extent_size_quantize_ceil(size_t size);
ph_proto(, extent_heap_, extent_heap_t, extent_t)
bool extent_boot(void);
#endif /* JEMALLOC_H_EXTERNS */
/******************************************************************************/
#ifdef JEMALLOC_H_INLINES
#ifndef JEMALLOC_ENABLE_INLINE
extent_t *extent_lookup(tsdn_t *tsdn, const void *chunk, bool dependent);
arena_t *extent_arena_get(const extent_t *extent);
void *extent_base_get(const extent_t *extent);
void *extent_addr_get(const extent_t *extent);
@@ -140,6 +145,13 @@ void extent_ring_remove(extent_t *extent);
#endif
#if (defined(JEMALLOC_ENABLE_INLINE) || defined(JEMALLOC_EXTENT_C_))
JEMALLOC_INLINE extent_t *
extent_lookup(tsdn_t *tsdn, const void *ptr, bool dependent)
{
return (rtree_read(tsdn, &extents_rtree, (uintptr_t)ptr, dependent));
}
JEMALLOC_INLINE arena_t *
extent_arena_get(const extent_t *extent)
{

6
include/jemalloc/internal/jemalloc_internal.h.in
View File

@@ -510,9 +510,9 @@ void jemalloc_postfork_child(void);
#include "jemalloc/internal/witness.h"
#include "jemalloc/internal/mutex.h"
#include "jemalloc/internal/mb.h"
#include "jemalloc/internal/rtree.h"
#include "jemalloc/internal/extent.h"
#include "jemalloc/internal/base.h"
#include "jemalloc/internal/rtree.h"
#include "jemalloc/internal/pages.h"
#include "jemalloc/internal/chunk.h"
#include "jemalloc/internal/large.h"
@@ -929,7 +929,7 @@ JEMALLOC_ALWAYS_INLINE extent_t *
iealloc(tsdn_t *tsdn, const void *ptr)
{
return (chunk_lookup(tsdn, ptr, true));
return (extent_lookup(tsdn, ptr, true));
}
#endif
@@ -1062,7 +1062,7 @@ ivsalloc(tsdn_t *tsdn, const void *ptr)
extent_t *extent;
/* Return 0 if ptr is not within a chunk managed by jemalloc. */
extent = chunk_lookup(tsdn, ptr, false);
extent = extent_lookup(tsdn, ptr, false);
if (extent == NULL)
return (0);
assert(extent_active_get(extent));

5
include/jemalloc/internal/private_symbols.txt
View File

@@ -132,7 +132,6 @@ chunk_dss_prec_get
chunk_dss_prec_set
chunk_dss_prefork
chunk_in_dss
chunk_lookup
chunk_merge_wrapper
chunk_npages
chunk_postfork_child
@@ -140,7 +139,6 @@ chunk_postfork_parent
chunk_prefork
chunk_purge_wrapper
chunk_split_wrapper
chunks_rtree
chunksize
chunksize_mask
ckh_count
@@ -173,6 +171,7 @@ extent_arena_get
extent_arena_set
extent_base_get
extent_before_get
extent_boot
extent_committed_get
extent_committed_set
extent_dalloc
@@ -187,6 +186,7 @@ extent_hooks_get
extent_hooks_set
extent_init
extent_last_get
extent_lookup
extent_past_get
extent_prof_tctx_get
extent_prof_tctx_set
@@ -205,6 +205,7 @@ extent_usize_get
extent_usize_set
extent_zeroed_get
extent_zeroed_set
extents_rtree
ffs_llu
ffs_lu
ffs_u