From: Michael Schroeder Date: Fri, 4 Oct 2013 14:43:52 +0000 (+0200) Subject: refactor selection code, add SELECTION_SKIP_KIND, add support for arch/kind filtering X-Git-Tag: upstream/0.6.4~204 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=def5c271d0d1bd7c3ab365acba60646298892c31;p=platform%2Fupstream%2Flibsolv.git refactor selection code, add SELECTION_SKIP_KIND, add support for arch/kind filtering --- diff --git a/src/pool.c b/src/pool.c index 6f790ff..fd8de89 100644 --- a/src/pool.c +++ b/src/pool.c @@ -846,6 +846,29 @@ pool_addstdproviders(Pool *pool, Id 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 * @@ -950,7 +973,19 @@ pool_addrelproviders(Pool *pool, Id d) continue; if (pool_disabled_solvable(pool, s)) continue; - if (pool_match_nevr(pool, s, name)) + 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; @@ -966,6 +1001,31 @@ pool_addrelproviders(Pool *pool, Id d) wp = 0; } 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) diff --git a/src/pool.h b/src/pool.h index eb1a9ac..edcca56 100644 --- a/src/pool.h +++ b/src/pool.h @@ -213,6 +213,7 @@ struct _Pool { #define REL_FILECONFLICT 21 #define REL_COND 22 #define REL_COMPAT 23 +#define REL_KIND 24 /* for filters only */ #if !defined(__GNUC__) && !defined(__attribute__) # define __attribute__(x) diff --git a/src/poolid.c b/src/poolid.c index cc1b6f5..3fa1ed4 100644 --- a/src/poolid.c +++ b/src/poolid.c @@ -186,6 +186,8 @@ pool_id2rel(const Pool *pool, Id id) return " IF "; case REL_COMPAT: return " compat >= "; + case REL_KIND: + return " KIND "; default: break; } @@ -240,6 +242,15 @@ dep2strcpy(const Pool *pool, char *p, Id id, int oldrel) strcat(p, ")"); return; } + if (rd->flags == REL_KIND) + { + dep2strcpy(pool, p, rd->evr, rd->flags); + p += strlen(p); + *p++ = ':'; + id = rd->name; + oldrel = rd->flags; + continue; + } dep2strcpy(pool, p, rd->name, rd->flags); p += strlen(p); if (rd->flags == REL_NAMESPACE) diff --git a/src/selection.c b/src/selection.c index fb1baf6..9e7f9eb 100644 --- a/src/selection.c +++ b/src/selection.c @@ -279,7 +279,7 @@ selection_filter_installed(Pool *pool, Queue *selection) } if (select) { - selection->elements[j++] = select | (selection->elements[i] & ~SOLVER_SELECTMASK); + selection->elements[j++] = select | (selection->elements[i] & ~SOLVER_SELECTMASK) | SOLVER_SETREPO; selection->elements[j++] = id; } } @@ -335,12 +335,85 @@ selection_addsrc(Pool *pool, Queue *selection, int flags) queue_free(&q); } +static inline const char * +skipkind(const char *n) +{ + const char *s; + for (s = n; *s >= 'a' && *s <= 'z'; s++) + ; + if (*s == ':' && s != n) + return s + 1; + return n; +} + +static inline void +queue_pushunique2(Queue *q, Id id1, Id id2) +{ + int i; + for (i = 0; i < q->count; i += 2) + if (q->elements[i] == id1 && q->elements[i + 1] == id2) + return; + queue_push2(q, id1, id2); +} + +static int +selection_depglob_id(Pool *pool, Queue *selection, Id id, int flags) +{ + Id p, pp; + int match = 0; + + FOR_PROVIDES(p, pp, id) + { + Solvable *s = pool->solvables + p; + if ((flags & SELECTION_INSTALLED_ONLY) != 0 && s->repo != pool->installed) + continue; + match = 1; + if (s->name == id && (flags & SELECTION_NAME) != 0) + { + if ((flags & SELECTION_SOURCE_ONLY) != 0) + id = pool_rel2id(pool, id, ARCH_SRC, REL_ARCH, 1); + queue_push2(selection, SOLVER_SOLVABLE_NAME, id); + if ((flags & SELECTION_WITH_SOURCE) != 0) + selection_addsrc(pool, selection, flags); + return SELECTION_NAME; + } + } + if ((flags & (SELECTION_SOURCE_ONLY | SELECTION_WITH_SOURCE)) != 0 && (flags & SELECTION_NAME) != 0) + { + /* src rpms don't have provides, so we must check every solvable */ + FOR_POOL_SOLVABLES(p) /* slow path */ + { + Solvable *s = pool->solvables + p; + if (s->name == id && (s->arch == ARCH_SRC || s->arch == ARCH_NOSRC)) + { + if ((flags & SELECTION_INSTALLED_ONLY) != 0 && s->repo != pool->installed) + continue; /* just in case... src rpms can't be installed */ + if (pool_disabled_solvable(pool, s)) + continue; + if ((flags & SELECTION_SOURCE_ONLY) != 0) + id = pool_rel2id(pool, id, ARCH_SRC, REL_ARCH, 1); + queue_push2(selection, SOLVER_SOLVABLE_NAME, id); + if ((flags & SELECTION_WITH_SOURCE) != 0) + selection_addsrc(pool, selection, flags); + return SELECTION_NAME; + } + } + } + if (match && (flags & SELECTION_PROVIDES) != 0) + { + queue_push2(selection, SOLVER_SOLVABLE_PROVIDES, id); + return SELECTION_PROVIDES; + } + return 0; +} + static int selection_depglob(Pool *pool, Queue *selection, const char *name, int flags) { Id id, p, pp; - int i, match = 0; + int match = 0; int doglob = 0; + int nocase = 0; int globflags = 0; if ((flags & SELECTION_SOURCE_ONLY) != 0) @@ -355,121 +428,56 @@ selection_depglob(Pool *pool, Queue *selection, const char *name, int flags) if ((flags & SELECTION_INSTALLED_ONLY) != 0 && !pool->installed) return 0; - if (!(flags & SELECTION_NOCASE)) + nocase = flags & SELECTION_NOCASE; + if (!nocase && !(flags & SELECTION_SKIP_KIND)) { id = pool_str2id(pool, name, 0); if (id) { - if ((flags & (SELECTION_SOURCE_ONLY | SELECTION_WITH_SOURCE)) != 0 && (flags & SELECTION_NAME) != 0) - { - /* src rpms don't have provides, so we must check every solvable */ - FOR_PROVIDES(p, pp, id) /* try fast path first */ - { - Solvable *s = pool->solvables + p; - if (s->name == id) - { - if ((flags & SELECTION_INSTALLED_ONLY) != 0 && s->repo != pool->installed) - continue; - if ((flags & SELECTION_SOURCE_ONLY) != 0) - id = pool_rel2id(pool, id, ARCH_SRC, REL_ARCH, 1); - queue_push2(selection, SOLVER_SOLVABLE_NAME, id); - if ((flags & SELECTION_WITH_SOURCE) != 0) - selection_addsrc(pool, selection, flags); - return SELECTION_NAME; - } - } - FOR_POOL_SOLVABLES(p) /* slow path */ - { - Solvable *s = pool->solvables + p; - if (s->name == id && (s->arch == ARCH_SRC || s->arch == ARCH_NOSRC)) - { - if ((flags & SELECTION_INSTALLED_ONLY) != 0 && s->repo != pool->installed) - continue; /* just in case... src rpms can't be installed */ - if (pool_disabled_solvable(pool, s)) - continue; - if ((flags & SELECTION_SOURCE_ONLY) != 0) - id = pool_rel2id(pool, id, ARCH_SRC, REL_ARCH, 1); - queue_push2(selection, SOLVER_SOLVABLE_NAME, id); - if ((flags & SELECTION_WITH_SOURCE) != 0) - selection_addsrc(pool, selection, flags); - return SELECTION_NAME; - } - } - } - FOR_PROVIDES(p, pp, id) - { - Solvable *s = pool->solvables + p; - if ((flags & SELECTION_INSTALLED_ONLY) != 0 && s->repo != pool->installed) - continue; - match = 1; - if (s->name == id && (flags & SELECTION_NAME) != 0) - { - if ((flags & SELECTION_SOURCE_ONLY) != 0) - id = pool_rel2id(pool, id, ARCH_SRC, REL_ARCH, 1); - queue_push2(selection, SOLVER_SOLVABLE_NAME, id); - if ((flags & SELECTION_WITH_SOURCE) != 0) - selection_addsrc(pool, selection, flags); - return SELECTION_NAME; - } - } - if (match && (flags & SELECTION_PROVIDES) != 0) - { - queue_push2(selection, SOLVER_SOLVABLE_PROVIDES, id); - return SELECTION_PROVIDES; - } + /* the id is know, do the fast id matching using the whatprovides lookup */ + int ret = selection_depglob_id(pool, selection, id, flags); + if (ret) + return ret; } } if ((flags & SELECTION_GLOB) != 0 && strpbrk(name, "[*?") != 0) doglob = 1; - if (!doglob && !(flags & SELECTION_NOCASE)) - return 0; + if (!nocase && !(flags & SELECTION_SKIP_KIND) && !doglob) + return 0; /* all done above in depglob_id */ - if (doglob && (flags & SELECTION_NOCASE) != 0) + if (doglob && nocase) globflags = FNM_CASEFOLD; -#if 0 /* doesn't work with selection_filter_rel yet */ - if (doglob && !strcmp(name, "*") && (flags & SELECTION_FLAT) != 0) - { - /* can't do this for SELECTION_PROVIDES, as src rpms don't provide anything */ - if ((flags & SELECTION_NAME) != 0) - { - queue_push2(selection, SOLVER_SOLVABLE_ALL, 0); - return SELECTION_NAME; - } - } -#endif - if ((flags & SELECTION_NAME) != 0) { /* looks like a name glob. hard work. */ FOR_POOL_SOLVABLES(p) - { - Solvable *s = pool->solvables + p; - if (s->repo != pool->installed && !pool_installable(pool, s)) + { + Solvable *s = pool->solvables + p; + const char *n; + if (s->repo != pool->installed && !pool_installable(pool, s)) { if (!(flags & SELECTION_SOURCE_ONLY) || (s->arch != ARCH_SRC && s->arch != ARCH_NOSRC)) - continue; + continue; if (pool_disabled_solvable(pool, s)) continue; } if ((flags & SELECTION_INSTALLED_ONLY) != 0 && s->repo != pool->installed) continue; - id = s->name; - if ((doglob ? fnmatch(name, pool_id2str(pool, id), globflags) : strcasecmp(name, pool_id2str(pool, id))) == 0) - { + id = s->name; + n = pool_id2str(pool, id); + if (flags & SELECTION_SKIP_KIND) + n = skipkind(n); + if ((doglob ? fnmatch(name, n, globflags) : nocase ? strcasecmp(name, n) : strcmp(name, n)) == 0) + { if ((flags & SELECTION_SOURCE_ONLY) != 0) id = pool_rel2id(pool, id, ARCH_SRC, REL_ARCH, 1); - /* queue_pushunique2 */ - for (i = 0; i < selection->count; i += 2) - if (selection->elements[i] == SOLVER_SOLVABLE_NAME && selection->elements[i + 1] == id) - break; - if (i == selection->count) - queue_push2(selection, SOLVER_SOLVABLE_NAME, id); - match = 1; - } - } + queue_pushunique2(selection, SOLVER_SOLVABLE_NAME, id); + match = 1; + } + } if (match) { if ((flags & SELECTION_WITH_SOURCE) != 0) @@ -477,15 +485,18 @@ selection_depglob(Pool *pool, Queue *selection, const char *name, int flags) return SELECTION_NAME; } } + if ((flags & SELECTION_PROVIDES)) { /* looks like a dep glob. really hard work. */ for (id = 1; id < pool->ss.nstrings; id++) - { - if (!pool->whatprovides[id] || pool->whatprovides[id] == 1) - continue; - if ((doglob ? fnmatch(name, pool_id2str(pool, id), globflags) : strcasecmp(name, pool_id2str(pool, id))) == 0) - { + { + const char *n; + if (!pool->whatprovides[id] || pool->whatprovides[id] == 1) + continue; + n = pool_id2str(pool, id); + if ((doglob ? fnmatch(name, n, globflags) : nocase ? strcasecmp(name, n) : strcmp(name, n)) == 0) + { if ((flags & SELECTION_INSTALLED_ONLY) != 0) { FOR_PROVIDES(p, pp, id) @@ -495,9 +506,9 @@ selection_depglob(Pool *pool, Queue *selection, const char *name, int flags) continue; } queue_push2(selection, SOLVER_SOLVABLE_PROVIDES, id); - match = 1; - } - } + match = 1; + } + } if (match) return SELECTION_PROVIDES; } @@ -948,11 +959,34 @@ selection_make_matchdeps(Pool *pool, Queue *selection, const char *name, int fla return SELECTION_PROVIDES; } +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; + } +} + void selection_filter(Pool *pool, Queue *sel1, Queue *sel2) { int i, j, miss; - Id p, pp; + Id p, pp, q1filled = 0; Queue q1; Map m2; Id setflags = 0; @@ -990,6 +1024,38 @@ selection_filter(Pool *pool, Queue *sel1, Queue *sel2) } else { + if ((select == SOLVER_SOLVABLE_NAME || select == SOLVER_SOLVABLE_PROVIDES) && ISRELDEP(sel2->elements[i + 1])) + { + Reldep *rd = GETRELDEP(pool, sel2->elements[i + 1]); + if (rd->flags == REL_ARCH && rd->name == 0) + { + /* special arch filter */ + if (!q1filled++) + selection_solvables(pool, sel1, &q1); + for (j = 0; j < q1.count; j++) + { + Id p = q1.elements[j]; + Solvable *s = pool->solvables + p; + if (s->arch == rd->evr || (rd->evr == ARCH_SRC && s->arch == ARCH_NOSRC)) + map_set(&m2, p); + } + continue; + } + else if (rd->flags == REL_KIND && rd->name == 0) + { + /* special kind filter */ + if (!q1filled++) + selection_solvables(pool, sel1, &q1); + for (j = 0; j < q1.count; j++) + { + Id p = q1.elements[j]; + Solvable *s = pool->solvables + p; + if (pool_is_kind(pool, s->name, rd->evr)) + map_set(&m2, p); + } + continue; + } + } FOR_JOB_SELECT(p, pp, select, sel2->elements[i + 1]) map_set(&m2, p); } diff --git a/src/selection.h b/src/selection.h index 8f4d04b..1908476 100644 --- a/src/selection.h +++ b/src/selection.h @@ -32,6 +32,7 @@ extern "C" { #define SELECTION_NOCASE (1 << 11) #define SELECTION_SOURCE_ONLY (1 << 12) #define SELECTION_WITH_SOURCE (1 << 13) +#define SELECTION_SKIP_KIND (1 << 14) extern int selection_make(Pool *pool, Queue *selection, const char *name, int flags); extern int selection_make_matchdeps(Pool *pool, Queue *selection, const char *name, int flags, int keyname, int marker);