* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+
+#include "curl_setup.h"
#if defined(USE_THREADS_POSIX)
# ifdef HAVE_PTHREAD_H
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));
- if(!ac)
- return curl_thread_t_null;
+ if(!(ac && t))
+ goto err;
ac->func = func;
ac->arg = arg;
- if(pthread_create(&t, NULL, curl_thread_create_thunk, ac) != 0) {
- free(ac);
- return curl_thread_t_null;
- }
+ if(pthread_create(t, NULL, curl_thread_create_thunk, ac) != 0)
+ goto err;
return t;
+
+err:
+ Curl_safefree(t);
+ Curl_safefree(ac);
+ return curl_thread_t_null;
}
void Curl_thread_destroy(curl_thread_t hnd)
{
- if(hnd != curl_thread_t_null)
- pthread_detach(hnd);
+ if(hnd != curl_thread_t_null) {
+ pthread_detach(*hnd);
+ free(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;
return ret;
#elif defined(USE_THREADS_WIN32)
-curl_thread_t Curl_thread_create(unsigned int (CURL_STDCALL *func) (void*), void *arg)
+curl_thread_t Curl_thread_create(unsigned int (CURL_STDCALL *func) (void*),
+ void *arg)
{
#ifdef _WIN32_WCE
return CreateThread(NULL, 0, func, arg, 0, NULL);
int Curl_thread_join(curl_thread_t *hnd)
{
+#if !defined(_WIN32_WINNT) || !defined(_WIN32_WINNT_VISTA) || \
+ (_WIN32_WINNT < _WIN32_WINNT_VISTA)
int ret = (WaitForSingleObject(*hnd, INFINITE) == WAIT_OBJECT_0);
+#else
+ int ret = (WaitForSingleObjectEx(*hnd, INFINITE, FALSE) == WAIT_OBJECT_0);
+#endif
Curl_thread_destroy(*hnd);