Author: mlschroe Date: Wed Nov 7 17:15:12 2007 New Revision: 7751 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7751&view=rev Log: - move policy-ruby.c into ruby dir - fix lock xml parsing in deptestomatic. grrr.... - support multiple verbosity levels - add experimental minimization feature - always take first element of prune function to annoy coolo - sorry, no policy support yet Added: trunk/sat-solver/bindings/ruby/policy-ruby.c Removed: trunk/sat-solver/src/policy-ruby.c Modified: trunk/sat-solver/src/policy.c trunk/sat-solver/src/solver.c trunk/sat-solver/src/solver.h trunk/sat-solver/testsuite/deptestomatic.c Added: trunk/sat-solver/bindings/ruby/policy-ruby.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/policy-ruby.c?rev=7751&view=auto ============================================================================== --- trunk/sat-solver/bindings/ruby/policy-ruby.c (added) +++ trunk/sat-solver/bindings/ruby/policy-ruby.c Wed Nov 7 17:15:12 2007 @@ -0,0 +1,62 @@ +/* + * Ruby policy backend for SAT solver + * + */ +#include +#include "policy.h" + +#include "ruby.h" + +static const Pool *pool; +static VALUE cPolicy; + +int +policy_init( const Pool *p ) +{ + ruby_init(); + ruby_init_loadpath(); + rb_set_safe_level(0); //FIXME + + /* give the ruby code a name */ + ruby_script("satsolver_policy"); + + cPolicy = rb_define_class( "SatPolicy", rb_cObject ); + + /* load the policy implementation */ + rb_require( "satsolver_policy" ); + + pool = p; + + return 0; +} + + +int +policy_exit( void ) +{ + pool = NULL; + return 0; +} + +/*-----------------------------------------------*/ +int +policy_printrules( void ) +{ + static VALUE id = Qnil; + + /* check if ruby implementation available */ + if (NIL_P( id )) { + id = rb_intern( "printrules" ); + if (rb_respond_to( cPolicy, id ) == Qfalse) { + id = Qfalse; + } + } + + /* call ruby, if available */ + if (RTEST( id )) { + return RTEST( rb_funcall( cPolicy, id, 0 ) ); + } + + /* default: false */ + return 0; +} Modified: trunk/sat-solver/src/policy.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/policy.c?rev=7751&r1=7750&r2=7751&view=diff ============================================================================== --- trunk/sat-solver/src/policy.c (original) +++ trunk/sat-solver/src/policy.c Wed Nov 7 17:15:12 2007 @@ -4,27 +4,6 @@ */ #include "solver.h" - -#include #include "policy.h" -int -policy_init( const Pool *p ) -{ - return 0; -} - - -int -policy_exit( void ) -{ - return 0; -} -/*-----------------------------------------------*/ -int -policy_printrules( void ) -{ - /* default: false */ - return 0; -} Modified: trunk/sat-solver/src/solver.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.c?rev=7751&r1=7750&r2=7751&view=diff ============================================================================== --- trunk/sat-solver/src/solver.c (original) +++ trunk/sat-solver/src/solver.c Wed Nov 7 17:15:12 2007 @@ -38,7 +38,35 @@ Id b = *(Id *)bp; r = pool->solvables[a].name - pool->solvables[b].name; if (r) - return r; + { + const char *na, *nb; + /* different names. We use real strcmp here so that the result + * is not depending on some random solvable order */ + na = id2str(pool, pool->solvables[a].name); + nb = id2str(pool, pool->solvables[b].name); + /* bring selections and patterns to the front */ + if (!strncmp(na, "pattern:", 8)) + { + if (strncmp(nb, "pattern:", 8)) + return -1; + } + else if (!strncmp(nb, "pattern:", 8)) + { + if (strncmp(na, "pattern:", 8)) + return 1; + } + if (!strncmp(na, "selection:", 10)) + { + if (strncmp(nb, "selection:", 10)) + return -1; + } + else if (!strncmp(nb, "selection:", 10)) + { + if (strncmp(na, "selection:", 10)) + return 1; + } + return strcmp(na, nb); + } return a - b; } @@ -1348,10 +1376,11 @@ /* unit clause found, set other watch to TRUE */ if (DECISIONMAP_TRUE(-ow)) return r; /* eek, a conflict! */ -#if 0 - printf("unit "); - printrule(solv, r); -#endif + if (pool->verbose > 2) + { + printf("unit "); + printrule(solv, r); + } if (ow > 0) decisionmap[ow] = level; else @@ -1737,6 +1766,12 @@ solv->decisionq_why.count--; solv->propagate_index = solv->decisionq.count; } + while (solv->minimize.count && solv->minimize.elements[solv->minimize.count - 1] < -level) + { + solv->minimize.count--; + while (solv->minimize.count && solv->minimize.elements[solv->minimize.count - 1] >= 0) + solv->minimize.count--; + } solv->recommends_index = -1; } @@ -1864,6 +1899,7 @@ queue_init(&solv->suggestions); queue_init(&solv->learnt_why); queue_init(&solv->learnt_pool); + queue_init(&solv->minimize); map_init(&solv->recommendsmap, pool->nsolvables); map_init(&solv->suggestsmap, pool->nsolvables); @@ -1874,8 +1910,6 @@ memset(solv->rules, 0, sizeof(Rule)); solv->nrules = 1; - policy_init( pool ); - return solv; } @@ -1887,8 +1921,6 @@ void solver_free(Solver *solv) { - policy_exit(); - queue_free(&solv->ruletojob); queue_free(&solv->decisionq); queue_free(&solv->decisionq_why); @@ -1896,6 +1928,7 @@ queue_free(&solv->learnt_pool); queue_free(&solv->problems); queue_free(&solv->suggestions); + queue_free(&solv->minimize); map_free(&solv->recommendsmap); map_free(&solv->suggestsmap); @@ -1914,7 +1947,7 @@ /* * run_solver * - * all rules have been set up, not actually run the solver + * all rules have been set up, now actually run the solver * */ @@ -1930,15 +1963,11 @@ Pool *pool = solv->pool; Id p, *dp; -if (policy_printrules()) -{ +#if 0 printf("number of rules: %d\n", solv->nrules); - int i; for (i = 0; i < solv->nrules; i++) - { - printrule(solv, solv->rules + i); - } -} + printrule(solv, solv->rules + i); +#endif /* all new rules are learnt after this point */ solv->learntrules = solv->nrules; @@ -2138,12 +2167,21 @@ printrule(solv, r); abort(); } + if (pool->verbose > 2) + printrule(solv, r); prune_to_highest_prio(pool, &dq); if (dq.count > 1) prune_to_recommended(solv, &dq); if (dq.count > 1) prune_best_version_arch(pool, &dq); - p = dq.elements[dq.count - 1]; + if (dq.count > 1) + { + int j; + for (j = 1; j < dq.count; j++) + queue_push(&solv->minimize, dq.elements[j]); + queue_push(&solv->minimize, -level); + } + p = dq.elements[0]; s = pool->solvables + p; #if 0 printf("installing %s-%s.%s\n", id2str(pool, s->name), id2str(pool, s->evr), id2str(pool, s->arch)); @@ -2194,7 +2232,9 @@ break; } else if (solv->decisionmap[p] == 0) - queue_pushunique(&dq, p); + { + queue_pushunique(&dq, p); + } } } } @@ -2234,7 +2274,7 @@ prune_to_highest_prio(pool, &dq); if (dq.count > 1) prune_best_version_arch(pool, &dq); - p = dq.elements[dq.count - 1]; + p = dq.elements[0]; s = pool->solvables + p; #if 1 printf("installing recommended %s-%s.%s\n", id2str(pool, s->name), id2str(pool, s->evr), id2str(pool, s->arch)); @@ -2243,6 +2283,44 @@ continue; } } + /* minimization step */ + if (solv->minimize.count) + { + int l = 0, lasti = -1, lastl = -1; + p = 0; + for (i = solv->minimize.count - 1; i >= 0; i--) + { + p = solv->minimize.elements[i]; + if (p < 0) + l = -p; + else if (p > 0 && solv->decisionmap[p] > l + 1) + { + lasti = i; + lastl = l; + } + } + if (lasti >= 0) + { + /* kill old solvable so that we do not loop */ + p = solv->minimize.elements[lasti]; + solv->minimize.elements[lasti] = 0; + s = pool->solvables + p; +#if 1 + printf("minimizing %d -> %d with %s-%s.%s\n", solv->decisionmap[p], l, id2str(pool, s->name), id2str(pool, s->evr), id2str(pool, s->arch)); +#endif + level = lastl; + revert(solv, level); + olevel = level; + level = setpropagatelearn(solv, level, p, disablerules); + if (level == 0) + { + printf("UNSOLVABLE\n"); + queue_free(&dq); + return; + } + continue; + } + } break; } queue_free(&dq); @@ -2819,9 +2897,12 @@ { case SOLVER_INSTALL_SOLVABLE: /* install specific solvable */ s = pool->solvables + what; - if (solv->rc_output) { - printf(">!> Installing %s from channel %s\n", id2str(pool, s->name), repo_name(s->repo)); - } + if (solv->rc_output) + { + printf(">!> Installing %s from channel %s\n", id2str(pool, s->name), repo_name(s->repo)); + } + if (pool->verbose) + printf("job: install solvable %s-%s.%s\n", id2str(pool, s->name), id2str(pool, s->evr), id2str(pool, s->arch)); addrule(solv, what, 0); /* install by Id */ queue_push(&solv->ruletojob, i); FOR_PROVIDES(p, pp, s->name) @@ -2829,12 +2910,19 @@ MAPSET(&noupdaterule, p); break; case SOLVER_ERASE_SOLVABLE: + s = pool->solvables + what; + if (pool->verbose) + printf("job: erase solvable %s-%s.%s\n", id2str(pool, s->name), id2str(pool, s->evr), id2str(pool, s->arch)); addrule(solv, -what, 0); /* remove by Id */ queue_push(&solv->ruletojob, i); MAPSET(&noupdaterule, what); break; case SOLVER_INSTALL_SOLVABLE_NAME: /* install by capability */ case SOLVER_INSTALL_SOLVABLE_PROVIDES: + if (pool->verbose && how == SOLVER_INSTALL_SOLVABLE_NAME) + printf("job: install name %s\n", id2str(pool, what)); + if (pool->verbose && how == SOLVER_INSTALL_SOLVABLE_PROVIDES) + printf("job: install provides %s\n", dep2str(pool, what)); queue_empty(&q); FOR_PROVIDES(p, pp, what) { @@ -2859,6 +2947,10 @@ break; case SOLVER_ERASE_SOLVABLE_NAME: /* remove by capability */ case SOLVER_ERASE_SOLVABLE_PROVIDES: + if (pool->verbose && how == SOLVER_ERASE_SOLVABLE_NAME) + printf("job: erase name %s\n", id2str(pool, what)); + if (pool->verbose && how == SOLVER_ERASE_SOLVABLE_PROVIDES) + printf("job: erase provides %s\n", dep2str(pool, what)); FOR_PROVIDES(p, pp, what) { /* if by name, ensure that the name matches */ @@ -2871,7 +2963,11 @@ } break; case SOLVER_INSTALL_SOLVABLE_UPDATE: /* find update for solvable */ - addupdaterule(solv, pool->solvables + what, &addedmap, 0, 0, 0, 0); + s = pool->solvables + what; + MAPSET(&noupdaterule, what); + if (pool->verbose) + printf("job: update %s-%s.%s\n", id2str(pool, s->name), id2str(pool, s->evr), id2str(pool, s->arch)); + addupdaterule(solv, s, &addedmap, 0, 0, 0, 0); queue_push(&solv->ruletojob, i); break; } @@ -2978,7 +3074,8 @@ FOR_PROVIDES(p, pp, sug) MAPSET(&solv->suggestsmap, p); } - } } + } + } for (i = 1; i < pool->nsolvables; i++) { if (solv->decisionmap[i] != 0) Modified: trunk/sat-solver/src/solver.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.h?rev=7751&r1=7750&r2=7751&view=diff ============================================================================== --- trunk/sat-solver/src/solver.h (original) +++ trunk/sat-solver/src/solver.h Wed Nov 7 17:15:12 2007 @@ -76,6 +76,7 @@ /* learnt rule history */ Queue learnt_why; Queue learnt_pool; + Queue minimize; int propagate_index; Modified: trunk/sat-solver/testsuite/deptestomatic.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/deptestomatic.c?rev=7751&r1=7750&r2=7751&view=diff ============================================================================== --- trunk/sat-solver/testsuite/deptestomatic.c (original) +++ trunk/sat-solver/testsuite/deptestomatic.c Wed Nov 7 17:15:12 2007 @@ -56,6 +56,7 @@ STATE_LOCALE, STATE_FORCEINSTALL, STATE_FORCEUNINSTALL, + STATE_SETUPLOCK, STATE_LOCK, STATE_KEEP, STATE_MEDIAID, @@ -105,7 +106,7 @@ { STATE_SETUP, "locale", STATE_LOCALE, 0 }, { STATE_SETUP, "force-install",STATE_FORCEINSTALL, 0 }, { STATE_SETUP, "force-uninstall",STATE_FORCEUNINSTALL, 0 }, - { STATE_SETUP, "lock", STATE_LOCK, 0 }, + { STATE_SETUP, "lock", STATE_SETUPLOCK, 0 }, { STATE_SETUP, "mediaid", STATE_MEDIAID, 0 }, { STATE_SETUP, "hardwareInfo", STATE_HARDWAREINFO, 0 }, { STATE_SETUP, "setlicencebit", STATE_SETLICENSEBIT, 0 }, @@ -893,6 +894,7 @@ break; case STATE_LOCK: /* prevent install/removal */ + case STATE_SETUPLOCK: { /* * <lock channel="1" package="foofoo" /> @@ -1323,9 +1325,9 @@ ++argp; } - if (argp < argc && !strcmp( argv[argp], "-v" )) + while (argp < argc && !strcmp( argv[argp], "-v" )) { - verbose = 1; + verbose++; ++argp; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org