* 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 29bdcc2996bbbb64ebd3c2280c64129fa5c6c579..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.8 1998/12/04 21:16:48 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,10 +21,10 @@
 // Interfacing to the method process
 class pkgAcquire::Worker
 {
 // Interfacing to the method process
 class pkgAcquire::Worker
 {

-   friend pkgAcquire;
+   friend class pkgAcquire;

    
    protected:
    
    protected:

-   friend Queue;
+   friend class Queue;

 
    /* Linked list starting at a Queue and a linked list starting
       at Acquire */
 
    /* Linked list starting at a Queue and a linked list starting
       at Acquire */


@@ -36,7 +36,7 @@ class pkgAcquire::Worker
    pkgAcquireStatus *Log;
    MethodConfig *Config;
    string Access;
    pkgAcquireStatus *Log;
    MethodConfig *Config;
    string Access;

-      
+

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


@@ -73,11 +73,13 @@ class pkgAcquire::Worker
    string Status;
    unsigned long CurrentSize;
    unsigned long TotalSize;
    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();
    // 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,MethodConfig *Config,pkgAcquireStatus *Log);
    Worker(MethodConfig *Config);
    
    Worker(Queue *OwnerQ,MethodConfig *Config,pkgAcquireStatus *Log);
    Worker(MethodConfig *Config);