diff options
| author | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2016-08-10 13:07:59 +0200 |
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2016-08-10 13:07:59 +0200 |
| commit | 26b20744a441705accbe550aa0b996f8601a9404 (patch) | |
| tree | 9b33b5d1888cd4fb338b57b7b1aa90349668eb8b /src/irmd/irm_flow.c | |
| parent | e5cb8042c9f0c6374c4f14bf7ff3f4fe3cdcd155 (diff) | |
| parent | 9740c4bf2966d57d6f7e0d034a862211cb3814c4 (diff) | |
| download | ouroboros-26b20744a441705accbe550aa0b996f8601a9404.tar.gz ouroboros-26b20744a441705accbe550aa0b996f8601a9404.zip | |
Merged in dstaesse/ouroboros/be-irmd-cleanup (pull request #201)
irmd: Graceful shutdown
Diffstat (limited to 'src/irmd/irm_flow.c')
| -rw-r--r-- | src/irmd/irm_flow.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/irmd/irm_flow.c b/src/irmd/irm_flow.c index bf67f2ce..d9fe3fb3 100644 --- a/src/irmd/irm_flow.c +++ b/src/irmd/irm_flow.c @@ -65,13 +65,10 @@ void irm_flow_destroy(struct irm_flow * f) pthread_cond_signal(&f->state_cond); - pthread_cleanup_push((void (*)(void *)) pthread_mutex_unlock, - (void *) &f->state_lock); - while (f->state != FLOW_NULL) pthread_cond_wait(&f->state_cond, &f->state_lock); - pthread_cleanup_pop(true); + pthread_mutex_unlock(&f->state_lock); pthread_cond_destroy(&f->state_cond); pthread_mutex_destroy(&f->state_lock); |