mirror of
https://github.com/curl/curl.git
synced 2026-05-29 22:27:28 +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
246 lines
7.7 KiB
C
246 lines
7.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 "tool_setup.h"
|
|
|
|
#include "tool_cfgable.h"
|
|
#include "tool_cb_prg.h"
|
|
#include "tool_util.h"
|
|
#include "tool_operate.h"
|
|
#include "terminal.h"
|
|
|
|
#define MAX_BARLENGTH 400
|
|
#define MIN_BARLENGTH 20
|
|
|
|
/* 200 values generated by this perl code:
|
|
|
|
my $pi = 3.1415;
|
|
foreach my $i (1 .. 200) {
|
|
printf "%d, ", sin($i/200 * 2 * $pi) * 500000 + 500000;
|
|
}
|
|
*/
|
|
static const int sinus[] = {
|
|
515704, 531394, 547052, 562664, 578214, 593687, 609068, 624341, 639491,
|
|
654504, 669364, 684057, 698568, 712883, 726989, 740870, 754513, 767906,
|
|
781034, 793885, 806445, 818704, 830647, 842265, 853545, 864476, 875047,
|
|
885248, 895069, 904500, 913532, 922156, 930363, 938145, 945495, 952406,
|
|
958870, 964881, 970434, 975522, 980141, 984286, 987954, 991139, 993840,
|
|
996054, 997778, 999011, 999752, 999999, 999754, 999014, 997783, 996060,
|
|
993848, 991148, 987964, 984298, 980154, 975536, 970449, 964898, 958888,
|
|
952426, 945516, 938168, 930386, 922180, 913558, 904527, 895097, 885277,
|
|
875077, 864507, 853577, 842299, 830682, 818739, 806482, 793922, 781072,
|
|
767945, 754553, 740910, 727030, 712925, 698610, 684100, 669407, 654548,
|
|
639536, 624386, 609113, 593733, 578260, 562710, 547098, 531440, 515751,
|
|
500046, 484341, 468651, 452993, 437381, 421830, 406357, 390976, 375703,
|
|
360552, 345539, 330679, 315985, 301474, 287158, 273052, 259170, 245525,
|
|
232132, 219003, 206152, 193590, 181331, 169386, 157768, 146487, 135555,
|
|
124983, 114781, 104959, 95526, 86493, 77868, 69660, 61876, 54525, 47613,
|
|
41147, 35135, 29581, 24491, 19871, 15724, 12056, 8868, 6166, 3951, 2225,
|
|
990, 248, 0, 244, 982, 2212, 3933, 6144, 8842, 12025, 15690, 19832, 24448,
|
|
29534, 35084, 41092, 47554, 54462, 61809, 69589, 77794, 86415, 95445,
|
|
104873, 114692, 124891, 135460, 146389, 157667, 169282, 181224, 193480,
|
|
206039, 218888, 232015, 245406, 259048, 272928, 287032, 301346, 315856,
|
|
330548, 345407, 360419, 375568, 390841, 406221, 421693, 437243, 452854,
|
|
468513, 484202, 499907
|
|
};
|
|
|
|
static void fly(struct ProgressData *bar, bool moved)
|
|
{
|
|
char buf[MAX_BARLENGTH + 2];
|
|
int pos;
|
|
int check = bar->width - 2;
|
|
|
|
/* bar->width is range checked when assigned */
|
|
DEBUGASSERT(bar->width <= MAX_BARLENGTH);
|
|
buf[0] = '\r';
|
|
memset(&buf[1], ' ', bar->width);
|
|
buf[bar->width + 1] = '\0';
|
|
|
|
memcpy(&buf[bar->bar + 1], "-=O=-", 5);
|
|
|
|
pos = sinus[bar->tick%200] / (1000000 / check) + 1;
|
|
buf[pos] = '#';
|
|
pos = sinus[(bar->tick + 5)%200] / (1000000 / check) + 1;
|
|
buf[pos] = '#';
|
|
pos = sinus[(bar->tick + 10)%200] / (1000000 / check) + 1;
|
|
buf[pos] = '#';
|
|
pos = sinus[(bar->tick + 15)%200] / (1000000 / check) + 1;
|
|
buf[pos] = '#';
|
|
|
|
fputs(buf, bar->out);
|
|
bar->tick += 2;
|
|
if(bar->tick >= 200)
|
|
bar->tick -= 200;
|
|
|
|
bar->bar += (moved ? bar->barmove : 0);
|
|
if(bar->bar >= (bar->width - 6)) {
|
|
bar->barmove = -1;
|
|
bar->bar = bar->width - 6;
|
|
}
|
|
else if(bar->bar < 0) {
|
|
bar->barmove = 1;
|
|
bar->bar = 0;
|
|
}
|
|
}
|
|
|
|
/*
|
|
** callback for CURLOPT_XFERINFOFUNCTION
|
|
*/
|
|
|
|
#if (SIZEOF_CURL_OFF_T < 8)
|
|
#error "too small curl_off_t"
|
|
#else
|
|
/* assume SIZEOF_CURL_OFF_T == 8 */
|
|
# define CURL_OFF_T_MAX 0x7FFFFFFFFFFFFFFF
|
|
#endif
|
|
|
|
static void update_width(struct ProgressData *bar)
|
|
{
|
|
int cols = get_terminal_columns();
|
|
if(cols > MAX_BARLENGTH)
|
|
bar->width = MAX_BARLENGTH;
|
|
else if(cols > MIN_BARLENGTH)
|
|
bar->width = (int)cols;
|
|
else
|
|
bar->width = MIN_BARLENGTH;
|
|
}
|
|
|
|
int tool_progress_cb(void *clientp,
|
|
curl_off_t dltotal, curl_off_t dlnow,
|
|
curl_off_t ultotal, curl_off_t ulnow)
|
|
{
|
|
struct curltime now = curlx_now();
|
|
struct per_transfer *per = clientp;
|
|
struct OperationConfig *config = per->config;
|
|
struct ProgressData *bar = &per->progressbar;
|
|
curl_off_t total;
|
|
curl_off_t point;
|
|
|
|
/* Calculate expected transfer size. initial_size can be less than zero when
|
|
indicating that we are expecting to get the filesize from the remote */
|
|
if(bar->initial_size < 0) {
|
|
if(dltotal || ultotal)
|
|
total = dltotal + ultotal;
|
|
else
|
|
total = CURL_OFF_T_MAX;
|
|
}
|
|
else if((CURL_OFF_T_MAX - bar->initial_size) < (dltotal + ultotal))
|
|
total = CURL_OFF_T_MAX;
|
|
else
|
|
total = dltotal + ultotal + bar->initial_size;
|
|
|
|
/* Calculate the current progress. initial_size can be less than zero when
|
|
indicating that we are expecting to get the filesize from the remote */
|
|
if(bar->initial_size < 0) {
|
|
if(dltotal || ultotal)
|
|
point = dlnow + ulnow;
|
|
else
|
|
point = CURL_OFF_T_MAX;
|
|
}
|
|
else if((CURL_OFF_T_MAX - bar->initial_size) < (dlnow + ulnow))
|
|
point = CURL_OFF_T_MAX;
|
|
else
|
|
point = dlnow + ulnow + bar->initial_size;
|
|
|
|
if(bar->calls) {
|
|
/* after first call... */
|
|
if(total) {
|
|
/* we know the total data to get... */
|
|
if(bar->prev == point)
|
|
/* progress did not change since last invoke */
|
|
return 0;
|
|
else if((curlx_timediff_ms(now, bar->prevtime) < 100L) && point < total)
|
|
/* limit progress-bar updating to 10 Hz except when we are at 100% */
|
|
return 0;
|
|
}
|
|
else {
|
|
/* total is unknown */
|
|
if(curlx_timediff_ms(now, bar->prevtime) < 100L)
|
|
/* limit progress-bar updating to 10 Hz */
|
|
return 0;
|
|
update_width(bar);
|
|
fly(bar, point != bar->prev);
|
|
}
|
|
}
|
|
|
|
/* simply count invokes */
|
|
bar->calls++;
|
|
|
|
update_width(bar);
|
|
if((total > 0) && (point != bar->prev)) {
|
|
char line[MAX_BARLENGTH + 1];
|
|
char format[40];
|
|
double frac;
|
|
double percent;
|
|
int barwidth;
|
|
size_t num;
|
|
if(point > total)
|
|
/* we have got more than the expected total! */
|
|
total = point;
|
|
|
|
frac = (double)point / (double)total;
|
|
percent = frac * 100.0;
|
|
barwidth = bar->width - 7;
|
|
num = (size_t) (((double)barwidth) * frac);
|
|
if(num > MAX_BARLENGTH)
|
|
num = MAX_BARLENGTH;
|
|
memset(line, '#', num);
|
|
line[num] = '\0';
|
|
curl_msnprintf(format, sizeof(format), "\r%%-%ds %%5.1f%%%%", barwidth);
|
|
#ifdef __clang__
|
|
#pragma clang diagnostic push
|
|
#pragma clang diagnostic ignored "-Wformat-nonliteral"
|
|
#endif
|
|
curl_mfprintf(bar->out, format, line, percent);
|
|
#ifdef __clang__
|
|
#pragma clang diagnostic pop
|
|
#endif
|
|
}
|
|
fflush(bar->out);
|
|
bar->prev = point;
|
|
bar->prevtime = now;
|
|
|
|
if(config->readbusy) {
|
|
config->readbusy = FALSE;
|
|
curl_easy_pause(per->curl, CURLPAUSE_CONT);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
void progressbarinit(struct ProgressData *bar,
|
|
struct OperationConfig *config)
|
|
{
|
|
memset(bar, 0, sizeof(struct ProgressData));
|
|
|
|
/* pass the resume from value through to the progress function so it can
|
|
* display progress towards total file not just the part that is left. */
|
|
if(config->use_resume)
|
|
bar->initial_size = config->resume_from;
|
|
|
|
update_width(bar);
|
|
|
|
bar->out = tool_stderr;
|
|
bar->tick = 150;
|
|
bar->barmove = 1;
|
|
}
|