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

Pairing heap: inline functions instead of macros.

Browse Source 
By force-inlining everything that would otherwise be a macro, we get the same
effect (it's not clear in the first place that this is actually a good idea, but
it avoids making any changes to the existing performance profile).

This makes the code more maintainable (in anticipation of subsequent changes),
as well as making performance profiles and debug info more readable (we get
"real" line numbers, instead of making everything point to the macro definition
of all associated functions).
This commit is contained in:
David Goldblatt
2021-07-19 16:47:10 -07:00
committed by David Goldblatt
parent 92a1e38f52
commit 08a4cc0969
6 changed files with 450 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
test/unit/ph.c
View File

@@ -3,11 +3,12 @@
#include "jemalloc/internal/ph.h"
typedef struct node_s node_t;
ph_structs(heap, node_t);
struct node_s {
#define NODE_MAGIC 0x9823af7e
uint32_t magic;
phn(node_t) link;
heap_link_t link;
uint64_t key;
};
@@ -36,8 +37,22 @@ node_cmp_magic(const node_t *a, const node_t *b) {
return node_cmp(a, b);
}
typedef ph(node_t) heap_t;
ph_gen(static, heap_, heap_t, node_t, link, node_cmp_magic);
ph_gen(static, heap, node_t, link, node_cmp_magic);
static node_t *
node_next_get(const node_t *node) {
return phn_next_get((node_t *)node, offsetof(node_t, link));
}
static node_t *
node_prev_get(const node_t *node) {
return phn_prev_get((node_t *)node, offsetof(node_t, link));
}
static node_t *
node_lchild_get(const node_t *node) {
return phn_lchild_get((node_t *)node, offsetof(node_t, link));
}
static void
node_print(const node_t *node, unsigned depth) {
@@ -49,14 +64,14 @@ node_print(const node_t *node, unsigned depth) {
}
malloc_printf("%2"FMTu64"\n", node->key);
leftmost_child = phn_lchild_get(node_t, link, node);
leftmost_child = node_lchild_get(node);
if (leftmost_child == NULL) {
return;
}
node_print(leftmost_child, depth + 1);
for (sibling = phn_next_get(node_t, link, leftmost_child); sibling !=
NULL; sibling = phn_next_get(node_t, link, sibling)) {
for (sibling = node_next_get(leftmost_child); sibling !=
NULL; sibling = node_next_get(sibling)) {
node_print(sibling, depth + 1);
}
}
@@ -66,16 +81,15 @@ heap_print(const heap_t *heap) {
node_t *auxelm;
malloc_printf("vvv heap %p vvv\n", heap);
if (heap->ph_root == NULL) {
if (heap->ph.root == NULL) {
goto label_return;
}
node_print(heap->ph_root, 0);
node_print(heap->ph.root, 0);
for (auxelm = phn_next_get(node_t, link, heap->ph_root); auxelm != NULL;
auxelm = phn_next_get(node_t, link, auxelm)) {
expect_ptr_eq(phn_next_get(node_t, link, phn_prev_get(node_t,
link, auxelm)), auxelm,
for (auxelm = node_next_get(heap->ph.root); auxelm != NULL;
auxelm = node_next_get(auxelm)) {
expect_ptr_eq(node_next_get(node_prev_get(auxelm)), auxelm,
"auxelm's prev doesn't link to auxelm");
node_print(auxelm, 0);
}
@@ -94,18 +108,17 @@ node_validate(const node_t *node, const node_t *parent) {
"Child is less than parent");
}
leftmost_child = phn_lchild_get(node_t, link, node);
leftmost_child = node_lchild_get(node);
if (leftmost_child == NULL) {
return nnodes;
}
expect_ptr_eq((void *)phn_prev_get(node_t, link, leftmost_child),
expect_ptr_eq(node_prev_get(leftmost_child),
(void *)node, "Leftmost child does not link to node");
nnodes += node_validate(leftmost_child, node);
for (sibling = phn_next_get(node_t, link, leftmost_child); sibling !=
NULL; sibling = phn_next_get(node_t, link, sibling)) {
expect_ptr_eq(phn_next_get(node_t, link, phn_prev_get(node_t,
link, sibling)), sibling,
for (sibling = node_next_get(leftmost_child); sibling !=
NULL; sibling = node_next_get(sibling)) {
expect_ptr_eq(node_next_get(node_prev_get(sibling)), sibling,
"sibling's prev doesn't link to sibling");
nnodes += node_validate(sibling, node);
}
@@ -117,16 +130,15 @@ heap_validate(const heap_t *heap) {
unsigned nnodes = 0;
node_t *auxelm;
if (heap->ph_root == NULL) {
if (heap->ph.root == NULL) {
goto label_return;
}
nnodes += node_validate(heap->ph_root, NULL);
nnodes += node_validate(heap->ph.root, NULL);
for (auxelm = phn_next_get(node_t, link, heap->ph_root); auxelm != NULL;
auxelm = phn_next_get(node_t, link, auxelm)) {
expect_ptr_eq(phn_next_get(node_t, link, phn_prev_get(node_t,
link, auxelm)), auxelm,
for (auxelm = node_next_get(heap->ph.root); auxelm != NULL;
auxelm = node_next_get(auxelm)) {
expect_ptr_eq(node_next_get(node_prev_get(auxelm)), auxelm,
"auxelm's prev doesn't link to auxelm");
nnodes += node_validate(auxelm, NULL);
}