|
@@ -91,6 +91,12 @@ class pkgAcquireStatus;
|
|
|
*/
|
|
*/
|
|
|
class pkgAcquire
|
|
class pkgAcquire
|
|
|
{
|
|
{
|
|
|
|
|
+ private:
|
|
|
|
|
+ /** \brief FD of the Lock file we acquire in Setup (if any) */
|
|
|
|
|
+ int LockFD;
|
|
|
|
|
+ /** \brief dpointer placeholder (for later in case we need it) */
|
|
|
|
|
+ void *d;
|
|
|
|
|
+
|
|
|
public:
|
|
public:
|
|
|
|
|
|
|
|
class Item;
|
|
class Item;
|
|
@@ -359,9 +365,6 @@ class pkgAcquire
|
|
|
*/
|
|
*/
|
|
|
virtual ~pkgAcquire();
|
|
virtual ~pkgAcquire();
|
|
|
|
|
|
|
|
- private:
|
|
|
|
|
- /** \brief FD of the Lock file we acquire in Setup (if any) */
|
|
|
|
|
- int LockFD;
|
|
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
/** \brief Represents a single download source from which an item
|
|
/** \brief Represents a single download source from which an item
|
|
@@ -391,6 +394,9 @@ class pkgAcquire::Queue
|
|
|
friend class pkgAcquire::UriIterator;
|
|
friend class pkgAcquire::UriIterator;
|
|
|
friend class pkgAcquire::Worker;
|
|
friend class pkgAcquire::Worker;
|
|
|
|
|
|
|
|
|
|
+ /** \brief dpointer placeholder (for later in case we need it) */
|
|
|
|
|
+ void *d;
|
|
|
|
|
+
|
|
|
/** \brief The next queue in the pkgAcquire object's list of queues. */
|
|
/** \brief The next queue in the pkgAcquire object's list of queues. */
|
|
|
Queue *Next;
|
|
Queue *Next;
|
|
|
|
|
|
|
@@ -540,12 +546,15 @@ class pkgAcquire::Queue
|
|
|
/** Shut down all the worker processes associated with this queue
|
|
/** Shut down all the worker processes associated with this queue
|
|
|
* and empty the queue.
|
|
* and empty the queue.
|
|
|
*/
|
|
*/
|
|
|
- ~Queue();
|
|
|
|
|
|
|
+ virtual ~Queue();
|
|
|
};
|
|
};
|
|
|
/*}}}*/
|
|
/*}}}*/
|
|
|
/** \brief Iterates over all the URIs being fetched by a pkgAcquire object. {{{*/
|
|
/** \brief Iterates over all the URIs being fetched by a pkgAcquire object. {{{*/
|
|
|
class pkgAcquire::UriIterator
|
|
class pkgAcquire::UriIterator
|
|
|
{
|
|
{
|
|
|
|
|
+ /** \brief dpointer placeholder (for later in case we need it) */
|
|
|
|
|
+ void *d;
|
|
|
|
|
+
|
|
|
/** The next queue to iterate over. */
|
|
/** The next queue to iterate over. */
|
|
|
pkgAcquire::Queue *CurQ;
|
|
pkgAcquire::Queue *CurQ;
|
|
|
/** The item that we currently point at. */
|
|
/** The item that we currently point at. */
|
|
@@ -581,11 +590,15 @@ class pkgAcquire::UriIterator
|
|
|
CurQ = CurQ->Next;
|
|
CurQ = CurQ->Next;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+ virtual ~UriIterator() {};
|
|
|
};
|
|
};
|
|
|
/*}}}*/
|
|
/*}}}*/
|
|
|
/** \brief Information about the properties of a single acquire method. {{{*/
|
|
/** \brief Information about the properties of a single acquire method. {{{*/
|
|
|
struct pkgAcquire::MethodConfig
|
|
struct pkgAcquire::MethodConfig
|
|
|
{
|
|
{
|
|
|
|
|
+ /** \brief dpointer placeholder (for later in case we need it) */
|
|
|
|
|
+ void *d;
|
|
|
|
|
+
|
|
|
/** \brief The next link on the acquire method list.
|
|
/** \brief The next link on the acquire method list.
|
|
|
*
|
|
*
|
|
|
* \todo Why not an STL container?
|
|
* \todo Why not an STL container?
|
|
@@ -634,6 +647,9 @@ struct pkgAcquire::MethodConfig
|
|
|
* appropriate.
|
|
* appropriate.
|
|
|
*/
|
|
*/
|
|
|
MethodConfig();
|
|
MethodConfig();
|
|
|
|
|
+
|
|
|
|
|
+ /* \brief Destructor, empty currently */
|
|
|
|
|
+ virtual ~MethodConfig() {};
|
|
|
};
|
|
};
|
|
|
/*}}}*/
|
|
/*}}}*/
|
|
|
/** \brief A monitor object for downloads controlled by the pkgAcquire class. {{{
|
|
/** \brief A monitor object for downloads controlled by the pkgAcquire class. {{{
|
|
@@ -644,6 +660,9 @@ struct pkgAcquire::MethodConfig
|
|
|
*/
|
|
*/
|
|
|
class pkgAcquireStatus
|
|
class pkgAcquireStatus
|
|
|
{
|
|
{
|
|
|
|
|
+ /** \brief dpointer placeholder (for later in case we need it) */
|
|
|
|
|
+ void *d;
|
|
|
|
|
+
|
|
|
protected:
|
|
protected:
|
|
|
|
|
|
|
|
/** \brief The last time at which this monitor object was updated. */
|
|
/** \brief The last time at which this monitor object was updated. */
|