diff options
Diffstat (limited to 'lib/thread.c')
| -rw-r--r-- | lib/thread.c | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/lib/thread.c b/lib/thread.c index 898e9e9fce..52bc79ffe6 100644 --- a/lib/thread.c +++ b/lib/thread.c @@ -36,6 +36,7 @@ DEFINE_MTYPE_STATIC(LIB, THREAD, "Thread") DEFINE_MTYPE_STATIC(LIB, THREAD_MASTER, "Thread master") +DEFINE_MTYPE_STATIC(LIB, THREAD_POLL, "Thread Poll Info") DEFINE_MTYPE_STATIC(LIB, THREAD_STATS, "Thread stats") #if defined(__APPLE__) @@ -423,19 +424,11 @@ struct thread_master *thread_master_create(const char *name) /* Initialize I/O task data structures */ getrlimit(RLIMIT_NOFILE, &limit); rv->fd_limit = (int)limit.rlim_cur; - rv->read = - XCALLOC(MTYPE_THREAD, sizeof(struct thread *) * rv->fd_limit); - if (rv->read == NULL) { - XFREE(MTYPE_THREAD_MASTER, rv); - return NULL; - } - rv->write = - XCALLOC(MTYPE_THREAD, sizeof(struct thread *) * rv->fd_limit); - if (rv->write == NULL) { - XFREE(MTYPE_THREAD, rv->read); - XFREE(MTYPE_THREAD_MASTER, rv); - return NULL; - } + rv->read = XCALLOC(MTYPE_THREAD_POLL, + sizeof(struct thread *) * rv->fd_limit); + + rv->write = XCALLOC(MTYPE_THREAD_POLL, + sizeof(struct thread *) * rv->fd_limit); rv->cpu_record = hash_create_size( 8, (unsigned int (*)(void *))cpu_record_hash_key, @@ -539,17 +532,23 @@ static struct thread *thread_trim_head(struct thread_list *list) return NULL; } +#define THREAD_UNUSED_DEPTH 10 + /* Move thread to unuse list. */ static void thread_add_unuse(struct thread_master *m, struct thread *thread) { assert(m != NULL && thread != NULL); assert(thread->next == NULL); assert(thread->prev == NULL); - thread->ref = NULL; - thread->type = THREAD_UNUSED; thread->hist->total_active--; - thread_list_add(&m->unuse, thread); + memset(thread, 0, sizeof(struct thread)); + thread->type = THREAD_UNUSED; + + if (m->unuse.count < THREAD_UNUSED_DEPTH) + thread_list_add(&m->unuse, thread); + else + XFREE(MTYPE_THREAD, thread); } /* Free all unused thread. */ @@ -580,7 +579,7 @@ static void thread_array_free(struct thread_master *m, m->alloc--; } } - XFREE(MTYPE_THREAD, thread_array); + XFREE(MTYPE_THREAD_POLL, thread_array); } static void thread_queue_free(struct thread_master *m, struct pqueue *queue) @@ -1182,17 +1181,19 @@ void thread_cancel_event(struct thread_master *master, void *arg) */ void thread_cancel(struct thread *thread) { - assert(thread->master->owner == pthread_self()); + struct thread_master *master = thread->master; + + assert(master->owner == pthread_self()); - pthread_mutex_lock(&thread->master->mtx); + pthread_mutex_lock(&master->mtx); { struct cancel_req *cr = XCALLOC(MTYPE_TMP, sizeof(struct cancel_req)); cr->thread = thread; - listnode_add(thread->master->cancel_req, cr); - do_thread_cancel(thread->master); + listnode_add(master->cancel_req, cr); + do_thread_cancel(master); } - pthread_mutex_unlock(&thread->master->mtx); + pthread_mutex_unlock(&master->mtx); } /** |