curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-01 18:05:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

asyn-thrdd: addressing stalls in ci

Browse Source 
Disable pthread_cancel in pushed cleanup function. Close wakeup socket
when shutting down resolving, since we no longer want wakeups.

Closes #18339
This commit is contained in:
Stefan Eissing 2025-08-21 14:51:29 +02:00 committed by Daniel Stenberg
parent 0630e66cb4
commit b63cce7fee
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/asyn-thrdd.c
View File

@ -237,6 +237,7 @@ err_exit:
static void async_thrd_cleanup(void *arg) static void async_thrd_cleanup(void *arg)
{ {
struct async_thrdd_addr_ctx *addr_ctx = arg; struct async_thrdd_addr_ctx *addr_ctx = arg;
Curl_thread_disable_cancel();
addr_ctx_unlink(&addr_ctx, NULL); addr_ctx_unlink(&addr_ctx, NULL);
} }
@ -380,14 +381,15 @@ static void async_thrdd_destroy(struct Curl_easy *data)
Curl_mutex_acquire(&addr->mutx); Curl_mutex_acquire(&addr->mutx);
done = (addr->ref_count <= 1); done = (addr->ref_count <= 1);
Curl_mutex_release(&addr->mutx); Curl_mutex_release(&addr->mutx);
CURL_TRC_DNS(data, "resolve, destroy async data, shared ref=%d", if(done) {
addr->ref_count);
if(done)
Curl_thread_join(&addr->thread_hnd); Curl_thread_join(&addr->thread_hnd);
CURL_TRC_DNS(data, "async_thrdd_destroy, thread joined");
}
else { else {
/* thread is still running. Detach the thread while mutexed, it will /* thread is still running. Detach the thread while mutexed, it will
* trigger the cleanup when it releases its reference. */ * trigger the cleanup when it releases its reference. */
Curl_thread_destroy(&addr->thread_hnd); Curl_thread_destroy(&addr->thread_hnd);
CURL_TRC_DNS(data, "async_thrdd_destroy, thread detached");
} }
} }
addr_ctx_unlink(&thrdd->addr, data); addr_ctx_unlink(&thrdd->addr, data);
@ -536,7 +538,14 @@ static void async_thrdd_shutdown(struct Curl_easy *data)
Curl_mutex_acquire(&addr_ctx->mutx); Curl_mutex_acquire(&addr_ctx->mutx);
done = (addr_ctx->ref_count <= 1); done = (addr_ctx->ref_count <= 1);
/* We are no longer interested in wakeups */
if(addr_ctx->sock_pair[1] != CURL_SOCKET_BAD) {
wakeup_close(addr_ctx->sock_pair[1]);
addr_ctx->sock_pair[1] = CURL_SOCKET_BAD;
}
Curl_mutex_release(&addr_ctx->mutx); Curl_mutex_release(&addr_ctx->mutx);
DEBUGASSERT(addr_ctx->thread_hnd != curl_thread_t_null);
if(!done) { if(!done) {
CURL_TRC_DNS(data, "attempt to cancel resolve thread"); CURL_TRC_DNS(data, "attempt to cancel resolve thread");
(void)Curl_thread_cancel(&addr_ctx->thread_hnd); (void)Curl_thread_cancel(&addr_ctx->thread_hnd);