projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use splay trees instead of AVL trees.
[tinc]
/
src
/
connection.c
diff --git
a/src/connection.c
b/src/connection.c
index
5cd7a74
..
408ef6c
100644
(file)
--- a/
src/connection.c
+++ b/
src/connection.c
@@
-22,7
+22,7
@@
#include "system.h"
#include "system.h"
-#include "
avl
_tree.h"
+#include "
splay
_tree.h"
#include "conf.h"
#include "list.h"
#include "logger.h"
#include "conf.h"
#include "list.h"
#include "logger.h"
@@
-32,34
+32,30
@@
#include "utils.h"
#include "xalloc.h"
#include "utils.h"
#include "xalloc.h"
-
avl_tree_t *connection_tree;
/* Meta connections */
+
splay_tree_t *connection_tree;
/* Meta connections */
connection_t *broadcast;
connection_t *broadcast;
-static int connection_compare(const connection_t *a, const connection_t *b)
-{
+static int connection_compare(const connection_t *a, const connection_t *b) {
return (void *)a - (void *)b;
}
return (void *)a - (void *)b;
}
-void init_connections(void)
-{
+void init_connections(void) {
cp();
cp();
- connection_tree =
avl_alloc_tree((avl_compare_t) connection_compare, (avl
_action_t) free_connection);
+ connection_tree =
splay_alloc_tree((splay_compare_t) connection_compare, (splay
_action_t) free_connection);
broadcast = new_connection();
broadcast->name = xstrdup(_("everyone"));
broadcast->hostname = xstrdup(_("BROADCAST"));
}
broadcast = new_connection();
broadcast->name = xstrdup(_("everyone"));
broadcast->hostname = xstrdup(_("BROADCAST"));
}
-void exit_connections(void)
-{
+void exit_connections(void) {
cp();
cp();
-
avl
_delete_tree(connection_tree);
+
splay
_delete_tree(connection_tree);
free_connection(broadcast);
}
free_connection(broadcast);
}
-connection_t *new_connection(void)
-{
+connection_t *new_connection(void) {
connection_t *c;
cp();
connection_t *c;
cp();
@@
-75,8
+71,7
@@
connection_t *new_connection(void)
return c;
}
return c;
}
-void free_connection(connection_t *c)
-{
+void free_connection(connection_t *c) {
cp();
if(!c)
cp();
if(!c)
@@
-104,23
+99,20
@@
void free_connection(connection_t *c)
free(c);
}
free(c);
}
-void connection_add(connection_t *c)
-{
+void connection_add(connection_t *c) {
cp();
cp();
-
avl
_insert(connection_tree, c);
+
splay
_insert(connection_tree, c);
}
}
-void connection_del(connection_t *c)
-{
+void connection_del(connection_t *c) {
cp();
cp();
-
avl
_delete(connection_tree, c);
+
splay
_delete(connection_tree, c);
}
}
-void dump_connections(void)
-{
- avl_node_t *node;
+void dump_connections(void) {
+ splay_node_t *node;
connection_t *c;
cp();
connection_t *c;
cp();
@@
-137,8
+129,7
@@
void dump_connections(void)
logger(LOG_DEBUG, _("End of connections."));
}
logger(LOG_DEBUG, _("End of connections."));
}
-bool read_connection_config(connection_t *c)
-{
+bool read_connection_config(connection_t *c) {
char *fname;
int x;
char *fname;
int x;