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

Store arena index rather than (arena_t *) in extent_t.

Browse Source
This commit is contained in:
Jason Evans 2017-03-24 11:25:43 -07:00
parent 5e12223925
commit 0591c204b4
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/jemalloc/internal/extent_inlines.h
View File

@ -49,7 +49,7 @@ int extent_snad_comp(const extent_t *a, const extent_t *b);
#if (defined(JEMALLOC_ENABLE_INLINE) || defined(JEMALLOC_EXTENT_C_)) #if (defined(JEMALLOC_ENABLE_INLINE) || defined(JEMALLOC_EXTENT_C_))
JEMALLOC_INLINE arena_t * JEMALLOC_INLINE arena_t *
extent_arena_get(const extent_t *extent) { extent_arena_get(const extent_t *extent) {
return extent->e_arena; return arenas[extent->e_arena_ind];
} }
JEMALLOC_INLINE void * JEMALLOC_INLINE void *
@ -151,7 +151,7 @@ extent_prof_tctx_get(const extent_t *extent) {
JEMALLOC_INLINE void JEMALLOC_INLINE void
extent_arena_set(extent_t *extent, arena_t *arena) { extent_arena_set(extent_t *extent, arena_t *arena) {
extent->e_arena = arena; extent->e_arena_ind = (arena != NULL) ? arena_ind_get(arena) : UINT_MAX;
} }
JEMALLOC_INLINE void JEMALLOC_INLINE void

4
include/jemalloc/internal/extent_structs.h
View File

@ -10,8 +10,8 @@ typedef enum {
/* Extent (span of pages). Use accessor functions for e_* fields. */ /* Extent (span of pages). Use accessor functions for e_* fields. */
struct extent_s { struct extent_s {
/* Arena from which this extent came, if any. */ /* Arena from which this extent came, or UINT_MAX if unassociated. */
arena_t *e_arena; unsigned e_arena_ind;
/* Pointer to the extent that this structure is responsible for. */ /* Pointer to the extent that this structure is responsible for. */
void *e_addr; void *e_addr;

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

@ -932,7 +932,6 @@ decay_ticker_get(tsd_t *tsd, unsigned ind) {
} }
#endif #endif
#include "jemalloc/internal/extent_inlines.h"
#include "jemalloc/internal/rtree_inlines.h" #include "jemalloc/internal/rtree_inlines.h"
#include "jemalloc/internal/base_inlines.h" #include "jemalloc/internal/base_inlines.h"
#include "jemalloc/internal/bitmap_inlines.h" #include "jemalloc/internal/bitmap_inlines.h"
@ -942,6 +941,7 @@ decay_ticker_get(tsd_t *tsd, unsigned ind) {
*/ */
#include "jemalloc/internal/prof_inlines_a.h" #include "jemalloc/internal/prof_inlines_a.h"
#include "jemalloc/internal/arena_inlines_a.h" #include "jemalloc/internal/arena_inlines_a.h"
#include "jemalloc/internal/extent_inlines.h"
#ifndef JEMALLOC_ENABLE_INLINE #ifndef JEMALLOC_ENABLE_INLINE
extent_t *iealloc(tsdn_t *tsdn, const void *ptr); extent_t *iealloc(tsdn_t *tsdn, const void *ptr);