mirror of
https://github.com/curl/curl.git
synced 2026-04-19 12:01:14 +03:00
Before this patch curl used the C preprocessor to override standard memory allocation symbols: malloc, calloc, strdup, realloc, free. The goal of these is to replace them with curl's debug wrappers in `CURLDEBUG` builds, another was to replace them with the wrappers calling user-defined allocators in libcurl. This solution needed a bunch of workarounds to avoid breaking external headers: it relied on include order to do the overriding last. For "unity" builds it needed to reset overrides before external includes. Also in test apps, which are always built as single source files. It also needed the `(symbol)` trick to avoid overrides in some places. This would still not fix cases where the standard symbols were macros. It was also fragile and difficult to figure out which was the actual function behind an alloc or free call in a specific piece of code. This in turn caused bugs where the wrong allocator was accidentally called. To avoid these problems, this patch replaces this solution with `curlx_`-prefixed allocator macros, and mapping them _once_ to either the libcurl wrappers, the debug wrappers or the standard ones, matching the rest of the code in libtests. This concludes the long journey to avoid redefining standard functions in the curl codebase. Note: I did not update `packages/OS400/*.c` sources. They did not `#include` `curl_setup.h`, `curl_memory.h` or `memdebug.h`, meaning the overrides were never applied to them. This may or may not have been correct. For now I suppressed the direct use of standard allocators via a local `.checksrc`. Probably they (except for `curlcl.c`) should be updated to include `curl_setup.h` and use the `curlx_` macros. This patch changes mappings in two places: - `lib/curl_threads.c` in libtests: Before this patch it mapped to libcurl allocators. After, it maps to standard allocators, like the rest of libtests code. - `units`: before this patch it mapped to standard allocators. After, it maps to libcurl allocators. Also: - drop all position-dependent `curl_memory.h` and `memdebug.h` includes, and delete the now unnecessary headers. - rename `Curl_tcsdup` macro to `curlx_tcsdup` and define like the other allocators. - map `curlx_strdup()` to `_strdup()` on Windows (was: `strdup()`). To fix warnings silenced via `_CRT_NONSTDC_NO_DEPRECATE`. - multibyte: map `curlx_convert_*()` to `_strdup()` on Windows (was: `strdup()`). - src: do not reuse the `strdup` name for the local replacement. - lib509: call `_strdup()` on Windows (was: `strdup()`). - test1132: delete test obsoleted by this patch. - CHECKSRC.md: update text for `SNPRINTF`. - checksrc: ban standard allocator symbols. Follow-up tob12da22db1#18866 Follow-up todb98daab05#18844 Follow-up to4deea9396b#18814 Follow-up to9678ff5b1b#18776 Follow-up to10bac43b87#18774 Follow-up to20142f5d06#18634 Follow-up tobf7375ecc5#18503 Follow-up to9863599d69#18502 Follow-up to3bb5e58c10#17827 Closes #19626
170 lines
5 KiB
C
170 lines
5 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
|
|
*
|
|
***************************************************************************/
|
|
/*
|
|
* This code sets up multiple easy handles that transfer a single file from
|
|
* the same URL, in a serial manner after each other. Due to the connection
|
|
* sharing within the multi handle all transfers are performed on the same
|
|
* persistent connection.
|
|
*
|
|
* This source code is used for test526, test527 and test532 with branches
|
|
* controlling the small differences.
|
|
*
|
|
* - test526 closes all easy handles after
|
|
* they all have transferred the file over the single connection
|
|
* - test527 closes each easy handle after each single transfer.
|
|
* - test532 uses only a single easy handle that is removed, reset and then
|
|
* re-added for each transfer
|
|
*
|
|
* Test case 526, 527 and 532 use FTP, while test 528 uses the lib526 tool but
|
|
* with HTTP.
|
|
*/
|
|
|
|
#include "first.h"
|
|
|
|
static CURLcode test_lib526(const char *URL)
|
|
{
|
|
CURLcode res = CURLE_OK;
|
|
CURL *curl[NUM_HANDLES];
|
|
int running;
|
|
CURLM *multi = NULL;
|
|
size_t current = 0;
|
|
size_t i;
|
|
|
|
for(i = 0; i < CURL_ARRAYSIZE(curl); i++)
|
|
curl[i] = NULL;
|
|
|
|
start_test_timing();
|
|
|
|
global_init(CURL_GLOBAL_ALL);
|
|
|
|
/* get each easy handle */
|
|
for(i = 0; i < CURL_ARRAYSIZE(curl); i++) {
|
|
easy_init(curl[i]);
|
|
/* specify target */
|
|
easy_setopt(curl[i], CURLOPT_URL, URL);
|
|
/* go verbose */
|
|
easy_setopt(curl[i], CURLOPT_VERBOSE, 1L);
|
|
}
|
|
|
|
multi_init(multi);
|
|
|
|
multi_add_handle(multi, curl[current]);
|
|
|
|
curl_mfprintf(stderr, "Start at URL 0\n");
|
|
|
|
for(;;) {
|
|
struct timeval interval;
|
|
fd_set rd, wr, exc;
|
|
int maxfd = -99;
|
|
|
|
interval.tv_sec = 1;
|
|
interval.tv_usec = 0;
|
|
|
|
multi_perform(multi, &running);
|
|
|
|
abort_on_test_timeout();
|
|
|
|
if(!running) {
|
|
if(testnum == 527) {
|
|
/* NOTE: this code does not remove the handle from the multi handle
|
|
here, which would be the nice, sane and documented way of working.
|
|
This however tests that the API survives this abuse gracefully. */
|
|
curl_easy_cleanup(curl[current]);
|
|
curl[current] = NULL;
|
|
}
|
|
if(++current < CURL_ARRAYSIZE(curl)) {
|
|
curl_mfprintf(stderr, "Advancing to URL %zu\n", current);
|
|
if(testnum == 532) {
|
|
/* first remove the only handle we use */
|
|
curl_multi_remove_handle(multi, curl[0]);
|
|
|
|
/* make us reuse the same handle all the time, and try resetting
|
|
the handle first too */
|
|
curl_easy_reset(curl[0]);
|
|
easy_setopt(curl[0], CURLOPT_URL, URL);
|
|
/* go verbose */
|
|
easy_setopt(curl[0], CURLOPT_VERBOSE, 1L);
|
|
|
|
/* re-add it */
|
|
multi_add_handle(multi, curl[0]);
|
|
}
|
|
else {
|
|
multi_add_handle(multi, curl[current]);
|
|
}
|
|
}
|
|
else {
|
|
break; /* done */
|
|
}
|
|
}
|
|
|
|
FD_ZERO(&rd);
|
|
FD_ZERO(&wr);
|
|
FD_ZERO(&exc);
|
|
|
|
multi_fdset(multi, &rd, &wr, &exc, &maxfd);
|
|
|
|
/* At this point, maxfd is guaranteed to be greater or equal than -1. */
|
|
|
|
select_test(maxfd + 1, &rd, &wr, &exc, &interval);
|
|
|
|
abort_on_test_timeout();
|
|
}
|
|
|
|
test_cleanup:
|
|
|
|
if((testnum == 526) || (testnum == 528)) {
|
|
/* proper cleanup sequence - type PB */
|
|
|
|
for(i = 0; i < CURL_ARRAYSIZE(curl); i++) {
|
|
curl_multi_remove_handle(multi, curl[i]);
|
|
curl_easy_cleanup(curl[i]);
|
|
}
|
|
curl_multi_cleanup(multi);
|
|
curl_global_cleanup();
|
|
}
|
|
else if(testnum == 527) {
|
|
/* Upon non-failure test flow the easy's have already been cleanup'ed. In
|
|
case there is a failure we arrive here with easy's that have not been
|
|
cleanup'ed yet, in this case we have to cleanup them or otherwise these
|
|
will be leaked, let's use undocumented cleanup sequence - type UB */
|
|
|
|
if(res != CURLE_OK)
|
|
for(i = 0; i < CURL_ARRAYSIZE(curl); i++)
|
|
curl_easy_cleanup(curl[i]);
|
|
|
|
curl_multi_cleanup(multi);
|
|
curl_global_cleanup();
|
|
|
|
}
|
|
else if(testnum == 532) {
|
|
/* undocumented cleanup sequence - type UB */
|
|
|
|
for(i = 0; i < CURL_ARRAYSIZE(curl); i++)
|
|
curl_easy_cleanup(curl[i]);
|
|
curl_multi_cleanup(multi);
|
|
curl_global_cleanup();
|
|
}
|
|
|
|
return res;
|
|
}
|