diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2020-12-15 08:09:29 +0100 |
|---|---|---|
| committer | Paul Gevers <elbrus@debian.org> | 2021-06-25 20:59:54 +0200 |
| commit | 51c799040c59331a9575d22008d3c21197e31d33 (patch) | |
| tree | 2e0e27eedde99e4010cf0792948a68b6c0a5dbb3 | |
| parent | 62039b2528d3cdd62070148aba746091b4ecb3d4 (diff) | |
[PATCH] tooĺ_writeout: fix the -w time output units
Fix regression from commit fc813f80e1bcac (#6248) that changed the unit
to microseconds instead of seconds with fractions
Reported-by: 不确定
Fixes #6321
Closes #6322
Gbp-Pq: Name fix-regression-microseconds-instead-of-seconds.patch
| -rw-r--r-- | src/tool_writeout.c | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/src/tool_writeout.c b/src/tool_writeout.c index c12738c4..8b9f5900 100644 --- a/src/tool_writeout.c +++ b/src/tool_writeout.c @@ -106,6 +106,14 @@ static const struct writeoutvar variables[] = { 0, JSON_NONE} }; +static void us2sec(FILE *stream, curl_off_t us) +{ + curl_off_t secs = us / 1000000; + us %= 1000000; + fprintf(stream, "%" CURL_FORMAT_CURL_OFF_TU ".%06" CURL_FORMAT_CURL_OFF_TU, + secs, us); +} + void ourWriteOut(CURL *curl, struct per_transfer *per, const char *writeinfo) { FILE *stream = stdout; @@ -190,41 +198,41 @@ void ourWriteOut(CURL *curl, struct per_transfer *per, const char *writeinfo) case VAR_REDIRECT_TIME: if(CURLE_OK == curl_easy_getinfo(curl, CURLINFO_REDIRECT_TIME_T, &offinfo)) - fprintf(stream, "%" CURL_FORMAT_CURL_OFF_TU, offinfo); + us2sec(stream, offinfo); break; case VAR_TOTAL_TIME: if(CURLE_OK == curl_easy_getinfo(curl, CURLINFO_TOTAL_TIME_T, &offinfo)) - fprintf(stream, "%" CURL_FORMAT_CURL_OFF_TU, offinfo); + us2sec(stream, offinfo); break; case VAR_NAMELOOKUP_TIME: if(CURLE_OK == curl_easy_getinfo(curl, CURLINFO_NAMELOOKUP_TIME_T, &offinfo)) - fprintf(stream, "%" CURL_FORMAT_CURL_OFF_TU, offinfo); + us2sec(stream, offinfo); break; case VAR_CONNECT_TIME: if(CURLE_OK == curl_easy_getinfo(curl, CURLINFO_CONNECT_TIME_T, &offinfo)) - fprintf(stream, "%" CURL_FORMAT_CURL_OFF_TU, offinfo); + us2sec(stream, offinfo); break; case VAR_APPCONNECT_TIME: if(CURLE_OK == curl_easy_getinfo(curl, CURLINFO_APPCONNECT_TIME_T, &offinfo)) - fprintf(stream, "%" CURL_FORMAT_CURL_OFF_TU, offinfo); + us2sec(stream, offinfo); break; case VAR_PRETRANSFER_TIME: if(CURLE_OK == curl_easy_getinfo(curl, CURLINFO_PRETRANSFER_TIME_T, &offinfo)) - fprintf(stream, "%" CURL_FORMAT_CURL_OFF_TU, offinfo); + us2sec(stream, offinfo); break; case VAR_STARTTRANSFER_TIME: if(CURLE_OK == curl_easy_getinfo(curl, CURLINFO_STARTTRANSFER_TIME_T, &offinfo)) - fprintf(stream, "%" CURL_FORMAT_CURL_OFF_TU, offinfo); + us2sec(stream, offinfo); break; case VAR_SIZE_UPLOAD: if(CURLE_OK == |