moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-11 12:05:06 -05:00
Code Issues Releases Wiki Activity

threaded resolver: Use pthread_t * for curl_thread_t

Browse Source 
... since pthread_t may be non-scalar and/or may represent a real thread
with scalar 0.

Bug: http://curl.haxx.se/bug/view.cgi?id=1314
This commit is contained in:
Luke Dashjr 2013-12-24 23:10:42 +00:00 committed by Daniel Stenberg
parent 7fd490732a
commit e8b57d1e84
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/curl_threads.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -63,32 +63,38 @@ static void *curl_thread_create_thunk(void *arg)
curl_thread_t Curl_thread_create(unsigned int (*func) (void*), void *arg) curl_thread_t Curl_thread_create(unsigned int (*func) (void*), void *arg)
{ {
curl_thread_t t; curl_thread_t t = malloc(sizeof(pthread_t));
struct curl_actual_call *ac = malloc(sizeof(struct curl_actual_call)); struct curl_actual_call *ac = malloc(sizeof(struct curl_actual_call));
if(!ac) if(!(ac && t))
return curl_thread_t_null; goto err;
ac->func = func; ac->func = func;
ac->arg = arg; ac->arg = arg;
if(pthread_create(&t, NULL, curl_thread_create_thunk, ac) != 0) { if(pthread_create(t, NULL, curl_thread_create_thunk, ac) != 0)
free(ac); goto err;
return curl_thread_t_null;
}
return t; return t;
err:
free(t);
free(ac);
return curl_thread_t_null;
} }
void Curl_thread_destroy(curl_thread_t hnd) void Curl_thread_destroy(curl_thread_t hnd)
{ {
if(hnd != curl_thread_t_null) if(hnd != curl_thread_t_null) {
pthread_detach(hnd); pthread_detach(*hnd);
free(hnd);
}
} }
int Curl_thread_join(curl_thread_t *hnd) int Curl_thread_join(curl_thread_t *hnd)
{ {
int ret = (pthread_join(*hnd, NULL) == 0); int ret = (pthread_join(**hnd, NULL) == 0);
free(*hnd);
*hnd = curl_thread_t_null; *hnd = curl_thread_t_null;
return ret; return ret;

4
lib/curl_threads.h
View File

@ -26,8 +26,8 @@
#if defined(USE_THREADS_POSIX) #if defined(USE_THREADS_POSIX)
# define CURL_STDCALL # define CURL_STDCALL
# define curl_mutex_t pthread_mutex_t # define curl_mutex_t pthread_mutex_t
# define curl_thread_t pthread_t # define curl_thread_t pthread_t *
# define curl_thread_t_null (pthread_t)0 # define curl_thread_t_null (pthread_t *)0
# define Curl_mutex_init(m) pthread_mutex_init(m, NULL) # define Curl_mutex_init(m) pthread_mutex_init(m, NULL)
# define Curl_mutex_acquire(m) pthread_mutex_lock(m) # define Curl_mutex_acquire(m) pthread_mutex_lock(m)
# define Curl_mutex_release(m) pthread_mutex_unlock(m) # define Curl_mutex_release(m) pthread_mutex_unlock(m)