#include "policy.h"
#include "poolarch.h"
#include "solverdebug.h"
+#include "cplxdeps.h"
#define RULES_BLOCK 63
* for installed packages and check the lazywhatprovidesq (ignoring the REL_WITH part, but
* we filter the package name further down anyway).
*/
- if (pool->addedfileprovides == 1 && !ISRELDEP(rd->evr))
+ if (pool->addedfileprovides == 1 && !ISRELDEP(rd->evr) && !pool->whatprovides[rd->evr])
pp = pool_searchlazywhatprovidesq(pool, rd->evr);
else
pp = pool_whatprovides(pool, dep);
/************************************************************************/
/*
- * enable/disable learnt rules
+ * enable/disable learnt rules
*
* we have enabled or disabled some of our rules. We now reenable all
* of our learnt rules except the ones that were learnt from rules that
/*
* make assertion rules into decisions
- *
+ *
* Go through rules and add direct assertions to the decisionqueue.
* If we find a conflict, disable rules and add them to problem queue.
*/
{
ri = solv->ruleassertions.elements[ii];
r = solv->rules + ri;
-
+
if (havedisabled && ri >= solv->learntrules)
{
/* just started with learnt rule assertions. If we have disabled
enabledisablelearntrules(solv);
havedisabled = 0;
}
-
+
if (r->d < 0 || !r->p || r->w2) /* disabled, dummy or no assertion */
continue;
v = r->p;
vv = v > 0 ? v : -v;
-
+
if (!solv->decisionmap[vv]) /* if not yet decided */
{
queue_push(&solv->decisionq, v);
continue;
if (v < 0 && solv->decisionmap[vv] < 0) /* ok to remove */
continue;
-
+
/*
* found a conflict!
- *
+ *
* The rule (r) we're currently processing says something
* different (v = r->p) than a previous decision (decisionmap[abs(v)])
* on this literal
*/
-
+
if (ri >= solv->learntrules)
{
/* conflict with a learnt rule */
solver_disablerule(solv, r);
continue;
}
-
+
/*
* find the decision which is the "opposite" of the rule
*/
break;
assert(i < solv->decisionq.count); /* assert that we found it */
oldproblemcount = solv->problems.count;
-
+
/*
* conflict with system solvable ?
*/
/*
* conflict with another job or update/feature rule
*/
-
+
/* record proof */
if (record_proof)
{
continue;
if (v < 0 && solv->decisionmap[vv] < 0)
continue;
-
+
POOL_DEBUG(SOLV_DEBUG_UNSOLVABLE, "assertion conflict, but I am weak, disabling ");
solver_printrule(solv, SOLV_DEBUG_UNSOLVABLE, r);
*
* add watches (for a new learned rule)
* sets up watches for a single rule
- *
+ *
* see also makewatches() above.
*/
#define DECISIONMAP_UNDEF(p) (decisionmap[(p) > 0 ? (p) : -(p)] == 0)
/*-------------------------------------------------------------------
- *
+ *
* propagate
*
* make decision and propagate to all rules
- *
+ *
* Evaluate each term affected by the decision (linked through watches).
* If we find unit rules we make new decisions based on them.
- *
+ *
* return : 0 = everything is OK
* rule = conflict found in this rule
*/
Id p, pkg, other_watch;
Id *dp;
Id *decisionmap = solv->decisionmap;
-
+
Id *watches = solv->watches + pool->nsolvables; /* place ptr in middle */
POOL_DEBUG(SOLV_DEBUG_PROPAGATE, "----- propagate -----\n");
}
/* 'pkg' was just decided (was set to FALSE)
- *
+ *
* now find other literal watch, check clause
* and advance on linked list
*/
other_watch = r->w1;
next_rp = &r->n2;
}
-
- /*
+
+ /*
* This term is already true (through the other literal)
* so we have nothing to do
*/
/*
* The other literal is FALSE or UNDEF
- *
+ *
*/
-
+
if (r->d)
{
/* Not a binary clause, try to move our watch.
- *
+ *
* Go over all literals and find one that is
* not other_watch
* and not FALSE
- *
+ *
* (TRUE is also ok, in that case the rule is fulfilled)
*/
if (r->p /* we have a 'p' */
else
POOL_DEBUG(SOLV_DEBUG_PROPAGATE," -> move w%d to !%s\n", (pkg == r->w1 ? 1 : 2), pool_solvid2str(pool, -p));
}
-
+
*rp = *next_rp;
next_rp = rp;
-
+
if (pkg == r->w1)
{
r->w1 = p;
/* search failed, thus all unwatched literals are FALSE */
} /* not binary */
-
+
/*
* unit clause found, set literal other_watch to TRUE
*/
if (DECISIONMAP_FALSE(other_watch)) /* check if literal is FALSE */
return r; /* eek, a conflict! */
-
+
IF_POOLDEBUG (SOLV_DEBUG_PROPAGATE)
{
- POOL_DEBUG(SOLV_DEBUG_PROPAGATE, " unit ");
+ POOL_DEBUG(SOLV_DEBUG_PROPAGATE, " unit ");
solver_printrule(solv, SOLV_DEBUG_PROPAGATE, r);
}
decisionmap[other_watch] = level; /* install! */
else
decisionmap[-other_watch] = -level; /* remove! */
-
+
queue_push(&solv->decisionq, other_watch);
queue_push(&solv->decisionq_why, r - solv->rules);
else
POOL_DEBUG(SOLV_DEBUG_PROPAGATE, " -> decided to conflict %s\n", pool_solvid2str(pool, -other_watch));
}
-
+
} /* foreach rule involving 'pkg' */
} /* while we have non-decided decisions */
-
+
POOL_DEBUG(SOLV_DEBUG_PROPAGATE, "----- propagate end-----\n");
return 0; /* all is well */
/* Analysis */
/*-------------------------------------------------------------------
- *
+ *
* analyze
* and learn
*/
/*-------------------------------------------------------------------
- *
+ *
* solver_reset
- *
+ *
* reset all solver decisions
* called after rules have been enabled/disabled
*/
queue_empty(&solv->decisionq);
solv->recommends_index = -1;
solv->propagate_index = 0;
+ solv->decisioncnt_update = solv->decisioncnt_keep = solv->decisioncnt_resolve = solv->decisioncnt_weak = solv->decisioncnt_orphan = 0;
queue_empty(&solv->branches);
/* adapt learnt rule status to new set of enabled/disabled rules */
/*-------------------------------------------------------------------
- *
+ *
* analyze_unsolvable_rule
*
* recursion helper used by analyze_unsolvable
/*-------------------------------------------------------------------
- *
+ *
* analyze_unsolvable
*
* We know that the problem is not solvable. Record all involved
/* Decision revert */
/*-------------------------------------------------------------------
- *
+ *
* revert
* revert decisionq to a level
*/
while (solv->branches.count && solv->branches.elements[solv->branches.count - 1] >= 0)
solv->branches.count--;
}
- solv->recommends_index = -1;
+ if (solv->recommends_index > solv->decisionq.count)
+ solv->recommends_index = -1; /* rebuild recommends/suggests maps */
+ if (solv->decisionq.count < solv->decisioncnt_update)
+ solv->decisioncnt_update = 0;
+ if (solv->decisionq.count < solv->decisioncnt_keep)
+ solv->decisioncnt_keep = 0;
+ if (solv->decisionq.count < solv->decisioncnt_resolve)
+ solv->decisioncnt_resolve = 0;
+ if (solv->decisionq.count < solv->decisioncnt_weak)
+ solv->decisioncnt_weak= 0;
+ if (solv->decisionq.count < solv->decisioncnt_orphan)
+ solv->decisioncnt_orphan = 0;
}
/*-------------------------------------------------------------------
- *
+ *
* watch2onhighest - put watch2 on literal with highest level
*/
/*-------------------------------------------------------------------
- *
+ *
* setpropagatelearn
*
* add free decision (solvable to install) to decisionq
return level;
}
+static void
+reorder_dq_for_jobrules(Solver *solv, int level, Queue *dq)
+{
+ Pool *pool = solv->pool;
+ int i, j, haveone = 0, dqcount = dq->count;
+ Id p;
+ Solvable *s;
+
+ /* at the time we process jobrules the installed packages are not kept yet */
+ /* reorder so that "future-supplemented" packages come first */
+ FOR_REPO_SOLVABLES(solv->installed, p, s)
+ {
+ if (MAPTST(&solv->noupdate, p - solv->installed->start))
+ continue;
+ if (solv->decisionmap[p] == 0)
+ {
+ solv->decisionmap[p] = level;
+ haveone = 1;
+ }
+ }
+ if (!haveone)
+ return;
+ for (i = 0; i < dqcount; i++)
+ if (!solver_is_enhancing(solv, pool->solvables + dq->elements[i]))
+ {
+ queue_push(dq, dq->elements[i]);
+ dq->elements[i] = 0;
+ }
+ dqcount = dq->count;
+ for (i = 0; i < dqcount; i++)
+ if (dq->elements[i] && !solver_is_supplementing(solv, pool->solvables + dq->elements[i]))
+ {
+ queue_push(dq, dq->elements[i]);
+ dq->elements[i] = 0;
+ }
+ for (i = j = 0; i < dq->count; i++)
+ if (dq->elements[i])
+ dq->elements[j++] = dq->elements[i];
+ queue_truncate(dq, j);
+ FOR_REPO_SOLVABLES(solv->installed, p, s)
+ if (solv->decisionmap[p] == level)
+ solv->decisionmap[p] = 0;
+}
/*-------------------------------------------------------------------
- *
+ *
* select and install
- *
+ *
* install best package from the queue. We add an extra package, inst, if
* provided. See comment in weak install section.
*
break;
}
}
+ if (dq->count > 1 && ruleid >= solv->jobrules && ruleid < solv->jobrules_end && solv->installed)
+ reorder_dq_for_jobrules(solv, level, dq);
if (dq->count > 1)
{
/* multiple candidates, open a branch */
/*-------------------------------------------------------------------
- *
+ *
* solver_create
* create solver structure
*
/*-------------------------------------------------------------------
- *
+ *
* solver_free
*/
+static inline void
+queuep_free(Queue **qp)
+{
+ if (!*qp)
+ return;
+ queue_free(*qp);
+ *qp = solv_free(*qp);
+}
+
+static inline void
+map_zerosize(Map *m)
+{
+ if (m->size)
+ {
+ map_free(m);
+ map_init(m, 0);
+ }
+}
+
void
solver_free(Solver *solv)
{
queue_free(&solv->weakruleq);
queue_free(&solv->ruleassertions);
queue_free(&solv->addedmap_deduceq);
- if (solv->cleandeps_updatepkgs)
- {
- queue_free(solv->cleandeps_updatepkgs);
- solv->cleandeps_updatepkgs = solv_free(solv->cleandeps_updatepkgs);
- }
- if (solv->cleandeps_mistakes)
- {
- queue_free(solv->cleandeps_mistakes);
- solv->cleandeps_mistakes = solv_free(solv->cleandeps_mistakes);
- }
- if (solv->update_targets)
- {
- queue_free(solv->update_targets);
- solv->update_targets = solv_free(solv->update_targets);
- }
- if (solv->installsuppdepq)
- {
- queue_free(solv->installsuppdepq);
- solv->installsuppdepq = solv_free(solv->installsuppdepq);
- }
+ queuep_free(&solv->cleandeps_updatepkgs);
+ queuep_free(&solv->cleandeps_mistakes);
+ queuep_free(&solv->update_targets);
+ queuep_free(&solv->installsuppdepq);
+ queuep_free(&solv->recommendscplxq);
+ queuep_free(&solv->suggestscplxq);
map_free(&solv->recommendsmap);
map_free(&solv->suggestsmap);
solv_free(solv->watches);
solv_free(solv->obsoletes);
solv_free(solv->obsoletes_data);
- solv_free(solv->multiversionupdaters);
+ solv_free(solv->specialupdaters);
solv_free(solv->choicerules_ref);
solv_free(solv->bestrules_pkg);
+ solv_free(solv->instbuddy);
solv_free(solv);
}
queue_truncate(q, j);
}
+#ifdef ENABLE_COMPLEX_DEPS
+
+static void
+add_complex_recommends(Solver *solv, Id rec, Queue *dq, Map *dqmap)
+{
+ Pool *pool = solv->pool;
+ int oldcnt = dq->count;
+ int cutcnt, blkcnt;
+ Id p;
+ int i, j;
+
+#if 0
+ printf("ADD_COMPLEX_RECOMMENDS %s\n", pool_dep2str(pool, rec));
+#endif
+ i = pool_normalize_complex_dep(pool, rec, dq, CPLXDEPS_EXPAND);
+ if (i == 0 || i == 1)
+ return;
+ cutcnt = dq->count;
+ for (i = oldcnt; i < cutcnt; i++)
+ {
+ blkcnt = dq->count;
+ for (; (p = dq->elements[i]) != 0; i++)
+ {
+ if (p < 0)
+ {
+ if (solv->decisionmap[-p] <= 0)
+ break;
+ continue;
+ }
+ if (solv->decisionmap[p] > 0)
+ {
+ queue_truncate(dq, blkcnt);
+ break;
+ }
+ if (dqmap)
+ {
+ if (!MAPTST(dqmap, p))
+ continue;
+ }
+ else
+ {
+ if (solv->decisionmap[p] < 0)
+ continue;
+ if (solv->dupmap_all && solv->installed && pool->solvables[p].repo == solv->installed && (solv->droporphanedmap_all || (solv->droporphanedmap.size && MAPTST(&solv->droporphanedmap, p - solv->installed->start))))
+ continue;
+ }
+ queue_push(dq, p);
+ }
+ while (dq->elements[i])
+ i++;
+ }
+ queue_deleten(dq, oldcnt, cutcnt - oldcnt);
+ /* unify */
+ if (dq->count != oldcnt)
+ {
+ for (j = oldcnt; j < dq->count; j++)
+ {
+ p = dq->elements[j];
+ for (i = 0; i < j; i++)
+ if (dq->elements[i] == p)
+ {
+ dq->elements[j] = 0;
+ break;
+ }
+ }
+ for (i = j = oldcnt; j < dq->count; j++)
+ if (dq->elements[j])
+ dq->elements[i++] = dq->elements[j];
+ queue_truncate(dq, i);
+ }
+#if 0
+ printf("RETURN:\n");
+ for (i = oldcnt; i < dq->count; i++)
+ printf(" - %s\n", pool_solvid2str(pool, dq->elements[i]));
+#endif
+}
+
+static void
+do_complex_recommendations(Solver *solv, Id rec, Map *m, int noselected)
+{
+ Pool *pool = solv->pool;
+ Queue dq;
+ Id p;
+ int i, blk;
+
+#if 0
+ printf("DO_COMPLEX_RECOMMENDATIONS %s\n", pool_dep2str(pool, rec));
+#endif
+ queue_init(&dq);
+ i = pool_normalize_complex_dep(pool, rec, &dq, CPLXDEPS_EXPAND);
+ if (i == 0 || i == 1)
+ {
+ queue_free(&dq);
+ return;
+ }
+ for (i = 0; i < dq.count; i++)
+ {
+ blk = i;
+ for (; (p = dq.elements[i]) != 0; i++)
+ {
+ if (p < 0)
+ {
+ if (solv->decisionmap[-p] <= 0)
+ break;
+ continue;
+ }
+ if (solv->decisionmap[p] > 0)
+ {
+ if (noselected)
+ break;
+ MAPSET(m, p);
+ for (i++; (p = dq.elements[i]) != 0; i++)
+ if (p > 0 && solv->decisionmap[p] > 0)
+ MAPSET(m, p);
+ p = 1;
+ break;
+ }
+ }
+ if (!p)
+ {
+ for (i = blk; (p = dq.elements[i]) != 0; i++)
+ if (p > 0)
+ MAPSET(m, p);
+ }
+ while (dq.elements[i])
+ i++;
+ }
+ queue_free(&dq);
+}
+
+#endif
+
/*-------------------------------------------------------------------
- *
+ *
* solver_run_sat
*
* all rules have been set up, now actually run the solver
* if we encounter a problem, we rewind to a safe level and restart
* with step 1
*/
-
+
minimizationsteps = 0;
for (;;)
{
systemlevel = level + 1;
if (i < solv->jobrules_end)
continue;
- solv->decisioncnt_update = solv->decisionq.count;
- solv->decisioncnt_keep = solv->decisionq.count;
+ if (!solv->decisioncnt_update)
+ solv->decisioncnt_update = solv->decisionq.count;
}
/*
int pass;
POOL_DEBUG(SOLV_DEBUG_SOLVER, "resolving installed packages\n");
- /* we use two passes if we need to update packages
+ /* we use two passes if we need to update packages
* to create a better user experience */
for (pass = solv->updatemap.size ? 0 : 1; pass < 2; pass++)
{
int passlevel = level;
- Id *multiversionupdaters = solv->multiversion.size ? solv->multiversionupdaters : 0;
- if (pass == 1)
+ Id *specialupdaters = solv->specialupdaters;
+ if (pass == 1 && !solv->decisioncnt_keep)
solv->decisioncnt_keep = solv->decisionq.count;
/* start with installedpos, the position that gave us problems the last time */
for (i = installedpos, n = installed->start; n < installed->end; i++, n++)
if (s->repo != installed)
continue;
- if (solv->decisionmap[i] > 0 && (!multiversionupdaters || !multiversionupdaters[i - installed->start]))
+ if (solv->decisionmap[i] > 0 && (!specialupdaters || !specialupdaters[i - installed->start]))
continue; /* already decided */
if (!pass && solv->updatemap.size && !MAPTST(&solv->updatemap, i - installed->start))
continue; /* updates first */
rr -= solv->installed->end - solv->installed->start;
if (!rr->p) /* identical to update rule? */
rr = r;
- if (!rr->p)
+ if (!rr->p && (!specialupdaters || !specialupdaters[i - installed->start]))
continue; /* orpaned package */
/* check if we should update this package to the latest version
* noupdate is set for erase jobs, in that case we want to deinstall
- * the installed package and not replace it with a newer version */
+ * the installed package and not replace it with a newer version
+ * rr->p != i is for dup jobs where the installed package cannot be kept */
queue_empty(&dq);
- if (!MAPTST(&solv->noupdate, i - installed->start) && (solv->decisionmap[i] < 0 || solv->updatemap_all || (solv->updatemap.size && MAPTST(&solv->updatemap, i - installed->start)) || rr->p != i))
+ if (!MAPTST(&solv->noupdate, i - installed->start) && (solv->decisionmap[i] < 0 || solv->updatemap_all || (solv->updatemap.size && MAPTST(&solv->updatemap, i - installed->start)) || (rr->p && rr->p != i)))
{
- if (multiversionupdaters && (d = multiversionupdaters[i - installed->start]) != 0)
+ if (specialupdaters && (d = specialupdaters[i - installed->start]) != 0)
{
/* special multiversion handling, make sure best version is chosen */
if (rr->p == i && solv->decisionmap[i] >= 0)
queue_push(&dq, p);
if (dq.count && solv->update_targets && solv->update_targets->elements[i - installed->start])
prune_to_update_targets(solv, solv->update_targets->elements + solv->update_targets->elements[i - installed->start], &dq);
- if (dq.count)
+ if (dq.count && rr->p)
{
policy_filter_unwanted(solv, &dq, POLICY_MODE_CHOOSE);
p = dq.elements[0];
if (pass < 2)
continue; /* had trouble, retry */
}
+ if (!solv->decisioncnt_keep)
+ solv->decisioncnt_keep = solv->decisionq.count;
if (level < systemlevel)
systemlevel = level;
/*
* decide
*/
- solv->decisioncnt_resolve = solv->decisionq.count;
+ if (!solv->decisioncnt_resolve)
+ solv->decisioncnt_resolve = solv->decisionq.count;
POOL_DEBUG(SOLV_DEBUG_POLICY, "deciding unresolved rules\n");
for (i = 1, n = 1; n < solv->nrules; i++, n++)
{
r = solv->rules + i;
if (r->d < 0) /* ignore disabled rules */
continue;
- queue_empty(&dq);
+ if (r->p < 0) /* most common cases first */
+ {
+ if (r->d == 0 || solv->decisionmap[-r->p] <= 0)
+ continue;
+ }
+ if (dq.count)
+ queue_empty(&dq);
if (r->d == 0)
{
/* binary or unary rule */
- /* need two positive undecided literals */
- if (r->p < 0 || r->w2 <= 0)
+ /* need two positive undecided literals, r->p already checked above */
+ if (r->w2 <= 0)
continue;
if (solv->decisionmap[r->p] || solv->decisionmap[r->w2])
continue;
* no positive literal is installed
* i.e. the rule is not fulfilled and we
* just need to decide on the positive literals
+ * (decisionmap[-r->p] for the r->p < 0 case is already checked above)
*/
- if (r->p < 0)
- {
- if (solv->decisionmap[-r->p] <= 0)
- continue;
- }
- else
+ if (r->p >= 0)
{
if (solv->decisionmap[r->p] > 0)
continue;
continue; /* start over */
}
- /* at this point we have a consistent system. now do the extras... */
-
- /* first decide leftover cleandeps packages */
+ /* decide leftover cleandeps packages */
if (solv->cleandepsmap.size && solv->installed)
{
for (p = solv->installed->start; p < solv->installed->end; p++)
continue;
}
- solv->decisioncnt_weak = solv->decisionq.count;
+ /* at this point we have a consistent system. now do the extras... */
+
+ if (!solv->decisioncnt_weak)
+ solv->decisioncnt_weak = solv->decisionq.count;
if (doweak)
{
int qcount;
recp = s->repo->idarraydata + s->recommends;
while ((rec = *recp++) != 0)
{
+#ifdef ENABLE_COMPLEX_DEPS
+ if (pool_is_complex_dep(pool, rec))
+ {
+ add_complex_recommends(solv, rec, &dq, 0);
+ continue;
+ }
+#endif
qcount = dq.count;
FOR_PROVIDES(p, pp, rec)
{
while ((rec = *recp++) != 0)
{
queue_empty(&dq);
+#ifdef ENABLE_COMPLEX_DEPS
+ if (pool_is_complex_dep(pool, rec))
+ add_complex_recommends(solv, rec, &dq, &dqmap);
+ else
+#endif
FOR_PROVIDES(p, pp, rec)
{
if (solv->decisionmap[p] > 0)
break;
}
else if (solv->decisionmap[p] == 0 && MAPTST(&dqmap, p))
- queue_pushunique(&dq, p);
+ queue_push(&dq, p);
}
if (!dq.count)
continue;
}
}
- solv->decisioncnt_orphan = solv->decisionq.count;
+ if (!solv->decisioncnt_orphan)
+ solv->decisioncnt_orphan = solv->decisionq.count;
if (solv->dupmap_all && solv->installed)
{
int installedone = 0;
}
}
- if (solv->installed && solv->cleandepsmap.size)
+ /* one final pass to make sure we decided all installed packages */
+ if (solv->installed)
+ {
+ for (p = solv->installed->start; p < solv->installed->end; p++)
+ {
+ if (solv->decisionmap[p])
+ continue; /* already decided */
+ s = pool->solvables + p;
+ if (s->repo != solv->installed)
+ continue;
+ POOL_DEBUG(SOLV_DEBUG_SOLVER, "removing unwanted %s\n", pool_solvid2str(pool, p));
+ olevel = level;
+ level = setpropagatelearn(solv, level, -p, 0, 0);
+ if (level < olevel)
+ break;
+ }
+ }
+
+ if (solv->installed && solv->cleandepsmap.size)
{
if (cleandeps_check_mistakes(solv, level))
{
}
}
- if (solv->solution_callback)
+ if (solv->solution_callback)
{
solv->solution_callback(solv, solv->solution_callback_data);
if (solv->branches.count)
}
/* auto-minimization step */
- if (solv->branches.count)
+ if (solv->branches.count)
{
int l = 0, lasti = -1, lastl = -1;
Id why;
/*-------------------------------------------------------------------
- *
+ *
* remove disabled conflicts
*
* purpose: update the decisionmap after some rules were disabled.
Id obs, *obsp = s->repo->idarraydata + s->obsoletes;
while ((obs = *obsp++) != 0)
{
- FOR_PROVIDES(pi, pip, obs)
+ FOR_PROVIDES(pi, pip, obs)
{
Solvable *si = pool->solvables + pi;
if (si->repo != installed)
j++;
}
-static void
+static void
deduceq2addedmap(Solver *solv, Map *addedmap)
{
int j;
queue_insertn(&solv->job, 0, pool->pooljobs.count, pool->pooljobs.elements);
job = &solv->job;
- /* free old stuff */
- if (solv->update_targets)
- {
- queue_free(solv->update_targets);
- solv->update_targets = solv_free(solv->update_targets);
- }
- if (solv->cleandeps_updatepkgs)
- {
- queue_free(solv->cleandeps_updatepkgs);
- solv->cleandeps_updatepkgs = solv_free(solv->cleandeps_updatepkgs);
- }
+ /* free old stuff in jase we re-run a solver */
+ queuep_free(&solv->update_targets);
+ queuep_free(&solv->cleandeps_updatepkgs);
queue_empty(&solv->ruleassertions);
solv->bestrules_pkg = solv_free(solv->bestrules_pkg);
solv->choicerules_ref = solv_free(solv->choicerules_ref);
if (solv->noupdate.size)
map_empty(&solv->noupdate);
- if (solv->multiversion.size)
- {
- map_free(&solv->multiversion);
- map_init(&solv->multiversion, 0);
- }
+ map_zerosize(&solv->multiversion);
solv->updatemap_all = 0;
- if (solv->updatemap.size)
- {
- map_free(&solv->updatemap);
- map_init(&solv->updatemap, 0);
- }
+ map_zerosize(&solv->updatemap);
solv->bestupdatemap_all = 0;
- if (solv->bestupdatemap.size)
- {
- map_free(&solv->bestupdatemap);
- map_init(&solv->bestupdatemap, 0);
- }
+ map_zerosize(&solv->bestupdatemap);
solv->fixmap_all = 0;
- if (solv->fixmap.size)
- {
- map_free(&solv->fixmap);
- map_init(&solv->fixmap, 0);
- }
+ map_zerosize(&solv->fixmap);
solv->dupmap_all = 0;
- if (solv->dupmap.size)
- {
- map_free(&solv->dupmap);
- map_init(&solv->dupmap, 0);
- }
- if (solv->dupinvolvedmap.size)
- {
- map_free(&solv->dupinvolvedmap);
- map_init(&solv->dupinvolvedmap, 0);
- }
+ map_zerosize(&solv->dupmap);
+ map_zerosize(&solv->dupinvolvedmap);
solv->droporphanedmap_all = 0;
- if (solv->droporphanedmap.size)
- {
- map_free(&solv->droporphanedmap);
- map_init(&solv->droporphanedmap, 0);
- }
- if (solv->cleandepsmap.size)
- {
- map_free(&solv->cleandepsmap);
- map_init(&solv->cleandepsmap, 0);
- }
-
+ map_zerosize(&solv->droporphanedmap);
+ map_zerosize(&solv->cleandepsmap);
+ map_zerosize(&solv->weakrulemap);
queue_empty(&solv->weakruleq);
solv->watches = solv_free(solv->watches);
queue_empty(&solv->ruletojob);
{
map_empty(&solv->recommendsmap);
map_empty(&solv->suggestsmap);
+ queuep_free(&solv->recommendscplxq);
+ queuep_free(&solv->suggestscplxq);
solv->recommends_index = 0;
}
- solv->multiversionupdaters = solv_free(solv->multiversionupdaters);
-
+ solv->specialupdaters = solv_free(solv->specialupdaters);
+
/*
* create basic rule set of all involved packages
solver_shrinkrules(solv, initialnrules);
solv->nrules = initialnrules;
solv->rpmrules_end = 0;
-
+
if (installed)
{
/* check for update/verify jobs as they need to be known early */
* create rules for all packages involved in the job
* (to be installed or removed)
*/
-
+
oldnrules = solv->nrules;
for (i = 0; i < job->count; i += 2)
{
}
POOL_DEBUG(SOLV_DEBUG_STATS, "added %d rpm rules for packages involved in a job\n", solv->nrules - oldnrules);
-
+
/*
* add rules for suggests, enhances
*/
solver_addrpmrulesforweak(solv, &addedmap);
POOL_DEBUG(SOLV_DEBUG_STATS, "added %d rpm rules because of weak dependencies\n", solv->nrules - oldnrules);
+#ifdef ENABLE_LINKED_PKGS
+ oldnrules = solv->nrules;
+ solver_addrpmrulesforlinked(solv, &addedmap);
+ POOL_DEBUG(SOLV_DEBUG_STATS, "added %d rpm rules because of linked packages\n", solv->nrules - oldnrules);
+#endif
+
/*
* first pass done, we now have all the rpm rules we need.
* unify existing rules before going over all job rules and
/*
* create feature rules
- *
+ *
* foreach installed:
* create assertion (keep installed, if no update available)
* or
* create update rule (A|update1(A)|update2(A)|...)
- *
+ *
* those are used later on to keep a version of the installed packages in
* best effort mode
*/
-
+
solv->featurerules = solv->nrules; /* mark start of feature rules */
if (installed)
{
/*
* Add update rules for installed solvables
- *
+ *
* almost identical to feature rules
* except that downgrades/archchanges/vendorchanges are not allowed
*/
-
+
solv->updaterules = solv->nrules;
if (installed)
queue_push(&solv->orphaned, i);
if (!r->p)
{
- assert(solv->dupmap_all && !sr->p);
+ /* assert(solv->dupmap_all && !sr->p); */
continue;
}
if (!solver_rulecmp(solv, r, sr))
if (!solv->noinfarchcheck)
{
solver_addinfarchrules(solv, &addedmap);
+#if 0
if (pool->implicitobsoleteusescolors)
{
/* currently doesn't work well with infarch rules, so make
for (i = solv->infarchrules; i < solv->infarchrules_end; i++)
queue_push(&solv->weakruleq, i);
}
+#endif
}
else
solv->infarchrules = solv->infarchrules_end = solv->nrules;
* --------------------------------------------------------------
* prepare for solving
*/
-
+
/* free unneeded memory */
map_free(&addedmap);
map_free(&installcandidatemap);
map_grow(&solv->cleandepsmap, installed->end - installed->start);
/* no mistakes */
if (solv->cleandeps_mistakes)
- {
+ {
queue_free(solv->cleandeps_mistakes);
solv->cleandeps_mistakes = solv_free(solv->cleandeps_mistakes);
- }
+ }
/* all new rules are learnt after this point */
solv->learntrules = solv->nrules;
* solve!
* ********************************************
*/
-
+
now = solv_timems(0);
solver_run_sat(solv, 1, solv->dontinstallrecommended ? 0 : 1);
POOL_DEBUG(SOLV_DEBUG_STATS, "solver took %d ms\n", solv_timems(now));
solver_disablerule(solv, r);
goterase++;
}
-
+
if (goterase)
{
enabledisablelearntrules(solv);
Id why;
why = solv->decisionq_why.elements[i];
if (why)
- continue; /* forced by unit rule */
+ continue; /* forced by unit rule or dep resolving */
p = solv->decisionq.elements[i];
if (p < 0)
continue;
recp = s->repo->idarraydata + s->recommends;
while ((rec = *recp++) != 0)
{
+#ifdef ENABLE_COMPLEX_DEPS
+ if (pool_is_complex_dep(pool, rec))
+ {
+ do_complex_recommendations(solv, rec, &solv->recommendsmap, noselected);
+ continue;
+ }
+#endif
FOR_PROVIDES(p, pp, rec)
if (solv->decisionmap[p] > 0)
break;
/*
* find suggested packages
*/
-
+
if (suggestionsq)
{
Id sug, *sugp, p, pp;
sugp = s->repo->idarraydata + s->suggests;
while ((sug = *sugp++) != 0)
{
+#ifdef ENABLE_COMPLEX_DEPS
+ if (pool_is_complex_dep(pool, sug))
+ {
+ do_complex_recommendations(solv, sug, &solv->suggestsmap, noselected);
+ continue;
+ }
+#endif
FOR_PROVIDES(p, pp, sug)
if (solv->decisionmap[p] > 0)
break;
if (redoq.count)
undo_removedisabledconflicts(solv, &redoq);
queue_free(&redoq);
-
+
/* undo job rule disabling */
for (i = 0; i < disabledq.count; i++)
solver_enablerule(solv, solv->rules + disabledq.elements[i]);
/* disk usage computations */
/*-------------------------------------------------------------------
- *
+ *
* calculate DU changes
*/
/*-------------------------------------------------------------------
- *
+ *
* calculate changes in install size
*/
}
/*-------------------------------------------------------------------
- *
+ *
* decision introspection
*/
{
int i;
Id pp, why;
-
+
if (infop)
*infop = 0;
if (!solv->decisionmap[p])
if (i == solv->decisionq.count) /* just in case... */
return SOLVER_REASON_UNRELATED;
why = solv->decisionq_why.elements[i];
+ if (infop)
+ *infop = why > 0 ? why : -why;
if (why > 0)
- {
- if (infop)
- *infop = why;
- return SOLVER_REASON_UNIT_RULE;
- }
+ return SOLVER_REASON_UNIT_RULE;
why = -why;
if (i < solv->decisioncnt_update)
{
if (i == 0)
- {
- if (infop)
- *infop = SYSTEMSOLVABLE;
- return SOLVER_REASON_KEEP_INSTALLED;
- }
- if (infop)
- *infop = why;
+ return SOLVER_REASON_KEEP_INSTALLED;
return SOLVER_REASON_RESOLVE_JOB;
}
if (i < solv->decisioncnt_keep)
{
if (why == 0 && pp < 0)
return SOLVER_REASON_CLEANDEPS_ERASE;
- if (infop)
- {
- if (why >= solv->updaterules && why < solv->updaterules_end)
- *infop = why - solv->updaterules;
- else if (why >= solv->featurerules && why < solv->featurerules_end)
- *infop = why - solv->featurerules;
- }
return SOLVER_REASON_UPDATE_INSTALLED;
}
if (i < solv->decisioncnt_resolve)
{
if (why == 0 && pp < 0)
return SOLVER_REASON_CLEANDEPS_ERASE;
- if (infop)
- {
- if (why >= solv->updaterules && why < solv->updaterules_end)
- *infop = why - solv->updaterules;
- else if (why >= solv->featurerules && why < solv->featurerules_end)
- *infop = why - solv->featurerules;
- }
return SOLVER_REASON_KEEP_INSTALLED;
}
- if (i < solv->decisioncnt_weak)
- {
- if (infop)
- *infop = why;
- return SOLVER_REASON_RESOLVE;
- }
+ if (why > 0)
+ return SOLVER_REASON_RESOLVE;
+ /* weak or orphaned */
if (solv->decisionq.count < solv->decisioncnt_orphan)
return SOLVER_REASON_WEAKDEP;
return SOLVER_REASON_RESOLVE_ORPHAN;
Id obs, *obsp = s->repo->idarraydata + s->obsoletes;
while ((obs = *obsp++) != 0)
{
- FOR_PROVIDES(pi, pip, obs)
+ FOR_PROVIDES(pi, pip, obs)
{
Solvable *si = pool->solvables + pi;
if (si->repo != pool->installed)
return "do nothing";
case SOLVER_INSTALL:
if (select == SOLVER_SOLVABLE && pool->installed && pool->solvables[what].repo == pool->installed)
- strstart = "keep ", strend = "installed";
+ strstart = "keep ", strend = " installed";
else if (select == SOLVER_SOLVABLE || select == SOLVER_SOLVABLE_NAME)
strstart = "install ";
else if (select == SOLVER_SOLVABLE_PROVIDES)
break;
case SOLVER_ERASE:
if (select == SOLVER_SOLVABLE && !(pool->installed && pool->solvables[what].repo == pool->installed))
- strstart = "keep ", strend = "unstalled";
+ strstart = "keep ", strend = " uninstalled";
else if (select == SOLVER_SOLVABLE_PROVIDES)
strstart = "deinstall all packages ";
else
strstart = "verify ";
break;
case SOLVER_DROP_ORPHANED:
- strstart = "deinstall ", strend = "if orphaned";
+ strstart = "deinstall ", strend = " if orphaned";
break;
case SOLVER_USERINSTALLED:
- strstart = "regard ", strend = "as userinstalled";
+ strstart = "regard ", strend = " as userinstalled";
break;
default:
strstart = "unknown job ";
s = pool_tmpappend(pool, s, ",essential", 0);
if (how & SOLVER_CLEANDEPS)
s = pool_tmpappend(pool, s, ",cleandeps", 0);
+ if (how & SOLVER_ORUPDATE)
+ s = pool_tmpappend(pool, s, ",orupdate", 0);
+ if (how & SOLVER_FORCEBEST)
+ s = pool_tmpappend(pool, s, ",forcebest", 0);
+ if (how & SOLVER_TARGETED)
+ s = pool_tmpappend(pool, s, ",targeted", 0);
if (how & SOLVER_SETEV)
s = pool_tmpappend(pool, s, ",setev", 0);
if (how & SOLVER_SETEVR)
s = pool_tmpappend(pool, s, ",setvendor", 0);
if (how & SOLVER_SETREPO)
s = pool_tmpappend(pool, s, ",setrepo", 0);
+ if (how & SOLVER_SETNAME)
+ s = pool_tmpappend(pool, s, ",setname", 0);
if (how & SOLVER_NOAUTOSET)
s = pool_tmpappend(pool, s, ",noautoset", 0);
if (s[o + 1] != ',')
projects / platform / upstream / libsolv.git / blobdiff