upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-06-08 16:22:09 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#8901 tpool: use joinable threads instead of detached

Browse source 
When tearing down the threadpool we need to wait for the last
thread to actually exit, before returning. We can only wait
for a thread if it's joinable. For all the threads besides
the last one, we detach before exiting because we don't care
about waiting for them.
This commit is contained in:
Howard Chu 2026-05-30 15:36:01 +01:00 committed by Quanah Gibson-Mount
parent 23c07757b2
commit 5be6295e53
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
libraries/libldap/tpool.c
View file

@ -132,6 +132,9 @@ struct ldap_int_thread_poolq_s {
int ltp_active_count; /* Active, not paused/idle tasks */
int ltp_open_count; /* Number of threads */
int ltp_starting; /* Currently starting threads */
int ltp_last_valid; /* ltp_last was set */
ldap_pvt_thread_t ltp_last; /* Last thread to exit */
};
struct ldap_int_thread_pool_s {
@ -433,7 +436,7 @@ ldap_pvt_thread_pool_submit2 (
pq->ltp_open_count++;
if (0 != ldap_pvt_thread_create(
&thr, 1, ldap_int_thread_pool_wrapper, pq))
&thr, 0, ldap_int_thread_pool_wrapper, pq))
{
/* couldn't create thread. back out of
* ltp_open_count and check for even worse things.
@ -894,6 +897,10 @@ ldap_pvt_thread_pool_close ( ldap_pvt_thread_pool_t *tpool, int run_pending )
LDAP_SLIST_REMOVE_HEAD(&pq->ltp_free_list, ltt_next.l);
LDAP_FREE(task);
}
if (pq->ltp_last_valid) {
pq->ltp_last_valid = 0;
ldap_pvt_thread_join(pq->ltp_last, NULL);
}
ldap_pvt_thread_mutex_unlock(&pq->ltp_mutex);
}
@ -1074,11 +1081,17 @@ ldap_int_thread_pool_wrapper (
pq->ltp_open_count--;
if (pq->ltp_open_count == 0) {
if (pool->ltp_finishing)
if (pool->ltp_finishing) {
/* let pool_destroy know we're all done */
pq->ltp_last = ctx.ltu_id;
pq->ltp_last_valid = 1;
ldap_pvt_thread_cond_signal(&pq->ltp_cond);
else
} else {
ldap_pvt_thread_detach(ctx.ltu_id);
freeme = 1;
}
} else {
ldap_pvt_thread_detach(ctx.ltu_id);
}
if (pool_lock)