* wording fixes (cherry picked from apt--mvo)

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

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

-// $Id: acquire-worker.h,v 1.2 1998/10/20 02:39:14 jgg Exp $
+// $Id: acquire-worker.h,v 1.12 2001/02/20 07:03:17 jgg Exp $

 /* ######################################################################
 
    Acquire Worker - Worker process manager
 /* ######################################################################
 
    Acquire Worker - Worker process manager


@@ -21,41 +21,67 @@
 // Interfacing to the method process
 class pkgAcquire::Worker
 {
 // Interfacing to the method process
 class pkgAcquire::Worker
 {

+   friend class pkgAcquire;
+   

    protected:
    protected:

-   friend Queue;
+   friend class Queue;

 
 

-   Worker *Next;
+   /* Linked list starting at a Queue and a linked list starting
+      at Acquire */
+   Worker *NextQueue;
+   Worker *NextAcquire;

    
    // The access association
    Queue *OwnerQ;
    
    // The access association
    Queue *OwnerQ;

+   pkgAcquireStatus *Log;

    MethodConfig *Config;
    string Access;
    MethodConfig *Config;
    string Access;

-      
+

    // This is the subprocess IPC setup
    pid_t Process;
    int InFd;
    int OutFd;
    // This is the subprocess IPC setup
    pid_t Process;
    int InFd;
    int OutFd;

+   bool InReady;
+   bool OutReady;

    
    // Various internal things
    bool Debug;
    vector<string> MessageQueue;
    
    // Various internal things
    bool Debug;
    vector<string> MessageQueue;

-
+   string OutQueue;
+   

    // Private constructor helper
    void Construct();
    
    // Message handling things
    bool ReadMessages();
    bool RunMessages();
    // Private constructor helper
    void Construct();
    
    // Message handling things
    bool ReadMessages();
    bool RunMessages();

+   bool InFdReady();
+   bool OutFdReady();

    
    // The message handlers
    bool Capabilities(string Message);
    
    // The message handlers
    bool Capabilities(string Message);

+   bool SendConfiguration();
+   bool MediaChange(string Message);
+   
+   bool MethodFailure();
+   void ItemDone();

    
    public:
    
    
    public:
    

+   // The curent method state
+   pkgAcquire::Queue::QItem *CurrentItem;
+   string Status;
+   unsigned long CurrentSize;
+   unsigned long TotalSize;
+   unsigned long ResumePoint;
+   

    // Load the method and do the startup 
    // Load the method and do the startup 

-   bool Start();   
+   bool QueueItem(pkgAcquire::Queue::QItem *Item);
+   bool Start();
+   void Pulse();
+   inline const MethodConfig *GetConf() const {return Config;};

    
    

-   Worker(Queue *OwnerQ,string Access);
+   Worker(Queue *OwnerQ,MethodConfig *Config,pkgAcquireStatus *Log);

    Worker(MethodConfig *Config);
    ~Worker();
 };
    Worker(MethodConfig *Config);
    ~Worker();
 };