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

Remove thread_event_boot().

Browse Source
This commit is contained in:
Qi Wang 2020-01-29 20:29:05 -08:00 committed by Qi Wang
parent 97dd79db6c
commit 5e500523a0
3 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,6 @@ void thread_event_assert_invariants_debug(tsd_t *tsd);
void thread_event_trigger(tsd_t *tsd, event_ctx_t *ctx, bool delay_event); void thread_event_trigger(tsd_t *tsd, event_ctx_t *ctx, bool delay_event);
void thread_alloc_event_rollback(tsd_t *tsd, size_t diff); void thread_alloc_event_rollback(tsd_t *tsd, size_t diff);
void thread_event_update(tsd_t *tsd, bool alloc_event); void thread_event_update(tsd_t *tsd, bool alloc_event);
void thread_event_boot();
void thread_event_recompute_fast_threshold(tsd_t *tsd); void thread_event_recompute_fast_threshold(tsd_t *tsd);
void tsd_thread_event_init(tsd_t *tsd); void tsd_thread_event_init(tsd_t *tsd);

1
src/jemalloc.c
View File

@ -1580,7 +1580,6 @@ malloc_init_hard_a0_locked() {
if (config_prof) { if (config_prof) {
prof_boot1(); prof_boot1();
} }
thread_event_boot();
arena_boot(&sc_data); arena_boot(&sc_data);
if (tcache_boot(TSDN_NULL)) { if (tcache_boot(TSDN_NULL)) {
return true; return true;

36
src/thread_event.c
View File

@ -4,13 +4,6 @@
#include "jemalloc/internal/thread_event.h" #include "jemalloc/internal/thread_event.h"
/*
* There's no lock for thread_event_active because write is only done in
* malloc_init(), where init_lock there serves as the guard, and ever since
* then thread_event_active becomes read only.
*/
static bool thread_event_active = false;
/* TSD event init function signatures. */ /* TSD event init function signatures. */
#define E(event, condition_unused, is_alloc_event_unused) \ #define E(event, condition_unused, is_alloc_event_unused) \
static void tsd_thread_##event##_event_init(tsd_t *tsd); static void tsd_thread_##event##_event_init(tsd_t *tsd);
@ -114,14 +107,23 @@ thread_stats_interval_event_handler(tsd_t *tsd) {
} }
/* Per event facilities done. */ /* Per event facilities done. */
static bool
event_ctx_has_active_events(event_ctx_t *ctx) {
assert(config_debug);
#define E(event, condition, alloc_event) \
if (condition && alloc_event == ctx->is_alloc) { \
return true; \
}
ITERATE_OVER_ALL_EVENTS
#undef E
return false;
}
static uint64_t static uint64_t
thread_next_event_compute(tsd_t *tsd, bool is_alloc) { thread_next_event_compute(tsd_t *tsd, bool is_alloc) {
uint64_t wait = THREAD_EVENT_MAX_START_WAIT; uint64_t wait = THREAD_EVENT_MAX_START_WAIT;
bool no_event_on = true;
#define E(event, condition, alloc_event) \ #define E(event, condition, alloc_event) \
if (is_alloc == alloc_event && condition) { \ if (is_alloc == alloc_event && condition) { \
no_event_on = false; \
uint64_t event_wait = \ uint64_t event_wait = \
event##_event_wait_get(tsd); \ event##_event_wait_get(tsd); \
assert(event_wait <= THREAD_EVENT_MAX_START_WAIT); \ assert(event_wait <= THREAD_EVENT_MAX_START_WAIT); \
@ -132,8 +134,6 @@ thread_next_event_compute(tsd_t *tsd, bool is_alloc) {
ITERATE_OVER_ALL_EVENTS ITERATE_OVER_ALL_EVENTS
#undef E #undef E
assert(no_event_on == !thread_event_active);
assert(wait <= THREAD_EVENT_MAX_START_WAIT); assert(wait <= THREAD_EVENT_MAX_START_WAIT);
return wait; return wait;
} }
@ -166,7 +166,7 @@ thread_event_assert_invariants_impl(tsd_t *tsd, event_ctx_t *ctx) {
* below is stronger than needed, but having an exactly accurate guard * below is stronger than needed, but having an exactly accurate guard
* is more complicated to implement. * is more complicated to implement.
*/ */
assert((!thread_event_active && last_event == 0U) || assert((!event_ctx_has_active_events(ctx) && last_event == 0U) ||
interval == min_wait || interval == min_wait ||
(interval < min_wait && interval == THREAD_EVENT_MAX_INTERVAL)); (interval < min_wait && interval == THREAD_EVENT_MAX_INTERVAL));
} }
@ -413,16 +413,6 @@ thread_event_update(tsd_t *tsd, bool is_alloc) {
} }
} }
void thread_event_boot() {
#define E(event, condition, ignored) \
if (condition) { \
thread_event_active = true; \
}
ITERATE_OVER_ALL_EVENTS
#undef E
}
void tsd_thread_event_init(tsd_t *tsd) { void tsd_thread_event_init(tsd_t *tsd) {
#define E(event, condition, is_alloc_event_unused) \ #define E(event, condition, is_alloc_event_unused) \
if (condition) { \ if (condition) { \