diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2005-03-31 09:07:12 +0000 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2005-03-31 09:07:12 +0000 |
| commit | 2c38625920fa67d52ade11fd7d28cdb5373dc31c (patch) | |
| tree | 7b156366cb6826cc6d141aa373ef6fc0655f53ca /methods/http.cc | |
| parent | 66de63dde68e2cb3a26201a28a0fc8060432acd3 (diff) | |
* merged the apt--main with the 2004 bwlimit tree
Patches applied:
* michael.vogt@canonical.com--2004/apt--bwlimit--0--base-0
tag of apt@packages.debian.org/apt--main--0--patch-47
* michael.vogt@canonical.com--2004/apt--bwlimit--0--patch-1
* fist attempt for bwlimit
* michael.vogt@canonical.com--2004/apt--bwlimit--0--patch-2
* add a nanosleep, making it less cpu intensive
* michael.vogt@canonical.com--2004/apt--bwlimit--0--patch-3
* use SingleInstance when DlLimit is activated
* michael.vogt@canonical.com--2004/apt--bwlimit--0--patch-4
* cleanups, no code changes
Diffstat (limited to 'methods/http.cc')
| -rw-r--r-- | methods/http.cc | 41 |
1 files changed, 39 insertions, 2 deletions
diff --git a/methods/http.cc b/methods/http.cc index 81a64d7a3..27f0dafef 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -58,6 +58,12 @@ unsigned long PipelineDepth = 10; unsigned long TimeOut = 120; bool Debug = false; + +unsigned long CircleBuf::BwReadLimit=0; +unsigned long CircleBuf::BwTickReadData=0; +struct timeval CircleBuf::BwReadTick={0,0}; +const unsigned int CircleBuf::BW_HZ=10; + // CircleBuf::CircleBuf - Circular input buffer /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -65,6 +71,8 @@ CircleBuf::CircleBuf(unsigned long Size) : Size(Size), Hash(0) { Buf = new unsigned char[Size]; Reset(); + + CircleBuf::BwReadLimit = _config->FindI("Acquire::http::DlLimit",0)*1024; } /*}}}*/ // CircleBuf::Reset - Reset to the default state /*{{{*/ @@ -90,16 +98,45 @@ void CircleBuf::Reset() is non-blocking.. */ bool CircleBuf::Read(int Fd) { + unsigned long BwReadMax; + while (1) { // Woops, buffer is full if (InP - OutP == Size) return true; - + + // what's left to read in this tick + BwReadMax = CircleBuf::BwReadLimit/BW_HZ; + + if(CircleBuf::BwReadLimit) { + struct timeval now; + gettimeofday(&now,0); + + unsigned long d = (now.tv_sec-CircleBuf::BwReadTick.tv_sec)*1000000 + + now.tv_usec-CircleBuf::BwReadTick.tv_usec; + if(d > 1000000/BW_HZ) { + CircleBuf::BwReadTick = now; + CircleBuf::BwTickReadData = 0; + } + + if(CircleBuf::BwTickReadData >= BwReadMax) { + usleep(1000000/BW_HZ); + return true; + } + } + // Write the buffer segment int Res; - Res = read(Fd,Buf + (InP%Size),LeftRead()); + if(CircleBuf::BwReadLimit) { + Res = read(Fd,Buf + (InP%Size), + BwReadMax > LeftRead() ? LeftRead() : BwReadMax); + } else + Res = read(Fd,Buf + (InP%Size),LeftRead()); + if(Res > 0 && BwReadLimit > 0) + CircleBuf::BwTickReadData += Res; + if (Res == 0) return false; if (Res < 0) |