#include "policy.h"
#include "poolvendor.h"
#include "poolarch.h"
+#include "linkedpkg.h"
#include "cplxdeps.h"
+
/*-----------------------------------------------------------------*/
/*
{
if (pool->solvables[plist->elements[i]].name != name)
{
+ name = pool->solvables[plist->elements[i]].name;
if (pq.count > 2)
solver_prune_to_highest_prio(solv, &pq);
for (k = 0; k < pq.count; k++)
plist->elements[j++] = pq.elements[k];
queue_empty(&pq);
- queue_push(&pq, plist->elements[i]);
- name = pool->solvables[pq.elements[0]].name;
}
+ queue_push(&pq, plist->elements[i]);
}
if (pq.count > 2)
solver_prune_to_highest_prio(solv, &pq);
#ifdef ENABLE_COMPLEX_DEPS
+/* simple fixed-size hash for package ids */
+#define CPLXDEPHASH_EMPTY(elements) (memset(elements, 0, sizeof(Id) * 256))
+#define CPLXDEPHASH_SET(elements, p) (elements[(p) & 255] |= (1 << ((p) >> 8 & 31)))
+#define CPLXDEPHASH_TST(elements, p) (elements[(p) & 255] && (elements[(p) & 255] & (1 << ((p) >> 8 & 31))))
+
static void
check_complex_dep(Solver *solv, Id dep, Map *m, Queue **cqp)
{
qcnt = q.count;
for (i = 0; i < qcnt; i++)
{
- for (; (p = q.elements[i]) != 0; i++)
+ /* we rely on the fact that blocks are ordered here.
+ * if we reach a positive element, we know that we
+ * saw all negative ones */
+ for (; (p = q.elements[i]) < 0; i++)
{
- if (p < 0)
- {
- if (solv->decisionmap[-p] > 0)
- continue;
- if (solv->decisionmap[-p] < 0)
- break;
- queue_push(&q, -p);
- }
- if (p > 0 && qcnt == q.count)
- MAPSET(m, p);
+ if (solv->decisionmap[-p] < 0)
+ break;
+ if (solv->decisionmap[-p] == 0)
+ queue_push(&q, -p); /* undecided negative literal */
}
- if (q.elements[i])
+ if (p <= 0)
{
#if 0
- printf("complex dep block cannot be true\n");
+ printf("complex dep block cannot be true or no pos literals\n");
#endif
while (q.elements[i])
i++;
if (qcnt != q.count)
queue_truncate(&q, qcnt);
+ continue;
}
- else if (qcnt != q.count)
+ if (qcnt == q.count)
{
+ /* all negative literals installed, add positive literals to map */
+ for (; (p = q.elements[i]) != 0; i++)
+ MAPSET(m, p);
+ }
+ else
+ {
+ /* at least one undecided negative literal, postpone */
int j, k;
- Queue *cq = *cqp;
+ Queue *cq;
#if 0
printf("add new complex dep block\n");
for (j = qcnt; j < q.count; j++)
printf(" - %s\n", pool_solvid2str(pool, q.elements[j]));
#endif
- if (!cq)
+ while (q.elements[i])
+ i++;
+ if (!(cq = *cqp))
{
cq = solv_calloc(1, sizeof(Queue));
queue_init(cq);
+ queue_insertn(cq, 0, 256, 0); /* allocate hash area */
*cqp = cq;
- queue_insertn(cq, 0, 256, 0);
}
for (j = qcnt; j < q.count; j++)
{
p = q.elements[j];
+ /* check if we already have this (dep, p) entry */
for (k = 256; k < cq->count; k += 2)
if (cq->elements[k + 1] == dep && cq->elements[k] == p)
break;
if (k == cq->count)
{
+ /* a new one. add to cq and hash */
queue_push2(cq, p, dep);
- cq->elements[p & 255] |= (1 << (p >> 8 & 31));
+ CPLXDEPHASH_SET(cq->elements, p);
}
}
queue_truncate(&q, qcnt);
}
static void
-recheck_complex_dep(Solver *solv, Id p, Map *m, Queue **cqp)
+recheck_complex_deps(Solver *solv, Id p, Map *m, Queue **cqp)
{
Queue *cq = *cqp;
+ Id pp;
int i;
#if 0
- printf("recheck_complex_dep for package %s\n", pool_solvid2str(solv->pool, p));
+ printf("recheck_complex_deps for package %s\n", pool_solvid2str(solv->pool, p));
#endif
+ /* make sure that we don't have a false hit */
for (i = 256; i < cq->count; i += 2)
if (cq->elements[i] == p)
break;
return; /* false alert */
if (solv->decisionmap[p] <= 0)
return; /* just in case... */
- memset(cq->elements, 0, sizeof(Id) * 256);
+
+ /* rebuild the hash, call check_complex_dep for our package */
+ CPLXDEPHASH_EMPTY(cq->elements);
for (i = 256; i < cq->count; i += 2)
- if (cq->elements[i] == p)
+ if ((pp = cq->elements[i]) == p)
{
Id dep = cq->elements[i + 1];
queue_deleten(cq, i, 2);
check_complex_dep(solv, dep, m, &cq);
}
else
- {
- Id pp = cq->elements[i];
- cq->elements[pp & 255] |= (1 << (pp >> 8 & 31));
- }
+ CPLXDEPHASH_SET(cq->elements, pp);
}
#endif
continue;
s = pool->solvables + p;
#ifdef ENABLE_COMPLEX_DEPS
- if (solv->recommendscplxq && solv->recommendscplxq->elements[p & 255])
- if (solv->recommendscplxq->elements[p & 255] & (1 << (p >> 8 & 31)))
- recheck_complex_dep(solv, p, &solv->recommendsmap, &solv->recommendscplxq);
- if (solv->suggestscplxq && solv->suggestscplxq->elements[p & 255])
- if (solv->suggestscplxq->elements[p & 255] & (1 << (p >> 8 & 31)))
- recheck_complex_dep(solv, p, &solv->suggestsmap, &solv->suggestscplxq);
+ /* re-check postponed complex blocks */
+ if (solv->recommendscplxq && CPLXDEPHASH_TST(solv->recommendscplxq->elements, p))
+ recheck_complex_deps(solv, p, &solv->recommendsmap, &solv->recommendscplxq);
+ if (solv->suggestscplxq && CPLXDEPHASH_TST(solv->suggestscplxq->elements, p))
+ recheck_complex_deps(solv, p, &solv->suggestsmap, &solv->suggestscplxq);
#endif
if (s->recommends)
{
}
}
+static int
+sort_by_favorq_cmp(const void *ap, const void *bp, void *dp)
+{
+ const Id *a = ap, *b = bp, *d = dp;
+ return d[b[0]] - d[a[0]];
+}
+
+static void
+sort_by_favorq(Queue *favorq, Id *el, int cnt)
+{
+ int i;
+ /* map to offsets into favorq */
+ for (i = 0; i < cnt; i++)
+ {
+ Id p = el[i];
+ /* lookup p in sorted favorq */
+ int med = 0, low = 0;
+ int high = favorq->count / 2;
+ while (low != high)
+ {
+ med = (low + high) / 2;
+ Id pp = favorq->elements[2 * med];
+ if (pp < p)
+ low = med;
+ else if (pp > p)
+ high = med;
+ else
+ break;
+ }
+ while(med && favorq->elements[2 * med - 2] == p)
+ med--;
+ if (favorq->elements[2 * med] == p)
+ el[i] = 2 * med + 1;
+ else
+ el[i] = 0; /* hmm */
+ }
+ /* sort by position */
+ solv_sort(el, cnt, sizeof(Id), sort_by_favorq_cmp, favorq->elements);
+ /* map back */
+ for (i = 0; i < cnt; i++)
+ if (el[i])
+ el[i] = favorq->elements[el[i] - 1];
+}
+
+/* bring favored packages to front and disfavored packages to back */
+void
+policy_prefer_favored(Solver *solv, Queue *plist)
+{
+ int i, fav, disfav, count;
+ if (!solv->favormap.size)
+ return;
+ for (i = fav = disfav = 0, count = plist->count; i < count; i++)
+ {
+ Id p = plist->elements[i];
+ if (!MAPTST(&solv->favormap, p))
+ continue;
+ if (solv->isdisfavormap.size && MAPTST(&solv->isdisfavormap, p))
+ {
+ /* disfavored package. bring to back */
+ if (i < plist->count - 1)
+ {
+ memmove(plist->elements + i, plist->elements + i + 1, (plist->count - 1 - i) * sizeof(Id));
+ plist->elements[plist->count - 1] = p;
+ }
+ i--;
+ count--;
+ disfav++;
+ }
+ else
+ {
+ /* favored package. bring to front */
+ if (i > fav)
+ memmove(plist->elements + fav + 1, plist->elements + fav, (i - fav) * sizeof(Id));
+ plist->elements[fav++] = p;
+ }
+ }
+ /* if we have multiple favored/disfavored packages, sort by favorq index */
+ if (fav > 1)
+ sort_by_favorq(solv->favorq, plist->elements, fav);
+ if (disfav > 1)
+ sort_by_favorq(solv->favorq, plist->elements + plist->count - disfav, disfav);
+}
+
/*
* prune to recommended/suggested packages.
* does not prune installed packages (they are also somewhat recommended).
void
prune_to_best_version(Pool *pool, Queue *plist)
{
- int i, j;
+ int i, j, r;
Solvable *s, *best;
if (plist->count < 2) /* no need to prune for a single entry */
best = s; /* take current as new best */
continue;
}
-
- if (best->evr != s->evr) /* compare evr */
- {
- if (pool_evrcmp(pool, best->evr, s->evr, EVRCMP_COMPARE) < 0)
- best = s;
- }
+ r = best->evr != s->evr ? pool_evrcmp(pool, best->evr, s->evr, EVRCMP_COMPARE) : 0;
+#ifdef ENABLE_LINKED_PKGS
+ if (r == 0 && has_package_link(pool, s))
+ r = pool_link_evrcmp(pool, best, s);
+#endif
+ if (r < 0)
+ best = s;
}
plist->elements[j++] = best - pool->solvables; /* finish last group */
plist->count = j;
Id r = aa[1] - bb[1];
if (r)
return r < 0 ? -1 : 1;
+ if (aa[2] == bb[2])
+ return 0;
a = aa[2] < 0 ? -aa[2] : aa[2];
b = bb[2] < 0 ? -bb[2] : bb[2];
- if (pool->disttype != DISTTYPE_DEB)
- {
- /* treat release-less versions different */
- const char *as = pool_id2str(pool, a);
- const char *bs = pool_id2str(pool, b);
- if (strchr(as, '-'))
- {
- if (!strchr(bs, '-'))
- return -2;
- }
- else
- {
- if (strchr(bs, '-'))
- return 2;
- }
- }
- r = pool_evrcmp(pool, b, a, EVRCMP_COMPARE);
+ r = pool_evrcmp(pool, b, a, pool->disttype != DISTTYPE_DEB ? EVRCMP_MATCH_RELEASE : EVRCMP_COMPARE);
if (!r && (aa[2] < 0 || bb[2] < 0))
{
if (bb[2] >= 0)
if (aa[2] >= 0)
return -1;
}
- if (r)
- return r < 0 ? -1 : 1;
- return 0;
+ return r;
}
/* common end of sort_by_srcversion and sort_by_common_dep */
}
}
+
+/* special lang package handling for urpm */
+/* see https://bugs.mageia.org/show_bug.cgi?id=18315 */
+
+static int
+urpm_reorder_cmp(const void *ap, const void *bp, void *dp)
+{
+ return ((Id *)bp)[1] - ((Id *)ap)[1];
+}
+
+static void
+urpm_reorder(Solver *solv, Queue *plist)
+{
+ Pool *pool = solv->pool;
+ int i, count = plist->count;
+ /* add locale score to packages */
+ queue_insertn(plist, count, count, 0);
+ for (i = count - 1; i >= 0; i--)
+ {
+ Solvable *s = pool->solvables + plist->elements[i];
+ int score = 1;
+ const char *sn = pool_id2str(pool, s->name);
+
+ if (!strncmp(sn, "kernel-", 7))
+ {
+ const char *devel = strstr(sn, "-devel-");
+ if (devel && strlen(sn) < 256)
+ {
+ char kn[256];
+ Id p, pp, knid;
+ memcpy(kn, sn, devel - sn);
+ strcpy(kn + (devel - sn), devel + 6);
+ knid = pool_str2id(pool, kn, 0);
+ if (knid)
+ {
+ FOR_PROVIDES(p, pp, knid)
+ {
+ if (solv->decisionmap[p] > 0)
+ {
+ score = 4;
+ break;
+ }
+ else if (pool->installed && pool->solvables[p].repo == pool->installed)
+ score = 3;
+ }
+ }
+ }
+ }
+ else if ((sn = strstr(sn, "-kernel-")) != 0)
+ {
+ sn += 8;
+ if (strlen(sn) < 256 - 8 && *sn >= '0' && *sn <= '9' && sn[1] == '.')
+ {
+ const char *flavor = strchr(sn, '-');
+ if (flavor)
+ {
+ const char *release = strchr(flavor + 1, '-');
+ if (release)
+ {
+ char kn[256];
+ Id p, pp, knid;
+ memcpy(kn, "kernel", 8);
+ memcpy(kn + 6, flavor, release - flavor + 1);
+ memcpy(kn + 6 + (release - flavor) + 1, sn, flavor - sn);
+ strcpy(kn + 6 + (release + 1 - sn), release);
+ knid = pool_str2id(pool, kn, 0);
+ if (knid)
+ {
+ FOR_PROVIDES(p, pp, knid)
+ {
+ if (solv->decisionmap[p] > 0)
+ {
+ score = 4;
+ break;
+ }
+ if (pool->installed && pool->solvables[p].repo == pool->installed)
+ score = 3;
+ }
+ }
+ }
+ }
+ }
+ }
+ if (score == 1 && s->requires)
+ {
+ Id id, *idp, p, pp;
+ const char *deps;
+ for (idp = s->repo->idarraydata + s->requires; (id = *idp) != 0; idp++)
+ {
+ while (ISRELDEP(id))
+ {
+ Reldep *rd = GETRELDEP(pool, id);
+ id = rd->name;
+ }
+ deps = strstr(pool_id2str(pool, id), "locales-");
+ if (!deps)
+ continue;
+ if (!strncmp(deps + 8, "en", 2))
+ score = 2;
+ else
+ {
+ score = 0;
+ FOR_PROVIDES(p, pp, id)
+ {
+ if (solv->decisionmap[p] > 0)
+ {
+ score = 4;
+ break;
+ }
+ if (pool->installed && pool->solvables[p].repo == pool->installed)
+ score = 3;
+ }
+ break;
+ }
+ }
+ }
+ plist->elements[i * 2] = plist->elements[i];
+ plist->elements[i * 2 + 1] = score;
+ }
+ solv_sort(plist->elements, count, sizeof(Id) * 2, urpm_reorder_cmp, pool);
+ for (i = 0; i < count; i++)
+ plist->elements[i] = plist->elements[2 * i];
+ queue_truncate(plist, count);
+}
+
+
/*
* POLICY_MODE_CHOOSE: default, do all pruning steps
* POLICY_MODE_RECOMMEND: leave out prune_to_recommended
policy_filter_unwanted(Solver *solv, Queue *plist, int mode)
{
Pool *pool = solv->pool;
+ if (mode == POLICY_MODE_SUPPLEMENT)
+ {
+ /* reorder only */
+ dislike_old_versions(pool, plist);
+ sort_by_common_dep(pool, plist);
+ if (solv->urpmreorder)
+ urpm_reorder(solv, plist);
+ prefer_suggested(solv, plist);
+ policy_prefer_favored(solv, plist);
+ return;
+ }
if (plist->count > 1)
{
if (mode != POLICY_MODE_SUGGEST)
prune_to_best_arch(pool, plist);
if (plist->count > 1)
prune_to_best_version(pool, plist);
- if (plist->count > 1 && mode == POLICY_MODE_CHOOSE)
+ if (plist->count > 1 && (mode == POLICY_MODE_CHOOSE || mode == POLICY_MODE_CHOOSE_NOREORDER))
{
prune_to_recommended(solv, plist);
- if (plist->count > 1)
+ if (plist->count > 1 && mode != POLICY_MODE_CHOOSE_NOREORDER)
{
/* do some fancy reordering */
#if 0
#endif
dislike_old_versions(pool, plist);
sort_by_common_dep(pool, plist);
+ if (solv->urpmreorder)
+ urpm_reorder(solv, plist);
prefer_suggested(solv, plist);
+ policy_prefer_favored(solv, plist);
}
}
}
+void
+pool_best_solvables(Pool *pool, Queue *plist, int flags)
+{
+ if (plist->count > 1)
+ prune_to_highest_prio(pool, plist);
+ if (plist->count > 1)
+ prune_to_best_arch(pool, plist);
+ if (plist->count > 1)
+ prune_to_best_version(pool, plist);
+ if (plist->count > 1)
+ {
+ dislike_old_versions(pool, plist);
+ sort_by_common_dep(pool, plist);
+ }
+}
+
/* check if there is an illegal architecture change if
* installed solvable s1 is replaced by s2 */
}
else if (!allownamechange)
continue;
- else if (!solv->noupdateprovide && ps->obsoletes) /* provides/obsoletes combination ? */
+ else if ((!solv->noupdateprovide || solv->needupdateprovide) && ps->obsoletes) /* provides/obsoletes combination ? */
{
/* check if package ps obsoletes installed package s */
/* implicitobsoleteusescolors is somewhat wrong here, but we nevertheless
return;
/* if we have found some valid candidates and noupdateprovide is not set, we're
done. otherwise we fallback to all obsoletes */
- if (!solv->noupdateprovide && haveprovobs)
+ if (solv->needupdateprovide || (!solv->noupdateprovide && haveprovobs))
return;
if (solv->obsoletes && solv->obsoletes[n - solv->installed->start])
{
projects / platform / upstream / libsolv.git / blobdiff