diff options
| author | Daniel Walton <dwalton76@gmail.com> | 2017-09-27 09:21:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-27 09:21:26 -0400 |
| commit | 66b8ce1a170be6a719ec8c057ff695f6034f41f1 (patch) | |
| tree | 5363b57fa73724d50934c1e40c93cb23468f852a /lib/thread.c | |
| parent | 2a67b9150a9b5c3c31673018cc6ff64275f8cc10 (diff) | |
| parent | f5129394ecdb0e2c30e280b577f815f612ab1fe0 (diff) | |
Merge branch 'master' into bgpd-debug-updates-prefix
Diffstat (limited to 'lib/thread.c')
| -rw-r--r-- | lib/thread.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/thread.c b/lib/thread.c index d8be32e2bd..a69bd2f0d5 100644 --- a/lib/thread.c +++ b/lib/thread.c @@ -567,9 +567,11 @@ void thread_master_free(struct thread_master *m) thread_list_free(m, &m->ready); thread_list_free(m, &m->unuse); pthread_mutex_destroy(&m->mtx); + pthread_cond_destroy(&m->cancel_cond); close(m->io_pipe[0]); close(m->io_pipe[1]); list_delete(m->cancel_req); + m->cancel_req = NULL; hash_clean(m->cpu_record, cpu_record_hash_free); hash_free(m->cpu_record); |