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

Pull tcache GC events into thread event handler

Browse Source
This commit is contained in:
Yinan Zhang
2019-10-24 16:41:45 -07:00
parent 198f02e797
commit 97f93fa0f2
8 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/jemalloc/internal/tcache_inlines.h
View File

@@ -93,7 +93,6 @@ tcache_alloc_small(tsd_t *tsd, arena_t *arena, tcache_t *tcache,
if (config_stats) {
bin->tstats.nrequests++;
}
tcache_event(tsd, tcache);
return ret;
}
@@ -150,7 +149,6 @@ tcache_alloc_large(tsd_t *tsd, arena_t *arena, tcache_t *tcache, size_t size,
}
}
tcache_event(tsd, tcache);
return ret;
}

5
include/jemalloc/internal/tcache_types.h
View File

@@ -43,10 +43,13 @@ typedef struct tcaches_s tcaches_t;
*/
#define TCACHE_GC_SWEEP 8192
/* Number of tcache allocation/deallocation events between incremental GCs. */
/* Number of tcache deallocation events between incremental GCs. */
#define TCACHE_GC_INCR \
((TCACHE_GC_SWEEP / SC_NBINS) + ((TCACHE_GC_SWEEP / SC_NBINS == 0) ? 0 : 1))
/* Number of allocation bytes between tcache incremental GCs. */
#define TCACHE_GC_INCR_BYTES 65536U
/* Used in TSD static initializer only. Real init in tsd_tcache_data_init(). */
#define TCACHE_ZERO_INITIALIZER {{0}}

1
include/jemalloc/internal/thread_event.h
View File

@@ -33,6 +33,7 @@ void thread_event_boot();
* E(event, (condition))
*/
#define ITERATE_OVER_ALL_EVENTS \
E(tcache_gc, (TCACHE_GC_INCR_BYTES > 0)) \
E(prof_sample, (config_prof && opt_prof))
#define E(event, condition) \

9
include/jemalloc/internal/tsd.h
View File

@@ -29,6 +29,7 @@
* x: narenas_tdata
* l: thread_allocated_last_event
* j: thread_allocated_next_event
* g: tcache_gc_event_wait
* w: prof_sample_event_wait (config_prof)
* x: prof_sample_last_event (config_prof)
* p: prof_tdata (config_prof)
@@ -46,11 +47,11 @@
* |---------------------------- 2nd cacheline ----------------------------|
* | [c * 64 ........ ........ ........ ........ ........ ........ .......] |
* |---------------------------- 3nd cacheline ----------------------------|
* | [c * 32 ........ ........ .......] llllllll jjjjjjjj wwwwwwww xxxxxxxx |
* | [c * 32 ........ ........ .......] llllllll jjjjjjjj gggggggg wwwwwwww |
* +---------------------------- 4th cacheline ----------------------------+
* | pppppppp vvvvvvvv iiiiiiii aaaaaaaa oooooooo [b...... ........ ........ |
* | xxxxxxxx pppppppp vvvvvvvv iiiiiiii aaaaaaaa oooooooo [b...... ........ |
* +---------------------------- 5th cacheline ----------------------------+
* | ........ ..b][t.. ........ ........ ........ ........ ........ ........ |
* | ........ ........ ..b][t.. ........ ........ ........ ........ ........ |
* +-------------------------------------------------------------------------+
* Note: the entire tcache is embedded into TSD and spans multiple cachelines.
*
@@ -83,6 +84,7 @@ typedef void (*test_callback_t)(int *);
O(rtree_ctx, rtree_ctx_t, rtree_ctx_t) \
O(thread_allocated_last_event, uint64_t, uint64_t) \
O(thread_allocated_next_event, uint64_t, uint64_t) \
O(tcache_gc_event_wait, uint64_t, uint64_t) \
O(prof_sample_event_wait, uint64_t, uint64_t) \
O(prof_sample_last_event, uint64_t, uint64_t) \
O(prof_tdata, prof_tdata_t *, prof_tdata_t *) \
@@ -113,6 +115,7 @@ typedef void (*test_callback_t)(int *);
/* rtree_ctx */ RTREE_CTX_ZERO_INITIALIZER, \
/* thread_allocated_last_event */ 0, \
/* thread_allocated_next_event */ THREAD_EVENT_MIN_START_WAIT, \
/* tcache_gc_event_wait */ THREAD_EVENT_MIN_START_WAIT, \
/* prof_sample_event_wait */ THREAD_EVENT_MIN_START_WAIT, \
/* prof_sample_last_event */ 0, \
/* prof_tdata */ NULL, \