Avoid allocating packet buffers unnecessarily.

[meshlink] / src / edge.c

diff --git a/src/edge.c b/src/edge.c
index 88847909c01b3fb9e31b19e5a08e1a444e293974..afe9cfe325ad19bc82d33fe7f9e796fb794285a7 100644 (file)
--- a/src/edge.c
+++ b/src/edge.c
@@ -22,13 +22,12 @@
 #include "splay_tree.h"
 #include "edge.h"
 #include "logger.h"
+#include "meshlink_internal.h"
 #include "netutl.h"
 #include "node.h"
 #include "utils.h"
 #include "xalloc.h"
 
-splay_tree_t *edge_weight_tree;
-
 static int edge_compare(const edge_t *a, const edge_t *b) {
        return strcmp(a->to->name, b->to->name);
 }
@@ -38,19 +37,21 @@ static int edge_weight_compare(const edge_t *a, const edge_t *b) {
 
        result = a->weight - b->weight;
 
-       if(result)
+       if(result) {
                return result;
+       }
 
        result = strcmp(a->from->name, b->from->name);
 
-       if(result)
+       if(result) {
                return result;
+       }
 
        return strcmp(a->to->name, b->to->name);
 }
 
-void init_edges(void) {
-       edge_weight_tree = splay_alloc_tree((splay_compare_t) edge_weight_compare, NULL);
+void init_edges(meshlink_handle_t *mesh) {
+       mesh->edges = splay_alloc_tree((splay_compare_t) edge_weight_compare, NULL);
 }
 
 splay_tree_t *new_edge_tree(void) {
@@ -61,8 +62,12 @@ void free_edge_tree(splay_tree_t *edge_tree) {
        splay_delete_tree(edge_tree);
 }
 
-void exit_edges(void) {
-       splay_delete_tree(edge_weight_tree);
+void exit_edges(meshlink_handle_t *mesh) {
+       if(mesh->edges) {
+               splay_delete_tree(mesh->edges);
+       }
+
+       mesh->edges = NULL;
 }
 
 /* Creation and deletion of connection elements */
@@ -77,25 +82,30 @@ void free_edge(edge_t *e) {
        free(e);
 }
 
-void edge_add(edge_t *e) {
-       splay_insert(edge_weight_tree, e);
+void edge_add(meshlink_handle_t *mesh, edge_t *e) {
+       splay_insert(mesh->edges, e);
        splay_insert(e->from->edge_tree, e);
 
        e->reverse = lookup_edge(e->to, e->from);
 
-       if(e->reverse)
+       if(e->reverse) {
                e->reverse->reverse = e;
+       }
 }
 
-void edge_del(edge_t *e) {
-       if(e->reverse)
+void edge_del(meshlink_handle_t *mesh, edge_t *e) {
+       if(e->reverse) {
                e->reverse->reverse = NULL;
+       }
 
-       splay_delete(edge_weight_tree, e);
+       splay_delete(mesh->edges, e);
        splay_delete(e->from->edge_tree, e);
 }
 
 edge_t *lookup_edge(node_t *from, node_t *to) {
+       assert(from);
+       assert(to);
+
        edge_t v;
 
        v.from = from;