X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fpool.c;h=4b6ab433f90b710194c7e4cd959148c8f68bdf58;hb=eef58960087e9d7b347e77629b0da03b656b8377;hp=56d57474342726ff8c695527dea06c0950fe895f;hpb=4cd070f32551eb0dd7a2bd355028c346222107d8;p=platform%2Fupstream%2Flibsolv.git diff --git a/src/pool.c b/src/pool.c index 56d5747..4b6ab43 100644 --- a/src/pool.c +++ b/src/pool.c @@ -40,27 +40,49 @@ pool_create(void) Pool *pool; Solvable *s; - pool = (Pool *)sat_calloc(1, sizeof(*pool)); + pool = (Pool *)solv_calloc(1, sizeof(*pool)); stringpool_init (&pool->ss, initpool_data); /* alloc space for RelDep 0 */ - pool->rels = sat_extend_resize(0, 1, sizeof(Reldep), REL_BLOCK); + pool->rels = solv_extend_resize(0, 1, sizeof(Reldep), REL_BLOCK); pool->nrels = 1; memset(pool->rels, 0, sizeof(Reldep)); /* alloc space for Solvable 0 and system solvable */ - pool->solvables = sat_extend_resize(0, 2, sizeof(Solvable), SOLVABLE_BLOCK); + pool->solvables = solv_extend_resize(0, 2, sizeof(Solvable), SOLVABLE_BLOCK); pool->nsolvables = 2; memset(pool->solvables, 0, 2 * sizeof(Solvable)); + + queue_init(&pool->vendormap); + +#if defined(DEBIAN) + pool->disttype = DISTTYPE_DEB; + pool->noarchid = ARCH_ALL; +#elif defined(ARCHLINUX) + pool->disttype = DISTTYPE_ARCH; + pool->noarchid = ARCH_ANY; +#else + pool->disttype = DISTTYPE_RPM; + pool->noarchid = ARCH_NOARCH; +#endif + + /* initialize the system solvable */ s = pool->solvables + SYSTEMSOLVABLE; s->name = SYSTEM_SYSTEM; - s->arch = ARCH_NOARCH; + s->arch = pool->noarchid; s->evr = ID_EMPTY; - queue_init(&pool->vendormap); - - pool->debugmask = SAT_DEBUG_RESULT; /* FIXME */ + pool->debugmask = SOLV_DEBUG_RESULT; /* FIXME */ +#ifdef FEDORA + pool->obsoleteusescolors = 1; +#endif +#ifdef RPM5 + pool->forbidselfconflicts = 1; + pool->obsoleteusesprovides = 1; + pool->implicitobsoleteusesprovides = 1; + pool->havedistepoch = 1; +#endif return pool; } @@ -73,25 +95,119 @@ pool_free(Pool *pool) pool_freewhatprovides(pool); pool_freeidhashes(pool); - repo_freeallrepos(pool, 1); - sat_free(pool->id2arch); - sat_free(pool->solvables); + pool_freeallrepos(pool, 1); + solv_free(pool->id2arch); + solv_free(pool->id2color); + solv_free(pool->solvables); stringpool_free(&pool->ss); - sat_free(pool->rels); + solv_free(pool->rels); + pool_setvendorclasses(pool, 0); queue_free(&pool->vendormap); for (i = 0; i < POOL_TMPSPACEBUF; i++) - sat_free(pool->tmpspacebuf[i]); + solv_free(pool->tmpspace.buf[i]); for (i = 0; i < pool->nlanguages; i++) free((char *)pool->languages[i]); - sat_free(pool->languages); - sat_free(pool->languagecache); - sat_free(pool); + solv_free(pool->languages); + solv_free(pool->languagecache); + solv_free(pool->errstr); + solv_free(pool->rootdir); + solv_free(pool); +} + +void +pool_freeallrepos(Pool *pool, int reuseids) +{ + int i; + + pool_freewhatprovides(pool); + for (i = 1; i < pool->nrepos; i++) + if (pool->repos[i]) + repo_freedata(pool->repos[i]); + pool->repos = solv_free(pool->repos); + pool->nrepos = 0; + pool->urepos = 0; + /* the first two solvables don't belong to a repo */ + pool_free_solvable_block(pool, 2, pool->nsolvables - 2, reuseids); +} + +#ifdef MULTI_SEMANTICS +void +pool_setdisttype(Pool *pool, int disttype) +{ + pool->disttype = disttype; + if (disttype == DISTTYPE_RPM) + pool->noarchid = ARCH_NOARCH; + if (disttype == DISTTYPE_DEB) + pool->noarchid = ARCH_ALL; + if (disttype == DISTTYPE_ARCH) + pool->noarchid = ARCH_ANY; + pool->solvables[SYSTEMSOLVABLE].arch = pool->noarchid; +} +#endif + +int +pool_get_flag(Pool *pool, int flag) +{ + switch (flag) + { + case POOL_FLAG_PROMOTEEPOCH: + return pool->promoteepoch; + case POOL_FLAG_FORBIDSELFCONFLICTS: + return pool->forbidselfconflicts; + case POOL_FLAG_OBSOLETEUSESPROVIDES: + return pool->obsoleteusesprovides; + case POOL_FLAG_IMPLICITOBSOLETEUSESPROVIDES: + return pool->implicitobsoleteusesprovides; + case POOL_FLAG_OBSOLETEUSESCOLORS: + return pool->obsoleteusescolors; + case POOL_FLAG_NOINSTALLEDOBSOLETES: + return pool->noinstalledobsoletes; + case POOL_FLAG_HAVEDISTEPOCH: + return pool->havedistepoch; + default: + break; + } + return -1; } +int +pool_set_flag(Pool *pool, int flag, int value) +{ + int old = pool_get_flag(pool, flag); + switch (flag) + { + case POOL_FLAG_PROMOTEEPOCH: + pool->promoteepoch = value; + break; + case POOL_FLAG_FORBIDSELFCONFLICTS: + pool->forbidselfconflicts = value; + break; + case POOL_FLAG_OBSOLETEUSESPROVIDES: + pool->obsoleteusesprovides = value; + break; + case POOL_FLAG_IMPLICITOBSOLETEUSESPROVIDES: + pool->implicitobsoleteusesprovides = value; + break; + case POOL_FLAG_OBSOLETEUSESCOLORS: + pool->obsoleteusescolors = value; + break; + case POOL_FLAG_NOINSTALLEDOBSOLETES: + pool->noinstalledobsoletes = value; + break; + case POOL_FLAG_HAVEDISTEPOCH: + pool->havedistepoch = value; + break; + default: + break; + } + return old; +} + + Id pool_add_solvable(Pool *pool) { - pool->solvables = sat_extend(pool->solvables, pool->nsolvables, 1, sizeof(Solvable), SOLVABLE_BLOCK); + pool->solvables = solv_extend(pool->solvables, pool->nsolvables, 1, sizeof(Solvable), SOLVABLE_BLOCK); memset(pool->solvables + pool->nsolvables, 0, sizeof(Solvable)); return pool->nsolvables++; } @@ -102,7 +218,7 @@ pool_add_solvable_block(Pool *pool, int count) Id nsolvables = pool->nsolvables; if (!count) return nsolvables; - pool->solvables = sat_extend(pool->solvables, pool->nsolvables, count, sizeof(Solvable), SOLVABLE_BLOCK); + pool->solvables = solv_extend(pool->solvables, pool->nsolvables, count, sizeof(Solvable), SOLVABLE_BLOCK); memset(pool->solvables + nsolvables, 0, sizeof(Solvable) * count); pool->nsolvables += count; return nsolvables; @@ -142,10 +258,6 @@ pool_shrink_whatprovides_sortcmp(const void *ap, const void *bp, void *dp) ob = pool->whatprovides[*(Id *)bp]; if (oa == ob) return *(Id *)ap - *(Id *)bp; - if (!oa) - return -1; - if (!ob) - return 1; da = pool->whatprovidesdata + oa; db = pool->whatprovidesdata + ob; while (*db) @@ -165,7 +277,7 @@ pool_shrink_whatprovides_sortcmp(const void *ap, const void *bp, void *dp) static void pool_shrink_whatprovides(Pool *pool) { - Id i, id; + Id i, n, id; Id *sorted; Id lastid, *last, *dp, *lp; Offset o; @@ -173,18 +285,18 @@ pool_shrink_whatprovides(Pool *pool) if (pool->ss.nstrings < 3) return; - sorted = sat_malloc2(pool->ss.nstrings, sizeof(Id)); - for (id = 0; id < pool->ss.nstrings; id++) - sorted[id] = id; - sat_sort(sorted + 1, pool->ss.nstrings - 1, sizeof(Id), pool_shrink_whatprovides_sortcmp, pool); + sorted = solv_malloc2(pool->ss.nstrings, sizeof(Id)); + for (i = id = 0; id < pool->ss.nstrings; id++) + if (pool->whatprovides[id] && pool->whatprovides[id] != 1) + sorted[i++] = id; + n = i; + solv_sort(sorted, n, sizeof(Id), pool_shrink_whatprovides_sortcmp, pool); last = 0; lastid = 0; - for (i = 1; i < pool->ss.nstrings; i++) + for (i = 0; i < n; i++) { id = sorted[i]; o = pool->whatprovides[id]; - if (o == 0 || o == 1) - continue; dp = pool->whatprovidesdata + o; if (last) { @@ -206,7 +318,7 @@ pool_shrink_whatprovides(Pool *pool) last = pool->whatprovidesdata + o; lastid = id; } - sat_free(sorted); + solv_free(sorted); dp = pool->whatprovidesdata + 2; for (id = 1; id < pool->ss.nstrings; id++) { @@ -229,12 +341,12 @@ pool_shrink_whatprovides(Pool *pool) ; } o = dp - pool->whatprovidesdata; - POOL_DEBUG(SAT_DEBUG_STATS, "shrunk whatprovidesdata from %d to %d\n", pool->whatprovidesdataoff, o); + POOL_DEBUG(SOLV_DEBUG_STATS, "shrunk whatprovidesdata from %d to %d\n", pool->whatprovidesdataoff, o); if (pool->whatprovidesdataoff == o) return; r = pool->whatprovidesdataoff - o; pool->whatprovidesdataoff = o; - pool->whatprovidesdata = sat_realloc(pool->whatprovidesdata, (o + pool->whatprovidesdataleft) * sizeof(Id)); + pool->whatprovidesdata = solv_realloc(pool->whatprovidesdata, (o + pool->whatprovidesdataleft) * sizeof(Id)); if (r > pool->whatprovidesdataleft) r = pool->whatprovidesdataleft; memset(pool->whatprovidesdata + o, 0, r * sizeof(Id)); @@ -260,29 +372,32 @@ pool_createwhatprovides(Pool *pool) Repo *installed = pool->installed; unsigned int now; - now = sat_timems(0); - POOL_DEBUG(SAT_DEBUG_STATS, "number of solvables: %d\n", pool->nsolvables); - POOL_DEBUG(SAT_DEBUG_STATS, "number of ids: %d + %d\n", pool->ss.nstrings, pool->nrels); + now = solv_timems(0); + POOL_DEBUG(SOLV_DEBUG_STATS, "number of solvables: %d, memory used: %d K\n", pool->nsolvables, pool->nsolvables * (int)sizeof(Solvable) / 1024); + POOL_DEBUG(SOLV_DEBUG_STATS, "number of ids: %d + %d\n", pool->ss.nstrings, pool->nrels); + POOL_DEBUG(SOLV_DEBUG_STATS, "string memory used: %d K array + %d K data, rel memory used: %d K array\n", pool->ss.nstrings / (1024 / (int)sizeof(Id)), pool->ss.sstrings / 1024, pool->nrels * (int)sizeof(Reldep) / 1024); + if (pool->ss.stringhashmask || pool->relhashmask) + POOL_DEBUG(SOLV_DEBUG_STATS, "string hash memory: %d K, rel hash memory : %d K\n", (pool->ss.stringhashmask + 1) / (int)(1024/sizeof(Id)), (pool->relhashmask + 1) / (int)(1024/sizeof(Id))); pool_freeidhashes(pool); /* XXX: should not be here! */ pool_freewhatprovides(pool); num = pool->ss.nstrings; - pool->whatprovides = whatprovides = sat_calloc_block(num, sizeof(Offset), WHATPROVIDES_BLOCK); - pool->whatprovides_rel = sat_calloc_block(pool->nrels, sizeof(Offset), WHATPROVIDES_BLOCK); + pool->whatprovides = whatprovides = solv_calloc_block(num, sizeof(Offset), WHATPROVIDES_BLOCK); + pool->whatprovides_rel = solv_calloc_block(pool->nrels, sizeof(Offset), WHATPROVIDES_BLOCK); /* count providers for each name */ - for (i = 1; i < pool->nsolvables; i++) + for (i = pool->nsolvables - 1; i > 0; i--) { Id *pp; s = pool->solvables + i; - if (!s->provides) + if (!s->provides || !s->repo || s->repo->disabled) continue; /* we always need the installed solvable in the whatprovides data, otherwise obsoletes/conflicts on them won't work */ if (s->repo != installed && !pool_installable(pool, s)) continue; pp = s->repo->idarraydata + s->provides; - while ((id = *pp++) != ID_NULL) + while ((id = *pp++) != 0) { while (ISRELDEP(id)) { @@ -294,36 +409,35 @@ pool_createwhatprovides(Pool *pool) } off = 2; /* first entry is undef, second is empty list */ - idp = whatprovides; np = 0; /* number of names provided */ - for (i = 0; i < num; i++, idp++) + for (i = 0, idp = whatprovides; i < num; i++, idp++) { n = *idp; if (!n) /* no providers */ continue; - *idp = off; /* move from counts to offsets into whatprovidesdata */ - off += n + 1; /* make space for all providers + terminating ID_NULL */ - np++; /* inc # of provider 'slots' */ + off += n; /* make space for all providers */ + *idp = off++; /* now idp points to terminating zero */ + np++; /* inc # of provider 'slots' for stats */ } - POOL_DEBUG(SAT_DEBUG_STATS, "provide ids: %d\n", np); + POOL_DEBUG(SOLV_DEBUG_STATS, "provide ids: %d\n", np); /* reserve some space for relation data */ extra = 2 * pool->nrels; if (extra < 256) extra = 256; - POOL_DEBUG(SAT_DEBUG_STATS, "provide space needed: %d + %d\n", off, extra); + POOL_DEBUG(SOLV_DEBUG_STATS, "provide space needed: %d + %d\n", off, extra); /* alloc space for all providers + extra */ - whatprovidesdata = sat_calloc(off + extra, sizeof(Id)); + whatprovidesdata = solv_calloc(off + extra, sizeof(Id)); /* now fill data for all provides */ - for (i = 1; i < pool->nsolvables; i++) + for (i = pool->nsolvables - 1; i > 0; i--) { Id *pp; s = pool->solvables + i; - if (!s->provides) + if (!s->provides || !s->repo || s->repo->disabled) continue; if (s->repo != installed && !pool_installable(pool, s)) continue; @@ -338,23 +452,19 @@ pool_createwhatprovides(Pool *pool) id = rd->name; } d = whatprovidesdata + whatprovides[id]; /* offset into whatprovidesdata */ - if (*d) + if (*d != i) /* don't add same solvable twice */ { - d++; - while (*d) /* find free slot */ - d++; - if (d[-1] == i) /* solvable already tacked at end ? */ - continue; /* Y: skip, on to next provides */ + d[-1] = i; + whatprovides[id]--; } - *d = i; /* put solvable Id into data */ } } pool->whatprovidesdata = whatprovidesdata; pool->whatprovidesdataoff = off; pool->whatprovidesdataleft = extra; pool_shrink_whatprovides(pool); - POOL_DEBUG(SAT_DEBUG_STATS, "whatprovides memory used: %d K id array, %d K data\n", (pool->ss.nstrings + pool->nrels + WHATPROVIDES_BLOCK) / (int)(1024/sizeof(Id)), (pool->whatprovidesdataoff + pool->whatprovidesdataleft) / (int)(1024/sizeof(Id))); - POOL_DEBUG(SAT_DEBUG_STATS, "createwhatprovides took %d ms\n", sat_timems(now)); + POOL_DEBUG(SOLV_DEBUG_STATS, "whatprovides memory used: %d K id array, %d K data\n", (pool->ss.nstrings + pool->nrels + WHATPROVIDES_BLOCK) / (int)(1024/sizeof(Id)), (pool->whatprovidesdataoff + pool->whatprovidesdataleft) / (int)(1024/sizeof(Id))); + POOL_DEBUG(SOLV_DEBUG_STATS, "createwhatprovides took %d ms\n", solv_timems(now)); } /* @@ -365,9 +475,9 @@ pool_createwhatprovides(Pool *pool) void pool_freewhatprovides(Pool *pool) { - pool->whatprovides = sat_free(pool->whatprovides); - pool->whatprovides_rel = sat_free(pool->whatprovides_rel); - pool->whatprovidesdata = sat_free(pool->whatprovidesdata); + pool->whatprovides = solv_free(pool->whatprovides); + pool->whatprovides_rel = solv_free(pool->whatprovides_rel); + pool->whatprovidesdata = solv_free(pool->whatprovidesdata); pool->whatprovidesdataoff = 0; pool->whatprovidesdataleft = 0; } @@ -396,8 +506,8 @@ pool_queuetowhatprovides(Pool *pool, Queue *q) /* extend whatprovidesdata if needed, +1 for ID_NULL-termination */ if (pool->whatprovidesdataleft < count + 1) { - POOL_DEBUG(SAT_DEBUG_STATS, "growing provides hash data...\n"); - pool->whatprovidesdata = sat_realloc(pool->whatprovidesdata, (pool->whatprovidesdataoff + count + 4096) * sizeof(Id)); + POOL_DEBUG(SOLV_DEBUG_STATS, "growing provides hash data...\n"); + pool->whatprovidesdata = solv_realloc(pool->whatprovidesdata, (pool->whatprovidesdataoff + count + 4096) * sizeof(Id)); pool->whatprovidesdataleft = count + 4096; } @@ -416,6 +526,14 @@ pool_queuetowhatprovides(Pool *pool, Queue *q) /*************************************************************************/ +#if defined(MULTI_SEMANTICS) +# define EVRCMP_DEPCMP (pool->disttype == DISTTYPE_DEB ? EVRCMP_COMPARE : EVRCMP_MATCH_RELEASE) +#elif defined(DEBIAN) +# define EVRCMP_DEPCMP EVRCMP_COMPARE +#else +# define EVRCMP_DEPCMP EVRCMP_MATCH_RELEASE +#endif + /* check if a package's nevr matches a dependency */ int @@ -432,7 +550,10 @@ pool_match_nevr_rel(Pool *pool, Solvable *s, Id d) { case REL_ARCH: if (s->arch != evr) - return 0; + { + if (evr != ARCH_SRC || s->arch != ARCH_NOSRC) + return 0; + } return pool_match_nevr(pool, s, name); case REL_OR: if (pool_match_nevr(pool, s, name)) @@ -450,30 +571,65 @@ pool_match_nevr_rel(Pool *pool, Solvable *s, Id d) if (!pool_match_nevr(pool, s, name)) return 0; if (evr == s->evr) - return flags & 2 ? 1 : 0; + return (flags & REL_EQ) ? 1 : 0; if (!flags) return 0; if (flags == 7) return 1; - if (flags != 2 && flags != 5) - flags ^= 5; -#ifdef DEBIAN_SEMANTICS - if ((flags & (1 << (1 + evrcmp(pool, s->evr, evr, EVRCMP_COMPARE)))) != 0) - return 1; -#else - if ((flags & (1 << (1 + evrcmp(pool, s->evr, evr, EVRCMP_MATCH_RELEASE)))) != 0) - return 1; -#endif + switch (pool_evrcmp(pool, s->evr, evr, EVRCMP_DEPCMP)) + { + case -2: + return 1; + case -1: + return (flags & REL_LT) ? 1 : 0; + case 0: + return (flags & REL_EQ) ? 1 : 0; + case 1: + return (flags & REL_GT) ? 1 : 0; + case 2: + return (flags & REL_EQ) ? 1 : 0; + default: + break; + } return 0; } -/* match two dependencies */ +/* match (flags, evr) against provider (pflags, pevr) */ +static inline int +pool_match_flags_evr(Pool *pool, int pflags, Id pevr, int flags, int evr) +{ + if (!pflags || !flags || pflags >= 8 || flags >= 8) + return 0; + if (flags == 7 || pflags == 7) + return 1; /* rel provides every version */ + if ((pflags & flags & (REL_LT | REL_GT)) != 0) + return 1; /* both rels show in the same direction */ + if (pevr == evr) + return (flags & pflags & REL_EQ) ? 1 : 0; + switch (pool_evrcmp(pool, pevr, evr, EVRCMP_DEPCMP)) + { + case -2: + return (pflags & REL_EQ) ? 1 : 0; + case -1: + return (flags & REL_LT) || (pflags & REL_GT) ? 1 : 0; + case 0: + return (flags & pflags & REL_EQ) ? 1 : 0; + case 1: + return (flags & REL_GT) || (pflags & REL_LT) ? 1 : 0; + case 2: + return (flags & REL_EQ) ? 1 : 0; + default: + break; + } + return 0; +} + +/* match two dependencies (d1 = provider) */ int pool_match_dep(Pool *pool, Id d1, Id d2) { Reldep *rd1, *rd2; - int pflags, flags; if (d1 == d2) return 1; @@ -490,33 +646,11 @@ pool_match_dep(Pool *pool, Id d1, Id d2) return pool_match_dep(pool, rd1->name, d2); } rd2 = GETRELDEP(pool, d2); + /* first match name */ if (!pool_match_dep(pool, rd1->name, rd2->name)) return 0; - pflags = rd1->flags; - flags = rd2->flags; - if (!pflags || !flags || pflags >= 8 || flags >= 8) - return 0; - if (flags == 7 || pflags == 7) - return 1; - if ((pflags & flags & 5) != 0) - return 1; - if (rd1->evr == rd2->evr) - { - if ((pflags & flags & 2) != 0) - return 1; - } - else - { - int f = flags == 5 ? 5 : flags == 2 ? pflags : (flags ^ 5) & (pflags | 5); -#ifdef DEBIAN_SEMANTICS - if ((f & (1 << (1 + evrcmp(pool, rd1->evr, rd2->evr, EVRCMP_COMPARE)))) != 0) - return 1; -#else - if ((f & (1 << (1 + evrcmp(pool, rd1->evr, rd2->evr, EVRCMP_MATCH_RELEASE)))) != 0) - return 1; -#endif - } - return 0; + /* name matches, check flags and evr */ + return pool_match_flags_evr(pool, rd1->flags, rd1->evr, rd2->flags, rd2->evr); } /* @@ -538,102 +672,136 @@ pool_addrelproviders(Pool *pool, Id d) Id evr = rd->evr; int flags = rd->flags; Id pid, *pidp; - Id p, wp, *pp, *pp2, *pp3; + Id p, *pp; d = GETRELID(d); queue_init_buffer(&plist, buf, sizeof(buf)/sizeof(*buf)); - switch (flags) + + if (flags >= 8) { - case REL_AND: - case REL_WITH: - pp = pool_whatprovides_ptr(pool, name); - pp2 = pool_whatprovides_ptr(pool, evr); - while ((p = *pp++) != 0) - { - for (pp3 = pp2; *pp3;) - if (*pp3++ == p) - { - queue_push(&plist, p); - break; - } - } - break; - case REL_OR: - pp = pool_whatprovides_ptr(pool, name); - while ((p = *pp++) != 0) - queue_push(&plist, p); - pp = pool_whatprovides_ptr(pool, evr); - while ((p = *pp++) != 0) - queue_pushunique(&plist, p); - break; - case REL_NAMESPACE: - if (name == NAMESPACE_OTHERPROVIDERS) - { - wp = pool_whatprovides(pool, evr); - pool->whatprovides_rel[d] = wp; - return wp; - } - if (pool->nscallback) + /* special relation */ + Id wp = 0; + Id *pp2, *pp3; + + switch (flags) { - /* ask callback which packages provide the dependency - * 0: none - * 1: the system (aka SYSTEMSOLVABLE) - * >1: a set of packages, stored as offset on whatprovidesdata - */ - p = pool->nscallback(pool, pool->nscallbackdata, name, evr); - if (p > 1) + case REL_AND: + case REL_WITH: + wp = pool_whatprovides(pool, name); + pp2 = pool_whatprovides_ptr(pool, evr); + pp = pool->whatprovidesdata + wp; + while ((p = *pp++) != 0) { - queue_free(&plist); - pool->whatprovides_rel[d] = p; - return p; + for (pp3 = pp2; *pp3; pp3++) + if (*pp3 == p) + break; + if (*pp3) + queue_push(&plist, p); /* found it */ + else + wp = 0; } - if (p == 1) - queue_push(&plist, SYSTEMSOLVABLE); - } - break; - case REL_ARCH: - /* small hack: make it possible to match .src - * we have to iterate over the solvables as src packages do not - * provide anything, thus they are not indexed in our - * whatprovides hash */ - if (evr == ARCH_SRC) - { - Solvable *s; - for (p = 1, s = pool->solvables + p; p < pool->nsolvables; p++, s++) + break; + case REL_OR: + wp = pool_whatprovides(pool, name); + pp = pool->whatprovidesdata + wp; + if (!*pp) + wp = pool_whatprovides(pool, evr); + else + { + int cnt; + while ((p = *pp++) != 0) + queue_push(&plist, p); + cnt = plist.count; + pp = pool_whatprovides_ptr(pool, evr); + while ((p = *pp++) != 0) + queue_pushunique(&plist, p); + if (plist.count != cnt) + wp = 0; + } + break; + case REL_NAMESPACE: + if (name == NAMESPACE_OTHERPROVIDERS) + { + wp = pool_whatprovides(pool, evr); + break; + } + if (pool->nscallback) + { + /* ask callback which packages provide the dependency + * 0: none + * 1: the system (aka SYSTEMSOLVABLE) + * >1: set of packages, stored as offset on whatprovidesdata + */ + p = pool->nscallback(pool, pool->nscallbackdata, name, evr); + if (p > 1) + wp = p; + if (p == 1) + queue_push(&plist, SYSTEMSOLVABLE); + } + break; + case REL_ARCH: + /* small hack: make it possible to match .src + * we have to iterate over the solvables as src packages do not + * provide anything, thus they are not indexed in our + * whatprovides hash */ + if (evr == ARCH_SRC || evr == ARCH_NOSRC) + { + Solvable *s; + for (p = 1, s = pool->solvables + p; p < pool->nsolvables; p++, s++) + { + if (!s->repo) + continue; + if (s->arch != evr && s->arch != ARCH_NOSRC) + continue; + if (pool_match_nevr(pool, s, name)) + queue_push(&plist, p); + } + break; + } + wp = pool_whatprovides(pool, name); + pp = pool->whatprovidesdata + wp; + while ((p = *pp++) != 0) { - if (s->arch != ARCH_SRC && s->arch != ARCH_NOSRC) + Solvable *s = pool->solvables + p; + if (s->arch == evr) + queue_push(&plist, p); + else + wp = 0; + } + break; + case REL_FILECONFLICT: + pp = pool_whatprovides_ptr(pool, name); + while ((p = *pp++) != 0) + { + Id origd = MAKERELDEP(d); + Solvable *s = pool->solvables + p; + if (!s->provides) continue; - if (pool_match_nevr(pool, s, name)) + pidp = s->repo->idarraydata + s->provides; + while ((pid = *pidp++) != 0) + if (pid == origd) + break; + if (pid) queue_push(&plist, p); } break; - } - wp = pool_whatprovides(pool, name); - pp = pool->whatprovidesdata + wp; - while ((p = *pp++) != 0) - { - Solvable *s = pool->solvables + p; - if (s->arch == evr) - queue_push(&plist, p); - else - wp = 0; + default: + break; } if (wp) { + /* we can reuse an existing entry */ + queue_free(&plist); pool->whatprovides_rel[d] = wp; return wp; } - break; - default: - break; } - - /* convert to whatprovides id */ + else if (flags) + { + /* simple version comparison relation */ #if 0 - POOL_DEBUG(SAT_DEBUG_STATS, "addrelproviders: what provides %s?\n", dep2str(pool, name)); + POOL_DEBUG(SOLV_DEBUG_STATS, "addrelproviders: what provides %s?\n", pool_dep2str(pool, name)); #endif - if (flags && flags < 8) - { pp = pool_whatprovides_ptr(pool, name); while (ISRELDEP(name)) { @@ -643,9 +811,6 @@ pool_addrelproviders(Pool *pool, Id d) while ((p = *pp++) != 0) { Solvable *s = pool->solvables + p; -#if 0 - POOL_DEBUG(DEBUG_1, "addrelproviders: checking package %s\n", id2str(pool, s->name)); -#endif if (!s->provides) { /* no provides - check nevr */ @@ -657,60 +822,32 @@ pool_addrelproviders(Pool *pool, Id d) pidp = s->repo->idarraydata + s->provides; while ((pid = *pidp++) != 0) { - int pflags; - Id pevr; - - if (pid == name) + if (!ISRELDEP(pid)) { -#ifdef DEBIAN_SEMANTICS - continue; /* unversioned provides can - * never match versioned deps */ -#else - break; /* yes, provides all versions */ -#endif + if (pid != name) + continue; /* wrong provides name */ + if (pool->disttype == DISTTYPE_DEB) + continue; /* unversioned provides can never match versioned deps */ + break; } - if (!ISRELDEP(pid)) - continue; /* wrong provides name */ prd = GETRELDEP(pool, pid); if (prd->name != name) continue; /* wrong provides name */ - /* right package, both deps are rels */ - pflags = prd->flags; - if (!pflags) - continue; - if (flags == 7 || pflags == 7) - break; /* included */ - if ((pflags & flags & 5) != 0) - break; /* same direction, match */ - pevr = prd->evr; - if (pevr == evr) - { - if ((pflags & flags & 2) != 0) - break; /* both have =, match */ - } - else - { - int f = flags == 5 ? 5 : flags == 2 ? pflags : (flags ^ 5) & (pflags | 5); -#ifdef DEBIAN_SEMANTICS - if ((f & (1 << (1 + evrcmp(pool, pevr, evr, EVRCMP_COMPARE)))) != 0) - break; -#else - if ((f & (1 << (1 + evrcmp(pool, pevr, evr, EVRCMP_MATCH_RELEASE)))) != 0) - break; -#endif - } + /* right package, both deps are rels. check flags/evr */ + if (pool_match_flags_evr(pool, prd->flags, prd->evr, flags, evr)) + break; /* matches */ } if (!pid) - continue; /* no rel match */ + continue; /* none of the providers matched */ queue_push(&plist, p); } /* make our system solvable provide all unknown rpmlib() stuff */ - if (plist.count == 0 && !strncmp(id2str(pool, name), "rpmlib(", 7)) + if (plist.count == 0 && !strncmp(pool_id2str(pool, name), "rpmlib(", 7)) queue_push(&plist, SYSTEMSOLVABLE); } /* add providers to whatprovides */ #if 0 - POOL_DEBUG(SAT_DEBUG_STATS, "addrelproviders: adding %d packages to %d\n", plist.count, d); + POOL_DEBUG(SOLV_DEBUG_STATS, "addrelproviders: adding %d packages to %d\n", plist.count, d); #endif pool->whatprovides_rel[d] = pool_queuetowhatprovides(pool, &plist); queue_free(&plist); @@ -726,7 +863,7 @@ pool_debug(Pool *pool, int type, const char *format, ...) va_list args; char buf[1024]; - if ((type & (SAT_FATAL|SAT_ERROR)) == 0) + if ((type & (SOLV_FATAL|SOLV_ERROR)) == 0) { if ((pool->debugmask & type) == 0) return; @@ -734,33 +871,90 @@ pool_debug(Pool *pool, int type, const char *format, ...) va_start(args, format); if (!pool->debugcallback) { - if ((type & (SAT_FATAL|SAT_ERROR)) == 0) + if ((type & (SOLV_FATAL|SOLV_ERROR)) == 0 && !(pool->debugmask & SOLV_DEBUG_TO_STDERR)) vprintf(format, args); else vfprintf(stderr, format, args); return; } vsnprintf(buf, sizeof(buf), format, args); + va_end(args); pool->debugcallback(pool, pool->debugcallbackdata, type, buf); } +int +pool_error(Pool *pool, int ret, const char *format, ...) +{ + va_list args; + int l; + va_start(args, format); + if (!pool->errstr) + { + pool->errstra = 1024; + pool->errstr = solv_malloc(pool->errstra); + } + if (!*format) + { + *pool->errstr = 0; + l = 0; + } + else + l = vsnprintf(pool->errstr, pool->errstra, format, args); + va_end(args); + if (l >= 0 && l + 1 > pool->errstra) + { + pool->errstra = l + 256; + pool->errstr = solv_realloc(pool->errstr, pool->errstra); + va_start(args, format); + l = vsnprintf(pool->errstr, pool->errstra, format, args); + va_end(args); + } + if (l < 0) + strcpy(pool->errstr, "unknown error"); + if (pool->debugmask & SOLV_ERROR) + pool_debug(pool, SOLV_ERROR, "%s\n", pool->errstr); + return ret; +} + +char * +pool_errstr(Pool *pool) +{ + return pool->errstr ? pool->errstr : "no error"; +} + void pool_setdebuglevel(Pool *pool, int level) { - int mask = SAT_DEBUG_RESULT; + int mask = SOLV_DEBUG_RESULT; if (level > 0) - mask |= SAT_DEBUG_STATS|SAT_DEBUG_ANALYZE|SAT_DEBUG_UNSOLVABLE; + mask |= SOLV_DEBUG_STATS|SOLV_DEBUG_ANALYZE|SOLV_DEBUG_UNSOLVABLE|SOLV_DEBUG_SOLVER|SOLV_DEBUG_TRANSACTION|SOLV_ERROR; if (level > 1) - mask |= SAT_DEBUG_JOB|SAT_DEBUG_SOLUTIONS|SAT_DEBUG_POLICY; + mask |= SOLV_DEBUG_JOB|SOLV_DEBUG_SOLUTIONS|SOLV_DEBUG_POLICY; if (level > 2) - mask |= SAT_DEBUG_PROPAGATE; + mask |= SOLV_DEBUG_PROPAGATE; if (level > 3) - mask |= SAT_DEBUG_RULE_CREATION; - if (level > 4) - mask |= SAT_DEBUG_SCHUBI; + mask |= SOLV_DEBUG_RULE_CREATION; + mask |= pool->debugmask & SOLV_DEBUG_TO_STDERR; /* keep bit */ pool->debugmask = mask; } +void pool_setdebugcallback(Pool *pool, void (*debugcallback)(struct _Pool *, void *data, int type, const char *str), void *debugcallbackdata) +{ + pool->debugcallback = debugcallback; + pool->debugcallbackdata = debugcallbackdata; +} + +void pool_setdebugmask(Pool *pool, int mask) +{ + pool->debugmask = mask; +} + +void pool_setloadcallback(Pool *pool, int (*cb)(struct _Pool *, struct _Repodata *, void *), void *loadcbdata) +{ + pool->loadcallback = cb; + pool->loadcallbackdata = loadcbdata; +} + /*************************************************************************/ struct searchfiles { @@ -810,6 +1004,11 @@ pool_addfileprovides_dep(Pool *pool, Id *ida, struct searchfiles *sf, struct sea } dep = rd->evr; } + else if (rd->flags == REL_FILECONFLICT) + { + dep = 0; + break; + } else { Id ids[2]; @@ -824,16 +1023,16 @@ pool_addfileprovides_dep(Pool *pool, Id *ida, struct searchfiles *sf, struct sea if (MAPTST(&csf->seen, dep)) continue; MAPSET(&csf->seen, dep); - s = id2str(pool, dep); + s = pool_id2str(pool, dep); if (*s != '/') continue; - csf->ids = sat_extend(csf->ids, csf->nfiles, 1, sizeof(Id), SEARCHFILES_BLOCK); - csf->dirs = sat_extend(csf->dirs, csf->nfiles, 1, sizeof(const char *), SEARCHFILES_BLOCK); - csf->names = sat_extend(csf->names, csf->nfiles, 1, sizeof(const char *), SEARCHFILES_BLOCK); + csf->ids = solv_extend(csf->ids, csf->nfiles, 1, sizeof(Id), SEARCHFILES_BLOCK); + csf->dirs = solv_extend(csf->dirs, csf->nfiles, 1, sizeof(const char *), SEARCHFILES_BLOCK); + csf->names = solv_extend(csf->names, csf->nfiles, 1, sizeof(const char *), SEARCHFILES_BLOCK); csf->ids[csf->nfiles] = dep; sr = strrchr(s, '/'); - csf->names[csf->nfiles] = strdup(sr + 1); - csf->dirs[csf->nfiles] = sat_malloc(sr - s + 1); + csf->names[csf->nfiles] = solv_strdup(sr + 1); + csf->dirs[csf->nfiles] = solv_malloc(sr - s + 1); if (sr != s) strncpy(csf->dirs[csf->nfiles], s, sr - s); csf->dirs[csf->nfiles][sr - s] = 0; @@ -847,8 +1046,10 @@ struct addfileprovides_cbdata { char **dirs; char **names; - Repodata *olddata; Id *dids; + + Map providedids; + Map useddirs; }; @@ -858,20 +1059,25 @@ addfileprovides_cb(void *cbdata, Solvable *s, Repodata *data, Repokey *key, KeyV struct addfileprovides_cbdata *cbd = cbdata; int i; - if (data != cbd->olddata) + if (!cbd->useddirs.size) { - map_free(&cbd->useddirs); - map_init(&cbd->useddirs, data->dirpool.ndirs); + map_init(&cbd->useddirs, data->dirpool.ndirs + 1); for (i = 0; i < cbd->nfiles; i++) { - Id did = repodata_str2dir(data, cbd->dirs[i], 0); - cbd->dids[i] = did; + Id did; + if (MAPTST(&cbd->providedids, cbd->ids[i])) + { + cbd->dids[i] = 0; + continue; + } + did = repodata_str2dir(data, cbd->dirs[i], 0); + cbd->dids[i] = did; if (did) MAPSET(&cbd->useddirs, did); } - cbd->olddata = data; + repodata_free_dircache(data); } - if (!MAPTST(&cbd->useddirs, value->id)) + if (value->id >= data->dirpool.ndirs || !MAPTST(&cbd->useddirs, value->id)) return 0; for (i = 0; i < cbd->nfiles; i++) { @@ -886,110 +1092,151 @@ addfileprovides_cb(void *cbdata, Solvable *s, Repodata *data, Repokey *key, KeyV return 0; } -static int -addfileprovides_setid_cb(void *cbdata, Solvable *s, Repodata *data, Repokey *key, KeyValue *kv) -{ - Map *provideids = cbdata; - if (key->type != REPOKEY_TYPE_IDARRAY) - return 0; - MAPSET(provideids, kv->id); - return kv->eof ? SEARCH_NEXT_SOLVABLE : 0; -} - - static void pool_addfileprovides_search(Pool *pool, struct addfileprovides_cbdata *cbd, struct searchfiles *sf, Repo *repoonly) { - Id p, start, end; - Solvable *s; - Repodata *data = 0, *nextdata; - Repo *oldrepo = 0; - int dataincludes = 0; - int i, j; - Map providedids; + Id p; + Repodata *data; + Repo *repo; + Queue fileprovidesq; + int i, j, repoid, repodataid; + int provstart, provend; + Map donemap; + int ndone, incomplete; + + if (!pool->urepos) + return; cbd->nfiles = sf->nfiles; cbd->ids = sf->ids; cbd->dirs = sf->dirs; cbd->names = sf->names; - cbd->olddata = 0; - cbd->dids = sat_realloc2(cbd->dids, sf->nfiles, sizeof(Id)); - if (repoonly) + cbd->dids = solv_realloc2(cbd->dids, sf->nfiles, sizeof(Id)); + map_init(&cbd->providedids, pool->ss.nstrings); + + repoid = 1; + repo = repoonly ? repoonly : pool->repos[repoid]; + map_init(&donemap, pool->nsolvables); + queue_init(&fileprovidesq); + provstart = provend = 0; + for (;;) { - start = repoonly->start; - end = repoonly->end; - } - else - { - start = 2; /* skip system solvable */ - end = pool->nsolvables; - } - for (p = start, s = pool->solvables + p; p < end; p++, s++) - { - if (!s->repo || (repoonly && s->repo != repoonly)) - continue; - /* check if p is in (oldrepo,data) */ - if (s->repo != oldrepo || (data && p >= data->end)) + if (!repo || repo->disabled) { - data = 0; - oldrepo = 0; + if (repoonly || ++repoid == pool->nrepos) + break; + repo = pool->repos[repoid]; + continue; } - if (oldrepo == 0) + ndone = 0; + FOR_REPODATAS(repo, repodataid, data) { - /* nope, find new repo/repodata */ - /* if we don't find a match, set data to the next repodata */ - nextdata = 0; - for (i = 0, data = s->repo->repodata; i < s->repo->nrepodata; i++, data++) + if (ndone >= repo->nsolvables) + break; + + if (repodata_lookup_idarray(data, SOLVID_META, REPOSITORY_ADDEDFILEPROVIDES, &fileprovidesq)) { - if (p >= data->end) - continue; - if (data->state != REPODATA_AVAILABLE) - continue; - for (j = 1; j < data->nkeys; j++) - if (data->keys[j].name == REPOSITORY_ADDEDFILEPROVIDES && data->keys[j].type == REPOKEY_TYPE_IDARRAY) + map_empty(&cbd->providedids); + for (i = 0; i < fileprovidesq.count; i++) + MAPSET(&cbd->providedids, fileprovidesq.elements[i]); + provstart = data->start; + provend = data->end; + for (i = 0; i < cbd->nfiles; i++) + if (!MAPTST(&cbd->providedids, cbd->ids[i])) break; - if (j == data->nkeys) - continue; - /* great, this repodata contains addedfileprovides */ - if (!nextdata || nextdata->start > data->start) - nextdata = data; - if (p >= data->start) - break; + if (i == cbd->nfiles) + { + /* great! no need to search files */ + for (p = data->start; p < data->end; p++) + if (pool->solvables[p].repo == repo) + { + if (MAPTST(&donemap, p)) + continue; + MAPSET(&donemap, p); + ndone++; + } + continue; + } } - if (i == s->repo->nrepodata) - data = nextdata; /* no direct hit, use next repodata */ - if (data) + + if (!repodata_has_keyname(data, SOLVABLE_FILELIST)) + continue; + + if (data->start < provstart || data->end > provend) { - map_init(&providedids, pool->ss.nstrings); - repodata_search(data, SOLVID_META, REPOSITORY_ADDEDFILEPROVIDES, 0, addfileprovides_setid_cb, &providedids); - for (i = 0; i < cbd->nfiles; i++) - if (!MAPTST(&providedids, cbd->ids[i])) + map_empty(&cbd->providedids); + provstart = provend = 0; + } + + /* check if the data is incomplete */ + incomplete = 0; + if (data->state == REPODATA_AVAILABLE) + { + for (j = 1; j < data->nkeys; j++) + if (data->keys[j].name != REPOSITORY_SOLVABLES && data->keys[j].name != SOLVABLE_FILELIST) break; - map_free(&providedids); - dataincludes = i == cbd->nfiles; + if (j < data->nkeys) + { +#if 0 + for (i = 0; i < cbd->nfiles; i++) + if (!MAPTST(&cbd->providedids, cbd->ids[i]) && !repodata_filelistfilter_matches(data, pool_id2str(pool, cbd->ids[i]))) + printf("need complete filelist because of %s\n", pool_id2str(pool, cbd->ids[i])); +#endif + for (i = 0; i < cbd->nfiles; i++) + if (!MAPTST(&cbd->providedids, cbd->ids[i]) && !repodata_filelistfilter_matches(data, pool_id2str(pool, cbd->ids[i]))) + break; + if (i < cbd->nfiles) + incomplete = 1; + } } - oldrepo = s->repo; + + /* do the search */ + map_init(&cbd->useddirs, 0); + for (p = data->start; p < data->end; p++) + if (pool->solvables[p].repo == repo) + { + if (MAPTST(&donemap, p)) + continue; + repodata_search(data, p, SOLVABLE_FILELIST, 0, addfileprovides_cb, cbd); + if (!incomplete) + { + MAPSET(&donemap, p); + ndone++; + } + } + map_free(&cbd->useddirs); } - if (data && p >= data->start && dataincludes) - continue; - repo_search(s->repo, p, SOLVABLE_FILELIST, 0, 0, addfileprovides_cb, cbd); + + if (repoonly || ++repoid == pool->nrepos) + break; + repo = pool->repos[repoid]; } + map_free(&donemap); + queue_free(&fileprovidesq); + map_free(&cbd->providedids); } void -pool_addfileprovides_ids(Pool *pool, Repo *installed, Id **idp) +pool_addfileprovides_queue(Pool *pool, Queue *idq, Queue *idqinst) { Solvable *s; - Repo *repo; + Repo *installed, *repo; struct searchfiles sf, isf, *isfp; struct addfileprovides_cbdata cbd; int i; + unsigned int now; + installed = pool->installed; + now = solv_timems(0); memset(&sf, 0, sizeof(sf)); map_init(&sf.seen, pool->ss.nstrings + pool->nrels); memset(&isf, 0, sizeof(isf)); map_init(&isf.seen, pool->ss.nstrings + pool->nrels); + if (idq) + queue_empty(idq); + if (idqinst) + queue_empty(idqinst); isfp = installed ? &isf : 0; for (i = 1, s = pool->solvables + i; i < pool->nsolvables; i++, s++) { @@ -1013,61 +1260,59 @@ pool_addfileprovides_ids(Pool *pool, Repo *installed, Id **idp) } map_free(&sf.seen); map_free(&isf.seen); - POOL_DEBUG(SAT_DEBUG_STATS, "found %d file dependencies\n", sf.nfiles); - POOL_DEBUG(SAT_DEBUG_STATS, "found %d installed file dependencies\n", isf.nfiles); + POOL_DEBUG(SOLV_DEBUG_STATS, "found %d file dependencies, %d installed file dependencies\n", sf.nfiles, isf.nfiles); cbd.dids = 0; - map_init(&cbd.useddirs, 1); - if (idp) - *idp = 0; if (sf.nfiles) { #if 0 for (i = 0; i < sf.nfiles; i++) - POOL_DEBUG(SAT_DEBUG_STATS, "looking up %s in filelist\n", id2str(pool, sf.ids[i])); + POOL_DEBUG(SOLV_DEBUG_STATS, "looking up %s in filelist\n", pool_id2str(pool, sf.ids[i])); #endif pool_addfileprovides_search(pool, &cbd, &sf, 0); - if (idp) - { - sf.ids = sat_extend(sf.ids, sf.nfiles, 1, sizeof(Id), SEARCHFILES_BLOCK); - sf.ids[sf.nfiles] = 0; - *idp = sf.ids; - sf.ids = 0; - } - sat_free(sf.ids); + if (idq) + for (i = 0; i < sf.nfiles; i++) + queue_push(idq, sf.ids[i]); + if (idqinst) + for (i = 0; i < sf.nfiles; i++) + queue_push(idqinst, sf.ids[i]); + solv_free(sf.ids); for (i = 0; i < sf.nfiles; i++) { - sat_free(sf.dirs[i]); - sat_free(sf.names[i]); + solv_free(sf.dirs[i]); + solv_free(sf.names[i]); } - sat_free(sf.dirs); - sat_free(sf.names); + solv_free(sf.dirs); + solv_free(sf.names); } if (isf.nfiles) { #if 0 for (i = 0; i < isf.nfiles; i++) - POOL_DEBUG(SAT_DEBUG_STATS, "looking up %s in installed filelist\n", id2str(pool, isf.ids[i])); + POOL_DEBUG(SOLV_DEBUG_STATS, "looking up %s in installed filelist\n", pool_id2str(pool, isf.ids[i])); #endif if (installed) pool_addfileprovides_search(pool, &cbd, &isf, installed); - sat_free(isf.ids); + if (installed && idqinst) + for (i = 0; i < isf.nfiles; i++) + queue_pushunique(idqinst, isf.ids[i]); + solv_free(isf.ids); for (i = 0; i < isf.nfiles; i++) { - sat_free(isf.dirs[i]); - sat_free(isf.names[i]); + solv_free(isf.dirs[i]); + solv_free(isf.names[i]); } - sat_free(isf.dirs); - sat_free(isf.names); + solv_free(isf.dirs); + solv_free(isf.names); } - map_free(&cbd.useddirs); - sat_free(cbd.dids); + solv_free(cbd.dids); pool_freewhatprovides(pool); /* as we have added provides */ + POOL_DEBUG(SOLV_DEBUG_STATS, "addfileprovides took %d ms\n", solv_timems(now)); } void pool_addfileprovides(Pool *pool) { - pool_addfileprovides_ids(pool, pool->installed, 0); + pool_addfileprovides_queue(pool, 0, 0); } void @@ -1097,7 +1342,7 @@ pool_set_languages(Pool *pool, const char **languages, int nlanguages) { int i; - pool->languagecache = sat_free(pool->languagecache); + pool->languagecache = solv_free(pool->languagecache); pool->languagecacheother = 0; if (pool->nlanguages) { @@ -1108,9 +1353,9 @@ pool_set_languages(Pool *pool, const char **languages, int nlanguages) pool->nlanguages = nlanguages; if (!nlanguages) return; - pool->languages = sat_calloc(nlanguages, sizeof(const char **)); + pool->languages = solv_calloc(nlanguages, sizeof(const char **)); for (i = 0; i < pool->nlanguages; i++) - pool->languages[i] = strdup(languages[i]); + pool->languages[i] = solv_strdup(languages[i]); } Id @@ -1120,16 +1365,16 @@ pool_id2langid(Pool *pool, Id id, const char *lang, int create) char buf[256], *p; int l; - if (!lang) + if (!lang || !*lang) return id; - n = id2str(pool, id); + n = pool_id2str(pool, id); l = strlen(n) + strlen(lang) + 2; if (l > sizeof(buf)) - p = sat_malloc(strlen(n) + strlen(lang) + 2); + p = solv_malloc(strlen(n) + strlen(lang) + 2); else p = buf; sprintf(p, "%s:%s", n, lang); - id = str2id(pool, p, create); + id = pool_str2id(pool, p, create); if (p != buf) free(p); return id; @@ -1138,16 +1383,127 @@ pool_id2langid(Pool *pool, Id id, const char *lang, int create) char * pool_alloctmpspace(Pool *pool, int len) { - int n = pool->tmpspacen; + int n = pool->tmpspace.n; if (!len) return 0; - if (len > pool->tmpspacelen[n]) + if (len > pool->tmpspace.len[n]) { - pool->tmpspacebuf[n] = sat_realloc(pool->tmpspacebuf[n], len + 32); - pool->tmpspacelen[n] = len + 32; + pool->tmpspace.buf[n] = solv_realloc(pool->tmpspace.buf[n], len + 32); + pool->tmpspace.len[n] = len + 32; } - pool->tmpspacen = (n + 1) % POOL_TMPSPACEBUF; - return pool->tmpspacebuf[n]; + pool->tmpspace.n = (n + 1) % POOL_TMPSPACEBUF; + return pool->tmpspace.buf[n]; +} + +static char * +pool_alloctmpspace_free(Pool *pool, const char *space, int len) +{ + if (space) + { + int n, oldn; + n = oldn = pool->tmpspace.n; + for (;;) + { + if (!n--) + n = POOL_TMPSPACEBUF - 1; + if (n == oldn) + break; + if (pool->tmpspace.buf[n] != space) + continue; + if (len > pool->tmpspace.len[n]) + { + pool->tmpspace.buf[n] = solv_realloc(pool->tmpspace.buf[n], len + 32); + pool->tmpspace.len[n] = len + 32; + } + return pool->tmpspace.buf[n]; + } + } + return 0; +} + +void +pool_freetmpspace(Pool *pool, const char *space) +{ + int n = pool->tmpspace.n; + if (!space) + return; + n = (n + (POOL_TMPSPACEBUF - 1)) % POOL_TMPSPACEBUF; + if (pool->tmpspace.buf[n] == space) + pool->tmpspace.n = n; +} + +char * +pool_tmpjoin(Pool *pool, const char *str1, const char *str2, const char *str3) +{ + int l1, l2, l3; + char *s, *str; + l1 = str1 ? strlen(str1) : 0; + l2 = str2 ? strlen(str2) : 0; + l3 = str3 ? strlen(str3) : 0; + s = str = pool_alloctmpspace(pool, l1 + l2 + l3 + 1); + if (l1) + { + strcpy(s, str1); + s += l1; + } + if (l2) + { + strcpy(s, str2); + s += l2; + } + if (l3) + { + strcpy(s, str3); + s += l3; + } + *s = 0; + return str; +} + +char * +pool_tmpappend(Pool *pool, const char *str1, const char *str2, const char *str3) +{ + int l1, l2, l3; + char *s, *str; + + l1 = str1 ? strlen(str1) : 0; + l2 = str2 ? strlen(str2) : 0; + l3 = str3 ? strlen(str3) : 0; + str = pool_alloctmpspace_free(pool, str1, l1 + l2 + l3 + 1); + if (str) + str1 = str; + else + str = pool_alloctmpspace(pool, l1 + l2 + l3 + 1); + s = str; + if (l1) + { + if (s != str1) + strcpy(s, str1); + s += l1; + } + if (l2) + { + strcpy(s, str2); + s += l2; + } + if (l3) + { + strcpy(s, str3); + s += l3; + } + *s = 0; + return str; +} + +const char * +pool_bin2hex(Pool *pool, const unsigned char *buf, int len) +{ + char *s; + if (!len) + return ""; + s = pool_alloctmpspace(pool, 2 * len + 1); + solv_bin2hex(buf, len, s); + return s; } /*******************************************************************/ @@ -1186,9 +1542,9 @@ solver_fill_DU_cb(void *cbdata, Solvable *s, Repodata *data, Repokey *key, KeyVa struct mptree *mptree; /* create map from dir to mptree */ - cbd->dirmap = sat_free(cbd->dirmap); + cbd->dirmap = solv_free(cbd->dirmap); cbd->nmap = 0; - dirmap = sat_calloc(data->dirpool.ndirs, sizeof(Id)); + dirmap = solv_calloc(data->dirpool.ndirs, sizeof(Id)); mptree = cbd->mptree; mp = 0; for (dn = 2, dirs = data->dirpool.dirs + dn; dn < data->dirpool.ndirs; dn++) @@ -1213,7 +1569,7 @@ solver_fill_DU_cb(void *cbdata, Solvable *s, Repodata *data, Repokey *key, KeyVa if (data->localpool) compstr = stringpool_id2str(&data->spool, comp); else - compstr = id2str(data->repo->pool, comp); + compstr = pool_id2str(data->repo->pool, comp); compl = strlen(compstr); for (i = mptree[mp].child; i; i = mptree[i].sibling) if (mptree[i].compl == compl && !strncmp(mptree[i].comp, compstr, compl)) @@ -1285,7 +1641,7 @@ pool_calc_duchanges(Pool *pool, Map *installedmap, DUChanges *mps, int nmps) cbd.nmap = 0; cbd.olddata = 0; - mptree = sat_extend_resize(0, 1, sizeof(struct mptree), MPTREE_BLOCK); + mptree = solv_extend_resize(0, 1, sizeof(struct mptree), MPTREE_BLOCK); /* our root node */ mptree[0].sibling = 0; @@ -1326,7 +1682,7 @@ pool_calc_duchanges(Pool *pool, Map *installedmap, DUChanges *mps, int nmps) if (!i) { /* create new node */ - mptree = sat_extend(mptree, nmptree, 1, sizeof(struct mptree), MPTREE_BLOCK); + mptree = solv_extend(mptree, nmptree, 1, sizeof(struct mptree), MPTREE_BLOCK); i = nmptree++; mptree[i].sibling = mptree[pos].child; mptree[i].child = 0; @@ -1398,8 +1754,8 @@ pool_calc_duchanges(Pool *pool, Map *installedmap, DUChanges *mps, int nmps) } if (ignoredu.map) map_free(&ignoredu); - sat_free(cbd.dirmap); - sat_free(mptree); + solv_free(cbd.dirmap); + solv_free(mptree); } int @@ -1416,7 +1772,7 @@ pool_calc_installsizechange(Pool *pool, Map *installedmap) continue; if (!MAPTST(installedmap, sp)) continue; - change += solvable_lookup_num(s, SOLVABLE_INSTALLSIZE, 0); + change += solvable_lookup_sizek(s, SOLVABLE_INSTALLSIZE, 0); } if (oldinstalled) { @@ -1424,7 +1780,7 @@ pool_calc_installsizechange(Pool *pool, Map *installedmap) { if (MAPTST(installedmap, sp)) continue; - change -= solvable_lookup_num(s, SOLVABLE_INSTALLSIZE, 0); + change -= solvable_lookup_sizek(s, SOLVABLE_INSTALLSIZE, 0); } } return change; @@ -1447,7 +1803,7 @@ static inline Id dep2name(Pool *pool, Id dep) return dep; } -static int providedbyinstalled_multiversion(Pool *pool, unsigned char *map, Id n, Id dep) +static int providedbyinstalled_multiversion(Pool *pool, unsigned char *map, Id n, Id con) { Id p, pp; Solvable *sn = pool->solvables + n; @@ -1457,9 +1813,12 @@ static int providedbyinstalled_multiversion(Pool *pool, unsigned char *map, Id n Solvable *s = pool->solvables + p; if (s->name != sn->name || s->arch != sn->arch) continue; - if ((map[p] & 9) == 9) - return 1; - } + if ((map[p] & 9) != 9) + continue; + if (pool_match_nevr(pool, pool->solvables + p, con)) + continue; + return 1; /* found installed package that doesn't conflict */ + } return 0; } @@ -1502,7 +1861,7 @@ pool_trivial_installable_noobsoletesmap(Pool *pool, Map *installedmap, Queue *pk unsigned char *map; Solvable *s; - map = sat_calloc(pool->nsolvables, 1); + map = solv_calloc(pool->nsolvables, 1); for (p = 1; p < pool->nsolvables; p++) { if (!MAPTST(installedmap, p)) @@ -1561,7 +1920,7 @@ pool_trivial_installable_noobsoletesmap(Pool *pool, Map *installedmap, Queue *pk { int ispatch = 0; /* see solver.c patch handling */ - if (!strncmp("patch:", id2str(pool, s->name), 6)) + if (!strncmp("patch:", pool_id2str(pool, s->name), 6)) ispatch = 1; conp = s->repo->idarraydata + s->conflicts; while ((con = *conp++) != 0) @@ -1655,18 +2014,22 @@ Id pool_lookup_id(Pool *pool, Id entry, Id keyname) { if (entry == SOLVID_POS && pool->pos.repo) - return repodata_lookup_id(pool->pos.repo->repodata + pool->pos.repodataid, SOLVID_POS, keyname); + { + Repodata *data = pool->pos.repo->repodata + pool->pos.repodataid; + Id id = repodata_lookup_id(data, SOLVID_POS, keyname); + return data->localpool ? repodata_globalize_id(data, id, 1) : id; + } if (entry <= 0) return 0; return solvable_lookup_id(pool->solvables + entry, keyname); } -unsigned int -pool_lookup_num(Pool *pool, Id entry, Id keyname, unsigned int notfound) +unsigned long long +pool_lookup_num(Pool *pool, Id entry, Id keyname, unsigned long long notfound) { if (entry == SOLVID_POS && pool->pos.repo) { - unsigned int value; + unsigned long long value; if (repodata_lookup_num(pool->pos.repo->repodata + pool->pos.repodataid, SOLVID_POS, keyname, &value)) return value; return notfound; @@ -1709,4 +2072,84 @@ pool_lookup_checksum(Pool *pool, Id entry, Id keyname, Id *typep) return solvable_lookup_checksum(pool->solvables + entry, keyname, typep); } -// EOF +const char * +pool_lookup_deltalocation(Pool *pool, Id entry, unsigned int *medianrp) +{ + const char *loc; + if (medianrp) + *medianrp = 0; + if (entry != SOLVID_POS) + return 0; + loc = pool_lookup_str(pool, entry, DELTA_LOCATION_DIR); + loc = pool_tmpjoin(pool, loc, loc ? "/" : 0, pool_lookup_str(pool, entry, DELTA_LOCATION_NAME)); + loc = pool_tmpappend(pool, loc, "-", pool_lookup_str(pool, entry, DELTA_LOCATION_EVR)); + loc = pool_tmpappend(pool, loc, ".", pool_lookup_str(pool, entry, DELTA_LOCATION_SUFFIX)); + return loc; +} + +void +pool_add_fileconflicts_deps(Pool *pool, Queue *conflicts) +{ + int hadhashes = pool->relhashtbl ? 1 : 0; + Solvable *s; + Id fn, p, q, md5; + Id id; + int i; + + if (!conflicts->count) + return; + pool_freewhatprovides(pool); + for (i = 0; i < conflicts->count; i += 5) + { + fn = conflicts->elements[i]; + p = conflicts->elements[i + 1]; + md5 = conflicts->elements[i + 2]; + q = conflicts->elements[i + 3]; + id = pool_rel2id(pool, fn, md5, REL_FILECONFLICT, 1); + s = pool->solvables + p; + if (!s->repo) + continue; + s->provides = repo_addid_dep(s->repo, s->provides, id, SOLVABLE_FILEMARKER); + s = pool->solvables + q; + if (!s->repo) + continue; + s->conflicts = repo_addid_dep(s->repo, s->conflicts, id, 0); + } + if (!hadhashes) + pool_freeidhashes(pool); +} + +char * +pool_prepend_rootdir(Pool *pool, const char *path) +{ + if (!path) + return 0; + if (!pool->rootdir) + return solv_strdup(path); + return solv_dupjoin(pool->rootdir, "/", *path == '/' ? path + 1 : path); +} + +const char * +pool_prepend_rootdir_tmp(Pool *pool, const char *path) +{ + if (!path) + return 0; + if (!pool->rootdir) + return path; + return pool_tmpjoin(pool, pool->rootdir, "/", *path == '/' ? path + 1 : path); +} + +void +pool_set_rootdir(Pool *pool, const char *rootdir) +{ + solv_free(pool->rootdir); + pool->rootdir = solv_strdup(rootdir); +} + +const char * +pool_get_rootdir(Pool *pool) +{ + return pool->rootdir; +} + +/* EOF */