romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-24 04:47:17 +03:00
Code Issues Projects Releases Packages Wiki Activity

curl: improve non-blocking STDIN performance

Browse source 
Using a select() call on supported platforms to check for data with a
given timeout

Closes #17566
This commit is contained in:
DoI 2025-06-10 20:59:09 +12:00 • committed by Daniel Stenberg
parent 4914c2177e
commit 83baac43a8
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
1 changed files with 27 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

51
src/tool_cb_rea.c
View file

@ -144,6 +144,7 @@ int tool_readbusy_cb(void *clientp,
{
struct per_transfer *per = clientp;
struct OperationConfig *config = per->config;
static curl_off_t ulprev;
(void)dltotal; /* unused */
(void)dlnow; /* unused */
@ -151,33 +152,35 @@ int tool_readbusy_cb(void *clientp,
(void)ulnow; /* unused */
if(config->readbusy) {
/* lame code to keep the rate down because the input might not deliver
anything, get paused again and come back here immediately */
static timediff_t rate = 500;
static struct curltime prev;
static curl_off_t ulprev;
if(ulprev == ulnow) {
/* it did not upload anything since last call */
struct curltime now = curlx_now();
if(prev.tv_sec)
/* get a rolling average rate */
rate -= rate/4 - curlx_timediff(now, prev)/4;
prev = now;
#ifndef _WIN32
fd_set bits;
struct timeval timeout;
/* wait this long at the most */
timeout.tv_sec = 0;
timeout.tv_usec = 1000;
FD_ZERO(&bits);
#if defined(__DJGPP__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warith-conversion"
#endif
FD_SET(per->infd, &bits);
#if defined(__DJGPP__)
#pragma GCC diagnostic pop
#endif
select(per->infd + 1, &bits, NULL, NULL, &timeout);
#else
/* sleep */
curlx_wait_ms(1);
#endif
}
else {
rate = 50;
ulprev = ulnow;
}
if(rate >= 50) {
/* keeps the looping down to 20 times per second in the crazy case */
config->readbusy = FALSE;
curl_easy_pause(per->curl, CURLPAUSE_CONT);
}
else
/* sleep half a period */
curlx_wait_ms(25);
config->readbusy = FALSE;
curl_easy_pause(per->curl, CURLPAUSE_CONT);
}
ulprev = ulnow;
return per->noprogress ? 0 : CURL_PROGRESSFUNC_CONTINUE;
}