debian/NEWS: Mention new pinning algorithm added in 2.0~exp1

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

diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index cf4a98c4f95818b069336362ba0c178e5997d8f1..aad261b6334993c95fd6ffc946c7f7d571b424c7 100644 (file)
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -1,6 +1,5 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: algorithms.h,v 1.10 2001/05/22 04:17:41 jgg Exp $

 /* ######################################################################
 
    Algorithms - A set of misc algorithms
 /* ######################################################################
 
    Algorithms - A set of misc algorithms


@@ -10,7 +9,7 @@
    see all of the effects of an upgrade run.
 
    pkgDistUpgrade computes an upgrade that causes as many packages as
    see all of the effects of an upgrade run.
 
    pkgDistUpgrade computes an upgrade that causes as many packages as

-   possible to move to the newest verison.
+   possible to move to the newest version.

    
    pkgApplyStatus sets the target state based on the content of the status
    field in the status file. It is important to get proper crash recovery.
    
    pkgApplyStatus sets the target state based on the content of the status
    field in the status file. It is important to get proper crash recovery.


@@ -33,14 +32,29 @@
 
 #include <apt-pkg/packagemanager.h>
 #include <apt-pkg/depcache.h>
 
 #include <apt-pkg/packagemanager.h>
 #include <apt-pkg/depcache.h>

-#include <apt-pkg/acquire.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>

 
 #include <iostream>
 
 #include <iostream>

+#include <string>
+
+#include <apt-pkg/macros.h>

 
 

+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/acquire.h>

 using std::ostream;
 using std::ostream;

+#endif
+
+#ifndef APT_9_CLEANER_HEADERS
+// include pkg{DistUpgrade,AllUpgrade,MiniizeUpgrade} here for compatibility
+#include <apt-pkg/upgrade.h>
+#include <apt-pkg/update.h>
+#endif
+

 
 class pkgSimulate : public pkgPackageManager                           /*{{{*/
 {
 
 class pkgSimulate : public pkgPackageManager                           /*{{{*/
 {

+   void * const d;

    protected:
 
    class Policy : public pkgDepCache::Policy
    protected:
 
    class Policy : public pkgDepCache::Policy


@@ -48,12 +62,12 @@ class pkgSimulate : public pkgPackageManager                                /*{{{*/
       pkgDepCache *Cache;
       public:
       
       pkgDepCache *Cache;
       public:
       

-      virtual VerIterator GetCandidateVer(PkgIterator const &Pkg)
+      virtual VerIterator GetCandidateVer(PkgIterator const &Pkg) APT_OVERRIDE

       {
         return (*Cache)[Pkg].CandidateVerIter(*Cache);
       }
       
       {
         return (*Cache)[Pkg].CandidateVerIter(*Cache);
       }
       

-      Policy(pkgDepCache *Cache) : Cache(Cache) {};
+      explicit Policy(pkgDepCache *Cache) : Cache(Cache) {};

    };
    
    unsigned char *Flags;
    };
    
    unsigned char *Flags;


@@ -63,21 +77,26 @@ class pkgSimulate : public pkgPackageManager                                /*{{{*/
    pkgDepCache::ActionGroup group;
    
    // The Actuall installation implementation
    pkgDepCache::ActionGroup group;
    
    // The Actuall installation implementation

-   virtual bool Install(PkgIterator Pkg,string File);
-   virtual bool Configure(PkgIterator Pkg);
-   virtual bool Remove(PkgIterator Pkg,bool Purge);
+   virtual bool Install(PkgIterator Pkg,std::string File) APT_OVERRIDE;
+   virtual bool Configure(PkgIterator Pkg) APT_OVERRIDE;
+   virtual bool Remove(PkgIterator Pkg,bool Purge) APT_OVERRIDE;

 
 private:
 
 private:

-   void ShortBreaks();
-   void Describe(PkgIterator iPkg,ostream &out,bool Current,bool Candidate);
-   
+   APT_HIDDEN void ShortBreaks();
+   APT_HIDDEN void Describe(PkgIterator iPkg,std::ostream &out,bool Current,bool Candidate);
+

    public:
 
    public:
 

-   pkgSimulate(pkgDepCache *Cache);
+   explicit pkgSimulate(pkgDepCache *Cache);
+   virtual ~pkgSimulate();

 };
                                                                        /*}}}*/
 class pkgProblemResolver                                               /*{{{*/
 {
 };
                                                                        /*}}}*/
 class pkgProblemResolver                                               /*{{{*/
 {

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

    pkgDepCache &Cache;
    typedef pkgCache::PkgIterator PkgIterator;
    typedef pkgCache::VerIterator VerIterator;
    pkgDepCache &Cache;
    typedef pkgCache::PkgIterator PkgIterator;
    typedef pkgCache::VerIterator VerIterator;


@@ -89,13 +108,13 @@ class pkgProblemResolver                                           /*{{{*/
    enum Flags {Protected = (1 << 0), PreInstalled = (1 << 1),
                Upgradable = (1 << 2), ReInstateTried = (1 << 3),
                ToRemove = (1 << 4)};
    enum Flags {Protected = (1 << 0), PreInstalled = (1 << 1),
                Upgradable = (1 << 2), ReInstateTried = (1 << 3),
                ToRemove = (1 << 4)};

-   signed short *Scores;
+   int *Scores;

    unsigned char *Flags;
    bool Debug;
    
    // Sort stuff
    static pkgProblemResolver *This;
    unsigned char *Flags;
    bool Debug;
    
    // Sort stuff
    static pkgProblemResolver *This;

-   static int ScoreSort(const void *a,const void *b);
+   APT_HIDDEN static int ScoreSort(const void *a,const void *b) APT_PURE;

 
    struct PackageKill
    {
 
    struct PackageKill
    {


@@ -103,36 +122,37 @@ class pkgProblemResolver                                          /*{{{*/
       DepIterator Dep;
    };
 
       DepIterator Dep;
    };
 

-   void MakeScores();
-   bool DoUpgrade(pkgCache::PkgIterator Pkg);
-   
+   APT_HIDDEN void MakeScores();
+   APT_HIDDEN bool DoUpgrade(pkgCache::PkgIterator Pkg);
+
+   APT_HIDDEN bool ResolveInternal(bool const BrokenFix = false);
+   APT_HIDDEN bool ResolveByKeepInternal();
+
+   protected:
+   bool InstOrNewPolicyBroken(pkgCache::PkgIterator Pkg);
+

    public:
    
    public:
    

-   inline void Protect(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] |= Protected;};
+   inline void Protect(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] |= Protected; Cache.MarkProtected(Pkg);};

    inline void Remove(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] |= ToRemove;};
    inline void Clear(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] &= ~(Protected | ToRemove);};
    inline void Remove(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] |= ToRemove;};
    inline void Clear(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] &= ~(Protected | ToRemove);};

-   
-   // Try to intelligently resolve problems by installing and removing packages   
-   bool Resolve(bool BrokenFix = false);
-   
+
+   // Try to intelligently resolve problems by installing and removing packages
+   bool Resolve(bool BrokenFix = false, OpProgress * const Progress = NULL);
+

    // Try to resolve problems only by using keep
    // Try to resolve problems only by using keep

-   bool ResolveByKeep();
+   bool ResolveByKeep(OpProgress * const Progress = NULL);

 
 

-   // Install all protected packages   
-   void InstallProtect();   
-   
-   pkgProblemResolver(pkgDepCache *Cache);
-   ~pkgProblemResolver();
+   APT_DEPRECATED void InstallProtect();
+
+   explicit pkgProblemResolver(pkgDepCache *Cache);
+   virtual ~pkgProblemResolver();

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

-bool pkgDistUpgrade(pkgDepCache &Cache);

 bool pkgApplyStatus(pkgDepCache &Cache);
 bool pkgFixBroken(pkgDepCache &Cache);
 bool pkgApplyStatus(pkgDepCache &Cache);
 bool pkgFixBroken(pkgDepCache &Cache);

-bool pkgAllUpgrade(pkgDepCache &Cache);
-bool pkgMinimizeUpgrade(pkgDepCache &Cache);

 
 void pkgPrioSortList(pkgCache &Cache,pkgCache::Version **List);
 
 
 void pkgPrioSortList(pkgCache &Cache,pkgCache::Version **List);
 

-bool ListUpdate(pkgAcquireStatus &progress, pkgSourceList &List, int PulseInterval=0);
-                    
+

 #endif
 #endif