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

Refactor ph_merge_ordered() out of ph_merge().

Browse Source
This commit is contained in:
Jason Evans 2016-03-08 13:43:47 -08:00
parent 34dca5671f
commit f8d80d62a8
2 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
include/jemalloc/internal/ph.h
View File

@ -49,6 +49,7 @@ struct ph_heap_s {
#ifdef JEMALLOC_H_INLINES #ifdef JEMALLOC_H_INLINES
#ifndef JEMALLOC_ENABLE_INLINE #ifndef JEMALLOC_ENABLE_INLINE
ph_node_t *ph_merge_ordered(ph_node_t *heap1, ph_node_t *heap2);
ph_node_t *ph_merge(ph_node_t *heap1, ph_node_t *heap2); ph_node_t *ph_merge(ph_node_t *heap1, ph_node_t *heap2);
ph_node_t *ph_merge_pairs(ph_node_t *subheaps); ph_node_t *ph_merge_pairs(ph_node_t *subheaps);
void ph_merge_aux_list(ph_heap_t *l); void ph_merge_aux_list(ph_heap_t *l);
@ -63,6 +64,23 @@ void ph_remove(ph_heap_t *l, ph_node_t *n);
/* Helper routines ************************************************************/ /* Helper routines ************************************************************/
JEMALLOC_INLINE ph_node_t *
ph_merge_ordered(ph_node_t *heap1, ph_node_t *heap2)
{
assert(heap1 != NULL);
assert(heap2 != NULL);
assert ((uintptr_t)heap1 <= (uintptr_t)heap2);
heap2->parent = heap1;
heap2->prev = NULL;
heap2->next = heap1->subheaps;
if (heap1->subheaps != NULL)
heap1->subheaps->prev = heap2;
heap1->subheaps = heap2;
return (heap1);
}
JEMALLOC_INLINE ph_node_t * JEMALLOC_INLINE ph_node_t *
ph_merge(ph_node_t *heap1, ph_node_t *heap2) ph_merge(ph_node_t *heap1, ph_node_t *heap2)
{ {
@ -72,23 +90,10 @@ ph_merge(ph_node_t *heap1, ph_node_t *heap2)
if (heap2 == NULL) if (heap2 == NULL)
return (heap1); return (heap1);
/* Optional: user-settable comparison function */ /* Optional: user-settable comparison function */
if ((uintptr_t)heap1 < (uintptr_t)heap2) { if ((uintptr_t)heap1 < (uintptr_t)heap2)
heap2->parent = heap1; return (ph_merge_ordered(heap1, heap2));
heap2->prev = NULL; else
heap2->next = heap1->subheaps; return (ph_merge_ordered(heap2, heap1));
if (heap1->subheaps != NULL)
heap1->subheaps->prev = heap2;
heap1->subheaps = heap2;
return (heap1);
} else {
heap1->parent = heap2;
heap1->prev = NULL;
heap1->next = heap2->subheaps;
if (heap2->subheaps != NULL)
heap2->subheaps->prev = heap1;
heap2->subheaps = heap1;
return (heap2);
}
} }
JEMALLOC_INLINE ph_node_t * JEMALLOC_INLINE ph_node_t *

1
include/jemalloc/internal/private_symbols.txt
View File

@ -383,6 +383,7 @@ ph_first
ph_insert ph_insert
ph_merge ph_merge
ph_merge_aux_list ph_merge_aux_list
ph_merge_ordered
ph_merge_pairs ph_merge_pairs
ph_new ph_new
ph_remove_first ph_remove_first