X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnode.c;h=f43619a2a4b2f38fd2cc6e1c2d311eb7c8cef423;hb=326a86ef927e1f161a6742edfca041a945c7a547;hp=e6b9f018f46657519b7cceab1939b139ad6f010b;hpb=1da7f28315be17a4ed854cdceb97a870f16a511e;p=meshlink diff --git a/src/node.c b/src/node.c index e6b9f018..f43619a2 100644 --- a/src/node.c +++ b/src/node.c @@ -34,21 +34,17 @@ static int node_compare(const node_t *a, const node_t *b) { } void init_nodes(meshlink_handle_t *mesh) { - pthread_mutex_lock(&(mesh->nodes_mutex)); mesh->nodes = splay_alloc_tree((splay_compare_t) node_compare, (splay_action_t) free_node); mesh->node_udp_cache = hash_alloc(0x100, sizeof(sockaddr_t)); - pthread_mutex_unlock(&(mesh->nodes_mutex)); } void exit_nodes(meshlink_handle_t *mesh) { - pthread_mutex_lock(&(mesh->nodes_mutex)); if(mesh->node_udp_cache) hash_free(mesh->node_udp_cache); if(mesh->nodes) splay_delete_tree(mesh->nodes); mesh->node_udp_cache = NULL; mesh->nodes = NULL; - pthread_mutex_unlock(&(mesh->nodes_mutex)); } node_t *new_node(void) { @@ -87,30 +83,24 @@ void free_node(node_t *n) { } void node_add(meshlink_handle_t *mesh, node_t *n) { - pthread_mutex_lock(&(mesh->nodes_mutex)); n->mesh = mesh; splay_insert(mesh->nodes, n); - pthread_mutex_unlock(&(mesh->nodes_mutex)); } void node_del(meshlink_handle_t *mesh, node_t *n) { - pthread_mutex_lock(&(mesh->nodes_mutex)); timeout_del(&mesh->loop, &n->mtutimeout); for splay_each(edge_t, e, n->edge_tree) edge_del(mesh, e); splay_delete(mesh->nodes, n); - pthread_mutex_unlock(&(mesh->nodes_mutex)); } node_t *lookup_node(meshlink_handle_t *mesh, const char *name) { const node_t n = {.name = (char *)name}; node_t *result; - pthread_mutex_lock(&(mesh->nodes_mutex)); result = splay_search(mesh->nodes, &n); - pthread_mutex_unlock(&(mesh->nodes_mutex)); return result; }