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

Fix profiling regression caused by bugfix.

Browse Source 
Properly set the context associated with each allocated object, even
when the object is not sampled.

Remove debug print code that slipped in.
This commit is contained in:
Jason Evans 2010-04-14 11:24:45 -07:00
parent 6d68ed6492
commit 38cda690dd
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
jemalloc/src/prof.c
View File

@ -651,10 +651,11 @@ prof_malloc(const void *ptr, prof_thr_cnt_t *cnt)
assert(ptr != NULL); assert(ptr != NULL);
prof_ctx_set(ptr, cnt->ctx);
prof_sample_accum_update(size); prof_sample_accum_update(size);
if ((uintptr_t)cnt > (uintptr_t)1U) { if ((uintptr_t)cnt > (uintptr_t)1U) {
prof_ctx_set(ptr, cnt->ctx);
cnt->epoch++; cnt->epoch++;
/*********/ /*********/
mb_write(); mb_write();
@ -670,7 +671,8 @@ prof_malloc(const void *ptr, prof_thr_cnt_t *cnt)
/*********/ /*********/
mb_write(); mb_write();
/*********/ /*********/
} } else
prof_ctx_set(ptr, (prof_ctx_t *)(uintptr_t)1U);
} }
void void
@ -680,10 +682,8 @@ prof_realloc(const void *ptr, prof_thr_cnt_t *cnt, const void *old_ptr,
size_t size = isalloc(ptr); size_t size = isalloc(ptr);
prof_thr_cnt_t *told_cnt; prof_thr_cnt_t *told_cnt;
if (ptr != NULL) { if (ptr != NULL)
prof_ctx_set(ptr, cnt->ctx);
prof_sample_accum_update(size); prof_sample_accum_update(size);
}
if ((uintptr_t)old_ctx > (uintptr_t)1U) { if ((uintptr_t)old_ctx > (uintptr_t)1U) {
told_cnt = prof_lookup(old_ctx->bt); told_cnt = prof_lookup(old_ctx->bt);
@ -692,7 +692,6 @@ prof_realloc(const void *ptr, prof_thr_cnt_t *cnt, const void *old_ptr,
* It's too late to propagate OOM for this realloc(), * It's too late to propagate OOM for this realloc(),
* so operate directly on old_cnt->ctx->cnt_merged. * so operate directly on old_cnt->ctx->cnt_merged.
*/ */
malloc_printf("XXX BANG A\n");
malloc_mutex_lock(&old_ctx->lock); malloc_mutex_lock(&old_ctx->lock);
old_ctx->cnt_merged.curobjs--; old_ctx->cnt_merged.curobjs--;
old_ctx->cnt_merged.curbytes -= old_size; old_ctx->cnt_merged.curbytes -= old_size;
@ -704,8 +703,11 @@ prof_realloc(const void *ptr, prof_thr_cnt_t *cnt, const void *old_ptr,
if ((uintptr_t)told_cnt > (uintptr_t)1U) if ((uintptr_t)told_cnt > (uintptr_t)1U)
told_cnt->epoch++; told_cnt->epoch++;
if ((uintptr_t)cnt > (uintptr_t)1U) if ((uintptr_t)cnt > (uintptr_t)1U) {
prof_ctx_set(ptr, cnt->ctx);
cnt->epoch++; cnt->epoch++;
} else
prof_ctx_set(ptr, (prof_ctx_t *)(uintptr_t)1U);
/*********/ /*********/
mb_write(); mb_write();
/*********/ /*********/
@ -758,7 +760,6 @@ prof_free(const void *ptr)
* OOM during free() cannot be propagated, so operate * OOM during free() cannot be propagated, so operate
* directly on cnt->ctx->cnt_merged. * directly on cnt->ctx->cnt_merged.
*/ */
malloc_printf("XXX BANG B\n");
malloc_mutex_lock(&ctx->lock); malloc_mutex_lock(&ctx->lock);
ctx->cnt_merged.curobjs--; ctx->cnt_merged.curobjs--;
ctx->cnt_merged.curbytes -= size; ctx->cnt_merged.curbytes -= size;