Almost done now

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

diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h
index 20ce2873fdf3abb0109ddaa6032c8669d135dd01..5d6e5502cb30babf0283688ee94d83993a50d1c4 100644 (file)
--- a/apt-pkg/acquire.h
+++ b/apt-pkg/acquire.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: acquire.h,v 1.6 1998/10/30 07:53:38 jgg Exp $
+// $Id: acquire.h,v 1.10 1998/11/11 06:54:17 jgg Exp $
 /* ######################################################################
 
    Acquire - File Acquiration
@@ -39,8 +39,10 @@
 #pragma interface "apt-pkg/acquire.h"
 #endif 
 
+#include <sys/time.h>
 #include <unistd.h>
 
+class pkgAcquireStatus;
 class pkgAcquire
 {   
    public:
@@ -49,6 +51,7 @@ class pkgAcquire
    class Queue;
    class Worker;
    struct MethodConfig;
+   struct ItemDesc;
    friend Item;
    friend Queue;
    
@@ -61,8 +64,9 @@ class pkgAcquire
    Queue *Queues;
    Worker *Workers;
    MethodConfig *Configs;
+   pkgAcquireStatus *Log;
    unsigned long ToFetch;
-   
+
    // Configurable parameters for the schedular
    enum {QueueHost,QueueAccess} QueueMode;
    bool Debug;
@@ -73,7 +77,7 @@ class pkgAcquire
    void Add(Worker *Work);
    void Remove(Worker *Work);
    
-   void Enqueue(Item *Item,string URI,string Description);
+   void Enqueue(ItemDesc &Item);
    void Dequeue(Item *Item);
    string QueueName(string URI);
 
@@ -88,11 +92,26 @@ class pkgAcquire
 
    MethodConfig *GetConfig(string Access);
    bool Run();
+
+   // Simple iteration mechanism
+   inline Worker *WorkersBegin() {return Workers;};
+   Worker *WorkerStep(Worker *I);
+   inline Item **ItemsBegin() {return Items.begin();};
+   inline Item **ItemsEnd() {return Items.end();};
    
-   pkgAcquire();
+   pkgAcquire(pkgAcquireStatus *Log = 0);
    ~pkgAcquire();
 };
 
+// Description of an Item+URI
+struct pkgAcquire::ItemDesc
+{
+   string URI;
+   string Description;
+   string ShortDesc;
+   Item *Owner;
+};
+
 // List of possible items queued for download.
 class pkgAcquire::Queue
 {
@@ -102,15 +121,19 @@ class pkgAcquire::Queue
    protected:
 
    // Queued item
-   struct QItem 
+   struct QItem : pkgAcquire::ItemDesc
    {
-      QItem *Next;
-      
-      string URI;
-      string Description;
-      Item *Owner;
+      QItem *Next;      
       pkgAcquire::Worker *Worker;
-   };   
+      
+      void operator =(pkgAcquire::ItemDesc const &I)
+      {
+        URI = I.URI;
+        Description = I.Description;
+        ShortDesc = I.ShortDesc;
+        Owner = I.Owner;
+      };
+   };
    
    // Name of the queue
    string Name;
@@ -123,16 +146,18 @@ class pkgAcquire::Queue
    public:
    
    // Put an item into this queue
-   void Enqueue(Item *Owner,string URI,string Description);
-   void Dequeue(Item *Owner);
+   void Enqueue(ItemDesc &Item);
+   bool Dequeue(Item *Owner);
 
    // Find a Queued item
    QItem *FindItem(string URI,pkgAcquire::Worker *Owner);
+   bool ItemStart(QItem *Itm,unsigned long Size);
    bool ItemDone(QItem *Itm);
    
    bool Startup();
    bool Shutdown();
    bool Cycle();
+   void Bump();
    
    Queue(string Name,pkgAcquire *Owner);
    ~Queue();
@@ -154,4 +179,37 @@ struct pkgAcquire::MethodConfig
    MethodConfig();
 };
 
+class pkgAcquireStatus
+{
+   protected:
+   
+   struct timeval Time;
+   struct timeval StartTime;
+   unsigned long LastBytes;
+   double CurrentCPS;
+   unsigned long CurrentBytes;
+   unsigned long TotalBytes;
+   unsigned long FetchedBytes;
+   unsigned long ElapsedTime;
+   
+   public:
+
+   bool Update;
+   
+   // Called by items when they have finished a real download
+   virtual void Fetched(unsigned long Size,unsigned long ResumePoint);
+   
+   // Each of these is called by the workers when an event occures
+   virtual void IMSHit(pkgAcquire::ItemDesc &Itm) {};
+   virtual void Fetch(pkgAcquire::ItemDesc &Itm) {};
+   virtual void Done(pkgAcquire::ItemDesc &Itm) {};
+   virtual void Fail(pkgAcquire::ItemDesc &Itm) {};   
+   virtual void Pulse(pkgAcquire *Owner);
+   virtual void Start();
+   virtual void Stop();
+
+   pkgAcquireStatus();
+   virtual ~pkgAcquireStatus() {};
+};
+
 #endif