projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Try to process all pending events after select().
[tinc]
/
src
/
splay_tree.c
diff --git
a/src/splay_tree.c
b/src/splay_tree.c
index
54a46f2
..
ee85519
100644
(file)
--- a/
src/splay_tree.c
+++ b/
src/splay_tree.c
@@
-1,6
+1,6
@@
/*
splay_tree.c -- splay tree and linked list convenience
/*
splay_tree.c -- splay tree and linked list convenience
- Copyright (C) 2004-201
2
Guus Sliepen <guus@tinc-vpn.org>
+ Copyright (C) 2004-201
3
Guus Sliepen <guus@tinc-vpn.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-31,8
+31,10
@@
static splay_node_t *splay_top_down(splay_tree_t *tree, const void *data, int *r
int c;
if(!root) {
int c;
if(!root) {
- if(result)
+ if(result)
{
*result = 0;
*result = 0;
+ }
+
return NULL;
}
return NULL;
}
@@
-45,8
+47,9
@@
static splay_node_t *splay_top_down(splay_tree_t *tree, const void *data, int *r
child->parent = rightbottom;
rightbottom = child;
child->parent = rightbottom;
rightbottom = child;
- if((root->left = child->right))
+ if((root->left = child->right))
{
child->right->parent = root;
child->right->parent = root;
+ }
child->right = root;
root->parent = child;
child->right = root;
root->parent = child;
@@
-55,7
+58,7
@@
static splay_node_t *splay_top_down(splay_tree_t *tree, const void *data, int *r
grandchild->parent = NULL;
root = grandchild;
grandchild->parent = NULL;
root = grandchild;
- } else if
(c > 0 && (grandchild = child->right)) {
+ } else if(c > 0 && (grandchild = child->right)) {
leftbottom->right = child;
child->parent = leftbottom;
leftbottom = child;
leftbottom->right = child;
child->parent = leftbottom;
leftbottom = child;
@@
-89,8
+92,9
@@
static splay_node_t *splay_top_down(splay_tree_t *tree, const void *data, int *r
child->parent = leftbottom;
leftbottom = child;
child->parent = leftbottom;
leftbottom = child;
- if((root->right = child->left))
+ if((root->right = child->left))
{
child->left->parent = root;
child->left->parent = root;
+ }
child->left = root;
root->parent = child;
child->left = root;
root->parent = child;
@@
-99,7
+103,7
@@
static splay_node_t *splay_top_down(splay_tree_t *tree, const void *data, int *r
grandchild->parent = NULL;
root = grandchild;
grandchild->parent = NULL;
root = grandchild;
- } else if
(c < 0 && (grandchild = child->left)) {
+ } else if(c < 0 && (grandchild = child->left)) {
rightbottom->left = child;
child->parent = rightbottom;
rightbottom = child;
rightbottom->left = child;
child->parent = rightbottom;
rightbottom = child;
@@
-137,6
+141,7
@@
static splay_node_t *splay_top_down(splay_tree_t *tree, const void *data, int *r
leftbottom->right = root->left;
root->left->parent = leftbottom;
}
leftbottom->right = root->left;
root->left->parent = leftbottom;
}
+
root->left = left.right;
left.right->parent = root;
}
root->left = left.right;
left.right->parent = root;
}
@@
-146,6
+151,7
@@
static splay_node_t *splay_top_down(splay_tree_t *tree, const void *data, int *r
rightbottom->left = root->right;
root->right->parent = rightbottom;
}
rightbottom->left = root->right;
root->right->parent = rightbottom;
}
+
root->right = right.left;
right.left->parent = root;
}
root->right = right.left;
right.left->parent = root;
}
@@
-153,8
+159,10
@@
static splay_node_t *splay_top_down(splay_tree_t *tree, const void *data, int *r
/* Return result */
tree->root = root;
/* Return result */
tree->root = root;
- if(result)
+
+ if(result) {
*result = c;
*result = c;
+ }
return tree->root;
}
return tree->root;
}
@@
-165,12
+173,16
@@
static void splay_bottom_up(splay_tree_t *tree, splay_node_t *node) {
while((parent = node->parent)) {
if(!(grandparent = parent->parent)) { /* zig */
if(node == parent->left) {
while((parent = node->parent)) {
if(!(grandparent = parent->parent)) { /* zig */
if(node == parent->left) {
- if((parent->left = node->right))
+ if((parent->left = node->right))
{
parent->left->parent = parent;
parent->left->parent = parent;
+ }
+
node->right = parent;
} else {
node->right = parent;
} else {
- if((parent->right = node->left))
+ if((parent->right = node->left))
{
parent->right->parent = parent;
parent->right->parent = parent;
+ }
+
node->left = parent;
}
node->left = parent;
}
@@
-180,52
+192,69
@@
static void splay_bottom_up(splay_tree_t *tree, splay_node_t *node) {
greatgrandparent = grandparent->parent;
if(node == parent->left && parent == grandparent->left) { /* left zig-zig */
greatgrandparent = grandparent->parent;
if(node == parent->left && parent == grandparent->left) { /* left zig-zig */
- if((grandparent->left = parent->right))
+ if((grandparent->left = parent->right))
{
grandparent->left->parent = grandparent;
grandparent->left->parent = grandparent;
+ }
+
parent->right = grandparent;
grandparent->parent = parent;
parent->right = grandparent;
grandparent->parent = parent;
- if((parent->left = node->right))
+ if((parent->left = node->right))
{
parent->left->parent = parent;
parent->left->parent = parent;
+ }
+
node->right = parent;
parent->parent = node;
} else if(node == parent->right && parent == grandparent->right) { /* right zig-zig */
node->right = parent;
parent->parent = node;
} else if(node == parent->right && parent == grandparent->right) { /* right zig-zig */
- if((grandparent->right = parent->left))
+ if((grandparent->right = parent->left))
{
grandparent->right->parent = grandparent;
grandparent->right->parent = grandparent;
+ }
+
parent->left = grandparent;
grandparent->parent = parent;
parent->left = grandparent;
grandparent->parent = parent;
- if((parent->right = node->left))
+ if((parent->right = node->left))
{
parent->right->parent = parent;
parent->right->parent = parent;
+ }
+
node->left = parent;
parent->parent = node;
} else if(node == parent->right && parent == grandparent->left) { /* left-right zig-zag */
node->left = parent;
parent->parent = node;
} else if(node == parent->right && parent == grandparent->left) { /* left-right zig-zag */
- if((parent->right = node->left))
+ if((parent->right = node->left))
{
parent->right->parent = parent;
parent->right->parent = parent;
+ }
+
node->left = parent;
parent->parent = node;
node->left = parent;
parent->parent = node;
- if((grandparent->left = node->right))
+ if((grandparent->left = node->right))
{
grandparent->left->parent = grandparent;
grandparent->left->parent = grandparent;
+ }
+
node->right = grandparent;
grandparent->parent = node;
} else { /* right-left zig-zag */
node->right = grandparent;
grandparent->parent = node;
} else { /* right-left zig-zag */
- if((parent->left = node->right))
+ if((parent->left = node->right))
{
parent->left->parent = parent;
parent->left->parent = parent;
+ }
+
node->right = parent;
parent->parent = node;
node->right = parent;
parent->parent = node;
- if((grandparent->right = node->left))
+ if((grandparent->right = node->left))
{
grandparent->right->parent = grandparent;
grandparent->right->parent = grandparent;
+ }
+
node->left = grandparent;
grandparent->parent = node;
}
if((node->parent = greatgrandparent)) {
node->left = grandparent;
grandparent->parent = node;
}
if((node->parent = greatgrandparent)) {
- if(grandparent == greatgrandparent->left)
+ if(grandparent == greatgrandparent->left)
{
greatgrandparent->left = node;
greatgrandparent->left = node;
- else
+ } else {
greatgrandparent->right = node;
greatgrandparent->right = node;
+ }
}
}
}
}
}
}
@@
-238,7
+267,7
@@
static void splay_bottom_up(splay_tree_t *tree, splay_node_t *node) {
splay_tree_t *splay_alloc_tree(splay_compare_t compare, splay_action_t delete) {
splay_tree_t *tree;
splay_tree_t *splay_alloc_tree(splay_compare_t compare, splay_action_t delete) {
splay_tree_t *tree;
- tree = x
malloc_and_zero
(sizeof(splay_tree_t));
+ tree = x
zalloc
(sizeof(splay_tree_t));
tree->compare = compare;
tree->delete = delete;
tree->compare = compare;
tree->delete = delete;
@@
-250,12
+279,13
@@
void splay_free_tree(splay_tree_t *tree) {
}
splay_node_t *splay_alloc_node(void) {
}
splay_node_t *splay_alloc_node(void) {
- return x
malloc_and_zero
(sizeof(splay_node_t));
+ return x
zalloc
(sizeof(splay_node_t));
}
void splay_free_node(splay_tree_t *tree, splay_node_t *node) {
}
void splay_free_node(splay_tree_t *tree, splay_node_t *node) {
- if(node->data && tree->delete)
+ if(node->data && tree->delete)
{
tree->delete(node->data);
tree->delete(node->data);
+ }
free(node);
}
free(node);
}
@@
-310,8
+340,10
@@
splay_node_t *splay_search_closest_node_nosplay(const splay_tree_t *tree, const
node = tree->root;
if(!node) {
node = tree->root;
if(!node) {
- if(result)
+ if(result)
{
*result = 0;
*result = 0;
+ }
+
return NULL;
}
return NULL;
}
@@
-319,22
+351,26
@@
splay_node_t *splay_search_closest_node_nosplay(const splay_tree_t *tree, const
c = tree->compare(data, node->data);
if(c < 0) {
c = tree->compare(data, node->data);
if(c < 0) {
- if(node->left)
+ if(node->left)
{
node = node->left;
node = node->left;
- else
+ } else {
break;
break;
+ }
} else if(c > 0) {
} else if(c > 0) {
- if(node->right)
+ if(node->right)
{
node = node->right;
node = node->right;
- else
+ } else {
break;
break;
+ }
} else {
break;
}
}
} else {
break;
}
}
- if(result)
+ if(result)
{
*result = c;
*result = c;
+ }
+
return node;
}
return node;
}
@@
-348,8
+384,9
@@
splay_node_t *splay_search_closest_smaller_node(splay_tree_t *tree, const void *
node = splay_search_closest_node(tree, data, &result);
node = splay_search_closest_node(tree, data, &result);
- if(result < 0)
+ if(result < 0)
{
node = node->prev;
node = node->prev;
+ }
return node;
}
return node;
}
@@
-360,8
+397,9
@@
splay_node_t *splay_search_closest_greater_node(splay_tree_t *tree, const void *
node = splay_search_closest_node(tree, data, &result);
node = splay_search_closest_node(tree, data, &result);
- if(result > 0)
+ if(result > 0)
{
node = node->next;
node = node->next;
+ }
return node;
}
return node;
}
@@
-379,16
+417,18
@@
splay_node_t *splay_insert(splay_tree_t *tree, void *data) {
} else {
closest = splay_search_closest_node(tree, data, &result);
} else {
closest = splay_search_closest_node(tree, data, &result);
- if(!result)
+ if(!result)
{
return NULL;
return NULL;
+ }
new = splay_alloc_node();
new->data = data;
new = splay_alloc_node();
new->data = data;
- if(result < 0)
+ if(result < 0)
{
splay_insert_before(tree, closest, new);
splay_insert_before(tree, closest, new);
- else
+ } else {
splay_insert_after(tree, closest, new);
splay_insert_after(tree, closest, new);
+ }
}
return new;
}
return new;
@@
-400,18
+440,20
@@
splay_node_t *splay_insert_node(splay_tree_t *tree, splay_node_t *node) {
node->left = node->right = node->parent = node->next = node->prev = NULL;
node->left = node->right = node->parent = node->next = node->prev = NULL;
- if(!tree->root)
+ if(!tree->root)
{
splay_insert_top(tree, node);
splay_insert_top(tree, node);
- else {
+
}
else {
closest = splay_search_closest_node(tree, node->data, &result);
closest = splay_search_closest_node(tree, node->data, &result);
- if(!result)
+ if(!result)
{
return NULL;
return NULL;
+ }
- if(result < 0)
+ if(result < 0)
{
splay_insert_before(tree, closest, node);
splay_insert_before(tree, closest, node);
- else
+ } else {
splay_insert_after(tree, closest, node);
splay_insert_after(tree, closest, node);
+ }
}
return node;
}
return node;
@@
-421,64
+463,83
@@
void splay_insert_top(splay_tree_t *tree, splay_node_t *node) {
node->prev = node->next = node->left = node->right = node->parent = NULL;
tree->head = tree->tail = tree->root = node;
tree->count++;
node->prev = node->next = node->left = node->right = node->parent = NULL;
tree->head = tree->tail = tree->root = node;
tree->count++;
+ tree->generation++;
}
void splay_insert_before(splay_tree_t *tree, splay_node_t *before, splay_node_t *node) {
if(!before) {
}
void splay_insert_before(splay_tree_t *tree, splay_node_t *before, splay_node_t *node) {
if(!before) {
- if(tree->tail)
+ if(tree->tail)
{
splay_insert_after(tree, tree->tail, node);
splay_insert_after(tree, tree->tail, node);
- else
+ } else {
splay_insert_top(tree, node);
splay_insert_top(tree, node);
+ }
+
return;
}
node->next = before;
return;
}
node->next = before;
- if((node->prev = before->prev))
+
+ if((node->prev = before->prev)) {
before->prev->next = node;
before->prev->next = node;
- else
+ } else {
tree->head = node;
tree->head = node;
+ }
+
before->prev = node;
splay_bottom_up(tree, before);
node->right = before;
before->parent = node;
before->prev = node;
splay_bottom_up(tree, before);
node->right = before;
before->parent = node;
- if((node->left = before->left))
+
+ if((node->left = before->left)) {
before->left->parent = node;
before->left->parent = node;
+ }
+
before->left = NULL;
node->parent = NULL;
tree->root = node;
tree->count++;
before->left = NULL;
node->parent = NULL;
tree->root = node;
tree->count++;
+ tree->generation++;
}
void splay_insert_after(splay_tree_t *tree, splay_node_t *after, splay_node_t *node) {
if(!after) {
}
void splay_insert_after(splay_tree_t *tree, splay_node_t *after, splay_node_t *node) {
if(!after) {
- if(tree->head)
+ if(tree->head)
{
splay_insert_before(tree, tree->head, node);
splay_insert_before(tree, tree->head, node);
- else
+ } else {
splay_insert_top(tree, node);
splay_insert_top(tree, node);
+ }
+
return;
}
node->prev = after;
return;
}
node->prev = after;
- if((node->next = after->next))
+
+ if((node->next = after->next)) {
after->next->prev = node;
after->next->prev = node;
- else
+ } else {
tree->tail = node;
tree->tail = node;
+ }
+
after->next = node;
splay_bottom_up(tree, after);
node->left = after;
after->parent = node;
after->next = node;
splay_bottom_up(tree, after);
node->left = after;
after->parent = node;
- if((node->right = after->right))
+
+ if((node->right = after->right)) {
after->right->parent = node;
after->right->parent = node;
+ }
+
after->right = NULL;
node->parent = NULL;
tree->root = node;
tree->count++;
after->right = NULL;
node->parent = NULL;
tree->root = node;
tree->count++;
+ tree->generation++;
}
splay_node_t *splay_unlink(splay_tree_t *tree, void *data) {
}
splay_node_t *splay_unlink(splay_tree_t *tree, void *data) {
@@
-486,30
+547,35
@@
splay_node_t *splay_unlink(splay_tree_t *tree, void *data) {
node = splay_search_node(tree, data);
node = splay_search_node(tree, data);
- if(node)
+ if(node)
{
splay_unlink_node(tree, node);
splay_unlink_node(tree, node);
+ }
return node;
}
void splay_unlink_node(splay_tree_t *tree, splay_node_t *node) {
return node;
}
void splay_unlink_node(splay_tree_t *tree, splay_node_t *node) {
- if(node->prev)
+ if(node->prev)
{
node->prev->next = node->next;
node->prev->next = node->next;
- else
+ } else {
tree->head = node->next;
tree->head = node->next;
+ }
- if(node->next)
+ if(node->next)
{
node->next->prev = node->prev;
node->next->prev = node->prev;
- else
+ } else {
tree->tail = node->prev;
tree->tail = node->prev;
+ }
splay_bottom_up(tree, node);
if(node->prev) {
node->left->parent = NULL;
tree->root = node->left;
splay_bottom_up(tree, node);
if(node->prev) {
node->left->parent = NULL;
tree->root = node->left;
- if((node->prev->right = node->right))
+
+ if((node->prev->right = node->right)) {
node->right->parent = node->prev;
node->right->parent = node->prev;
+ }
} else if(node->next) {
tree->root = node->right;
node->right->parent = NULL;
} else if(node->next) {
tree->root = node->right;
node->right->parent = NULL;
@@
-518,6
+584,7
@@
void splay_unlink_node(splay_tree_t *tree, splay_node_t *node) {
}
tree->count--;
}
tree->count--;
+ tree->generation++;
}
void splay_delete_node(splay_tree_t *tree, splay_node_t *node) {
}
void splay_delete_node(splay_tree_t *tree, splay_node_t *node) {
@@
-530,8
+597,9
@@
void splay_delete(splay_tree_t *tree, void *data) {
node = splay_search_node(tree, data);
node = splay_search_node(tree, data);
- if(node)
+ if(node)
{
splay_delete_node(tree, node);
splay_delete_node(tree, node);
+ }
}
/* Fast tree cleanup */
}
/* Fast tree cleanup */