mirror of
https://github.com/curl/curl.git
synced 2026-04-13 00:31:41 +08:00
255aac56f9
Move curlx_ functions into its own subdir. The idea is to use the curlx_ prefix proper on these functions, and use these same function names both in tool, lib and test suite source code. Stop the previous special #define setup for curlx_ names. The printf defines are now done for the library alone. Tests no longer use the printf defines. The tool code sets its own defines. The printf functions are not curlx, they are publicly available. The strcase defines are not curlx_ functions and should not be used by tool or server code. dynbuf, warnless, base64, strparse, timeval, timediff are now proper curlx functions. When libcurl is built statically, the functions from the library can be used as-is. The key is then that the functions must work as-is, without having to be recompiled for use in tool/tests. This avoids symbol collisions - when libcurl is built statically, we use those functions directly when building the tool/tests. When libcurl is shared, we build/link them separately for the tool/tests. Assisted-by: Jay Satiro Closes #17253
163 lines
3.9 KiB
C
163 lines
3.9 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 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
|
|
* are also available at https://curl.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
* SPDX-License-Identifier: curl
|
|
*
|
|
***************************************************************************/
|
|
|
|
#include "curl_setup.h"
|
|
|
|
#include <curl/curl.h>
|
|
|
|
#if defined(USE_THREADS_POSIX)
|
|
# ifdef HAVE_PTHREAD_H
|
|
# include <pthread.h>
|
|
# endif
|
|
#elif defined(USE_THREADS_WIN32)
|
|
# include <process.h>
|
|
#endif
|
|
|
|
#include "curl_threads.h"
|
|
#include "curl_memory.h"
|
|
/* The last #include file should be: */
|
|
#include "memdebug.h"
|
|
|
|
#if defined(USE_THREADS_POSIX)
|
|
|
|
struct Curl_actual_call {
|
|
unsigned int (*func)(void *);
|
|
void *arg;
|
|
};
|
|
|
|
static void *curl_thread_create_thunk(void *arg)
|
|
{
|
|
struct Curl_actual_call *ac = arg;
|
|
unsigned int (*func)(void *) = ac->func;
|
|
void *real_arg = ac->arg;
|
|
|
|
free(ac);
|
|
|
|
(*func)(real_arg);
|
|
|
|
return 0;
|
|
}
|
|
|
|
curl_thread_t Curl_thread_create(unsigned int (*func) (void *), void *arg)
|
|
{
|
|
curl_thread_t t = malloc(sizeof(pthread_t));
|
|
struct Curl_actual_call *ac = malloc(sizeof(struct Curl_actual_call));
|
|
if(!(ac && t))
|
|
goto err;
|
|
|
|
ac->func = func;
|
|
ac->arg = arg;
|
|
|
|
if(pthread_create(t, NULL, curl_thread_create_thunk, ac) != 0)
|
|
goto err;
|
|
|
|
return t;
|
|
|
|
err:
|
|
free(t);
|
|
free(ac);
|
|
return curl_thread_t_null;
|
|
}
|
|
|
|
void Curl_thread_destroy(curl_thread_t *hnd)
|
|
{
|
|
if(*hnd != curl_thread_t_null) {
|
|
pthread_detach(**hnd);
|
|
free(*hnd);
|
|
*hnd = curl_thread_t_null;
|
|
}
|
|
}
|
|
|
|
int Curl_thread_join(curl_thread_t *hnd)
|
|
{
|
|
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(
|
|
#if defined(CURL_WINDOWS_UWP) || defined(UNDER_CE)
|
|
DWORD
|
|
#else
|
|
unsigned int
|
|
#endif
|
|
(CURL_STDCALL *func) (void *),
|
|
void *arg)
|
|
{
|
|
#if defined(CURL_WINDOWS_UWP) || defined(UNDER_CE)
|
|
typedef HANDLE curl_win_thread_handle_t;
|
|
#else
|
|
typedef uintptr_t curl_win_thread_handle_t;
|
|
#endif
|
|
curl_thread_t t;
|
|
curl_win_thread_handle_t thread_handle;
|
|
#if defined(CURL_WINDOWS_UWP) || defined(UNDER_CE)
|
|
thread_handle = CreateThread(NULL, 0, func, arg, 0, NULL);
|
|
#else
|
|
thread_handle = _beginthreadex(NULL, 0, func, arg, 0, NULL);
|
|
#endif
|
|
t = (curl_thread_t)thread_handle;
|
|
if((t == 0) || (t == LongToHandle(-1L))) {
|
|
#ifdef UNDER_CE
|
|
DWORD gle = GetLastError();
|
|
/* !checksrc! disable ERRNOVAR 1 */
|
|
int err = (gle == ERROR_ACCESS_DENIED ||
|
|
gle == ERROR_NOT_ENOUGH_MEMORY) ?
|
|
EACCES : EINVAL;
|
|
CURL_SETERRNO(err);
|
|
#endif
|
|
return curl_thread_t_null;
|
|
}
|
|
return t;
|
|
}
|
|
|
|
void Curl_thread_destroy(curl_thread_t *hnd)
|
|
{
|
|
if(*hnd != curl_thread_t_null) {
|
|
CloseHandle(*hnd);
|
|
*hnd = curl_thread_t_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);
|
|
|
|
return ret;
|
|
}
|
|
|
|
#endif /* USE_THREADS_* */
|