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

84
test/unit/rb.c
View File

@@ -1,14 +1,14 @@
#include "test/jemalloc_test.h"
#define rbtn_black_height(a_type, a_field, a_rbt, r_height) do { \
a_type *rbp_bh_t; \
for (rbp_bh_t = (a_rbt)->rbt_root, (r_height) = 0; \
rbp_bh_t != NULL; \
rbp_bh_t = rbtn_left_get(a_type, a_field, rbp_bh_t)) { \
if (!rbtn_red_get(a_type, a_field, rbp_bh_t)) { \
(r_height)++; \
a_type *rbp_bh_t; \
for (rbp_bh_t = (a_rbt)->rbt_root, (r_height) = 0; rbp_bh_t != \
NULL; rbp_bh_t = rbtn_left_get(a_type, a_field, \
rbp_bh_t)) { \
if (!rbtn_red_get(a_type, a_field, rbp_bh_t)) { \
(r_height)++; \
} \
} \
} \
} while (0)
typedef struct node_s node_t;
@@ -42,8 +42,7 @@ node_cmp(const node_t *a, const node_t *b) {
typedef rb_tree(node_t) tree_t;
rb_gen(static, tree_, tree_t, node_t, link, node_cmp);
TEST_BEGIN(test_rb_empty)
{
TEST_BEGIN(test_rb_empty) {
tree_t tree;
node_t key;
@@ -68,52 +67,56 @@ TEST_BEGIN(test_rb_empty)
TEST_END
static unsigned
tree_recurse(node_t *node, unsigned black_height, unsigned black_depth)
{
tree_recurse(node_t *node, unsigned black_height, unsigned black_depth) {
unsigned ret = 0;
node_t *left_node;
node_t *right_node;
if (node == NULL)
if (node == NULL) {
return (ret);
}
left_node = rbtn_left_get(node_t, link, node);
right_node = rbtn_right_get(node_t, link, node);
if (!rbtn_red_get(node_t, link, node))
if (!rbtn_red_get(node_t, link, node)) {
black_depth++;
}
/* Red nodes must be interleaved with black nodes. */
if (rbtn_red_get(node_t, link, node)) {
if (left_node != NULL)
if (left_node != NULL) {
assert_false(rbtn_red_get(node_t, link, left_node),
"Node should be black");
if (right_node != NULL)
}
if (right_node != NULL) {
assert_false(rbtn_red_get(node_t, link, right_node),
"Node should be black");
}
}
/* Self. */
assert_u32_eq(node->magic, NODE_MAGIC, "Bad magic");
/* Left subtree. */
if (left_node != NULL)
if (left_node != NULL) {
ret += tree_recurse(left_node, black_height, black_depth);
else
} else {
ret += (black_depth != black_height);
}
/* Right subtree. */
if (right_node != NULL)
if (right_node != NULL) {
ret += tree_recurse(right_node, black_height, black_depth);
else
} else {
ret += (black_depth != black_height);
}
return (ret);
}
static node_t *
tree_iterate_cb(tree_t *tree, node_t *node, void *data)
{
tree_iterate_cb(tree_t *tree, node_t *node, void *data) {
unsigned *i = (unsigned *)data;
node_t *search_node;
@@ -140,8 +143,7 @@ tree_iterate_cb(tree_t *tree, node_t *node, void *data)
}
static unsigned
tree_iterate(tree_t *tree)
{
tree_iterate(tree_t *tree) {
unsigned i;
i = 0;
@@ -151,8 +153,7 @@ tree_iterate(tree_t *tree)
}
static unsigned
tree_iterate_reverse(tree_t *tree)
{
tree_iterate_reverse(tree_t *tree) {
unsigned i;
i = 0;
@@ -162,8 +163,7 @@ tree_iterate_reverse(tree_t *tree)
}
static void
node_remove(tree_t *tree, node_t *node, unsigned nnodes)
{
node_remove(tree_t *tree, node_t *node, unsigned nnodes) {
node_t *search_node;
unsigned black_height, imbalances;
@@ -195,8 +195,7 @@ node_remove(tree_t *tree, node_t *node, unsigned nnodes)
}
static node_t *
remove_iterate_cb(tree_t *tree, node_t *node, void *data)
{
remove_iterate_cb(tree_t *tree, node_t *node, void *data) {
unsigned *nnodes = (unsigned *)data;
node_t *ret = tree_next(tree, node);
@@ -206,8 +205,7 @@ remove_iterate_cb(tree_t *tree, node_t *node, void *data)
}
static node_t *
remove_reverse_iterate_cb(tree_t *tree, node_t *node, void *data)
{
remove_reverse_iterate_cb(tree_t *tree, node_t *node, void *data) {
unsigned *nnodes = (unsigned *)data;
node_t *ret = tree_prev(tree, node);
@@ -217,16 +215,14 @@ remove_reverse_iterate_cb(tree_t *tree, node_t *node, void *data)
}
static void
destroy_cb(node_t *node, void *data)
{
destroy_cb(node_t *node, void *data) {
unsigned *nnodes = (unsigned *)data;
assert_u_gt(*nnodes, 0, "Destruction removed too many nodes");
(*nnodes)--;
}
TEST_BEGIN(test_rb_random)
{
TEST_BEGIN(test_rb_random) {
#define NNODES 25
#define NBAGS 250
#define SEED 42
@@ -241,17 +237,20 @@ TEST_BEGIN(test_rb_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++) {
@@ -292,12 +291,14 @@ TEST_BEGIN(test_rb_random)
/* Remove nodes. */
switch (i % 5) {
case 0:
for (k = 0; k < j; k++)
for (k = 0; k < j; k++) {
node_remove(&tree, &nodes[k], j - k);
}
break;
case 1:
for (k = j; k > 0; k--)
for (k = j; k > 0; k--) {
node_remove(&tree, &nodes[k-1], k);
}
break;
case 2: {
node_t *start;
@@ -345,8 +346,7 @@ TEST_BEGIN(test_rb_random)
TEST_END
int
main(void)
{
main(void) {
return (test(
test_rb_empty,
test_rb_random));