diff options
| author | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2016-08-04 18:08:32 +0200 |
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2016-08-04 18:08:32 +0200 |
| commit | d5b71449bc18116444720257ba640e3c597ff6e9 (patch) | |
| tree | e2fca06805ca406607402c7206ea14ae17611d82 /src/irmd/main.c | |
| parent | 51bb7c6f315dba4044eb2ece5c1312362674d7fb (diff) | |
| parent | 25c356b9ba9d91b4a291e3adad050d8ea85eb3e2 (diff) | |
| download | ouroboros-d5b71449bc18116444720257ba640e3c597ff6e9.tar.gz ouroboros-d5b71449bc18116444720257ba640e3c597ff6e9.zip | |
Merged in dstaesse/ouroboros/be-bugfixing (pull request #186)
Be bugfixing
Diffstat (limited to 'src/irmd/main.c')
| -rw-r--r-- | src/irmd/main.c | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/src/irmd/main.c b/src/irmd/main.c index 1c731788..69ce765c 100644 --- a/src/irmd/main.c +++ b/src/irmd/main.c @@ -151,11 +151,13 @@ static void irm_flow_destroy(struct irm_flow * e) if (e->state == FLOW_PENDING) e->state = FLOW_DESTROY; + else + e->state = FLOW_NULL; pthread_cond_signal(&e->state_cond); pthread_mutex_unlock(&e->state_lock); - pthread_cleanup_push((void(*)(void *)) pthread_mutex_unlock, + pthread_cleanup_push((void (*)(void *)) pthread_mutex_unlock, (void *) &e->state_lock); while (e->state != FLOW_NULL) @@ -655,15 +657,15 @@ static int ap_reg(char * name, LOG_ERR("Could not register %s in DIF %s.", name, e->dif_name); } else { - if(registry_add_name_to_dif(&irmd->registry, - name, - e->dif_name, - e->type) < 0) + if (registry_add_name_to_dif(&irmd->registry, + name, + e->dif_name, + e->type) < 0) LOG_WARN("Registered unbound name %s. " "Registry may be inconsistent", name); - LOG_INFO("Registered %s in %s %d.", - name, e->dif_name, e->type); + LOG_INFO("Registered %s in %s.", + name, e->dif_name); ++ret; } } @@ -942,6 +944,14 @@ static struct irm_flow * flow_alloc(pid_t api, return pme; } +static void cleanup_alloc_res(void * o) +{ + struct irm_flow * e = (struct irm_flow *) o; + if (e->state == FLOW_PENDING) + e->state = FLOW_NULL; + pthread_mutex_unlock(&e->state_lock); +} + static int flow_alloc_res(int port_id) { struct irm_flow * e; @@ -979,8 +989,7 @@ static int flow_alloc_res(int port_id) pthread_rwlock_unlock(&irmd->state_lock); pthread_mutex_lock(&e->state_lock); - pthread_cleanup_push((void(*)(void *))pthread_mutex_unlock, - (void*) &e->state_lock); + pthread_cleanup_push(cleanup_alloc_res, (void *) e); while (e->state == FLOW_PENDING) pthread_cond_wait(&e->state_cond, &e->state_lock); @@ -1035,7 +1044,7 @@ static int flow_dealloc(int port_id) pthread_rwlock_unlock(&irmd->state_lock); - free(e); + irm_flow_destroy(e); return ret; } @@ -1147,7 +1156,7 @@ static struct irm_flow * flow_req_arr(pid_t api, pthread_rwlock_unlock(&irmd->reg_lock); pthread_mutex_lock(&rne->state_lock); - pthread_cleanup_push((void(*)(void *)) pthread_mutex_unlock, + pthread_cleanup_push((void (*)(void *)) pthread_mutex_unlock, (void *) &rne->state_lock); while (rne->state == REG_NAME_AUTO_EXEC) @@ -1203,7 +1212,7 @@ static struct irm_flow * flow_req_arr(pid_t api, pthread_rwlock_unlock(&irmd->state_lock); - pthread_cleanup_push((void(*)(void *)) pthread_mutex_unlock, + pthread_cleanup_push((void (*)(void *)) pthread_mutex_unlock, (void *) &rne->state_lock); while (rne->state == REG_NAME_FLOW_ARRIVED && @@ -1268,7 +1277,7 @@ static int flow_dealloc_ipcp(int port_id) pthread_rwlock_unlock(&irmd->flows_lock); pthread_rwlock_unlock(&irmd->state_lock); - free(e); + irm_flow_destroy(e); return 0; } @@ -1425,6 +1434,7 @@ void * irm_flow_cleaner() if (n_rb != NULL) shm_ap_rbuff_destroy(n_rb); irm_flow_destroy(e); + continue; } if (kill(e->n_1_api, 0) < 0) { struct shm_ap_rbuff * n_1_rb = @@ -1464,7 +1474,7 @@ void * irm_flow_cleaner() } } -void clean_msg(void * msg) +static void clean_msg(void * msg) { irm_msg__free_unpacked(msg, NULL); } |