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

Simplify time setting and getting for prof log

Browse Source
This commit is contained in:
Yinan Zhang 2019-07-15 10:37:09 -07:00
parent 4094b7c03f
commit 4fbbc817c1
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/jemalloc/internal/arena_inlines_b.h
View File

@ -90,8 +90,7 @@ arena_prof_tctx_reset(tsdn_t *tsdn, const void *ptr, prof_tctx_t *tctx) {
} }
JEMALLOC_ALWAYS_INLINE nstime_t JEMALLOC_ALWAYS_INLINE nstime_t
arena_prof_alloc_time_get(tsdn_t *tsdn, const void *ptr, arena_prof_alloc_time_get(tsdn_t *tsdn, const void *ptr) {
alloc_ctx_t *alloc_ctx) {
cassert(config_prof); cassert(config_prof);
assert(ptr != NULL); assert(ptr != NULL);
@ -105,8 +104,7 @@ arena_prof_alloc_time_get(tsdn_t *tsdn, const void *ptr,
} }
JEMALLOC_ALWAYS_INLINE void JEMALLOC_ALWAYS_INLINE void
arena_prof_alloc_time_set(tsdn_t *tsdn, const void *ptr, alloc_ctx_t *alloc_ctx, arena_prof_alloc_time_set(tsdn_t *tsdn, const void *ptr, nstime_t t) {
nstime_t t) {
cassert(config_prof); cassert(config_prof);
assert(ptr != NULL); assert(ptr != NULL);

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

@ -64,20 +64,19 @@ prof_tctx_reset(tsdn_t *tsdn, const void *ptr, prof_tctx_t *tctx) {
} }
JEMALLOC_ALWAYS_INLINE nstime_t JEMALLOC_ALWAYS_INLINE nstime_t
prof_alloc_time_get(tsdn_t *tsdn, const void *ptr, alloc_ctx_t *alloc_ctx) { prof_alloc_time_get(tsdn_t *tsdn, const void *ptr) {
cassert(config_prof); cassert(config_prof);
assert(ptr != NULL); assert(ptr != NULL);
return arena_prof_alloc_time_get(tsdn, ptr, alloc_ctx); return arena_prof_alloc_time_get(tsdn, ptr);
} }
JEMALLOC_ALWAYS_INLINE void JEMALLOC_ALWAYS_INLINE void
prof_alloc_time_set(tsdn_t *tsdn, const void *ptr, alloc_ctx_t *alloc_ctx, prof_alloc_time_set(tsdn_t *tsdn, const void *ptr, nstime_t t) {
nstime_t t) {
cassert(config_prof); cassert(config_prof);
assert(ptr != NULL); assert(ptr != NULL);
arena_prof_alloc_time_set(tsdn, ptr, alloc_ctx, t); arena_prof_alloc_time_set(tsdn, ptr, t);
} }
JEMALLOC_ALWAYS_INLINE bool JEMALLOC_ALWAYS_INLINE bool

2
src/prof.c
View File

@ -169,7 +169,7 @@ prof_malloc_sample_object(tsdn_t *tsdn, const void *ptr, size_t usize,
* when free() is called. */ * when free() is called. */
nstime_t t = NSTIME_ZERO_INITIALIZER; nstime_t t = NSTIME_ZERO_INITIALIZER;
nstime_update(&t); nstime_update(&t);
prof_alloc_time_set(tsdn, ptr, NULL, t); prof_alloc_time_set(tsdn, ptr, t);
malloc_mutex_lock(tsdn, tctx->tdata->lock); malloc_mutex_lock(tsdn, tctx->tdata->lock);
tctx->cnts.curobjs++; tctx->cnts.curobjs++;

3
src/prof_log.c
View File

@ -229,8 +229,7 @@ prof_try_log(tsd_t *tsd, const void *ptr, size_t usize, prof_tctx_t *tctx) {
log_tables_initialized = true; log_tables_initialized = true;
} }
nstime_t alloc_time = prof_alloc_time_get(tsd_tsdn(tsd), ptr, nstime_t alloc_time = prof_alloc_time_get(tsd_tsdn(tsd), ptr);
(alloc_ctx_t *)NULL);
nstime_t free_time = NSTIME_ZERO_INITIALIZER; nstime_t free_time = NSTIME_ZERO_INITIALIZER;
nstime_update(&free_time); nstime_update(&free_time);