moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

improved --limit-rate functionality, partly by the new use of curlx_tvnow()

Browse Source
This commit is contained in:
Daniel Stenberg 2004-04-06 12:06:05 +00:00
parent ca7f0852df
commit 0ccdf3d0e6
3 changed files with 124 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGES
View File

@ -7,6 +7,15 @@
Changelog
Daniel (6 April 2004)
- The --limit-rate logic was corrected and now it works a lot better for
higher speeds, such as '10m' or similar. Reported in bug report #930249.
- Introducing curlx_tvnow() and curlx_tvdiff() using the new curlx_* fashion.
#include "timeval.h" from the lib dir to get the protos etc. Note that
these are NOT part of the libcurl API. The curl app simply uses the same
source files as the library does and therefore the file needs to be compiled
and linked with curl too, not just when creating libcurl.
- lib/strerror.c no longer uses sys_nerr on non-windows platforms since it
isn't portable enough

21
src/Makefile.am
View File

@ -31,10 +31,14 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/include -I$(top_builddir)/src \
bin_PROGRAMS = curl
# libcurl has sources that provide functions named curlx_* that aren't part of
# the official API, but we re-use the code here to avoid duplication.
curlx_ones = $(top_srcdir)/lib/strtoofft.c $(top_srcdir)/lib/timeval.c
curl_SOURCES = main.c hugehelp.c hugehelp.h urlglob.c writeout.c setup.h \
config-win32.h config-mac.h config-vms.h config-riscos.h \
urlglob.h version.h writeout.h writeenv.c writeenv.h \
getpass.c getpass.h homedir.c homedir.h $(top_srcdir)/lib/strtoofft.c
config-win32.h config-mac.h config-vms.h config-riscos.h urlglob.h \
version.h writeout.h writeenv.c writeenv.h getpass.c getpass.h \
homedir.c homedir.h $(curlx_ones)
curl_LDADD = ../lib/libcurl.la
curl_DEPENDENCIES = ../lib/libcurl.la
@ -42,13 +46,10 @@ BUILT_SOURCES = hugehelp.c
CLEANFILES = hugehelp.c
NROFF=@NROFF@ @MANOPT@ # figured out by the configure script
EXTRA_DIST = mkhelp.pl makefile.dj \
Makefile.vc6 Makefile.b32 Makefile.m32 Makefile.riscos config.h.in \
macos/curl.mcp.xml.sit.hqx \
macos/MACINSTALL.TXT \
macos/src/curl_GUSIConfig.cpp \
macos/src/macos_main.cpp \
config-amigaos.h makefile.amiga curl.rc \
EXTRA_DIST = mkhelp.pl makefile.dj Makefile.vc6 Makefile.b32 Makefile.m32 \
Makefile.riscos config.h.in macos/curl.mcp.xml.sit.hqx \
macos/MACINSTALL.TXT macos/src/curl_GUSIConfig.cpp \
macos/src/macos_main.cpp config-amigaos.h makefile.amiga curl.rc \
Makefile.netware config-netware.h
MANPAGE=$(top_srcdir)/docs/curl.1

137
src/main.c
View File

@ -104,6 +104,7 @@
#endif
#include <strtoofft.h> /* header from the libcurl directory */
#include <timeval.h> /* header from the libcurl directory */
/* The last #include file should be: */
#ifdef CURLDEBUG
@ -495,20 +496,15 @@ struct Configurable {
HttpReq httpreq;
/* for bandwidth limiting features: */
size_t sendpersecond; /* send to peer */
size_t recvpersecond; /* receive from peer */
time_t lastsendtime;
struct timeval lastsendtime;
size_t lastsendsize;
time_t lastrecvtime;
struct timeval lastrecvtime;
size_t lastrecvsize;
bool ftp_ssl;
char *socks5proxy;
bool tcp_nodelay;
};
@ -2216,7 +2212,8 @@ static void go_sleep(long ms)
/* Other systems must use select() for this */
struct timeval timeout;
timeout.tv_sec = 0;
timeout.tv_sec = ms/1000;
ms -= ms/1000;
timeout.tv_usec = ms * 1000;
select(0, NULL, NULL, NULL, &timeout);
@ -2231,11 +2228,12 @@ struct OutStruct {
struct Configurable *config;
};
static int my_fwrite(void *buffer, size_t size, size_t nmemb, void *stream)
static int my_fwrite(void *buffer, size_t sz, size_t nmemb, void *stream)
{
int rc;
struct OutStruct *out=(struct OutStruct *)stream;
struct Configurable *config = out->config;
curl_off_t size = sz * nmemb;
if(out && !out->stream) {
/* open file for writing */
out->stream=fopen(out->filename, "wb");
@ -2250,31 +2248,49 @@ static int my_fwrite(void *buffer, size_t size, size_t nmemb, void *stream)
* If we're faster, sleep a while *before* doing the fwrite() here.
*/
time_t timediff;
time_t now;
time_t sleep_time;
struct timeval now;
long timediff;
long sleep_time;
now = time(NULL);
timediff = now - config->lastrecvtime;
if( size*nmemb > config->recvpersecond*timediff) {
static curl_off_t addit = 0;
now = curlx_tvnow();
timediff = curlx_tvdiff(now, config->lastrecvtime); /* milliseconds */
if((config->recvpersecond > CURL_MAX_WRITE_SIZE) && (timediff < 100) ) {
/* If we allow a rather speedy transfer, add this amount for later
* checking. Also, do not modify the lastrecvtime as we will use a
* longer scope due to this addition. We wait for at least 100 ms to
* pass to get better values to do better math for the sleep. */
addit += size;
}
else {
size += addit; /* add up the possibly added bonus rounds from the
zero timediff calls */
addit = 0; /* clear the addition pool */
if( size*1000 > config->recvpersecond*timediff) {
/* figure out how many milliseconds to rest */
sleep_time = (size*nmemb)*1000/config->recvpersecond - timediff*1000;
sleep_time = size*1000/config->recvpersecond - timediff;
/*
* Make sure we don't sleep for so long that we trigger the speed limit.
* This won't limit the bandwidth quite the way we've been asked to, but
* at least the transfer has a chance.
* Make sure we don't sleep for so long that we trigger the speed
* limit. This won't limit the bandwidth quite the way we've been
* asked to, but at least the transfer has a chance.
*/
if (config->low_speed_time > 0)
sleep_time = MIN(sleep_time,(config->low_speed_time * 1000) / 2);
go_sleep (sleep_time);
now = time(NULL);
if(sleep_time > 0) {
go_sleep(sleep_time);
now = curlx_tvnow();
}
}
config->lastrecvtime = now;
}
}
rc = fwrite(buffer, size, nmemb, out->stream);
rc = fwrite(buffer, sz, nmemb, out->stream);
if(config->nobuffer)
/* disable output buffering */
@ -2288,11 +2304,11 @@ struct InStruct {
struct Configurable *config;
};
static int my_fread(void *buffer, size_t size, size_t nmemb, void *userp)
static int my_fread(void *buffer, size_t sz, size_t nmemb, void *userp)
{
struct InStruct *in=(struct InStruct *)userp;
struct Configurable *config = in->config;
curl_off_t size = sz * nmemb;
if(config->sendpersecond) {
/*
@ -2302,29 +2318,51 @@ static int my_fread(void *buffer, size_t size, size_t nmemb, void *userp)
* Also, make no larger fread() than should be sent this second!
*/
time_t timediff;
time_t now;
struct timeval now;
long timediff;
long sleep_time;
now = time(NULL);
timediff = now - config->lastsendtime;
if( config->lastsendsize > config->sendpersecond*timediff) {
static curl_off_t addit = 0;
now = curlx_tvnow();
timediff = curlx_tvdiff(now, config->lastsendtime); /* milliseconds */
if((config->sendpersecond > CURL_MAX_WRITE_SIZE) &&
(timediff < 100)) {
/*
* We allow very fast transfers, then allow at least 100 ms between
* each sleeping mile-stone to create more accurate long-term rates.
*/
addit += size;
}
else {
/* If 'addit' is non-zero, it contains the total amount of bytes
uploaded during the last 'timediff' milliseconds. If it is zero,
we use the stored previous size. */
curl_off_t xfered = addit?addit:config->lastsendsize;
addit = 0; /* clear it for the next round */
if( xfered*1000 > config->sendpersecond*timediff) {
/* figure out how many milliseconds to rest */
go_sleep ( config->lastsendsize*1000/config->sendpersecond -
timediff*1000 );
now = time(NULL);
sleep_time = xfered*1000/config->sendpersecond - timediff;
if(sleep_time > 0) {
go_sleep (sleep_time);
now = curlx_tvnow();
}
}
config->lastsendtime = now;
if(size*nmemb > config->sendpersecond) {
if(size > config->sendpersecond) {
/* lower the size to actually read */
nmemb = config->sendpersecond;
size = 1;
sz = 1;
}
config->lastsendsize = size*nmemb;
}
config->lastsendsize = sz*nmemb;
}
return fread(buffer, size, nmemb, in->stream);
return fread(buffer, sz, nmemb, in->stream);
}
struct ProgressData {
@ -2677,6 +2715,8 @@ operate(struct Configurable *config, int argc, char *argv[])
config->conf=CONF_DEFAULT;
config->use_httpget=FALSE;
config->create_dirs=FALSE;
config->lastrecvtime = curlx_tvnow();
config->lastsendtime = curlx_tvnow();
if(argc>1 &&
(!curl_strnequal("--", argv[1], 2) && (argv[1][0] == '-')) &&
@ -2959,7 +2999,7 @@ operate(struct Configurable *config, int argc, char *argv[])
struct stat fileinfo;
/*VMS?? -- Danger, the filesize is only valid for stream files */
/* VMS -- Danger, the filesize is only valid for stream files */
if(0 == stat(outfile, &fileinfo))
/* set offset to current file size: */
config->resume_from = fileinfo.st_size;
@ -3036,15 +3076,20 @@ operate(struct Configurable *config, int argc, char *argv[])
url = urlbuffer; /* use our new URL instead! */
}
}
/*VMS??-- Reading binary from files can be a problem... */
/*VMS?? Only FIXED, VAR etc WITHOUT implied CC will work */
/*VMS?? Others need a \n appended to a line */
/*VMS??-- Stat gives a size but this is UNRELIABLE in VMS */
/*VMS?? As a f.e. a fixed file with implied CC needs to have a byte added */
/*VMS?? for every record processed, this can by derived from Filesize & recordsize */
/*VMS?? for VARiable record files the records need to be counted! */
/*VMS?? for every record add 1 for linefeed and subtract 2 for the record header */
/*VMS?? for VARIABLE header files only the bare record data needs to be considered with one appended if implied CC */
/* VMS Note:
*
* Reading binary from files can be a problem... Only FIXED, VAR
* etc WITHOUT implied CC will work Others need a \n appended to a
* line
*
* - Stat gives a size but this is UNRELIABLE in VMS As a f.e. a
* fixed file with implied CC needs to have a byte added for every
* record processed, this can by derived from Filesize & recordsize
* for VARiable record files the records need to be counted! for
* every record add 1 for linefeed and subtract 2 for the record
* header for VARIABLE header files only the bare record data needs
* to be considered with one appended if implied CC
*/
infd=(FILE *) fopen(uploadfile, "rb");
if (!infd || stat(uploadfile, &fileinfo)) {