X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fpool.c;h=ecc3686ef688ae0809f00d8a431c9cd526815baa;hb=a52345de1f81f92a1bd69365def64a91cfd782ff;hp=4b6ab433f90b710194c7e4cd959148c8f68bdf58;hpb=eef58960087e9d7b347e77629b0da03b656b8377;p=platform%2Fupstream%2Flibsolv.git diff --git a/src/pool.c b/src/pool.c index 4b6ab43..ecc3686 100644 --- a/src/pool.c +++ b/src/pool.c @@ -7,7 +7,7 @@ /* * pool.c - * + * * The pool contains information about solvables * stored optimized for memory consumption and fast retrieval. */ @@ -19,6 +19,7 @@ #include #include "pool.h" +#include "poolvendor.h" #include "repo.h" #include "poolid.h" #include "poolid_private.h" @@ -29,6 +30,7 @@ #define SOLVABLE_BLOCK 255 +#undef LIBSOLV_KNOWNID_H #define KNOWNID_INITIALIZE #include "knownid.h" #undef KNOWNID_INITIALIZE @@ -55,6 +57,8 @@ pool_create(void) memset(pool->solvables, 0, 2 * sizeof(Solvable)); queue_init(&pool->vendormap); + queue_init(&pool->pooljobs); + queue_init(&pool->lazywhatprovidesq); #if defined(DEBIAN) pool->disttype = DISTTYPE_DEB; @@ -62,6 +66,10 @@ pool_create(void) #elif defined(ARCHLINUX) pool->disttype = DISTTYPE_ARCH; pool->noarchid = ARCH_ANY; +#elif defined(HAIKU) + pool->disttype = DISTTYPE_HAIKU; + pool->noarchid = ARCH_ANY; + pool->obsoleteusesprovides = 1; #else pool->disttype = DISTTYPE_RPM; pool->noarchid = ARCH_NOARCH; @@ -74,10 +82,11 @@ pool_create(void) s->evr = ID_EMPTY; pool->debugmask = SOLV_DEBUG_RESULT; /* FIXME */ -#ifdef FEDORA - pool->obsoleteusescolors = 1; +#if defined(FEDORA) || defined(MAGEIA) + pool->implicitobsoleteusescolors = 1; #endif #ifdef RPM5 + pool->noobsoletesmultiversion = 1; pool->forbidselfconflicts = 1; pool->obsoleteusesprovides = 1; pool->implicitobsoleteusesprovides = 1; @@ -103,11 +112,13 @@ pool_free(Pool *pool) solv_free(pool->rels); pool_setvendorclasses(pool, 0); queue_free(&pool->vendormap); + queue_free(&pool->pooljobs); + queue_free(&pool->lazywhatprovidesq); for (i = 0; i < POOL_TMPSPACEBUF; i++) solv_free(pool->tmpspace.buf[i]); for (i = 0; i < pool->nlanguages; i++) free((char *)pool->languages[i]); - solv_free(pool->languages); + solv_free((void *)pool->languages); solv_free(pool->languagecache); solv_free(pool->errstr); solv_free(pool->rootdir); @@ -120,30 +131,43 @@ pool_freeallrepos(Pool *pool, int reuseids) int i; pool_freewhatprovides(pool); - for (i = 1; i < pool->nrepos; i++) + 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; + 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 +int pool_setdisttype(Pool *pool, int disttype) { +#ifdef MULTI_SEMANTICS + int olddisttype = pool->disttype; + switch(disttype) + { + case DISTTYPE_RPM: + pool->noarchid = ARCH_NOARCH; + break; + case DISTTYPE_DEB: + pool->noarchid = ARCH_ALL; + break; + case DISTTYPE_ARCH: + case DISTTYPE_HAIKU: + pool->noarchid = ARCH_ANY; + break; + default: + return -1; + } 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; -} + return olddisttype; +#else + return pool->disttype == disttype ? disttype : -1; #endif +} int pool_get_flag(Pool *pool, int flag) @@ -160,10 +184,18 @@ pool_get_flag(Pool *pool, int flag) return pool->implicitobsoleteusesprovides; case POOL_FLAG_OBSOLETEUSESCOLORS: return pool->obsoleteusescolors; + case POOL_FLAG_IMPLICITOBSOLETEUSESCOLORS: + return pool->implicitobsoleteusescolors; case POOL_FLAG_NOINSTALLEDOBSOLETES: return pool->noinstalledobsoletes; case POOL_FLAG_HAVEDISTEPOCH: return pool->havedistepoch; + case POOL_FLAG_NOOBSOLETESMULTIVERSION: + return pool->noobsoletesmultiversion; + case POOL_FLAG_ADDFILEPROVIDESFILTERED: + return pool->addfileprovidesfiltered; + case POOL_FLAG_NOWHATPROVIDESAUX: + return pool->nowhatprovidesaux; default: break; } @@ -191,12 +223,24 @@ pool_set_flag(Pool *pool, int flag, int value) case POOL_FLAG_OBSOLETEUSESCOLORS: pool->obsoleteusescolors = value; break; + case POOL_FLAG_IMPLICITOBSOLETEUSESCOLORS: + pool->implicitobsoleteusescolors = value; + break; case POOL_FLAG_NOINSTALLEDOBSOLETES: pool->noinstalledobsoletes = value; break; case POOL_FLAG_HAVEDISTEPOCH: pool->havedistepoch = value; break; + case POOL_FLAG_NOOBSOLETESMULTIVERSION: + pool->noobsoletesmultiversion = value; + break; + case POOL_FLAG_ADDFILEPROVIDESFILTERED: + pool->addfileprovidesfiltered = value; + break; + case POOL_FLAG_NOWHATPROVIDESAUX: + pool->nowhatprovidesaux = value; + break; default: break; } @@ -287,7 +331,7 @@ pool_shrink_whatprovides(Pool *pool) return; 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) + if (pool->whatprovides[id] >= 4) sorted[i++] = id; n = i; solv_sort(sorted, n, sizeof(Id), pool_shrink_whatprovides_sortcmp, pool); @@ -319,11 +363,11 @@ pool_shrink_whatprovides(Pool *pool) lastid = id; } solv_free(sorted); - dp = pool->whatprovidesdata + 2; + dp = pool->whatprovidesdata + 4; for (id = 1; id < pool->ss.nstrings; id++) { o = pool->whatprovides[id]; - if (o == 0 || o == 1) + if (!o) continue; if ((Id)o < 0) { @@ -333,6 +377,8 @@ pool_shrink_whatprovides(Pool *pool) pool->whatprovides[id] = pool->whatprovides[i]; continue; } + if (o < 4) + continue; lp = pool->whatprovidesdata + o; if (lp < dp) abort(); @@ -352,12 +398,40 @@ pool_shrink_whatprovides(Pool *pool) memset(pool->whatprovidesdata + o, 0, r * sizeof(Id)); } +/* this gets rid of all the zeros in the aux */ +static void +pool_shrink_whatprovidesaux(Pool *pool) +{ + int num = pool->whatprovidesauxoff; + Id id; + Offset newoff; + Id *op, *wp = pool->whatprovidesauxdata + 1; + int i; + + for (i = 0; i < num; i++) + { + Offset o = pool->whatprovidesaux[i]; + if (o < 2) + continue; + op = pool->whatprovidesauxdata + o; + pool->whatprovidesaux[i] = wp - pool->whatprovidesauxdata; + if (op < wp) + abort(); + while ((id = *op++) != 0) + *wp++ = id; + } + newoff = wp - pool->whatprovidesauxdata; + pool->whatprovidesauxdata = solv_realloc(pool->whatprovidesauxdata, newoff * sizeof(Id)); + POOL_DEBUG(SOLV_DEBUG_STATS, "shrunk whatprovidesauxdata from %d to %d\n", pool->whatprovidesauxdataoff, newoff); + pool->whatprovidesauxdataoff = newoff; +} + /* * pool_createwhatprovides() - * + * * create hashes over pool of solvables to ease provide lookups - * + * */ void pool_createwhatprovides(Pool *pool) @@ -368,7 +442,8 @@ pool_createwhatprovides(Pool *pool) Id id; Offset *idp, n; Offset *whatprovides; - Id *whatprovidesdata, *d; + Id *whatprovidesdata, *dp, *whatprovidesauxdata; + Offset *whatprovidesaux; Repo *installed = pool->installed; unsigned int now; @@ -408,16 +483,19 @@ pool_createwhatprovides(Pool *pool) } } - off = 2; /* first entry is undef, second is empty list */ + off = 4; /* first entry is undef, second is empty list, third is system solvable */ np = 0; /* number of names provided */ for (i = 0, idp = whatprovides; i < num; i++, idp++) { n = *idp; - if (!n) /* no providers */ - continue; - off += n; /* make space for all providers */ - *idp = off++; /* now idp points to terminating zero */ - np++; /* inc # of provider 'slots' for stats */ + if (!n) /* no providers */ + { + *idp = 1; /* offset for empty list */ + continue; + } + off += n; /* make space for all providers */ + *idp = off++; /* now idp points to terminating zero */ + np++; /* inc # of provider 'slots' for stats */ } POOL_DEBUG(SOLV_DEBUG_STATS, "provide ids: %d\n", np); @@ -431,6 +509,17 @@ pool_createwhatprovides(Pool *pool) /* alloc space for all providers + extra */ whatprovidesdata = solv_calloc(off + extra, sizeof(Id)); + whatprovidesdata[2] = SYSTEMSOLVABLE; + + /* alloc aux vector */ + whatprovidesauxdata = 0; + if (!pool->nowhatprovidesaux) + { + pool->whatprovidesaux = whatprovidesaux = solv_calloc(num, sizeof(Offset)); + pool->whatprovidesauxoff = num; + pool->whatprovidesauxdataoff = off; + pool->whatprovidesauxdata = whatprovidesauxdata = solv_calloc(pool->whatprovidesauxdataoff, sizeof(Id)); + } /* now fill data for all provides */ for (i = pool->nsolvables - 1; i > 0; i--) @@ -446,24 +535,59 @@ pool_createwhatprovides(Pool *pool) pp = s->repo->idarraydata + s->provides; while ((id = *pp++) != 0) { + Id auxid = id; while (ISRELDEP(id)) { Reldep *rd = GETRELDEP(pool, id); id = rd->name; } - d = whatprovidesdata + whatprovides[id]; /* offset into whatprovidesdata */ - if (*d != i) /* don't add same solvable twice */ + dp = whatprovidesdata + whatprovides[id]; /* offset into whatprovidesdata */ + if (*dp != i) /* don't add same solvable twice */ { - d[-1] = i; + dp[-1] = i; whatprovides[id]--; } + else + auxid = 1; + if (whatprovidesauxdata) + whatprovidesauxdata[whatprovides[id]] = auxid; } } + if (pool->whatprovidesaux) + memcpy(pool->whatprovidesaux, pool->whatprovides, num * sizeof(Id)); pool->whatprovidesdata = whatprovidesdata; pool->whatprovidesdataoff = off; pool->whatprovidesdataleft = extra; pool_shrink_whatprovides(pool); + if (pool->whatprovidesaux) + pool_shrink_whatprovidesaux(pool); 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))); + if (pool->whatprovidesaux) + POOL_DEBUG(SOLV_DEBUG_STATS, "whatprovidesaux memory used: %d K id array, %d K data\n", pool->whatprovidesauxoff / (int)(1024/sizeof(Id)), pool->whatprovidesauxdataoff / (int)(1024/sizeof(Id))); + + queue_empty(&pool->lazywhatprovidesq); + if ((!pool->addedfileprovides && pool->disttype == DISTTYPE_RPM) || pool->addedfileprovides == 1) + { + if (!pool->addedfileprovides) + POOL_DEBUG(SOLV_DEBUG_STATS, "WARNING: pool_addfileprovides was not called, this may result in slow operation\n"); + /* lazyly add file provides */ + for (i = 1; i < num; i++) + { + const char *str = pool->ss.stringspace + pool->ss.strings[i]; + if (str[0] != '/') + continue; + if (pool->addedfileprovides == 1 && repodata_filelistfilter_matches(0, str)) + continue; + /* setup lazy adding, but remember old value */ + if (pool->whatprovides[i] > 1) + queue_push2(&pool->lazywhatprovidesq, i, pool->whatprovides[i]); + pool->whatprovides[i] = 0; + if (pool->whatprovidesaux) + pool->whatprovidesaux[i] = 0; /* sorry */ + } + POOL_DEBUG(SOLV_DEBUG_STATS, "lazywhatprovidesq size: %d entries\n", pool->lazywhatprovidesq.count / 2); + } + POOL_DEBUG(SOLV_DEBUG_STATS, "createwhatprovides took %d ms\n", solv_timems(now)); } @@ -480,6 +604,10 @@ pool_freewhatprovides(Pool *pool) pool->whatprovidesdata = solv_free(pool->whatprovidesdata); pool->whatprovidesdataoff = 0; pool->whatprovidesdataleft = 0; + pool->whatprovidesaux = solv_free(pool->whatprovidesaux); + pool->whatprovidesauxdata = solv_free(pool->whatprovidesauxdata); + pool->whatprovidesauxoff = 0; + pool->whatprovidesauxdataoff = 0; } @@ -487,23 +615,24 @@ pool_freewhatprovides(Pool *pool) /* * pool_queuetowhatprovides - add queue contents to whatprovidesdata - * - * on-demand filling of provider information - * move queue data into whatprovidesdata - * q: queue of Ids - * returns: Offset into whatprovides + * + * used for whatprovides, jobs, learnt rules, selections + * input: q: queue of Ids + * returns: Offset into whatprovidesdata * */ + Id -pool_queuetowhatprovides(Pool *pool, Queue *q) +pool_ids2whatprovides(Pool *pool, Id *ids, int count) { Offset off; - int count = q->count; if (count == 0) /* queue empty -> 1 */ return 1; + if (count == 1 && *ids == SYSTEMSOLVABLE) + return 2; - /* extend whatprovidesdata if needed, +1 for ID_NULL-termination */ + /* extend whatprovidesdata if needed, +1 for 0-termination */ if (pool->whatprovidesdataleft < count + 1) { POOL_DEBUG(SOLV_DEBUG_STATS, "growing provides hash data...\n"); @@ -513,16 +642,27 @@ pool_queuetowhatprovides(Pool *pool, Queue *q) /* copy queue to next free slot */ off = pool->whatprovidesdataoff; - memcpy(pool->whatprovidesdata + pool->whatprovidesdataoff, q->elements, count * sizeof(Id)); + memcpy(pool->whatprovidesdata + pool->whatprovidesdataoff, ids, count * sizeof(Id)); - /* adapt count and ID_NULL-terminate */ + /* adapt count and 0-terminate */ pool->whatprovidesdataoff += count; - pool->whatprovidesdata[pool->whatprovidesdataoff++] = ID_NULL; + pool->whatprovidesdata[pool->whatprovidesdataoff++] = 0; pool->whatprovidesdataleft -= count + 1; return (Id)off; } +Id +pool_queuetowhatprovides(Pool *pool, Queue *q) +{ + int count = q->count; + if (count == 0) /* queue empty -> 1 */ + return 1; + if (count == 1 && q->elements[0] == SYSTEMSOLVABLE) + return 2; + return pool_ids2whatprovides(pool, q->elements, count); +} + /*************************************************************************/ @@ -535,6 +675,7 @@ pool_queuetowhatprovides(Pool *pool, Queue *q) #endif /* check if a package's nevr matches a dependency */ +/* semi-private, called from public pool_match_nevr */ int pool_match_nevr_rel(Pool *pool, Solvable *s, Id d) @@ -564,6 +705,11 @@ pool_match_nevr_rel(Pool *pool, Solvable *s, Id d) if (!pool_match_nevr(pool, s, name)) return 0; return pool_match_nevr(pool, s, evr); + case REL_MULTIARCH: + if (evr != ARCH_ANY) + return 0; + /* XXX : need to check for Multi-Arch: allowed! */ + return pool_match_nevr(pool, s, name); default: return 0; } @@ -594,6 +740,11 @@ pool_match_nevr_rel(Pool *pool, Solvable *s, Id d) return 0; } +#if defined(HAIKU) || defined(MULTI_SEMANTICS) +/* forward declaration */ +static int pool_match_flags_evr_rel_compat(Pool *pool, Reldep *range, int flags, int evr); +#endif + /* match (flags, evr) against provider (pflags, pevr) */ static inline int pool_match_flags_evr(Pool *pool, int pflags, Id pevr, int flags, int evr) @@ -606,6 +757,14 @@ pool_match_flags_evr(Pool *pool, int pflags, Id pevr, int flags, int evr) return 1; /* both rels show in the same direction */ if (pevr == evr) return (flags & pflags & REL_EQ) ? 1 : 0; +#if defined(HAIKU) || defined(MULTI_SEMANTICS) + if (ISRELDEP(pevr)) + { + Reldep *rd = GETRELDEP(pool, pevr); + if (rd->flags == REL_COMPAT) + return pool_match_flags_evr_rel_compat(pool, rd, flags, evr); + } +#endif switch (pool_evrcmp(pool, pevr, evr, EVRCMP_DEPCMP)) { case -2: @@ -624,6 +783,27 @@ pool_match_flags_evr(Pool *pool, int pflags, Id pevr, int flags, int evr) return 0; } +#if defined(HAIKU) || defined(MULTI_SEMANTICS) +static int +pool_match_flags_evr_rel_compat(Pool *pool, Reldep *range, int flags, int evr) +{ + /* range->name is the actual version, range->evr the backwards compatibility + version. If flags are '>=' or '>', we match the compatibility version + as well, otherwise only the actual version. */ + if (!(flags & REL_GT) || (flags & REL_LT)) + return pool_match_flags_evr(pool, REL_EQ, range->name, flags, evr); + return pool_match_flags_evr(pool, REL_LT | REL_EQ, range->name, flags, evr) && + pool_match_flags_evr(pool, REL_GT | REL_EQ, range->evr, REL_EQ, evr); +} +#endif + +/* public (i.e. not inlined) version of pool_match_flags_evr */ +int +pool_intersect_evrs(Pool *pool, int pflags, Id pevr, int flags, int evr) +{ + return pool_match_flags_evr(pool, pflags, pevr, flags, evr); +} + /* match two dependencies (d1 = provider) */ int @@ -633,6 +813,45 @@ pool_match_dep(Pool *pool, Id d1, Id d2) if (d1 == d2) return 1; + + if (ISRELDEP(d1)) + { + /* we use potentially matches for complex deps */ + rd1 = GETRELDEP(pool, d1); + if (rd1->flags == REL_AND || rd1->flags == REL_OR || rd1->flags == REL_WITH || rd1->flags == REL_COND) + { + if (pool_match_dep(pool, rd1->name, d2)) + return 1; + if (rd1->flags == REL_COND && ISRELDEP(rd1->evr)) + { + rd1 = GETRELDEP(pool, rd1->evr); + if (rd1->flags != REL_ELSE) + return 0; + } + if (rd1->flags != REL_COND && pool_match_dep(pool, rd1->evr, d2)) + return 1; + return 0; + } + } + if (ISRELDEP(d2)) + { + /* we use potentially matches for complex deps */ + rd2 = GETRELDEP(pool, d2); + if (rd2->flags == REL_AND || rd2->flags == REL_OR || rd2->flags == REL_WITH || rd2->flags == REL_COND) + { + if (pool_match_dep(pool, d1, rd2->name)) + return 1; + if (rd2->flags == REL_COND && ISRELDEP(rd2->evr)) + { + rd2 = GETRELDEP(pool, rd2->evr); + if (rd2->flags != REL_ELSE) + return 0; + } + if (rd2->flags != REL_COND && pool_match_dep(pool, d1, rd2->evr)) + return 1; + return 0; + } + } if (!ISRELDEP(d1)) { if (!ISRELDEP(d2)) @@ -650,30 +869,161 @@ pool_match_dep(Pool *pool, Id d1, Id d2) if (!pool_match_dep(pool, rd1->name, rd2->name)) return 0; /* name matches, check flags and evr */ - return pool_match_flags_evr(pool, rd1->flags, rd1->evr, rd2->flags, rd2->evr); + return pool_intersect_evrs(pool, rd1->flags, rd1->evr, rd2->flags, rd2->evr); +} + +Id +pool_searchlazywhatprovidesq(Pool *pool, Id d) +{ + int start = 0; + int end = pool->lazywhatprovidesq.count; + Id *elements; + if (!end) + return 0; + elements = pool->lazywhatprovidesq.elements; + while (end - start > 16) + { + int mid = (start + end) / 2 & ~1; + if (elements[mid] == d) + return elements[mid + 1]; + if (elements[mid] < d) + start = mid + 2; + else + end = mid; + } + for (; start < end; start += 2) + if (elements[start] == d) + return elements[start + 1]; + return 0; +} + +/* + * addstdproviders + * + * lazy populating of the whatprovides array, non relation case + */ +static Id +pool_addstdproviders(Pool *pool, Id d) +{ + const char *str; + Queue q; + Id qbuf[16]; + Dataiterator di; + Id oldoffset; + + if (pool->addedfileprovides == 2) + { + pool->whatprovides[d] = 1; + return 1; + } + str = pool->ss.stringspace + pool->ss.strings[d]; + if (*str != '/') + { + pool->whatprovides[d] = 1; + return 1; + } + queue_init_buffer(&q, qbuf, sizeof(qbuf)/sizeof(*qbuf)); + dataiterator_init(&di, pool, 0, 0, SOLVABLE_FILELIST, str, SEARCH_STRING|SEARCH_FILES|SEARCH_COMPLETE_FILELIST); + for (; dataiterator_step(&di); dataiterator_skip_solvable(&di)) + { + Solvable *s = pool->solvables + di.solvid; + /* XXX: maybe should add a provides dependency to the solvables + * OTOH this is only needed for rel deps that filter the provides, + * and those should not use filelist entries */ + if (s->repo->disabled) + continue; + if (s->repo != pool->installed && !pool_installable(pool, s)) + continue; + queue_push(&q, di.solvid); + } + dataiterator_free(&di); + oldoffset = pool_searchlazywhatprovidesq(pool, d); + if (!q.count) + pool->whatprovides[d] = oldoffset ? oldoffset : 1; + else + { + if (oldoffset) + { + Id *oo = pool->whatprovidesdata + oldoffset; + int i; + /* unify both queues. easy, as we know both are sorted */ + for (i = 0; i < q.count; i++) + { + if (*oo > q.elements[i]) + continue; + if (*oo < q.elements[i]) + queue_insert(&q, i, *oo); + oo++; + if (!*oo) + break; + } + while (*oo) + queue_push(&q, *oo++); + if (q.count == oo - (pool->whatprovidesdata + oldoffset)) + { + /* end result has same size as oldoffset -> no new entries */ + queue_free(&q); + pool->whatprovides[d] = oldoffset; + return oldoffset; + } + } + pool->whatprovides[d] = pool_queuetowhatprovides(pool, &q); + } + queue_free(&q); + return pool->whatprovides[d]; +} + + +static inline int +pool_is_kind(Pool *pool, Id name, Id kind) +{ + const char *n; + if (!kind) + return 1; + n = pool_id2str(pool, name); + if (kind != 1) + { + const char *kn = pool_id2str(pool, kind); + int knl = strlen(kn); + return !strncmp(n, kn, knl) && n[knl] == ':' ? 1 : 0; + } + else + { + if (*n == ':') + return 1; + while(*n >= 'a' && *n <= 'z') + n++; + return *n == ':' ? 0 : 1; + } } /* * addrelproviders - * + * * add packages fulfilling the relation to whatprovides array - * no exact providers, do range match - * + * + * some words about REL_AND and REL_IF: we assume the best case + * here, so that you get a "potential" result if you ask for a match. + * E.g. if you ask for "whatrequires A" and package X contains + * "Requires: A & B", you'll get "X" as an answer. */ - Id pool_addrelproviders(Pool *pool, Id d) { - Reldep *rd = GETRELDEP(pool, d); + Reldep *rd; Reldep *prd; Queue plist; Id buf[16]; - Id name = rd->name; - Id evr = rd->evr; - int flags = rd->flags; + Id name, evr, flags; Id pid, *pidp; Id p, *pp; + if (!ISRELDEP(d)) + return pool_addstdproviders(pool, d); + rd = GETRELDEP(pool, d); + name = rd->name; + evr = rd->evr; + flags = rd->flags; d = GETRELID(d); queue_init_buffer(&plist, buf, sizeof(buf)/sizeof(*buf)); @@ -685,7 +1035,6 @@ pool_addrelproviders(Pool *pool, Id d) switch (flags) { - case REL_AND: case REL_WITH: wp = pool_whatprovides(pool, name); pp2 = pool_whatprovides_ptr(pool, evr); @@ -701,24 +1050,49 @@ pool_addrelproviders(Pool *pool, Id d) wp = 0; } break; + + case REL_AND: case REL_OR: + case REL_COND: + if (flags == REL_COND) + { + if (ISRELDEP(evr)) + { + Reldep *rd2 = GETRELDEP(pool, evr); + evr = rd2->flags == REL_ELSE ? rd2->evr : 0; + } + else + evr = 0; /* assume cond is true */ + } wp = pool_whatprovides(pool, name); - pp = pool->whatprovidesdata + wp; - if (!*pp) - wp = pool_whatprovides(pool, evr); - else + if (!pool->whatprovidesdata[wp]) + wp = evr ? pool_whatprovides(pool, evr) : 1; + else if (evr) { - 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) + /* sorted merge */ + pp2 = pool_whatprovides_ptr(pool, evr); + pp = pool->whatprovidesdata + wp; + while (*pp && *pp2) + { + if (*pp < *pp2) + queue_push(&plist, *pp++); + else + { + if (*pp == *pp2) + pp++; + queue_push(&plist, *pp2++); + } + } + while (*pp) + queue_push(&plist, *pp++); + while (*pp2) + queue_push(&plist, *pp2++); + /* if the number of elements did not change, we can reuse wp */ + if (pp - (pool->whatprovidesdata + wp) != plist.count) wp = 0; } break; + case REL_NAMESPACE: if (name == NAMESPACE_OTHERPROVIDERS) { @@ -753,7 +1127,21 @@ pool_addrelproviders(Pool *pool, Id d) continue; if (s->arch != evr && s->arch != ARCH_NOSRC) continue; - if (pool_match_nevr(pool, s, name)) + if (pool_disabled_solvable(pool, s)) + continue; + if (!name || pool_match_nevr(pool, s, name)) + queue_push(&plist, p); + } + break; + } + if (!name) + { + FOR_POOL_SOLVABLES(p) + { + Solvable *s = pool->solvables + p; + if (s->repo != pool->installed && !pool_installable(pool, s)) + continue; + if (s->arch == evr) queue_push(&plist, p); } break; @@ -769,6 +1157,37 @@ pool_addrelproviders(Pool *pool, Id d) wp = 0; } break; + case REL_MULTIARCH: + if (evr != ARCH_ANY) + break; + /* XXX : need to check for Multi-Arch: allowed! */ + wp = pool_whatprovides(pool, name); + break; + case REL_KIND: + /* package kind filtering */ + if (!name) + { + FOR_POOL_SOLVABLES(p) + { + Solvable *s = pool->solvables + p; + if (s->repo != pool->installed && !pool_installable(pool, s)) + continue; + if (pool_is_kind(pool, s->name, evr)) + queue_push(&plist, p); + } + break; + } + wp = pool_whatprovides(pool, name); + pp = pool->whatprovidesdata + wp; + while ((p = *pp++) != 0) + { + Solvable *s = pool->solvables + p; + if (pool_is_kind(pool, s->name, evr)) + queue_push(&plist, p); + else + wp = 0; + } + break; case REL_FILECONFLICT: pp = pool_whatprovides_ptr(pool, name); while ((p = *pp++) != 0) @@ -798,11 +1217,14 @@ pool_addrelproviders(Pool *pool, Id d) } else if (flags) { + Id *ppaux = 0; /* simple version comparison relation */ #if 0 POOL_DEBUG(SOLV_DEBUG_STATS, "addrelproviders: what provides %s?\n", pool_dep2str(pool, name)); #endif pp = pool_whatprovides_ptr(pool, name); + if (!ISRELDEP(name) && name < pool->whatprovidesauxoff) + ppaux = pool->whatprovidesaux[name] ? pool->whatprovidesauxdata + pool->whatprovidesaux[name] : 0; while (ISRELDEP(name)) { rd = GETRELDEP(pool, name); @@ -811,6 +1233,34 @@ pool_addrelproviders(Pool *pool, Id d) while ((p = *pp++) != 0) { Solvable *s = pool->solvables + p; + if (ppaux) + { + pid = *ppaux++; + if (pid && pid != 1) + { +#if 0 + POOL_DEBUG(SOLV_DEBUG_STATS, "addrelproviders: aux hit %d %s\n", p, pool_dep2str(pool, pid)); +#endif + if (!ISRELDEP(pid)) + { + if (pid != name) + continue; /* wrong provides name */ + if (pool->disttype == DISTTYPE_DEB) + continue; /* unversioned provides can never match versioned deps */ + } + else + { + prd = GETRELDEP(pool, pid); + if (prd->name != name) + continue; /* wrong provides name */ + /* right package, both deps are rels. check flags/evr */ + if (!pool_match_flags_evr(pool, prd->flags, prd->evr, flags, evr)) + continue; + } + queue_push(&plist, p); + continue; + } + } if (!s->provides) { /* no provides - check nevr */ @@ -855,6 +1305,46 @@ pool_addrelproviders(Pool *pool, Id d) return pool->whatprovides_rel[d]; } +void +pool_flush_namespaceproviders(Pool *pool, Id ns, Id evr) +{ + int nrels = pool->nrels; + Id d; + Reldep *rd; + + if (!pool->whatprovides_rel) + return; + for (d = 1, rd = pool->rels + d; d < nrels; d++, rd++) + { + if (rd->flags != REL_NAMESPACE || rd->name == NAMESPACE_OTHERPROVIDERS) + continue; + if (ns && rd->name != ns) + continue; + if (evr && rd->evr != evr) + continue; + pool->whatprovides_rel[d] = 0; + } +} + +/* intersect dependencies in keyname with dep, return list of matching packages */ +void +pool_whatmatchesdep(Pool *pool, Id keyname, Id dep, Queue *q, int marker) +{ + Id p; + + queue_empty(q); + FOR_POOL_SOLVABLES(p) + { + Solvable *s = pool->solvables + p; + if (s->repo->disabled) + continue; + if (s->repo != pool->installed && !pool_installable(pool, s)) + continue; + if (solvable_matchesdep(s, keyname, dep, marker)) + queue_push(q, p); + } +} + /*************************************************************************/ void @@ -955,364 +1445,10 @@ void pool_setloadcallback(Pool *pool, int (*cb)(struct _Pool *, struct _Repodata pool->loadcallbackdata = loadcbdata; } -/*************************************************************************/ - -struct searchfiles { - Id *ids; - char **dirs; - char **names; - int nfiles; - Map seen; -}; - -#define SEARCHFILES_BLOCK 127 - -static void -pool_addfileprovides_dep(Pool *pool, Id *ida, struct searchfiles *sf, struct searchfiles *isf) +void pool_setnamespacecallback(Pool *pool, Id (*cb)(struct _Pool *, void *, Id, Id), void *nscbdata) { - Id dep, sid; - const char *s, *sr; - struct searchfiles *csf; - - while ((dep = *ida++) != 0) - { - csf = sf; - while (ISRELDEP(dep)) - { - Reldep *rd; - sid = pool->ss.nstrings + GETRELID(dep); - if (MAPTST(&csf->seen, sid)) - { - dep = 0; - break; - } - MAPSET(&csf->seen, sid); - rd = GETRELDEP(pool, dep); - if (rd->flags < 8) - dep = rd->name; - else if (rd->flags == REL_NAMESPACE) - { - if (rd->name == NAMESPACE_INSTALLED || rd->name == NAMESPACE_SPLITPROVIDES) - { - csf = isf; - if (!csf || MAPTST(&csf->seen, sid)) - { - dep = 0; - break; - } - MAPSET(&csf->seen, sid); - } - dep = rd->evr; - } - else if (rd->flags == REL_FILECONFLICT) - { - dep = 0; - break; - } - else - { - Id ids[2]; - ids[0] = rd->name; - ids[1] = 0; - pool_addfileprovides_dep(pool, ids, csf, isf); - dep = rd->evr; - } - } - if (!dep) - continue; - if (MAPTST(&csf->seen, dep)) - continue; - MAPSET(&csf->seen, dep); - s = pool_id2str(pool, dep); - if (*s != '/') - continue; - 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] = 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; - csf->nfiles++; - } -} - -struct addfileprovides_cbdata { - int nfiles; - Id *ids; - char **dirs; - char **names; - - Id *dids; - - Map providedids; - - Map useddirs; -}; - -static int -addfileprovides_cb(void *cbdata, Solvable *s, Repodata *data, Repokey *key, KeyValue *value) -{ - struct addfileprovides_cbdata *cbd = cbdata; - int i; - - if (!cbd->useddirs.size) - { - map_init(&cbd->useddirs, data->dirpool.ndirs + 1); - for (i = 0; i < cbd->nfiles; i++) - { - 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); - } - repodata_free_dircache(data); - } - if (value->id >= data->dirpool.ndirs || !MAPTST(&cbd->useddirs, value->id)) - return 0; - for (i = 0; i < cbd->nfiles; i++) - { - if (cbd->dids[i] != value->id) - continue; - if (!strcmp(cbd->names[i], value->str)) - break; - } - if (i == cbd->nfiles) - return 0; - s->provides = repo_addid_dep(s->repo, s->provides, cbd->ids[i], SOLVABLE_FILEMARKER); - return 0; -} - -static void -pool_addfileprovides_search(Pool *pool, struct addfileprovides_cbdata *cbd, struct searchfiles *sf, Repo *repoonly) -{ - 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->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 (;;) - { - if (!repo || repo->disabled) - { - if (repoonly || ++repoid == pool->nrepos) - break; - repo = pool->repos[repoid]; - continue; - } - ndone = 0; - FOR_REPODATAS(repo, repodataid, data) - { - if (ndone >= repo->nsolvables) - break; - - if (repodata_lookup_idarray(data, SOLVID_META, REPOSITORY_ADDEDFILEPROVIDES, &fileprovidesq)) - { - 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 (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 (!repodata_has_keyname(data, SOLVABLE_FILELIST)) - continue; - - if (data->start < provstart || data->end > provend) - { - 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; - 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; - } - } - - /* 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 (repoonly || ++repoid == pool->nrepos) - break; - repo = pool->repos[repoid]; - } - map_free(&donemap); - queue_free(&fileprovidesq); - map_free(&cbd->providedids); -} - -void -pool_addfileprovides_queue(Pool *pool, Queue *idq, Queue *idqinst) -{ - Solvable *s; - 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++) - { - repo = s->repo; - if (!repo) - continue; - if (s->obsoletes) - pool_addfileprovides_dep(pool, repo->idarraydata + s->obsoletes, &sf, isfp); - if (s->conflicts) - pool_addfileprovides_dep(pool, repo->idarraydata + s->conflicts, &sf, isfp); - if (s->requires) - pool_addfileprovides_dep(pool, repo->idarraydata + s->requires, &sf, isfp); - if (s->recommends) - pool_addfileprovides_dep(pool, repo->idarraydata + s->recommends, &sf, isfp); - if (s->suggests) - pool_addfileprovides_dep(pool, repo->idarraydata + s->suggests, &sf, isfp); - if (s->supplements) - pool_addfileprovides_dep(pool, repo->idarraydata + s->supplements, &sf, isfp); - if (s->enhances) - pool_addfileprovides_dep(pool, repo->idarraydata + s->enhances, &sf, isfp); - } - map_free(&sf.seen); - map_free(&isf.seen); - POOL_DEBUG(SOLV_DEBUG_STATS, "found %d file dependencies, %d installed file dependencies\n", sf.nfiles, isf.nfiles); - cbd.dids = 0; - if (sf.nfiles) - { -#if 0 - for (i = 0; i < sf.nfiles; 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 (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++) - { - solv_free(sf.dirs[i]); - solv_free(sf.names[i]); - } - solv_free(sf.dirs); - solv_free(sf.names); - } - if (isf.nfiles) - { -#if 0 - for (i = 0; i < isf.nfiles; 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); - 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++) - { - solv_free(isf.dirs[i]); - solv_free(isf.names[i]); - } - solv_free(isf.dirs); - solv_free(isf.names); - } - 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_queue(pool, 0, 0); + pool->nscallback = cb; + pool->nscallbackdata = nscbdata; } void @@ -1336,7 +1472,6 @@ pool_clear_pos(Pool *pool) memset(&pool->pos, 0, sizeof(pool->pos)); } - void pool_set_languages(Pool *pool, const char **languages, int nlanguages) { @@ -1344,12 +1479,9 @@ pool_set_languages(Pool *pool, const char **languages, int nlanguages) pool->languagecache = solv_free(pool->languagecache); pool->languagecacheother = 0; - if (pool->nlanguages) - { - for (i = 0; i < pool->nlanguages; i++) - free((char *)pool->languages[i]); - free(pool->languages); - } + for (i = 0; i < pool->nlanguages; i++) + free((char *)pool->languages[i]); + pool->languages = solv_free((void *)pool->languages); pool->nlanguages = nlanguages; if (!nlanguages) return; @@ -1506,311 +1638,31 @@ pool_bin2hex(Pool *pool, const unsigned char *buf, int len) return s; } -/*******************************************************************/ - -struct mptree { - Id sibling; - Id child; - const char *comp; - int compl; - Id mountpoint; -}; - -struct ducbdata { - DUChanges *mps; - struct mptree *mptree; - int addsub; - int hasdu; - - Id *dirmap; - int nmap; - Repodata *olddata; -}; - - -static int -solver_fill_DU_cb(void *cbdata, Solvable *s, Repodata *data, Repokey *key, KeyValue *value) -{ - struct ducbdata *cbd = cbdata; - Id mp; - - if (data != cbd->olddata) - { - Id dn, mp, comp, *dirmap, *dirs; - int i, compl; - const char *compstr; - struct mptree *mptree; - - /* create map from dir to mptree */ - cbd->dirmap = solv_free(cbd->dirmap); - cbd->nmap = 0; - 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++) - { - comp = *dirs++; - if (comp <= 0) - { - mp = dirmap[-comp]; - continue; - } - if (mp < 0) - { - /* unconnected */ - dirmap[dn] = mp; - continue; - } - if (!mptree[mp].child) - { - dirmap[dn] = -mp; - continue; - } - if (data->localpool) - compstr = stringpool_id2str(&data->spool, comp); - else - 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)) - break; - dirmap[dn] = i ? i : -mp; - } - /* change dirmap to point to mountpoint instead of mptree */ - for (dn = 0; dn < data->dirpool.ndirs; dn++) - { - mp = dirmap[dn]; - dirmap[dn] = mptree[mp > 0 ? mp : -mp].mountpoint; - } - cbd->dirmap = dirmap; - cbd->nmap = data->dirpool.ndirs; - cbd->olddata = data; - } - cbd->hasdu = 1; - if (value->id < 0 || value->id >= cbd->nmap) - return 0; - mp = cbd->dirmap[value->id]; - if (mp < 0) - return 0; - if (cbd->addsub > 0) - { - cbd->mps[mp].kbytes += value->num; - cbd->mps[mp].files += value->num2; - } - else - { - cbd->mps[mp].kbytes -= value->num; - cbd->mps[mp].files -= value->num2; - } - return 0; -} - -static void -propagate_mountpoints(struct mptree *mptree, int pos, Id mountpoint) -{ - int i; - if (mptree[pos].mountpoint == -1) - mptree[pos].mountpoint = mountpoint; - else - mountpoint = mptree[pos].mountpoint; - for (i = mptree[pos].child; i; i = mptree[i].sibling) - propagate_mountpoints(mptree, i, mountpoint); -} - -#define MPTREE_BLOCK 15 - -void -pool_calc_duchanges(Pool *pool, Map *installedmap, DUChanges *mps, int nmps) -{ - char *p; - const char *path, *compstr; - struct mptree *mptree; - int i, nmptree; - int pos, compl; - int mp; - struct ducbdata cbd; - Solvable *s; - Id sp; - Map ignoredu; - Repo *oldinstalled = pool->installed; - - memset(&ignoredu, 0, sizeof(ignoredu)); - cbd.mps = mps; - cbd.addsub = 0; - cbd.dirmap = 0; - cbd.nmap = 0; - cbd.olddata = 0; - - mptree = solv_extend_resize(0, 1, sizeof(struct mptree), MPTREE_BLOCK); - - /* our root node */ - mptree[0].sibling = 0; - mptree[0].child = 0; - mptree[0].comp = 0; - mptree[0].compl = 0; - mptree[0].mountpoint = -1; - nmptree = 1; - - /* create component tree */ - for (mp = 0; mp < nmps; mp++) - { - mps[mp].kbytes = 0; - mps[mp].files = 0; - pos = 0; - path = mps[mp].path; - while(*path == '/') - path++; - while (*path) - { - if ((p = strchr(path, '/')) == 0) - { - compstr = path; - compl = strlen(compstr); - path += compl; - } - else - { - compstr = path; - compl = p - path; - path = p + 1; - while(*path == '/') - path++; - } - for (i = mptree[pos].child; i; i = mptree[i].sibling) - if (mptree[i].compl == compl && !strncmp(mptree[i].comp, compstr, compl)) - break; - if (!i) - { - /* create new node */ - mptree = solv_extend(mptree, nmptree, 1, sizeof(struct mptree), MPTREE_BLOCK); - i = nmptree++; - mptree[i].sibling = mptree[pos].child; - mptree[i].child = 0; - mptree[i].comp = compstr; - mptree[i].compl = compl; - mptree[i].mountpoint = -1; - mptree[pos].child = i; - } - pos = i; - } - mptree[pos].mountpoint = mp; - } - - propagate_mountpoints(mptree, 0, mptree[0].mountpoint); - -#if 0 - for (i = 0; i < nmptree; i++) - { - printf("#%d sibling: %d\n", i, mptree[i].sibling); - printf("#%d child: %d\n", i, mptree[i].child); - printf("#%d comp: %s\n", i, mptree[i].comp); - printf("#%d compl: %d\n", i, mptree[i].compl); - printf("#%d mountpont: %d\n", i, mptree[i].mountpoint); - } -#endif - - cbd.mptree = mptree; - cbd.addsub = 1; - for (sp = 1, s = pool->solvables + sp; sp < pool->nsolvables; sp++, s++) - { - if (!s->repo || (oldinstalled && s->repo == oldinstalled)) - continue; - if (!MAPTST(installedmap, sp)) - continue; - cbd.hasdu = 0; - repo_search(s->repo, sp, SOLVABLE_DISKUSAGE, 0, 0, solver_fill_DU_cb, &cbd); - if (!cbd.hasdu && oldinstalled) - { - Id op, opp; - /* no du data available, ignore data of all installed solvables we obsolete */ - if (!ignoredu.map) - map_init(&ignoredu, oldinstalled->end - oldinstalled->start); - if (s->obsoletes) - { - Id obs, *obsp = s->repo->idarraydata + s->obsoletes; - while ((obs = *obsp++) != 0) - FOR_PROVIDES(op, opp, obs) - if (op >= oldinstalled->start && op < oldinstalled->end) - MAPSET(&ignoredu, op - oldinstalled->start); - } - FOR_PROVIDES(op, opp, s->name) - if (pool->solvables[op].name == s->name) - if (op >= oldinstalled->start && op < oldinstalled->end) - MAPSET(&ignoredu, op - oldinstalled->start); - } - } - cbd.addsub = -1; - if (oldinstalled) - { - /* assumes we allways have du data for installed solvables */ - FOR_REPO_SOLVABLES(oldinstalled, sp, s) - { - if (MAPTST(installedmap, sp)) - continue; - if (ignoredu.map && MAPTST(&ignoredu, sp - oldinstalled->start)) - continue; - repo_search(oldinstalled, sp, SOLVABLE_DISKUSAGE, 0, 0, solver_fill_DU_cb, &cbd); - } - } - if (ignoredu.map) - map_free(&ignoredu); - solv_free(cbd.dirmap); - solv_free(mptree); -} - -int -pool_calc_installsizechange(Pool *pool, Map *installedmap) -{ - Id sp; - Solvable *s; - int change = 0; - Repo *oldinstalled = pool->installed; - - for (sp = 1, s = pool->solvables + sp; sp < pool->nsolvables; sp++, s++) - { - if (!s->repo || (oldinstalled && s->repo == oldinstalled)) - continue; - if (!MAPTST(installedmap, sp)) - continue; - change += solvable_lookup_sizek(s, SOLVABLE_INSTALLSIZE, 0); - } - if (oldinstalled) - { - FOR_REPO_SOLVABLES(oldinstalled, sp, s) - { - if (MAPTST(installedmap, sp)) - continue; - change -= solvable_lookup_sizek(s, SOLVABLE_INSTALLSIZE, 0); - } - } - return change; -} - /* map: * 1: installed * 2: conflicts with installed * 8: interesting (only true if installed) * 16: undecided */ - + static inline Id dep2name(Pool *pool, Id dep) { while (ISRELDEP(dep)) { - Reldep *rd = rd = GETRELDEP(pool, dep); + Reldep *rd = GETRELDEP(pool, dep); dep = rd->name; } return dep; } -static int providedbyinstalled_multiversion(Pool *pool, unsigned char *map, Id n, Id con) +static int providedbyinstalled_multiversion(Pool *pool, unsigned char *map, Id n, Id con) { Id p, pp; - Solvable *sn = pool->solvables + n; + Solvable *sn = pool->solvables + n; FOR_PROVIDES(p, pp, sn->name) - { - Solvable *s = pool->solvables + p; + { + Solvable *s = pool->solvables + p; if (s->name != sn->name || s->arch != sn->arch) continue; if ((map[p] & 9) != 9) @@ -1822,7 +1674,7 @@ static int providedbyinstalled_multiversion(Pool *pool, unsigned char *map, Id n return 0; } -static inline int providedbyinstalled(Pool *pool, unsigned char *map, Id dep, int ispatch, Map *noobsoletesmap) +static inline int providedbyinstalled(Pool *pool, unsigned char *map, Id dep, int ispatch, Map *multiversionmap) { Id p, pp; int r = 0; @@ -1832,7 +1684,7 @@ static inline int providedbyinstalled(Pool *pool, unsigned char *map, Id dep, in return 1; /* always boring, as never constraining */ if (ispatch && !pool_match_nevr(pool, pool->solvables + p, dep)) continue; - if (ispatch && noobsoletesmap && noobsoletesmap->size && MAPTST(noobsoletesmap, p) && ISRELDEP(dep)) + if (ispatch && multiversionmap && multiversionmap->size && MAPTST(multiversionmap, p) && ISRELDEP(dep)) if (providedbyinstalled_multiversion(pool, map, p, dep)) continue; if ((map[p] & 9) == 9) @@ -1854,7 +1706,7 @@ static inline int providedbyinstalled(Pool *pool, unsigned char *map, Id dep, in */ void -pool_trivial_installable_noobsoletesmap(Pool *pool, Map *installedmap, Queue *pkgs, Queue *res, Map *noobsoletesmap) +pool_trivial_installable_multiversionmap(Pool *pool, Map *installedmap, Queue *pkgs, Queue *res, Map *multiversionmap) { int i, r, m, did; Id p, *dp, con, *conp, req, *reqp; @@ -1907,9 +1759,12 @@ pool_trivial_installable_noobsoletesmap(Pool *pool, Map *installedmap, Queue *pk { /* decided and miss */ map[p] = 2; + did = 0; break; } - m |= r; /* 1 | 9 | 16 | 17 */ + if (r == 16) + break; /* undecided */ + m |= r; /* 1 | 9 | 17 */ } if (req) continue; @@ -1925,15 +1780,16 @@ pool_trivial_installable_noobsoletesmap(Pool *pool, Map *installedmap, Queue *pk conp = s->repo->idarraydata + s->conflicts; while ((con = *conp++) != 0) { - if ((providedbyinstalled(pool, map, con, ispatch, noobsoletesmap) & 1) != 0) + if ((providedbyinstalled(pool, map, con, ispatch, multiversionmap) & 1) != 0) { map[p] = 2; + did = 0; break; } if ((m == 1 || m == 17) && ISRELDEP(con)) { con = dep2name(pool, con); - if ((providedbyinstalled(pool, map, con, ispatch, noobsoletesmap) & 1) != 0) + if ((providedbyinstalled(pool, map, con, ispatch, multiversionmap) & 1) != 0) m = 9; } } @@ -1997,14 +1853,14 @@ pool_trivial_installable_noobsoletesmap(Pool *pool, Map *installedmap, Queue *pk void pool_trivial_installable(Pool *pool, Map *installedmap, Queue *pkgs, Queue *res) { - pool_trivial_installable_noobsoletesmap(pool, installedmap, pkgs, res, 0); + pool_trivial_installable_multiversionmap(pool, installedmap, pkgs, res, 0); } const char * pool_lookup_str(Pool *pool, Id entry, Id keyname) { if (entry == SOLVID_POS && pool->pos.repo) - return repodata_lookup_str(pool->pos.repo->repodata + pool->pos.repodataid, SOLVID_POS, keyname); + return repo_lookup_str(pool->pos.repo, pool->pos.repodataid ? entry : pool->pos.solvid, keyname); if (entry <= 0) return 0; return solvable_lookup_str(pool->solvables + entry, keyname); @@ -2014,11 +1870,7 @@ Id pool_lookup_id(Pool *pool, Id entry, Id keyname) { if (entry == SOLVID_POS && pool->pos.repo) - { - 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; - } + return repo_lookup_id(pool->pos.repo, pool->pos.repodataid ? entry : pool->pos.solvid, keyname); if (entry <= 0) return 0; return solvable_lookup_id(pool->solvables + entry, keyname); @@ -2028,12 +1880,7 @@ unsigned long long pool_lookup_num(Pool *pool, Id entry, Id keyname, unsigned long long notfound) { if (entry == SOLVID_POS && pool->pos.repo) - { - unsigned long long value; - if (repodata_lookup_num(pool->pos.repo->repodata + pool->pos.repodataid, SOLVID_POS, keyname, &value)) - return value; - return notfound; - } + return repo_lookup_num(pool->pos.repo, pool->pos.repodataid ? entry : pool->pos.solvid, keyname, notfound); if (entry <= 0) return notfound; return solvable_lookup_num(pool->solvables + entry, keyname, notfound); @@ -2043,7 +1890,7 @@ int pool_lookup_void(Pool *pool, Id entry, Id keyname) { if (entry == SOLVID_POS && pool->pos.repo) - return repodata_lookup_void(pool->pos.repo->repodata + pool->pos.repodataid, SOLVID_POS, keyname); + return repo_lookup_void(pool->pos.repo, pool->pos.repodataid ? entry : pool->pos.solvid, keyname); if (entry <= 0) return 0; return solvable_lookup_void(pool->solvables + entry, keyname); @@ -2053,7 +1900,7 @@ const unsigned char * pool_lookup_bin_checksum(Pool *pool, Id entry, Id keyname, Id *typep) { if (entry == SOLVID_POS && pool->pos.repo) - return repodata_lookup_bin_checksum(pool->pos.repo->repodata + pool->pos.repodataid, SOLVID_POS, keyname, typep); + return repo_lookup_bin_checksum(pool->pos.repo, pool->pos.repodataid ? entry : pool->pos.solvid, keyname, typep); if (entry <= 0) return 0; return solvable_lookup_bin_checksum(pool->solvables + entry, keyname, typep); @@ -2063,15 +1910,22 @@ const char * pool_lookup_checksum(Pool *pool, Id entry, Id keyname, Id *typep) { if (entry == SOLVID_POS && pool->pos.repo) - { - const unsigned char *chk = repodata_lookup_bin_checksum(pool->pos.repo->repodata + pool->pos.repodataid, SOLVID_POS, keyname, typep); - return chk ? repodata_chk2str(pool->pos.repo->repodata + pool->pos.repodataid, *typep, chk) : 0; - } + return repo_lookup_checksum(pool->pos.repo, pool->pos.repodataid ? entry : pool->pos.solvid, keyname, typep); if (entry <= 0) return 0; return solvable_lookup_checksum(pool->solvables + entry, keyname, typep); } +int +pool_lookup_idarray(Pool *pool, Id entry, Id keyname, Queue *q) +{ + if (entry == SOLVID_POS && pool->pos.repo) + return repo_lookup_idarray(pool->pos.repo, pool->pos.repodataid ? entry : pool->pos.solvid, keyname, q); + if (entry <= 0) + return 0; + return solvable_lookup_idarray(pool->solvables + entry, keyname, q); +} + const char * pool_lookup_deltalocation(Pool *pool, Id entry, unsigned int *medianrp) { @@ -2087,6 +1941,41 @@ pool_lookup_deltalocation(Pool *pool, Id entry, unsigned int *medianrp) return loc; } +static void +add_new_provider(Pool *pool, Id id, Id p) +{ + Queue q; + Id *pp; + + while (ISRELDEP(id)) + { + Reldep *rd = GETRELDEP(pool, id); + id = rd->name; + } + + queue_init(&q); + for (pp = pool->whatprovidesdata + pool->whatprovides[id]; *pp; pp++) + { + if (*pp == p) + { + queue_free(&q); + return; + } + if (*pp > p) + { + queue_push(&q, p); + p = 0; + } + queue_push(&q, *pp); + } + if (p) + queue_push(&q, p); + pool->whatprovides[id] = pool_queuetowhatprovides(pool, &q); + if (id < pool->whatprovidesauxoff) + pool->whatprovidesaux[id] = 0; /* sorry */ + queue_free(&q); +} + void pool_add_fileconflicts_deps(Pool *pool, Queue *conflicts) { @@ -2098,18 +1987,21 @@ pool_add_fileconflicts_deps(Pool *pool, Queue *conflicts) if (!conflicts->count) return; - pool_freewhatprovides(pool); - for (i = 0; i < conflicts->count; i += 5) + for (i = 0; i < conflicts->count; i += 6) { fn = conflicts->elements[i]; p = conflicts->elements[i + 1]; md5 = conflicts->elements[i + 2]; - q = conflicts->elements[i + 3]; + q = conflicts->elements[i + 4]; 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); + if (pool->whatprovides) + add_new_provider(pool, fn, p); + if (pool->whatprovides_rel) + pool->whatprovides_rel[GETRELID(id)] = 0; /* clear cache */ s = pool->solvables + q; if (!s->repo) continue; @@ -2152,4 +2044,11 @@ pool_get_rootdir(Pool *pool) return pool->rootdir; } +/* only used in libzypp */ +void +pool_set_custom_vendorcheck(Pool *pool, int (*vendorcheck)(Pool *, Solvable *, Solvable *)) +{ + pool->custom_vendorcheck = vendorcheck; +} + /* EOF */