October 2007 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r7731 - /trunk/sat-solver/testsuite/runtest.rb
by kkaempf＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: kkaempf Date: Wed Oct 31 21:43:03 2007 New Revision: 7731 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7731&view=rev Log: support 'build dir' as used by cmake Modified: trunk/sat-solver/testsuite/runtest.rb Modified: trunk/sat-solver/testsuite/runtest.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/runtest.rb?… ============================================================================== --- trunk/sat-solver/testsuite/runtest.rb (original) +++ trunk/sat-solver/testsuite/runtest.rb Wed Oct 31 21:43:03 2007 @@ -19,7 +19,12 @@ $redcarpet = false $tests = Array.new -$deptestomatic = File.join( Dir.getwd, "deptestomatic" ) +if File.executable?( "./deptestomatic" ) + execdir = Dir.getwd +else + execdir = "../build/testsuite" +end +$deptestomatic = File.join( execdir, "deptestomatic" ) $topdir = Dir.getwd $fails = Array.new $ignorecount = 0 -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7730 - /trunk/sat-solver/bindings/satsolver.i
by kkaempf＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: kkaempf Date: Wed Oct 31 21:29:43 2007 New Revision: 7730 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7730&view=rev Log: Fix Swig warning: Creating wrapper code for ruby .../backup/projects/sat-solver/bindings/ruby/../satsolver.i:33: Warning(124): Specifying the language name in %typemap is deprecated - use #ifdef SWIG<LANG> instead. Modified: trunk/sat-solver/bindings/satsolver.i Modified: trunk/sat-solver/bindings/satsolver.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/satsolver.i?… ============================================================================== --- trunk/sat-solver/bindings/satsolver.i (original) +++ trunk/sat-solver/bindings/satsolver.i Wed Oct 31 21:29:43 2007 @@ -30,7 +30,8 @@ }*/ -%typemap(ruby,in) FILE * { +#ifdef SWIG<Ruby> +FILE * { OpenFile *fptr; Check_Type($input, T_FILE); @@ -38,6 +39,7 @@ /*rb_io_check_writable(fptr);*/ $1 = GetReadFile(fptr); } +#endif %include "bitmap.h" %include "evr.h" -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7729 - /trunk/sat-solver/bindings/satsolver.i
by kkaempf＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: kkaempf Date: Wed Oct 31 21:27:34 2007 New Revision: 7729 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7729&view=rev Log: fix build Modified: trunk/sat-solver/bindings/satsolver.i Modified: trunk/sat-solver/bindings/satsolver.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/satsolver.i?… ============================================================================== --- trunk/sat-solver/bindings/satsolver.i (original) +++ trunk/sat-solver/bindings/satsolver.i Wed Oct 31 21:27:34 2007 @@ -153,7 +153,7 @@ { return ($self->count == 0); } void clear() - { QUEUEEMPTY($self); } + { queue_empty($self); } }; %newobject queue_init; %delobject queue_free; @@ -196,7 +196,7 @@ %extend Solver { - Solver( Pool *pool, Repo *system ) { return solver_create(pool, system); } + Solver( Pool *pool, Repo *installed ) { return solver_create(pool, installed); } ~Solver() { solver_free($self); } %rename("fix_system") fixsystem; @@ -219,9 +219,9 @@ if (p < 0) continue; /* already installed resolvable */ - if (p >= $self->system->start && p < $self->system->start + $self->system->nsolvables) + if (p >= $self->installed->start && p < $self->installed->start + $self->installed->nsolvables) continue; - /** system resolvable */ + /** installed resolvable */ if (p == SYSTEMSOLVABLE) continue; @@ -238,8 +238,8 @@ Solvable *s; /* solvables to be erased */ - for (int i = $self->system->start; - i < $self->system->start + $self->system->nsolvables; + for (int i = $self->installed->start; + i < $self->installed->start + $self->installed->nsolvables; i++) { /* what is this? */ -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7728 - /trunk/sat-solver/src/solver.c
by mlschroe＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: mlschroe Date: Wed Oct 31 15:01:35 2007 New Revision: 7728 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7728&view=rev Log: - do not be that verbose - format solutions a bit better Modified: trunk/sat-solver/src/solver.c Modified: trunk/sat-solver/src/solver.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.c?rev=7728… ============================================================================== --- trunk/sat-solver/src/solver.c (original) +++ trunk/sat-solver/src/solver.c Wed Oct 31 15:01:35 2007 @@ -287,7 +287,7 @@ if (plist->count < 2) /* no need to prune for a single entry */ return; - if (pool->verbose) printf("prune_best_version_arch %d\n", plist->count); + if (pool->verbose > 1) printf("prune_best_version_arch %d\n", plist->count); /* prune to best architecture */ if (pool->id2arch) @@ -357,7 +357,7 @@ { s = pool->solvables + plist->elements[i]; - if (pool->verbose) printf("- %s-%s.%s\n", id2str(pool, s->name), id2str(pool, s->evr), id2str(pool, s->arch)); + if (pool->verbose > 1) printf("- %s-%s.%s\n", id2str(pool, s->name), id2str(pool, s->evr), id2str(pool, s->arch)); if (!best) /* if no best yet, the current is best */ { @@ -1394,12 +1394,12 @@ queue_init(&r); - if (pool->verbose) printf("ANALYZE at %d ----------------------\n", level); + if (pool->verbose > 1) printf("ANALYZE at %d ----------------------\n", level); map_init(&seen, pool->nsolvables); idx = solv->decisionq.count; for (;;) { - printrule(solv, c); + if (pool->verbose > 1) printrule(solv, c); queue_push(&solv->learnt_pool, c - solv->rules); dp = c->d ? pool->whatprovidesdata + c->d : 0; for (i = -1; ; i++) @@ -1471,7 +1471,7 @@ *dr = r.elements[0]; else *dr = pool_queuetowhatprovides(pool, &r); - if (pool->verbose) + if (pool->verbose > 1) { printf("learned rule for level %d (am %d)\n", rlevel, level); printruleelement(solv, 0, -v); @@ -1529,7 +1529,7 @@ solv->decisionmap[v > 0 ? v : -v] = v > 0 ? 1 : -1; } - if (solv->pool->verbose) + if (solv->pool->verbose > 1) printf("decisions done reduced from %d to %d\n", solv->decisionq.count, i); solv->decisionq_why.count = i; @@ -1539,7 +1539,7 @@ /* redo all job/system decisions */ makeruledecisions(solv); - if (solv->pool->verbose) + if (solv->pool->verbose > 1) printf("decisions after adding job and system rules: %d\n", solv->decisionq.count); /* recreate watches */ makewatches(solv); @@ -1819,10 +1819,13 @@ solv->decisionmap[p > 0 ? p : -p] = p > 0 ? level : -level; queue_push(&solv->decisionq, p); queue_push(&solv->decisionq_why, r - solv->rules); - printf("decision: "); - printruleelement(solv, 0, p); - printf("new rule: "); - printrule(solv, r); + if (solv->pool->verbose > 1) + { + printf("decision: "); + printruleelement(solv, 0, p); + printf("new rule: "); + printrule(solv, r); + } } return level; } @@ -2372,8 +2375,8 @@ } else { +#if 0 printf("############################################## more than one solution found.\n"); -#if 1 for (i = 0; i < solv->problems.elements[i]; i++) printrule(solv, solv->rules + solv->problems.elements[i]); printf("##############################################\n"); @@ -3009,7 +3012,7 @@ Queue solution; Id *problem; Id why, what; - int j, ji; + int j, ji, pcnt; if (!pool->verbose) return; @@ -3017,11 +3020,19 @@ queue_init(&solution); printf("Encountered problems! Here are the solutions:\n"); problem = problems.elements; + pcnt = 1; + printf("\n"); + printf("Problem %d:\n", pcnt); + printf("====================================\n"); for (i = 0; i < problems.count; i++) { Id v = problems.elements[i]; if (v == 0) { + printf("\n"); + if (i + 1 == problems.count) + break; + printf("Problem %d:\n", ++pcnt); printf("====================================\n"); problem = problems.elements + i + 1; continue; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7727 - /trunk/sat-solver/src/solver.c
by mlschroe＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: mlschroe Date: Wed Oct 31 14:46:52 2007 New Revision: 7727 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7727&view=rev Log: - fix bug in last bugfix - make suggestions a bit better Modified: trunk/sat-solver/src/solver.c Modified: trunk/sat-solver/src/solver.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.c?rev=7727… ============================================================================== --- trunk/sat-solver/src/solver.c (original) +++ trunk/sat-solver/src/solver.c Wed Oct 31 14:46:52 2007 @@ -2810,14 +2810,14 @@ switch(how) { case SOLVER_INSTALL_SOLVABLE: /* install specific solvable */ + s = pool->solvables + what; if (solv->rc_output) { - Solvable *s = pool->solvables + what; printf(">!> Installing %s from channel %s\n", id2str(pool, s->name), repo_name(s->repo)); } addrule(solv, what, 0); /* install by Id */ queue_push(&solv->ruletojob, i); - FOR_PROVIDES(p, pp, what) - if (pool->solvables[what].name == pool->solvables[p].name) + FOR_PROVIDES(p, pp, s->name) + if (pool->solvables[p].name == s->name) MAPSET(&noupdaterule, p); break; case SOLVER_ERASE_SOLVABLE: @@ -3053,11 +3053,17 @@ { case SOLVER_INSTALL_SOLVABLE: s = pool->solvables + what; - printf("- do not install %s-%s.%s\n", id2str(pool, s->name), id2str(pool, s->evr), id2str(pool, s->arch)); + if (what >= solv->installed->start && what < solv->installed->start + solv->installed->nsolvables) + printf("- do not keep %s-%s.%s installed\n", id2str(pool, s->name), id2str(pool, s->evr), id2str(pool, s->arch)); + else + printf("- do not install %s-%s.%s\n", id2str(pool, s->name), id2str(pool, s->evr), id2str(pool, s->arch)); break; case SOLVER_ERASE_SOLVABLE: s = pool->solvables + what; - printf("- do not deinstall %s-%s.%s\n", id2str(pool, s->name), id2str(pool, s->evr), id2str(pool, s->arch)); + if (what >= solv->installed->start && what < solv->installed->start + solv->installed->nsolvables) + printf("- do not deinstall %s-%s.%s\n", id2str(pool, s->name), id2str(pool, s->evr), id2str(pool, s->arch)); + else + printf("- do not forbid installation of %s-%s.%s\n", id2str(pool, s->name), id2str(pool, s->evr), id2str(pool, s->arch)); break; case SOLVER_INSTALL_SOLVABLE_NAME: printf("- do not install %s\n", id2str(pool, what)); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7726 - in /trunk/sat-solver: src/solver.c testsuite/deptestomatic.c tools/repo_content.c
by mlschroe＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: mlschroe Date: Wed Oct 31 12:54:49 2007 New Revision: 7726 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7726&view=rev Log: - allow downgrade for INSTALL_SOLVABLE - add support for "version" in deptestomatic's select_solvable() - comment to repo_content Modified: trunk/sat-solver/src/solver.c trunk/sat-solver/testsuite/deptestomatic.c trunk/sat-solver/tools/repo_content.c Modified: trunk/sat-solver/src/solver.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.c?rev=7726… ============================================================================== --- trunk/sat-solver/src/solver.c (original) +++ trunk/sat-solver/src/solver.c Wed Oct 31 12:54:49 2007 @@ -2816,6 +2816,9 @@ } addrule(solv, what, 0); /* install by Id */ queue_push(&solv->ruletojob, i); + FOR_PROVIDES(p, pp, what) + if (pool->solvables[what].name == pool->solvables[p].name) + MAPSET(&noupdaterule, p); break; case SOLVER_ERASE_SOLVABLE: addrule(solv, -what, 0); /* remove by Id */ Modified: trunk/sat-solver/testsuite/deptestomatic.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/deptestomat… ============================================================================== --- trunk/sat-solver/testsuite/deptestomatic.c (original) +++ trunk/sat-solver/testsuite/deptestomatic.c Wed Oct 31 12:54:49 2007 @@ -23,6 +23,7 @@ #include "solver.h" #include "repo_solv.h" #include "poolarch.h" +#include "evr.h" static int verbose = 0; static int redcarpet = 0; @@ -571,7 +572,7 @@ // static Id -select_solvable( Pool *pool, Repo *repo, const char *name, const char *arch ) +select_solvable( Pool *pool, Repo *repo, const char *name, const char *version, const char *arch ) { Id id, archid; int i, end; @@ -595,8 +596,16 @@ { if (archid && pool->solvables[i].arch != archid) continue; - if (pool->solvables[i].name == id) - return i; + if (pool->solvables[i].name != id) + continue; + if (version) + { + const char *sver = id2str(pool, pool->solvables[i].evr); + const char *svere = strrchr(sver, '-'); + if (vercmp(version, version + strlen(version), sver, svere ? svere : sver + strlen(sver))) + continue; + } + return i; } return ID_NULL; @@ -893,6 +902,7 @@ char package[MAXNAMELEN]; getPackageName( atts, package ); const char *arch = attrval( atts, "arch" ); + const char *version = attrval( atts, "version" ); if (!strlen(package)) { @@ -920,7 +930,7 @@ } if (repo) { - Id id = select_solvable( pool, repo, package, arch ); + Id id = select_solvable( pool, repo, package, version, arch ); if (id == ID_NULL) { err( "Install: Package '%s' not found", package ); @@ -932,7 +942,7 @@ } else /* no channel given, lock installed */ { - Id id = select_solvable( pool, pd->system, package, arch ); + Id id = select_solvable( pool, pd->system, package, version, arch ); queue_push( &(pd->trials), SOLVER_INSTALL_SOLVABLE ); queue_push( &(pd->trials), id ); } @@ -1007,13 +1017,7 @@ } ++i; } - if ( arch && version ) // the downgrade should happen only for that package though... - { - pd->allowdowngrade = 1; - pd->allowarchchange = 1; - } - - Id id = select_solvable( pool, repo, package, arch ); + Id id = select_solvable( pool, repo, package, version, arch ); if (id == ID_NULL) { err( "Install: Package '%s' not found", package ); @@ -1047,7 +1051,7 @@ err( "No system channel defined to <uninstall> from" ); exit( 1 ); } - Id id = select_solvable( pool, pd->system, package, 0 ); + Id id = select_solvable( pool, pd->system, package, 0, 0 ); if (id == ID_NULL) { err( "Remove: Package '%s' is not installed", package ); @@ -1129,6 +1133,7 @@ case STATE_KEEP: { const char *arch = attrval( atts, "arch" ); + const char *version = attrval( atts, "version" ); char package[MAXNAMELEN]; getPackageName( atts, package ); @@ -1137,7 +1142,7 @@ err( "No package given in <keep>" ); exit( 1 ); } - Id id = select_solvable( pool, pd->system, package, arch ); + Id id = select_solvable( pool, pd->system, package, version, arch ); queue_push( &(pd->trials), SOLVER_INSTALL_SOLVABLE ); queue_push( &(pd->trials), id ); } Modified: trunk/sat-solver/tools/repo_content.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_content.c?… ============================================================================== --- trunk/sat-solver/tools/repo_content.c (original) +++ trunk/sat-solver/tools/repo_content.c Wed Oct 31 12:54:49 2007 @@ -224,11 +224,12 @@ pack++; } else if (istag ("VERSION")) + /* without a release? but that's like zypp implements it */ s->evr = makeevr(pool, value); else if (istag ("DISTPRODUCT")) - ; // DISTPRODUCT is only for Yast, not for the package manager + ; /* DISTPRODUCT is only for Yast, not the package manager */ else if (istag ("DISTVERSION")) - ; // DISTVERSION is only for Yast + ; /* DISTVERSION is only for Yast, not the package manager */ else if (istag ("VENDOR")) s->vendor = str2id(pool, value, 1); else if (istag ("ARCH")) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7725 - /trunk/sat-solver/tools/repo_content.c
by coolo＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: coolo Date: Wed Oct 31 12:43:50 2007 New Revision: 7725 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7725&view=rev Log: yep, right. DISTVERSION is the same misunderstanding Modified: trunk/sat-solver/tools/repo_content.c Modified: trunk/sat-solver/tools/repo_content.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_content.c?… ============================================================================== --- trunk/sat-solver/tools/repo_content.c (original) +++ trunk/sat-solver/tools/repo_content.c Wed Oct 31 12:43:50 2007 @@ -224,11 +224,11 @@ pack++; } else if (istag ("VERSION")) - ; + s->evr = makeevr(pool, value); else if (istag ("DISTPRODUCT")) ; // DISTPRODUCT is only for Yast, not for the package manager else if (istag ("DISTVERSION")) - s->evr = makeevr(pool, value); + ; // DISTVERSION is only for Yast else if (istag ("VENDOR")) s->vendor = str2id(pool, value, 1); else if (istag ("ARCH")) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7724 - /trunk/sat-solver/testsuite/deptestomatic.c
by coolo＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: coolo Date: Wed Oct 31 12:02:46 2007 New Revision: 7724 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7724&view=rev Log: allow arch change and downgrade on fully specificied solvables - the problem is that I can't tell the solver to either force that solvable or only downgrade that one Modified: trunk/sat-solver/testsuite/deptestomatic.c Modified: trunk/sat-solver/testsuite/deptestomatic.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/deptestomat… ============================================================================== --- trunk/sat-solver/testsuite/deptestomatic.c (original) +++ trunk/sat-solver/testsuite/deptestomatic.c Wed Oct 31 12:02:46 2007 @@ -171,6 +171,7 @@ int allowdowngrade; /* 0/1, if version downgrades are allowed */ int allowuninstall; /* 0/1, if solver should remove installed package for solution */ int allowvirtualconflicts; /* 0/1, if conflicts specify package names or package provides */ + int allowarchchange; /* 0/1, if packages can change architecture */ struct stateswitch *swtab[NUMSTATES]; enum state sbtab[NUMSTATES]; @@ -948,12 +949,14 @@ free((char *)pd->hardwareinfo); const char *dir = attrval( atts, "path" ); +printf("hardware %s\n", dir); if (dir) { char path[PATH_MAX]; strncpy(path, pd->directory, sizeof(path)); strncat(path, dir, sizeof(path)); pd->hardwareinfo = strdup(path); + printf("Setting hardwareinfo to %s\n", path); } else pd->hardwareinfo = 0; @@ -975,6 +978,7 @@ const char *channel = attrval( atts, "channel" ); const char *arch = attrval( atts, "arch" ); + const char *version = attrval( atts, "version" ); char package[MAXNAMELEN]; getPackageName( atts, package ); @@ -1003,6 +1007,12 @@ } ++i; } + if ( arch && version ) // the downgrade should happen only for that package though... + { + pd->allowdowngrade = 1; + pd->allowarchchange = 1; + } + Id id = select_solvable( pool, repo, package, arch ); if (id == ID_NULL) { @@ -1106,6 +1116,7 @@ case STATE_DISTUPGRADE: pd->updatesystem = 1; + pd->allowarchchange = 1; //pd->fixsystem = 1; pd->allowuninstall = 1; pd->allowdowngrade = 1; @@ -1184,6 +1195,7 @@ solv->updatesystem = pd->updatesystem; solv->allowdowngrade = pd->allowdowngrade; solv->allowuninstall = pd->allowuninstall; + solv->allowarchchange = pd->allowarchchange; solv->rc_output = redcarpet ? 2 : 1; solv->noupdateprovide = 1; pd->pool->verbose = verbose; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7723 - /trunk/sat-solver/tools/repo_content.c
by coolo＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: coolo Date: Wed Oct 31 09:45:27 2007 New Revision: 7723 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7723&view=rev Log: fixing misunderstanding Modified: trunk/sat-solver/tools/repo_content.c Modified: trunk/sat-solver/tools/repo_content.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_content.c?… ============================================================================== --- trunk/sat-solver/tools/repo_content.c (original) +++ trunk/sat-solver/tools/repo_content.c Wed Oct 31 09:45:27 2007 @@ -220,12 +220,13 @@ } s = pool->solvables + repo->start + pack; s->repo = repo; + s->name = str2id(pool, join(&pd, pd.kind, ":", value), 1); pack++; } else if (istag ("VERSION")) ; else if (istag ("DISTPRODUCT")) - s->name = str2id(pool, join(&pd, pd.kind, ":", value), 1); + ; // DISTPRODUCT is only for Yast, not for the package manager else if (istag ("DISTVERSION")) s->evr = makeevr(pool, value); else if (istag ("VENDOR")) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7722 - in /trunk/sat-solver/tools: attr_store.c attr_store_p.h dumpattr.c
by matz＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: matz Date: Wed Oct 31 05:11:20 2007 New Revision: 7722 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7722&view=rev Log: The blobs are now stored and loaded. If the input file for the attr store is seekable we load the blobs on demand, and as we do this in pages we don't even need much more memory (currently I'm using 4 pages at 32KB each, so the constant memory overhead for all authors and descriptions and other blobs is only 128Kb per attr store). And it isn't even slow :-) Modified: trunk/sat-solver/tools/attr_store.c trunk/sat-solver/tools/attr_store_p.h trunk/sat-solver/tools/dumpattr.c Modified: trunk/sat-solver/tools/attr_store.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/attr_store.c?re… ============================================================================== --- trunk/sat-solver/tools/attr_store.c (original) +++ trunk/sat-solver/tools/attr_store.c Wed Oct 31 05:11:20 2007 @@ -265,10 +265,27 @@ { if (((s->blob_next_free + BLOB_BLOCK) & ~BLOB_BLOCK) != ((s->blob_next_free + len + BLOB_BLOCK) & ~BLOB_BLOCK)) - s->blob_store = xrealloc (s->blob_store, (s->blob_next_free + len + BLOB_BLOCK) & ~BLOB_BLOCK); + { + unsigned int blobsz = (s->blob_next_free + len + BLOB_BLOCK) &~BLOB_BLOCK; + s->blob_store = xrealloc (s->blob_store, blobsz); + } memcpy (s->blob_store + s->blob_next_free, ptr, len); add_attr_chunk (s, entry, name, s->blob_next_free, len); s->blob_next_free += len; + + unsigned int npages = (s->blob_next_free + BLOB_PAGESIZE - 1) / BLOB_PAGESIZE; + if (npages != s->num_pages) + { + Attrblobpage *p; + s->pages = xrealloc (s->pages, npages * sizeof (s->pages[0])); + for (p = s->pages + s->num_pages; s->num_pages < npages; + p++, s->num_pages++) + { + p->mapped_at = s->num_pages * BLOB_PAGESIZE; + p->file_offset = 0; + p->file_size = 0; + } + } } void @@ -343,11 +360,148 @@ } } +/* Make sure all pages from PSTART to PEND (inclusive) are loaded, + and are consecutive. Return a pointer to the mapping of PSTART. */ +static const void * +load_page_range (Attrstore *s, unsigned int pstart, unsigned int pend) +{ + unsigned int i; + + /* Quick check in case all pages are there already and consecutive. */ + for (i = pstart; i <= pend; i++) + if (s->pages[i].mapped_at == -1 + || (i > pstart + && s->pages[i].mapped_at + != s->pages[i-1].mapped_at + BLOB_PAGESIZE)) + break; + if (i > pend) + return s->blob_store + s->pages[pstart].mapped_at; + + /* Ensure that we can map the numbers of pages we need at all. */ + if (pend - pstart + 1 > s->ncanmap) + { + unsigned int oldcan = s->ncanmap; + s->ncanmap = pend - pstart + 1; + if (s->ncanmap < 4) + s->ncanmap = 4; + s->mapped = xrealloc (s->mapped, s->ncanmap * sizeof (s->mapped[0])); + memset (s->mapped + oldcan, 0, (s->ncanmap - oldcan) * sizeof (s->mapped[0])); + s->blob_store = xrealloc (s->blob_store, s->ncanmap * BLOB_PAGESIZE); + fprintf (stderr, "PAGE: can map %d pages\n", s->ncanmap); + } + + /* Now search for "cheap" space in our store. Space is cheap if it's either + free (very cheap) or contains pages we search for anyway. */ + + /* Setup cost array. */ + unsigned int cost[s->ncanmap]; + for (i = 0; i < s->ncanmap; i++) + { + unsigned int pnum = s->mapped[i]; + if (pnum == 0) + cost[i] = 0; + else + { + pnum--; + Attrblobpage *p = s->pages + pnum; + assert (p->mapped_at != -1); + if (pnum >= pstart && pnum <= pend) + cost[i] = 1; + else + cost[i] = 3; + } + } + + /* And search for cheapest space. */ + unsigned int best_cost = -1; + unsigned int best = 0; + for (i = 0; i + pend - pstart < s->ncanmap; i++) + { + unsigned int c = cost[i]; + unsigned int j; + for (j = 0; j < pend - pstart + 1; j++) + c += cost[i+j]; + if (c < best_cost) + best_cost = c, best = i; + /* A null cost won't become better. */ + if (c == 0) + break; + } + + /* So we want to map our pages from [best] to [best+pend-pstart]. + Use a very simple strategy, which doesn't make the best use of + our resources, but works. Throw away all pages in that range + (even ours) then copy around ours (in case they were outside the + range) or read them in. */ + for (i = best; i < best + pend - pstart + 1; i++) + { + unsigned int pnum = s->mapped[i]; + if (pnum-- + /* If this page is exactly at the right place already, + no need to evict it. */ + && pnum != pstart + i - best) + { + /* Evict this page. */ + fprintf (stderr, "PAGE: evict page %d from %d\n", pnum, i); + cost[i] = 0; + s->mapped[i] = 0; + s->pages[pnum].mapped_at = -1; + } + } + + /* Everything is free now. Read in the pages we want. */ + for (i = pstart; i <= pend; i++) + { + Attrblobpage *p = s->pages + i; + unsigned int pnum = i - pstart + best; + void *dest = s->blob_store + pnum * BLOB_PAGESIZE; + if (p->mapped_at != -1) + { + if (p->mapped_at != pnum * BLOB_PAGESIZE) + { + fprintf (stderr, "PAGECOPY: %d to %d\n", i, pnum); + /* Still mapped somewhere else, so just copy it from there. */ + memcpy (dest, s->blob_store + p->mapped_at, BLOB_PAGESIZE); + s->mapped[p->mapped_at / BLOB_PAGESIZE] = 0; + } + } + else + { + fprintf (stderr, "PAGEIN: %d to %d\n", i, pnum); + /* Not mapped, so read in this page. */ + if (fseek (s->file, p->file_offset, SEEK_SET) < 0) + { + perror ("mapping fseek"); + exit (1); + } + if (fread (dest, p->file_size, 1, s->file) != 1) + { + perror ("mapping fread"); + exit (1); + } + } + p->mapped_at = pnum * BLOB_PAGESIZE; + s->mapped[pnum] = i + 1; + } + + return s->blob_store + best * BLOB_PAGESIZE; +} + const void * attr_retrieve_blob (Attrstore *s, unsigned int ofs, unsigned int len) { + if (s->file) + { + /* Paging! Yeah! */ + unsigned int pstart = ofs / BLOB_PAGESIZE; + unsigned int pend = (ofs + len - 1) / BLOB_PAGESIZE; + const void *m = load_page_range (s, pstart, pend); + return m + (ofs & (BLOB_PAGESIZE - 1)); + } if (!s->blob_store) return 0; + if (ofs >= s->blob_next_free) + return 0; return s->blob_store + ofs; } @@ -520,9 +674,20 @@ fprintf (stderr, "%d\n", s->attr_next_free); fprintf (stderr, "%d\n", s->abbr_next_free * sizeof(s->abbr[0])); fprintf (stderr, "%d\n", s->flat_abbr_next_free * sizeof(s->flat_abbr[0])); + fprintf (stderr, "pages %d\n", s->num_pages); s->packed = 1; } +/* Pages in all blob pages, and deactivates paging. */ +static void +pagein_all (Attrstore *s) +{ + /* If we have no backing file everything is there already. */ + if (!s->file) + return; + /*fprintf (stderr, "Aieee!\n"); + exit (1);*/ +} void attr_store_unpack (Attrstore *s) @@ -531,6 +696,8 @@ if (!s->packed) return; + pagein_all (s); + /* Make the store writable right away, so we can use our adder functions. */ s->packed = 0; s->attrs = xcalloc (s->entries, sizeof (s->attrs[0])); @@ -630,6 +797,79 @@ } } +static void +write_pages (FILE *fp, Attrstore *s) +{ + unsigned int i; + unsigned char *buf[BLOB_PAGESIZE]; + + /* The compressed pages in the file have different sizes, so we need + to store these sizes somewhere, either in front of all page data, + interleaved with the page data (in front of each page), or after + the page data. At this point we don't yet know the final compressed + sizes. These are the pros and cons: + * in front of all page data + + when reading back we only have to read this header, and know + where every page data is placed + - we have to compress all pages first before starting to write them. + Our output stream might be unseekable, so we can't simply + reserve space for the header, write all pages and then update the + header. This needs memory for all compressed pages at once. + * interleaved with page data + + we can compress and write per page, low memory overhead + - when reading back we have to read at least those numbers, + thereby either having to read all page data, or at least seek + over it. + * after all page data + + we can do streamed writing, remembering the sizes per page, + and emitting the header (which is a footer then) at the end + - reading back is hardest: before the page data we don't know + how long it is overall, so we have to put that information + also at the end, but it needs a determinate position, so can + only be at a known offset from the end. But that means that + we must be able to seek when reading back. We have this + wish anyway in case we want to use on-demand paging then, but + it's optional. + + Of all these it seems the best good/bad ratio is with the interleaved + storage. No memory overhead at writing and no unreasonable limitations + for read back. */ + write_u32 (fp, s->blob_next_free); + write_u32 (fp, BLOB_PAGESIZE); + assert (((s->blob_next_free + BLOB_PAGESIZE - 1) / BLOB_PAGESIZE) == s->num_pages); + for (i = 0; i < s->num_pages; i++) + { + unsigned int in_len; + unsigned int out_len; + const void *in; + if (i == s->num_pages - 1) + in_len = s->blob_next_free & (BLOB_PAGESIZE - 1); + else + in_len = BLOB_PAGESIZE; + if (in_len) + { + in = attr_retrieve_blob (s, i * BLOB_PAGESIZE, in_len); + //out_len = lzf_compress (in, in_len, buf, in_len - 1); + out_len = 0; + if (!out_len) + { + memcpy (buf, in, in_len); + out_len = in_len; + } + } + else + out_len = 0; + fprintf (stderr, "page %d: %d -> %d\n", i, in_len, out_len); + write_u32 (fp, out_len); + if (out_len + && fwrite (buf, out_len, 1, fp) != 1) + { + perror("write error"); + exit(1); + } + } +} + void write_attr_store (FILE *fp, Attrstore *s) { @@ -689,6 +929,8 @@ perror ("write error"); exit (1); } + + write_pages (fp, s); } static unsigned int @@ -753,6 +995,105 @@ exit(1); } +/* Try to either setup on-demand paging (using FP as backing + file), or in case that doesn't work (FP not seekable) slurps in + all pages and deactivates paging. */ +static void +read_or_setup_pages (FILE *fp, Attrstore *s) +{ + unsigned int blobsz; + unsigned int pagesz; + unsigned int npages; + unsigned int i; + unsigned int can_seek; + long cur_file_ofs; + //unsigned char buf[BLOB_PAGESIZE]; + blobsz = read_u32 (fp); + pagesz = read_u32 (fp); + if (pagesz != BLOB_PAGESIZE) + { + /* We could handle this by slurping in everything. */ + fprintf (stderr, "non matching page size\n"); + exit (1); + } + can_seek = 1; + if ((cur_file_ofs = ftell (fp)) < 0) + can_seek = 0; + clearerr (fp); + fprintf (stderr, "can %sseek\n", can_seek ? "" : "NOT "); + npages = (blobsz + BLOB_PAGESIZE - 1) / BLOB_PAGESIZE; + + s->num_pages = npages; + s->pages = xmalloc (npages * sizeof (s->pages[0])); + + /* If we can't seek on our input we have to slurp in everything. */ + if (!can_seek) + { + s->blob_next_free = blobsz; + s->blob_store = xrealloc (s->blob_store, (s->blob_next_free + BLOB_BLOCK) &~BLOB_BLOCK); + } + for (i = 0; i < npages; i++) + { + unsigned int in_len = read_u32 (fp); + Attrblobpage *p = s->pages + i; + fprintf (stderr, "page %d: len %d\n", i, in_len); + if (can_seek) + { + cur_file_ofs += 4; + p->mapped_at = -1; + p->file_offset = cur_file_ofs; + p->file_size = in_len; + if (fseek (fp, in_len, SEEK_CUR) < 0) + { + perror ("fseek"); + fprintf (stderr, "can't seek after we thought we can\n"); + /* We can't fall back to non-seeking behaviour as we already + read over some data pages without storing them away. */ + exit (1); + } + cur_file_ofs += in_len; + } + else + { + p->mapped_at = i * BLOB_PAGESIZE; + p->file_offset = 0; + p->file_size = 0; + /* We can't seek, so suck everything in. */ + if (fread (s->blob_store + i * BLOB_PAGESIZE, in_len, 1, fp) != 1) + { + perror ("fread"); + exit (1); + } + } + } + + if (can_seek) + { + /* If we are here we were able to seek to all page + positions, so activate paging by copying FP into our structure. + We dup() the file, so that our callers can fclose() it and we + still have it open. But this means that we share file positions + with the input filedesc. So in case our caller reads it after us, + and calls back into us we might change the file position unexpectedly + to him. */ + int fd = dup (fileno (fp)); + if (fd < 0) + { + /* Jeez! What a bloody system, we can't dup() anymore. */ + perror ("dup"); + exit (1); + } + /* XXX we don't close this yet anywhere. */ + s->file = fdopen (fd, "r"); + if (!s->file) + { + /* My God! What happened now? */ + perror ("fdopen"); + exit (1); + } + } +} + Attrstore * attr_store_read (FILE *fp, Pool *pool) { @@ -860,6 +1201,8 @@ add_elem (s->abbr, s->abbr_next_free, abbi + 1, ABBR_BLOCK); assert (s->flat_abbr[abbi] == 0); + read_or_setup_pages (fp, s); + s->packed = 1; free (buf); Modified: trunk/sat-solver/tools/attr_store_p.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/attr_store_p.h?… ============================================================================== --- trunk/sat-solver/tools/attr_store_p.h (original) +++ trunk/sat-solver/tools/attr_store_p.h Wed Oct 31 05:11:20 2007 @@ -23,6 +23,20 @@ } v; } LongNV; +#define BLOB_PAGEBITS 15 +#define BLOB_PAGESIZE (1 << BLOB_PAGEBITS) + +typedef struct _Attrblobpage +{ + /* mapped_at == -1 --> not loaded, otherwise offset into + store->blob_store. The size of the mapping is BLOB_PAGESIZE + except for the last page. */ + unsigned int mapped_at; + long file_offset; + /* file_size == 0 means the page is not backed by some file storage. */ + long file_size; +} Attrblobpage; + struct _Attrstore { Pool *pool; @@ -32,6 +46,13 @@ Id *nameids; char *blob_store; unsigned int blob_next_free; + Attrblobpage *pages; + unsigned int num_pages; + FILE *file; + /* mapped[i] is zero if nothing is mapped at logical page I, + otherwise it contains the pagenumber plus one (of the mapped page). */ + unsigned int *mapped; + unsigned int nmapped, ncanmap; Offset *strings; int nstrings; Modified: trunk/sat-solver/tools/dumpattr.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/dumpattr.c?rev=… ============================================================================== --- trunk/sat-solver/tools/dumpattr.c (original) +++ trunk/sat-solver/tools/dumpattr.c Wed Oct 31 05:11:20 2007 @@ -26,7 +26,13 @@ fprintf (stdout, "id %u\n", ai.as_id); break; case ATTR_CHUNK: - fprintf (stdout, "blob %u+%u\n", ai.as_chunk[0], ai.as_chunk[1]); + { + const char *str = attr_retrieve_blob (s, ai.as_chunk[0], ai.as_chunk[1]); + if (str) + fprintf (stdout, "blob %s\n", str); + else + fprintf (stdout, "blob %u+%u\n", ai.as_chunk[0], ai.as_chunk[1]); + } break; case ATTR_STRING: fprintf (stdout, "str %s\n", ai.as_string); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0