December 2007 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r8139 - in /trunk/sat-solver/tools: repo_rpmdb.c repo_rpmdb.h rpmdb2solv.c
by kkaempf＠svn.opensuse.org 22 Dec '07

22 Dec '07

Author: kkaempf Date: Sat Dec 22 09:17:02 2007 New Revision: 8139 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8139&view=rev Log: prepare to pass rootdir for reading rpmdb from other directory (unfinished) Modified: trunk/sat-solver/tools/repo_rpmdb.c trunk/sat-solver/tools/repo_rpmdb.h trunk/sat-solver/tools/rpmdb2solv.c Modified: trunk/sat-solver/tools/repo_rpmdb.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_rpmdb.c?re… ============================================================================== --- trunk/sat-solver/tools/repo_rpmdb.c (original) +++ trunk/sat-solver/tools/repo_rpmdb.c Sat Dec 22 09:17:02 2007 @@ -511,7 +511,7 @@ */ void -repo_add_rpmdb(Repo *repo, Repo *ref) +repo_add_rpmdb(Repo *repo, Repo *ref, const char *rootdir) { Pool *pool = repo->pool; unsigned char buf[16]; Modified: trunk/sat-solver/tools/repo_rpmdb.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_rpmdb.h?re… ============================================================================== --- trunk/sat-solver/tools/repo_rpmdb.h (original) +++ trunk/sat-solver/tools/repo_rpmdb.h Sat Dec 22 09:17:02 2007 @@ -5,4 +5,4 @@ * for further information */ -extern void repo_add_rpmdb(Repo *repo, Repo *ref); +extern void repo_add_rpmdb(Repo *repo, Repo *ref, const char *rootdir); Modified: trunk/sat-solver/tools/rpmdb2solv.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/rpmdb2solv.c?re… ============================================================================== --- trunk/sat-solver/tools/rpmdb2solv.c (original) +++ trunk/sat-solver/tools/rpmdb2solv.c Sat Dec 22 09:17:02 2007 @@ -44,7 +44,7 @@ } repo = repo_create(pool, "installed"); - repo_add_rpmdb(repo, ref); + repo_add_rpmdb(repo, ref, "/"); if (ref) { if (ref->pool != pool) -- 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] r8138 - in /trunk/sat-solver/bindings: ruby/tests/relation.rb ruby/tests/solvable.rb satsolver.i
by kkaempf＠svn.opensuse.org 21 Dec '07

21 Dec '07

Author: kkaempf Date: Fri Dec 21 20:21:39 2007 New Revision: 8138 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8138&view=rev Log: Add public constructor, compare and match for Relation with testcase Added: trunk/sat-solver/bindings/ruby/tests/relation.rb Modified: trunk/sat-solver/bindings/ruby/tests/solvable.rb trunk/sat-solver/bindings/satsolver.i Added: trunk/sat-solver/bindings/ruby/tests/relation.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/r… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/relation.rb (added) +++ trunk/sat-solver/bindings/ruby/tests/relation.rb Fri Dec 21 20:21:39 2007 @@ -0,0 +1,28 @@ +$: << "../../../build/bindings/ruby" +# test Relation +require 'test/unit' +require 'SatSolver' + +class SolvableTest < Test::Unit::TestCase + def setup + @pool = SatSolver::Pool.new + assert @pool + @repo = SatSolver::Repo.new( @pool, "test" ) + assert @repo + @pool.arch = "i686" + @repo.add_solv( "../../../testsuite/data.libzypp/basic-exercises/exercise-1-packages.solv" ) + assert @repo.size > 0 + end + def test_relation + rel = SatSolver::Relation.new( @pool, "A", SatSolver::REL_EQ, "1.0-0" ) + puts "Relation: #{rel}" + @repo.each_solvable{ |s| + s.provides.each { |p| + res1 = (p <=> rel) + puts "#{p} cmp #{rel} => #{res1}" + res2 = (p =~ rel) + puts "#{p} match #{rel} => #{res1}" + } + } + end +end Modified: trunk/sat-solver/bindings/ruby/tests/solvable.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/s… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/solvable.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/solvable.rb Fri Dec 21 20:21:39 2007 @@ -13,7 +13,9 @@ i += 1 end # does not work yet - deps.each { |d| puts d } + deps.each { |d| + puts "#{d.name} #{d.op} #{d.evr}" + } end class SolvableTest < Test::Unit::TestCase 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 Fri Dec 21 20:21:39 2007 @@ -256,8 +256,24 @@ /* Relation */ %extend Relation { + %constant int REL_GT = 1; + %constant int REL_EQ = 2; + %constant int REL_LT = 4; + %constant int REL_AND = 16; + %constant int REL_OR = 17; + %constant int REL_WITH = 18; + %constant int REL_NAMESPACE = 18; Relation( Id id, Pool *pool) { return relation_new( id, pool ); } + Relation( Pool *pool, const char *name, int op = 0, const char *evr = NULL ) + { + Id name_id = str2id( pool, name, 1 ); + Id evr_id = 0; + if (evr) + evr_id = str2id( pool, evr, 1 ); + Id rel = rel2id( pool, name_id, evr_id, op, 1 ); + return relation_new( rel, pool ); + } ~Relation() { free( $self ); } %rename("to_s") asString(); @@ -266,7 +282,30 @@ return dep2str( $self->pool, $self->id ); } const char *name() - { return id2str( $self->pool, $self->id ); } + { + Reldep *rd = GETRELDEP( $self->pool, $self->id ); + return id2str( $self->pool, rd->name ); + } + const char *evr() + { + Reldep *rd = GETRELDEP( $self->pool, $self->id ); + return id2str( $self->pool, rd->evr ); + } + int op() + { + Reldep *rd = GETRELDEP( $self->pool, $self->id ); + return rd->flags; + } +#if defined(SWIGRUBY) + %alias cmp "<=>"; +#endif + int cmp( const Relation *r ) + { return evrcmp( $self->pool, $self->id, r->id, EVRCMP_COMPARE ); } +#if defined(SWIGRUBY) + %alias match "=~"; +#endif + int match( const Relation *r ) + { return evrcmp( $self->pool, $self->id, r->id, EVRCMP_MATCH_RELEASE ) == 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] r8137 - in /trunk/sat-solver/bindings: ruby/tests/repo.rb ruby/tests/solvable.rb satsolver.i
by kkaempf＠svn.opensuse.org 21 Dec '07

21 Dec '07

Author: kkaempf Date: Fri Dec 21 19:41:09 2007 New Revision: 8137 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8137&view=rev Log: fix Dependency.each Modified: trunk/sat-solver/bindings/ruby/tests/repo.rb trunk/sat-solver/bindings/ruby/tests/solvable.rb trunk/sat-solver/bindings/satsolver.i Modified: trunk/sat-solver/bindings/ruby/tests/repo.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/r… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/repo.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/repo.rb Fri Dec 21 19:41:09 2007 @@ -22,4 +22,16 @@ puts repo.name puts repo.size end + def test_deps + pool = SatSolver::Pool.new + assert pool + repo = SatSolver::Repo.new( pool, "test" ) + assert repo + pool.arch = "i686" + puts repo.add_solv( "../../../testsuite/data.libzypp/basic-exercises/exercise-1-packages.solv" ) + repo.each_solvable{ |s| + puts s + } + assert true + end end Modified: trunk/sat-solver/bindings/ruby/tests/solvable.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/s… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/solvable.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/solvable.rb Fri Dec 21 19:41:09 2007 @@ -13,7 +13,7 @@ i += 1 end # does not work yet -# deps.each { |d| puts d } + deps.each { |d| puts d } end class SolvableTest < Test::Unit::TestCase 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 Fri Dec 21 19:41:09 2007 @@ -146,7 +146,7 @@ int installable( Solvable *s ) { return pool_installable( $self,s ); } - /* without the %rename, swig converts it to id_2solvable. Ouch! */ + /* without the %rename, swig converts it to 'id_2solvable'. Ouch! */ %rename( "id2solvable" ) id2solvable( Id p ); Solvable *id2solvable(Id p) { return pool_id2solvable( $self, p ); } @@ -235,7 +235,7 @@ Id p; for (p = 0, s = $self->pool->solvables + $self->start; p < $self->nsolvables; p++, s++) { - if (!s->name) + if (!s) continue; rb_yield( SWIG_NewPointerObj((void*) s, SWIGTYPE_p__Solvable, 0) ); } @@ -292,7 +292,7 @@ if ($self->relation) { Id *ids = $self->solvable->repo->idarraydata + $self->relation; while (*ids) { - rb_yield( SWIG_NewPointerObj((void*) *ids, SWIGTYPE_p__Relation, 0) ); + rb_yield( SWIG_NewPointerObj((void*) relation_new( *ids, $self->solvable->repo->pool ), SWIGTYPE_p__Relation, 0) ); ++ids; } } -- 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] r8136 - in /trunk/sat-solver: src/evr.c src/evr.h src/pool.c src/pool.h testsuite/deptestomatic.c testsuite/yps.c
by mlschroe＠svn.opensuse.org 21 Dec '07

21 Dec '07

Author: mlschroe Date: Fri Dec 21 19:16:33 2007 New Revision: 8136 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8136&view=rev Log: - add evrmatch - first shot at adding file provides Modified: trunk/sat-solver/src/evr.c trunk/sat-solver/src/evr.h trunk/sat-solver/src/pool.c trunk/sat-solver/src/pool.h trunk/sat-solver/testsuite/deptestomatic.c trunk/sat-solver/testsuite/yps.c Modified: trunk/sat-solver/src/evr.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/evr.c?rev=8136&r1… ============================================================================== --- trunk/sat-solver/src/evr.c (original) +++ trunk/sat-solver/src/evr.c Fri Dec 21 19:16:33 2007 @@ -167,4 +167,52 @@ return r; } +int +evrmatch(Pool *pool, Id evrid, const char *epoch, const char *version, const char *release) +{ + const char *evr1; + const char *s1; + const char *r1; + int r; + + evr1 = id2str(pool, evrid); + for (s1 = evr1; *s1 >= '0' && *s1 <= '9'; s1++) + ; + if (s1 != evr1 && *s1 == ':') + { + if (epoch) + { + r = vercmp(evr1, s1, epoch, epoch + strlen(epoch)); + if (r) + return r; + } + evr1 = s1 + 1; + } + else if (epoch) + { + while (*epoch == '0') + epoch++; + if (*epoch) + return -1; + } + for (s1 = evr1, r1 = 0; *s1; s1++) + if (*s1 == '-') + r1 = s1; + if (version) + { + r = vercmp(evr1, r1 ? r1 : s1, version, version + strlen(version)); + if (r) + return r; + } + if (release) + { + if (!r1) + return -1; + r = vercmp(r1 + 1, s1, release, release + strlen(release)); + if (r) + return r; + } + return 0; +} + // EOF Modified: trunk/sat-solver/src/evr.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/evr.h?rev=8136&r1… ============================================================================== --- trunk/sat-solver/src/evr.h (original) +++ trunk/sat-solver/src/evr.h Fri Dec 21 19:16:33 2007 @@ -25,6 +25,7 @@ extern int vercmp(const char *s1, const char *q1, const char *s2, const char *q2); extern int evrcmp(Pool *pool, Id evr1id, Id evr2id, int mode); +extern int evrmatch(Pool *pool, Id evrid, const char *epoch, const char *version, const char *release); #ifdef __cplusplus } Modified: trunk/sat-solver/src/pool.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/pool.c?rev=8136&r… ============================================================================== --- trunk/sat-solver/src/pool.c (original) +++ trunk/sat-solver/src/pool.c Fri Dec 21 19:16:33 2007 @@ -24,6 +24,7 @@ #include "poolid_private.h" #include "poolarch.h" #include "util.h" +#include "bitmap.h" #include "evr.h" #define SOLVABLE_BLOCK 255 @@ -626,5 +627,132 @@ pool->debugmask = mask; } +/*************************************************************************/ + +struct searchfiles { + const char **files; + int nfiles; +}; + +#define SEARCHFILES_BLOCK 127 + +static void +pool_addfileprovides_dep(Pool *pool, Id *ida, Map *seen, struct searchfiles *sf) +{ + Id dep, sid; + const char *s; + + while ((dep = *ida++) != 0) + { + while (ISRELDEP(dep)) + { + Reldep *rd; + sid = pool->ss.nstrings + GETRELID(dep); + if (MAPTST(seen, sid)) + { + dep = 0; + break; + } + MAPSET(seen, sid); + rd = GETRELDEP(pool, dep); + if (rd->flags < 8) + dep = rd->name; + else if (rd->flags == REL_NAMESPACE) + { + if (rd->name == NAMESPACE_INSTALLED) + { + dep = 0; /* for now */ + break; + } + dep = rd->evr; + } + else + { + Id ids[2]; + ids[0] = rd->name; + ids[1] = 0; + pool_addfileprovides_dep(pool, ids, seen, sf); + dep = rd->evr; + } + } + if (!dep) + continue; + if (MAPTST(seen, dep)) + continue; + MAPSET(seen, dep); + s = id2str(pool, dep); + if (*s != '/') + continue; + if ((sf->nfiles & SEARCHFILES_BLOCK) == 0) + sf->files = xrealloc2(sf->files, sf->nfiles + (SEARCHFILES_BLOCK + 1), sizeof(const char *)); + sf->files[sf->nfiles++] = strdup(s); + } +} + +#if 0 +static int +addfileprovides_cb(void *data, Solvable *s, Id key, const char *str) +{ + Pool *pool = s->repo->pool; + Id id; + id = str2id(pool, str, 0); + if (!id) + return 0; /* can't happen */ + s->provides = repo_addid_dep(s->repo, s->provides, id, SOLVABLE_FILEMARKER); + return 0; +} +#endif + +void +pool_addfileprovides(Pool *pool) +{ + Solvable *s; + Repo *repo; + Map seen; + struct searchfiles sf; + int i; + + map_init(&seen, pool->ss.nstrings + pool->nrels); + memset(&sf, 0, sizeof(sf)); + + for (i = 1, s = pool->solvables + i; i < pool->nsolvables; i++, s++) + { + repo = s->repo; + if (!repo) + continue; + if (s->obsoletes) + pool_addfileprovides_dep(pool, repo->idarraydata + s->obsoletes, &seen, &sf); + if (s->conflicts) + pool_addfileprovides_dep(pool, repo->idarraydata + s->conflicts, &seen, &sf); + if (s->requires) + pool_addfileprovides_dep(pool, repo->idarraydata + s->requires, &seen, &sf); + if (s->recommends) + pool_addfileprovides_dep(pool, repo->idarraydata + s->recommends, &seen, &sf); + if (s->suggests) + pool_addfileprovides_dep(pool, repo->idarraydata + s->suggests, &seen, &sf); + if (s->supplements) + pool_addfileprovides_dep(pool, repo->idarraydata + s->supplements, &seen, &sf); + if (s->enhances) + pool_addfileprovides_dep(pool, repo->idarraydata + s->enhances, &seen, &sf); + if (s->freshens) + pool_addfileprovides_dep(pool, repo->idarraydata + s->freshens, &seen, &sf); + } + map_free(&seen); + POOL_DEBUG(SAT_DEBUG_STATS, "found %d file dependencies\n", sf.nfiles); + if (!sf.nfiles) + return; +#if 0 + for (i = 0; i < sf.nfiles; i++) + POOL_DEBUG(SAT_DEBUG_STATS, "looking up %s in filelist\n", sf.files[i]); +#endif + if ((sf.nfiles & SEARCHFILES_BLOCK) == 0) + sf.files = xrealloc2(sf.files, sf.nfiles + (SEARCHFILES_BLOCK + 1), sizeof(const char *)); + sf.files[sf.nfiles++] = 0; +#if 0 + pool_search(0, SOLVABLE_FILELIST, (const char *)sf.files, SEARCH_STRING|SEARCH_MULTIPLE, addfileprovides_cb, 0); +#endif + xfree(sf.files); + pool_freewhatprovides(pool); /* as we have added provides */ +} // EOF Modified: trunk/sat-solver/src/pool.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/pool.h?rev=8136&r… ============================================================================== --- trunk/sat-solver/src/pool.h (original) +++ trunk/sat-solver/src/pool.h Fri Dec 21 19:16:33 2007 @@ -207,6 +207,7 @@ * Prepares a pool for solving */ extern void pool_createwhatprovides(Pool *pool); +extern void pool_addfileprovides(Pool *pool); extern void pool_freewhatprovides(Pool *pool); extern Id pool_queuetowhatprovides(Pool *pool, Queue *q); 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 Fri Dec 21 19:16:33 2007 @@ -1201,6 +1201,7 @@ else pool_setarch( pd->pool, "i686" ); + pool_addfileprovides( pd->pool ); pool_createwhatprovides( pd->pool ); if (redcarpet) pool->promoteepoch = 1; Modified: trunk/sat-solver/testsuite/yps.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/yps.c?rev=8… ============================================================================== --- trunk/sat-solver/testsuite/yps.c (original) +++ trunk/sat-solver/testsuite/yps.c Fri Dec 21 19:16:33 2007 @@ -145,7 +145,11 @@ exit(1); } system = repo_create(pool, "system"); - repo_add_solv(system, fp); + if (repo_add_solv(system, fp)) + { + fprintf(stderr, "could not add system repository\n"); + exit(1); + } channel = 0; fclose(fp); @@ -161,7 +165,11 @@ exit(1); } channel = repo_create(pool, argv[1]); - repo_add_solv(channel, fp); + if (repo_add_solv(channel, fp)) + { + fprintf(stderr, "could not add repository %s\n", argv[1]); + exit(1); + } fclose(fp); argv++; argc--; @@ -183,6 +191,7 @@ queue_push(&job, id); } + pool_addfileprovides(pool); pool_createwhatprovides(pool); pool->promoteepoch = 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] r8135 - in /trunk/sat-solver: src/repo.c src/repo.h tools/repo_content.c tools/repo_helix.c tools/repo_patchxml.c tools/repo_rpmmd.c tools/repo_susetags.c
by mlschroe＠svn.opensuse.org 21 Dec '07

21 Dec '07

Author: mlschroe Date: Fri Dec 21 15:42:40 2007 New Revision: 8135 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8135&view=rev Log: - fix bug in repo_addid_dep - make repo_addid_dep handle different markers, so that we can add the file provides with SOLVABLE_FILEMARKER Modified: trunk/sat-solver/src/repo.c trunk/sat-solver/src/repo.h trunk/sat-solver/tools/repo_content.c trunk/sat-solver/tools/repo_helix.c trunk/sat-solver/tools/repo_patchxml.c trunk/sat-solver/tools/repo_rpmmd.c trunk/sat-solver/tools/repo_susetags.c Modified: trunk/sat-solver/src/repo.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/repo.c?rev=8135&r… ============================================================================== --- trunk/sat-solver/src/repo.c (original) +++ trunk/sat-solver/src/repo.c Fri Dec 21 15:42:40 2007 @@ -118,23 +118,27 @@ /* - * add dependency (as Id) to repo + * add dependency (as Id) to repo, also unifies dependencies * olddeps = offset into idarraydata - * isreq = 0 for normal dep - * isreq = 1 for requires - * isreq = 2 for pre-requires + * marker= 0 for normal dep + * marker > 0 add dep after marker + * marker < 0 add dep after -marker * */ - Offset -repo_addid_dep(Repo *repo, Offset olddeps, Id id, int isreq) +repo_addid_dep(Repo *repo, Offset olddeps, Id id, Id marker) { - Id oid, *oidp, *marker = 0; + Id oid, *oidp, *markerp; + int before; if (!olddeps) - return repo_addid(repo, olddeps, id); + { + if (marker > 0) + olddeps = repo_addid(repo, olddeps, marker); + return repo_addid(repo, olddeps, id); + } - if (!isreq) + if (!marker) { for (oidp = repo->idarraydata + olddeps; (oid = *oidp) != ID_NULL; oidp++) { @@ -144,45 +148,55 @@ return repo_addid(repo, olddeps, id); } + before = 0; + markerp = 0; + if (marker < 0) + { + before = 1; + marker = -marker; + } for (oidp = repo->idarraydata + olddeps; (oid = *oidp) != ID_NULL; oidp++) { - if (oid == SOLVABLE_PREREQMARKER) - marker = oidp; + if (oid == marker) + markerp = oidp; else if (oid == id) break; } if (oid) { - if (marker || isreq == 1) + if (markerp || before) return olddeps; - marker = oidp++; + /* we found it, but in the wrong half */ + markerp = oidp++; for (; (oid = *oidp) != ID_NULL; oidp++) - if (oid == SOLVABLE_PREREQMARKER) + if (oid == marker) break; if (!oid) { + /* no marker in array yet */ oidp--; - if (marker < oidp) - memmove(marker, marker + 1, (oidp - marker) * sizeof(Id)); - *oidp = SOLVABLE_PREREQMARKER; + if (markerp < oidp) + memmove(markerp, markerp + 1, (oidp - markerp) * sizeof(Id)); + *oidp = marker; return repo_addid(repo, olddeps, id); } while (oidp[1]) oidp++; - memmove(marker, marker + 1, (oidp - marker) * sizeof(Id)); + memmove(markerp, markerp + 1, (oidp - markerp) * sizeof(Id)); *oidp = id; return olddeps; } - if (isreq == 2 && !marker) - olddeps = repo_addid(repo, olddeps, SOLVABLE_PREREQMARKER); - else if (isreq == 1 && marker) + /* id not yet in array */ + if (!before && !markerp) + olddeps = repo_addid(repo, olddeps, marker); + else if (before && markerp) { - *marker++ = id; + *markerp++ = id; id = *--oidp; - if (marker < oidp) - memmove(marker + 1, marker, (oidp - marker) * sizeof(Id)); - *marker = SOLVABLE_PREREQMARKER; + if (markerp < oidp) + memmove(markerp + 1, markerp, (oidp - markerp) * sizeof(Id)); + *markerp = marker; } return repo_addid(repo, olddeps, id); } Modified: trunk/sat-solver/src/repo.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/repo.h?rev=8135&r… ============================================================================== --- trunk/sat-solver/src/repo.h (original) +++ trunk/sat-solver/src/repo.h Fri Dec 21 15:42:40 2007 @@ -108,7 +108,7 @@ extern void repo_freeallrepos(Pool *pool, int reuseids); extern Offset repo_addid(Repo *repo, Offset olddeps, Id id); -extern Offset repo_addid_dep(Repo *repo, Offset olddeps, Id id, int isreq); +extern Offset repo_addid_dep(Repo *repo, Offset olddeps, Id id, Id marker); extern Offset repo_reserve_ids(Repo *repo, Offset olddeps, int num); extern Offset repo_fix_legacy(Repo *repo, Offset provides, Offset supplements); 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 Fri Dec 21 15:42:40 2007 @@ -104,7 +104,7 @@ } static unsigned int -adddep(Pool *pool, struct parsedata *pd, unsigned int olddeps, char *line, int isreq) +adddep(Pool *pool, struct parsedata *pd, unsigned int olddeps, char *line, Id marker) { int flags, words; Id id, evrid; @@ -152,7 +152,7 @@ if (words == 3) line = sp[2], words = 2; } - olddeps = repo_addid_dep(pd->repo, olddeps, id, isreq); + olddeps = repo_addid_dep(pd->repo, olddeps, id, marker); if (!line) break; } @@ -235,9 +235,9 @@ arch. We don't know the latter here, though. */ s->arch = ARCH_NOARCH; else if (istag ("PREREQUIRES")) - s->requires = adddep(pool, &pd, s->requires, value, 2); + s->requires = adddep(pool, &pd, s->requires, value, SOLVABLE_PREREQMARKER); else if (istag ("REQUIRES")) - s->requires = adddep(pool, &pd, s->requires, value, 1); + s->requires = adddep(pool, &pd, s->requires, value, -SOLVABLE_PREREQMARKER); else if (istag ("PROVIDES")) s->provides = adddep(pool, &pd, s->provides, value, 0); else if (istag ("CONFLICTS")) Modified: trunk/sat-solver/tools/repo_helix.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_helix.c?re… ============================================================================== --- trunk/sat-solver/tools/repo_helix.c (original) +++ trunk/sat-solver/tools/repo_helix.c Fri Dec 21 15:42:40 2007 @@ -296,11 +296,12 @@ static unsigned int adddep(Pool *pool, Parsedata *pd, unsigned int olddeps, const char **atts, int isreq) { - Id id, name; + Id id, name, marker; const char *n, *f, *k; const char **a; n = f = k = NULL; + marker = isreq ? -SOLVABLE_PREREQMARKER : 0; /* loop over name,value pairs */ for (a = atts; *a; a += 2) @@ -312,7 +313,7 @@ else if (!strcmp(*a, "op")) f = a[1]; else if (isreq && !strcmp(*a, "pre") && a[1][0] == '1') - isreq = 2; + marker = SOLVABLE_PREREQMARKER; } if (!n) /* quit if no name found */ return olddeps; @@ -332,9 +333,10 @@ sprintf(pd->content, "%s:%s", k, n); name = str2id(pool, pd->content, 1); } - else { + else + { name = str2id(pool, n, 1); /* package: just intern <name> */ - } + } if (f) /* operator ? */ { @@ -357,7 +359,7 @@ id = name; /* no operator */ /* add new dependency to repo */ - return repo_addid_dep(pd->repo, olddeps, id, isreq); + return repo_addid_dep(pd->repo, olddeps, id, marker); } Modified: trunk/sat-solver/tools/repo_patchxml.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_patchxml.c… ============================================================================== --- trunk/sat-solver/tools/repo_patchxml.c (original) +++ trunk/sat-solver/tools/repo_patchxml.c Fri Dec 21 15:42:40 2007 @@ -184,11 +184,12 @@ static unsigned int adddep(Pool *pool, struct parsedata *pd, unsigned int olddeps, const char **atts, int isreq) { - Id id, name; + Id id, name, marker; const char *n, *f, *k; const char **a; n = f = k = 0; + marker = isreq ? -SOLVABLE_PREREQMARKER : 0; for (a = atts; *a; a += 2) { if (!strcmp(*a, "name")) @@ -198,7 +199,7 @@ else if (!strcmp(*a, "kind")) k = a[1]; else if (isreq && !strcmp(*a, "pre") && a[1][0] == '1') - isreq = 2; + marker = SOLVABLE_PREREQMARKER; } if (!n) return olddeps; @@ -232,7 +233,7 @@ #if 0 fprintf(stderr, "new dep %s%s%s\n", id2str(pool, d), id2rel(pool, d), id2evr(pool, d)); #endif - return repo_addid_dep(pd->repo, olddeps, id, isreq); + return repo_addid_dep(pd->repo, olddeps, id, marker); } Modified: trunk/sat-solver/tools/repo_rpmmd.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_rpmmd.c?re… ============================================================================== --- trunk/sat-solver/tools/repo_rpmmd.c (original) +++ trunk/sat-solver/tools/repo_rpmmd.c Fri Dec 21 15:42:40 2007 @@ -181,11 +181,12 @@ static unsigned int adddep(Pool *pool, struct parsedata *pd, unsigned int olddeps, const char **atts, int isreq) { - Id id, name; + Id id, name, marker; const char *n, *f, *k; const char **a; n = f = k = 0; + marker = isreq ? -SOLVABLE_PREREQMARKER : 0; for (a = atts; *a; a += 2) { if (!strcmp(*a, "name")) @@ -195,7 +196,7 @@ else if (!strcmp(*a, "kind")) k = a[1]; else if (isreq && !strcmp(*a, "pre") && a[1][0] == '1') - isreq = 2; + marker = SOLVABLE_PREREQMARKER; } if (!n) return olddeps; @@ -229,7 +230,7 @@ #if 0 fprintf(stderr, "new dep %s%s%s\n", id2str(pool, d), id2rel(pool, d), id2evr(pool, d)); #endif - return repo_addid_dep(pd->repo, olddeps, id, isreq); + return repo_addid_dep(pd->repo, olddeps, id, marker); } Modified: trunk/sat-solver/tools/repo_susetags.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_susetags.c… ============================================================================== --- trunk/sat-solver/tools/repo_susetags.c (original) +++ trunk/sat-solver/tools/repo_susetags.c Fri Dec 21 15:42:40 2007 @@ -106,7 +106,7 @@ } static unsigned int -adddep(Pool *pool, struct parsedata *pd, unsigned int olddeps, char *line, int isreq, char *kind) +adddep(Pool *pool, struct parsedata *pd, unsigned int olddeps, char *line, Id marker, char *kind) { int i, flags; Id id, evrid; @@ -135,7 +135,7 @@ } id = rel2id(pool, id, evrid, flags + 1, 1); } - return repo_addid_dep(pd->repo, olddeps, id, isreq); + return repo_addid_dep(pd->repo, olddeps, id, marker); } Attrstore *attr; @@ -512,13 +512,13 @@ s->provides = adddep(pool, &pd, s->provides, line, 0, pd.kind); continue; case CTAG('=', 'R', 'e', 'q'): - s->requires = adddep(pool, &pd, s->requires, line, 1, pd.kind); + s->requires = adddep(pool, &pd, s->requires, line, -SOLVABLE_PREREQMARKER, pd.kind); continue; case CTAG('=', 'P', 'r', 'q'): if (pd.kind) s->requires = adddep(pool, &pd, s->requires, line, 0, 0); else - s->requires = adddep(pool, &pd, s->requires, line, 2, 0); + s->requires = adddep(pool, &pd, s->requires, line, SOLVABLE_PREREQMARKER, 0); continue; case CTAG('=', 'O', 'b', 's'): s->obsoletes = adddep(pool, &pd, s->obsoletes, line, 0, pd.kind); -- 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] r8134 - in /trunk/sat-solver: src/attr_store.c src/attr_store.h src/attr_store_p.h tools/repo_susetags.c
by matz＠svn.opensuse.org 21 Dec '07

21 Dec '07

Author: matz Date: Fri Dec 21 12:58:38 2007 New Revision: 8134 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8134&view=rev Log: Improve the page eviction a bit. Add possibility to merge attributes between entities, use it to handle =Shr susetags headers. Modified: trunk/sat-solver/src/attr_store.c trunk/sat-solver/src/attr_store.h trunk/sat-solver/src/attr_store_p.h trunk/sat-solver/tools/repo_susetags.c Modified: trunk/sat-solver/src/attr_store.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/attr_store.c?rev=… ============================================================================== --- trunk/sat-solver/src/attr_store.c (original) +++ trunk/sat-solver/src/attr_store.c Fri Dec 21 12:58:38 2007 @@ -30,7 +30,7 @@ #include "fastlz.c" -/*#define DEBUG_PAGING*/ +/* #define DEBUG_PAGING */ #define BLOB_BLOCK 65535 @@ -272,6 +272,42 @@ add_attr (s, entry, nv); } +void +merge_attrs (Attrstore *s, unsigned dest, unsigned src) +{ + LongNV *nv; + ensure_entry (s, dest); + nv = s->attrs[src]; + if (nv) + { + for (; nv->key; nv++) + if (!find_attr (s, dest, s->keys[nv->key].name)) + switch (s->keys[nv->key].type) + { + case TYPE_ATTR_INTLIST: + { + unsigned len = 0; + while (nv->v.intlist[len]) + add_attr_intlist_int (s, dest, s->keys[nv->key].name, nv->v.intlist[len++]); + } + break; + case TYPE_ATTR_LOCALIDS: + { + unsigned len = 0; + while (nv->v.localids[len]) + add_attr_localids_id (s, dest, s->keys[nv->key].name, nv->v.localids[len++]); + } + break; + case TYPE_ATTR_STRING: + add_attr_string (s, dest, s->keys[nv->key].name, nv->v.str); + break; + default: + add_attr (s, dest, *nv); + break; + } + } +} + #define pool_debug(a,b,...) fprintf (stderr, __VA_ARGS__) static Id read_id (FILE *fp, Id max); @@ -423,6 +459,7 @@ /* And search for cheapest space. */ unsigned int best_cost = -1; unsigned int best = 0; + unsigned int same_cost = 0; for (i = 0; i + pend - pstart < s->ncanmap; i++) { unsigned int c = cost[i]; @@ -431,10 +468,16 @@ c += cost[i+j]; if (c < best_cost) best_cost = c, best = i; + else if (c == best_cost) + same_cost++; /* A null cost won't become better. */ if (c == 0) break; } + /* If all places have the same cost we would thrash on slot 0. Avoid + this by doing a round-robin strategy in this case. */ + if (same_cost == s->ncanmap - pend + pstart - 1) + best = s->rr_counter++ % (s->ncanmap - pend + pstart); /* 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 Modified: trunk/sat-solver/src/attr_store.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/attr_store.h?rev=… ============================================================================== --- trunk/sat-solver/src/attr_store.h (original) +++ trunk/sat-solver/src/attr_store.h Fri Dec 21 12:58:38 2007 @@ -39,6 +39,7 @@ void add_attr_intlist_int (Attrstore *s, unsigned int entry, Id name, int val); void add_attr_localids_id (Attrstore *s, unsigned int entry, Id name, LocalId id); void add_attr_void (Attrstore *s, unsigned int entry, Id name); +void merge_attrs (Attrstore *s, unsigned dest, unsigned src); const void * attr_retrieve_blob (Attrstore *s, unsigned int ofs, unsigned int len); Modified: trunk/sat-solver/src/attr_store_p.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/attr_store_p.h?re… ============================================================================== --- trunk/sat-solver/src/attr_store_p.h (original) +++ trunk/sat-solver/src/attr_store_p.h Fri Dec 21 12:58:38 2007 @@ -53,6 +53,7 @@ otherwise it contains the pagenumber plus one (of the mapped page). */ unsigned int *mapped; unsigned int nmapped, ncanmap; + unsigned int rr_counter; Stringpool ss; Modified: trunk/sat-solver/tools/repo_susetags.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_susetags.c… ============================================================================== --- trunk/sat-solver/tools/repo_susetags.c (original) +++ trunk/sat-solver/tools/repo_susetags.c Fri Dec 21 12:58:38 2007 @@ -45,6 +45,8 @@ char **sources; int nsources; int last_found_source; + char **share_with; + int nshare; }; static Id @@ -598,9 +600,18 @@ add_attr_blob (attr, last_found_pack, id_messagedel, line + 6, strlen (line + 6) + 1); continue; case CTAG('=', 'S', 'h', 'r'): - /* XXX Not yet handled. Two possibilities: either include all - referenced data verbatim here, or write out the sharing - information. */ + if (last_found_pack >= pd.nshare) + { + if (pd.share_with) + { + pd.share_with = realloc (pd.share_with, (last_found_pack + 256) * sizeof (*pd.share_with)); + memset (pd.share_with + pd.nshare, 0, (last_found_pack + 256 - pd.nshare) * sizeof (*pd.share_with)); + } + else + pd.share_with = calloc (last_found_pack + 256, sizeof (*pd.share_with)); + pd.nshare = last_found_pack + 256; + } + pd.share_with[last_found_pack] = strdup (line + 6); continue; case CTAG('=', 'V', 'e', 'r'): last_found_pack = 0; @@ -615,7 +626,7 @@ if (pd.sources) { - int i; + int i, last_found; for (i = 0; i < pd.nsources; i++) if (pd.sources[i]) { @@ -623,6 +634,41 @@ free (pd.sources[i]); } free (pd.sources); + + last_found = 0; + for (i = 0; i < pd.nshare; i++) + if (pd.share_with[i]) + { + if (split(pd.share_with[i], sp, 5) != 4) + { + fprintf(stderr, "Bad =Shr line: %s\n", pd.share_with[i]); + exit(1); + } + + Id name = str2id(pool, sp[0], 1); + Id evr = makeevr(pool, join(&pd, sp[1], "-", sp[2])); + Id arch = str2id(pool, sp[3], 1); + unsigned n, nn; + Solvable *found = 0; + for (n = repo->start, nn = repo->start + last_found; + n < repo->end; n++, nn++) + { + if (nn >= repo->end) + nn = repo->start; + found = pool->solvables + nn; + if (found->repo == repo + && found->name == name + && found->evr == evr + && found->arch == arch) + { + last_found = nn - repo->start; + break; + } + } + if (n != repo->end) + merge_attrs (attr, i, last_found); + } + free (pd.share_with); } if (pd.tmp) free(pd.tmp); -- 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] r8133 - /trunk/sat-solver/tools/repo_susetags.c
by matz＠svn.opensuse.org 21 Dec '07

21 Dec '07

Author: matz Date: Fri Dec 21 11:13:29 2007 New Revision: 8133 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8133&view=rev Log: Let's not compare strings in an if-cascade or lookup the same names all the time. Modified: trunk/sat-solver/tools/repo_susetags.c Modified: trunk/sat-solver/tools/repo_susetags.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_susetags.c… ============================================================================== --- trunk/sat-solver/tools/repo_susetags.c (original) +++ trunk/sat-solver/tools/repo_susetags.c Fri Dec 21 11:13:29 2007 @@ -137,6 +137,24 @@ } Attrstore *attr; +static Id id_authors; +static Id id_description; +static Id id_downloadsize; +static Id id_eula; +static Id id_group; +static Id id_installsize; +static Id id_keywords; +static Id id_license; +static Id id_messagedel; +static Id id_messageins; +static Id id_mediadir; +static Id id_mediafile; +static Id id_medianr; +static Id id_nosource; +static Id id_source; +static Id id_sourceid; +static Id id_summary; +static Id id_time; static void add_location (char *line, Solvable *s, unsigned entry) @@ -159,9 +177,9 @@ { /* medianr filename dir don't optimize this one */ - add_attr_special_int (attr, entry, str2id (pool, "medianr", 1), atoi (sp[0])); - add_attr_localids_id (attr, entry, str2id (pool, "mediadir", 1), str2localid (attr, sp[2], 1)); - add_attr_string (attr, entry, str2id (pool, "mediafile", 1), sp[1]); + add_attr_special_int (attr, entry, id_medianr, atoi (sp[0])); + add_attr_localids_id (attr, entry, id_mediadir, str2localid (attr, sp[2], 1)); + add_attr_string (attr, entry, id_mediafile, sp[1]); return; } else @@ -190,13 +208,13 @@ break; if (*n2 || strcmp (n1, ".rpm")) goto nontrivial; - add_attr_special_int (attr, entry, str2id (pool, "medianr", 1), medianr); - add_attr_void (attr, entry, str2id (pool, "mediafile", 1)); + add_attr_special_int (attr, entry, id_medianr, medianr); + add_attr_void (attr, entry, id_mediafile); return; nontrivial: - add_attr_special_int (attr, entry, str2id (pool, "medianr", 1), medianr); - add_attr_string (attr, entry, str2id (pool, "mediafile", 1), sp[1]); + add_attr_special_int (attr, entry, id_medianr, medianr); + add_attr_string (attr, entry, id_mediafile, sp[1]); return; } } @@ -222,8 +240,7 @@ (src or nosrc), code only that fact. */ if (s->name == name && s->evr == evr && (arch == ARCH_SRC || arch == ARCH_NOSRC)) - add_attr_void (attr, entry, - str2id (pool, arch == ARCH_SRC ? "source" : "nosource", 1)); + add_attr_void (attr, entry, arch == ARCH_SRC ? id_source : id_nosource); else if (first) { if (entry >= pd->nsources) @@ -265,16 +282,30 @@ } } if (n != repo->end) - add_attr_intlist_int (attr, entry, str2id (pool, "sourceid", 1), nn - repo->start); + add_attr_intlist_int (attr, entry, id_sourceid, nn - repo->start); else { - add_attr_localids_id (attr, entry, str2id (pool, "source", 1), str2localid (attr, sp[0], 1)); - add_attr_localids_id (attr, entry, str2id (pool, "source", 1), str2localid (attr, join (pd, sp[1], "-", sp[2]), 1)); - add_attr_localids_id (attr, entry, str2id (pool, "source", 1), str2localid (attr, sp[3], 1)); + add_attr_localids_id (attr, entry, id_source, str2localid (attr, sp[0], 1)); + add_attr_localids_id (attr, entry, id_source, str2localid (attr, join (pd, sp[1], "-", sp[2]), 1)); + add_attr_localids_id (attr, entry, id_source, str2localid (attr, sp[3], 1)); } } } +/* Unfortunately "a"[0] is no constant expression in the C languages, + so we need to pass the four characters individually :-/ */ +#define CTAG(a,b,c,d) ((unsigned)(((unsigned char)a) << 24) \ + | ((unsigned char)b << 16) \ + | ((unsigned char)c << 8) \ + | ((unsigned char)d)) + +static inline unsigned +tag_from_string (char *cs) +{ + unsigned char *s = (unsigned char*) cs; + return ((s[0] << 24) | (s[1] << 16) | (s[2] << 8) | s[3]); +} + void repo_add_susetags(Repo *repo, FILE *fp, Id vendor, int with_attr) { @@ -290,7 +321,28 @@ struct parsedata pd; if (with_attr) - attr = new_store(pool); + { + attr = new_store(pool); + id_authors = str2id (pool, "authors", 1); + id_description = str2id (pool, "description", 1); + id_downloadsize = str2id (pool, "downloadsize", 1); + id_eula = str2id (pool, "eula", 1); + id_group = str2id (pool, "group", 1); + id_installsize = str2id (pool, "installsize", 1); + id_keywords = str2id (pool, "keywords", 1); + id_license = str2id (pool, "license", 1); + id_messagedel = str2id (pool, "messagedel", 1); + id_messageins = str2id (pool, "messageins", 1); + id_mediadir = str2id (pool, "mediadir", 1); + id_mediafile = str2id (pool, "mediafile", 1); + id_medianr = str2id (pool, "medianr", 1); + id_nosource = str2id (pool, "nosource", 1); + id_source = str2id (pool, "source", 1); + id_sourceid = str2id (pool, "sourceid", 1); + id_summary = str2id (pool, "summary", 1); + id_time = str2id (pool, "time", 1); + } + memset(&pd, 0, sizeof(pd)); line = malloc(1024); aline = 1024; @@ -302,6 +354,7 @@ for (;;) { + unsigned tag; if (linep - line + 16 > aline) { aline = linep - line; @@ -351,14 +404,17 @@ exit(1); } intag = tagend - (line + 1); - if (!strncmp (line, "+Des:", 5) - || !strncmp (line, "+Eul:", 5) - || !strncmp (line, "+Ins:", 5) - || !strncmp (line, "+Del:", 5) - || !strncmp (line, "+Aut:", 5)) - cummulate = 1; - else - cummulate = 0; + cummulate = 0; + switch (tag_from_string (line)) + { + case CTAG('+', 'D', 'e', 's'): + case CTAG('+', 'E', 'u', 'l'): + case CTAG('+', 'I', 'n', 's'): + case CTAG('+', 'D', 'e', 'l'): + case CTAG('+', 'A', 'u', 't'): + if (line[4] == ':') + cummulate = 1; + } line[0] = '='; line[intag + 2] = ' '; linep = line + intag + 3; @@ -366,8 +422,12 @@ } if (*line == '#' || !*line) continue; + if (! (line[0] && line[1] && line[2] && line[3] && line[4] == ':')) + continue; + tag = tag_from_string (line); if (indesc < 2 - && (!strncmp(line, "=Pkg:", 5) || !strncmp(line, "=Pat:", 5))) + && (tag == CTAG('=', 'P', 'k', 'g') + || tag == CTAG('=', 'P', 'a', 't'))) { if (s && s->arch != ARCH_SRC && s->arch != ARCH_NOSRC) s->provides = repo_addid_dep(repo, s->provides, rel2id(pool, s->name, s->evr, REL_EQ, 1), 0); @@ -393,7 +453,8 @@ continue; } if (indesc == 2 - && (!strncmp(line, "=Pkg:", 5) || !strncmp(line, "=Pat:", 5))) + && (tag == CTAG('=', 'P', 'k', 'g') + || tag == CTAG('=', 'P', 'a', 't'))) { Id name, evr, arch; int n, nn; @@ -412,7 +473,7 @@ name = str2id(pool, sp[0], 0); evr = makeevr(pool, join(&pd, sp[1], "-", sp[2])); arch = str2id(pool, sp[3], 0); - /* If we found neither the name or the arch at all in this repo + /* If we found neither the name nor the arch at all in this repo there's no chance of finding the exact solvable either. */ if (!name || !arch) continue; @@ -443,167 +504,108 @@ fprintf (stderr, "Huh?\n"); continue; } - if (!strncmp(line, "=Prv:", 5)) - { - s->provides = adddep(pool, &pd, s->provides, line, 0, pd.kind); - continue; - } - if (!strncmp(line, "=Req:", 5)) - { - s->requires = adddep(pool, &pd, s->requires, line, 1, pd.kind); - continue; - } - if (!strncmp(line, "=Prq:", 5)) - { - if (pd.kind) - s->requires = adddep(pool, &pd, s->requires, line, 0, 0); - else - s->requires = adddep(pool, &pd, s->requires, line, 2, 0); - continue; - } - if (!strncmp(line, "=Obs:", 5)) - { - s->obsoletes = adddep(pool, &pd, s->obsoletes, line, 0, pd.kind); - continue; - } - if (!strncmp(line, "=Con:", 5)) - { - s->conflicts = adddep(pool, &pd, s->conflicts, line, 0, pd.kind); - continue; - } - if (!strncmp(line, "=Rec:", 5)) - { - s->recommends = adddep(pool, &pd, s->recommends, line, 0, pd.kind); - continue; - } - if (!strncmp(line, "=Sup:", 5)) - { - s->supplements = adddep(pool, &pd, s->supplements, line, 0, pd.kind); - continue; - } - if (!strncmp(line, "=Enh:", 5)) - { - s->enhances = adddep(pool, &pd, s->enhances, line, 0, pd.kind); - continue; - } - if (!strncmp(line, "=Sug:", 5)) - { - s->suggests = adddep(pool, &pd, s->suggests, line, 0, pd.kind); - continue; - } - if (!strncmp(line, "=Fre:", 5)) - { - s->freshens = adddep(pool, &pd, s->freshens, line, 0, pd.kind); - continue; - } - if (!strncmp(line, "=Prc:", 5)) - { - s->recommends = adddep(pool, &pd, s->recommends, line, 0, 0); - continue; - } - if (!strncmp(line, "=Psg:", 5)) - { - s->suggests = adddep(pool, &pd, s->suggests, line, 0, 0); - continue; + switch (tag) + { + case CTAG('=', 'P', 'r', 'v'): + s->provides = adddep(pool, &pd, s->provides, line, 0, pd.kind); + continue; + case CTAG('=', 'R', 'e', 'q'): + s->requires = adddep(pool, &pd, s->requires, line, 1, pd.kind); + continue; + case CTAG('=', 'P', 'r', 'q'): + if (pd.kind) + s->requires = adddep(pool, &pd, s->requires, line, 0, 0); + else + s->requires = adddep(pool, &pd, s->requires, line, 2, 0); + continue; + case CTAG('=', 'O', 'b', 's'): + s->obsoletes = adddep(pool, &pd, s->obsoletes, line, 0, pd.kind); + continue; + case CTAG('=', 'C', 'o', 'n'): + s->conflicts = adddep(pool, &pd, s->conflicts, line, 0, pd.kind); + continue; + case CTAG('=', 'R', 'e', 'c'): + s->recommends = adddep(pool, &pd, s->recommends, line, 0, pd.kind); + continue; + case CTAG('=', 'S', 'u', 'p'): + s->supplements = adddep(pool, &pd, s->supplements, line, 0, pd.kind); + continue; + case CTAG('=', 'E', 'n', 'h'): + s->enhances = adddep(pool, &pd, s->enhances, line, 0, pd.kind); + continue; + case CTAG('=', 'S', 'u', 'g'): + s->suggests = adddep(pool, &pd, s->suggests, line, 0, pd.kind); + continue; + case CTAG('=', 'F', 'r', 'e'): + s->freshens = adddep(pool, &pd, s->freshens, line, 0, pd.kind); + continue; + case CTAG('=', 'P', 'r', 'c'): + s->recommends = adddep(pool, &pd, s->recommends, line, 0, 0); + continue; + case CTAG('=', 'P', 's', 'g'): + s->suggests = adddep(pool, &pd, s->suggests, line, 0, 0); + continue; } if (!with_attr) continue; - if (!strncmp(line, "=Grp:", 5)) - { - ensure_entry (attr, last_found_pack); - add_attr_localids_id (attr, last_found_pack, str2id (pool, "group", 1), str2localid (attr, line + 6, 1)); - continue; - } - if (!strncmp(line, "=Lic:", 5)) + switch (tag) { - ensure_entry (attr, last_found_pack); - add_attr_localids_id (attr, last_found_pack, str2id (pool, "license", 1), str2localid (attr, line + 6, 1)); - continue; - } - if (!strncmp(line, "=Loc:", 5)) - { - ensure_entry (attr, last_found_pack); - add_location (line + 6, s, last_found_pack); - continue; - } - if (!strncmp(line, "=Src:", 5)) - { - ensure_entry (attr, last_found_pack); - add_source (line + 6, &pd, s, last_found_pack, 1); - continue; - } - if (!strncmp(line, "=Siz:", 5)) - { - ensure_entry (attr, last_found_pack); - if (split (line + 6, sp, 3) == 2) + case CTAG('=', 'G', 'r', 'p'): + add_attr_localids_id (attr, last_found_pack, id_group, str2localid (attr, line + 6, 1)); + continue; + case CTAG('=', 'L', 'i', 'c'): + add_attr_localids_id (attr, last_found_pack, id_license, str2localid (attr, line + 6, 1)); + continue; + case CTAG('=', 'L', 'o', 'c'): + add_location (line + 6, s, last_found_pack); + continue; + case CTAG('=', 'S', 'r', 'c'): + add_source (line + 6, &pd, s, last_found_pack, 1); + continue; + case CTAG('=', 'S', 'i', 'z'): + if (split (line + 6, sp, 3) == 2) + { + add_attr_int (attr, last_found_pack, id_downloadsize, (atoi (sp[0]) + 1023) / 1024); + add_attr_int (attr, last_found_pack, id_installsize, (atoi (sp[1]) + 1023) / 1024); + } + continue; + case CTAG('=', 'T', 'i', 'm'): { - add_attr_int (attr, last_found_pack, str2id (pool, "downloadsize", 1), (atoi (sp[0]) + 1023) / 1024); - add_attr_int (attr, last_found_pack, str2id (pool, "installsize", 1), (atoi (sp[1]) + 1023) / 1024); + unsigned int t = atoi (line + 6); + if (t) + add_attr_int (attr, last_found_pack, id_time, t); } - continue; - } - if (!strncmp(line, "=Tim:", 5)) - { - ensure_entry (attr, last_found_pack); - unsigned int t = atoi (line + 6); - if (t) - add_attr_int (attr, last_found_pack, str2id (pool, "time", 1), t); - continue; - } - if (!strncmp(line, "=Kwd:", 5)) - { - ensure_entry (attr, last_found_pack); - add_attr_localids_id (attr, last_found_pack, str2id (pool, "keywords", 1), str2localid (attr, line + 6, 1)); - continue; - } - if (!strncmp(line, "=Aut:", 5)) - { - ensure_entry (attr, last_found_pack); - add_attr_blob (attr, last_found_pack, str2id (pool, "authors", 1), line + 6, strlen (line + 6) + 1); - continue; - } - if (!strncmp(line, "=Sum:", 5)) - { - ensure_entry (attr, last_found_pack); - add_attr_string (attr, last_found_pack, str2id (pool, "summary", 1), line + 6); - continue; - } - if (!strncmp(line, "=Des:", 5)) - { - ensure_entry (attr, last_found_pack); - add_attr_blob (attr, last_found_pack, str2id (pool, "description", 1), line + 6, strlen (line + 6) + 1); - continue; - } - if (!strncmp(line, "=Eul:", 5)) - { - ensure_entry (attr, last_found_pack); - add_attr_blob (attr, last_found_pack, str2id (pool, "eula", 1), line + 6, strlen (line + 6) + 1); - continue; - } - if (!strncmp(line, "=Ins:", 5)) - { - ensure_entry (attr, last_found_pack); - add_attr_blob (attr, last_found_pack, str2id (pool, "messageins", 1), line + 6, strlen (line + 6) + 1); - continue; - } - if (!strncmp(line, "=Del:", 5)) - { - ensure_entry (attr, last_found_pack); - add_attr_blob (attr, last_found_pack, str2id (pool, "messagedel", 1), line + 6, strlen (line + 6) + 1); - continue; - } - if (!strncmp(line, "=Shr:", 5)) - { - /* XXX Not yet handled. Two possibilities: either include all - referenced data verbatim here, or write out the sharing - information. */ - continue; - } - if (!strncmp(line, "=Ver:", 5)) - { - last_found_pack = 0; - indesc++; - continue; + continue; + case CTAG('=', 'K', 'w', 'd'): + add_attr_localids_id (attr, last_found_pack, id_keywords, str2localid (attr, line + 6, 1)); + continue; + case CTAG('=', 'A', 'u', 't'): + add_attr_blob (attr, last_found_pack, id_authors, line + 6, strlen (line + 6) + 1); + continue; + case CTAG('=', 'S', 'u', 'm'): + add_attr_string (attr, last_found_pack, id_summary, line + 6); + continue; + case CTAG('=', 'D', 'e', 's'): + add_attr_blob (attr, last_found_pack, id_description, line + 6, strlen (line + 6) + 1); + continue; + case CTAG('=', 'E', 'u', 'l'): + add_attr_blob (attr, last_found_pack, id_eula, line + 6, strlen (line + 6) + 1); + continue; + case CTAG('=', 'I', 'n', 's'): + add_attr_blob (attr, last_found_pack, id_messageins, line + 6, strlen (line + 6) + 1); + continue; + case CTAG('=', 'D', 'e', 'l'): + add_attr_blob (attr, last_found_pack, id_messagedel, line + 6, strlen (line + 6) + 1); + continue; + case CTAG('=', 'S', 'h', 'r'): + /* XXX Not yet handled. Two possibilities: either include all + referenced data verbatim here, or write out the sharing + information. */ + continue; + case CTAG('=', 'V', 'e', 'r'): + last_found_pack = 0; + indesc++; + continue; } } if (s && s->arch != ARCH_SRC && s->arch != ARCH_NOSRC) -- 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] r8132 - in /trunk/sat-solver/bindings: ruby/tests/solvable.rb satsolver.i
by kkaempf＠svn.opensuse.org 21 Dec '07

21 Dec '07

Author: kkaempf Date: Fri Dec 21 11:06:50 2007 New Revision: 8132 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8132&view=rev Log: extend bindings further by adding - Solvable with name, evr, arch, vendor and dependencies (-> Dependency) - Dependency a collection of Relation(s) - Relation with name, op, evr Added: trunk/sat-solver/bindings/ruby/tests/solvable.rb Modified: trunk/sat-solver/bindings/satsolver.i Added: trunk/sat-solver/bindings/ruby/tests/solvable.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/s… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/solvable.rb (added) +++ trunk/sat-solver/bindings/ruby/tests/solvable.rb Fri Dec 21 11:06:50 2007 @@ -0,0 +1,46 @@ +$: << "../../../build/bindings/ruby" +# test Solvable +require 'test/unit' +require 'SatSolver' + +def show_dep name, deps + return unless deps + puts "#{deps.size} #{name}: " + i = 0 + while (i < deps.size) + d = deps[i] + puts "#{d.name} : #{d}" + i += 1 + end +# does not work yet +# deps.each { |d| puts d } +end + +class SolvableTest < Test::Unit::TestCase + def setup + @pool = SatSolver::Pool.new + assert @pool + @repo = SatSolver::Repo.new( @pool, "test" ) + assert @repo + @pool.arch = "i686" + @repo.add_solv( "../../../testsuite/data.libzypp/basic-exercises/exercise-1-packages.solv" ) + assert @repo.size > 0 + end + def test_solvable + solv = @repo[0] + assert solv + puts solv + puts "#{solv.id}: #{solv.name}-#{solv.evr}.#{solv.arch}[#{solv.vendor}]" + solv = @pool.id2solvable solv.id + puts "#{solv.id}: #{solv.name}-#{solv.evr}.#{solv.arch}[#{solv.vendor}]" + end + def test_deps + @repo.each_solvable{ |s| + puts s + show_dep "Provides", s.provides + show_dep "Requires", s.requires + show_dep "Obsoletes", s.obsoletes + show_dep "Conflicts", s.conflicts + } + end +end 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 Fri Dec 21 11:06:50 2007 @@ -21,6 +21,35 @@ /*#include <sstream> */ + +typedef struct _Relation { + Offset id; + Pool *pool; +} Relation; +static Relation *relation_new( Id id, Pool *pool ) +{ + if (!id) return NULL; + Relation *relation = (Relation *)malloc( sizeof( Relation )); + relation->id = id; + relation->pool = pool; + return relation; +} + +/* Collection of Relations -> Dependency */ +typedef struct _Dependency { + Offset relation; /* offset into repo->idarraydata */ + Solvable *solvable; /* solvable this dep belongs to */ +} Dependency; + +static Dependency *dependency_new( Offset relation, Solvable *solvable ) +{ + if (!relation) return NULL; + Dependency *dependency = (Dependency *)malloc( sizeof( Dependency )); + dependency->relation = relation; + dependency->solvable = solvable; + return dependency; +} + %} /*-------------------------------------------------------------*/ @@ -36,22 +65,26 @@ $1 = GetReadFile(fptr); } -%typemap(in) Id { - $1 = (int) NUM2INT($input); -} - -%typemap(in) Offset { - $1 = (unsigned int) NUM2INT($input); -} #endif +typedef int Id; +typedef unsigned int Offset; + %nodefault _Repo; %rename(Repo) _Repo; typedef struct _Repo {} Repo; %nodefault _Solvable; %rename(Solvable) _Solvable; -struct _Solvable {}; +typedef struct _Solvable {} Solvable; + +%nodefault _Relation; +%rename(Relation) _Relation; +typedef struct _Relation {} Relation; + +%nodefault _Dependency; +%rename(Dependency) _Dependency; +typedef struct _Dependency {} Dependency; /*-------------------------------------------------------------*/ /* Pool */ @@ -113,10 +146,10 @@ int installable( Solvable *s ) { return pool_installable( $self,s ); } + /* without the %rename, swig converts it to id_2solvable. Ouch! */ + %rename( "id2solvable" ) id2solvable( Id p ); Solvable *id2solvable(Id p) - { - return pool_id2solvable($self, p); - } + { return pool_id2solvable( $self, p ); } void each_solvable() { @@ -131,7 +164,7 @@ } Solvable * - select_solvable(Repo *repo, char *name) + select_solvable( char *name, Repo *repo = NULL ) { Id id; Queue plist; @@ -195,15 +228,91 @@ { return $self->priority; } Pool *pool() { return $self->pool; } + + void each_solvable() + { + Solvable *s; + Id p; + for (p = 0, s = $self->pool->solvables + $self->start; p < $self->nsolvables; p++, s++) + { + if (!s->name) + continue; + rb_yield( SWIG_NewPointerObj((void*) s, SWIGTYPE_p__Solvable, 0) ); + } + } +#if defined(SWIGRUBY) + /* %rename is rejected by swig for [] */ + %alias get_solvable "[]"; +#endif + Solvable *get_solvable( int i ) + { + if (i < 0) return NULL; + if (i >= $self->nsolvables) return NULL; + return pool_id2solvable( $self->pool, $self->start + i ); + } } -#if 0 +/*-------------------------------------------------------------*/ +/* Relation */ +%extend Relation { + Relation( Id id, Pool *pool) + { return relation_new( id, pool ); } + ~Relation() + { free( $self ); } + %rename("to_s") asString(); + const char *asString() + { + return dep2str( $self->pool, $self->id ); + } + const char *name() + { return id2str( $self->pool, $self->id ); } +} /*-------------------------------------------------------------*/ -/* Solvable */ +/* Dependency */ -%include "solvable.h" +%extend Dependency { + Dependency( Offset offset, Solvable *solvable ) + { return dependency_new( offset, solvable ); } + ~Dependency() + { free( $self ); } + int size() + { + int i = 0; + if ($self->relation) { + Id *ids = $self->solvable->repo->idarraydata + $self->relation; + while (*ids++) + ++i; + } + return i; + } + void each() + { + if ($self->relation) { + Id *ids = $self->solvable->repo->idarraydata + $self->relation; + while (*ids) { + rb_yield( SWIG_NewPointerObj((void*) *ids, SWIGTYPE_p__Relation, 0) ); + ++ids; + } + } + } +#if defined(SWIGRUBY) + /* %rename is rejected by swig for [] */ + %alias get_relation "[]"; +#endif + Relation *get_relation( unsigned int i ) + { + if (!$self->relation) + return NULL; + /* FIXME: check overflow */ + Id *ids = $self->solvable->repo->idarraydata + $self->relation + i; + return relation_new( *ids, $self->solvable->repo->pool ); + } +} + +/*-------------------------------------------------------------*/ +/* Solvable */ %extend Solvable { @@ -213,40 +322,56 @@ return $self - $self->repo->pool->solvables; } - //%typemap(ruby,in) Id { - // $1 = id2str($self->pool, $input); - //} - - //%typemap(ruby,out) Id { - // $result = rb_str_new2(str2id($self->pool,$1)); - //} - - //%rename(name_id) name(); - %ignore name; const char * name() - { return id2str($self->repo->pool, $self->name);} - %ignore arch; + { return id2str( $self->repo->pool, $self->name ); } + Id name_id() + { return $self->name; } const char * arch() - { return id2str($self->repo->pool, $self->arch);} - %ignore evr; + { return id2str( $self->repo->pool, $self->arch ); } + Id arch_id() + { return $self->arch; } const char * evr() - { return id2str($self->repo->pool, $self->evr);} - %ignore vendor; + { return id2str( $self->repo->pool, $self->evr ); } + Id evr_id() + { return $self->evr; } const char * vendor() - { return id2str($self->repo->pool, $self->vendor);} + { return id2str( $self->repo->pool, $self->vendor ); } + Id vendor_id() + { return $self->vendor; } %rename("to_s") asString(); const char * asString() { if ( !$self->repo ) return "<UNKNOWN>"; - return solvable2str($self->repo->pool, $self); + return solvable2str( $self->repo->pool, $self ); } + /* + * Dependencies + */ + Dependency *provides() + { return dependency_new( $self->provides, $self ); } + Dependency *requires() + { return dependency_new( $self->requires, $self ); } + Dependency *conflicts() + { return dependency_new( $self->conflicts, $self ); } + Dependency *obsoletes() + { return dependency_new( $self->obsoletes, $self ); } + Dependency *recommends() + { return dependency_new( $self->recommends, $self ); } + Dependency *suggests() + { return dependency_new( $self->suggests, $self ); } + Dependency *supplements() + { return dependency_new( $self->supplements, $self ); } + Dependency *enhances() + { return dependency_new( $self->enhances, $self ); } } /*-------------------------------------------------------------*/ +#if 0 + %include "poolid.h" %include "pooltypes.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] r8131 - in /trunk/sat-solver/bindings: ruby/CMakeLists.txt ruby/ruby.i ruby/satsolver.rb ruby/tests/ ruby/tests/loading.rb ruby/tests/pool.rb ruby/tests/repo.rb satsolver.i
by kkaempf＠svn.opensuse.org 20 Dec '07

20 Dec '07

Author: kkaempf Date: Thu Dec 20 23:19:47 2007 New Revision: 8131 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8131&view=rev Log: put some love into the bindings - dont generate everything from .h file, but selectively whats actually needed - add test cases for Ruby bindings Added: trunk/sat-solver/bindings/ruby/tests/ trunk/sat-solver/bindings/ruby/tests/loading.rb trunk/sat-solver/bindings/ruby/tests/pool.rb trunk/sat-solver/bindings/ruby/tests/repo.rb Removed: trunk/sat-solver/bindings/ruby/ruby.i trunk/sat-solver/bindings/ruby/satsolver.rb Modified: trunk/sat-solver/bindings/ruby/CMakeLists.txt trunk/sat-solver/bindings/satsolver.i Modified: trunk/sat-solver/bindings/ruby/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/CMakeLi… ============================================================================== --- trunk/sat-solver/bindings/ruby/CMakeLists.txt (original) +++ trunk/sat-solver/bindings/ruby/CMakeLists.txt Thu Dec 20 23:19:47 2007 @@ -1,3 +1,5 @@ +ADD_SUBDIRECTORY(tests) + #SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") @@ -7,30 +9,29 @@ MESSAGE(STATUS "Ruby vendor arch dir: ${RUBY_VENDOR_ARCH_DIR}") MESSAGE(STATUS "Ruby include path: ${RUBY_INCLUDE_PATH}") -SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/libsatsolver_wrap.cxx" ) +SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/libsatsolver_wrap.c" ) SET( SWIG_INPUT "${CMAKE_CURRENT_SOURCE_DIR}/satsolver.i" ) ADD_CUSTOM_COMMAND ( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/libsatsolver_wrap.cxx + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/libsatsolver_wrap.c COMMAND ${CMAKE_COMMAND} -E echo_append "Creating wrapper code for ruby..." - COMMAND ${SWIG_EXECUTABLE} -c++ -ruby -autorename -xmlout ${CMAKE_CURRENT_BINARY_DIR}/parse.xml -o ${CMAKE_CURRENT_BINARY_DIR}/libsatsolver_wrap.cxx -I${CMAKE_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/../satsolver.i + COMMAND ${SWIG_EXECUTABLE} -ruby -autorename -o ${CMAKE_CURRENT_BINARY_DIR}/libsatsolver_wrap.c -I${CMAKE_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/../satsolver.i COMMAND ${CMAKE_COMMAND} -E echo "Done." WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../*.i ${CMAKE_CURRENT_SOURCE_DIR}/*.i + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../*.i ) ADD_CUSTOM_TARGET( glue DEPENDS ${SWIG_OUTPUT} ) -ADD_LIBRARY( satsolverx SHARED "${CMAKE_CURRENT_BINARY_DIR}/libsatsolver_wrap.cxx" ) -SET_TARGET_PROPERTIES( satsolverx PROPERTIES PREFIX "" ) -ADD_DEPENDENCIES( satsolverx glue ) +ADD_LIBRARY( SatSolver SHARED "${CMAKE_CURRENT_BINARY_DIR}/libsatsolver_wrap.c" ) +SET_TARGET_PROPERTIES( SatSolver PROPERTIES PREFIX "" ) +ADD_DEPENDENCIES( SatSolver glue ) INCLUDE_DIRECTORIES( ${RUBY_INCLUDE_PATH} ) -TARGET_LINK_LIBRARIES( satsolverx satsolver ) -TARGET_LINK_LIBRARIES( satsolverx ${RUBY_LIBRARY} ) - -INSTALL(TARGETS satsolverx LIBRARY DESTINATION ${RUBY_VENDOR_ARCH_DIR}) -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/satsolver.rb DESTINATION ${RUBY_VENDORLIB_DIR} ) +TARGET_LINK_LIBRARIES( SatSolver satsolver ) +TARGET_LINK_LIBRARIES( SatSolver ${RUBY_LIBRARY} ) +INSTALL(TARGETS SatSolver LIBRARY DESTINATION ${RUBY_VENDOR_ARCH_DIR}) +#INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/satsolver.rb DESTINATION ${RUBY_VENDORLIB_DIR} ) \ No newline at end of file Added: trunk/sat-solver/bindings/ruby/tests/loading.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/l… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/loading.rb (added) +++ trunk/sat-solver/bindings/ruby/tests/loading.rb Thu Dec 20 23:19:47 2007 @@ -0,0 +1,10 @@ +$: << "../../../build/bindings/ruby" +# test loading of extension +require 'test/unit' + +class LoadTest < Test::Unit::TestCase + def test_loading + require 'SatSolver' + assert true + end +end Added: trunk/sat-solver/bindings/ruby/tests/pool.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/p… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/pool.rb (added) +++ trunk/sat-solver/bindings/ruby/tests/pool.rb Thu Dec 20 23:19:47 2007 @@ -0,0 +1,12 @@ +$: << "../../../build/bindings/ruby" +# test Pool +require 'test/unit' +require 'SatSolver' + +class PoolTest < Test::Unit::TestCase + def test_pool + pool = SatSolver::Pool.new + assert pool + assert pool.repo_count == 0 + end +end Added: trunk/sat-solver/bindings/ruby/tests/repo.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/r… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/repo.rb (added) +++ trunk/sat-solver/bindings/ruby/tests/repo.rb Thu Dec 20 23:19:47 2007 @@ -0,0 +1,25 @@ +$: << "../../../build/bindings/ruby" +# test Repo +require 'test/unit' +require 'SatSolver' + +class RepoTest < Test::Unit::TestCase + def test_repo_create + pool = SatSolver::Pool.new + assert pool + repo = SatSolver::Repo.new( pool, "test" ) + assert repo + assert repo.size == 0 + assert repo.name == "test" + end + def test_repo_add + pool = SatSolver::Pool.new + assert pool + repo = SatSolver::Repo.new( pool, "test" ) + assert repo + pool.arch = "i686" + puts repo.add_solv( "../../../testsuite/data.libzypp/basic-exercises/exercise-1-packages.solv" ) + puts repo.name + puts repo.size + end +end 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 Thu Dec 20 23:19:47 2007 @@ -1,9 +1,7 @@ -%module satsolverx +%module SatSolver %{ -extern "C" -{ #include "ruby.h" #include "rubyio.h" #include "policy.h" @@ -20,11 +18,14 @@ #include "solver.h" #include "repo.h" #include "repo_solv.h" -} -#include <sstream> + +/*#include <sstream> */ %} +/*-------------------------------------------------------------*/ +/* types and typemaps */ + #if defined(SWIGRUBY) %typemap(in) FILE* { OpenFile *fptr; @@ -34,39 +35,84 @@ /*rb_io_check_writable(fptr);*/ $1 = GetReadFile(fptr); } + +%typemap(in) Id { + $1 = (int) NUM2INT($input); +} + +%typemap(in) Offset { + $1 = (unsigned int) NUM2INT($input); +} #endif -%include "bitmap.h" -%include "evr.h" -%include "hash.h" -%include "poolarch.h" +%nodefault _Repo; +%rename(Repo) _Repo; +typedef struct _Repo {} Repo; + +%nodefault _Solvable; +%rename(Solvable) _Solvable; +struct _Solvable {}; + +/*-------------------------------------------------------------*/ +/* Pool */ + +%newobject pool_create; +%delobject pool_free; +typedef struct _Pool {} Pool; +%rename(Pool) _Pool; -%alias Pool::nsolvables "size" -%include "pool.h" -%extend _Pool { +%extend Pool { - _Pool() + /* + * Pool management + */ + + Pool() { return pool_create(); } - ~_Pool() + ~Pool() { pool_free($self); } - void set_arch(const char *arch) - { pool_setarch($self, arch); } +#if defined(SWIGRUBY) + %rename( "arch=" ) set_arch( const char *arch ); +#endif + void set_arch( const char *arch ) + { pool_setarch( $self, arch ); } - int installable(Solvable *s) - { return pool_installable($self,s); } +#if defined(SWIGRUBY) + %rename( "debug=" ) set_debug( int level ); +#endif + void set_debug( int level ) + { pool_setdebuglevel( $self, level ); } void prepare() - { pool_createwhatprovides($self); } + { pool_createwhatprovides( $self ); } + + /* + * Repo management + */ + + int repo_count() + { return $self->nrepos; } void each_repo() { - for (int i = 0; i < $self->nrepos; ++i ) + int i; + for (i = 0; i < $self->nrepos; ++i ) rb_yield(SWIG_NewPointerObj((void*) $self->repos[i], SWIGTYPE_p__Repo, 0)); } + /* + * Solvable management + */ + + int size() + { return $self->nsolvables; } + + int installable( Solvable *s ) + { return pool_installable( $self,s ); } + Solvable *id2solvable(Id p) { return pool_id2solvable($self, p); @@ -121,15 +167,85 @@ return pool->solvables + id; } +} + +/*-------------------------------------------------------------*/ +/* Repo */ + +%extend Repo { + Repo( Pool *pool, const char *reponame ) + { return repo_create( pool, reponame ); } + int add_solv( FILE *fp ) + { return repo_add_solv( $self, fp ); } + int add_solv( const char *fname ) + { + int result = -1; + FILE *fp = fopen( fname, "r"); + if (fp) { + result = repo_add_solv( $self, fp ); + fclose( fp ); + } + return result; + } + int size() + { return $self->nsolvables; } + const char *name() + { return $self->name; } + int priority() + { return $self->priority; } + Pool *pool() + { return $self->pool; } +} + +#if 0 + + +/*-------------------------------------------------------------*/ +/* Solvable */ + +%include "solvable.h" + +%extend Solvable { + + Id id() { + if (!$self->repo) + return 0; + return $self - $self->repo->pool->solvables; + } + + //%typemap(ruby,in) Id { + // $1 = id2str($self->pool, $input); + //} + + //%typemap(ruby,out) Id { + // $result = rb_str_new2(str2id($self->pool,$1)); + //} - Repo* create_repo(const char *reponame) + //%rename(name_id) name(); + %ignore name; + const char * name() + { return id2str($self->repo->pool, $self->name);} + %ignore arch; + const char * arch() + { return id2str($self->repo->pool, $self->arch);} + %ignore evr; + const char * evr() + { return id2str($self->repo->pool, $self->evr);} + %ignore vendor; + const char * vendor() + { return id2str($self->repo->pool, $self->vendor);} + + %rename("to_s") asString(); + const char * asString() { - return repo_create($self, reponame); + if ( !$self->repo ) + return "<UNKNOWN>"; + return solvable2str($self->repo->pool, $self); } -}; -%newobject pool_create; -%delobject pool_free; +} + +/*-------------------------------------------------------------*/ %include "poolid.h" %include "pooltypes.h" @@ -170,39 +286,6 @@ %delobject queue_free; -%include "solvable.h" - -%extend Solvable { - - Id id() { - if (!$self->repo) - return 0; - return $self - $self->repo->pool->solvables; - } - - //%typemap(ruby,in) Id { - // $1 = id2str($self->pool, $input); - //} - - //%typemap(ruby,out) Id { - // $result = rb_str_new2(str2id($self->pool,$1)); - //} - - //%rename(name_id) name(); - %ignore name; - const char * name() - { return id2str($self->repo->pool, $self->name);} - - %rename("to_s") asString(); - const char * asString() - { - if ( $self->repo == NULL ) - return "<UNKNOWN>"; - return solvable2str($self->repo->pool, $self); - } - -} - %include "solver.h" @@ -289,7 +372,4 @@ %include "repo_solv.h" -%typemap(in) Id { - $1 = (int) NUM2INT($input); - printf("Received an integer : %d\n",$1); -} +#endif \ No newline at end of file -- 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] r8130 - /trunk/sat-solver/src/repo.c
by mlschroe＠svn.opensuse.org 20 Dec '07

20 Dec '07

Author: mlschroe Date: Thu Dec 20 22:30:41 2007 New Revision: 8130 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8130&view=rev Log: - some bug fixes + stop handling, nothing fancy Modified: trunk/sat-solver/src/repo.c Modified: trunk/sat-solver/src/repo.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/repo.c?rev=8130&r… ============================================================================== --- trunk/sat-solver/src/repo.c (original) +++ trunk/sat-solver/src/repo.c Thu Dec 20 22:30:41 2007 @@ -527,7 +527,10 @@ if (!dp) return 0; if (key->storage == KEY_STORAGE_INCORE) - return dp; + { + *dpp = data_skip(dp, key->type); + return dp; + } if (key->storage != KEY_STORAGE_VERTICAL_OFFSET) return 0; if (!data->fp) @@ -616,6 +619,10 @@ #endif } +#define SEARCH_NEXT_KEY 1 +#define SEARCH_NEXT_SOLVABLE 2 +#define SEACH_STOP 3 + struct matchdata { Pool *pool; @@ -633,7 +640,7 @@ domatch(Id p, Id key, struct matchdata *md, const char *str) { /* fill match code here */ - md->callback(md->callback_data, md->pool->solvables + p, key, str); + md->stop = md->callback(md->callback_data, md->pool->solvables + p, key, str); } static void @@ -664,6 +671,7 @@ keyp = kp - 1; onekey = 1; } + md->stop = 0; while ((key = *keyp++) != 0) { ddp = get_data(data, data->keys + key, &dp); @@ -686,17 +694,26 @@ ddp = 0; id = (id & 0x3f) | ((id >> 1) & ~0x3f); /* domatch */ + while (md->stop == SEARCH_NEXT_KEY && ddp) + ddp = data_read_id(ddp, &id); break; default: ddp = 0; } } - if (onekey || md->stop) + if (onekey || md->stop > SEARCH_NEXT_KEY) return; } } static void +domatch_idarray(Id p, Id key, struct matchdata *md, Id *ida) +{ + for (; *ida && !md->stop; ida++) + domatch(p, key, md, id2str(md->pool, *ida)); +} + +static void repo_search_md(Repo *repo, Id p, Id key, struct matchdata *md) { Pool *pool = repo->pool; @@ -704,27 +721,98 @@ Solvable *s; int i; + md->stop = 0; if (!p) { for (p = repo->start, s = repo->pool->solvables + p; p < repo->end; p++, s++) - if (s->repo == repo) - repo_search_md(repo, p, key, md); + { + if (s->repo == repo) + repo_search_md(repo, p, key, md); + if (md->stop > SEARCH_NEXT_SOLVABLE) + break; + } return; } s = pool->solvables + p; - if ((!key || key == SOLVABLE_NAME) && s->name) - domatch(p, SOLVABLE_NAME, md, id2str(pool, s->name)); - if ((!key || key == SOLVABLE_ARCH) && s->arch) - domatch(p, SOLVABLE_ARCH, md, id2str(pool, s->arch)); - if ((!key || key == SOLVABLE_EVR) && s->evr) - domatch(p, SOLVABLE_EVR, md, id2str(pool, s->evr)); - if ((!key || key == SOLVABLE_VENDOR) && s->vendor) - domatch(p, SOLVABLE_VENDOR, md, id2str(pool, s->vendor)); + switch(key) + { + case 0: + case SOLVABLE_NAME: + if (s->name) + domatch(p, SOLVABLE_NAME, md, id2str(pool, s->name)); + if (key || md->stop > SEARCH_NEXT_KEY) + return; + case SOLVABLE_ARCH: + if (s->arch) + domatch(p, SOLVABLE_ARCH, md, id2str(pool, s->arch)); + if (key || md->stop > SEARCH_NEXT_KEY) + return; + case SOLVABLE_EVR: + if (s->evr) + domatch(p, SOLVABLE_EVR, md, id2str(pool, s->evr)); + if (key || md->stop > SEARCH_NEXT_KEY) + return; + case SOLVABLE_VENDOR: + if (s->vendor) + domatch(p, SOLVABLE_VENDOR, md, id2str(pool, s->vendor)); + if (key || md->stop > SEARCH_NEXT_KEY) + return; + case SOLVABLE_PROVIDES: + if (s->provides) + domatch_idarray(p, SOLVABLE_PROVIDES, md, repo->idarraydata + s->provides); + if (key || md->stop > SEARCH_NEXT_KEY) + return; + case SOLVABLE_OBSOLETES: + if (s->obsoletes) + domatch_idarray(p, SOLVABLE_OBSOLETES, md, repo->idarraydata + s->obsoletes); + if (key || md->stop > SEARCH_NEXT_KEY) + return; + case SOLVABLE_CONFLICTS: + if (s->obsoletes) + domatch_idarray(p, SOLVABLE_CONFLICTS, md, repo->idarraydata + s->conflicts); + if (key || md->stop > SEARCH_NEXT_KEY) + return; + case SOLVABLE_REQUIRES: + if (s->requires) + domatch_idarray(p, SOLVABLE_REQUIRES, md, repo->idarraydata + s->requires); + if (key || md->stop > SEARCH_NEXT_KEY) + return; + case SOLVABLE_RECOMMENDS: + if (s->recommends) + domatch_idarray(p, SOLVABLE_RECOMMENDS, md, repo->idarraydata + s->recommends); + if (key || md->stop > SEARCH_NEXT_KEY) + return; + case SOLVABLE_SUPPLEMENTS: + if (s->supplements) + domatch_idarray(p, SOLVABLE_SUPPLEMENTS, md, repo->idarraydata + s->supplements); + if (key || md->stop > SEARCH_NEXT_KEY) + return; + case SOLVABLE_SUGGESTS: + if (s->suggests) + domatch_idarray(p, SOLVABLE_SUGGESTS, md, repo->idarraydata + s->suggests); + if (key || md->stop > SEARCH_NEXT_KEY) + return; + case SOLVABLE_ENHANCES: + if (s->enhances) + domatch_idarray(p, SOLVABLE_ENHANCES, md, repo->idarraydata + s->enhances); + if (key || md->stop > SEARCH_NEXT_KEY) + return; + case SOLVABLE_FRESHENS: + if (s->freshens) + domatch_idarray(p, SOLVABLE_FRESHENS, md, repo->idarraydata + s->freshens); + if (key || md->stop > SEARCH_NEXT_KEY) + return; + default: + break; + } + for (i = 0, data = repo->repodata; i < repo->nrepodata; i++, data++) { if (p < data->start || p >= data->end) continue; repodata_search(data, p - data->start, key, md); + if (md->stop > SEARCH_NEXT_KEY) + break; } } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0