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=8135&r2=8136&view=diff ============================================================================== --- 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=8135&r2=8136&view=diff ============================================================================== --- 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&r1=8135&r2=8136&view=diff ============================================================================== --- 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&r1=8135&r2=8136&view=diff ============================================================================== --- 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/deptestomatic.c?rev=8136&r1=8135&r2=8136&view=diff ============================================================================== --- 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=8136&r1=8135&r2=8136&view=diff ============================================================================== --- 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@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org