* merged with mainline

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

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

-// $Id: acquire-worker.h,v 1.1 1998/10/15 06:59:59 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
    

+   Each worker class is associated with exaclty one subprocess.
+   

    ##################################################################### */
                                                                        /*}}}*/
 #ifndef PKGLIB_ACQUIRE_WORKER_H
    ##################################################################### */
                                                                        /*}}}*/
 #ifndef PKGLIB_ACQUIRE_WORKER_H


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

+   friend class pkgAcquire;
+   

    protected:
    protected:

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

    
    

+   // The access association

    Queue *OwnerQ;
    Queue *OwnerQ;

-   MethodConfig *Config;   
-   Worker *Next;
+   pkgAcquireStatus *Log;
+   MethodConfig *Config;
+   string Access;
+
+   // 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;
+   string OutQueue;

    
    

-   friend Queue;
+   // Private constructor helper
+   void Construct();
+   
+   // Message handling things
+   bool ReadMessages();
+   bool RunMessages();
+   bool InFdReady();
+   bool OutFdReady();
+   
+   // The message handlers
+   bool Capabilities(string Message);
+   bool SendConfiguration();
+   bool MediaChange(string Message);
+   
+   bool MethodFailure();
+   void ItemDone();

    
    public:
    
    
    public:
    

-   bool Create();
+   // 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 
+   bool QueueItem(pkgAcquire::Queue::QItem *Item);
+   bool Start();
+   void Pulse();
+   inline const MethodConfig *GetConf() const {return Config;};

    
    

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

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