Author: mlschroe Date: Wed Apr 30 18:53:46 2008 New Revision: 9918 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9918&view=rev Log: - speed up solver a bit by creating a queue holding all assertion rules, so we do not have to scan all rules for assertions Modified: trunk/sat-solver/src/solver.c trunk/sat-solver/src/solver.h Modified: trunk/sat-solver/src/solver.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.c?rev=9918&r1=9917&r2=9918&view=diff ============================================================================== --- trunk/sat-solver/src/solver.c (original) +++ trunk/sat-solver/src/solver.c Wed Apr 30 18:53:46 2008 @@ -508,7 +508,7 @@ makeruledecisions(Solver *solv) { Pool *pool = solv->pool; - int i, ri; + int i, ri, ii; Rule *r, *rr; Id v, vv; int decisionstart; @@ -516,12 +516,10 @@ POOL_DEBUG(SAT_DEBUG_SCHUBI, "----- makeruledecisions ; size decisionq: %d -----\n",solv->decisionq.count); decisionstart = solv->decisionq.count; - /* rpm rules don't have assertions, so we can start with the job - * rules (rpm assertions are not resulting in a rule, but cause a - * immediate decision) */ - /* nowadays they can be weak, so start with rule 1 */ - for (ri = 1, r = solv->rules + ri; ri < solv->nrules; ri++, r++) + for (ii = 0; ii < solv->ruleassertions.count; ii++) { + ri = solv->ruleassertions.elements[ii]; + r = solv->rules + ri; if (r->d < 0 || !r->p || r->w2) /* disabled, dummy or no assertion */ continue; /* do weak rules in phase 2 */ @@ -636,13 +634,14 @@ vv = v > 0 ? v : -v; solv->decisionmap[vv] = 0; } - ri = solv->jobrules - 1; - r = solv->rules + ri; + ii = -1; } /* phase 2: now do the weak assertions */ - for (ri = 1, r = solv->rules + ri; ri < solv->learntrules; ri++, r++) + for (ii = 0; ii < solv->ruleassertions.count; ii++) { + ri = solv->ruleassertions.elements[ii]; + r = solv->rules + ri; if (r->d < 0 || r->w2) /* disabled or no assertion */ continue; if (!MAPTST(&solv->weakrulemap, ri)) @@ -1904,6 +1903,11 @@ watch2onhighest(solv, r); addwatches_rule(solv, r); } + else + { + /* learnt rule is an assertion */ + queue_push(&solv->ruleassertions, r - solv->rules); + } solv->decisionmap[p > 0 ? p : -p] = p > 0 ? level : -level; queue_push(&solv->decisionq, p); queue_push(&solv->decisionq_why, r - solv->rules); @@ -1994,6 +1998,7 @@ queue_init(&solv->branches); queue_init(&solv->covenantq); queue_init(&solv->weakruleq); + queue_init(&solv->ruleassertions); map_init(&solv->recommendsmap, pool->nsolvables); map_init(&solv->suggestsmap, pool->nsolvables); @@ -2027,6 +2032,7 @@ queue_free(&solv->branches); queue_free(&solv->covenantq); queue_free(&solv->weakruleq); + queue_free(&solv->ruleassertions); map_free(&solv->recommendsmap); map_free(&solv->suggestsmap); @@ -3608,6 +3614,12 @@ /* all new rules are learnt after this point */ solv->learntrules = solv->nrules; + /* create assertion index. it is only used to speed up + * makeruledecsions() a bit */ + for (i = 1, r = solv->rules + i; i < solv->nrules; i++, r++) + if (r->p && !r->w2 && (r->d == 0 || r->d == -1)) + queue_push(&solv->ruleassertions, i); + /* disable update rules that conflict with our job */ disableupdaterules(solv, job, -1); Modified: trunk/sat-solver/src/solver.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.h?rev=9918&r1=9917&r2=9918&view=diff ============================================================================== --- trunk/sat-solver/src/solver.h (original) +++ trunk/sat-solver/src/solver.h Wed Apr 30 18:53:46 2008 @@ -66,6 +66,8 @@ Rule *rules; /* all rules */ Id nrules; /* index of the last rule */ + Queue ruleassertions; /* index of all assertion rules */ + Id jobrules; /* user rules */ Id updaterules; /* policy rules, e.g. keep packages installed or update. All literals > 0 */ Id featurerules; /* feature rules */ -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org