luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

asyn-thread: avoid the separate curl_mutex_t alloc

Browse Source 
Just make it a part of the thread_sync_data struct.

Closes #16323
This commit is contained in:
Daniel Stenberg 2025-02-06 17:22:36 +01:00
parent b4538ec522
commit 2ee754d830
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/asyn-thread.c
View File

@ -158,10 +158,7 @@ static struct thread_sync_data *conn_thread_sync_data(struct Curl_easy *data)
static
void destroy_thread_sync_data(struct thread_sync_data *tsd)
{
if(tsd->mtx) {
Curl_mutex_destroy(tsd->mtx);
free(tsd->mtx);
}
Curl_mutex_destroy(&tsd->mutx);
free(tsd->hostname);
@ -206,11 +203,7 @@ int init_thread_sync_data(struct thread_data *td,
(void) hints;
#endif
tsd->mtx = malloc(sizeof(curl_mutex_t));
if(!tsd->mtx)
goto err_exit;
Curl_mutex_init(tsd->mtx);
Curl_mutex_init(&tsd->mutx);
#ifndef CURL_DISABLE_SOCKETPAIR
/* create socket pair or pipe */
@ -291,10 +284,10 @@ CURL_STDCALL getaddrinfo_thread(void *arg)
Curl_addrinfo_set_port(tsd->res, tsd->port);
}
Curl_mutex_acquire(tsd->mtx);
Curl_mutex_acquire(&tsd->mutx);
if(tsd->done) {
/* too late, gotta clean up the mess */
Curl_mutex_release(tsd->mtx);
Curl_mutex_release(&tsd->mutx);
destroy_thread_sync_data(tsd);
}
else {
@ -313,7 +306,7 @@ CURL_STDCALL getaddrinfo_thread(void *arg)
}
#endif
tsd->done = TRUE;
Curl_mutex_release(tsd->mtx);
Curl_mutex_release(&tsd->mutx);
}
return 0;
@ -382,10 +375,10 @@ static void destroy_async_data(struct Curl_easy *data)
* if the thread is still blocking in the resolve syscall, detach it and
* let the thread do the cleanup...
*/
Curl_mutex_acquire(td->tsd.mtx);
Curl_mutex_acquire(&td->tsd.mutx);
done = td->tsd.done;
td->tsd.done = TRUE;
Curl_mutex_release(td->tsd.mtx);
Curl_mutex_release(&td->tsd.mutx);
if(!done) {
Curl_thread_destroy(td->thread_hnd);
@ -588,9 +581,9 @@ CURLcode Curl_resolver_is_resolved(struct Curl_easy *data,
return CURLE_UNRECOVERABLE_POLL;
#endif
Curl_mutex_acquire(td->tsd.mtx);
Curl_mutex_acquire(&td->tsd.mutx);
done = td->tsd.done;
Curl_mutex_release(td->tsd.mtx);
Curl_mutex_release(&td->tsd.mutx);
if(done) {
getaddrinfo_complete(data);

2
lib/asyn.h
View File

@ -39,9 +39,9 @@ struct Curl_dns_entry;
/* Data for synchronization between resolver thread and its parent */
struct thread_sync_data {
curl_mutex_t *mtx;
char *hostname; /* hostname to resolve, Curl_async.hostname
duplicate */
curl_mutex_t mutx;
#ifndef CURL_DISABLE_SOCKETPAIR
curl_socket_t sock_pair[2]; /* eventfd/pipes/socket pair */
#endif