summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
af8787d)
- The mesh->nodes tree can be updated by the library thread at any time,
so it must be protected by a mutex or rwlock.
mesh->confbase = xstrdup(confbase);
mesh->name = xstrdup(name);
pthread_mutex_init ( &(mesh->outpacketqueue_mutex), NULL);
mesh->confbase = xstrdup(confbase);
mesh->name = xstrdup(name);
pthread_mutex_init ( &(mesh->outpacketqueue_mutex), NULL);
+ pthread_mutex_init ( &(mesh->nodes_mutex), NULL);
event_loop_init(&mesh->loop);
mesh->loop.data = mesh;
event_loop_init(&mesh->loop);
mesh->loop.data = mesh;
size_t meshlink_get_all_nodes(meshlink_handle_t *mesh, meshlink_node_t **nodes, size_t nmemb) {
size_t i = 0;
size_t meshlink_get_all_nodes(meshlink_handle_t *mesh, meshlink_node_t **nodes, size_t nmemb) {
size_t i = 0;
+ //lock mesh->nodes
+ pthread_mutex_lock(&(mesh->nodes_mutex));
+
for splay_each(node_t, n, mesh->nodes) {
if(i < nmemb)
nodes[i] = (meshlink_node_t *)n;
i++;
}
for splay_each(node_t, n, mesh->nodes) {
if(i < nmemb)
nodes[i] = (meshlink_node_t *)n;
i++;
}
+ pthread_mutex_unlock(&(mesh->nodes_mutex));
+
pthread_t thread;
pthread_mutex_t outpacketqueue_mutex;
pthread_t thread;
pthread_mutex_t outpacketqueue_mutex;
+ pthread_mutex_t nodes_mutex;
event_loop_t loop;
listen_socket_t listen_socket[MAXSOCKETS];
int listen_sockets;
event_loop_t loop;
listen_socket_t listen_socket[MAXSOCKETS];
int listen_sockets;
}
void init_nodes(meshlink_handle_t *mesh) {
}
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);
node_udp_cache = hash_alloc(0x100, sizeof(sockaddr_t));
mesh->nodes = splay_alloc_tree((splay_compare_t) node_compare, (splay_action_t) free_node);
node_udp_cache = hash_alloc(0x100, sizeof(sockaddr_t));
+ pthread_mutex_unlock(&(mesh->nodes_mutex));
}
void exit_nodes(meshlink_handle_t *mesh) {
}
void exit_nodes(meshlink_handle_t *mesh) {
+ pthread_mutex_lock(&(mesh->nodes_mutex));
hash_free(node_udp_cache);
splay_delete_tree(mesh->nodes);
hash_free(node_udp_cache);
splay_delete_tree(mesh->nodes);
+ pthread_mutex_unlock(&(mesh->nodes_mutex));
}
node_t *new_node(void) {
}
node_t *new_node(void) {
}
void node_add(meshlink_handle_t *mesh, 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);
n->mesh = mesh;
splay_insert(mesh->nodes, n);
+ pthread_mutex_unlock(&(mesh->nodes_mutex));
}
void node_del(meshlink_handle_t *mesh, node_t *n) {
}
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);
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, char *name) {
node_t n = {NULL};
}
node_t *lookup_node(meshlink_handle_t *mesh, char *name) {
node_t n = {NULL};
- return splay_search(mesh->nodes, &n);
+ pthread_mutex_lock(&(mesh->nodes_mutex));
+ result = splay_search(mesh->nodes, &n);
+ pthread_mutex_unlock(&(mesh->nodes_mutex));
+
+ return result;
}
node_t *lookup_node_udp(meshlink_handle_t *mesh, const sockaddr_t *sa) {
}
node_t *lookup_node_udp(meshlink_handle_t *mesh, const sockaddr_t *sa) {