Author: mlschroe Date: Wed Sep 17 12:30:59 2008 New Revision: 11078 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11078&view=rev Log: - Change provide iterator from ID pointer to ID. Before, iterating was unsave as the whatprovides array can get relocated. Modified: trunk/sat-solver/bindings/pool.i trunk/sat-solver/src/policy.c trunk/sat-solver/src/pool.c trunk/sat-solver/src/pool.h trunk/sat-solver/src/solvable.c trunk/sat-solver/src/solver.c trunk/sat-solver/src/solver.h trunk/sat-solver/src/solverdebug.c trunk/sat-solver/testsuite/gimmick.c trunk/sat-solver/testsuite/yps.c Modified: trunk/sat-solver/bindings/pool.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/pool.i?rev=11078&r1=11077&r2=11078&view=diff ============================================================================== --- trunk/sat-solver/bindings/pool.i (original) +++ trunk/sat-solver/bindings/pool.i Wed Sep 17 12:30:59 2008 @@ -191,7 +191,7 @@ */ void each_provider( Relation *rel ) { - Id p, *pp; + Id p, pp; Pool *pool = $self; if (!$self->whatprovides) pool_createwhatprovides( $self ); @@ -240,7 +240,7 @@ void each_provider( const char *name ) { #if defined(SWIGRUBY) - Id p, *pp; + Id p, pp; Pool *pool = $self; if (!$self->whatprovides) pool_createwhatprovides($self); Modified: trunk/sat-solver/src/policy.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/policy.c?rev=11078&r1=11077&r2=11078&view=diff ============================================================================== --- trunk/sat-solver/src/policy.c (original) +++ trunk/sat-solver/src/policy.c Wed Sep 17 12:30:59 2008 @@ -116,7 +116,7 @@ Pool *pool = solv->pool; int i, j; Solvable *s; - Id p, *pp, rec, *recp, sug, *sugp; + Id p, pp, rec, *recp, sug, *sugp; if (solv->recommends_index < 0) { @@ -241,7 +241,7 @@ /* FIXME do not prune cycles */ for (i = 0; i < plist->count; i++) { - Id p, *pp, obs, *obsp; + Id p, pp, obs, *obsp; s = pool->solvables + plist->elements[i]; if (!s->obsoletes) continue; @@ -401,7 +401,7 @@ { /* installed packages get a special upgrade allowed rule */ Pool *pool = solv->pool; - Id p, *pp, n, p2, *pp2; + Id p, pp, n, p2, pp2; Id obs, *obsp; Solvable *ps; @@ -467,7 +467,8 @@ return; if (solv->obsoletes && solv->obsoletes[n - solv->installed->start]) { - for (pp = solv->obsoletes_data + solv->obsoletes[n - solv->installed->start]; (p = *pp++) != 0;) + Id *opp; + for (opp = solv->obsoletes_data + solv->obsoletes[n - solv->installed->start]; (p = *opp++) != 0;) { ps = pool->solvables + p; if (!allow_all && !solv->allowarchchange && s->arch != ps->arch && policy_illegal_archchange(solv, s, ps)) Modified: trunk/sat-solver/src/pool.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/pool.c?rev=11078&r1=11077&r2=11078&view=diff ============================================================================== --- trunk/sat-solver/src/pool.c (original) +++ trunk/sat-solver/src/pool.c Wed Sep 17 12:30:59 2008 @@ -456,7 +456,7 @@ * */ -Id * +Id pool_addrelproviders(Pool *pool, Id d) { Reldep *rd = GETRELDEP(pool, d); @@ -467,7 +467,7 @@ Id evr = rd->evr; int flags = rd->flags; Id pid, *pidp; - Id p, *pp, *pp2, *pp3; + Id p, wp, *pp, *pp2, *pp3; d = GETRELID(d); queue_init_buffer(&plist, buf, sizeof(buf)/sizeof(*buf)); @@ -475,8 +475,8 @@ { case REL_AND: case REL_WITH: - pp = pool_whatprovides(pool, name); - pp2 = pool_whatprovides(pool, evr); + pp = pool->whatprovidesdata + pool_whatprovides(pool, name); + pp2 = pool->whatprovidesdata + pool_whatprovides(pool, evr); while ((p = *pp++) != 0) { for (pp3 = pp2; *pp3;) @@ -488,19 +488,19 @@ } break; case REL_OR: - pp = pool_whatprovides(pool, name); + pp = pool->whatprovidesdata + pool_whatprovides(pool, name); while ((p = *pp++) != 0) queue_push(&plist, p); - pp = pool_whatprovides(pool, evr); + pp = pool->whatprovidesdata + pool_whatprovides(pool, evr); while ((p = *pp++) != 0) queue_pushunique(&plist, p); break; case REL_NAMESPACE: if (name == NAMESPACE_OTHERPROVIDERS) { - pp = pool_whatprovides(pool, evr); - pool->whatprovides_rel[d] = pp - pool->whatprovidesdata; - return pp; + wp = pool_whatprovides(pool, evr); + pool->whatprovides_rel[d] = wp; + return wp; } if (pool->nscallback) { @@ -514,7 +514,7 @@ { queue_free(&plist); pool->whatprovides_rel[d] = p; - return pool->whatprovidesdata + p; + return p; } if (p == 1) queue_push(&plist, SYSTEMSOLVABLE); @@ -537,17 +537,21 @@ } break; } - pp = pp2 = pool_whatprovides(pool, name); + wp = pool_whatprovides(pool, name); + pp = pool->whatprovidesdata + wp; while ((p = *pp++) != 0) { Solvable *s = pool->solvables + p; if (s->arch == evr) queue_push(&plist, p); else - pp2 = 0; + wp = 0; + } + if (wp) + { + pool->whatprovides_rel[d] = wp; + return wp; } - if (pp2) - return pp2; break; default: break; @@ -559,7 +563,7 @@ #endif if (flags && flags < 8) { - pp = pool_whatprovides(pool, name); + pp = pool->whatprovidesdata + pool_whatprovides(pool, name); while (ISRELDEP(name)) { rd = GETRELDEP(pool, name); @@ -635,7 +639,7 @@ pool->whatprovides_rel[d] = pool_queuetowhatprovides(pool, &plist); queue_free(&plist); - return pool->whatprovidesdata + pool->whatprovides_rel[d]; + return pool->whatprovides_rel[d]; } /*************************************************************************/ @@ -1260,7 +1264,7 @@ repo_search(s->repo, sp, SOLVABLE_DISKUSAGE, 0, 0, solver_fill_DU_cb, &cbd); if (!cbd.hasdu && oldinstalled) { - Id op, *opp; + Id op, opp; /* no du data available, ignore data of all installed solvables we obsolete */ if (!ignoredu.map) map_init(&ignoredu, oldinstalled->end - oldinstalled->start); @@ -1343,7 +1347,7 @@ static inline int providedbyinstalled(Pool *pool, unsigned char *map, Id dep) { - Id p, *pp; + Id p, pp; int r = 0; FOR_PROVIDES(p, pp, dep) { @@ -1387,7 +1391,7 @@ conp = s->repo->idarraydata + s->conflicts; while ((con = *conp++) != 0) { - dp = pool_whatprovides(pool, con); + dp = pool->whatprovidesdata + pool_whatprovides(pool, con); for (; *dp; dp++) map[p] |= 2; /* XXX: self conflict ? */ } Modified: trunk/sat-solver/src/pool.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/pool.h?rev=11078&r1=11077&r2=11078&view=diff ============================================================================== --- trunk/sat-solver/src/pool.h (original) +++ trunk/sat-solver/src/pool.h Wed Sep 17 12:30:59 2008 @@ -221,16 +221,16 @@ return 1; } -extern Id *pool_addrelproviders(Pool *pool, Id d); +extern Id pool_addrelproviders(Pool *pool, Id d); -static inline Id *pool_whatprovides(Pool *pool, Id d) +static inline Id pool_whatprovides(Pool *pool, Id d) { Id v; if (!ISRELDEP(d)) - return pool->whatprovidesdata + pool->whatprovides[d]; + return pool->whatprovides[d]; v = GETRELID(d); if (pool->whatprovides_rel[v]) - return pool->whatprovidesdata + pool->whatprovides_rel[v]; + return pool->whatprovides_rel[v]; return pool_addrelproviders(pool, d); } @@ -273,7 +273,7 @@ /* loop over all providers of d */ #define FOR_PROVIDES(v, vp, d) \ - for (vp = pool_whatprovides(pool, d) ; (v = *vp++) != 0; ) + for (vp = pool_whatprovides(pool, d) ; (v = pool->whatprovidesdata[vp++]) != 0; ) #define POOL_DEBUG(type, ...) do {if ((pool->debugmask & (type)) != 0) pool_debug(pool, (type), __VA_ARGS__);} while (0) #define IF_POOLDEBUG(type) if ((pool->debugmask & (type)) != 0) Modified: trunk/sat-solver/src/solvable.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solvable.c?rev=11078&r1=11077&r2=11078&view=diff ============================================================================== --- trunk/sat-solver/src/solvable.c (original) +++ trunk/sat-solver/src/solvable.c Wed Sep 17 12:30:59 2008 @@ -397,7 +397,7 @@ static inline int providedbyinstalled(Pool *pool, Map *installed, Id dep) { - Id p, *pp; + Id p, pp; FOR_PROVIDES(p, pp, dep) { if (p == SYSTEMSOLVABLE) @@ -429,7 +429,7 @@ { Pool *pool = s->repo->pool; Solvable *s2; - Id p, *pp, *dp; + Id p, pp, *dp; Id *reqp, req; Id *conp, con; Id *obsp, obs; @@ -503,7 +503,7 @@ conp = s2->repo->idarraydata + s2->conflicts; while ((con = *conp++) != 0) { - dp = pool_whatprovides(pool, con); + dp = pool->whatprovidesdata + pool_whatprovides(pool, con); for (; *dp; dp++) if (*dp == p) return 0; @@ -597,7 +597,7 @@ conp = s->repo->idarraydata + s->conflicts; while ((con = *conp++) != 0) { - dp = pool_whatprovides(pool, con); + dp = pool->whatprovidesdata + pool_whatprovides(pool, con); for (; *dp; dp++) MAPSET(conflictsmap, *dp); } Modified: trunk/sat-solver/src/solver.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.c?rev=11078&r1=11077&r2=11078&view=diff ============================================================================== --- trunk/sat-solver/src/solver.c (original) +++ trunk/sat-solver/src/solver.c Wed Sep 17 12:30:59 2008 @@ -25,8 +25,6 @@ #include "policy.h" #include "solverdebug.h" -#define CODE10 0 /* set to '1' to enable patch atoms */ - #define RULES_BLOCK 63 /******************************************************************** @@ -43,7 +41,7 @@ solver_splitprovides(Solver *solv, Id dep) { Pool *pool = solv->pool; - Id p, *pp; + Id p, pp; Reldep *rd; Solvable *s; @@ -73,7 +71,7 @@ { #if 0 Pool *pool = solv->pool; - Id p, *pp; + Id p, pp; if (ISRELDEP(dep)) { @@ -108,7 +106,7 @@ dep_possible(Solver *solv, Id dep, Map *m) { Pool *pool = solv->pool; - Id p, *pp; + Id p, pp; if (ISRELDEP(dep)) { @@ -867,7 +865,7 @@ { Pool *pool = solv->pool; int i, j; - Id how, select, what, p, *pp; + Id how, select, what, p, pp; Solvable *s; Repo *installed; Rule *r; @@ -1057,7 +1055,7 @@ Pool *pool = solv->pool; Solvable *s, *sn; Queue q; - Id p, *pp, qbuf[64]; + Id p, pp, qbuf[64]; sn = pool->solvables + n; queue_init_buffer(&q, qbuf, sizeof(qbuf)/sizeof(*qbuf)); @@ -1117,9 +1115,6 @@ * 0 = yes, 1 = no */ int dontfix; -#if CODE10 - int patchatom; -#endif /* Id var and pointer for each dependency * (not used in parallel) */ @@ -1129,7 +1124,7 @@ Id rec, *recp; Id sug, *sugp; /* var and ptr for loops */ - Id p, *pp; + Id p, pp; /* ptr to 'whatprovides' */ Id *dp; /* Id for current solvable 's' */ @@ -1185,18 +1180,11 @@ continue; /* find list of solvables providing 'req' */ - dp = pool_whatprovides(pool, req); + dp = pool->whatprovidesdata + pool_whatprovides(pool, req); if (*dp == SYSTEMSOLVABLE) /* always installed */ continue; -#if CODE10 - if (patchatom) - { - addpatchatomrequires(solv, s, dp, &workq, m); - continue; - } -#endif if (dontfix) { /* the strategy here is to not insist on dependencies @@ -1264,6 +1252,8 @@ /* we treat conflicts in patches a bit differen: * - nevr matching * - multiversion handling + * XXX: we should really handle this different, looking + * at the name is a bad hack */ if (!strncmp("patch:", id2str(pool, s->name), 6)) ispatch = 1; @@ -2726,7 +2716,7 @@ if (solv->decisionmap[i] > 0) { /* installed, check for recommends */ - Id *recp, rec, *pp, p; + Id *recp, rec, pp, p; s = pool->solvables + i; if (solv->ignorealreadyrecommended && s->repo == solv->installed) continue; @@ -3351,7 +3341,7 @@ Rule *r; Solvable *s; int dontfix = 0; - Id p, d, w2, *pp, req, *reqp, con, *conp, obs, *obsp, *dp; + Id p, d, w2, pp, req, *reqp, con, *conp, obs, *obsp, *dp; assert(rid > 0); if (rid >= solv->jobrules && rid < solv->jobrules_end) @@ -3401,7 +3391,7 @@ { if (req == SOLVABLE_PREREQMARKER) continue; - dp = pool_whatprovides(pool, req); + dp = pool->whatprovidesdata + pool_whatprovides(pool, req); if (*dp == 0) break; } @@ -3573,7 +3563,7 @@ { if (req == SOLVABLE_PREREQMARKER) continue; - dp = pool_whatprovides(pool, req); + dp = pool->whatprovidesdata + pool_whatprovides(pool, req); if (d == 0) { if (*dp == r->w2 && dp[1] == 0) @@ -3711,7 +3701,7 @@ Pool *pool = solv->pool; Solvable *s; Repo *installed = solv->installed; - Id p, *pp, obs, *obsp, *obsoletes, *obsoletes_data; + Id p, pp, obs, *obsp, *obsoletes, *obsoletes_data; int i, n; if (!installed || !installed->nsolvables) @@ -3916,7 +3906,7 @@ int oldnrules; Map addedmap; /* '1' == have rpm-rules for solvable */ Map installcandidatemap; - Id how, what, select, name, weak, p, *pp, d; + Id how, what, select, name, weak, p, pp, d; Queue q, redoq; Solvable *s; int goterase; @@ -4369,7 +4359,7 @@ * solver run */ if (redoq.count || solv->dontinstallrecommended || !solv->dontshowinstalledrecommended || solv->ignorealreadyrecommended) { - Id rec, *recp, p, *pp; + Id rec, *recp, p, pp; /* create map of all recommened packages */ solv->recommends_index = -1; @@ -4434,7 +4424,7 @@ if (1) { - Id sug, *sugp, p, *pp; + Id sug, *sugp, p, pp; /* create map of all suggests that are still open */ solv->recommends_index = -1; @@ -4566,4 +4556,235 @@ return change; } +#define FIND_INVOLVED_DEBUG 0 +void +solver_find_involved(Solver *solv, Queue *installedq, Solvable *ts, Queue *q) +{ + Pool *pool = solv->pool; + Map im; + Map installedm; + Solvable *s; + Queue iq; + Queue installedq_internal; + Id tp, ip, p, pp, req, *reqp, sup, *supp; + int i, count; + + tp = ts - pool->solvables; + queue_init(&iq); + queue_init(&installedq_internal); + map_init(&im, pool->nsolvables); + map_init(&installedm, pool->nsolvables); + + if (!installedq) + { + installedq = &installedq_internal; + if (solv->installed) + { + for (ip = solv->installed->start; ip < solv->installed->end; ip++) + { + s = pool->solvables + ip; + if (s->repo != solv->installed) + continue; + queue_push(installedq, ip); + } + } + } + for (i = 0; i < installedq->count; i++) + { + ip = installedq->elements[i]; + MAPSET(&installedm, ip); + MAPSET(&im, ip); + } + + queue_push(&iq, ts - pool->solvables); + while (iq.count) + { + ip = queue_shift(&iq); + if (!MAPTST(&im, ip)) + continue; + if (!MAPTST(&installedm, ip)) + continue; + MAPCLR(&im, ip); + s = pool->solvables + ip; +#if FIND_INVOLVED_DEBUG + printf("hello %s\n", solvable2str(pool, s)); +#endif + if (s->requires) + { + reqp = s->repo->idarraydata + s->requires; + while ((req = *reqp++) != 0) + { + if (req == SOLVABLE_PREREQMARKER) + continue; + /* count number of installed packages that match */ + count = 0; + FOR_PROVIDES(p, pp, req) + if (MAPTST(&installedm, p)) + count++; + if (count > 1) + continue; + FOR_PROVIDES(p, pp, req) + { + if (MAPTST(&im, p)) + { +#if FIND_INVOLVED_DEBUG + printf("%s requires %s\n", solvable2str(pool, pool->solvables + ip), solvable2str(pool, pool->solvables + p)); +#endif + queue_push(&iq, p); + } + } + } + } + if (s->recommends) + { + reqp = s->repo->idarraydata + s->recommends; + while ((req = *reqp++) != 0) + { + count = 0; + FOR_PROVIDES(p, pp, req) + if (MAPTST(&installedm, p)) + count++; + if (count > 1) + continue; + FOR_PROVIDES(p, pp, req) + { + if (MAPTST(&im, p)) + { +#if FIND_INVOLVED_DEBUG + printf("%s recommends %s\n", solvable2str(pool, pool->solvables + ip), solvable2str(pool, pool->solvables + p)); +#endif + queue_push(&iq, p); + } + } + } + } + if (!iq.count) + { + /* supplements pass */ + for (i = 0; i < installedq->count; i++) + { + ip = installedq->elements[i]; + 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) + { +#if FIND_INVOLVED_DEBUG + printf("%s supplemented\n", solvable2str(pool, pool->solvables + ip)); +#endif + queue_push(&iq, ip); + } + } + } + } + + for (i = 0; i < installedq->count; i++) + { + ip = installedq->elements[i]; + if (MAPTST(&im, ip)) + queue_push(&iq, ip); + } + + while (iq.count) + { + ip = queue_shift(&iq); + if (!MAPTST(&installedm, ip)) + continue; + s = pool->solvables + ip; +#if FIND_INVOLVED_DEBUG + printf("bye %s\n", solvable2str(pool, s)); +#endif + if (s->requires) + { + reqp = s->repo->idarraydata + s->requires; + while ((req = *reqp++) != 0) + { + FOR_PROVIDES(p, pp, req) + { + if (!MAPTST(&im, p)) + { + if (p == tp) + continue; +#if FIND_INVOLVED_DEBUG + printf("%s requires %s\n", solvable2str(pool, pool->solvables + ip), solvable2str(pool, pool->solvables + p)); +#endif + MAPSET(&im, p); + queue_push(&iq, p); + } + } + } + } + if (s->recommends) + { + reqp = s->repo->idarraydata + s->recommends; + while ((req = *reqp++) != 0) + { + FOR_PROVIDES(p, pp, req) + { + if (!MAPTST(&im, p)) + { + if (p == tp) + continue; +#if FIND_INVOLVED_DEBUG + printf("%s recommends %s\n", solvable2str(pool, pool->solvables + ip), solvable2str(pool, pool->solvables + p)); +#endif + MAPSET(&im, p); + queue_push(&iq, p); + } + } + } + } + if (!iq.count) + { + /* supplements pass */ + for (i = 0; i < installedq->count; i++) + { + ip = installedq->elements[i]; + if (ip == tp) + 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) + { +#if FIND_INVOLVED_DEBUG + printf("%s supplemented\n", solvable2str(pool, pool->solvables + ip)); +#endif + MAPSET(&im, ip); + queue_push(&iq, ip); + } + } + } + } + + queue_free(&iq); + + /* convert map into result */ + for (i = 0; i < installedq->count; i++) + { + ip = installedq->elements[i]; + if (MAPTST(&im, ip)) + continue; + if (ip == ts - pool->solvables) + continue; + queue_push(q, ip); + } + map_free(&im); + map_free(&installedm); + queue_free(&installedq_internal); +} + /* EOF */ Modified: trunk/sat-solver/src/solver.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.h?rev=11078&r1=11077&r2=11078&view=diff ============================================================================== --- trunk/sat-solver/src/solver.h (original) +++ trunk/sat-solver/src/solver.h Wed Sep 17 12:30:59 2008 @@ -281,7 +281,7 @@ solver_dep_fulfilled(Solver *solv, Id dep) { Pool *pool = solv->pool; - Id p, *pp; + Id p, pp; if (ISRELDEP(dep)) { @@ -334,22 +334,28 @@ void solver_calc_duchanges(Solver *solv, DUChanges *mps, int nmps); int solver_calc_installsizechange(Solver *solv); +void solver_find_involved(Solver *solv, Queue *installedq, Solvable *s, Queue *q); + static inline void solver_create_state_maps(Solver *solv, Map *installedmap, Map *conflictsmap) { pool_create_state_maps(solv->pool, &solv->decisionq, installedmap, conflictsmap); } +/* 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)) +/* iterate over all packages selected by a job */ #define FOR_JOB_SELECT(p, pp, select, what) \ - for (pp = (select == SOLVER_SOLVABLE ? pool->whatprovidesdata : \ - select == SOLVER_SOLVABLE_ONE_OF ? pool->whatprovidesdata + what : \ + for (pp = (select == SOLVER_SOLVABLE ? 0 : \ + select == SOLVER_SOLVABLE_ONE_OF ? what : \ pool_whatprovides(pool, what)), \ - p = (select == SOLVER_SOLVABLE ? what : *pp++) ; p ; p = *pp++) \ + 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)) #ifdef __cplusplus Modified: trunk/sat-solver/src/solverdebug.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solverdebug.c?rev=11078&r1=11077&r2=11078&view=diff ============================================================================== --- trunk/sat-solver/src/solverdebug.c (original) +++ trunk/sat-solver/src/solverdebug.c Wed Sep 17 12:30:59 2008 @@ -51,7 +51,7 @@ { for (i = 0; i < solv->decisionq.count; i++) { - Id *pp, n; + Id pp, n; int noobs; n = solv->decisionq.elements[i]; @@ -80,7 +80,7 @@ for (i = 0; i < solv->decisionq.count; i++) { Id obs, *obsp; - Id *pp, n; + Id pp, n; n = solv->decisionq.elements[i]; if (n < 0) @@ -301,7 +301,7 @@ } else { - Id xp, *xpp; + Id xp, xpp; FOR_PROVIDES(xp, xpp, s->name) { Solvable *s2 = pool->solvables + xp; Modified: trunk/sat-solver/testsuite/gimmick.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/gimmick.c?rev=11078&r1=11077&r2=11078&view=diff ============================================================================== --- trunk/sat-solver/testsuite/gimmick.c (original) +++ trunk/sat-solver/testsuite/gimmick.c Wed Sep 17 12:30:59 2008 @@ -30,7 +30,7 @@ Pool *pool; Repo *repo; Id id; - Id p, *pp; + Id p, pp; char *arch = 0; int debuglevel = 0; int nevr = 0; Modified: trunk/sat-solver/testsuite/yps.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/yps.c?rev=11078&r1=11077&r2=11078&view=diff ============================================================================== --- trunk/sat-solver/testsuite/yps.c (original) +++ trunk/sat-solver/testsuite/yps.c Wed Sep 17 12:30:59 2008 @@ -100,7 +100,7 @@ void langdemo(Pool *pool) { - Id screenid, p, *pp; + Id screenid, p, pp; screenid = str2id(pool, "3ddiag", 1); static const char *languages[] = {"es", "de"}; @@ -128,6 +128,72 @@ return 0; } +static void +findinstalled(Solver *solv, Queue *installedq) +{ + Pool *pool = solv->pool; + Id ip, p, pp; + Solvable *s, *ps; + Queue pq, nq, opq; + int i; + Map installedmap, namemap; + const char *name; + + map_init(&namemap, pool->ss.nstrings); + map_init(&installedmap, pool->nsolvables); + queue_init(&pq); + queue_init(&opq); + queue_init(&nq); + + if (solv->installed) + { + for (ip = solv->installed->start; ip < solv->installed->end; ip++) + { + s = pool->solvables + ip; + if (s->repo != solv->installed) + continue; + queue_push(installedq, ip); + MAPSET(&installedmap, ip); + } + } + /* find installed products/patterns */ + for (ip = 1; ip < pool->nsolvables; ip++) + { + s = pool->solvables + ip; + name = id2str(pool, s->name); + if (strncmp(name, "pattern:", 8) && strncmp(name, "product:", 8)) + continue; + if (MAPTST(&namemap, s->name)) + continue; + MAPSET(&namemap, s->name); + queue_empty(&nq); + FOR_PROVIDES(p, pp, s->name) + { + ps = pool->solvables + p; + if (ps->name == s->name) + queue_push(&nq, p); + } + if (!nq.count) + continue; + policy_filter_unwanted(solv, &nq, 0, POLICY_MODE_RECOMMEND); + queue_push(&pq, nq.elements[0]); + } + pool_trivial_installable(pool, solv->installed, &installedmap, &pq, &opq); + for (i = 0; i < opq.count; i++) + { +#if 0 + printf("%s -> %d\n", solvable2str(pool, pool->solvables + pq.elements[i]), opq.elements[i]); +#endif + if (opq.elements[i]) + queue_push(installedq, pq.elements[i]); + } + queue_free(&nq); + queue_free(&opq); + queue_free(&pq); + map_free(&installedmap); + map_free(&namemap); +} + //----------------------------------------------- int @@ -174,7 +240,7 @@ switch(c) { case 'e': - erase = 1; + erase++; break; case 'u': forceupdate = 1; @@ -281,7 +347,7 @@ ; else if (forceupdate) { - Id p, *pp; + Id p, pp; Solvable *s = 0; Queue qs; @@ -329,11 +395,35 @@ id = str2id(pool, argv[1], 1); queue_push(&job, SOLVER_ERASE_SOLVABLE_NAME | weak); queue_push(&job, id); + if (erase > 1) + { + Queue qs; + Queue iq; + Id p, pp; + int i; + + FOR_PROVIDES(p, pp, id) + { + if (pool->solvables[p].name != id) + continue; + queue_init(&qs); + queue_init(&iq); + findinstalled(solv, &iq); + solver_find_involved(solv, &iq, pool->solvables + p, &qs); + queue_free(&iq); + for (i = 0 ; i < qs.count; i++) + { + queue_push(&job, SOLVER_ERASE|SOLVER_SOLVABLE); + queue_push(&job, qs.elements[i]); + } + queue_free(&qs); + } + } } if (weakdeps) { - Id p, *pp; + Id p, pp; Solvable *s; id = str2id(pool, weakdeps, 1); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org