* apt-pkg/indexfile.cc:

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

diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h
index bf43ac7039a2b4d9525d234c61a253a24fc1e6c8..27bb3d363a985b588c5d199d8c15371d919590eb 100644 (file)
--- a/apt-pkg/acquire.h
+++ b/apt-pkg/acquire.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: acquire.h,v 1.23 1999/07/09 04:38:00 jgg Exp $
+// $Id: acquire.h,v 1.29.2.1 2003/12/24 23:09:17 mdz Exp $

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


@@ -35,6 +35,9 @@
 #include <vector>
 #include <string>
 
 #include <vector>
 #include <string>
 

+using std::vector;
+using std::string;
+

 #ifdef __GNUG__
 #pragma interface "apt-pkg/acquire.h"
 #endif 
 #ifdef __GNUG__
 #pragma interface "apt-pkg/acquire.h"
 #endif 


@@ -52,8 +55,11 @@ class pkgAcquire
    class Worker;
    struct MethodConfig;
    struct ItemDesc;
    class Worker;
    struct MethodConfig;
    struct ItemDesc;

-   friend Item;
-   friend Queue;
+   friend class Item;
+   friend class Queue;
+
+   typedef vector<Item *>::iterator ItemIterator;
+   typedef vector<Item *>::const_iterator ItemCIterator;

    
    protected:
    
    
    protected:
    


@@ -94,14 +100,14 @@ class pkgAcquire
 
    enum RunResult {Continue,Failed,Cancelled};
 
 
    enum RunResult {Continue,Failed,Cancelled};
 

-   RunResult Run();
+   RunResult Run(int PulseIntervall=500000);

    void Shutdown();
    
    // Simple iteration mechanism
    inline Worker *WorkersBegin() {return Workers;};
    Worker *WorkerStep(Worker *I);
    void Shutdown();
    
    // Simple iteration mechanism
    inline Worker *WorkersBegin() {return Workers;};
    Worker *WorkerStep(Worker *I);

-   inline Item **ItemsBegin() {return Items.begin();};
-   inline Item **ItemsEnd() {return Items.end();};
+   inline ItemIterator ItemsBegin() {return Items.begin();};
+   inline ItemIterator ItemsEnd() {return Items.end();};

    
    // Iterate over queued Item URIs
    class UriIterator;
    
    // Iterate over queued Item URIs
    class UriIterator;


@@ -112,10 +118,10 @@ class pkgAcquire
    bool Clean(string Dir);
 
    // Returns the size of the total download set
    bool Clean(string Dir);
 
    // Returns the size of the total download set

-   unsigned long TotalNeeded();
-   unsigned long FetchNeeded();
-   unsigned long PartialPresent();
-   
+   double TotalNeeded();
+   double FetchNeeded();
+   double PartialPresent();
+

    pkgAcquire(pkgAcquireStatus *Log = 0);
    virtual ~pkgAcquire();
 };
    pkgAcquire(pkgAcquireStatus *Log = 0);
    virtual ~pkgAcquire();
 };


@@ -132,8 +138,9 @@ struct pkgAcquire::ItemDesc
 // List of possible items queued for download.
 class pkgAcquire::Queue
 {
 // List of possible items queued for download.
 class pkgAcquire::Queue
 {

-   friend pkgAcquire;
-   friend pkgAcquire::UriIterator;
+   friend class pkgAcquire;
+   friend class pkgAcquire::UriIterator;
+   friend class pkgAcquire::Worker;

    Queue *Next;
    
    protected:
    Queue *Next;
    
    protected:


@@ -175,7 +182,7 @@ class pkgAcquire::Queue
    bool ItemDone(QItem *Itm);
    
    bool Startup();
    bool ItemDone(QItem *Itm);
    
    bool Startup();

-   bool Shutdown();
+   bool Shutdown(bool Final);

    bool Cycle();
    void Bump();
    
    bool Cycle();
    void Bump();
    


@@ -229,7 +236,9 @@ struct pkgAcquire::MethodConfig
    bool Pipeline;
    bool SendConfig;
    bool LocalOnly;
    bool Pipeline;
    bool SendConfig;
    bool LocalOnly;

-      
+   bool NeedsCleanup;
+   bool Removable;
+   

    MethodConfig();
 };
 
    MethodConfig();
 };
 


@@ -239,11 +248,11 @@ class pkgAcquireStatus
    
    struct timeval Time;
    struct timeval StartTime;
    
    struct timeval Time;
    struct timeval StartTime;

-   unsigned long LastBytes;
+   double LastBytes;

    double CurrentCPS;
    double CurrentCPS;

-   unsigned long CurrentBytes;
-   unsigned long TotalBytes;
-   unsigned long FetchedBytes;
+   double CurrentBytes;
+   double TotalBytes;
+   double FetchedBytes;

    unsigned long ElapsedTime;
    unsigned long TotalItems;
    unsigned long CurrentItems;
    unsigned long ElapsedTime;
    unsigned long TotalItems;
    unsigned long CurrentItems;


@@ -251,7 +260,8 @@ class pkgAcquireStatus
    public:
 
    bool Update;
    public:
 
    bool Update;

-   
+   bool MorePulses;
+      

    // Called by items when they have finished a real download
    virtual void Fetched(unsigned long Size,unsigned long ResumePoint);
    
    // Called by items when they have finished a real download
    virtual void Fetched(unsigned long Size,unsigned long ResumePoint);
    


@@ -259,10 +269,10 @@ class pkgAcquireStatus
    virtual bool MediaChange(string Media,string Drive) = 0;
    
    // Each of these is called by the workers when an event occures
    virtual bool MediaChange(string Media,string Drive) = 0;
    
    // 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 IMSHit(pkgAcquire::ItemDesc &/*Itm*/) {};
+   virtual void Fetch(pkgAcquire::ItemDesc &/*Itm*/) {};
+   virtual void Done(pkgAcquire::ItemDesc &/*Itm*/) {};
+   virtual void Fail(pkgAcquire::ItemDesc &/*Itm*/) {};

    virtual bool Pulse(pkgAcquire *Owner); // returns false on user cancel
    virtual void Start();
    virtual void Stop();
    virtual bool Pulse(pkgAcquire *Owner); // returns false on user cancel
    virtual void Start();
    virtual void Stop();