Abbreviate thread-event to te.
This commit is contained in:
@@ -3,39 +3,40 @@
|
||||
|
||||
#include "jemalloc/internal/tsd.h"
|
||||
|
||||
/* "te" is short for "thread_event" */
|
||||
|
||||
/*
|
||||
* Maximum threshold on thread_(de)allocated_next_event_fast, so that there is
|
||||
* no need to check overflow in malloc fast path. (The allocation size in malloc
|
||||
* fast path never exceeds SC_LOOKUP_MAXCLASS.)
|
||||
*/
|
||||
#define THREAD_NEXT_EVENT_FAST_MAX \
|
||||
(UINT64_MAX - SC_LOOKUP_MAXCLASS + 1U)
|
||||
#define TE_NEXT_EVENT_FAST_MAX (UINT64_MAX - SC_LOOKUP_MAXCLASS + 1U)
|
||||
|
||||
/*
|
||||
* The max interval helps make sure that malloc stays on the fast path in the
|
||||
* common case, i.e. thread_allocated < thread_allocated_next_event_fast. When
|
||||
* thread_allocated is within an event's distance to THREAD_NEXT_EVENT_FAST_MAX
|
||||
* thread_allocated is within an event's distance to TE_NEXT_EVENT_FAST_MAX
|
||||
* above, thread_allocated_next_event_fast is wrapped around and we fall back to
|
||||
* the medium-fast path. The max interval makes sure that we're not staying on
|
||||
* the fallback case for too long, even if there's no active event or if all
|
||||
* active events have long wait times.
|
||||
*/
|
||||
#define THREAD_EVENT_MAX_INTERVAL ((uint64_t)(4U << 20))
|
||||
#define TE_MAX_INTERVAL ((uint64_t)(4U << 20))
|
||||
|
||||
typedef struct event_ctx_s {
|
||||
typedef struct te_ctx_s {
|
||||
bool is_alloc;
|
||||
uint64_t *current;
|
||||
uint64_t *last_event;
|
||||
uint64_t *next_event;
|
||||
uint64_t *next_event_fast;
|
||||
} event_ctx_t;
|
||||
} te_ctx_t;
|
||||
|
||||
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_alloc_event_rollback(tsd_t *tsd, size_t diff);
|
||||
void thread_event_update(tsd_t *tsd, bool alloc_event);
|
||||
void thread_event_recompute_fast_threshold(tsd_t *tsd);
|
||||
void tsd_thread_event_init(tsd_t *tsd);
|
||||
void te_assert_invariants_debug(tsd_t *tsd);
|
||||
void te_event_trigger(tsd_t *tsd, te_ctx_t *ctx, bool delay_event);
|
||||
void te_alloc_rollback(tsd_t *tsd, size_t diff);
|
||||
void te_event_update(tsd_t *tsd, bool alloc_event);
|
||||
void te_recompute_fast_threshold(tsd_t *tsd);
|
||||
void tsd_te_init(tsd_t *tsd);
|
||||
|
||||
/*
|
||||
* List of all events, in the following format:
|
||||
@@ -97,21 +98,16 @@ ITERATE_OVER_ALL_COUNTERS
|
||||
*
|
||||
* Note that these can only be used on the fastpath.
|
||||
*/
|
||||
JEMALLOC_ALWAYS_INLINE uint64_t
|
||||
thread_allocated_malloc_fastpath(tsd_t *tsd) {
|
||||
return *tsd_thread_allocatedp_get_unsafe(tsd);
|
||||
}
|
||||
|
||||
JEMALLOC_ALWAYS_INLINE uint64_t
|
||||
thread_allocated_next_event_malloc_fastpath(tsd_t *tsd) {
|
||||
uint64_t v = *tsd_thread_allocated_next_event_fastp_get_unsafe(tsd);
|
||||
assert(v <= THREAD_NEXT_EVENT_FAST_MAX);
|
||||
return v;
|
||||
JEMALLOC_ALWAYS_INLINE void
|
||||
te_malloc_fastpath_ctx(tsd_t *tsd, uint64_t *allocated, uint64_t *threshold) {
|
||||
*allocated = *tsd_thread_allocatedp_get_unsafe(tsd);
|
||||
*threshold = *tsd_thread_allocated_next_event_fastp_get_unsafe(tsd);
|
||||
assert(*threshold <= TE_NEXT_EVENT_FAST_MAX);
|
||||
}
|
||||
|
||||
JEMALLOC_ALWAYS_INLINE void
|
||||
thread_event_free_fastpath_ctx(tsd_t *tsd, uint64_t *deallocated,
|
||||
uint64_t *threshold, bool size_hint) {
|
||||
te_free_fastpath_ctx(tsd_t *tsd, uint64_t *deallocated, uint64_t *threshold,
|
||||
bool size_hint) {
|
||||
if (!size_hint) {
|
||||
*deallocated = tsd_thread_deallocated_get(tsd);
|
||||
*threshold = tsd_thread_deallocated_next_event_fast_get(tsd);
|
||||
@@ -121,50 +117,50 @@ thread_event_free_fastpath_ctx(tsd_t *tsd, uint64_t *deallocated,
|
||||
*threshold =
|
||||
*tsd_thread_deallocated_next_event_fastp_get_unsafe(tsd);
|
||||
}
|
||||
assert(*threshold <= THREAD_NEXT_EVENT_FAST_MAX);
|
||||
assert(*threshold <= TE_NEXT_EVENT_FAST_MAX);
|
||||
}
|
||||
|
||||
JEMALLOC_ALWAYS_INLINE bool
|
||||
event_ctx_is_alloc(event_ctx_t *ctx) {
|
||||
te_ctx_is_alloc(te_ctx_t *ctx) {
|
||||
return ctx->is_alloc;
|
||||
}
|
||||
|
||||
JEMALLOC_ALWAYS_INLINE uint64_t
|
||||
event_ctx_current_bytes_get(event_ctx_t *ctx) {
|
||||
te_ctx_current_bytes_get(te_ctx_t *ctx) {
|
||||
return *ctx->current;
|
||||
}
|
||||
|
||||
JEMALLOC_ALWAYS_INLINE void
|
||||
event_ctx_current_bytes_set(event_ctx_t *ctx, uint64_t v) {
|
||||
te_ctx_current_bytes_set(te_ctx_t *ctx, uint64_t v) {
|
||||
*ctx->current = v;
|
||||
}
|
||||
|
||||
JEMALLOC_ALWAYS_INLINE uint64_t
|
||||
event_ctx_last_event_get(event_ctx_t *ctx) {
|
||||
te_ctx_last_event_get(te_ctx_t *ctx) {
|
||||
return *ctx->last_event;
|
||||
}
|
||||
|
||||
JEMALLOC_ALWAYS_INLINE void
|
||||
event_ctx_last_event_set(event_ctx_t *ctx, uint64_t v) {
|
||||
te_ctx_last_event_set(te_ctx_t *ctx, uint64_t v) {
|
||||
*ctx->last_event = v;
|
||||
}
|
||||
|
||||
/* Below 3 for next_event_fast. */
|
||||
JEMALLOC_ALWAYS_INLINE uint64_t
|
||||
event_ctx_next_event_fast_get(event_ctx_t *ctx) {
|
||||
te_ctx_next_event_fast_get(te_ctx_t *ctx) {
|
||||
uint64_t v = *ctx->next_event_fast;
|
||||
assert(v <= THREAD_NEXT_EVENT_FAST_MAX);
|
||||
assert(v <= TE_NEXT_EVENT_FAST_MAX);
|
||||
return v;
|
||||
}
|
||||
|
||||
JEMALLOC_ALWAYS_INLINE void
|
||||
event_ctx_next_event_fast_set(event_ctx_t *ctx, uint64_t v) {
|
||||
assert(v <= THREAD_NEXT_EVENT_FAST_MAX);
|
||||
te_ctx_next_event_fast_set(te_ctx_t *ctx, uint64_t v) {
|
||||
assert(v <= TE_NEXT_EVENT_FAST_MAX);
|
||||
*ctx->next_event_fast = v;
|
||||
}
|
||||
|
||||
JEMALLOC_ALWAYS_INLINE void
|
||||
thread_next_event_fast_set_non_nominal(tsd_t *tsd) {
|
||||
te_next_event_fast_set_non_nominal(tsd_t *tsd) {
|
||||
/*
|
||||
* Set the fast thresholds to zero when tsd is non-nominal. Use the
|
||||
* unsafe getter as this may get called during tsd init and clean up.
|
||||
@@ -175,14 +171,14 @@ thread_next_event_fast_set_non_nominal(tsd_t *tsd) {
|
||||
|
||||
/* For next_event. Setter also updates the fast threshold. */
|
||||
JEMALLOC_ALWAYS_INLINE uint64_t
|
||||
event_ctx_next_event_get(event_ctx_t *ctx) {
|
||||
te_ctx_next_event_get(te_ctx_t *ctx) {
|
||||
return *ctx->next_event;
|
||||
}
|
||||
|
||||
JEMALLOC_ALWAYS_INLINE void
|
||||
event_ctx_next_event_set(tsd_t *tsd, event_ctx_t *ctx, uint64_t v) {
|
||||
te_ctx_next_event_set(tsd_t *tsd, te_ctx_t *ctx, uint64_t v) {
|
||||
*ctx->next_event = v;
|
||||
thread_event_recompute_fast_threshold(tsd);
|
||||
te_recompute_fast_threshold(tsd);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -190,22 +186,22 @@ event_ctx_next_event_set(tsd_t *tsd, event_ctx_t *ctx, uint64_t v) {
|
||||
* a consistent state, which forms the invariants before and after each round
|
||||
* of thread event handling that we can rely on and need to promise.
|
||||
* The invariants are only temporarily violated in the middle of:
|
||||
* (a) thread_event() if an event is triggered (the thread_event_trigger() call
|
||||
* (a) event_advance() if an event is triggered (the te_event_trigger() call
|
||||
* at the end will restore the invariants),
|
||||
* (b) thread_##event##_event_update() (the thread_event_update() call at the
|
||||
* (b) te_##event##_event_update() (the te_event_update() call at the
|
||||
* end will restore the invariants), or
|
||||
* (c) thread_alloc_event_rollback() if the rollback falls below the last_event
|
||||
* (the thread_event_update() call at the end will restore the invariants).
|
||||
* (c) te_alloc_rollback() if the rollback falls below the last_event
|
||||
* (the te_event_update() call at the end will restore the invariants).
|
||||
*/
|
||||
JEMALLOC_ALWAYS_INLINE void
|
||||
thread_event_assert_invariants(tsd_t *tsd) {
|
||||
te_assert_invariants(tsd_t *tsd) {
|
||||
if (config_debug) {
|
||||
thread_event_assert_invariants_debug(tsd);
|
||||
te_assert_invariants_debug(tsd);
|
||||
}
|
||||
}
|
||||
|
||||
JEMALLOC_ALWAYS_INLINE void
|
||||
event_ctx_get(tsd_t *tsd, event_ctx_t *ctx, bool is_alloc) {
|
||||
te_ctx_get(tsd_t *tsd, te_ctx_t *ctx, bool is_alloc) {
|
||||
ctx->is_alloc = is_alloc;
|
||||
if (is_alloc) {
|
||||
ctx->current = tsd_thread_allocatedp_get(tsd);
|
||||
@@ -223,51 +219,51 @@ event_ctx_get(tsd_t *tsd, event_ctx_t *ctx, bool is_alloc) {
|
||||
}
|
||||
|
||||
JEMALLOC_ALWAYS_INLINE void
|
||||
thread_event_advance(tsd_t *tsd, size_t usize, bool is_alloc) {
|
||||
thread_event_assert_invariants(tsd);
|
||||
te_event_advance(tsd_t *tsd, size_t usize, bool is_alloc) {
|
||||
te_assert_invariants(tsd);
|
||||
|
||||
event_ctx_t ctx;
|
||||
event_ctx_get(tsd, &ctx, is_alloc);
|
||||
te_ctx_t ctx;
|
||||
te_ctx_get(tsd, &ctx, is_alloc);
|
||||
|
||||
uint64_t bytes_before = event_ctx_current_bytes_get(&ctx);
|
||||
event_ctx_current_bytes_set(&ctx, bytes_before + usize);
|
||||
uint64_t bytes_before = te_ctx_current_bytes_get(&ctx);
|
||||
te_ctx_current_bytes_set(&ctx, bytes_before + usize);
|
||||
|
||||
/* The subtraction is intentionally susceptible to underflow. */
|
||||
if (likely(usize < event_ctx_next_event_get(&ctx) - bytes_before)) {
|
||||
thread_event_assert_invariants(tsd);
|
||||
if (likely(usize < te_ctx_next_event_get(&ctx) - bytes_before)) {
|
||||
te_assert_invariants(tsd);
|
||||
} else {
|
||||
thread_event_trigger(tsd, &ctx, false);
|
||||
te_event_trigger(tsd, &ctx, false);
|
||||
}
|
||||
}
|
||||
|
||||
JEMALLOC_ALWAYS_INLINE void
|
||||
thread_dalloc_event(tsd_t *tsd, size_t usize) {
|
||||
thread_event_advance(tsd, usize, false);
|
||||
te_event_advance(tsd, usize, false);
|
||||
}
|
||||
|
||||
JEMALLOC_ALWAYS_INLINE void
|
||||
thread_alloc_event(tsd_t *tsd, size_t usize) {
|
||||
thread_event_advance(tsd, usize, true);
|
||||
te_event_advance(tsd, usize, true);
|
||||
}
|
||||
|
||||
#define E(event, condition, is_alloc) \
|
||||
JEMALLOC_ALWAYS_INLINE void \
|
||||
thread_##event##_event_update(tsd_t *tsd, uint64_t event_wait) { \
|
||||
thread_event_assert_invariants(tsd); \
|
||||
te_##event##_event_update(tsd_t *tsd, uint64_t event_wait) { \
|
||||
te_assert_invariants(tsd); \
|
||||
assert(condition); \
|
||||
assert(tsd_nominal(tsd)); \
|
||||
assert(tsd_reentrancy_level_get(tsd) == 0); \
|
||||
assert(event_wait > 0U); \
|
||||
if (THREAD_EVENT_MIN_START_WAIT > 1U && \
|
||||
unlikely(event_wait < THREAD_EVENT_MIN_START_WAIT)) { \
|
||||
event_wait = THREAD_EVENT_MIN_START_WAIT; \
|
||||
if (TE_MIN_START_WAIT > 1U && \
|
||||
unlikely(event_wait < TE_MIN_START_WAIT)) { \
|
||||
event_wait = TE_MIN_START_WAIT; \
|
||||
} \
|
||||
if (THREAD_EVENT_MAX_START_WAIT < UINT64_MAX && \
|
||||
unlikely(event_wait > THREAD_EVENT_MAX_START_WAIT)) { \
|
||||
event_wait = THREAD_EVENT_MAX_START_WAIT; \
|
||||
if (TE_MAX_START_WAIT < UINT64_MAX && \
|
||||
unlikely(event_wait > TE_MAX_START_WAIT)) { \
|
||||
event_wait = TE_MAX_START_WAIT; \
|
||||
} \
|
||||
event##_event_wait_set(tsd, event_wait); \
|
||||
thread_event_update(tsd, is_alloc); \
|
||||
te_event_update(tsd, is_alloc); \
|
||||
}
|
||||
|
||||
ITERATE_OVER_ALL_EVENTS
|
||||
|
@@ -104,10 +104,10 @@ typedef void (*test_callback_t)(int *);
|
||||
MALLOC_TEST_TSD
|
||||
|
||||
/*
|
||||
* THREAD_EVENT_MIN_START_WAIT should not exceed the minimal allocation usize.
|
||||
* TE_MIN_START_WAIT should not exceed the minimal allocation usize.
|
||||
*/
|
||||
#define THREAD_EVENT_MIN_START_WAIT ((uint64_t)1U)
|
||||
#define THREAD_EVENT_MAX_START_WAIT UINT64_MAX
|
||||
#define TE_MIN_START_WAIT ((uint64_t)1U)
|
||||
#define TE_MAX_START_WAIT UINT64_MAX
|
||||
|
||||
#define TSD_INITIALIZER { \
|
||||
/* state */ ATOMIC_INIT(tsd_state_uninitialized), \
|
||||
@@ -121,14 +121,14 @@ typedef void (*test_callback_t)(int *);
|
||||
/* thread_deallocated_next_event_fast */ 0, \
|
||||
/* rtree_ctx */ RTREE_CTX_ZERO_INITIALIZER, \
|
||||
/* thread_allocated_last_event */ 0, \
|
||||
/* thread_allocated_next_event */ THREAD_EVENT_MIN_START_WAIT, \
|
||||
/* thread_allocated_next_event */ TE_MIN_START_WAIT, \
|
||||
/* thread_deallocated_last_event */ 0, \
|
||||
/* thread_deallocated_next_event */ THREAD_EVENT_MIN_START_WAIT, \
|
||||
/* tcache_gc_event_wait */ THREAD_EVENT_MIN_START_WAIT, \
|
||||
/* tcache_gc_dalloc_event_wait */ THREAD_EVENT_MIN_START_WAIT, \
|
||||
/* prof_sample_event_wait */ THREAD_EVENT_MIN_START_WAIT, \
|
||||
/* thread_deallocated_next_event */ TE_MIN_START_WAIT, \
|
||||
/* tcache_gc_event_wait */ TE_MIN_START_WAIT, \
|
||||
/* tcache_gc_dalloc_event_wait */ TE_MIN_START_WAIT, \
|
||||
/* prof_sample_event_wait */ TE_MIN_START_WAIT, \
|
||||
/* prof_sample_last_event */ 0, \
|
||||
/* stats_interval_event_wait */ THREAD_EVENT_MIN_START_WAIT, \
|
||||
/* stats_interval_event_wait */ TE_MIN_START_WAIT, \
|
||||
/* stats_interval_last_event */ 0, \
|
||||
/* prof_tdata */ NULL, \
|
||||
/* prng_state */ 0, \
|
||||
|
Reference in New Issue
Block a user