Merge branch 'debian/sid' into debian/experimental

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

diff --git a/apt-pkg/acquire-worker.h b/apt-pkg/acquire-worker.h
index 1f6bcc05f6fed0904373ea67f6f66981853a59bd..67aee4b59fc26cbac3df023ddbd58b973388eb2b 100644 (file)
--- a/apt-pkg/acquire-worker.h
+++ b/apt-pkg/acquire-worker.h
@@ -20,10 +20,11 @@
 #define PKGLIB_ACQUIRE_WORKER_H
 
 #include <apt-pkg/acquire.h>
 #define PKGLIB_ACQUIRE_WORKER_H
 
 #include <apt-pkg/acquire.h>

+#include <apt-pkg/weakptr.h>

 
 

-#ifdef __GNUG__
-#pragma interface "apt-pkg/acquire-worker.h"
-#endif 
+#include <sys/types.h>
+#include <string>
+#include <vector>

 
 /** \brief A fetch subprocess.
  *
 
 /** \brief A fetch subprocess.
  *


@@ -44,8 +45,11 @@
  *
  *  \sa pkgAcqMethod, pkgAcquire::Item, pkgAcquire
  */
  *
  *  \sa pkgAcqMethod, pkgAcquire::Item, pkgAcquire
  */

-class pkgAcquire::Worker
+class pkgAcquire::Worker : public WeakPointable

 {
 {

+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;
+  

    friend class pkgAcquire;
    
    protected:
    friend class pkgAcquire;
    
    protected:


@@ -78,7 +82,7 @@ class pkgAcquire::Worker
     *
     *  \todo Doesn't this duplicate Config->Access?
     */
     *
     *  \todo Doesn't this duplicate Config->Access?
     */

-   string Access;
+   std::string Access;

 
    /** \brief The PID of the subprocess. */
    pid_t Process;
 
    /** \brief The PID of the subprocess. */
    pid_t Process;


@@ -117,13 +121,13 @@ class pkgAcquire::Worker
    /** \brief The raw text values of messages received from the
     *  worker, in sequence.
     */
    /** \brief The raw text values of messages received from the
     *  worker, in sequence.
     */

-   vector<string> MessageQueue;
+   std::vector<std::string> MessageQueue;

 
    /** \brief Buffers pending writes to the subprocess.
     *
     *  \todo Wouldn't a std::dequeue be more appropriate?
     */
 
    /** \brief Buffers pending writes to the subprocess.
     *
     *  \todo Wouldn't a std::dequeue be more appropriate?
     */

-   string OutQueue;
+   std::string OutQueue;

    
    /** \brief Common code for the constructor.
     *
    
    /** \brief Common code for the constructor.
     *


@@ -135,8 +139,8 @@ class pkgAcquire::Worker
    
    /** \brief Retrieve any available messages from the subprocess.
     *
    
    /** \brief Retrieve any available messages from the subprocess.
     *

-    *  The messages are retrieved as in ::ReadMessages(), and
-    *  MessageFailure() is invoked if an error occurs; in particular,
+    *  The messages are retrieved as in \link strutl.h ReadMessages()\endlink, and
+    *  #MethodFailure() is invoked if an error occurs; in particular,

     *  if the pipe to the subprocess dies unexpectedly while a message
     *  is being read.
     *
     *  if the pipe to the subprocess dies unexpectedly while a message
     *  is being read.
     *


@@ -182,7 +186,7 @@ class pkgAcquire::Worker
     *
     *  \return \b true.
     */
     *
     *  \return \b true.
     */

-   bool Capabilities(string Message);
+   bool Capabilities(std::string Message);

 
    /** \brief Send a 601 Configuration message (containing the APT
     *  configuration) to the subprocess.
 
    /** \brief Send a 601 Configuration message (containing the APT
     *  configuration) to the subprocess.


@@ -213,7 +217,7 @@ class pkgAcquire::Worker
     *  603 Media Changed, with the Failed field set to \b true if the
     *  user cancelled the media change).
     */
     *  603 Media Changed, with the Failed field set to \b true if the
     *  user cancelled the media change).
     */

-   bool MediaChange(string Message);
+   bool MediaChange(std::string Message);

    
    /** \brief Invoked when the worked process dies unexpectedly.
     *
    
    /** \brief Invoked when the worked process dies unexpectedly.
     *


@@ -241,22 +245,22 @@ class pkgAcquire::Worker
    /** \brief The most recent status string received from the
     *  subprocess.
     */
    /** \brief The most recent status string received from the
     *  subprocess.
     */

-   string Status;
+   std::string Status;

 
    /** \brief How many bytes of the file have been downloaded.  Zero
     *  if the current progress of the file cannot be determined.
     */
 
    /** \brief How many bytes of the file have been downloaded.  Zero
     *  if the current progress of the file cannot be determined.
     */

-   unsigned long CurrentSize;
+   unsigned long long CurrentSize;

 
    /** \brief The total number of bytes to be downloaded.  Zero if the
     *  total size of the final is unknown.
     */
 
    /** \brief The total number of bytes to be downloaded.  Zero if the
     *  total size of the final is unknown.
     */

-   unsigned long TotalSize;
+   unsigned long long TotalSize;

 
    /** \brief How much of the file was already downloaded prior to
     *  starting this worker.
     */
 
    /** \brief How much of the file was already downloaded prior to
     *  starting this worker.
     */

-   unsigned long ResumePoint;
+   unsigned long long ResumePoint;

    
    /** \brief Tell the subprocess to download the given item.
     *
    
    /** \brief Tell the subprocess to download the given item.
     *


@@ -316,7 +320,7 @@ class pkgAcquire::Worker
     *  Closes the file descriptors; if MethodConfig::NeedsCleanup is
     *  \b false, also rudely interrupts the worker with a SIGINT.
     */
     *  Closes the file descriptors; if MethodConfig::NeedsCleanup is
     *  \b false, also rudely interrupts the worker with a SIGINT.
     */

-   ~Worker();
+   virtual ~Worker();

 };
 
 /** @} */
 };
 
 /** @} */