Imported Upstream version 0.6.5
[platform/upstream/libsolv.git] / src / solver.h
index b8f0c38..49ccec8 100644 (file)
  *
  */
 
-#ifndef SATSOLVER_SOLVER_H
-#define SATSOLVER_SOLVER_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef LIBSOLV_SOLVER_H
+#define LIBSOLV_SOLVER_H
 
 #include "pooltypes.h"
 #include "pool.h"
 #include "repo.h"
 #include "queue.h"
 #include "bitmap.h"
-/*
- * Callback definitions in order to "overwrite" the policies by an external application.
- */
-typedef void  (*BestSolvableCb) (Pool *pool, Queue *canditates);
-typedef int  (*ArchCheckCb) (Pool *pool, Solvable *solvable1, Solvable *solvable2);
-typedef int  (*VendorCheckCb) (Pool *pool, Solvable *solvable1, Solvable *solvable2);
-typedef void (*UpdateCandidateCb) (Pool *pool, Solvable *solvable, Queue *canditates);
+#include "transaction.h"
+#include "rules.h"
+#include "problems.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-/* ----------------------------------------------
- * Rule
- *
- *   providerN(B) == Package Id of package providing tag B
- *   N = 1, 2, 3, in case of multiple providers
- *
- * A requires B : !A | provider1(B) | provider2(B)
- *
- * A conflicts B : (!A | !provider1(B)) & (!A | !provider2(B)) ...
- *
- * 'not' is encoded as a negative Id
- * 
- * Binary rule: p = first literal, d = 0, w2 = second literal, w1 = p
- */
+struct _Solver {
+  Pool *pool;                          /* back pointer to pool */
+  Queue job;                           /* copy of the job we're solving */
+
+  int (*solution_callback)(struct _Solver *solv, void *data);
+  void *solution_callback_data;
+
+  int pooljobcnt;                      /* number of pooljob entries in job queue */
+
+#ifdef LIBSOLV_INTERNAL
+  Repo *installed;                     /* copy of pool->installed */
 
-typedef struct rule {
-  Id p;                        /* first literal in rule */
-  Id d;                        /* Id offset into 'list of providers terminated by 0' as used by whatprovides; pool->whatprovides + d */
-                       /* in case of binary rules, d == 0, w1 == p, w2 == other literal */
-                       /* in case of disabled rules: ~d, aka -d - 1 */
-  Id w1, w2;           /* watches, literals not-yet-decided */
-                                      /* if !w2, assertion, not rule */
-  Id n1, n2;           /* next rules in linked list, corresponding to w1,w2 */
-} Rule;
-
-struct solver;
-
-typedef struct solver {
-  Pool *pool;
-  Repo *installed;
-  
   /* list of rules, ordered
    * rpm rules first, then features, updates, jobs, learnt
    * see start/end offsets below
@@ -73,24 +48,50 @@ typedef struct solver {
   Queue ruleassertions;                        /* Queue of all assertion rules */
 
   /* start/end offset for rule 'areas' */
-    
+
   Id rpmrules_end;                      /* [Offset] rpm rules end */
-    
+
   Id featurerules;                     /* feature rules start/end */
   Id featurerules_end;
-    
+
   Id updaterules;                      /* policy rules, e.g. keep packages installed or update. All literals > 0 */
   Id updaterules_end;
-    
+
   Id jobrules;                         /* user rules */
   Id jobrules_end;
-    
+
+  Id infarchrules;                     /* inferior arch rules */
+  Id infarchrules_end;
+
+  Id duprules;                         /* dist upgrade rules */
+  Id duprules_end;
+
+  Id bestrules;                                /* rules from SOLVER_FORCEBEST */
+  Id bestrules_end;
+  Id *bestrules_pkg;
+
+  Id yumobsrules;                      /* rules from yum obsoletes handling */
+  Id yumobsrules_end;
+  Id *yumobsrules_info;                        /* the dependency for each rule */
+
+  Id choicerules;                      /* choice rules (always weak) */
+  Id choicerules_end;
+  Id *choicerules_ref;
+
   Id learntrules;                      /* learnt rules, (end == nrules) */
 
   Map noupdate;                                /* don't try to update these
                                            installed solvables */
-  Map noobsoletes;                     /* ignore obsoletes for these
-                                          (multiinstall) */
+  Map multiversion;                    /* ignore obsoletes for these (multiinstall) */
+
+  Map updatemap;                       /* bring these installed packages to the newest version */
+  int updatemap_all;                   /* bring all packages to the newest version */
+
+  Map bestupdatemap;                   /* create best rule for those packages */
+  int bestupdatemap_all;               /* bring all packages to the newest version */
+
+  Map fixmap;                          /* fix these packages */
+  int fixmap_all;                      /* fix all packages */
 
   Queue weakruleq;                     /* index into 'rules' for weak ones */
   Map weakrulemap;                     /* map rule# to '1' for weak rules, 1..learntrules */
@@ -106,27 +107,30 @@ typedef struct solver {
   /* our decisions: */
   Queue decisionq;                      /* >0:install, <0:remove/conflict */
   Queue decisionq_why;                 /* index of rule, Offset into rules */
-  int directdecisions;                 /* number of decisions with no rule */
 
   Id *decisionmap;                     /* map for all available solvables,
                                         * = 0: undecided
                                         * > 0: level of decision when installed,
                                         * < 0: level of decision when conflict */
 
+  int decisioncnt_jobs;
+  int decisioncnt_update;
+  int decisioncnt_keep;
+  int decisioncnt_resolve;
+  int decisioncnt_weak;
+  int decisioncnt_orphan;
+
   /* learnt rule history */
   Queue learnt_why;
   Queue learnt_pool;
 
   Queue branches;
-  int (*solution_callback)(struct solver *solv, void *data);
-  void *solution_callback_data;
-
   int propagate_index;                  /* index into decisionq for non-propagated decisions */
 
-  Queue problems;                       /* index of conflicting rules, < 0 for job rules */
-  Queue recommendations;               /* recommended packages */
-  Queue suggestions;                   /* suggested packages */
-  Queue orphaned;                      /* orphaned packages */
+  Queue problems;                       /* list of lists of conflicting rules, < 0 for job rules */
+  Queue solutions;                     /* refined problem storage space */
+
+  Queue orphaned;                      /* orphaned packages (to be removed?) */
 
   int stats_learned;                   /* statistic */
   int stats_unsolvable;                        /* statistic */
@@ -134,81 +138,66 @@ typedef struct solver {
   Map recommendsmap;                   /* recommended packages from decisionmap */
   Map suggestsmap;                     /* suggested packages from decisionmap */
   int recommends_index;                        /* recommendsmap/suggestsmap is created up to this level */
+  Queue *recommendscplxq;
+  Queue *suggestscplxq;
 
   Id *obsoletes;                       /* obsoletes for each installed solvable */
   Id *obsoletes_data;                  /* data area for obsoletes */
-  Id *multiversionupdaters;            /* updaters for multiversion packages in updatesystem mode */
+  Id *specialupdaters;                 /* updaters for packages with a limited update rule */
 
   /*-------------------------------------------------------------------------------------------------------------
    * Solver configuration
    *-------------------------------------------------------------------------------------------------------------*/
 
-  int fixsystem;                       /* repair errors in rpm dependency graph */
   int allowdowngrade;                  /* allow to downgrade installed solvable */
+  int allownamechange;                 /* allow to change name of installed solvables */
   int allowarchchange;                 /* allow to change architecture of installed solvables */
   int allowvendorchange;               /* allow to change vendor of installed solvables */
   int allowuninstall;                  /* allow removal of installed solvables */
-  int updatesystem;                    /* distupgrade */
-  int allowvirtualconflicts;           /* false: conflicts on package name, true: conflicts on package provides */
-  int allowselfconflicts;              /* true: packages wich conflict with itself are installable */
-  int obsoleteusesprovides;            /* true: obsoletes are matched against provides, not names */
-  int implicitobsoleteusesprovides;    /* true: implicit obsoletes due to same name are matched against provides, not names */
   int noupdateprovide;                 /* true: update packages needs not to provide old package */
   int dosplitprovides;                 /* true: consider legacy split provides */
   int dontinstallrecommended;          /* true: do not install recommended packages */
-  int ignorealreadyrecommended;                /* true: ignore recommended packages that were already recommended by the installed packages */
+  int addalreadyrecommended;           /* true: also install recommended packages that were already recommended by the installed packages */
   int dontshowinstalledrecommended;    /* true: do not show recommended packages that are already installed */
-  
-  /* distupgrade also needs updatesystem and dosplitprovides */
-  int distupgrade;
-  int distupgrade_removeunsupported;
-
-  /* Callbacks for defining the bahaviour of the SAT solver */
-
-  /* Finding best candidate
-   *
-   * Callback definition:
-   * void  bestSolvable (Pool *pool, Queue *canditates)
-   *     candidates       : List of canditates which has to be sorted by the function call
-   *     return candidates: Sorted list of the candidates(first is the best).
-   */
-   BestSolvableCb bestSolvableCb;
-
-  /* Checking if two solvables has compatible architectures
-   *
-   * Callback definition:
-   *     int  archCheck (Pool *pool, Solvable *solvable1, Solvable *solvable2);
-   *     
-   *     return 0 it the two solvables has compatible architectures
-   */
-   ArchCheckCb archCheckCb;
-
-  /* Checking if two solvables has compatible vendors
-   *
-   * Callback definition:
-   *     int  vendorCheck (Pool *pool, Solvable *solvable1, Solvable *solvable2);
-   *     
-   *     return 0 it the two solvables has compatible architectures
-   */
-   VendorCheckCb vendorCheckCb;
-    
-  /* Evaluate update candidate
-   *
-   * Callback definition:
-   * void pdateCandidateCb (Pool *pool, Solvable *solvable, Queue *canditates)
-   *     solvable   : for which updates should be search
-   *     candidates : List of candidates (This list depends on other
-   *                  restrictions like architecture and vendor policies too)
-   */
-   UpdateCandidateCb   updateCandidateCb;
-    
 
-  /* some strange queue that doesn't belong here */
-  Queue covenantq;                      /* Covenants honored by this solver (generic locks) */
+  int noinfarchcheck;                  /* true: do not forbid inferior architectures */
+  int keepexplicitobsoletes;           /* true: honor obsoletes during multiinstall */
+  int bestobeypolicy;                  /* true: stay in policy with the best rules */
+  int noautotarget;                    /* true: do not assume targeted for up/dup jobs that contain no installed solvable */
+  int focus_installed;                 /* true: resolve update rules first */
+  int do_yum_obsoletes;                        /* true: add special yumobs rules */
+
+  Map dupmap;                          /* dup these packages*/
+  int dupmap_all;                      /* dup all packages */
+  Map dupinvolvedmap;                  /* packages involved in dup process */
+  int dup_allowdowngrade;              /* dup mode: allow to downgrade installed solvable */
+  int dup_allownamechange;             /* dup mode: allow to change name of installed solvable */
+  int dup_allowarchchange;             /* dup mode: allow to change architecture of installed solvables */
+  int dup_allowvendorchange;           /* dup mode: allow to change vendor of installed solvables */
+
+  Map droporphanedmap;                 /* packages to drop in dup mode */
+  int droporphanedmap_all;
+
+  Map cleandepsmap;                    /* try to drop these packages as of cleandeps erases */
+
+  Queue *ruleinfoq;                    /* tmp space for solver_ruleinfo() */
+
+  Queue *cleandeps_updatepkgs;         /* packages we update in cleandeps mode */
+  Queue *cleandeps_mistakes;           /* mistakes we made */
+
+  Queue *update_targets;               /* update to specific packages */
 
-  
-  Queue *job;                          /* tmp store for job we're working on */
-} Solver;
+  Queue *installsuppdepq;              /* deps from the install namespace provides hack */
+
+  Queue addedmap_deduceq;              /* deduce addedmap from rpm rules */
+  Id *instbuddy;                       /* buddies of installed packages */
+  int keep_orphans;                    /* how to treat orphans */
+  int break_orphans;                   /* how to treat orphans */
+  Queue *brokenorphanrules;            /* broken rules of orphaned packages */
+#endif /* LIBSOLV_INTERNAL */
+};
+
+typedef struct _Solver Solver;
 
 /*
  * queue commands
@@ -218,152 +207,162 @@ typedef struct solver {
 #define SOLVER_SOLVABLE_NAME           0x02
 #define SOLVER_SOLVABLE_PROVIDES       0x03
 #define SOLVER_SOLVABLE_ONE_OF         0x04
+#define SOLVER_SOLVABLE_REPO           0x05
+#define SOLVER_SOLVABLE_ALL            0x06
 
 #define SOLVER_SELECTMASK              0xff
 
+#define SOLVER_NOOP                    0x0000
 #define SOLVER_INSTALL                 0x0100
 #define SOLVER_ERASE                   0x0200
 #define SOLVER_UPDATE                  0x0300
 #define SOLVER_WEAKENDEPS                      0x0400
-#define SOLVER_NOOBSOLETES             0x0500
+#define SOLVER_MULTIVERSION            0x0500
 #define SOLVER_LOCK                    0x0600
+#define SOLVER_DISTUPGRADE             0x0700
+#define SOLVER_VERIFY                  0x0800
+#define SOLVER_DROP_ORPHANED           0x0900
+#define SOLVER_USERINSTALLED            0x0a00
 
 #define SOLVER_JOBMASK                 0xff00
 
 #define SOLVER_WEAK                    0x010000
 #define SOLVER_ESSENTIAL               0x020000
+#define SOLVER_CLEANDEPS                0x040000
+/* ORUPDATE makes SOLVER_INSTALL not prune to installed
+ * packages, thus updating installed packages */
+#define SOLVER_ORUPDATE                        0x080000
+/* FORCEBEST makes the solver insist on best packages, so
+ * you will get problem reported if the best package is
+ * not installable. This can be used with INSTALL, UPDATE
+ * and DISTUPGRADE */
+#define SOLVER_FORCEBEST               0x100000
+/* TARGETED is used in up/dup jobs to make the solver
+ * treat the specified selection as target packages.
+ * It is automatically assumed if the selection does not
+ * contain an "installed" package unless the
+ * NO_AUTOTARGET solver flag is set */
+#define SOLVER_TARGETED                        0x200000
+/* This (SOLVER_INSTALL) job was automatically added
+ * and thus does not the add to the userinstalled packages */
+#define SOLVER_NOTBYUSER               0x400000
+
+#define SOLVER_SETEV                   0x01000000
+#define SOLVER_SETEVR                  0x02000000
+#define SOLVER_SETARCH                 0x04000000
+#define SOLVER_SETVENDOR               0x08000000
+#define SOLVER_SETREPO                 0x10000000
+#define SOLVER_NOAUTOSET               0x20000000
+#define SOLVER_SETNAME                 0x40000000
+
+#define SOLVER_SETMASK                 0x7f000000
+
+/* legacy */
+#define SOLVER_NOOBSOLETES             SOLVER_MULTIVERSION
+
+#define SOLVER_REASON_UNRELATED                0
+#define SOLVER_REASON_UNIT_RULE                1
+#define SOLVER_REASON_KEEP_INSTALLED   2
+#define SOLVER_REASON_RESOLVE_JOB      3
+#define SOLVER_REASON_UPDATE_INSTALLED 4
+#define SOLVER_REASON_CLEANDEPS_ERASE  5
+#define SOLVER_REASON_RESOLVE          6
+#define SOLVER_REASON_WEAKDEP          7
+#define SOLVER_REASON_RESOLVE_ORPHAN   8
+
+#define SOLVER_REASON_RECOMMENDED      16
+#define SOLVER_REASON_SUPPLEMENTED     17
+
+
+#define SOLVER_FLAG_ALLOW_DOWNGRADE            1
+#define SOLVER_FLAG_ALLOW_ARCHCHANGE           2
+#define SOLVER_FLAG_ALLOW_VENDORCHANGE         3
+#define SOLVER_FLAG_ALLOW_UNINSTALL            4
+#define SOLVER_FLAG_NO_UPDATEPROVIDE           5
+#define SOLVER_FLAG_SPLITPROVIDES              6
+#define SOLVER_FLAG_IGNORE_RECOMMENDED         7
+#define SOLVER_FLAG_ADD_ALREADY_RECOMMENDED    8
+#define SOLVER_FLAG_NO_INFARCHCHECK            9
+#define SOLVER_FLAG_ALLOW_NAMECHANGE           10
+#define SOLVER_FLAG_KEEP_EXPLICIT_OBSOLETES    11
+#define SOLVER_FLAG_BEST_OBEY_POLICY           12
+#define SOLVER_FLAG_NO_AUTOTARGET              13
+#define SOLVER_FLAG_DUP_ALLOW_DOWNGRADE                14
+#define SOLVER_FLAG_DUP_ALLOW_ARCHCHANGE       15
+#define SOLVER_FLAG_DUP_ALLOW_VENDORCHANGE     16
+#define SOLVER_FLAG_DUP_ALLOW_NAMECHANGE       17
+#define SOLVER_FLAG_KEEP_ORPHANS               18
+#define SOLVER_FLAG_BREAK_ORPHANS              19
+#define SOLVER_FLAG_FOCUS_INSTALLED            20
+#define SOLVER_FLAG_YUM_OBSOLETES              21
+
+#define GET_USERINSTALLED_NAMES                        (1 << 0)        /* package names instead if ids */
+#define GET_USERINSTALLED_INVERTED             (1 << 1)        /* autoinstalled */
 
-/* old API compatibility, do not use in new code */
-#if 1
-#define SOLVER_INSTALL_SOLVABLE (SOLVER_INSTALL|SOLVER_SOLVABLE)
-#define SOLVER_ERASE_SOLVABLE (SOLVER_ERASE|SOLVER_SOLVABLE)
-#define SOLVER_INSTALL_SOLVABLE_NAME (SOLVER_INSTALL|SOLVER_SOLVABLE_NAME)
-#define SOLVER_ERASE_SOLVABLE_NAME (SOLVER_ERASE|SOLVER_SOLVABLE_NAME)
-#define SOLVER_INSTALL_SOLVABLE_PROVIDES (SOLVER_INSTALL|SOLVER_SOLVABLE_PROVIDES)
-#define SOLVER_ERASE_SOLVABLE_PROVIDES (SOLVER_ERASE|SOLVER_SOLVABLE_PROVIDES)
-#define SOLVER_INSTALL_SOLVABLE_UPDATE (SOLVER_UPDATE|SOLVER_SOLVABLE)
-#define SOLVER_INSTALL_SOLVABLE_ONE_OF (SOLVER_INSTALL|SOLVER_SOLVABLE_ONE_OF)
-#define SOLVER_WEAKEN_SOLVABLE_DEPS (SOLVER_WEAKENDEPS|SOLVER_SOLVABLE)
-#define SOLVER_NOOBSOLETES_SOLVABLE (SOLVER_NOOBSOLETES|SOLVER_SOLVABLE)
-#define SOLVER_NOOBSOLETES_SOLVABLE_NAME (SOLVER_NOOBSOLETES|SOLVER_SOLVABLE_NAME)
-#define SOLVER_NOOBSOLETES_SOLVABLE_PROVIDES (SOLVER_NOOBSOLETES|SOLVER_SOLVABLE_PROVIDES)
-#endif
+extern Solver *solver_create(Pool *pool);
+extern void solver_free(Solver *solv);
+extern int  solver_solve(Solver *solv, Queue *job);
+extern Transaction *solver_create_transaction(Solver *solv);
+extern int solver_set_flag(Solver *solv, int flag, int value);
+extern int solver_get_flag(Solver *solv, int flag);
 
-typedef enum {
-  SOLVER_PROBLEM_UPDATE_RULE,
-  SOLVER_PROBLEM_JOB_RULE,
-  SOLVER_PROBLEM_JOB_NOTHING_PROVIDES_DEP,
-  SOLVER_PROBLEM_NOT_INSTALLABLE,
-  SOLVER_PROBLEM_NOTHING_PROVIDES_DEP,
-  SOLVER_PROBLEM_SAME_NAME,
-  SOLVER_PROBLEM_PACKAGE_CONFLICT,
-  SOLVER_PROBLEM_PACKAGE_OBSOLETES,
-  SOLVER_PROBLEM_DEP_PROVIDERS_NOT_INSTALLABLE,
-  SOLVER_PROBLEM_SELF_CONFLICT,
-  SOLVER_PROBLEM_RPM_RULE
-} SolverProbleminfo;
+extern int  solver_get_decisionlevel(Solver *solv, Id p);
+extern void solver_get_decisionqueue(Solver *solv, Queue *decisionq);
+extern int  solver_get_lastdecisionblocklevel(Solver *solv);
+extern void solver_get_decisionblock(Solver *solv, int level, Queue *decisionq);
 
+extern void solver_get_orphaned(Solver *solv, Queue *orphanedq);
+extern void solver_get_recommendations(Solver *solv, Queue *recommendationsq, Queue *suggestionsq, int noselected);
+extern void solver_get_unneeded(Solver *solv, Queue *unneededq, int filtered);
+extern void solver_get_userinstalled(Solver *solv, Queue *q, int flags);
+extern void pool_add_userinstalled_jobs(Pool *pool, Queue *q, Queue *job, int flags);
 
-extern Solver *solver_create(Pool *pool);
-extern void solver_free(Solver *solv);
-extern void solver_solve(Solver *solv, Queue *job);
-extern int solver_dep_installed(Solver *solv, Id dep);
-extern int solver_splitprovides(Solver *solv, Id dep);
-
-extern Id solver_next_problem(Solver *solv, Id problem);
-extern Id solver_next_solution(Solver *solv, Id problem, Id solution);
-extern Id solver_next_solutionelement(Solver *solv, Id problem, Id solution, Id element, Id *p, Id *rp);
-extern Id solver_findproblemrule(Solver *solv, Id problem);
-extern void solver_findallproblemrules(Solver *solv, Id problem, Queue *rules);
-
-extern SolverProbleminfo solver_problemruleinfo(Solver *solv, Queue *job, Id rid, Id *depp, Id *sourcep, Id *targetp);
-
-/* XXX: why is this not static? */
-Id *solver_create_decisions_obsoletesmap(Solver *solv);
-
-static inline int
-solver_dep_fulfilled(Solver *solv, Id dep)
-{
-  Pool *pool = solv->pool;
-  Id p, pp;
-
-  if (ISRELDEP(dep))
-    {
-      Reldep *rd = GETRELDEP(pool, dep);
-      if (rd->flags == REL_AND)
-        {
-          if (!solver_dep_fulfilled(solv, rd->name))
-            return 0;
-          return solver_dep_fulfilled(solv, rd->evr);
-        }
-      if (rd->flags == REL_NAMESPACE && rd->name == NAMESPACE_SPLITPROVIDES)
-        return solver_splitprovides(solv, rd->evr);
-      if (rd->flags == REL_NAMESPACE && rd->name == NAMESPACE_INSTALLED)
-        return solver_dep_installed(solv, rd->evr);
-    }
-  FOR_PROVIDES(p, pp, dep)
-    {
-      if (solv->decisionmap[p] > 0)
-        return 1;
-    }
-  return 0;
-}
+extern int  solver_describe_decision(Solver *solv, Id p, Id *infop);
+extern void solver_describe_weakdep_decision(Solver *solv, Id p, Queue *whyq);
 
-static inline int
-solver_is_supplementing(Solver *solv, Solvable *s)
-{
-  Id sup, *supp;
-  if (!s->supplements)
-    return 0;
-  supp = s->repo->idarraydata + s->supplements;
-  while ((sup = *supp++) != 0)
-    if (solver_dep_fulfilled(solv, sup))
-      return 1;
-  return 0;
-}
 
-static inline int
-solver_is_enhancing(Solver *solv, Solvable *s)
-{
-  Id enh, *enhp;
-  if (!s->enhances)
-    return 0;
-  enhp = s->repo->idarraydata + s->enhances;
-  while ((enh = *enhp++) != 0)
-    if (solver_dep_fulfilled(solv, enh))
-      return 1;
-  return 0;
-}
+extern void solver_calculate_multiversionmap(Pool *pool, Queue *job, Map *multiversionmap);
+extern void solver_calculate_noobsmap(Pool *pool, Queue *job, Map *multiversionmap);   /* obsolete */
+extern void solver_create_state_maps(Solver *solv, Map *installedmap, Map *conflictsmap);
 
-void solver_calc_duchanges(Solver *solv, DUChanges *mps, int nmps);
-int solver_calc_installsizechange(Solver *solv);
+extern void solver_calc_duchanges(Solver *solv, DUChanges *mps, int nmps);
+extern int solver_calc_installsizechange(Solver *solv);
+extern void solver_trivial_installable(Solver *solv, Queue *pkgs, Queue *res);
 
-void solver_find_involved(Solver *solv, Queue *installedq, Solvable *s, Queue *q);
+extern void pool_job2solvables(Pool *pool, Queue *pkgs, Id how, Id what);
+extern int  pool_isemptyupdatejob(Pool *pool, Id how, Id what);
 
-static inline void
-solver_create_state_maps(Solver *solv, Map *installedmap, Map *conflictsmap)
-{
-  pool_create_state_maps(solv->pool, &solv->decisionq, installedmap, conflictsmap);
-}
+extern const char *solver_select2str(Pool *pool, Id select, Id what);
+extern const char *pool_job2str(Pool *pool, Id how, Id what, Id flagmask);
 
 /* iterate over all literals of a rule */
-/* WARNING: loop body must not relocate whatprovidesdata, e.g. by
- * looking up the providers of a dependency */
-#define FOR_RULELITERALS(l, dp, r)                             \
-    for (l = r->d < 0 ? -r->d - 1 : r->d,                      \
-         dp = !l ? &r->w2 : pool->whatprovidesdata + l,                \
-         l = r->p; l; l = (dp != &r->w2 + 1 ? *dp++ : 0))
+#define FOR_RULELITERALS(l, pp, r)                             \
+    for (pp = r->d < 0 ? -r->d - 1 : r->d,                     \
+         l = r->p; l; l = (pp <= 0 ? (pp-- ? 0 : r->w2) :      \
+         pool->whatprovidesdata[pp++]))
+
+
+
+
+/* XXX: this currently doesn't work correctly for SOLVER_SOLVABLE_REPO and
+   SOLVER_SOLVABLE_ALL */
 
 /* iterate over all packages selected by a job */
-#define FOR_JOB_SELECT(p, pp, select, what) \
-    for (pp = (select == SOLVER_SOLVABLE ? 0 : \
-               select == SOLVER_SOLVABLE_ONE_OF ? what : \
-               pool_whatprovides(pool, what)),                         \
-         p = (select == SOLVER_SOLVABLE ? what : pool->whatprovidesdata[pp++]) ; p ; p = pool->whatprovidesdata[pp++]) \
-      if (select != SOLVER_SOLVABLE_NAME || pool_match_nevr(pool, pool->solvables + p, what))
+#define FOR_JOB_SELECT(p, pp, select, what)                                    \
+    if (select == SOLVER_SOLVABLE_REPO || select == SOLVER_SOLVABLE_ALL)       \
+       p = pp = 0;                                                             \
+    else for (pp = (select == SOLVER_SOLVABLE ? 0 :                            \
+               select == SOLVER_SOLVABLE_ONE_OF ? what :                       \
+               pool_whatprovides(pool, what)),                                 \
+         p = (select == SOLVER_SOLVABLE ? what : pool->whatprovidesdata[pp++]); \
+                                        p ; p = pool->whatprovidesdata[pp++])  \
+      if (select == SOLVER_SOLVABLE_NAME &&                                    \
+                       pool_match_nevr(pool, pool->solvables + p, what) == 0)  \
+       continue;                                                               \
+      else
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* SATSOLVER_SOLVER_H */
+#endif /* LIBSOLV_SOLVER_H */