lihao/jemalloc
1
0
Fork 0
mirror of https://github.com/jemalloc/jemalloc.git synced 2026-07-23 21:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update brace style.

Browse Source 
Add braces around single-line blocks, and remove line breaks before
function-opening braces.

This resolves #537.
This commit is contained in:
Jason Evans
2017-01-15 16:56:30 -08:00
parent 5154ff32ee
commit c4c2592c83
119 changed files with 2971 additions and 3572 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
test/unit/ph.c
View File

@@ -10,8 +10,7 @@ struct node_s {
};
static int
node_cmp(const node_t *a, const node_t *b)
{
node_cmp(const node_t *a, const node_t *b) {
int ret;
ret = (a->key > b->key) - (a->key < b->key);
@@ -39,18 +38,19 @@ typedef ph(node_t) heap_t;
ph_gen(static, heap_, heap_t, node_t, link, node_cmp_magic);
static void
node_print(const node_t *node, unsigned depth)
{
node_print(const node_t *node, unsigned depth) {
unsigned i;
node_t *leftmost_child, *sibling;
for (i = 0; i < depth; i++)
for (i = 0; i < depth; i++) {
malloc_printf("\t");
}
malloc_printf("%2"FMTu64"\n", node->key);
leftmost_child = phn_lchild_get(node_t, link, node);
if (leftmost_child == NULL)
if (leftmost_child == NULL) {
return;
}
node_print(leftmost_child, depth + 1);
for (sibling = phn_next_get(node_t, link, leftmost_child); sibling !=
@@ -60,13 +60,13 @@ node_print(const node_t *node, unsigned depth)
}
static void
heap_print(const heap_t *heap)
{
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);
@@ -83,8 +83,7 @@ label_return:
}
static unsigned
node_validate(const node_t *node, const node_t *parent)
{
node_validate(const node_t *node, const node_t *parent) {
unsigned nnodes = 1;
node_t *leftmost_child, *sibling;
@@ -94,8 +93,9 @@ node_validate(const node_t *node, const node_t *parent)
}
leftmost_child = phn_lchild_get(node_t, link, node);
if (leftmost_child == NULL)
if (leftmost_child == NULL) {
return (nnodes);
}
assert_ptr_eq((void *)phn_prev_get(node_t, link, leftmost_child),
(void *)node, "Leftmost child does not link to node");
nnodes += node_validate(leftmost_child, node);
@@ -111,13 +111,13 @@ node_validate(const node_t *node, const node_t *parent)
}
static unsigned
heap_validate(const heap_t *heap)
{
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);
@@ -130,13 +130,13 @@ heap_validate(const heap_t *heap)
}
label_return:
if (false)
if (false) {
heap_print(heap);
}
return (nnodes);
}
TEST_BEGIN(test_ph_empty)
{
TEST_BEGIN(test_ph_empty) {
heap_t heap;
heap_new(&heap);
@@ -146,23 +146,20 @@ TEST_BEGIN(test_ph_empty)
TEST_END
static void
node_remove(heap_t *heap, node_t *node)
{
node_remove(heap_t *heap, node_t *node) {
heap_remove(heap, node);
node->magic = 0;
}
static node_t *
node_remove_first(heap_t *heap)
{
node_remove_first(heap_t *heap) {
node_t *node = heap_remove_first(heap);
node->magic = 0;
return (node);
}
TEST_BEGIN(test_ph_random)
{
TEST_BEGIN(test_ph_random) {
#define NNODES 25
#define NBAGS 250
#define SEED 42
@@ -177,17 +174,20 @@ TEST_BEGIN(test_ph_random)
switch (i) {
case 0:
/* Insert in order. */
for (j = 0; j < NNODES; j++)
for (j = 0; j < NNODES; j++) {
bag[j] = j;
}
break;
case 1:
/* Insert in reverse order. */
for (j = 0; j < NNODES; j++)
for (j = 0; j < NNODES; j++) {
bag[j] = NNODES - j - 1;
}
break;
default:
for (j = 0; j < NNODES; j++)
for (j = 0; j < NNODES; j++) {
bag[j] = gen_rand64_range(sfmt, NNODES);
}
}
for (j = 1; j <= NNODES; j++) {
@@ -280,8 +280,7 @@ TEST_BEGIN(test_ph_random)
TEST_END
int
main(void)
{
main(void) {
return (test(
test_ph_empty,
test_ph_random));