Fixed typo

[apt.git] / apt-pkg / acquire.cc

diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
index e73619530a0732b8a33b214e4133f0ed2023c9ba..80624f9d3341bbc209123b8ca9b94cecc10490ff 100644 (file)
--- a/apt-pkg/acquire.cc
+++ b/apt-pkg/acquire.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: acquire.cc,v 1.22 1998/12/11 06:32:35 jgg Exp $
+// $Id: acquire.cc,v 1.29 1999/03/16 00:43:55 jgg Exp $

 /* ######################################################################
 
    Acquire - File Acquiration
 /* ######################################################################
 
    Acquire - File Acquiration


@@ -21,7 +21,7 @@
 #include <apt-pkg/acquire-worker.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/acquire-worker.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>

-#include <strutl.h>
+#include <apt-pkg/strutl.h>

 
 #include <dirent.h>
 #include <sys/time.h>
 
 #include <dirent.h>
 #include <sys/time.h>


@@ -297,7 +297,13 @@ bool pkgAcquire::Run()
       FD_ZERO(&WFds);
       SetFds(Highest,&RFds,&WFds);
       
       FD_ZERO(&WFds);
       SetFds(Highest,&RFds,&WFds);
       

-      int Res = select(Highest+1,&RFds,&WFds,0,&tv);
+      int Res;
+      do
+      {
+        Res = select(Highest+1,&RFds,&WFds,0,&tv);
+      }
+      while (Res < 0 && errno == EINTR);
+      

       if (Res < 0)
       {
         _error->Errno("select","Select has failed");
       if (Res < 0)
       {
         _error->Errno("select","Select has failed");


@@ -413,6 +419,22 @@ unsigned long pkgAcquire::FetchNeeded()
    return Total;
 }
                                                                        /*}}}*/
    return Total;
 }
                                                                        /*}}}*/

+// pkgAcquire::UriBegin - Start iterator for the uri list              /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+pkgAcquire::UriIterator pkgAcquire::UriBegin()
+{
+   return UriIterator(Queues);
+}
+                                                                       /*}}}*/
+// pkgAcquire::UriEnd - End iterator for the uri list                  /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+pkgAcquire::UriIterator pkgAcquire::UriEnd()
+{
+   return UriIterator(0);
+}
+                                                                       /*}}}*/

 
 // Acquire::MethodConfig::MethodConfig - Constructor                   /*{{{*/
 // ---------------------------------------------------------------------
 
 // Acquire::MethodConfig::MethodConfig - Constructor                   /*{{{*/
 // ---------------------------------------------------------------------


@@ -547,7 +569,7 @@ bool pkgAcquire::Queue::Shutdown()
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-// Queue::Finditem - Find a URI in the item list                       /*{{{*/
+// Queue::FindItem - Find a URI in the item list                       /*{{{*/

 // ---------------------------------------------------------------------
 /* */
 pkgAcquire::Queue::QItem *pkgAcquire::Queue::FindItem(string URI,pkgAcquire::Worker *Owner)
 // ---------------------------------------------------------------------
 /* */
 pkgAcquire::Queue::QItem *pkgAcquire::Queue::FindItem(string URI,pkgAcquire::Worker *Owner)


@@ -589,9 +611,12 @@ bool pkgAcquire::Queue::Cycle()
    if (Items == 0 || Workers == 0)
       return true;
 
    if (Items == 0 || Workers == 0)
       return true;
 

+   if (PipeDepth < 0)
+      return _error->Error("Pipedepth failure");
+                          

    // Look for a queable item
    QItem *I = Items;
    // Look for a queable item
    QItem *I = Items;

-   while (PipeDepth < MaxPipeDepth)
+   while (PipeDepth < (signed)MaxPipeDepth)

    {
       for (; I != 0; I = I->Next)
         if (I->Owner->Status == pkgAcquire::Item::StatIdle)
    {
       for (; I != 0; I = I->Next)
         if (I->Owner->Status == pkgAcquire::Item::StatIdle)


@@ -603,6 +628,7 @@ bool pkgAcquire::Queue::Cycle()
       
       I->Worker = Workers;
       I->Owner->Status = pkgAcquire::Item::StatFetching;
       
       I->Worker = Workers;
       I->Owner->Status = pkgAcquire::Item::StatFetching;

+      PipeDepth++;

       if (Workers->QueueItem(I) == false)
         return false;
    }
       if (Workers->QueueItem(I) == false)
         return false;
    }


@@ -680,24 +706,16 @@ void pkgAcquireStatus::Pulse(pkgAcquire *Owner)
    if (NewTime.tv_sec - Time.tv_sec == 6 && NewTime.tv_usec > Time.tv_usec ||
        NewTime.tv_sec - Time.tv_sec > 6)
    {    
    if (NewTime.tv_sec - Time.tv_sec == 6 && NewTime.tv_usec > Time.tv_usec ||
        NewTime.tv_sec - Time.tv_sec > 6)
    {    

-      // Compute the delta time with full accuracy
-      long usdiff = NewTime.tv_usec - Time.tv_usec;
-      long sdiff = NewTime.tv_sec - Time.tv_sec;
+      double Delta = NewTime.tv_sec - Time.tv_sec + 
+                    (NewTime.tv_usec - Time.tv_usec)/1000000.0;

       
       

-      // Borrow
-      if (usdiff < 0)
-      {         
-        usdiff += 1000000;
-        sdiff--;
-      }
-            

       // Compute the CPS value
       // Compute the CPS value

-      if (sdiff == 0 && usdiff == 0)
+      if (Delta < 0.01)

         CurrentCPS = 0;
       else
         CurrentCPS = 0;
       else

-        CurrentCPS = (CurrentBytes - LastBytes)/(sdiff + usdiff/1000000.0);
+        CurrentCPS = (CurrentBytes - LastBytes)/Delta;

       LastBytes = CurrentBytes;
       LastBytes = CurrentBytes;

-      ElapsedTime = NewTime.tv_sec - StartTime.tv_sec;
+      ElapsedTime = (unsigned long)Delta;

       Time = NewTime;
    }
 }
       Time = NewTime;
    }
 }