G++3 fixes from Randolph

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

diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
index 21aade75d6a8c98aec34ed1c5c5e464840e76ffa..1be8551f451fa9c911b29408ccca99ebc050d280 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.4 1998/10/24 04:58:01 jgg Exp $
+// $Id: acquire.cc,v 1.47 2001/02/20 07:03:17 jgg Exp $

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


@@ -21,18 +21,26 @@
 #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 <apti18n.h>
+    
+#include <dirent.h>
+#include <sys/time.h>
+#include <errno.h>
+#include <sys/stat.h>

                                                                        /*}}}*/
 
 // Acquire::pkgAcquire - Constructor                                   /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 
 // Acquire::pkgAcquire - Constructor                                   /*{{{*/
 // ---------------------------------------------------------------------

-/* */
-pkgAcquire::pkgAcquire()
+/* We grab some runtime state from the configuration space */
+pkgAcquire::pkgAcquire(pkgAcquireStatus *Log) : Log(Log)

 {
    Queues = 0;
    Configs = 0;
    Workers = 0;
    ToFetch = 0;
 {
    Queues = 0;
    Configs = 0;
    Workers = 0;
    ToFetch = 0;

+   Running = false;

    
    string Mode = _config->Find("Acquire::Queue-Mode","host");
    if (strcasecmp(Mode.c_str(),"host") == 0)
    
    string Mode = _config->Find("Acquire::Queue-Mode","host");
    if (strcasecmp(Mode.c_str(),"host") == 0)


@@ -41,22 +49,41 @@ pkgAcquire::pkgAcquire()
       QueueMode = QueueAccess;   
 
    Debug = _config->FindB("Debug::pkgAcquire",false);
       QueueMode = QueueAccess;   
 
    Debug = _config->FindB("Debug::pkgAcquire",false);

+   
+   // This is really a stupid place for this
+   struct stat St;
+   if (stat((_config->FindDir("Dir::State::lists") + "partial/").c_str(),&St) != 0 ||
+       S_ISDIR(St.st_mode) == 0)
+      _error->Error(_("Lists directory %spartial is missing."),
+                   _config->FindDir("Dir::State::lists").c_str());
+   if (stat((_config->FindDir("Dir::Cache::Archives") + "partial/").c_str(),&St) != 0 ||
+       S_ISDIR(St.st_mode) == 0)
+      _error->Error(_("Archive directory %spartial is missing."),
+                   _config->FindDir("Dir::Cache::Archives").c_str());

 }
                                                                        /*}}}*/
 // Acquire::~pkgAcquire        - Destructor                                    /*{{{*/
 // ---------------------------------------------------------------------
 }
                                                                        /*}}}*/
 // Acquire::~pkgAcquire        - Destructor                                    /*{{{*/
 // ---------------------------------------------------------------------

-/* Free our memory */
+/* Free our memory, clean up the queues (destroy the workers) */

 pkgAcquire::~pkgAcquire()
 {
 pkgAcquire::~pkgAcquire()
 {

-   while (Items.size() != 0)
-      delete Items[0];
-
+   Shutdown();
+   

    while (Configs != 0)
    {
       MethodConfig *Jnk = Configs;
       Configs = Configs->Next;
       delete Jnk;
    }   
    while (Configs != 0)
    {
       MethodConfig *Jnk = Configs;
       Configs = Configs->Next;
       delete Jnk;
    }   

+}
+                                                                       /*}}}*/
+// Acquire::Shutdown - Clean out the acquire object                    /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+void pkgAcquire::Shutdown()
+{
+   while (Items.size() != 0)
+      delete Items[0];

 
    while (Queues != 0)
    {
 
    while (Queues != 0)
    {


@@ -68,7 +95,8 @@ pkgAcquire::~pkgAcquire()
                                                                        /*}}}*/
 // Acquire::Add - Add a new item                                       /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 // Acquire::Add - Add a new item                                       /*{{{*/
 // ---------------------------------------------------------------------

-/* */
+/* This puts an item on the acquire list. This list is mainly for tracking
+   item status */

 void pkgAcquire::Add(Item *Itm)
 {
    Items.push_back(Itm);
 void pkgAcquire::Add(Item *Itm)
 {
    Items.push_back(Itm);


@@ -76,19 +104,22 @@ void pkgAcquire::Add(Item *Itm)
                                                                        /*}}}*/
 // Acquire::Remove - Remove a item                                     /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 // Acquire::Remove - Remove a item                                     /*{{{*/
 // ---------------------------------------------------------------------

-/* */
+/* Remove an item from the acquire list. This is usually not used.. */

 void pkgAcquire::Remove(Item *Itm)
 {
 void pkgAcquire::Remove(Item *Itm)
 {

+   Dequeue(Itm);
+   

    for (vector<Item *>::iterator I = Items.begin(); I < Items.end(); I++)
    {
       if (*I == Itm)
         Items.erase(I);
    for (vector<Item *>::iterator I = Items.begin(); I < Items.end(); I++)
    {
       if (*I == Itm)
         Items.erase(I);

-   }   
+   }

 }
                                                                        /*}}}*/
 // Acquire::Add - Add a worker                                         /*{{{*/
 // ---------------------------------------------------------------------
 }
                                                                        /*}}}*/
 // Acquire::Add - Add a worker                                         /*{{{*/
 // ---------------------------------------------------------------------

-/* */
+/* A list of workers is kept so that the select loop can direct their FD
+   usage. */

 void pkgAcquire::Add(Worker *Work)
 {
    Work->NextAcquire = Workers;
 void pkgAcquire::Add(Worker *Work)
 {
    Work->NextAcquire = Workers;


@@ -97,9 +128,14 @@ void pkgAcquire::Add(Worker *Work)
                                                                        /*}}}*/
 // Acquire::Remove - Remove a worker                                   /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 // Acquire::Remove - Remove a worker                                   /*{{{*/
 // ---------------------------------------------------------------------

-/* */
+/* A worker has died. This can not be done while the select loop is running
+   as it would require that RunFds could handling a changing list state and
+   it cant.. */

 void pkgAcquire::Remove(Worker *Work)
 {
 void pkgAcquire::Remove(Worker *Work)
 {

+   if (Running == true)
+      abort();
+   

    Worker **I = &Workers;
    for (; *I != 0;)
    {
    Worker **I = &Workers;
    for (; *I != 0;)
    {


@@ -112,11 +148,15 @@ void pkgAcquire::Remove(Worker *Work)
                                                                        /*}}}*/
 // Acquire::Enqueue - Queue an URI for fetching                                /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 // Acquire::Enqueue - Queue an URI for fetching                                /*{{{*/
 // ---------------------------------------------------------------------

-/* */
-void pkgAcquire::Enqueue(Item *Itm,string URI,string Description)
+/* This is the entry point for an item. An item calls this function when
+   it is constructed which creates a queue (based on the current queue
+   mode) and puts the item in that queue. If the system is running then
+   the queue might be started. */
+void pkgAcquire::Enqueue(ItemDesc &Item)

 {
    // Determine which queue to put the item in
 {
    // Determine which queue to put the item in

-   string Name = QueueName(URI);
+   const MethodConfig *Config;
+   string Name = QueueName(Item.URI,Config);

    if (Name.empty() == true)
       return;
 
    if (Name.empty() == true)
       return;
 


@@ -128,30 +168,44 @@ void pkgAcquire::Enqueue(Item *Itm,string URI,string Description)
       I = new Queue(Name,this);
       I->Next = Queues;
       Queues = I;
       I = new Queue(Name,this);
       I->Next = Queues;
       Queues = I;

+      
+      if (Running == true)
+        I->Startup();

    }
    }

+
+   // See if this is a local only URI
+   if (Config->LocalOnly == true && Item.Owner->Complete == false)
+      Item.Owner->Local = true;
+   Item.Owner->Status = Item::StatIdle;

    
    // Queue it into the named queue
    
    // Queue it into the named queue

-   I->Enqueue(Itm,URI,Description);
+   I->Enqueue(Item);

    ToFetch++;
    ToFetch++;

-      
+         

    // Some trace stuff
    if (Debug == true)
    {
    // Some trace stuff
    if (Debug == true)
    {

-      clog << "Fetching " << URI << endl;
-      clog << " to " << Itm->DestFile << endl;
-      clog << " Queue is: " << QueueName(URI) << endl;
+      clog << "Fetching " << Item.URI << endl;
+      clog << " to " << Item.Owner->DestFile << endl;
+      clog << " Queue is: " << Name << endl;

    }
 }
                                                                        /*}}}*/
 // Acquire::Dequeue - Remove an item from all queues                   /*{{{*/
 // ---------------------------------------------------------------------
    }
 }
                                                                        /*}}}*/
 // Acquire::Dequeue - Remove an item from all queues                   /*{{{*/
 // ---------------------------------------------------------------------

-/* */
+/* This is called when an item is finished being fetched. It removes it
+   from all the queues */

 void pkgAcquire::Dequeue(Item *Itm)
 {
    Queue *I = Queues;
 void pkgAcquire::Dequeue(Item *Itm)
 {
    Queue *I = Queues;

+   bool Res = false;

    for (; I != 0; I = I->Next)
    for (; I != 0; I = I->Next)

-      I->Dequeue(Itm);
-   ToFetch--;
+      Res |= I->Dequeue(Itm);
+   
+   if (Debug == true)
+      clog << "Dequeuing " << Itm->DestFile << endl;
+   if (Res == true)
+      ToFetch--;

 }
                                                                        /*}}}*/
 // Acquire::QueueName - Return the name of the queue for this URI      /*{{{*/
 }
                                                                        /*}}}*/
 // Acquire::QueueName - Return the name of the queue for this URI      /*{{{*/


@@ -159,24 +213,20 @@ void pkgAcquire::Dequeue(Item *Itm)
 /* The string returned depends on the configuration settings and the
    method parameters. Given something like http://foo.org/bar it can
    return http://foo.org or http */
 /* The string returned depends on the configuration settings and the
    method parameters. Given something like http://foo.org/bar it can
    return http://foo.org or http */

-string pkgAcquire::QueueName(string URI)
+string pkgAcquire::QueueName(string Uri,MethodConfig const *&Config)

 {
 {

-   const MethodConfig *Config = GetConfig(URIAccess(URI));
+   URI U(Uri);
+   
+   Config = GetConfig(U.Access);

    if (Config == 0)
       return string();
    
    /* Single-Instance methods get exactly one queue per URI. This is
       also used for the Access queue method  */
    if (Config->SingleInstance == true || QueueMode == QueueAccess)
    if (Config == 0)
       return string();
    
    /* Single-Instance methods get exactly one queue per URI. This is
       also used for the Access queue method  */
    if (Config->SingleInstance == true || QueueMode == QueueAccess)

-      return URIAccess(URI);
-      
-   // Host based queue 
-   string::iterator I = URI.begin();
-   for (; I < URI.end() && *I != ':'; I++);
-   for (; I < URI.end() && (*I == '/' || *I == ':'); I++);
-   for (; I < URI.end() && *I != '/'; I++);
-       
-   return string(URI,0,I - URI.begin());
+       return U.Access;
+
+   return U.Access + ':' + U.Host;

 }
                                                                        /*}}}*/
 // Acquire::GetConfig - Fetch the configuration information            /*{{{*/
 }
                                                                        /*}}}*/
 // Acquire::GetConfig - Fetch the configuration information            /*{{{*/


@@ -230,7 +280,9 @@ void pkgAcquire::SetFds(int &Fd,fd_set *RSet,fd_set *WSet)
                                                                        /*}}}*/
 // Acquire::RunFds - Deal with active FDs                              /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 // Acquire::RunFds - Deal with active FDs                              /*{{{*/
 // ---------------------------------------------------------------------

-/* Dispatch active FDs over to the proper workers */
+/* Dispatch active FDs over to the proper workers. It is very important
+   that a worker never be erased while this is running! The queue class
+   should never erase a worker except during shutdown processing. */

 void pkgAcquire::RunFds(fd_set *RSet,fd_set *WSet)
 {
    for (Worker *I = Workers; I != 0; I = I->NextAcquire)
 void pkgAcquire::RunFds(fd_set *RSet,fd_set *WSet)
 {
    for (Worker *I = Workers; I != 0; I = I->NextAcquire)


@@ -247,12 +299,22 @@ void pkgAcquire::RunFds(fd_set *RSet,fd_set *WSet)
 /* This runs the queues. It manages a select loop for all of the
    Worker tasks. The workers interact with the queues and items to
    manage the actual fetch. */
 /* This runs the queues. It manages a select loop for all of the
    Worker tasks. The workers interact with the queues and items to
    manage the actual fetch. */

-bool pkgAcquire::Run()
+pkgAcquire::RunResult pkgAcquire::Run()

 {
 {

+   Running = true;
+   

    for (Queue *I = Queues; I != 0; I = I->Next)
       I->Startup();
    
    for (Queue *I = Queues; I != 0; I = I->Next)
       I->Startup();
    

+   if (Log != 0)
+      Log->Start();
+   
+   bool WasCancelled = false;
+

    // Run till all things have been acquired
    // Run till all things have been acquired

+   struct timeval tv;
+   tv.tv_sec = 0;
+   tv.tv_usec = 500000; 

    while (ToFetch > 0)
    {
       fd_set RFds;
    while (ToFetch > 0)
    {
       fd_set RFds;


@@ -262,16 +324,165 @@ bool pkgAcquire::Run()
       FD_ZERO(&WFds);
       SetFds(Highest,&RFds,&WFds);
       
       FD_ZERO(&WFds);
       SetFds(Highest,&RFds,&WFds);
       

-      if (select(Highest+1,&RFds,&WFds,0,0) <= 0)
-        return _error->Errno("select","Select has failed");
+      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");
+        break;
+      }
+            

       RunFds(&RFds,&WFds);
       RunFds(&RFds,&WFds);

+      if (_error->PendingError() == true)
+        break;
+      
+      // Timeout, notify the log class
+      if (Res == 0 || (Log != 0 && Log->Update == true))
+      {
+        tv.tv_usec = 500000;
+        for (Worker *I = Workers; I != 0; I = I->NextAcquire)
+           I->Pulse();
+        if (Log != 0 && Log->Pulse(this) == false)
+        {
+           WasCancelled = true;
+           break;
+        }
+      }      

    }   
    }   

+
+   if (Log != 0)
+      Log->Stop();

    
    

+   // Shut down the acquire bits
+   Running = false;

    for (Queue *I = Queues; I != 0; I = I->Next)
    for (Queue *I = Queues; I != 0; I = I->Next)

-      I->Shutdown();
+      I->Shutdown(false);

 
 

-   return true;
+   // Shut down the items
+   for (Item **I = Items.begin(); I != Items.end(); I++)
+      (*I)->Finished(); 
+   
+   if (_error->PendingError())
+      return Failed;
+   if (WasCancelled)
+      return Cancelled;
+   return Continue;
+}
+                                                                       /*}}}*/
+// Acquire::Bump - Called when an item is dequeued                     /*{{{*/
+// ---------------------------------------------------------------------
+/* This routine bumps idle queues in hopes that they will be able to fetch
+   the dequeued item */
+void pkgAcquire::Bump()
+{
+   for (Queue *I = Queues; I != 0; I = I->Next)
+      I->Bump();
+}
+                                                                       /*}}}*/
+// Acquire::WorkerStep - Step to the next worker                       /*{{{*/
+// ---------------------------------------------------------------------
+/* Not inlined to advoid including acquire-worker.h */
+pkgAcquire::Worker *pkgAcquire::WorkerStep(Worker *I)
+{
+   return I->NextAcquire;
+};
+                                                                       /*}}}*/
+// Acquire::Clean - Cleans a directory                                 /*{{{*/
+// ---------------------------------------------------------------------
+/* This is a bit simplistic, it looks at every file in the dir and sees
+   if it is part of the download set. */
+bool pkgAcquire::Clean(string Dir)
+{
+   DIR *D = opendir(Dir.c_str());   
+   if (D == 0)
+      return _error->Errno("opendir",_("Unable to read %s"),Dir.c_str());
+   
+   string StartDir = SafeGetCWD();
+   if (chdir(Dir.c_str()) != 0)
+   {
+      closedir(D);
+      return _error->Errno("chdir",_("Unable to change to %s"),Dir.c_str());
+   }
+   
+   for (struct dirent *Dir = readdir(D); Dir != 0; Dir = readdir(D))
+   {
+      // Skip some files..
+      if (strcmp(Dir->d_name,"lock") == 0 ||
+         strcmp(Dir->d_name,"partial") == 0 ||
+         strcmp(Dir->d_name,".") == 0 ||
+         strcmp(Dir->d_name,"..") == 0)
+        continue;
+      
+      // Look in the get list
+      vector<Item *>::iterator I = Items.begin();
+      for (; I != Items.end(); I++)
+        if (flNotDir((*I)->DestFile) == Dir->d_name)
+           break;
+      
+      // Nothing found, nuke it
+      if (I == Items.end())
+        unlink(Dir->d_name);
+   };
+   
+   chdir(StartDir.c_str());
+   closedir(D);
+   return true;   
+}
+                                                                       /*}}}*/
+// Acquire::TotalNeeded - Number of bytes to fetch                     /*{{{*/
+// ---------------------------------------------------------------------
+/* This is the total number of bytes needed */
+double pkgAcquire::TotalNeeded()
+{
+   double Total = 0;
+   for (pkgAcquire::Item **I = ItemsBegin(); I != ItemsEnd(); I++)
+      Total += (*I)->FileSize;
+   return Total;
+}
+                                                                       /*}}}*/
+// Acquire::FetchNeeded - Number of bytes needed to get                        /*{{{*/
+// ---------------------------------------------------------------------
+/* This is the number of bytes that is not local */
+double pkgAcquire::FetchNeeded()
+{
+   double Total = 0;
+   for (pkgAcquire::Item **I = ItemsBegin(); I != ItemsEnd(); I++)
+      if ((*I)->Local == false)
+        Total += (*I)->FileSize;
+   return Total;
+}
+                                                                       /*}}}*/
+// Acquire::PartialPresent - Number of partial bytes we already have   /*{{{*/
+// ---------------------------------------------------------------------
+/* This is the number of bytes that is not local */
+double pkgAcquire::PartialPresent()
+{
+  double Total = 0;
+   for (pkgAcquire::Item **I = ItemsBegin(); I != ItemsEnd(); I++)
+      if ((*I)->Local == false)
+        Total += (*I)->PartialSize;
+   return Total;
+}
+                                                                       /*}}}*/
+// Acquire::UriBegin - Start iterator for the uri list                 /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+pkgAcquire::UriIterator pkgAcquire::UriBegin()
+{
+   return UriIterator(Queues);
+}
+                                                                       /*}}}*/
+// Acquire::UriEnd - End iterator for the uri list                     /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+pkgAcquire::UriIterator pkgAcquire::UriEnd()
+{
+   return UriIterator(0);

 }
                                                                        /*}}}*/
 
 }
                                                                        /*}}}*/
 


@@ -281,9 +492,10 @@ bool pkgAcquire::Run()
 pkgAcquire::MethodConfig::MethodConfig()
 {
    SingleInstance = false;
 pkgAcquire::MethodConfig::MethodConfig()
 {
    SingleInstance = false;

-   PreScan = false;

    Pipeline = false;
    SendConfig = false;
    Pipeline = false;
    SendConfig = false;

+   LocalOnly = false;
+   Removable = false;

    Next = 0;
 }
                                                                        /*}}}*/
    Next = 0;
 }
                                                                        /*}}}*/


@@ -297,6 +509,8 @@ pkgAcquire::Queue::Queue(string Name,pkgAcquire *Owner) : Name(Name),
    Items = 0;
    Next = 0;
    Workers = 0;
    Items = 0;
    Next = 0;
    Workers = 0;

+   MaxPipeDepth = 1;
+   PipeDepth = 0;

 }
                                                                        /*}}}*/
 // Queue::~Queue - Destructor                                          /*{{{*/
 }
                                                                        /*}}}*/
 // Queue::~Queue - Destructor                                          /*{{{*/


@@ -304,7 +518,7 @@ pkgAcquire::Queue::Queue(string Name,pkgAcquire *Owner) : Name(Name),
 /* */
 pkgAcquire::Queue::~Queue()
 {
 /* */
 pkgAcquire::Queue::~Queue()
 {

-   Shutdown();
+   Shutdown(true);

    
    while (Items != 0)
    {
    
    while (Items != 0)
    {


@@ -317,25 +531,32 @@ pkgAcquire::Queue::~Queue()
 // Queue::Enqueue - Queue an item to the queue                         /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // Queue::Enqueue - Queue an item to the queue                         /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-void pkgAcquire::Queue::Enqueue(Item *Owner,string URI,string Description)
+void pkgAcquire::Queue::Enqueue(ItemDesc &Item)

 {
 {

+   QItem **I = &Items;
+   for (; *I != 0; I = &(*I)->Next);
+   

    // Create a new item
    // Create a new item

-   QItem *I = new QItem;   
-   I->Next = Items;
-   Items = I;
+   QItem *Itm = new QItem;
+   *Itm = Item;
+   Itm->Next = 0;
+   *I = Itm;

    
    

-   // Fill it in
-   Items->Owner = Owner;
-   Items->URI = URI;
-   Items->Description = Description;
-   Owner->QueueCounter++;
+   Item.Owner->QueueCounter++;   
+   if (Items->Next == 0)
+      Cycle();

 }
                                                                        /*}}}*/
 // Queue::Dequeue - Remove an item from the queue                      /*{{{*/
 // ---------------------------------------------------------------------
 }
                                                                        /*}}}*/
 // Queue::Dequeue - Remove an item from the queue                      /*{{{*/
 // ---------------------------------------------------------------------

-/* */
-void pkgAcquire::Queue::Dequeue(Item *Owner)
+/* We return true if we hit something */
+bool pkgAcquire::Queue::Dequeue(Item *Owner)

 {
 {

+   if (Owner->Status == pkgAcquire::Item::StatFetching)
+      return _error->Error("Tried to dequeue a fetching object");
+       
+   bool Res = false;
+   

    QItem **I = &Items;
    for (; *I != 0;)
    {
    QItem **I = &Items;
    for (; *I != 0;)
    {


@@ -345,52 +566,70 @@ void pkgAcquire::Queue::Dequeue(Item *Owner)
         *I = (*I)->Next;
         Owner->QueueCounter--;
         delete Jnk;
         *I = (*I)->Next;
         Owner->QueueCounter--;
         delete Jnk;

+        Res = true;

       }
       else
         I = &(*I)->Next;
    }
       }
       else
         I = &(*I)->Next;
    }

+   
+   return Res;

 }
                                                                        /*}}}*/
 // Queue::Startup - Start the worker processes                         /*{{{*/
 // ---------------------------------------------------------------------
 }
                                                                        /*}}}*/
 // Queue::Startup - Start the worker processes                         /*{{{*/
 // ---------------------------------------------------------------------

-/* */
+/* It is possible for this to be called with a pre-existing set of
+   workers. */

 bool pkgAcquire::Queue::Startup()
 {
 bool pkgAcquire::Queue::Startup()
 {

-   Shutdown();
-   
-   pkgAcquire::MethodConfig *Cnf = Owner->GetConfig(URIAccess(Name));
-   if (Cnf == 0)
-      return false;
-   
-   Workers = new Worker(this,Cnf);
-   Owner->Add(Workers);
-   if (Workers->Start() == false)
-      return false;
+   if (Workers == 0)
+   {
+      URI U(Name);
+      pkgAcquire::MethodConfig *Cnf = Owner->GetConfig(U.Access);
+      if (Cnf == 0)
+        return false;

       
       

-   Items->Worker = Workers;
-   Workers->QueueItem(Items);
+      Workers = new Worker(this,Cnf,Owner->Log);
+      Owner->Add(Workers);
+      if (Workers->Start() == false)
+        return false;
+      
+      /* When pipelining we commit 10 items. This needs to change when we
+         added other source retry to have cycle maintain a pipeline depth
+         on its own. */
+      if (Cnf->Pipeline == true)
+        MaxPipeDepth = 10;
+      else
+        MaxPipeDepth = 1;
+   }

    
    

-   return true;
+   return Cycle();

 }
                                                                        /*}}}*/
 // Queue::Shutdown - Shutdown the worker processes                     /*{{{*/
 // ---------------------------------------------------------------------
 }
                                                                        /*}}}*/
 // Queue::Shutdown - Shutdown the worker processes                     /*{{{*/
 // ---------------------------------------------------------------------

-/* */
-bool pkgAcquire::Queue::Shutdown()
+/* If final is true then all workers are eliminated, otherwise only workers
+   that do not need cleanup are removed */
+bool pkgAcquire::Queue::Shutdown(bool Final)

 {
    // Delete all of the workers
 {
    // Delete all of the workers

-   while (Workers != 0)
+   pkgAcquire::Worker **Cur = &Workers;
+   while (*Cur != 0)

    {
    {

-      pkgAcquire::Worker *Jnk = Workers;
-      Workers = Workers->NextQueue;
-      Owner->Remove(Jnk);
-      delete Jnk;
+      pkgAcquire::Worker *Jnk = *Cur;
+      if (Final == true || Jnk->GetConf()->NeedsCleanup == false)
+      {
+        *Cur = Jnk->NextQueue;
+        Owner->Remove(Jnk);
+        delete Jnk;
+      }
+      else
+        Cur = &(*Cur)->NextQueue;      

    }
    
    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)


@@ -404,16 +643,199 @@ pkgAcquire::Queue::QItem *pkgAcquire::Queue::FindItem(string URI,pkgAcquire::Wor
 // Queue::ItemDone - Item has been completed                           /*{{{*/
 // ---------------------------------------------------------------------
 /* The worker signals this which causes the item to be removed from the
 // Queue::ItemDone - Item has been completed                           /*{{{*/
 // ---------------------------------------------------------------------
 /* The worker signals this which causes the item to be removed from the

-   queue. */
+   queue. If this is the last queue instance then it is removed from the
+   main queue too.*/

 bool pkgAcquire::Queue::ItemDone(QItem *Itm)
 {
 bool pkgAcquire::Queue::ItemDone(QItem *Itm)
 {

-   Dequeue(Itm->Owner);
+   PipeDepth--;
+   if (Itm->Owner->Status == pkgAcquire::Item::StatFetching)
+      Itm->Owner->Status = pkgAcquire::Item::StatDone;

    
    

-   if (Items == 0)
+   if (Itm->Owner->QueueCounter <= 1)
+      Owner->Dequeue(Itm->Owner);
+   else
+   {
+      Dequeue(Itm->Owner);
+      Owner->Bump();
+   }
+   
+   return Cycle();
+}
+                                                                       /*}}}*/
+// Queue::Cycle - Queue new items into the method                      /*{{{*/
+// ---------------------------------------------------------------------
+/* This locates a new idle item and sends it to the worker. If pipelining
+   is enabled then it keeps the pipe full. */
+bool pkgAcquire::Queue::Cycle()
+{
+   if (Items == 0 || Workers == 0)

       return true;
 
       return true;
 

-   Items->Worker = Workers;
-   Items->Owner->Status = pkgAcquire::Item::StatFetching;
-   return Workers->QueueItem(Items);
+   if (PipeDepth < 0)
+      return _error->Error("Pipedepth failure");
+                          
+   // Look for a queable item
+   QItem *I = Items;
+   while (PipeDepth < (signed)MaxPipeDepth)
+   {
+      for (; I != 0; I = I->Next)
+        if (I->Owner->Status == pkgAcquire::Item::StatIdle)
+           break;
+      
+      // Nothing to do, queue is idle.
+      if (I == 0)
+        return true;
+      
+      I->Worker = Workers;
+      I->Owner->Status = pkgAcquire::Item::StatFetching;
+      PipeDepth++;
+      if (Workers->QueueItem(I) == false)
+        return false;
+   }
+   
+   return true;
+}
+                                                                       /*}}}*/
+// Queue::Bump - Fetch any pending objects if we are idle              /*{{{*/
+// ---------------------------------------------------------------------
+/* This is called when an item in multiple queues is dequeued */
+void pkgAcquire::Queue::Bump()
+{
+   Cycle();
+}
+                                                                       /*}}}*/
+
+// AcquireStatus::pkgAcquireStatus - Constructor                       /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+pkgAcquireStatus::pkgAcquireStatus() : Update(true), MorePulses(false)
+{
+   Start();
+}
+                                                                       /*}}}*/
+// AcquireStatus::Pulse - Called periodically                          /*{{{*/
+// ---------------------------------------------------------------------
+/* This computes some internal state variables for the derived classes to
+   use. It generates the current downloaded bytes and total bytes to download
+   as well as the current CPS estimate. */
+bool pkgAcquireStatus::Pulse(pkgAcquire *Owner)
+{
+   TotalBytes = 0;
+   CurrentBytes = 0;
+   TotalItems = 0;
+   CurrentItems = 0;
+   
+   // Compute the total number of bytes to fetch
+   unsigned int Unknown = 0;
+   unsigned int Count = 0;
+   for (pkgAcquire::Item **I = Owner->ItemsBegin(); I != Owner->ItemsEnd(); 
+       I++, Count++)
+   {
+      TotalItems++;
+      if ((*I)->Status == pkgAcquire::Item::StatDone)
+        CurrentItems++;
+      
+      // Totally ignore local items
+      if ((*I)->Local == true)
+        continue;
+
+      TotalBytes += (*I)->FileSize;
+      if ((*I)->Complete == true)
+        CurrentBytes += (*I)->FileSize;
+      if ((*I)->FileSize == 0 && (*I)->Complete == false)
+        Unknown++;
+   }
+   
+   // Compute the current completion
+   unsigned long ResumeSize = 0;
+   for (pkgAcquire::Worker *I = Owner->WorkersBegin(); I != 0;
+       I = Owner->WorkerStep(I))
+      if (I->CurrentItem != 0 && I->CurrentItem->Owner->Complete == false)
+      {
+        CurrentBytes += I->CurrentSize;
+        ResumeSize += I->ResumePoint;
+        
+        // Files with unknown size always have 100% completion
+        if (I->CurrentItem->Owner->FileSize == 0 && 
+            I->CurrentItem->Owner->Complete == false)
+           TotalBytes += I->CurrentSize;
+      }
+   
+   // Normalize the figures and account for unknown size downloads
+   if (TotalBytes <= 0)
+      TotalBytes = 1;
+   if (Unknown == Count)
+      TotalBytes = Unknown;
+
+   // Wha?! Is not supposed to happen.
+   if (CurrentBytes > TotalBytes)
+      CurrentBytes = TotalBytes;
+   
+   // Compute the CPS
+   struct timeval NewTime;
+   gettimeofday(&NewTime,0);
+   if (NewTime.tv_sec - Time.tv_sec == 6 && NewTime.tv_usec > Time.tv_usec ||
+       NewTime.tv_sec - Time.tv_sec > 6)
+   {    
+      double Delta = NewTime.tv_sec - Time.tv_sec + 
+                    (NewTime.tv_usec - Time.tv_usec)/1000000.0;
+      
+      // Compute the CPS value
+      if (Delta < 0.01)
+        CurrentCPS = 0;
+      else
+        CurrentCPS = ((CurrentBytes - ResumeSize) - LastBytes)/Delta;
+      LastBytes = CurrentBytes - ResumeSize;
+      ElapsedTime = (unsigned long)Delta;
+      Time = NewTime;
+   }
+
+   return true;
+}
+                                                                       /*}}}*/
+// AcquireStatus::Start - Called when the download is started          /*{{{*/
+// ---------------------------------------------------------------------
+/* We just reset the counters */
+void pkgAcquireStatus::Start()
+{
+   gettimeofday(&Time,0);
+   gettimeofday(&StartTime,0);
+   LastBytes = 0;
+   CurrentCPS = 0;
+   CurrentBytes = 0;
+   TotalBytes = 0;
+   FetchedBytes = 0;
+   ElapsedTime = 0;
+   TotalItems = 0;
+   CurrentItems = 0;
+}
+                                                                       /*}}}*/
+// AcquireStatus::Stop - Finished downloading                          /*{{{*/
+// ---------------------------------------------------------------------
+/* This accurately computes the elapsed time and the total overall CPS. */
+void pkgAcquireStatus::Stop()
+{
+   // Compute the CPS and elapsed time
+   struct timeval NewTime;
+   gettimeofday(&NewTime,0);
+   
+   double Delta = NewTime.tv_sec - StartTime.tv_sec + 
+                  (NewTime.tv_usec - StartTime.tv_usec)/1000000.0;
+   
+   // Compute the CPS value
+   if (Delta < 0.01)
+      CurrentCPS = 0;
+   else
+      CurrentCPS = FetchedBytes/Delta;
+   LastBytes = CurrentBytes;
+   ElapsedTime = (unsigned int)Delta;
+}
+                                                                       /*}}}*/
+// AcquireStatus::Fetched - Called when a byte set has been fetched    /*{{{*/
+// ---------------------------------------------------------------------
+/* This is used to get accurate final transfer rate reporting. */
+void pkgAcquireStatus::Fetched(unsigned long Size,unsigned long Resume)
+{   
+   FetchedBytes += Size - Resume;

 }
                                                                        /*}}}*/
 }
                                                                        /*}}}*/