travis: Add coverage testing using codecov.io

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

diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h
index fc90624e1e6193946094e48ee2d2e3f046c57a82..1fae662f80685ec232d7334e8e5b5736dacbb450 100644 (file)
--- a/apt-pkg/acquire.h
+++ b/apt-pkg/acquire.h
@@ -1,11 +1,10 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: acquire.h,v 1.29.2.1 2003/12/24 23:09:17 mdz Exp $

 /* ######################################################################
 
    Acquire - File Acquiration
    
 /* ######################################################################
 
    Acquire - File Acquiration
    

-   This module contians the Acquire system. It is responsible for bringing
+   This module contains the Acquire system. It is responsible for bringing

    files into the local pathname space. It deals with URIs for files and
    URI handlers responsible for downloading or finding the URIs.
    
    files into the local pathname space. It deals with URIs for files and
    URI handlers responsible for downloading or finding the URIs.
    


@@ -68,9 +67,10 @@
 
 #include <apt-pkg/macros.h>
 #include <apt-pkg/weakptr.h>
 
 #include <apt-pkg/macros.h>
 #include <apt-pkg/weakptr.h>

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

 
 

-#include <vector>

 #include <string>
 #include <string>

+#include <vector>

 
 #include <stddef.h>
 #include <sys/time.h>
 
 #include <stddef.h>
 #include <sys/time.h>


@@ -101,7 +101,7 @@ class pkgAcquire
    /** \brief FD of the Lock file we acquire in Setup (if any) */
    int LockFD;
    /** \brief dpointer placeholder (for later in case we need it) */
    /** \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;
+   void * const d;

 
    public:
    
 
    public:
    


@@ -236,8 +236,15 @@ class pkgAcquire
     *
     *  \param WSet The set of file descriptors that are ready for
     *  output.
     *
     *  \param WSet The set of file descriptors that are ready for
     *  output.

+    *
+    * \return false if there is an error condition on one of the fds

     */
     */

-   virtual void RunFds(fd_set *RSet,fd_set *WSet);   
+   bool RunFdsSane(fd_set *RSet,fd_set *WSet);
+
+   // just here for compatbility, needs to be removed on the next
+   // ABI/API break. RunFdsSane() is what should be used as it
+   // returns if there is an error condition on one of the fds
+   virtual void RunFds(fd_set *RSet,fd_set *WSet);

 
    /** \brief Check for idle queues with ready-to-fetch items.
     *
 
    /** \brief Check for idle queues with ready-to-fetch items.
     *


@@ -303,9 +310,11 @@ class pkgAcquire
 
    /** \brief Get the head of the list of items. */
    inline ItemIterator ItemsBegin() {return Items.begin();};
 
    /** \brief Get the head of the list of items. */
    inline ItemIterator ItemsBegin() {return Items.begin();};

+   inline ItemCIterator ItemsBegin() const {return Items.begin();};

 
    /** \brief Get the end iterator of the list of items. */
    inline ItemIterator ItemsEnd() {return Items.end();};
 
    /** \brief Get the end iterator of the list of items. */
    inline ItemIterator ItemsEnd() {return Items.end();};

+   inline ItemCIterator ItemsEnd() const {return Items.end();};

    
    // Iterate over queued Item URIs
    class UriIterator;
    
    // Iterate over queued Item URIs
    class UriIterator;


@@ -355,7 +364,7 @@ class pkgAcquire
     *  if no lock file should be used. If set also all needed directories
     *  will be created.
     */
     *  if no lock file should be used. If set also all needed directories
     *  will be created.
     */

-   APT_DEPRECATED bool Setup(pkgAcquireStatus *Progress = NULL, std::string const &Lock = "");
+   APT_DEPRECATED_MSG("Use constructors, .SetLog and .GetLock as needed") bool Setup(pkgAcquireStatus *Progress = NULL, std::string const &Lock = "");

 
    void SetLog(pkgAcquireStatus *Progress) { Log = Progress; }
 
 
    void SetLog(pkgAcquireStatus *Progress) { Log = Progress; }
 


@@ -369,7 +378,7 @@ class pkgAcquire
    bool GetLock(std::string const &Lock);
 
    /** \brief Construct a new pkgAcquire. */
    bool GetLock(std::string const &Lock);
 
    /** \brief Construct a new pkgAcquire. */

-   pkgAcquire(pkgAcquireStatus *Log);
+   explicit pkgAcquire(pkgAcquireStatus *Log);

    pkgAcquire();
 
    /** \brief Destroy this pkgAcquire object.
    pkgAcquire();
 
    /** \brief Destroy this pkgAcquire object.


@@ -390,13 +399,13 @@ class pkgAcquire
  */
 struct pkgAcquire::ItemDesc : public WeakPointable
 {
  */
 struct pkgAcquire::ItemDesc : public WeakPointable
 {

-   /** \brief The URI from which to download this item. */
+   /** \brief URI from which to download this item. */

    std::string URI;
    std::string URI;

-   /** brief A description of this item. */
+   /** \brief description of this item. */

    std::string Description;
    std::string Description;

-   /** brief A shorter description of this item. */
+   /** \brief shorter description of this item. */

    std::string ShortDesc;
    std::string ShortDesc;

-   /** brief The underlying item which is to be downloaded. */
+   /** \brief underlying item which is to be downloaded. */

    Item *Owner;
 };
                                                                        /*}}}*/
    Item *Owner;
 };
                                                                        /*}}}*/


@@ -411,7 +420,7 @@ class pkgAcquire::Queue
    friend class pkgAcquire::Worker;
 
    /** \brief dpointer placeholder (for later in case we need it) */
    friend class pkgAcquire::Worker;
 
    /** \brief dpointer placeholder (for later in case we need it) */

-   void *d;
+   void * const d;

 
    /** \brief The next queue in the pkgAcquire object's list of queues. */
    Queue *Next;
 
    /** \brief The next queue in the pkgAcquire object's list of queues. */
    Queue *Next;


@@ -419,13 +428,18 @@ class pkgAcquire::Queue
    protected:
 
    /** \brief A single item placed in this queue. */
    protected:
 
    /** \brief A single item placed in this queue. */

-   struct QItem : pkgAcquire::ItemDesc
+   struct QItem : public ItemDesc

    {
       /** \brief The next item in the queue. */
       QItem *Next;
       /** \brief The worker associated with this item, if any. */
       pkgAcquire::Worker *Worker;
 
    {
       /** \brief The next item in the queue. */
       QItem *Next;
       /** \brief The worker associated with this item, if any. */
       pkgAcquire::Worker *Worker;
 

+      /** \brief The underlying items interested in the download */
+      std::vector<Item*> Owners;
+
+      typedef std::vector<Item*>::const_iterator owner_iterator;
+

       /** \brief Assign the ItemDesc portion of this QItem from
        *  another ItemDesc
        */
       /** \brief Assign the ItemDesc portion of this QItem from
        *  another ItemDesc
        */


@@ -434,10 +448,26 @@ class pkgAcquire::Queue
         URI = I.URI;
         Description = I.Description;
         ShortDesc = I.ShortDesc;
         URI = I.URI;
         Description = I.Description;
         ShortDesc = I.ShortDesc;

+        Owners.clear();
+        Owners.push_back(I.Owner);

         Owner = I.Owner;
       };
         Owner = I.Owner;
       };

+
+      /** @return the sum of all expected hashes by all owners */
+      HashStringList GetExpectedHashes() const;
+
+      /** @return smallest maximum size of all owners */
+      unsigned long long GetMaximumSize() const;
+
+      /** \brief get partial files in order */
+      void SyncDestinationFiles() const;
+
+      /** @return the custom headers to use for this item */
+      std::string Custom600Headers() const;
+      /** @return the maximum priority of this item */
+      int APT_HIDDEN GetPriority() const;

    };
    };

-   
+

    /** \brief The name of this queue. */
    std::string Name;
 
    /** \brief The name of this queue. */
    std::string Name;
 


@@ -557,7 +587,7 @@ class pkgAcquire::Queue
     *  \param Name The name of the new queue.
     *  \param Owner The download process that owns the new queue.
     */
     *  \param Name The name of the new queue.
     *  \param Owner The download process that owns the new queue.
     */

-   Queue(std::string Name,pkgAcquire *Owner);
+   Queue(std::string const &Name,pkgAcquire * const Owner);

 
    /** Shut down all the worker processes associated with this queue
     *  and empty the queue.
 
    /** Shut down all the worker processes associated with this queue
     *  and empty the queue.


@@ -569,7 +599,7 @@ class pkgAcquire::Queue
 class pkgAcquire::UriIterator
 {
    /** \brief dpointer placeholder (for later in case we need it) */
 class pkgAcquire::UriIterator
 {
    /** \brief dpointer placeholder (for later in case we need it) */

-   void *d;
+   void * const d;

 
    /** The next queue to iterate over. */
    pkgAcquire::Queue *CurQ;
 
    /** The next queue to iterate over. */
    pkgAcquire::Queue *CurQ;


@@ -590,7 +620,7 @@ class pkgAcquire::UriIterator
       }
    };
    
       }
    };
    

-   inline pkgAcquire::ItemDesc const *operator ->() const {return CurItem;};
+   inline pkgAcquire::Queue::QItem const *operator ->() const {return CurItem;};

    inline bool operator !=(UriIterator const &rhs) const {return rhs.CurQ != CurQ || rhs.CurItem != CurItem;};
    inline bool operator ==(UriIterator const &rhs) const {return rhs.CurQ == CurQ && rhs.CurItem == CurItem;};
    
    inline bool operator !=(UriIterator const &rhs) const {return rhs.CurQ != CurQ || rhs.CurItem != CurItem;};
    inline bool operator ==(UriIterator const &rhs) const {return rhs.CurQ == CurQ && rhs.CurItem == CurItem;};
    


@@ -598,14 +628,7 @@ class pkgAcquire::UriIterator
     *
     *  \param Q The queue over which this UriIterator should iterate.
     */
     *
     *  \param Q The queue over which this UriIterator should iterate.
     */

-   UriIterator(pkgAcquire::Queue *Q) : d(NULL), CurQ(Q), CurItem(0)
-   {
-      while (CurItem == 0 && CurQ != 0)
-      {
-        CurItem = CurQ->Items;
-        CurQ = CurQ->Next;
-      }
-   }   
+   explicit UriIterator(pkgAcquire::Queue *Q);

    virtual ~UriIterator();
 };
                                                                        /*}}}*/
    virtual ~UriIterator();
 };
                                                                        /*}}}*/


@@ -613,7 +636,7 @@ class pkgAcquire::UriIterator
 struct pkgAcquire::MethodConfig
 {
    /** \brief dpointer placeholder (for later in case we need it) */
 struct pkgAcquire::MethodConfig
 {
    /** \brief dpointer placeholder (for later in case we need it) */

-   void *d;
+   void * const d;

    
    /** \brief The next link on the acquire method list.
     *
    
    /** \brief The next link on the acquire method list.
     *


@@ -674,7 +697,7 @@ struct pkgAcquire::MethodConfig
 class pkgAcquireStatus
 {
    /** \brief dpointer placeholder (for later in case we need it) */
 class pkgAcquireStatus
 {
    /** \brief dpointer placeholder (for later in case we need it) */

-   void *d;
+   void * const d;

 
    protected:
    
 
    protected: