summaryrefslogtreecommitdiffstats
path: root/jemalloc/src/huge.c
diff options
context:
space:
mode:
authorJason Evans <jasone@canonware.com>2010-04-14 22:07:37 (GMT)
committerJason Evans <jasone@canonware.com>2010-04-14 22:07:37 (GMT)
commit1af6ac42e303f229d5e8bb38252b1fb7371081b2 (patch)
tree0199eb3067af365c1c5268a49cf4b76d7efd2e15 /jemalloc/src/huge.c
parent552339916925c5432e51ab78864fe63edba9298d (diff)
parent5055f4516c8852e67668b0e746863a7d6a1c148e (diff)
downloadjemalloc-1.0.1.zip
jemalloc-1.0.1.tar.gz
jemalloc-1.0.1.tar.bz2
Merge branch 'dev'1.0.1
Diffstat (limited to 'jemalloc/src/huge.c')
-rw-r--r--jemalloc/src/huge.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/jemalloc/src/huge.c b/jemalloc/src/huge.c
index d35aa5c..49962ea 100644
--- a/jemalloc/src/huge.c
+++ b/jemalloc/src/huge.c
@@ -241,10 +241,10 @@ huge_salloc(const void *ptr)
}
#ifdef JEMALLOC_PROF
-prof_thr_cnt_t *
-huge_prof_cnt_get(const void *ptr)
+prof_ctx_t *
+huge_prof_ctx_get(const void *ptr)
{
- prof_thr_cnt_t *ret;
+ prof_ctx_t *ret;
extent_node_t *node, key;
malloc_mutex_lock(&huge_mtx);
@@ -254,7 +254,7 @@ huge_prof_cnt_get(const void *ptr)
node = extent_tree_ad_search(&huge, &key);
assert(node != NULL);
- ret = node->prof_cnt;
+ ret = node->prof_ctx;
malloc_mutex_unlock(&huge_mtx);
@@ -262,7 +262,7 @@ huge_prof_cnt_get(const void *ptr)
}
void
-huge_prof_cnt_set(const void *ptr, prof_thr_cnt_t *cnt)
+huge_prof_ctx_set(const void *ptr, prof_ctx_t *ctx)
{
extent_node_t *node, key;
@@ -273,7 +273,7 @@ huge_prof_cnt_set(const void *ptr, prof_thr_cnt_t *cnt)
node = extent_tree_ad_search(&huge, &key);
assert(node != NULL);
- node->prof_cnt = cnt;
+ node->prof_ctx = ctx;
malloc_mutex_unlock(&huge_mtx);
}