X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Frules.c;h=729268d7c5fb0e0f1919acb3791933bb8a49941c;hb=1e554802e7188a10cc9040d5067d7ebf6b3fe0f3;hp=83426f8ebfd2de26966e36011e5aade9dbf6000a;hpb=4c6908cd35063f06478338d66072b6823ff1ac17;p=platform%2Fupstream%2Flibsolv.git diff --git a/src/rules.c b/src/rules.c index 83426f8..729268d 100644 --- a/src/rules.c +++ b/src/rules.c @@ -30,13 +30,13 @@ #define RULES_BLOCK 63 static void addrpmruleinfo(Solver *solv, Id p, Id d, int type, Id dep); -static void solver_createcleandepsmap(Solver *solv); +static void solver_createcleandepsmap(Solver *solv, Map *cleandepsmap, int unneeded); /*------------------------------------------------------------------- * Check if dependency is possible * - * mirrors solver_dep_fulfilled but uses map m instead of the decisionmap - * used in solver_addrpmrulesforweak and solver_createcleandepsmap + * mirrors solver_dep_fulfilled but uses map m instead of the decisionmap. + * used in solver_addrpmrulesforweak and solver_createcleandepsmap. */ static inline int @@ -122,7 +122,7 @@ unifyrules_sortcmp(const void *ap, const void *bp, void *dp) } int -solver_samerule(Solver *solv, Rule *r1, Rule *r2) +solver_rulecmp(Solver *solv, Rule *r1, Rule *r2) { return unifyrules_sortcmp(r1, r2, solv->pool); } @@ -507,13 +507,15 @@ solver_addrpmrulesforsolvable(Solver *solv, Solvable *s, Map *m) dontfix = 1; /* dont care about broken rpm deps */ } - if (!dontfix - && s->arch != ARCH_SRC - && s->arch != ARCH_NOSRC - && !pool_installable(pool, s)) + if (!dontfix) { - POOL_DEBUG(SOLV_DEBUG_RULE_CREATION, "package %s [%d] is not installable\n", pool_solvable2str(pool, s), (Id)(s - pool->solvables)); - addrpmrule(solv, -n, 0, SOLVER_RULE_RPM_NOT_INSTALLABLE, 0); + if (s->arch == ARCH_SRC || s->arch == ARCH_NOSRC + ? pool_disabled_solvable(pool, s) + : !pool_installable(pool, s)) + { + POOL_DEBUG(SOLV_DEBUG_RULE_CREATION, "package %s [%d] is not installable\n", pool_solvable2str(pool, s), (Id)(s - pool->solvables)); + addrpmrule(solv, -n, 0, SOLVER_RULE_RPM_NOT_INSTALLABLE, 0); + } } /* yet another SUSE hack, sigh */ @@ -635,7 +637,7 @@ solver_addrpmrulesforsolvable(Solver *solv, Solvable *s, Map *m) if (dontfix && pool->solvables[p].repo == installed) continue; /* p == n: self conflict */ - if (p == n && !pool->allowselfconflicts) + if (p == n && pool->forbidselfconflicts) { if (ISRELDEP(con)) { @@ -665,7 +667,7 @@ solver_addrpmrulesforsolvable(Solver *solv, Solvable *s, Map *m) { int noobs = solv->noobsoletes.size && MAPTST(&solv->noobsoletes, n); int isinstalled = (installed && s->repo == installed); - if (s->obsoletes && !noobs) + if (s->obsoletes && (!noobs || solv->keepexplicitobsoletes)) { obsp = s->repo->idarraydata + s->obsoletes; /* foreach obsoletes */ @@ -773,8 +775,10 @@ solver_addrpmrulesforweak(Solver *solv, Map *m) continue; s = pool->solvables + i; - if (!pool_installable(pool, s)) /* only look at installable ones */ + if (!s->repo) continue; + if (s->repo != pool->installed && !pool_installable(pool, s)) + continue; /* only look at installable ones */ sup = 0; if (s->supplements) @@ -849,7 +853,7 @@ finddistupgradepackages(Solver *solv, Solvable *s, Queue *qs, int allow_all) Pool *pool = solv->pool; int i; - policy_findupdatepackages(solv, s, qs, allow_all); + policy_findupdatepackages(solv, s, qs, allow_all ? allow_all : 2); if (!qs->count) { if (allow_all) @@ -958,6 +962,13 @@ solver_addupdaterule(Solver *solv, Solvable *s, int allow_all) } qs.count = j; } + else if (p != -SYSTEMSOLVABLE) + { + /* could fallthrough, but then we would do pool_queuetowhatprovides twice */ + queue_free(&qs); + solver_addrule(solv, p, d); /* allow update of s */ + return; + } } if (qs.count && p == -SYSTEMSOLVABLE) p = queue_shift(&qs); @@ -978,6 +989,14 @@ disableupdaterule(Solver *solv, Id p) r = solv->rules + solv->featurerules + (p - solv->installed->start); if (r->p && r->d >= 0) solver_disablerule(solv, r); + if (solv->bestrules_pkg) + { + int i, ni; + ni = solv->bestrules_end - solv->bestrules; + for (i = 0; i < ni; i++) + if (solv->bestrules_pkg[i] == p) + solver_disablerule(solv, solv->rules + solv->bestrules + i); + } } static inline void @@ -990,26 +1009,37 @@ reenableupdaterule(Solver *solv, Id p) r = solv->rules + solv->updaterules + (p - solv->installed->start); if (r->p) { - if (r->d >= 0) - return; - solver_enablerule(solv, r); - IF_POOLDEBUG (SOLV_DEBUG_SOLUTIONS) + if (r->d < 0) { - POOL_DEBUG(SOLV_DEBUG_SOLUTIONS, "@@@ re-enabling "); - solver_printruleclass(solv, SOLV_DEBUG_SOLUTIONS, r); + solver_enablerule(solv, r); + IF_POOLDEBUG (SOLV_DEBUG_SOLUTIONS) + { + POOL_DEBUG(SOLV_DEBUG_SOLUTIONS, "@@@ re-enabling "); + solver_printruleclass(solv, SOLV_DEBUG_SOLUTIONS, r); + } } - return; } - r = solv->rules + solv->featurerules + (p - solv->installed->start); - if (r->p && r->d < 0) + else { - solver_enablerule(solv, r); - IF_POOLDEBUG (SOLV_DEBUG_SOLUTIONS) + r = solv->rules + solv->featurerules + (p - solv->installed->start); + if (r->p && r->d < 0) { - POOL_DEBUG(SOLV_DEBUG_SOLUTIONS, "@@@ re-enabling "); - solver_printruleclass(solv, SOLV_DEBUG_SOLUTIONS, r); + solver_enablerule(solv, r); + IF_POOLDEBUG (SOLV_DEBUG_SOLUTIONS) + { + POOL_DEBUG(SOLV_DEBUG_SOLUTIONS, "@@@ re-enabling "); + solver_printruleclass(solv, SOLV_DEBUG_SOLUTIONS, r); + } } } + if (solv->bestrules_pkg) + { + int i, ni; + ni = solv->bestrules_end - solv->bestrules; + for (i = 0; i < ni; i++) + if (solv->bestrules_pkg[i] == p) + solver_enablerule(solv, solv->rules + solv->bestrules + i); + } } @@ -1153,56 +1183,159 @@ reenableinfarchrule(Solver *solv, Id name) *** ***/ +static inline void +add_cleandeps_package(Solver *solv, Id p) +{ + if (!solv->cleandeps_updatepkgs) + { + solv->cleandeps_updatepkgs = solv_calloc(1, sizeof(Queue)); + queue_init(solv->cleandeps_updatepkgs); + } + queue_pushunique(solv->cleandeps_updatepkgs, p); +} + +static inline void +solver_addtodupmaps(Solver *solv, Id p, Id how, int targeted) +{ + Pool *pool = solv->pool; + Solvable *ps, *s = pool->solvables + p; + Repo *installed = solv->installed; + Id pi, pip, obs, *obsp; + + MAPSET(&solv->dupinvolvedmap, p); + if (targeted) + MAPSET(&solv->dupmap, p); + FOR_PROVIDES(pi, pip, s->name) + { + ps = pool->solvables + pi; + if (ps->name != s->name) + continue; + MAPSET(&solv->dupinvolvedmap, pi); + if (targeted && ps->repo == installed && solv->obsoletes && solv->obsoletes[pi - installed->start]) + { + Id *opp, pi2; + for (opp = solv->obsoletes_data + solv->obsoletes[pi - installed->start]; (pi2 = *opp++) != 0;) + if (pool->solvables[pi2].repo != installed) + MAPSET(&solv->dupinvolvedmap, pi2); + } + if (ps->repo == installed && (how & SOLVER_FORCEBEST) != 0) + { + if (!solv->bestupdatemap.size) + map_grow(&solv->bestupdatemap, installed->end - installed->start); + MAPSET(&solv->bestupdatemap, pi - installed->start); + } + if (ps->repo == installed && (how & SOLVER_CLEANDEPS) != 0) + add_cleandeps_package(solv, pi); + if (!targeted && ps->repo != installed) + MAPSET(&solv->dupmap, pi); + } + if (s->repo == installed && solv->obsoletes && solv->obsoletes[p - installed->start]) + { + Id *opp; + for (opp = solv->obsoletes_data + solv->obsoletes[p - installed->start]; (pi = *opp++) != 0;) + { + ps = pool->solvables + pi; + if (ps->repo == installed) + continue; + MAPSET(&solv->dupinvolvedmap, pi); + if (!targeted) + MAPSET(&solv->dupmap, pi); + } + } + if (targeted && s->repo != installed && s->obsoletes) + { + /* XXX: check obsoletes/provides combination */ + obsp = s->repo->idarraydata + s->obsoletes; + while ((obs = *obsp++) != 0) + { + FOR_PROVIDES(pi, pip, obs) + { + Solvable *ps = pool->solvables + pi; + if (!pool->obsoleteusesprovides && !pool_match_nevr(pool, ps, obs)) + continue; + if (pool->obsoleteusescolors && !pool_colormatch(pool, s, ps)) + continue; + MAPSET(&solv->dupinvolvedmap, pi); + if (targeted && ps->repo == installed && solv->obsoletes && solv->obsoletes[pi - installed->start]) + { + Id *opp, pi2; + for (opp = solv->obsoletes_data + solv->obsoletes[pi - installed->start]; (pi2 = *opp++) != 0;) + if (pool->solvables[pi2].repo != installed) + MAPSET(&solv->dupinvolvedmap, pi2); + } + if (ps->repo == installed && (how & SOLVER_FORCEBEST) != 0) + { + if (!solv->bestupdatemap.size) + map_grow(&solv->bestupdatemap, installed->end - installed->start); + MAPSET(&solv->bestupdatemap, pi - installed->start); + } + if (ps->repo == installed && (how & SOLVER_CLEANDEPS) != 0) + add_cleandeps_package(solv, pi); + } + } + } +} + void solver_createdupmaps(Solver *solv) { Queue *job = &solv->job; Pool *pool = solv->pool; - Repo *repo; - Id how, what, p, pi, pp, obs, *obsp; - Solvable *s, *ps; - int i; + Repo *installed = solv->installed; + Id select, how, what, p, pp; + Solvable *s; + int i, targeted; map_init(&solv->dupmap, pool->nsolvables); map_init(&solv->dupinvolvedmap, pool->nsolvables); for (i = 0; i < job->count; i += 2) { how = job->elements[i]; + select = job->elements[i] & SOLVER_SELECTMASK; what = job->elements[i + 1]; switch (how & SOLVER_JOBMASK) { case SOLVER_DISTUPGRADE: - if ((how & SOLVER_SELECTMASK) != SOLVER_SOLVABLE_REPO) - break; - if (what <= 0 || what > pool->nrepos) - break; - repo = pool_id2repo(pool, what); - FOR_REPO_SOLVABLES(repo, p, s) + if (select == SOLVER_SOLVABLE_REPO) { - MAPSET(&solv->dupmap, p); - FOR_PROVIDES(pi, pp, s->name) + Repo *repo; + if (what <= 0 || what > pool->nrepos) + break; + repo = pool_id2repo(pool, what); + if (!repo) + break; + if (repo != installed && !(how & SOLVER_TARGETED) && solv->noautotarget) + break; + targeted = repo != installed || (how & SOLVER_TARGETED) != 0; + FOR_REPO_SOLVABLES(repo, p, s) { - ps = pool->solvables + pi; - if (ps->name != s->name) + if (repo != installed && !pool_installable(pool, s)) continue; - MAPSET(&solv->dupinvolvedmap, pi); + solver_addtodupmaps(solv, p, how, targeted); } - if (s->obsoletes) + } + else + { + targeted = how & SOLVER_TARGETED ? 1 : 0; + if (installed && !targeted && !solv->noautotarget) { - /* FIXME: check obsoletes/provides combination */ - obsp = s->repo->idarraydata + s->obsoletes; - while ((obs = *obsp++) != 0) - { - FOR_PROVIDES(pi, pp, obs) - { - Solvable *pis = pool->solvables + pi; - if (!pool->obsoleteusesprovides && !pool_match_nevr(pool, pis, obs)) - continue; - if (pool->obsoleteusescolors && !pool_colormatch(pool, s, pis)) - continue; - MAPSET(&solv->dupinvolvedmap, pi); - } - } + FOR_JOB_SELECT(p, pp, select, what) + if (pool->solvables[p].repo == installed) + break; + targeted = p == 0; + } + else if (!installed && !solv->noautotarget) + targeted = 1; + FOR_JOB_SELECT(p, pp, select, what) + { + Solvable *s = pool->solvables + p; + if (!s->repo) + continue; + if (s->repo != installed && !targeted) + continue; + if (s->repo != installed && !pool_installable(pool, s)) + continue; + solver_addtodupmaps(solv, p, how, targeted); } } break; @@ -1266,6 +1399,8 @@ solver_addduprules(Solver *solv, Map *addedmap) } if (!ip) solver_addrule(solv, -p, 0); /* no match, sorry */ + else + MAPSET(&solv->dupmap, p); /* for best rules processing */ } } else if (!MAPTST(&solv->dupmap, p)) @@ -1323,6 +1458,120 @@ reenableduprule(Solver *solv, Id name) #define DISABLE_INFARCH 2 #define DISABLE_DUP 3 +/* + * add all installed packages that package p obsoletes to Queue q. + * Package p is not installed. Also, we know that if + * solv->keepexplicitobsoletes is not set, p is not in the noobs map. + * Entries may get added multiple times. + */ +static void +add_obsoletes(Solver *solv, Id p, Queue *q) +{ + Pool *pool = solv->pool; + Repo *installed = solv->installed; + Id p2, pp2; + Solvable *s = pool->solvables + p; + Id obs, *obsp; + Id lastp2 = 0; + + if (!solv->keepexplicitobsoletes || !(solv->noobsoletes.size && MAPTST(&solv->noobsoletes, p))) + { + FOR_PROVIDES(p2, pp2, s->name) + { + Solvable *ps = pool->solvables + p2; + if (ps->repo != installed) + continue; + if (!pool->implicitobsoleteusesprovides && ps->name != s->name) + continue; + if (pool->obsoleteusescolors && !pool_colormatch(pool, s, ps)) + continue; + queue_push(q, p2); + lastp2 = p2; + } + } + if (!s->obsoletes) + return; + obsp = s->repo->idarraydata + s->obsoletes; + while ((obs = *obsp++) != 0) + FOR_PROVIDES(p2, pp2, obs) + { + Solvable *ps = pool->solvables + p2; + if (ps->repo != installed) + continue; + if (!pool->obsoleteusesprovides && !pool_match_nevr(pool, ps, obs)) + continue; + if (pool->obsoleteusescolors && !pool_colormatch(pool, s, ps)) + continue; + if (p2 == lastp2) + continue; + queue_push(q, p2); + lastp2 = p2; + } +} + +/* + * Call add_obsoletes and intersect the result with the + * elements in Queue q starting at qstart. + * Assumes that it's the first call if qstart == q->count. + * May use auxillary map m for the intersection process, all + * elements of q starting at qstart must have their bit cleared. + * (This is also true after the function returns.) + */ +static void +intersect_obsoletes(Solver *solv, Id p, Queue *q, int qstart, Map *m) +{ + int i, j; + int qcount = q->count; + + add_obsoletes(solv, p, q); + if (qcount == qstart) + return; /* first call */ + if (qcount == q->count) + j = qstart; + else if (qcount == qstart + 1) + { + /* easy if there's just one element */ + j = qstart; + for (i = qcount; i < q->count; i++) + if (q->elements[i] == q->elements[qstart]) + { + j++; /* keep the element */ + break; + } + } + else if (!m->size && q->count - qstart <= 8) + { + /* faster than a map most of the time */ + int k; + for (i = j = qstart; i < qcount; i++) + { + Id ip = q->elements[i]; + for (k = qcount; k < q->count; k++) + if (q->elements[k] == ip) + { + q->elements[j++] = ip; + break; + } + } + } + else + { + /* for the really pathologic cases we use the map */ + Repo *installed = solv->installed; + if (!m->size) + map_init(m, installed->end - installed->start); + for (i = qcount; i < q->count; i++) + MAPSET(m, q->elements[i] - installed->start); + for (i = j = qstart; i < qcount; i++) + if (MAPTST(m, q->elements[i] - installed->start)) + { + MAPCLR(m, q->elements[i] - installed->start); + q->elements[j++] = q->elements[i]; + } + } + queue_truncate(q, j); +} + static void jobtodisablelist(Solver *solv, Id how, Id what, Queue *q) { @@ -1330,7 +1579,7 @@ jobtodisablelist(Solver *solv, Id how, Id what, Queue *q) Id select, p, pp; Repo *installed; Solvable *s; - int i, j, set, qstart, pass; + int i, j, set, qstart; Map omap; installed = solv->installed; @@ -1342,22 +1591,25 @@ jobtodisablelist(Solver *solv, Id how, Id what, Queue *q) if (!(set & SOLVER_NOAUTOSET)) { /* automatically add set bits by analysing the job */ + if (select == SOLVER_SOLVABLE_NAME) + set |= SOLVER_SETNAME; if (select == SOLVER_SOLVABLE) - set |= SOLVER_SETARCH | SOLVER_SETVENDOR | SOLVER_SETREPO | SOLVER_SETEVR; + set |= SOLVER_SETNAME | SOLVER_SETARCH | SOLVER_SETVENDOR | SOLVER_SETREPO | SOLVER_SETEVR; else if ((select == SOLVER_SOLVABLE_NAME || select == SOLVER_SOLVABLE_PROVIDES) && ISRELDEP(what)) { Reldep *rd = GETRELDEP(pool, what); if (rd->flags == REL_EQ && select == SOLVER_SOLVABLE_NAME) { -#if !defined(DEBIAN_SEMANTICS) - const char *evr = pool_id2str(pool, rd->evr); - if (strchr(evr, '-')) - set |= SOLVER_SETEVR; + if (pool->disttype != DISTTYPE_DEB) + { + const char *evr = pool_id2str(pool, rd->evr); + if (strchr(evr, '-')) + set |= SOLVER_SETEVR; + else + set |= SOLVER_SETEV; + } else - set |= SOLVER_SETEV; -#else - set |= SOLVER_SETEVR; -#endif + set |= SOLVER_SETEVR; } if (rd->flags <= 7 && ISRELDEP(rd->name)) rd = GETRELDEP(pool, rd->name); @@ -1376,6 +1628,8 @@ jobtodisablelist(Solver *solv, Id how, Id what, Queue *q) else { int qcnt = q->count; + /* does not work for SOLVER_SOLVABLE_ALL and SOLVER_SOLVABLE_REPO, but + they are not useful for SOLVER_INSTALL jobs anyway */ FOR_JOB_SELECT(p, pp, select, what) { s = pool->solvables + p; @@ -1409,94 +1663,57 @@ jobtodisablelist(Solver *solv, Id how, Id what, Queue *q) } } } - if (!installed) + if (!installed || installed->end == installed->start) return; /* now the hard part: disable some update rules */ /* first check if we have noobs or installed packages in the job */ + i = j = 0; FOR_JOB_SELECT(p, pp, select, what) { if (pool->solvables[p].repo == installed) - { - if (select == SOLVER_SOLVABLE) - queue_push2(q, DISABLE_UPDATE, what); - return; - } - if (solv->noobsoletes.size && MAPTST(&solv->noobsoletes, p)) + j = p; + else if (solv->noobsoletes.size && MAPTST(&solv->noobsoletes, p) && !solv->keepexplicitobsoletes) return; + i++; + } + if (j) /* have installed packages */ + { + /* this is for dupmap_all jobs, it can go away if we create + * duprules for them */ + if (i == 1 && (set & SOLVER_SETREPO) != 0) + queue_push2(q, DISABLE_UPDATE, j); + return; } - /* all job packages obsolete */ + omap.size = 0; qstart = q->count; - pass = 0; - memset(&omap, 0, sizeof(omap)); FOR_JOB_SELECT(p, pp, select, what) { - Id p2, pp2; - - if (pass == 1) - map_grow(&omap, installed->end - installed->start); - s = pool->solvables + p; - if (s->obsoletes) - { - Id obs, *obsp; - obsp = s->repo->idarraydata + s->obsoletes; - while ((obs = *obsp++) != 0) - FOR_PROVIDES(p2, pp2, obs) - { - Solvable *ps = pool->solvables + p2; - if (ps->repo != installed) - continue; - if (!pool->obsoleteusesprovides && !pool_match_nevr(pool, ps, obs)) - continue; - if (pool->obsoleteusescolors && !pool_colormatch(pool, s, ps)) - continue; - if (pass) - MAPSET(&omap, p2 - installed->start); - else - queue_push2(q, DISABLE_UPDATE, p2); - } - } - FOR_PROVIDES(p2, pp2, s->name) - { - Solvable *ps = pool->solvables + p2; - if (ps->repo != installed) - continue; - if (!pool->implicitobsoleteusesprovides && ps->name != s->name) - continue; - if (pool->obsoleteusescolors && !pool_colormatch(pool, s, ps)) - continue; - if (pass) - MAPSET(&omap, p2 - installed->start); - else - queue_push2(q, DISABLE_UPDATE, p2); - } - if (pass) - { - for (i = j = qstart; i < q->count; i += 2) - { - if (MAPTST(&omap, q->elements[i + 1] - installed->start)) - { - MAPCLR(&omap, q->elements[i + 1] - installed->start); - q->elements[j + 1] = q->elements[i + 1]; - j += 2; - } - } - queue_truncate(q, j); - } + intersect_obsoletes(solv, p, q, qstart, &omap); if (q->count == qstart) break; - pass++; } if (omap.size) map_free(&omap); if (qstart == q->count) return; /* nothing to prune */ - if ((set & (SOLVER_SETEVR | SOLVER_SETARCH | SOLVER_SETVENDOR)) == (SOLVER_SETEVR | SOLVER_SETARCH | SOLVER_SETVENDOR)) - return; /* all is set */ + + /* convert result to (DISABLE_UPDATE, p) pairs */ + i = q->count; + for (j = qstart; j < i; j++) + queue_push(q, q->elements[j]); + for (j = qstart; j < q->count; j += 2) + { + q->elements[j] = DISABLE_UPDATE; + q->elements[j + 1] = q->elements[i++]; + } /* now that we know which installed packages are obsoleted check each of them */ + if ((set & (SOLVER_SETEVR | SOLVER_SETARCH | SOLVER_SETVENDOR)) == (SOLVER_SETEVR | SOLVER_SETARCH | SOLVER_SETVENDOR)) + return; /* all is set, nothing to do */ + for (i = j = qstart; i < q->count; i += 2) { Solvable *is = pool->solvables + q->elements[i + 1]; @@ -1506,6 +1723,8 @@ jobtodisablelist(Solver *solv, Id how, Id what, Queue *q) s = pool->solvables + p; if ((set & SOLVER_SETEVR) != 0) illegal |= POLICY_ILLEGAL_DOWNGRADE; /* ignore */ + if ((set & SOLVER_SETNAME) != 0) + illegal |= POLICY_ILLEGAL_NAMECHANGE; /* ignore */ if ((set & SOLVER_SETARCH) != 0) illegal |= POLICY_ILLEGAL_ARCHCHANGE; /* ignore */ if ((set & SOLVER_SETVENDOR) != 0) @@ -1534,6 +1753,9 @@ jobtodisablelist(Solver *solv, Id how, Id what, Queue *q) case SOLVER_ERASE: if (!installed) break; + if (select == SOLVER_SOLVABLE_ALL || (select == SOLVER_SOLVABLE_REPO && what == installed->repoid)) + FOR_REPO_SOLVABLES(installed, p, s) + queue_push2(q, DISABLE_UPDATE, p); FOR_JOB_SELECT(p, pp, select, what) if (pool->solvables[p].repo == installed) queue_push2(q, DISABLE_UPDATE, p); @@ -1569,7 +1791,7 @@ solver_disablepolicyrules(Solver *solv) } if (solv->cleandepsmap.size) { - solver_createcleandepsmap(solv); + solver_createcleandepsmap(solv, &solv->cleandepsmap, 0); for (i = solv->installed->start; i < solv->installed->end; i++) if (MAPTST(&solv->cleandepsmap, i - solv->installed->start)) queue_push2(&allq, DISABLE_UPDATE, i); @@ -1626,7 +1848,7 @@ solver_reenablepolicyrules(Solver *solv, int jobidx) } if (solv->cleandepsmap.size) { - solver_createcleandepsmap(solv); + solver_createcleandepsmap(solv, &solv->cleandepsmap, 0); for (i = solv->installed->start; i < solv->installed->end; i++) if (MAPTST(&solv->cleandepsmap, i - solv->installed->start)) queue_push2(&allq, DISABLE_UPDATE, i); @@ -1656,6 +1878,38 @@ solver_reenablepolicyrules(Solver *solv, int jobidx) queue_free(&q); } +/* we just removed a package from the cleandeps map, now reenable all policy rules that were + * disabled because of this */ +void +solver_reenablepolicyrules_cleandeps(Solver *solv, Id pkg) +{ + Queue *job = &solv->job; + int i, j; + Queue allq; + Rule *r; + Id lastjob = -1; + Id allqbuf[128]; + + queue_init_buffer(&allq, allqbuf, sizeof(allqbuf)/sizeof(*allqbuf)); + for (i = solv->jobrules; i < solv->jobrules_end; i++) + { + r = solv->rules + i; + if (r->d < 0) /* disabled? */ + continue; + j = solv->ruletojob.elements[i - solv->jobrules]; + if (j == lastjob) + continue; + lastjob = j; + jobtodisablelist(solv, job->elements[j], job->elements[j + 1], &allq); + } + for (i = 0; i < allq.count; i += 2) + if (allq.elements[i] == DISABLE_UPDATE && allq.elements[i + 1] == pkg) + break; + if (i == allq.count) + reenableupdaterule(solv, pkg); + queue_free(&allq); +} + /*********************************************************************** *** @@ -1878,8 +2132,17 @@ solver_ruleinfo(Solver *solv, Id rid, Id *fromp, Id *top, Id *depp) *top = solv->job.elements[jidx]; if (depp) *depp = solv->job.elements[jidx + 1]; - if ((r->d == 0 || r->d == -1) && r->w2 == 0 && r->p == -SYSTEMSOLVABLE && (solv->job.elements[jidx] & SOLVER_SELECTMASK) != SOLVER_SOLVABLE_ONE_OF) - return SOLVER_RULE_JOB_NOTHING_PROVIDES_DEP; + if ((r->d == 0 || r->d == -1) && r->w2 == 0 && r->p == -SYSTEMSOLVABLE) + { + if ((solv->job.elements[jidx] & (SOLVER_JOBMASK|SOLVER_SELECTMASK)) == (SOLVER_INSTALL|SOLVER_SOLVABLE_NAME)) + return SOLVER_RULE_JOB_NOTHING_PROVIDES_DEP; + if ((solv->job.elements[jidx] & (SOLVER_JOBMASK|SOLVER_SELECTMASK)) == (SOLVER_INSTALL|SOLVER_SOLVABLE_PROVIDES)) + return SOLVER_RULE_JOB_NOTHING_PROVIDES_DEP; + if ((solv->job.elements[jidx] & (SOLVER_JOBMASK|SOLVER_SELECTMASK)) == (SOLVER_ERASE|SOLVER_SOLVABLE_NAME)) + return SOLVER_RULE_JOB_PROVIDED_BY_SYSTEM; + if ((solv->job.elements[jidx] & (SOLVER_JOBMASK|SOLVER_SELECTMASK)) == (SOLVER_ERASE|SOLVER_SOLVABLE_PROVIDES)) + return SOLVER_RULE_JOB_PROVIDED_BY_SYSTEM; + } return SOLVER_RULE_JOB; } if (rid >= solv->updaterules && rid < solv->updaterules_end) @@ -1910,6 +2173,10 @@ solver_ruleinfo(Solver *solv, Id rid, Id *fromp, Id *top, Id *depp) *depp = pool->solvables[-r->p].name; return SOLVER_RULE_INFARCH; } + if (rid >= solv->bestrules && rid < solv->bestrules_end) + { + return SOLVER_RULE_BEST; + } if (rid >= solv->choicerules && rid < solv->choicerules_end) { return SOLVER_RULE_CHOICE; @@ -1938,6 +2205,8 @@ solver_ruleclass(Solver *solv, Id rid) return SOLVER_RULE_DISTUPGRADE; if (rid >= solv->infarchrules && rid < solv->infarchrules_end) return SOLVER_RULE_INFARCH; + if (rid >= solv->bestrules && rid < solv->bestrules_end) + return SOLVER_RULE_BEST; if (rid >= solv->choicerules && rid < solv->choicerules_end) return SOLVER_RULE_CHOICE; if (rid >= solv->learntrules) @@ -1949,7 +2218,7 @@ void solver_ruleliterals(Solver *solv, Id rid, Queue *q) { Pool *pool = solv->pool; - Id p, *pp; + Id p, pp; Rule *r; queue_empty(q); @@ -1993,9 +2262,11 @@ solver_addchoicerules(Solver *solv) Rule *r; Queue q, qi; int i, j, rid, havechoice; - Id p, d, *pp; + Id p, d, pp; Id p2, pp2; Solvable *s, *s2; + Id lastaddedp, lastaddedd; + int lastaddedcnt; solv->choicerules = solv->nrules; if (!pool->installed) @@ -2015,12 +2286,15 @@ solver_addchoicerules(Solver *solv) for (rid = solv->duprules, r = solv->rules + rid; rid < solv->duprules_end; rid++, r++) if (r->p < 0 && !r->w2 && (r->d == 0 || r->d == -1)) MAPSET(&mneg, -r->p); + lastaddedp = 0; + lastaddedd = 0; + lastaddedcnt = 0; for (rid = 1; rid < solv->rpmrules_end ; rid++) { r = solv->rules + rid; if (r->p >= 0 || ((r->d == 0 || r->d == -1) && r->w2 < 0)) continue; /* only look at requires rules */ - // solver_printrule(solv, SOLV_DEBUG_RESULT, r); + /* solver_printrule(solv, SOLV_DEBUG_RESULT, r); */ queue_empty(&q); queue_empty(&qi); havechoice = 0; @@ -2107,9 +2381,10 @@ solver_addchoicerules(Solver *solv) MAPSET(&m, p); for (i = 0; i < qi.count; i++) { + Rule *ur; if (!qi.elements[i]) continue; - Rule *ur = solv->rules + solv->updaterules + (qi.elements[i] - pool->installed->start); + ur = solv->rules + solv->updaterules + (qi.elements[i] - pool->installed->start); if (!ur->p) ur = solv->rules + solv->featurerules + (qi.elements[i] - pool->installed->start); if (!ur->p) @@ -2131,7 +2406,22 @@ solver_addchoicerules(Solver *solv) #endif continue; } + + /* don't add identical rules */ + if (lastaddedp == r->p && lastaddedcnt == q.count) + { + for (i = 0; i < q.count; i++) + if (q.elements[i] != pool->whatprovidesdata[lastaddedd + i]) + break; + if (i == q.count) + continue; /* already added that one */ + } d = q.count ? pool_queuetowhatprovides(pool, &q) : 0; + + lastaddedp = r->p; + lastaddedd = d; + lastaddedcnt = q.count; + solver_addrule(solv, r->p, d); queue_push(&solv->weakruleq, solv->nrules - 1); solv->choicerules_ref[solv->nrules - 1 - solv->choicerules] = rid; @@ -2155,7 +2445,7 @@ solver_addchoicerules(Solver *solv) void solver_disablechoicerules(Solver *solv, Rule *r) { - Id rid, p, *pp; + Id rid, p, pp; Pool *pool = solv->pool; Map m; Rule *or; @@ -2182,74 +2472,599 @@ solver_disablechoicerules(Solver *solv, Rule *r) } } -static void solver_createcleandepsmap(Solver *solv) +static void +prune_to_update_targets(Solver *solv, Id *cp, Queue *q) +{ + int i, j; + Id p, *cp2; + for (i = j = 0; i < q->count; i++) + { + p = q->elements[i]; + for (cp2 = cp; *cp2; cp2++) + if (*cp2 == p) + { + q->elements[j++] = p; + break; + } + } + queue_truncate(q, j); +} + +static void +prune_to_dup_packages(Solver *solv, Id p, Queue *q) +{ + int i, j; + for (i = j = 0; i < q->count; i++) + { + Id p = q->elements[i]; + if (MAPTST(&solv->dupmap, p)) + q->elements[j++] = p; + } + queue_truncate(q, j); +} + +void +solver_addbestrules(Solver *solv, int havebestinstalljobs) { Pool *pool = solv->pool; + Id p; + Solvable *s; Repo *installed = solv->installed; - Queue *job = &solv->job; - Map userinstalled; - Map im; - Map installedm; + Queue q, q2; Rule *r; - Id rid, how, what, select; - Id p, pp, ip, *jp; - Id req, *reqp, sup, *supp; - Solvable *s; - Queue iq; - int i; + Queue r2pkg; + int i, oldcnt; - map_init(&userinstalled, installed->end - installed->start); - map_init(&im, pool->nsolvables); - map_init(&installedm, pool->nsolvables); - map_empty(&solv->cleandepsmap); - queue_init(&iq); + solv->bestrules = solv->nrules; + if (!installed) + { + solv->bestrules_end = solv->nrules; + return; + } + queue_init(&q); + queue_init(&q2); + queue_init(&r2pkg); - for (i = 0; i < job->count; i += 2) + if (havebestinstalljobs) { - how = job->elements[i]; - if ((how & SOLVER_JOBMASK) == SOLVER_USERINSTALLED) + for (i = 0; i < solv->job.count; i += 2) { - what = job->elements[i + 1]; - select = how & SOLVER_SELECTMASK; - FOR_JOB_SELECT(p, pp, select, what) - if (pool->solvables[p].repo == installed) - MAPSET(&userinstalled, p - installed->start); + if ((solv->job.elements[i] & (SOLVER_JOBMASK | SOLVER_FORCEBEST)) == (SOLVER_INSTALL | SOLVER_FORCEBEST)) + { + int j; + Id p2, pp2; + for (j = 0; j < solv->ruletojob.count; j++) + if (solv->ruletojob.elements[j] == i) + break; + if (j == solv->ruletojob.count) + continue; + r = solv->rules + solv->jobrules + j; + queue_empty(&q); + FOR_RULELITERALS(p2, pp2, r) + if (p2 > 0) + queue_push(&q, p2); + if (!q.count) + continue; /* orphaned */ + /* select best packages, just look at prio and version */ + oldcnt = q.count; + policy_filter_unwanted(solv, &q, POLICY_MODE_RECOMMEND); + if (q.count == oldcnt) + continue; /* nothing filtered */ + p2 = queue_shift(&q); + solver_addrule(solv, p2, q.count ? pool_queuetowhatprovides(pool, &q) : 0); + queue_push(&r2pkg, -(solv->jobrules + j)); + } } } - /* add all positive elements (e.g. locks) to "userinstalled" */ - for (rid = solv->jobrules; rid < solv->jobrules_end; rid++) + + if (solv->bestupdatemap_all || solv->bestupdatemap.size) { - r = solv->rules + rid; - if (r->d < 0) + FOR_REPO_SOLVABLES(installed, p, s) + { + Id d, p2, pp2; + if (!solv->updatemap_all && (!solv->updatemap.size || !MAPTST(&solv->updatemap, p - installed->start))) + continue; + if (!solv->bestupdatemap_all && (!solv->bestupdatemap.size || !MAPTST(&solv->bestupdatemap, p - installed->start))) + continue; + queue_empty(&q); + if (solv->bestobeypolicy) + r = solv->rules + solv->updaterules + (p - installed->start); + else + { + r = solv->rules + solv->featurerules + (p - installed->start); + if (!r->p) /* identical to update rule? */ + r = solv->rules + solv->updaterules + (p - installed->start); + } + if (solv->multiversionupdaters && (d = solv->multiversionupdaters[p - installed->start]) != 0 && r == solv->rules + solv->updaterules + (p - installed->start)) + { + /* need to check multiversionupdaters */ + if (r->p == p) /* be careful with the dup case */ + queue_push(&q, p); + while ((p2 = pool->whatprovidesdata[d++]) != 0) + queue_push(&q, p2); + } + else + { + FOR_RULELITERALS(p2, pp2, r) + if (p2 > 0) + queue_push(&q, p2); + } + if (solv->update_targets && solv->update_targets->elements[p - installed->start]) + prune_to_update_targets(solv, solv->update_targets->elements + solv->update_targets->elements[p - installed->start], &q); + if (solv->dupinvolvedmap.size && MAPTST(&solv->dupinvolvedmap, p)) + prune_to_dup_packages(solv, p, &q); + /* select best packages, just look at prio and version */ + policy_filter_unwanted(solv, &q, POLICY_MODE_RECOMMEND); + if (!q.count) + continue; /* orphaned */ + if (solv->bestobeypolicy) + { + /* also filter the best of the feature rule packages and add them */ + r = solv->rules + solv->featurerules + (p - installed->start); + if (r->p) + { + int j; + queue_empty(&q2); + FOR_RULELITERALS(p2, pp2, r) + if (p2 > 0) + queue_push(&q2, p2); + if (solv->update_targets && solv->update_targets->elements[p - installed->start]) + prune_to_update_targets(solv, solv->update_targets->elements + solv->update_targets->elements[p - installed->start], &q2); + if (solv->dupinvolvedmap.size && MAPTST(&solv->dupinvolvedmap, p)) + prune_to_dup_packages(solv, p, &q); + policy_filter_unwanted(solv, &q2, POLICY_MODE_RECOMMEND); + for (j = 0; j < q2.count; j++) + queue_pushunique(&q, q2.elements[j]); + } + } + p2 = queue_shift(&q); + solver_addrule(solv, p2, q.count ? pool_queuetowhatprovides(pool, &q) : 0); + queue_push(&r2pkg, p); + } + } + if (r2pkg.count) + { + solv->bestrules_pkg = solv_calloc(r2pkg.count, sizeof(Id)); + memcpy(solv->bestrules_pkg, r2pkg.elements, r2pkg.count * sizeof(Id)); + } + solv->bestrules_end = solv->nrules; + queue_free(&q); + queue_free(&q2); + queue_free(&r2pkg); +} + +#undef CLEANDEPSDEBUG + +/* + * This functions collects all packages that are looked at + * when a dependency is checked. We need it to "pin" installed + * packages when removing a supplemented package in createcleandepsmap. + * Here's an not uncommon example: + * A contains "Supplements: packageand(B, C)" + * B contains "Requires: A" + * Now if we remove C, the supplements is no longer true, + * thus we also remove A. Without the dep_pkgcheck function, we + * would now also remove B, but this is wrong, as adding back + * C doesn't make the supplements true again. Thus we "pin" B + * when we remove A. + * There's probably a better way to do this, but I haven't come + * up with it yet ;) + */ +static inline void +dep_pkgcheck(Solver *solv, Id dep, Map *m, Queue *q) +{ + Pool *pool = solv->pool; + Id p, pp; + + if (ISRELDEP(dep)) + { + Reldep *rd = GETRELDEP(pool, dep); + if (rd->flags >= 8) + { + if (rd->flags == REL_AND) + { + dep_pkgcheck(solv, rd->name, m, q); + dep_pkgcheck(solv, rd->evr, m, q); + return; + } + if (rd->flags == REL_NAMESPACE && rd->name == NAMESPACE_SPLITPROVIDES) + return; + if (rd->flags == REL_NAMESPACE && rd->name == NAMESPACE_INSTALLED) + return; + } + } + FOR_PROVIDES(p, pp, dep) + if (!m || MAPTST(m, p)) + queue_push(q, p); +} + +static int +check_xsupp(Solver *solv, Queue *depq, Id dep) +{ + Pool *pool = solv->pool; + Id p, pp; + + if (ISRELDEP(dep)) + { + Reldep *rd = GETRELDEP(pool, dep); + if (rd->flags >= 8) + { + if (rd->flags == REL_AND) + { + if (!check_xsupp(solv, depq, rd->name)) + return 0; + return check_xsupp(solv, depq, rd->evr); + } + if (rd->flags == REL_OR) + { + if (check_xsupp(solv, depq, rd->name)) + return 1; + return check_xsupp(solv, depq, 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); + } + if (depq && rd->flags == REL_NAMESPACE) + { + int i; + for (i = 0; i < depq->count; i++) + if (depq->elements[i] == dep || depq->elements[i] == rd->name) + return 1; + } + } + FOR_PROVIDES(p, pp, dep) + if (p == SYSTEMSOLVABLE || pool->solvables[p].repo == solv->installed) + return 1; + return 0; +} + +static inline int +queue_contains(Queue *q, Id id) +{ + int i; + for (i = 0; i < q->count; i++) + if (q->elements[i] == id) + return 1; + return 0; +} + + +/* + * Find all installed packages that are no longer + * needed regarding the current solver job. + * + * The algorithm is: + * - remove pass: remove all packages that could have + * been dragged in by the obsoleted packages. + * i.e. if package A is obsolete and contains "Requires: B", + * also remove B, as installing A will have pulled in B. + * after this pass, we have a set of still installed packages + * with broken dependencies. + * - add back pass: + * now add back all packages that the still installed packages + * require. + * + * The cleandeps packages are the packages removed in the first + * pass and not added back in the second pass. + * + * If we search for unneeded packages (unneeded is true), we + * simply remove all packages except the userinstalled ones in + * the first pass. + */ +static void +solver_createcleandepsmap(Solver *solv, Map *cleandepsmap, int unneeded) +{ + Pool *pool = solv->pool; + Repo *installed = solv->installed; + Queue *job = &solv->job; + Map userinstalled; + Map im; + Map installedm; + Rule *r; + Id rid, how, what, select; + Id p, pp, ip, jp; + Id req, *reqp, sup, *supp; + Solvable *s; + Queue iq, iqcopy, xsuppq; + int i; + + map_empty(cleandepsmap); + if (!installed || installed->end == installed->start) + return; + map_init(&userinstalled, installed->end - installed->start); + map_init(&im, pool->nsolvables); + map_init(&installedm, pool->nsolvables); + queue_init(&iq); + queue_init(&xsuppq); + + for (i = 0; i < job->count; i += 2) + { + how = job->elements[i]; + if ((how & SOLVER_JOBMASK) == SOLVER_USERINSTALLED) + { + what = job->elements[i + 1]; + select = how & SOLVER_SELECTMASK; + if (select == SOLVER_SOLVABLE_ALL || (select == SOLVER_SOLVABLE_REPO && what == installed->repoid)) + FOR_REPO_SOLVABLES(installed, p, s) + MAPSET(&userinstalled, p - installed->start); + FOR_JOB_SELECT(p, pp, select, what) + if (pool->solvables[p].repo == installed) + MAPSET(&userinstalled, p - installed->start); + } + if ((how & (SOLVER_JOBMASK | SOLVER_SELECTMASK)) == (SOLVER_ERASE | SOLVER_SOLVABLE_PROVIDES)) + { + what = job->elements[i + 1]; + if (ISRELDEP(what)) + { + Reldep *rd = GETRELDEP(pool, what); + if (rd->flags != REL_NAMESPACE) + continue; + if (rd->evr == 0) + { + queue_pushunique(&iq, rd->name); + continue; + } + FOR_PROVIDES(p, pp, what) + if (p) + break; + if (p) + continue; + queue_pushunique(&iq, what); + } + } + } + + /* have special namespace cleandeps erases */ + if (iq.count) + { + for (ip = solv->installed->start; ip < solv->installed->end; ip++) + { + s = pool->solvables + ip; + if (s->repo != installed) + continue; + if (!s->supplements) + continue; + supp = s->repo->idarraydata + s->supplements; + while ((sup = *supp++) != 0) + if (check_xsupp(solv, &iq, sup) && !check_xsupp(solv, 0, sup)) + { +#ifdef CLEANDEPSDEBUG + printf("xsupp %s from %s\n", pool_dep2str(pool, sup), pool_solvid2str(pool, ip)); +#endif + queue_pushunique(&xsuppq, sup); + } + } + queue_empty(&iq); + } + + /* also add visible patterns to userinstalled for openSUSE */ + if (1) + { + Dataiterator di; + dataiterator_init(&di, pool, 0, 0, SOLVABLE_ISVISIBLE, 0, 0); + while (dataiterator_step(&di)) + { + Id *dp; + if (di.solvid <= 0) + continue; + s = pool->solvables + di.solvid; + if (!s->repo || !s->requires) + continue; + if (s->repo != installed && !pool_installable(pool, s)) + continue; + if (strncmp(pool_id2str(pool, s->name), "pattern:", 8) != 0) + continue; + dp = s->repo->idarraydata + s->requires; + for (dp = s->repo->idarraydata + s->requires; *dp; dp++) + FOR_PROVIDES(p, pp, *dp) + if (pool->solvables[p].repo == installed) + { + if (strncmp(pool_id2str(pool, pool->solvables[p].name), "pattern", 7) != 0) + continue; + MAPSET(&userinstalled, p - installed->start); + } + } + dataiterator_free(&di); + } + if (1) + { + /* all products and their buddies are userinstalled */ + for (p = installed->start; p < installed->end; p++) + { + Solvable *s = pool->solvables + p; + if (s->repo != installed) + continue; + if (!strncmp("product:", pool_id2str(pool, s->name), 8)) + { + MAPSET(&userinstalled, p - installed->start); + if (pool->nscallback) + { + Id buddy = pool->nscallback(pool, pool->nscallbackdata, NAMESPACE_PRODUCTBUDDY, p); + if (buddy >= installed->start && buddy < installed->end && pool->solvables[buddy].repo == installed) + MAPSET(&userinstalled, buddy - installed->start); + } + } + } + } + + /* add all positive elements (e.g. locks) to "userinstalled" */ + for (rid = solv->jobrules; rid < solv->jobrules_end; rid++) + { + r = solv->rules + rid; + if (r->d < 0) + continue; + i = solv->ruletojob.elements[rid - solv->jobrules]; + if ((job->elements[i] & SOLVER_CLEANDEPS) == SOLVER_CLEANDEPS) continue; FOR_RULELITERALS(p, jp, r) if (p > 0 && pool->solvables[p].repo == installed) MAPSET(&userinstalled, p - installed->start); } + + /* add all cleandeps candidates to iq */ for (rid = solv->jobrules; rid < solv->jobrules_end; rid++) { r = solv->rules + rid; - if (r->p >= 0 || r->d != 0) - continue; /* disabled or not erase */ - p = -r->p; + if (r->d < 0) /* disabled? */ + continue; + if (r->d == 0 && r->p < 0 && r->w2 == 0) /* negative assertion (erase job)? */ + { + p = -r->p; + if (pool->solvables[p].repo != installed) + continue; + MAPCLR(&userinstalled, p - installed->start); + if (unneeded) + continue; + i = solv->ruletojob.elements[rid - solv->jobrules]; + how = job->elements[i]; + if ((how & (SOLVER_JOBMASK|SOLVER_CLEANDEPS)) == (SOLVER_ERASE|SOLVER_CLEANDEPS)) + queue_push(&iq, p); + } + else if (r->p > 0) /* install job */ + { + if (unneeded) + continue; + i = solv->ruletojob.elements[rid - solv->jobrules]; + if ((job->elements[i] & SOLVER_CLEANDEPS) == SOLVER_CLEANDEPS) + { + /* check if the literals all obsolete some installed package */ + Map om; + int iqstart; + + /* just one installed literal */ + if (r->d == 0 && r->w2 == 0 && pool->solvables[r->p].repo == installed) + continue; + /* noobs is bad */ + if (solv->noobsoletes.size && !solv->keepexplicitobsoletes) + { + FOR_RULELITERALS(p, jp, r) + if (MAPTST(&solv->noobsoletes, p)) + break; + if (p) + continue; + } + + om.size = 0; + iqstart = iq.count; + FOR_RULELITERALS(p, jp, r) + { + if (p < 0) + { + queue_truncate(&iq, iqstart); /* abort */ + break; + } + if (pool->solvables[p].repo == installed) + { + if (iq.count == iqstart) + queue_push(&iq, p); + else + { + for (i = iqstart; i < iq.count; i++) + if (iq.elements[i] == p) + break; + queue_truncate(&iq, iqstart); + if (i < iq.count) + queue_push(&iq, p); + } + } + else + intersect_obsoletes(solv, p, &iq, iqstart, &om); + if (iq.count == iqstart) + break; + } + if (om.size) + map_free(&om); + } + } + } + queue_init_clone(&iqcopy, &iq); + + if (!unneeded) + { + if (solv->cleandeps_updatepkgs) + for (i = 0; i < solv->cleandeps_updatepkgs->count; i++) + queue_push(&iq, solv->cleandeps_updatepkgs->elements[i]); + } + + if (unneeded) + queue_empty(&iq); /* just in case... */ + + /* clear userinstalled bit for the packages we really want to delete/update */ + for (i = 0; i < iq.count; i++) + { + p = iq.elements[i]; if (pool->solvables[p].repo != installed) continue; MAPCLR(&userinstalled, p - installed->start); - i = solv->ruletojob.elements[rid - solv->jobrules]; - how = job->elements[i]; - if ((how & (SOLVER_JOBMASK|SOLVER_CLEANDEPS)) == (SOLVER_ERASE|SOLVER_CLEANDEPS)) - queue_push(&iq, p); } + for (p = installed->start; p < installed->end; p++) { if (pool->solvables[p].repo != installed) continue; MAPSET(&installedm, p); + if (unneeded && !MAPTST(&userinstalled, p - installed->start)) + continue; MAPSET(&im, p); } + MAPSET(&installedm, SYSTEMSOLVABLE); + MAPSET(&im, SYSTEMSOLVABLE); + +#ifdef CLEANDEPSDEBUG + printf("REMOVE PASS\n"); +#endif - while (iq.count) + for (;;) { + if (!iq.count) + { + if (unneeded) + break; + /* supplements pass */ + for (ip = installed->start; ip < installed->end; ip++) + { + if (!MAPTST(&installedm, ip)) + continue; + s = pool->solvables + ip; + if (!s->supplements) + continue; + if (!MAPTST(&im, ip)) + continue; + if (MAPTST(&userinstalled, ip - installed->start)) + continue; + supp = s->repo->idarraydata + s->supplements; + while ((sup = *supp++) != 0) + if (dep_possible(solv, sup, &im)) + break; + if (!sup) + { + supp = s->repo->idarraydata + s->supplements; + while ((sup = *supp++) != 0) + if (dep_possible(solv, sup, &installedm) || (xsuppq.count && queue_contains(&xsuppq, sup))) + { + /* no longer supplemented, also erase */ + int iqcount = iq.count; + /* pin packages, see comment above dep_pkgcheck */ + dep_pkgcheck(solv, sup, &im, &iq); + for (i = iqcount; i < iq.count; i++) + { + Id pqp = iq.elements[i]; + if (pool->solvables[pqp].repo == installed) + MAPSET(&userinstalled, pqp - installed->start); + } + queue_truncate(&iq, iqcount); +#ifdef CLEANDEPSDEBUG + printf("%s supplemented [%s]\n", pool_solvid2str(pool, ip), pool_dep2str(pool, sup)); +#endif + queue_push(&iq, ip); + } + } + } + if (!iq.count) + break; /* no supplementing package found, we're done */ + } ip = queue_shift(&iq); s = pool->solvables + ip; if (!MAPTST(&im, ip)) @@ -2260,7 +3075,7 @@ static void solver_createcleandepsmap(Solver *solv) continue; MAPCLR(&im, ip); #ifdef CLEANDEPSDEBUG - printf("hello %s\n", pool_solvable2str(pool, s)); + printf("removing %s\n", pool_solvable2str(pool, s)); #endif if (s->requires) { @@ -2280,7 +3095,7 @@ static void solver_createcleandepsmap(Solver *solv) #endif FOR_PROVIDES(p, pp, req) { - if (MAPTST(&im, p)) + if (p != SYSTEMSOLVABLE && MAPTST(&im, p)) { #ifdef CLEANDEPSDEBUG printf("%s requires %s\n", pool_solvid2str(pool, ip), pool_solvid2str(pool, p)); @@ -2305,7 +3120,7 @@ static void solver_createcleandepsmap(Solver *solv) #endif FOR_PROVIDES(p, pp, req) { - if (MAPTST(&im, p)) + if (p != SYSTEMSOLVABLE && MAPTST(&im, p)) { #ifdef CLEANDEPSDEBUG printf("%s recommends %s\n", pool_solvid2str(pool, ip), pool_solvid2str(pool, p)); @@ -2315,32 +3130,6 @@ static void solver_createcleandepsmap(Solver *solv) } } } - if (!iq.count) - { - /* supplements pass */ - for (ip = solv->installed->start; ip < solv->installed->end; ip++) - { - if (!MAPTST(&installedm, ip)) - continue; - s = pool->solvables + ip; - if (!s->supplements) - continue; - if (!MAPTST(&im, ip)) - continue; - supp = s->repo->idarraydata + s->supplements; - while ((sup = *supp++) != 0) - if (!dep_possible(solv, sup, &im) && dep_possible(solv, sup, &installedm)) - break; - /* no longer supplemented, also erase */ - if (sup) - { -#ifdef CLEANDEPSDEBUG - printf("%s supplemented\n", pool_solvid2str(pool, ip)); -#endif - queue_push(&iq, ip); - } - } - } } /* turn userinstalled into remove set for pruning */ @@ -2348,13 +3137,14 @@ static void solver_createcleandepsmap(Solver *solv) for (rid = solv->jobrules; rid < solv->jobrules_end; rid++) { r = solv->rules + rid; - if (r->p >= 0 || r->d != 0) + if (r->p >= 0 || r->d != 0 || r->w2 != 0) continue; /* disabled or not erase */ p = -r->p; MAPCLR(&im, p); if (pool->solvables[p].repo == installed) MAPSET(&userinstalled, p - installed->start); } + MAPSET(&im, SYSTEMSOLVABLE); /* in case we cleared it above */ for (p = installed->start; p < installed->end; p++) if (MAPTST(&im, p)) queue_push(&iq, p); @@ -2380,12 +3170,46 @@ static void solver_createcleandepsmap(Solver *solv) queue_push(&iq, what); } } - while (iq.count) + +#ifdef CLEANDEPSDEBUG + printf("ADDBACK PASS\n"); +#endif + for (;;) { + if (!iq.count) + { + /* supplements pass */ + for (ip = installed->start; ip < installed->end; ip++) + { + if (!MAPTST(&installedm, ip)) + continue; + if (MAPTST(&userinstalled, ip - installed->start)) + continue; + s = pool->solvables + ip; + if (!s->supplements) + continue; + if (MAPTST(&im, ip)) + continue; + supp = s->repo->idarraydata + s->supplements; + while ((sup = *supp++) != 0) + if (dep_possible(solv, sup, &im)) + break; + if (sup) + { +#ifdef CLEANDEPSDEBUG + printf("%s supplemented\n", pool_solvid2str(pool, ip)); +#endif + MAPSET(&im, ip); + queue_push(&iq, ip); + } + } + if (!iq.count) + break; + } ip = queue_shift(&iq); s = pool->solvables + ip; #ifdef CLEANDEPSDEBUG - printf("bye %s\n", pool_solvable2str(pool, s)); + printf("adding back %s\n", pool_solvable2str(pool, s)); #endif if (s->requires) { @@ -2393,6 +3217,11 @@ static void solver_createcleandepsmap(Solver *solv) while ((req = *reqp++) != 0) { FOR_PROVIDES(p, pp, req) + if (MAPTST(&im, p)) + break; + if (p) + continue; + FOR_PROVIDES(p, pp, req) { if (!MAPTST(&im, p) && MAPTST(&installedm, p)) { @@ -2415,6 +3244,11 @@ static void solver_createcleandepsmap(Solver *solv) while ((req = *reqp++) != 0) { FOR_PROVIDES(p, pp, req) + if (MAPTST(&im, p)) + break; + if (p) + continue; + FOR_PROVIDES(p, pp, req) { if (!MAPTST(&im, p) && MAPTST(&installedm, p)) { @@ -2431,48 +3265,293 @@ static void solver_createcleandepsmap(Solver *solv) } } } - if (!iq.count) - { - /* supplements pass */ - for (ip = installed->start; ip < installed->end; ip++) - { - if (!MAPTST(&installedm, ip)) - continue; - if (MAPTST(&userinstalled, ip - installed->start)) - continue; - s = pool->solvables + ip; - if (!s->supplements) - continue; - if (MAPTST(&im, ip) || !MAPTST(&installedm, ip)) - continue; - supp = s->repo->idarraydata + s->supplements; - while ((sup = *supp++) != 0) - if (dep_possible(solv, sup, &im)) - break; - if (sup) - { -#ifdef CLEANDEPSDEBUG - printf("%s supplemented\n", pool_solvid2str(pool, ip)); -#endif - MAPSET(&im, ip); - queue_push(&iq, ip); - } - } - } } queue_free(&iq); + /* make sure the updatepkgs and mistakes are not in the cleandeps map */ + if (solv->cleandeps_updatepkgs) + for (i = 0; i < solv->cleandeps_updatepkgs->count; i++) + MAPSET(&im, solv->cleandeps_updatepkgs->elements[i]); + if (solv->cleandeps_mistakes) + for (i = 0; i < solv->cleandeps_mistakes->count; i++) + MAPSET(&im, solv->cleandeps_mistakes->elements[i]); + /* also remove original iq packages */ + for (i = 0; i < iqcopy.count; i++) + MAPSET(&im, iqcopy.elements[i]); + queue_free(&iqcopy); for (p = installed->start; p < installed->end; p++) { if (pool->solvables[p].repo != installed) continue; if (!MAPTST(&im, p)) - MAPSET(&solv->cleandepsmap, p - installed->start); + MAPSET(cleandepsmap, p - installed->start); } map_free(&im); map_free(&installedm); map_free(&userinstalled); + queue_free(&xsuppq); +#ifdef CLEANDEPSDEBUG + printf("=== final cleandeps map:\n"); + for (p = installed->start; p < installed->end; p++) + if (MAPTST(cleandepsmap, p - installed->start)) + printf(" - %s\n", pool_solvid2str(pool, p)); +#endif +} + + +struct trj_data { + Queue *edges; + Id *low; + Id idx; + Id nstack; + Id firstidx; +}; + +/* Tarjan's SCC algorithm, slightly modifed */ +static void +trj_visit(struct trj_data *trj, Id node) +{ + Id *low = trj->low; + Queue *edges = trj->edges; + Id nnode, myidx, stackstart; + int i; + + low[node] = myidx = trj->idx++; + low[(stackstart = trj->nstack++)] = node; + for (i = edges->elements[node]; (nnode = edges->elements[i]) != 0; i++) + { + Id l = low[nnode]; + if (!l) + { + if (!edges->elements[edges->elements[nnode]]) + { + trj->idx++; + low[nnode] = -1; + continue; + } + trj_visit(trj, nnode); + l = low[nnode]; + } + if (l < 0) + continue; + if (l < trj->firstidx) + { + int k; + for (k = l; low[low[k]] == l; k++) + low[low[k]] = -1; + } + else if (l < low[node]) + low[node] = l; + } + if (low[node] == myidx) + { + if (myidx != trj->firstidx) + myidx = -1; + for (i = stackstart; i < trj->nstack; i++) + low[low[i]] = myidx; + trj->nstack = stackstart; + } } +void +solver_get_unneeded(Solver *solv, Queue *unneededq, int filtered) +{ + Repo *installed = solv->installed; + int i; + Map cleandepsmap; + + queue_empty(unneededq); + if (!installed || installed->end == installed->start) + return; + + map_init(&cleandepsmap, installed->end - installed->start); + solver_createcleandepsmap(solv, &cleandepsmap, 1); + for (i = installed->start; i < installed->end; i++) + if (MAPTST(&cleandepsmap, i - installed->start)) + queue_push(unneededq, i); + + if (filtered && unneededq->count > 1) + { + Pool *pool = solv->pool; + Queue edges; + Id *nrequires; + Map installedm; + int j, pass, count = unneededq->count; + Id *low; + + map_init(&installedm, pool->nsolvables); + for (i = installed->start; i < installed->end; i++) + if (pool->solvables[i].repo == installed) + MAPSET(&installedm, i); + + nrequires = solv_calloc(count, sizeof(Id)); + queue_init(&edges); + queue_prealloc(&edges, count * 4 + 10); /* pre-size */ + + /* + * Go through the solvables in the nodes queue and create edges for + * all requires/recommends/supplements between the nodes. + * The edges are stored in the edges queue, we add 1 to the node + * index so that nodes in the edges queue are != 0 and we can + * terminate the edge list with 0. + * Thus for node element 5, the edges are stored starting at + * edges.elements[6] and are 0-terminated. + */ + /* leave first element zero to make things easier */ + /* also add trailing zero */ + queue_insertn(&edges, 0, 1 + count + 1); + + /* first requires and recommends */ + for (i = 0; i < count; i++) + { + Solvable *s = pool->solvables + unneededq->elements[i]; + edges.elements[i + 1] = edges.count; + for (pass = 0; pass < 2; pass++) + { + int num = 0; + unsigned int off = pass == 0 ? s->requires : s->recommends; + Id p, pp, *dp; + if (off) + for (dp = s->repo->idarraydata + off; *dp; dp++) + FOR_PROVIDES(p, pp, *dp) + { + Solvable *sp = pool->solvables + p; + if (s == sp || sp->repo != installed || !MAPTST(&cleandepsmap, p - installed->start)) + continue; + for (j = 0; j < count; j++) + if (p == unneededq->elements[j]) + break; + if (j == count) + continue; + if (num && edges.elements[edges.count - 1] == j + 1) + continue; + queue_push(&edges, j + 1); + num++; + } + if (pass == 0) + nrequires[i] = num; + } + queue_push(&edges, 0); + } +#if 0 + printf("requires + recommends\n"); + for (i = 0; i < count; i++) + { + int j; + printf(" %s (%d requires):\n", pool_solvid2str(pool, unneededq->elements[i]), nrequires[i]); + for (j = edges.elements[i + 1]; edges.elements[j]; j++) + printf(" - %s\n", pool_solvid2str(pool, unneededq->elements[edges.elements[j] - 1])); + } +#endif + + /* then add supplements */ + for (i = 0; i < count; i++) + { + Solvable *s = pool->solvables + unneededq->elements[i]; + if (s->supplements) + { + Id *dp; + int k; + for (dp = s->repo->idarraydata + s->supplements; *dp; dp++) + if (dep_possible(solv, *dp, &installedm)) + { + Queue iq; + Id iqbuf[16]; + queue_init_buffer(&iq, iqbuf, sizeof(iqbuf)/sizeof(*iqbuf)); + dep_pkgcheck(solv, *dp, 0, &iq); + for (k = 0; k < iq.count; k++) + { + Id p = iq.elements[k]; + Solvable *sp = pool->solvables + p; + if (p == unneededq->elements[i] || sp->repo != installed || !MAPTST(&cleandepsmap, p - installed->start)) + continue; + for (j = 0; j < count; j++) + if (p == unneededq->elements[j]) + break; + /* now add edge from j + 1 to i + 1 */ + queue_insert(&edges, edges.elements[j + 1] + nrequires[j], i + 1); + /* addapt following edge pointers */ + for (k = j + 2; k < count + 2; k++) + edges.elements[k]++; + } + queue_free(&iq); + } + } + } +#if 0 + /* print result */ + printf("+ supplements\n"); + for (i = 0; i < count; i++) + { + int j; + printf(" %s (%d requires):\n", pool_solvid2str(pool, unneededq->elements[i]), nrequires[i]); + for (j = edges.elements[i + 1]; edges.elements[j]; j++) + printf(" - %s\n", pool_solvid2str(pool, unneededq->elements[edges.elements[j] - 1])); + } +#endif + map_free(&installedm); + + /* now run SCC algo two times, first with requires+recommends+supplements, + * then again without the requires. We run it the second time to get rid + * of packages that got dragged in via recommends/supplements */ + /* + * low will contain the result of the SCC search. + * it must be of at least size 2 * (count + 1) and + * must be zero initialized. + * The layout is: + * 0 low low ... low stack stack ...stack 0 + * count count + */ + low = solv_calloc(count + 1, 2 * sizeof(Id)); + for (pass = 0; pass < 2; pass++) + { + struct trj_data trj; + if (pass) + { + memset(low, 0, (count + 1) * (2 * sizeof(Id))); + for (i = 0; i < count; i++) + { + edges.elements[i + 1] += nrequires[i]; + if (!unneededq->elements[i]) + low[i + 1] = -1; /* ignore this node */ + } + } + trj.edges = &edges; + trj.low = low; + trj.idx = count + 1; /* stack starts here */ + for (i = 1; i <= count; i++) + { + if (low[i]) + continue; + if (edges.elements[edges.elements[i]]) + { + trj.firstidx = trj.nstack = trj.idx; + trj_visit(&trj, i); + } + else + { + Id myidx = trj.idx++; + low[i] = myidx; + low[myidx] = i; + } + } + /* prune packages */ + for (i = 0; i < count; i++) + if (low[i + 1] <= 0) + unneededq->elements[i] = 0; + } + solv_free(low); + solv_free(nrequires); + queue_free(&edges); + + /* finally remove all pruned entries from unneededq */ + for (i = j = 0; i < count; i++) + if (unneededq->elements[i]) + unneededq->elements[j++] = unneededq->elements[i]; + queue_truncate(unneededq, j); + } + map_free(&cleandepsmap); +} + /* EOF */