mirror of
https://github.com/curl/curl.git
synced 2026-04-12 12:21:42 +08:00
Replace `_beginthreadex()` C runtime calls with native win32 API `CreateThread()`. The latter was already used in `src/tool_doswin.c` and in UWP and Windows CE builds before this patch. After this patch all Windows flavors use it. To drop PP logic and simplify code. While working on this it turned out that `src/tool_doswin.c` calls `TerminateThread()`, which isn't recommended by the documentation, except for "the most extreme cases". This patch makes no attempt to change that code. Ref:9a2663322c#17572 Ref: https://learn.microsoft.com/windows/win32/api/processthreadsapi/nf-processthreadsapi-terminatethread Also: - use `WaitForSingleObjectEx()` on all desktop Windows. Ref:4be80d5109Ref: https://sourceforge.net/p/curl/feature-requests/82/ Ref: https://learn.microsoft.com/windows/win32/api/synchapi/nf-synchapi-waitforsingleobjectex - tests: drop redundant casts. - lib3207: fix to not rely on thread macros when building without thread support. Assisted-by: Jay Satiro Assisted-by: Marcel Raad Assisted-by: Michał Petryka Follow-up to38029101e2#11625 Closes #18451
66 lines
2.5 KiB
C
66 lines
2.5 KiB
C
#ifndef HEADER_CURL_THREADS_H
|
|
#define HEADER_CURL_THREADS_H
|
|
/***************************************************************************
|
|
* _ _ ____ _
|
|
* 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"
|
|
|
|
#ifdef USE_THREADS_POSIX
|
|
# define CURL_THREAD_RETURN_T unsigned int
|
|
# define CURL_STDCALL
|
|
# define curl_mutex_t pthread_mutex_t
|
|
# define curl_thread_t pthread_t *
|
|
# define curl_thread_t_null (pthread_t *)0
|
|
# define Curl_mutex_init(m) pthread_mutex_init(m, NULL)
|
|
# define Curl_mutex_acquire(m) pthread_mutex_lock(m)
|
|
# define Curl_mutex_release(m) pthread_mutex_unlock(m)
|
|
# define Curl_mutex_destroy(m) pthread_mutex_destroy(m)
|
|
#elif defined(USE_THREADS_WIN32)
|
|
# define CURL_THREAD_RETURN_T DWORD
|
|
# define CURL_STDCALL WINAPI
|
|
# define curl_mutex_t CRITICAL_SECTION
|
|
# define curl_thread_t HANDLE
|
|
# define curl_thread_t_null (HANDLE)0
|
|
# if !defined(_WIN32_WINNT) || (_WIN32_WINNT < _WIN32_WINNT_VISTA)
|
|
# define Curl_mutex_init(m) InitializeCriticalSection(m)
|
|
# else
|
|
# define Curl_mutex_init(m) InitializeCriticalSectionEx(m, 0, 1)
|
|
# endif
|
|
# define Curl_mutex_acquire(m) EnterCriticalSection(m)
|
|
# define Curl_mutex_release(m) LeaveCriticalSection(m)
|
|
# define Curl_mutex_destroy(m) DeleteCriticalSection(m)
|
|
#endif
|
|
|
|
#if defined(USE_THREADS_POSIX) || defined(USE_THREADS_WIN32)
|
|
|
|
curl_thread_t Curl_thread_create(CURL_THREAD_RETURN_T
|
|
(CURL_STDCALL *func) (void *), void *arg);
|
|
|
|
void Curl_thread_destroy(curl_thread_t *hnd);
|
|
|
|
int Curl_thread_join(curl_thread_t *hnd);
|
|
|
|
#endif /* USE_THREADS_POSIX || USE_THREADS_WIN32 */
|
|
|
|
#endif /* HEADER_CURL_THREADS_H */
|