mirror of
https://github.com/curl/curl.git
synced 2026-04-13 12:41: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
160 lines
4.7 KiB
C
160 lines
4.7 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 "first.h"
|
|
|
|
#define NUM_THREADS 100
|
|
|
|
#ifdef _WIN32
|
|
static DWORD WINAPI t3026_run_thread(void *ptr)
|
|
{
|
|
CURLcode *result = ptr;
|
|
|
|
*result = curl_global_init(CURL_GLOBAL_ALL);
|
|
if(*result == CURLE_OK)
|
|
curl_global_cleanup();
|
|
|
|
return 0;
|
|
}
|
|
|
|
static CURLcode test_lib3026(const char *URL)
|
|
{
|
|
CURLcode results[NUM_THREADS];
|
|
HANDLE thread_handles[NUM_THREADS];
|
|
unsigned tid_count = NUM_THREADS, i;
|
|
CURLcode test_failure = CURLE_OK;
|
|
curl_version_info_data *ver;
|
|
(void)URL;
|
|
|
|
ver = curl_version_info(CURLVERSION_NOW);
|
|
if((ver->features & CURL_VERSION_THREADSAFE) == 0) {
|
|
curl_mfprintf(stderr, "%s:%d On Windows but the "
|
|
"CURL_VERSION_THREADSAFE feature flag is not set\n",
|
|
__FILE__, __LINE__);
|
|
return TEST_ERR_MAJOR_BAD;
|
|
}
|
|
|
|
for(i = 0; i < tid_count; i++) {
|
|
HANDLE th;
|
|
results[i] = CURL_LAST; /* initialize with invalid value */
|
|
th = CreateThread(NULL, 0, t3026_run_thread, &results[i], 0, NULL);
|
|
if(!th) {
|
|
curl_mfprintf(stderr, "%s:%d Couldn't create thread, errno %lu\n",
|
|
__FILE__, __LINE__, GetLastError());
|
|
tid_count = i;
|
|
test_failure = TEST_ERR_MAJOR_BAD;
|
|
goto cleanup;
|
|
}
|
|
thread_handles[i] = th;
|
|
}
|
|
|
|
cleanup:
|
|
for(i = 0; i < tid_count; i++) {
|
|
WaitForSingleObject(thread_handles[i], INFINITE);
|
|
CloseHandle(thread_handles[i]);
|
|
if(results[i] != CURLE_OK) {
|
|
curl_mfprintf(stderr, "%s:%d thread[%u]: curl_global_init() failed,"
|
|
"with code %d (%s)\n", __FILE__, __LINE__,
|
|
i, results[i], curl_easy_strerror(results[i]));
|
|
test_failure = TEST_ERR_MAJOR_BAD;
|
|
}
|
|
}
|
|
|
|
return test_failure;
|
|
}
|
|
|
|
#elif defined(HAVE_PTHREAD_H)
|
|
#include <pthread.h>
|
|
|
|
static void *t3026_run_thread(void *ptr)
|
|
{
|
|
CURLcode *result = ptr;
|
|
|
|
*result = curl_global_init(CURL_GLOBAL_ALL);
|
|
if(*result == CURLE_OK)
|
|
curl_global_cleanup();
|
|
|
|
return NULL;
|
|
}
|
|
|
|
static CURLcode test_lib3026(const char *URL)
|
|
{
|
|
CURLcode results[NUM_THREADS];
|
|
pthread_t tids[NUM_THREADS];
|
|
unsigned tid_count = NUM_THREADS, i;
|
|
CURLcode test_failure = CURLE_OK;
|
|
curl_version_info_data *ver;
|
|
(void)URL;
|
|
|
|
ver = curl_version_info(CURLVERSION_NOW);
|
|
if((ver->features & CURL_VERSION_THREADSAFE) == 0) {
|
|
curl_mfprintf(stderr, "%s:%d Have pthread but the "
|
|
"CURL_VERSION_THREADSAFE feature flag is not set\n",
|
|
__FILE__, __LINE__);
|
|
return TEST_ERR_MAJOR_BAD;
|
|
}
|
|
|
|
for(i = 0; i < tid_count; i++) {
|
|
int res;
|
|
results[i] = CURL_LAST; /* initialize with invalid value */
|
|
res = pthread_create(&tids[i], NULL, t3026_run_thread, &results[i]);
|
|
if(res) {
|
|
curl_mfprintf(stderr, "%s:%d Couldn't create thread, errno %d\n",
|
|
__FILE__, __LINE__, res);
|
|
tid_count = i;
|
|
test_failure = TEST_ERR_MAJOR_BAD;
|
|
goto cleanup;
|
|
}
|
|
}
|
|
|
|
cleanup:
|
|
for(i = 0; i < tid_count; i++) {
|
|
pthread_join(tids[i], NULL);
|
|
if(results[i] != CURLE_OK) {
|
|
curl_mfprintf(stderr, "%s:%d thread[%u]: curl_global_init() failed,"
|
|
"with code %d (%s)\n", __FILE__, __LINE__,
|
|
i, results[i], curl_easy_strerror(results[i]));
|
|
test_failure = TEST_ERR_MAJOR_BAD;
|
|
}
|
|
}
|
|
|
|
return test_failure;
|
|
}
|
|
|
|
#else /* without pthread or Windows, this test doesn't work */
|
|
static CURLcode test_lib3026(const char *URL)
|
|
{
|
|
curl_version_info_data *ver;
|
|
(void)URL;
|
|
|
|
ver = curl_version_info(CURLVERSION_NOW);
|
|
if((ver->features & CURL_VERSION_THREADSAFE) != 0) {
|
|
curl_mfprintf(stderr, "%s:%d No pthread but the "
|
|
"CURL_VERSION_THREADSAFE feature flag is set\n",
|
|
__FILE__, __LINE__);
|
|
return TEST_ERR_MAJOR_BAD;
|
|
}
|
|
return CURLE_OK;
|
|
}
|
|
#endif
|