d064bc2adb
Daniel Stenberg
2026-08-12
Subject
thrdqueue: drop name strdups from Curl_thrdq_create
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
lib/thrdpool.c+4 -5
| @@ -50,7 +50,7 @@ struct thrdslot { | |
| }; | |
| struct curl_thrdpool { | |
| - | char *name; |
| + | const char *name; |
| uint64_t refcount; | |
| curl_mutex_t lock; | |
| curl_cond_t await; | |
| @@ -236,7 +236,6 @@ static bool thrdpool_unlink(struct curl_thrdpool *tpool, bool locked) | |
| thrdpool_join_zombies(tpool); | |
| if(locked) | |
| Curl_mutex_release(&tpool->lock); | |
| - | curlx_free(tpool->name); |
| Curl_cond_destroy(&tpool->await); | |
| Curl_mutex_destroy(&tpool->lock); | |
| curlx_free(tpool); | |
| @@ -312,6 +311,7 @@ CURLcode Curl_thrdpool_create(struct curl_thrdpool **ptpool, | |
| { | |
| struct curl_thrdpool *tpool; | |
| CURLcode result = CURLE_OUT_OF_MEMORY; | |
| + | DEBUGASSERT(name); |
| tpool = curlx_calloc(1, sizeof(*tpool)); | |
| if(!tpool) | |
| @@ -327,9 +327,8 @@ CURLcode Curl_thrdpool_create(struct curl_thrdpool **ptpool, | |
| tpool->fn_return = fn_return; | |
| tpool->fn_user_data = user_data; | |
| - | tpool->name = curlx_strdup(name); |
| - | if(!tpool->name) |
| - | goto out; |
| + | /* a const string that remains */ |
| + | tpool->name = name; |
| #ifdef DEBUGBUILD | |
| { | |
lib/thrdqueue.c+4 -5
| @@ -37,7 +37,7 @@ | |
| struct curl_thrdq { | |
| - | char *name; |
| + | const char *name; |
| curl_mutex_t lock; | |
| curl_cond_t await; | |
| struct Curl_llist sendq; | |
| @@ -187,7 +187,6 @@ static void thrdq_unlink(struct curl_thrdq *tqueue, bool locked, bool join) | |
| Curl_llist_destroy(&tqueue->sendq, NULL); | |
| Curl_llist_destroy(&tqueue->recvq, NULL); | |
| - | curlx_free(tqueue->name); |
| Curl_cond_destroy(&tqueue->await); | |
| if(locked) | |
| Curl_mutex_release(&tqueue->lock); | |
| @@ -207,6 +206,7 @@ CURLcode Curl_thrdq_create(struct curl_thrdq **ptqueue, | |
| { | |
| struct curl_thrdq *tqueue; | |
| CURLcode result = CURLE_OUT_OF_MEMORY; | |
| + | DEBUGASSERT(name); |
| tqueue = curlx_calloc(1, sizeof(*tqueue)); | |
| if(!tqueue) | |
| @@ -221,9 +221,8 @@ CURLcode Curl_thrdq_create(struct curl_thrdq **ptqueue, | |
| tqueue->fn_event = fn_event; | |
| tqueue->fn_user_data = user_data; | |
| - | tqueue->name = curlx_strdup(name); |
| - | if(!tqueue->name) |
| - | goto out; |
| + | /* a const string that remains */ |
| + | tqueue->name = name; |
| result = Curl_thrdpool_create(&tqueue->tpool, name, | |
| min_threads, max_threads, idle_time_ms, | |