projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fancier protocol for control socket
[tinc]
/
src
/
graph.c
diff --git
a/src/graph.c
b/src/graph.c
index
02650f7
..
5bf6361
100644
(file)
--- a/
src/graph.c
+++ b/
src/graph.c
@@
-46,7
+46,7
@@
#include "system.h"
#include "system.h"
-#include "
avl
_tree.h"
+#include "
splay
_tree.h"
#include "config.h"
#include "connection.h"
#include "device.h"
#include "config.h"
#include "connection.h"
#include "device.h"
@@
-63,9
+63,8
@@
Please note that sorting on weight is already done by add_edge().
*/
Please note that sorting on weight is already done by add_edge().
*/
-void mst_kruskal(void)
-{
- avl_node_t *node, *next;
+void mst_kruskal(void) {
+ splay_node_t *node, *next;
edge_t *e;
node_t *n;
connection_t *c;
edge_t *e;
node_t *n;
connection_t *c;
@@
-147,9
+146,8
@@
void mst_kruskal(void)
Running time: O(E)
*/
Running time: O(E)
*/
-void sssp_bfs(void)
-{
- avl_node_t *node, *next, *to;
+void sssp_bfs(void) {
+ splay_node_t *node, *next, *to;
edge_t *e;
node_t *n;
list_t *todo_list;
edge_t *e;
node_t *n;
list_t *todo_list;
@@
-225,7
+223,7
@@
void sssp_bfs(void)
e->to->options = e->options;
if(sockaddrcmp(&e->to->address, &e->address)) {
e->to->options = e->options;
if(sockaddrcmp(&e->to->address, &e->address)) {
- node =
avl
_unlink(node_udp_tree, e->to);
+ node =
splay
_unlink(node_udp_tree, e->to);
sockaddrfree(&e->to->address);
sockaddrcpy(&e->to->address, &e->address);
sockaddrfree(&e->to->address);
sockaddrcpy(&e->to->address, &e->address);
@@
-235,7
+233,7
@@
void sssp_bfs(void)
e->to->hostname = sockaddr2hostname(&e->to->address);
if(node)
e->to->hostname = sockaddr2hostname(&e->to->address);
if(node)
-
avl
_insert_node(node_udp_tree, node);
+
splay
_insert_node(node_udp_tree, node);
if(e->to->options & OPTION_PMTU_DISCOVERY) {
e->to->mtuprobes = 0;
if(e->to->options & OPTION_PMTU_DISCOVERY) {
e->to->mtuprobes = 0;
@@
-267,11
+265,11
@@
void sssp_bfs(void)
if(n->status.reachable) {
ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Node %s (%s) became reachable"),
n->name, n->hostname);
if(n->status.reachable) {
ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Node %s (%s) became reachable"),
n->name, n->hostname);
-
avl
_insert(node_udp_tree, n);
+
splay
_insert(node_udp_tree, n);
} else {
ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Node %s (%s) became unreachable"),
n->name, n->hostname);
} else {
ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Node %s (%s) became unreachable"),
n->name, n->hostname);
-
avl
_delete(node_udp_tree, n);
+
splay
_delete(node_udp_tree, n);
}
n->status.validkey = false;
}
n->status.validkey = false;
@@
-315,9
+313,8
@@
void sssp_bfs(void)
dot -Tpng graph_filename -o image_filename.png -Gconcentrate=true
*/
dot -Tpng graph_filename -o image_filename.png -Gconcentrate=true
*/
-static void dump_graph(int fd, short events, void *data)
-{
- avl_node_t *node;
+static void dump_graph(int fd, short events, void *data) {
+ splay_node_t *node;
node_t *n;
edge_t *e;
char *filename = NULL, *tmpname = NULL;
node_t *n;
edge_t *e;
char *filename = NULL, *tmpname = NULL;
@@
-369,14
+366,13
@@
static void dump_graph(int fd, short events, void *data)
}
}
}
}
-void graph(void)
-{
+void graph(void) {
static struct event ev;
sssp_bfs();
mst_kruskal();
static struct event ev;
sssp_bfs();
mst_kruskal();
- if(!
ev.ev_callback
)
+ if(!
timeout_initialized(&ev)
)
timeout_set(&ev, dump_graph, NULL);
event_add(&ev, &(struct timeval){5, 0});
}
timeout_set(&ev, dump_graph, NULL);
event_add(&ev, &(struct timeval){5, 0});
}