]> git.saurik.com Git - apt.git/blame - apt-pkg/acquire.cc
Bugs
[apt.git] / apt-pkg / acquire.cc
CommitLineData
0118833a
AL
1// -*- mode: cpp; mode: fold -*-
2// Description /*{{{*/
7a7fa5f0 3// $Id: acquire.cc,v 1.14 1998/11/12 04:10:54 jgg Exp $
0118833a
AL
4/* ######################################################################
5
6 Acquire - File Acquiration
7
0a8a80e5
AL
8 The core element for the schedual system is the concept of a named
9 queue. Each queue is unique and each queue has a name derived from the
10 URI. The degree of paralization can be controled by how the queue
11 name is derived from the URI.
12
0118833a
AL
13 ##################################################################### */
14 /*}}}*/
15// Include Files /*{{{*/
16#ifdef __GNUG__
17#pragma implementation "apt-pkg/acquire.h"
18#endif
19#include <apt-pkg/acquire.h>
20#include <apt-pkg/acquire-item.h>
21#include <apt-pkg/acquire-worker.h>
0a8a80e5
AL
22#include <apt-pkg/configuration.h>
23#include <apt-pkg/error.h>
3b5421b4 24#include <strutl.h>
8267fe24 25
7a7fa5f0 26#include <dirent.h>
8267fe24 27#include <sys/time.h>
0118833a
AL
28 /*}}}*/
29
30// Acquire::pkgAcquire - Constructor /*{{{*/
31// ---------------------------------------------------------------------
93bf083d 32/* We grab some runtime state from the configuration space */
8267fe24 33pkgAcquire::pkgAcquire(pkgAcquireStatus *Log) : Log(Log)
0118833a
AL
34{
35 Queues = 0;
36 Configs = 0;
0a8a80e5
AL
37 Workers = 0;
38 ToFetch = 0;
8b89e57f 39 Running = false;
0a8a80e5
AL
40
41 string Mode = _config->Find("Acquire::Queue-Mode","host");
42 if (strcasecmp(Mode.c_str(),"host") == 0)
43 QueueMode = QueueHost;
44 if (strcasecmp(Mode.c_str(),"access") == 0)
45 QueueMode = QueueAccess;
46
47 Debug = _config->FindB("Debug::pkgAcquire",false);
0118833a
AL
48}
49 /*}}}*/
50// Acquire::~pkgAcquire - Destructor /*{{{*/
51// ---------------------------------------------------------------------
93bf083d 52/* Free our memory, clean up the queues (destroy the workers) */
0118833a
AL
53pkgAcquire::~pkgAcquire()
54{
55 while (Items.size() != 0)
56 delete Items[0];
3b5421b4
AL
57
58 while (Configs != 0)
59 {
60 MethodConfig *Jnk = Configs;
61 Configs = Configs->Next;
62 delete Jnk;
63 }
0a8a80e5
AL
64
65 while (Queues != 0)
66 {
67 Queue *Jnk = Queues;
68 Queues = Queues->Next;
69 delete Jnk;
70 }
0118833a
AL
71}
72 /*}}}*/
73// Acquire::Add - Add a new item /*{{{*/
74// ---------------------------------------------------------------------
93bf083d
AL
75/* This puts an item on the acquire list. This list is mainly for tracking
76 item status */
0118833a
AL
77void pkgAcquire::Add(Item *Itm)
78{
79 Items.push_back(Itm);
80}
81 /*}}}*/
82// Acquire::Remove - Remove a item /*{{{*/
83// ---------------------------------------------------------------------
93bf083d 84/* Remove an item from the acquire list. This is usually not used.. */
0118833a
AL
85void pkgAcquire::Remove(Item *Itm)
86{
87 for (vector<Item *>::iterator I = Items.begin(); I < Items.end(); I++)
88 {
89 if (*I == Itm)
90 Items.erase(I);
8267fe24 91 }
0118833a
AL
92}
93 /*}}}*/
0a8a80e5
AL
94// Acquire::Add - Add a worker /*{{{*/
95// ---------------------------------------------------------------------
93bf083d
AL
96/* A list of workers is kept so that the select loop can direct their FD
97 usage. */
0a8a80e5
AL
98void pkgAcquire::Add(Worker *Work)
99{
100 Work->NextAcquire = Workers;
101 Workers = Work;
102}
103 /*}}}*/
104// Acquire::Remove - Remove a worker /*{{{*/
105// ---------------------------------------------------------------------
93bf083d
AL
106/* A worker has died. This can not be done while the select loop is running
107 as it would require that RunFds could handling a changing list state and
108 it cant.. */
0a8a80e5
AL
109void pkgAcquire::Remove(Worker *Work)
110{
93bf083d
AL
111 if (Running == true)
112 abort();
113
0a8a80e5
AL
114 Worker **I = &Workers;
115 for (; *I != 0;)
116 {
117 if (*I == Work)
118 *I = (*I)->NextAcquire;
119 else
120 I = &(*I)->NextAcquire;
121 }
122}
123 /*}}}*/
0118833a
AL
124// Acquire::Enqueue - Queue an URI for fetching /*{{{*/
125// ---------------------------------------------------------------------
93bf083d
AL
126/* This is the entry point for an item. An item calls this function when
127 it is construction which creates a queue (based on the current queue
128 mode) and puts the item in that queue. If the system is running then
129 the queue might be started. */
8267fe24 130void pkgAcquire::Enqueue(ItemDesc &Item)
0118833a 131{
0a8a80e5 132 // Determine which queue to put the item in
8267fe24 133 string Name = QueueName(Item.URI);
0a8a80e5
AL
134 if (Name.empty() == true)
135 return;
136
137 // Find the queue structure
138 Queue *I = Queues;
139 for (; I != 0 && I->Name != Name; I = I->Next);
140 if (I == 0)
141 {
142 I = new Queue(Name,this);
143 I->Next = Queues;
144 Queues = I;
93bf083d
AL
145
146 if (Running == true)
147 I->Startup();
0a8a80e5 148 }
bfd22fc0 149
8267fe24 150 Item.Owner->Status = Item::StatIdle;
0a8a80e5
AL
151
152 // Queue it into the named queue
8267fe24 153 I->Enqueue(Item);
0a8a80e5 154 ToFetch++;
93bf083d 155
0a8a80e5
AL
156 // Some trace stuff
157 if (Debug == true)
158 {
8267fe24
AL
159 clog << "Fetching " << Item.URI << endl;
160 clog << " to " << Item.Owner->DestFile << endl;
161 clog << " Queue is: " << QueueName(Item.URI) << endl;
0a8a80e5 162 }
3b5421b4
AL
163}
164 /*}}}*/
0a8a80e5 165// Acquire::Dequeue - Remove an item from all queues /*{{{*/
3b5421b4 166// ---------------------------------------------------------------------
93bf083d
AL
167/* This is called when an item is finished being fetched. It removes it
168 from all the queues */
0a8a80e5
AL
169void pkgAcquire::Dequeue(Item *Itm)
170{
171 Queue *I = Queues;
bfd22fc0 172 bool Res = false;
0a8a80e5 173 for (; I != 0; I = I->Next)
bfd22fc0 174 Res |= I->Dequeue(Itm);
93bf083d
AL
175
176 if (Debug == true)
177 clog << "Dequeuing " << Itm->DestFile << endl;
bfd22fc0
AL
178 if (Res == true)
179 ToFetch--;
0a8a80e5
AL
180}
181 /*}}}*/
182// Acquire::QueueName - Return the name of the queue for this URI /*{{{*/
183// ---------------------------------------------------------------------
184/* The string returned depends on the configuration settings and the
185 method parameters. Given something like http://foo.org/bar it can
186 return http://foo.org or http */
93bf083d 187string pkgAcquire::QueueName(string Uri)
3b5421b4 188{
93bf083d
AL
189 URI U(Uri);
190
191 const MethodConfig *Config = GetConfig(U.Access);
0a8a80e5
AL
192 if (Config == 0)
193 return string();
194
195 /* Single-Instance methods get exactly one queue per URI. This is
196 also used for the Access queue method */
197 if (Config->SingleInstance == true || QueueMode == QueueAccess)
b98f2859 198 return U.Access;
93bf083d
AL
199
200 return U.Access + ':' + U.Host;
0118833a
AL
201}
202 /*}}}*/
3b5421b4
AL
203// Acquire::GetConfig - Fetch the configuration information /*{{{*/
204// ---------------------------------------------------------------------
205/* This locates the configuration structure for an access method. If
206 a config structure cannot be found a Worker will be created to
207 retrieve it */
0a8a80e5 208pkgAcquire::MethodConfig *pkgAcquire::GetConfig(string Access)
3b5421b4
AL
209{
210 // Search for an existing config
211 MethodConfig *Conf;
212 for (Conf = Configs; Conf != 0; Conf = Conf->Next)
213 if (Conf->Access == Access)
214 return Conf;
215
216 // Create the new config class
217 Conf = new MethodConfig;
218 Conf->Access = Access;
219 Conf->Next = Configs;
220 Configs = Conf;
0118833a 221
3b5421b4
AL
222 // Create the worker to fetch the configuration
223 Worker Work(Conf);
224 if (Work.Start() == false)
225 return 0;
226
227 return Conf;
228}
229 /*}}}*/
0a8a80e5
AL
230// Acquire::SetFds - Deal with readable FDs /*{{{*/
231// ---------------------------------------------------------------------
232/* Collect FDs that have activity monitors into the fd sets */
233void pkgAcquire::SetFds(int &Fd,fd_set *RSet,fd_set *WSet)
234{
235 for (Worker *I = Workers; I != 0; I = I->NextAcquire)
236 {
237 if (I->InReady == true && I->InFd >= 0)
238 {
239 if (Fd < I->InFd)
240 Fd = I->InFd;
241 FD_SET(I->InFd,RSet);
242 }
243 if (I->OutReady == true && I->OutFd >= 0)
244 {
245 if (Fd < I->OutFd)
246 Fd = I->OutFd;
247 FD_SET(I->OutFd,WSet);
248 }
249 }
250}
251 /*}}}*/
252// Acquire::RunFds - Deal with active FDs /*{{{*/
253// ---------------------------------------------------------------------
93bf083d
AL
254/* Dispatch active FDs over to the proper workers. It is very important
255 that a worker never be erased while this is running! The queue class
256 should never erase a worker except during shutdown processing. */
0a8a80e5
AL
257void pkgAcquire::RunFds(fd_set *RSet,fd_set *WSet)
258{
259 for (Worker *I = Workers; I != 0; I = I->NextAcquire)
260 {
261 if (I->InFd >= 0 && FD_ISSET(I->InFd,RSet) != 0)
262 I->InFdReady();
263 if (I->OutFd >= 0 && FD_ISSET(I->OutFd,WSet) != 0)
264 I->OutFdReady();
265 }
266}
267 /*}}}*/
268// Acquire::Run - Run the fetch sequence /*{{{*/
269// ---------------------------------------------------------------------
270/* This runs the queues. It manages a select loop for all of the
271 Worker tasks. The workers interact with the queues and items to
272 manage the actual fetch. */
273bool pkgAcquire::Run()
274{
8b89e57f
AL
275 Running = true;
276
0a8a80e5
AL
277 for (Queue *I = Queues; I != 0; I = I->Next)
278 I->Startup();
279
b98f2859
AL
280 if (Log != 0)
281 Log->Start();
282
0a8a80e5 283 // Run till all things have been acquired
8267fe24
AL
284 struct timeval tv;
285 tv.tv_sec = 0;
286 tv.tv_usec = 500000;
0a8a80e5
AL
287 while (ToFetch > 0)
288 {
289 fd_set RFds;
290 fd_set WFds;
291 int Highest = 0;
292 FD_ZERO(&RFds);
293 FD_ZERO(&WFds);
294 SetFds(Highest,&RFds,&WFds);
295
8267fe24
AL
296 int Res = select(Highest+1,&RFds,&WFds,0,&tv);
297 if (Res < 0)
8b89e57f 298 {
8267fe24
AL
299 _error->Errno("select","Select has failed");
300 break;
8b89e57f 301 }
93bf083d 302
0a8a80e5 303 RunFds(&RFds,&WFds);
93bf083d
AL
304 if (_error->PendingError() == true)
305 break;
8267fe24
AL
306
307 // Timeout, notify the log class
308 if (Res == 0 || (Log != 0 && Log->Update == true))
309 {
310 tv.tv_usec = 500000;
311 for (Worker *I = Workers; I != 0; I = I->NextAcquire)
312 I->Pulse();
313 if (Log != 0)
314 Log->Pulse(this);
315 }
0a8a80e5 316 }
be4401bf 317
b98f2859
AL
318 if (Log != 0)
319 Log->Stop();
320
be4401bf
AL
321 // Shut down the acquire bits
322 Running = false;
0a8a80e5
AL
323 for (Queue *I = Queues; I != 0; I = I->Next)
324 I->Shutdown();
325
0919e3f9 326 return !_error->PendingError();
93bf083d
AL
327}
328 /*}}}*/
be4401bf 329// Acquire::Bump - Called when an item is dequeued /*{{{*/
93bf083d
AL
330// ---------------------------------------------------------------------
331/* This routine bumps idle queues in hopes that they will be able to fetch
332 the dequeued item */
333void pkgAcquire::Bump()
334{
be4401bf
AL
335 for (Queue *I = Queues; I != 0; I = I->Next)
336 I->Bump();
0a8a80e5
AL
337}
338 /*}}}*/
8267fe24
AL
339// Acquire::WorkerStep - Step to the next worker /*{{{*/
340// ---------------------------------------------------------------------
341/* Not inlined to advoid including acquire-worker.h */
342pkgAcquire::Worker *pkgAcquire::WorkerStep(Worker *I)
343{
344 return I->NextAcquire;
345};
346 /*}}}*/
7a7fa5f0
AL
347// pkgAcquire::Clean - Cleans a directory /*{{{*/
348// ---------------------------------------------------------------------
349/* This is a bit simplistic, it looks at every file in the dir and sees
350 if it is part of the download set. */
351bool pkgAcquire::Clean(string Dir)
352{
353 DIR *D = opendir(Dir.c_str());
354 if (D == 0)
355 return _error->Errno("opendir","Unable to read %s",Dir.c_str());
356
357 string StartDir = SafeGetCWD();
358 if (chdir(Dir.c_str()) != 0)
359 {
360 closedir(D);
361 return _error->Errno("chdir","Unable to change to ",Dir.c_str());
362 }
363
364 for (struct dirent *Dir = readdir(D); Dir != 0; Dir = readdir(D))
365 {
366 // Skip some files..
367 if (strcmp(Dir->d_name,"lock") == 0 ||
368 strcmp(Dir->d_name,"partial") == 0 ||
369 strcmp(Dir->d_name,".") == 0 ||
370 strcmp(Dir->d_name,"..") == 0)
371 continue;
372
373 // Look in the get list
374 vector<Item *>::iterator I = Items.begin();
375 for (; I != Items.end(); I++)
376 if (flNotDir((*I)->DestFile) == Dir->d_name)
377 break;
378
379 // Nothing found, nuke it
380 if (I == Items.end())
381 unlink(Dir->d_name);
382 };
383
384 chdir(StartDir.c_str());
385 closedir(D);
386 return true;
387}
388 /*}}}*/
3b5421b4
AL
389// Acquire::MethodConfig::MethodConfig - Constructor /*{{{*/
390// ---------------------------------------------------------------------
391/* */
392pkgAcquire::MethodConfig::MethodConfig()
393{
394 SingleInstance = false;
395 PreScan = false;
0a8a80e5
AL
396 Pipeline = false;
397 SendConfig = false;
398 Next = 0;
399}
400 /*}}}*/
401
402// Queue::Queue - Constructor /*{{{*/
403// ---------------------------------------------------------------------
404/* */
405pkgAcquire::Queue::Queue(string Name,pkgAcquire *Owner) : Name(Name),
406 Owner(Owner)
407{
408 Items = 0;
409 Next = 0;
410 Workers = 0;
411}
412 /*}}}*/
413// Queue::~Queue - Destructor /*{{{*/
414// ---------------------------------------------------------------------
415/* */
416pkgAcquire::Queue::~Queue()
417{
418 Shutdown();
419
420 while (Items != 0)
421 {
422 QItem *Jnk = Items;
423 Items = Items->Next;
424 delete Jnk;
425 }
426}
427 /*}}}*/
428// Queue::Enqueue - Queue an item to the queue /*{{{*/
429// ---------------------------------------------------------------------
430/* */
8267fe24 431void pkgAcquire::Queue::Enqueue(ItemDesc &Item)
0a8a80e5
AL
432{
433 // Create a new item
8267fe24 434 QItem *I = new QItem;
0a8a80e5
AL
435 I->Next = Items;
436 Items = I;
8267fe24 437 *I = Item;
0a8a80e5 438
8267fe24 439 Item.Owner->QueueCounter++;
93bf083d
AL
440 if (Items->Next == 0)
441 Cycle();
0a8a80e5
AL
442}
443 /*}}}*/
c88edf1d 444// Queue::Dequeue - Remove an item from the queue /*{{{*/
0a8a80e5 445// ---------------------------------------------------------------------
bfd22fc0
AL
446/* We return true if we hit something*/
447bool pkgAcquire::Queue::Dequeue(Item *Owner)
0a8a80e5 448{
bfd22fc0
AL
449 bool Res = false;
450
0a8a80e5
AL
451 QItem **I = &Items;
452 for (; *I != 0;)
453 {
454 if ((*I)->Owner == Owner)
455 {
456 QItem *Jnk= *I;
457 *I = (*I)->Next;
458 Owner->QueueCounter--;
459 delete Jnk;
bfd22fc0 460 Res = true;
0a8a80e5
AL
461 }
462 else
463 I = &(*I)->Next;
464 }
bfd22fc0
AL
465
466 return Res;
0a8a80e5
AL
467}
468 /*}}}*/
469// Queue::Startup - Start the worker processes /*{{{*/
470// ---------------------------------------------------------------------
471/* */
472bool pkgAcquire::Queue::Startup()
473{
474 Shutdown();
475
93bf083d
AL
476 URI U(Name);
477 pkgAcquire::MethodConfig *Cnf = Owner->GetConfig(U.Access);
0a8a80e5
AL
478 if (Cnf == 0)
479 return false;
480
8267fe24 481 Workers = new Worker(this,Cnf,Owner->Log);
0a8a80e5
AL
482 Owner->Add(Workers);
483 if (Workers->Start() == false)
484 return false;
0a8a80e5 485
93bf083d 486 return Cycle();
0a8a80e5
AL
487}
488 /*}}}*/
489// Queue::Shutdown - Shutdown the worker processes /*{{{*/
490// ---------------------------------------------------------------------
491/* */
492bool pkgAcquire::Queue::Shutdown()
493{
494 // Delete all of the workers
495 while (Workers != 0)
496 {
497 pkgAcquire::Worker *Jnk = Workers;
498 Workers = Workers->NextQueue;
499 Owner->Remove(Jnk);
500 delete Jnk;
501 }
502
503 return true;
3b5421b4
AL
504}
505 /*}}}*/
c88edf1d
AL
506// Queue::Finditem - Find a URI in the item list /*{{{*/
507// ---------------------------------------------------------------------
508/* */
509pkgAcquire::Queue::QItem *pkgAcquire::Queue::FindItem(string URI,pkgAcquire::Worker *Owner)
510{
511 for (QItem *I = Items; I != 0; I = I->Next)
512 if (I->URI == URI && I->Worker == Owner)
513 return I;
514 return 0;
515}
516 /*}}}*/
517// Queue::ItemDone - Item has been completed /*{{{*/
518// ---------------------------------------------------------------------
519/* The worker signals this which causes the item to be removed from the
93bf083d
AL
520 queue. If this is the last queue instance then it is removed from the
521 main queue too.*/
c88edf1d
AL
522bool pkgAcquire::Queue::ItemDone(QItem *Itm)
523{
93bf083d
AL
524 if (Itm->Owner->QueueCounter <= 1)
525 Owner->Dequeue(Itm->Owner);
526 else
527 {
528 Dequeue(Itm->Owner);
529 Owner->Bump();
530 }
c88edf1d 531
93bf083d
AL
532 return Cycle();
533}
534 /*}}}*/
535// Queue::Cycle - Queue new items into the method /*{{{*/
536// ---------------------------------------------------------------------
537/* This locates a new idle item and sends it to the worker */
538bool pkgAcquire::Queue::Cycle()
539{
540 if (Items == 0 || Workers == 0)
c88edf1d
AL
541 return true;
542
93bf083d
AL
543 // Look for a queable item
544 QItem *I = Items;
545 for (; I != 0; I = I->Next)
546 if (I->Owner->Status == pkgAcquire::Item::StatIdle)
547 break;
548
549 // Nothing to do, queue is idle.
550 if (I == 0)
551 return true;
552
553 I->Worker = Workers;
554 I->Owner->Status = pkgAcquire::Item::StatFetching;
555 return Workers->QueueItem(I);
c88edf1d
AL
556}
557 /*}}}*/
be4401bf
AL
558// Queue::Bump - Fetch any pending objects if we are idle /*{{{*/
559// ---------------------------------------------------------------------
560/* */
561void pkgAcquire::Queue::Bump()
562{
563}
564 /*}}}*/
b98f2859
AL
565
566// AcquireStatus::pkgAcquireStatus - Constructor /*{{{*/
567// ---------------------------------------------------------------------
568/* */
569pkgAcquireStatus::pkgAcquireStatus()
570{
571 Start();
572}
573 /*}}}*/
574// AcquireStatus::Pulse - Called periodically /*{{{*/
575// ---------------------------------------------------------------------
576/* This computes some internal state variables for the derived classes to
577 use. It generates the current downloaded bytes and total bytes to download
578 as well as the current CPS estimate. */
579void pkgAcquireStatus::Pulse(pkgAcquire *Owner)
580{
581 TotalBytes = 0;
582 CurrentBytes = 0;
583
584 // Compute the total number of bytes to fetch
585 unsigned int Unknown = 0;
586 unsigned int Count = 0;
587 for (pkgAcquire::Item **I = Owner->ItemsBegin(); I != Owner->ItemsEnd();
588 I++, Count++)
589 {
590 TotalBytes += (*I)->FileSize;
591 if ((*I)->Complete == true)
592 CurrentBytes += (*I)->FileSize;
593 if ((*I)->FileSize == 0 && (*I)->Complete == false)
594 Unknown++;
595 }
596
597 // Compute the current completion
598 for (pkgAcquire::Worker *I = Owner->WorkersBegin(); I != 0;
599 I = Owner->WorkerStep(I))
600 if (I->CurrentItem != 0 && I->CurrentItem->Owner->Complete == false)
601 CurrentBytes += I->CurrentSize;
602
603 // Normalize the figures and account for unknown size downloads
604 if (TotalBytes <= 0)
605 TotalBytes = 1;
606 if (Unknown == Count)
607 TotalBytes = Unknown;
608 else
609 TotalBytes += TotalBytes/(Count - Unknown)*Unknown;
610
611 // Compute the CPS
612 struct timeval NewTime;
613 gettimeofday(&NewTime,0);
614 if (NewTime.tv_sec - Time.tv_sec == 6 && NewTime.tv_usec > Time.tv_usec ||
615 NewTime.tv_sec - Time.tv_sec > 6)
616 {
617 // Compute the delta time with full accuracy
618 long usdiff = NewTime.tv_usec - Time.tv_usec;
619 long sdiff = NewTime.tv_sec - Time.tv_sec;
620
621 // Borrow
622 if (usdiff < 0)
623 {
624 usdiff += 1000000;
625 sdiff--;
626 }
627
628 // Compute the CPS value
629 CurrentCPS = (CurrentBytes - LastBytes)/(sdiff + usdiff/1000000.0);
630 LastBytes = CurrentBytes;
631 ElapsedTime = NewTime.tv_sec - StartTime.tv_sec;
632 Time = NewTime;
633 }
634}
635 /*}}}*/
636// AcquireStatus::Start - Called when the download is started /*{{{*/
637// ---------------------------------------------------------------------
638/* We just reset the counters */
639void pkgAcquireStatus::Start()
640{
641 gettimeofday(&Time,0);
642 gettimeofday(&StartTime,0);
643 LastBytes = 0;
644 CurrentCPS = 0;
645 CurrentBytes = 0;
646 TotalBytes = 0;
647 FetchedBytes = 0;
648 ElapsedTime = 0;
649}
650 /*}}}*/
651// pkgAcquireStatus::Stop - Finished downloading /*{{{*/
652// ---------------------------------------------------------------------
653/* This accurately computes the elapsed time and the total overall CPS. */
654void pkgAcquireStatus::Stop()
655{
656 // Compute the CPS and elapsed time
657 struct timeval NewTime;
658 gettimeofday(&NewTime,0);
659
660 // Compute the delta time with full accuracy
661 long usdiff = NewTime.tv_usec - StartTime.tv_usec;
662 long sdiff = NewTime.tv_sec - StartTime.tv_sec;
663
664 // Borrow
665 if (usdiff < 0)
666 {
667 usdiff += 1000000;
668 sdiff--;
669 }
670
671 // Compute the CPS value
672 CurrentCPS = FetchedBytes/(sdiff + usdiff/1000000.0);
673 LastBytes = CurrentBytes;
674 ElapsedTime = sdiff;
675}
676 /*}}}*/
677// AcquireStatus::Fetched - Called when a byte set has been fetched /*{{{*/
678// ---------------------------------------------------------------------
679/* This is used to get accurate final transfer rate reporting. */
680void pkgAcquireStatus::Fetched(unsigned long Size,unsigned long Resume)
93274b8d 681{
b98f2859
AL
682 FetchedBytes += Size - Resume;
683}
684 /*}}}*/