October 2007 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r7701 - in /trunk/sat-solver: doc/ src/ tools/
by mlschroe＠svn.opensuse.org 30 Oct '07

30 Oct '07

Author: mlschroe Date: Tue Oct 30 12:27:12 2007 New Revision: 7701 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7701&view=rev Log: - add vendor id to solvables Modified: trunk/sat-solver/doc/PLANNING trunk/sat-solver/src/pool.c trunk/sat-solver/src/pool.h trunk/sat-solver/src/repo_solv.c trunk/sat-solver/src/solvable.h trunk/sat-solver/src/solver.c trunk/sat-solver/tools/dumpsolv.c trunk/sat-solver/tools/repo_content.c trunk/sat-solver/tools/repo_helix.c trunk/sat-solver/tools/repo_rpmdb.c trunk/sat-solver/tools/repo_rpmmd.c trunk/sat-solver/tools/repo_susetags.c trunk/sat-solver/tools/repo_susetags.h trunk/sat-solver/tools/repo_write.c trunk/sat-solver/tools/susetags2solv.c Modified: trunk/sat-solver/doc/PLANNING URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/doc/PLANNING?rev=7701… ============================================================================== --- trunk/sat-solver/doc/PLANNING (original) +++ trunk/sat-solver/doc/PLANNING Tue Oct 30 12:27:12 2007 @@ -24,11 +24,11 @@ How to express and, or, not within a .spec file ? See 'extended reldeps' below -6. Locale supplements +6. Locale supplements [DONE] support local(de), locale(de,at,ch) and locale(<package>:de) eventually extend 'package' to reldep, e.g. locale(package > 5.3-2:de) -7. Modalias supplements +7. Modalias supplements [DONE] support modalias(<modalias-regexp>) and modalias(<package>:<modalias-regexp>) eventually extend 'package' to reldep, e.g. modalias(package >5.3-2:<modalias-regexp>) @@ -56,7 +56,7 @@ Full range of boolean operators (AND, OR, NOT) and conditionals (IF/THEN/ELSE) for dependencies. -13. Source priorities +13. Source priorities [DONE IN PART] Prefer solvables from specific sources 14. split-provides Modified: trunk/sat-solver/src/pool.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/pool.c?rev=7701&r… ============================================================================== --- trunk/sat-solver/src/pool.c (original) +++ trunk/sat-solver/src/pool.c Tue Oct 30 12:27:12 2007 @@ -39,6 +39,7 @@ "solvable:name", "solvable:arch", "solvable:evr", + "solvable:vendor", "solvable:provides", "solvable:obsoletes", "solvable:conflicts", Modified: trunk/sat-solver/src/pool.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/pool.h?rev=7701&r… ============================================================================== --- trunk/sat-solver/src/pool.h (original) +++ trunk/sat-solver/src/pool.h Tue Oct 30 12:27:12 2007 @@ -24,24 +24,25 @@ #define SOLVABLE_NAME 2 #define SOLVABLE_ARCH 3 #define SOLVABLE_EVR 4 -#define SOLVABLE_PROVIDES 5 -#define SOLVABLE_OBSOLETES 6 -#define SOLVABLE_CONFLICTS 7 -#define SOLVABLE_REQUIRES 8 -#define SOLVABLE_RECOMMENDS 9 -#define SOLVABLE_SUGGESTS 10 -#define SOLVABLE_SUPPLEMENTS 11 -#define SOLVABLE_ENHANCES 12 -#define SOLVABLE_FRESHENS 13 -#define RPM_RPMDBID 14 -#define SOLVABLE_PREREQMARKER 15 // normal requires before this, prereqs after this -#define SOLVABLE_FILEMARKER 16 // normal provides before this, generated file provides after this -#define NAMESPACE_INSTALLED 17 -#define NAMESPACE_MODALIAS 18 -#define SYSTEM_SYSTEM 19 -#define ARCH_SRC 20 -#define ARCH_NOSRC 21 -#define ARCH_NOARCH 22 +#define SOLVABLE_VENDOR 5 +#define SOLVABLE_PROVIDES 6 +#define SOLVABLE_OBSOLETES 7 +#define SOLVABLE_CONFLICTS 8 +#define SOLVABLE_REQUIRES 9 +#define SOLVABLE_RECOMMENDS 10 +#define SOLVABLE_SUGGESTS 11 +#define SOLVABLE_SUPPLEMENTS 12 +#define SOLVABLE_ENHANCES 13 +#define SOLVABLE_FRESHENS 14 +#define RPM_RPMDBID 15 +#define SOLVABLE_PREREQMARKER 16 // normal requires before this, prereqs after this +#define SOLVABLE_FILEMARKER 17 // normal provides before this, generated file provides after this +#define NAMESPACE_INSTALLED 18 +#define NAMESPACE_MODALIAS 19 +#define SYSTEM_SYSTEM 20 +#define ARCH_SRC 21 +#define ARCH_NOSRC 22 +#define ARCH_NOARCH 23 /* well known solvable */ #define SYSTEMSOLVABLE 1 Modified: trunk/sat-solver/src/repo_solv.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/repo_solv.c?rev=7… ============================================================================== --- trunk/sat-solver/src/repo_solv.c (original) +++ trunk/sat-solver/src/repo_solv.c Tue Oct 30 12:27:12 2007 @@ -19,8 +19,8 @@ #include "repo_solv.h" #include "util.h" -#define INTERESTED_START 2 -#define INTERESTED_END 13 +#define INTERESTED_START SOLVABLE_NAME +#define INTERESTED_END SOLVABLE_FRESHENS /*-----------------------------------------------------------------*/ /* .solv read functions */ @@ -542,7 +542,9 @@ else if (id == SOLVABLE_ARCH) s->arch = did; else if (id == SOLVABLE_EVR) - s->evr= did; + s->evr = did; + else if (id == SOLVABLE_VENDOR) + s->vendor = did; #if 0 printf("%s -> %s\n", id2str(pool, id), id2str(pool, did)); #endif Modified: trunk/sat-solver/src/solvable.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solvable.h?rev=77… ============================================================================== --- trunk/sat-solver/src/solvable.h (original) +++ trunk/sat-solver/src/solvable.h Tue Oct 30 12:27:12 2007 @@ -14,6 +14,7 @@ Id name; Id arch; Id evr; /* epoch:version-release */ + Id vendor; Repo *repo; /* repo we belong to */ Modified: trunk/sat-solver/src/solver.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.c?rev=7701… ============================================================================== --- trunk/sat-solver/src/solver.c (original) +++ trunk/sat-solver/src/solver.c Tue Oct 30 12:27:12 2007 @@ -274,7 +274,6 @@ * */ -/* FIXME: must also look at update packages */ /* FIXME: should prefer installed if identical version */ void @@ -322,6 +321,8 @@ qsort(plist->elements, plist->count, sizeof(Id), prune_best_version_arch_sortcmp); /* delete obsoleted. hmm, looks expensive! */ + /* FIXME maybe also check provides depending on noupdateprovide? */ + /* FIXME do not prune cycles */ for (i = 0; i < plist->count; i++) { Id p, *pp, obs, *obsp; Modified: trunk/sat-solver/tools/dumpsolv.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/dumpsolv.c?rev=… ============================================================================== --- trunk/sat-solver/tools/dumpsolv.c (original) +++ trunk/sat-solver/tools/dumpsolv.c Tue Oct 30 12:27:12 2007 @@ -43,6 +43,8 @@ printf("\n"); printf("solvable %d:\n", i); printf("name: %s %s %s\n", id2str(pool, s->name), id2str(pool, s->evr), id2str(pool, s->arch)); + if (s->vendor) + printf("vendor: %s\n", id2str(pool, s->vendor)); printids(repo, "provides", s->provides); printids(repo, "obsoletes", s->obsoletes); printids(repo, "conflicts", s->conflicts); Modified: trunk/sat-solver/tools/repo_content.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_content.c?… ============================================================================== --- trunk/sat-solver/tools/repo_content.c (original) +++ trunk/sat-solver/tools/repo_content.c Tue Oct 30 12:27:12 2007 @@ -228,11 +228,13 @@ s->name = str2id(pool, join(&pd, pd.kind, ":", value), 1); else if (istag ("DISTVERSION")) s->evr = makeevr(pool, value); + else if (istag ("VENDOR")) + s->vendor = str2id(pool, value, 1); else if (istag ("ARCH")) /* Theoretically we want to have the best arch of the given modifiers which still is compatible with the system arch. We don't know the latter here, though. */ - s->arch = str2id (pool, "noarch" , 1); + s->arch = ARCH_NOARCH; else if (istag ("PREREQUIRES")) s->requires = adddep(pool, &pd, s->requires, value, 2); else if (istag ("REQUIRES")) Modified: trunk/sat-solver/tools/repo_helix.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_helix.c?re… ============================================================================== --- trunk/sat-solver/tools/repo_helix.c (original) +++ trunk/sat-solver/tools/repo_helix.c Tue Oct 30 12:27:12 2007 @@ -27,6 +27,7 @@ STATE_SUBCHANNEL, STATE_PACKAGE, STATE_NAME, + STATE_VENDOR, STATE_HISTORY, STATE_UPDATE, STATE_EPOCH, @@ -85,6 +86,7 @@ { STATE_SUBCHANNEL, "patch", STATE_PACKAGE, 0 }, { STATE_SUBCHANNEL, "product", STATE_PACKAGE, 0 }, { STATE_PACKAGE, "name", STATE_NAME, 1 }, + { STATE_PACKAGE, "vendor", STATE_VENDOR, 1 }, { STATE_PACKAGE, "epoch", STATE_PEPOCH, 1 }, { STATE_PACKAGE, "version", STATE_PVERSION, 1 }, { STATE_PACKAGE, "release", STATE_PRELEASE, 1 }, @@ -717,6 +719,9 @@ case STATE_NAME: s->name = str2id(pool, pd->content, 1); break; + case STATE_VENDOR: + s->vendor = str2id(pool, pd->content, 1); + break; case STATE_UPDATE: /* new version, keeping all other metadata */ evr = evr2id(pool, pd, pd->epoch ? pd->evrspace + pd->epoch : 0, Modified: trunk/sat-solver/tools/repo_rpmdb.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_rpmdb.c?re… ============================================================================== --- trunk/sat-solver/tools/repo_rpmdb.c (original) +++ trunk/sat-solver/tools/repo_rpmdb.c Tue Oct 30 12:27:12 2007 @@ -16,6 +16,7 @@ #include "pool.h" #include "hash.h" +#include "util.h" #include "repo_rpmdb.h" #define TAG_NAME 1000 @@ -94,7 +95,7 @@ if (o + 4 * i > h->dcnt) return 0; d = h->dp + o; - r = calloc(i ? i : 1, sizeof(unsigned int)); + r = xcalloc(i ? i : 1, sizeof(unsigned int)); if (cnt) *cnt = i; for (o = 0; o < i; o++, d += 4) @@ -144,7 +145,7 @@ return 0; o = d[8] << 24 | d[9] << 16 | d[10] << 8 | d[11]; i = d[12] << 24 | d[13] << 16 | d[14] << 8 | d[15]; - r = calloc(i ? i : 1, sizeof(char *)); + r = xcalloc(i ? i : 1, sizeof(char *)); if (cnt) *cnt = i; d = h->dp + o; @@ -185,12 +186,12 @@ { char epochbuf[11]; /* 32bit decimal will fit in */ sprintf(epochbuf, "%u", epoch); - evr = malloc(strlen(epochbuf) + 1 + strlen(version) + 1 + strlen(release) + 1); + evr = xmalloc(strlen(epochbuf) + 1 + strlen(version) + 1 + strlen(release) + 1); sprintf(evr, "%s:%s-%s", epochbuf, version, release); } else { - evr = malloc(strlen(version) + 1 + strlen(release) + 1); + evr = xmalloc(strlen(version) + 1 + strlen(release) + 1); sprintf(evr, "%s-%s", version, release); } if (epochp) @@ -441,11 +442,8 @@ j = strlen(bn[i]) + strlen(dn[di[i]]) + 1; if (j > fna) { - if (fn) - fn = realloc(fn, j + 256); - else - fn = malloc(j + 256); fna = j + 256; + fn = xrealloc(fn, fna); } strcpy(fn, dn[di[i]]); strcat(fn, bn[i]); @@ -476,13 +474,11 @@ } s->arch = str2id(pool, headstring(rpmhead, TAG_ARCH), 1); if (!s->arch) - { - fprintf(stderr, "package %s has no arch\n", id2str(pool, s->name)); - exit(1); - } + s->arch = ARCH_NOARCH; evr = headtoevr(rpmhead); s->evr = str2id(pool, evr, 1); free(evr); + s->vendor = str2id(pool, headstring(rpmhead, TAG_VENDOR), 1); s->provides = makedeps(pool, repo, rpmhead, TAG_PROVIDENAME, TAG_PROVIDEVERSION, TAG_PROVIDEFLAGS, 0); s->provides = addfileprovides(pool, repo, rpmhead, s->provides); @@ -555,9 +551,9 @@ exit(1); } dbidp = (unsigned char *)&dbid; - pool->solvables = realloc(pool->solvables, (pool->nsolvables + 256) * sizeof(Solvable)); + pool->solvables = xrealloc(pool->solvables, (pool->nsolvables + 256) * sizeof(Solvable)); memset(pool->solvables + repo->start, 0, 256 * sizeof(Solvable)); - repo->rpmdbid = calloc(256, sizeof(unsigned int)); + repo->rpmdbid = xcalloc(256, sizeof(unsigned int)); asolv = 256; rpmheadsize = 0; rpmhead = 0; @@ -566,9 +562,9 @@ { if (i >= asolv) { - pool->solvables = realloc(pool->solvables, (pool->nsolvables + asolv + 256) * sizeof(Solvable)); + pool->solvables = xrealloc(pool->solvables, (pool->nsolvables + asolv + 256) * sizeof(Solvable)); memset(pool->solvables + repo->start + asolv, 0, 256 * sizeof(Solvable)); - repo->rpmdbid = realloc(repo->rpmdbid, (asolv + 256) * sizeof(unsigned int)); + repo->rpmdbid = xrealloc(repo->rpmdbid, (asolv + 256) * sizeof(unsigned int)); memset(repo->rpmdbid + asolv, 0, 256 * sizeof(unsigned int)); asolv += 256; } @@ -595,10 +591,8 @@ fprintf(stderr, "corrupt rpm database (size %u)\n", data.size); exit(1); } - if (!rpmhead) - rpmhead = malloc(sizeof(*rpmhead) + data.size); - else if (data.size > rpmheadsize) - rpmhead = realloc(rpmhead, sizeof(*rpmhead) + data.size); + if (data.size > rpmheadsize) + rpmhead = xrealloc(rpmhead, sizeof(*rpmhead) + data.size); memcpy(buf, data.data, 8); rpmhead->cnt = buf[0] << 24 | buf[1] << 16 | buf[2] << 8 | buf[3]; rpmhead->dcnt = buf[4] << 24 | buf[5] << 16 | buf[6] << 8 | buf[7]; @@ -656,12 +650,7 @@ else memcpy(dbidp, dp, 4); if ((nrpmids & 255) == 0) - { - if (rpmids) - rpmids = realloc(rpmids, sizeof(*rpmids) * (nrpmids + 256)); - else - rpmids = malloc(sizeof(*rpmids) * 256); - } + rpmids = xrealloc(rpmids, sizeof(*rpmids) * (nrpmids + 256)); rpmids[nrpmids].dbid = dbid; rpmids[nrpmids].name = malloc((int)key.size + 1); memcpy(rpmids[nrpmids].name, key.data, (int)key.size); @@ -670,7 +659,6 @@ dp += 8; dl -= 8; } - } dbc->c_close(dbc); db->close(db, 0); @@ -681,7 +669,7 @@ rpmheadsize = 0; rpmhead = 0; - pool->solvables = realloc(pool->solvables, (pool->nsolvables + nrpmids) * sizeof(Solvable)); + pool->solvables = xrealloc(pool->solvables, (pool->nsolvables + nrpmids) * sizeof(Solvable)); memset(pool->solvables + repo->start, 0, nrpmids * sizeof(Solvable)); repo->rpmdbid = calloc(nrpmids, sizeof(unsigned int)); @@ -690,7 +678,7 @@ if (ref) { refmask = mkmask(ref->nsolvables); - refhash = calloc(refmask + 1, sizeof(Id)); + refhash = xcalloc(refmask + 1, sizeof(Id)); for (i = 0; i < ref->nsolvables; i++) { h = ref->rpmdbid[i] & refmask; @@ -722,6 +710,7 @@ s->name = r->name; s->evr = r->evr; s->arch = r->arch; + s->vendor = r->vendor; } else { @@ -731,6 +720,8 @@ s->evr = str2id(pool, id2str(ref->pool, r->evr), 1); if (r->arch) s->arch = str2id(pool, id2str(ref->pool, r->arch), 1); + if (r->vendor) + s->vendor = str2id(pool, id2str(ref->pool, r->vendor), 1); } s->provides = copydeps(pool, repo, r->provides, ref); s->requires = copydeps(pool, repo, r->requires, ref); @@ -786,10 +777,8 @@ fprintf(stderr, "corrupt rpm database (size)\n"); exit(1); } - if (!rpmhead) - rpmhead = malloc(sizeof(*rpmhead) + data.size); - else if (data.size > rpmheadsize) - rpmhead = realloc(rpmhead, sizeof(*rpmhead) + data.size); + if (data.size > rpmheadsize) + rpmhead = xrealloc(rpmhead, sizeof(*rpmhead) + data.size); memcpy(buf, data.data, 8); rpmhead->cnt = buf[0] << 24 | buf[1] << 16 | buf[2] << 8 | buf[3]; rpmhead->dcnt = buf[4] << 24 | buf[5] << 16 | buf[6] << 8 | buf[7]; Modified: trunk/sat-solver/tools/repo_rpmmd.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_rpmmd.c?re… ============================================================================== --- trunk/sat-solver/tools/repo_rpmmd.c (original) +++ trunk/sat-solver/tools/repo_rpmmd.c Tue Oct 30 12:27:12 2007 @@ -18,6 +18,7 @@ STATE_ARCH, STATE_VERSION, STATE_FORMAT, + STATE_VENDOR, STATE_PROVIDES, STATE_PROVIDESENTRY, STATE_REQUIRES, @@ -55,6 +56,7 @@ { STATE_PACKAGE, "arch", STATE_ARCH, 1 }, { STATE_PACKAGE, "version", STATE_VERSION, 0 }, { STATE_PACKAGE, "format", STATE_FORMAT, 0 }, + { STATE_FORMAT, "rpm:vendor", STATE_VENDOR, 1 }, { STATE_FORMAT, "rpm:provides", STATE_PROVIDES, 0 }, { STATE_FORMAT, "rpm:requires", STATE_REQUIRES, 0 }, { STATE_FORMAT, "rpm:obsoletes", STATE_OBSOLETES , 0 }, @@ -374,6 +376,9 @@ case STATE_ARCH: s->arch = str2id(pool, pd->content, 1); break; + case STATE_VENDOR: + s->vendor = str2id(pool, pd->content, 1); + break; case STATE_FILE: id = str2id(pool, pd->content, 1); s->provides = repo_addid(pd->repo, s->provides, id); Modified: trunk/sat-solver/tools/repo_susetags.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_susetags.c… ============================================================================== --- trunk/sat-solver/tools/repo_susetags.c (original) +++ trunk/sat-solver/tools/repo_susetags.c Tue Oct 30 12:27:12 2007 @@ -131,7 +131,7 @@ Attrstore *attr; Repo * -pool_addrepo_susetags(Pool *pool, FILE *fp, int with_attr) +pool_addrepo_susetags(Pool *pool, FILE *fp, Id vendor, int with_attr) { char *line, *linep; int aline; @@ -247,6 +247,7 @@ s->name = str2id(pool, sp[0], 1); s->evr = makeevr(pool, join(&pd, sp[1], "-", sp[2])); s->arch = str2id(pool, sp[3], 1); + s->vendor = vendor; continue; } if (!strncmp(line, "=Prv:", 5)) Modified: trunk/sat-solver/tools/repo_susetags.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_susetags.h… ============================================================================== --- trunk/sat-solver/tools/repo_susetags.h (original) +++ trunk/sat-solver/tools/repo_susetags.h Tue Oct 30 12:27:12 2007 @@ -1 +1 @@ -extern Repo *pool_addrepo_susetags(Pool *pool, FILE *fp, int with_attr); +extern Repo *pool_addrepo_susetags(Pool *pool, FILE *fp, Id vendor, int with_attr); Modified: trunk/sat-solver/tools/repo_write.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_write.c?re… ============================================================================== --- trunk/sat-solver/tools/repo_write.c (original) +++ trunk/sat-solver/tools/repo_write.c Tue Oct 30 12:27:12 2007 @@ -210,6 +210,11 @@ needid[s->name].need++; needid[s->arch].need++; needid[s->evr].need++; + if (s->vendor) + { + needid[s->vendor].need++; + idsizes[SOLVABLE_VENDOR] = 1; + } if (s->provides) idsizes[SOLVABLE_PROVIDES] += incneedid(pool, idarraydata + s->provides, needid); if (s->requires) @@ -386,6 +391,8 @@ write_id(fp, needid[s->name].need); write_id(fp, needid[s->arch].need); write_id(fp, needid[s->evr].need); + if (idsizes[SOLVABLE_VENDOR]) + write_id(fp, needid[s->vendor].need); if (s->provides) write_idarray(fp, pool, needid, idarraydata + s->provides); Modified: trunk/sat-solver/tools/susetags2solv.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/susetags2solv.c… ============================================================================== --- trunk/sat-solver/tools/susetags2solv.c (original) +++ trunk/sat-solver/tools/susetags2solv.c Tue Oct 30 12:27:12 2007 @@ -31,7 +31,7 @@ argv++; } Pool *pool = pool_create(); - Repo *repo = pool_addrepo_susetags(pool, stdin, with_attr); + Repo *repo = pool_addrepo_susetags(pool, stdin, 0, with_attr); pool_writerepo(pool, repo, stdout); if (with_attr && attr) { -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7700 - /trunk/libzypp/zypp/ZYppFactory.cc
by aschnell＠svn.opensuse.org 30 Oct '07

30 Oct '07

Author: aschnell Date: Tue Oct 30 12:06:09 2007 New Revision: 7700 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7700&view=rev Log: - better exception string with pid Modified: trunk/libzypp/zypp/ZYppFactory.cc Modified: trunk/libzypp/zypp/ZYppFactory.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ZYppFactory.cc?rev=… ============================================================================== --- trunk/libzypp/zypp/ZYppFactory.cc (original) +++ trunk/libzypp/zypp/ZYppFactory.cc Tue Oct 30 12:06:09 2007 @@ -337,8 +337,10 @@ /*--------------------------------------------------*/ if ( globalLock.zyppLocked() ) { - ZYPP_THROW( ZYppFactoryException(N_("Software management is already running."), - globalLock.locker_pid()) ); + string t = str::form(N_("System management is locked by the application with pid %d. " + "Please close this application before trying again."), + globalLock.locker_pid()); + ZYPP_THROW(ZYppFactoryException(t, globalLock.locker_pid())); } else { -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7699 - in /trunk/sat-solver/testsuite: README.FAILS data.libzypp/lock-tests/ignore
by coolo＠svn.opensuse.org 30 Oct '07

30 Oct '07

Author: coolo Date: Tue Oct 30 06:47:26 2007 New Revision: 7699 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7699&view=rev Log: shuffle around some descriptions now that I know what is triggered by unconditional recommends/suggests Modified: trunk/sat-solver/testsuite/README.FAILS trunk/sat-solver/testsuite/data.libzypp/lock-tests/ignore Modified: trunk/sat-solver/testsuite/README.FAILS URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/README.FAIL… ============================================================================== --- trunk/sat-solver/testsuite/README.FAILS (original) +++ trunk/sat-solver/testsuite/README.FAILS Tue Oct 30 06:47:26 2007 @@ -2,9 +2,18 @@ ./data.libzypp/bugzilla-tests/bug310455-test.xml libzypp does not like to change vendors, sat does not care -./data.libzypp/basic-exercises/Bug299819-2-test.xml ./data.libzypp/yast-tests/Bug159696-test.xml + libzypp removes packages if the pattern is deinstalled + +./data.libzypp/basic-exercises/Bug299819-2-test.xml ./data.libzypp/bugzilla-tests/bug308098-test.xml +./data.libzypp/sat-tests/install-digikam-test.xml +./data.libzypp/bugzilla-tests/bug308252-test.xml +./data.libzypp/freshen-tests/exercise-6-test.xml +./data.libzypp/freshen-tests/exercise-6f-test.xml +./data.libzypp/freshen-tests/exercise-7-test.xml +./data.libzypp/freshen-tests/exercise-7f-test.xml +./data.libzypp/bugzilla-tests/bug230685-test.xml installs recommends ./data.libzypp/kernel-tests/kernel_kmp-test.xml @@ -21,12 +30,12 @@ promoteepoch is only enabled for redcarpet ./data.libzypp/lock-tests/install-single-test.xml - lock should be broken by a install (possibly not a solver bug) +./data.libzypp/lock-tests/remove-single-test.xml + lock should be broken by a (un)install (possibly not a solver bug) # BUGS # MISSINGS -./data.libzypp/bugzilla-tests/bug308252-test.xml ./data.libzypp/bugzilla-tests/bug239199-test.xml ./data.libzypp/patch-tests/jumbo-patch-test.xml ./data.libzypp/patch-tests/kernel-single-update-test.xml @@ -37,15 +46,7 @@ ./data.libzypp/freshen-tests/exercise-1-test.xml ./data.libzypp/freshen-tests/exercise-11-test.xml ./data.libzypp/freshen-tests/exercise-1f-test.xml -./data.libzypp/freshen-tests/exercise-6-test.xml -./data.libzypp/freshen-tests/exercise-6f-test.xml -./data.libzypp/freshen-tests/exercise-7-test.xml -./data.libzypp/freshen-tests/exercise-7f-test.xml ./data.libzypp/freshen-tests/exercise-8-test.xml -./data.libzypp/bugzilla-tests/bug230685-test.xml ./data.libzypp/bugzilla-tests/bug238284-test.xml patches pretty much unimplemented - very likely not a solver problem -./data.libzypp/sat-tests/install-digikam-test.xml - lock not implemented correctly - Modified: trunk/sat-solver/testsuite/data.libzypp/lock-tests/ignore URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzyp… ============================================================================== --- trunk/sat-solver/testsuite/data.libzypp/lock-tests/ignore (original) +++ trunk/sat-solver/testsuite/data.libzypp/lock-tests/ignore Tue Oct 30 06:47:26 2007 @@ -1,8 +1,6 @@ #takesolution not support install-single-require-test.xml #incomplete -remove-single-test.xml -#incomplete exercise-obscureobsoletes-06-test.xml #incomplete exercise-obscureobsoletes-02-test.xml -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7698 - in /trunk/sat-solver/tools: attr_store.c attr_store.h attr_store_p.h dumpattr.c
by matz＠svn.opensuse.org 30 Oct '07

30 Oct '07

Author: matz Date: Tue Oct 30 02:19:17 2007 New Revision: 7698 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7698&view=rev Log: An iterator over attributes, as GCC scalarizes it the code is equivalent to hand-written code that doesn't use a structure: attr_iterator ai; FOR_ATTRS (store, entry, &ai) { do_something (ai.name, ai.type); switch (ai.type) { case ATTR_STRING: ai.as_string; break; case ATTR_INT: ai.as_int; break; case ATTR_LOCALIDS: iterate (ai.as_numlist); break; } } Modified: trunk/sat-solver/tools/attr_store.c trunk/sat-solver/tools/attr_store.h trunk/sat-solver/tools/attr_store_p.h trunk/sat-solver/tools/dumpattr.c Modified: trunk/sat-solver/tools/attr_store.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/attr_store.c?re… ============================================================================== --- trunk/sat-solver/tools/attr_store.c (original) +++ trunk/sat-solver/tools/attr_store.c Tue Oct 30 02:19:17 2007 @@ -516,16 +516,6 @@ s->packed = 1; } -#define get_num(ptr,val) do { \ - typedef int __wrong_buf__[(1-sizeof((ptr)[0])) * (sizeof((ptr)[0])-1)];\ - val = 0; \ - while (1) { \ - unsigned char __c = *((ptr)++); \ - (val) = ((val) << 7) | (__c & 0x7F); \ - if ((__c & 0x80) == 0) \ - break; \ - } \ -} while (0) void attr_store_unpack (Attrstore *s) @@ -540,55 +530,32 @@ for (i = 0; i < s->entries; i++) { - unsigned char *attrs; - unsigned int this_abbr; - if (!s->ent2attr[i]) - continue; - attrs = s->flat_attrs + s->ent2attr[i]; - get_num (attrs, this_abbr); - unsigned short *abbr = s->flat_abbr + s->abbr[this_abbr]; - while (*abbr) + attr_iterator ai; + FOR_ATTRS (s, i, &ai) { - NameId name = (*abbr) >> 4; - switch ((*abbr) & 15) + switch (ai.type) { case ATTR_INT: - { - int val; - get_num (attrs, val); - add_attr_int (s, i, name, val); - break; - } + add_attr_int (s, i, ai.name, ai.as_int); + break; case ATTR_ID: - { - Id val; - get_num (attrs, val); - add_attr_id (s, i, name, val); - break; - } + add_attr_id (s, i, ai.name, ai.as_id); + break; case ATTR_CHUNK: - { - unsigned int val1, val2; - get_num (attrs, val1); - get_num (attrs, val2); - add_attr_chunk (s, i, name, val1, val2); - break; - } + add_attr_chunk (s, i, ai.name, ai.as_chunk[0], ai.as_chunk[1]); + break; case ATTR_STRING: - { - add_attr_string (s, i, name, (const char*)attrs); - attrs += strlen ((const char*)attrs) + 1; - break; - } + add_attr_string (s, i, ai.name, ai.as_string); + break; case ATTR_INTLIST: { while (1) { int val; - get_num (attrs, val); + get_num (ai.as_numlist, val); if (!val) break; - add_attr_intlist_int (s, i, name, val); + add_attr_intlist_int (s, i, ai.name, val); } break; } @@ -597,17 +564,16 @@ while (1) { Id val; - get_num (attrs, val); + get_num (ai.as_numlist, val); if (!val) break; - add_attr_localids_id (s, i, name, val); + add_attr_localids_id (s, i, ai.name, val); } break; } default: break; } - abbr++; } } @@ -891,8 +857,6 @@ free (buf); - attr_store_unpack (s); - return s; } Modified: trunk/sat-solver/tools/attr_store.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/attr_store.h?re… ============================================================================== --- trunk/sat-solver/tools/attr_store.h (original) +++ trunk/sat-solver/tools/attr_store.h Tue Oct 30 02:19:17 2007 @@ -1,3 +1,6 @@ +#ifndef ATTR_STORE_H +#define ATTR_STORE_H + #ifdef __cplusplus extern "C" { #endif @@ -32,3 +35,5 @@ #ifdef __cplusplus } #endif + +#endif Modified: trunk/sat-solver/tools/attr_store_p.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/attr_store_p.h?… ============================================================================== --- trunk/sat-solver/tools/attr_store_p.h (original) +++ trunk/sat-solver/tools/attr_store_p.h Tue Oct 30 02:19:17 2007 @@ -1,3 +1,10 @@ +#ifndef ATTR_STORE_P_H +#define ATTR_STORE_P_H + +#ifdef __cplusplus +extern "C" { +#endif + typedef struct { NameId name; @@ -47,3 +54,128 @@ unsigned int packed:1; }; + +#define get_num(ptr,val) do { \ + typedef int __wrong_buf__[(1-sizeof((ptr)[0])) * (sizeof((ptr)[0])-1)];\ + val = 0; \ + while (1) { \ + unsigned char __c = *((ptr)++); \ + (val) = ((val) << 7) | (__c & 0x7F); \ + if ((__c & 0x80) == 0) \ + break; \ + } \ +} while (0) + +typedef struct { + unsigned char *attrs; + unsigned short *abbrp; + unsigned char *attrs_next; + NameId name; + unsigned short type; + + /* The following fields could be a union, but if we do that GCC + doesn't scalarize these fields anymore, hence real memory accesses + would remain, so don't do that. */ + int as_int; + Id as_id; + unsigned int as_chunk[2]; + const char *as_string; + const unsigned char *as_numlist; +} attr_iterator; + +static inline void +ai_init (Attrstore *s, unsigned int i, attr_iterator *ai) +{ + ai->attrs = s->flat_attrs + s->ent2attr[i]; + unsigned int this_abbr; + get_num (ai->attrs, this_abbr); + ai->abbrp = s->flat_abbr + s->abbr[this_abbr]; + + /* Initialize all fields so we get no uninit warnings later. + Don't use memset() to initialize this structure, it would make + GCC not scalarize it. */ + ai->as_int = 0; + ai->as_id = 0; + ai->as_chunk[0] = ai->as_chunk[1] = 0; + ai->as_string = 0; + ai->as_numlist = 0; +} + +static inline int +ai_step (Attrstore *s, attr_iterator *ai) +{ + unsigned short nt = *(ai->abbrp); + if (!nt) + return 0; + ai->name = nt >> 4; + ai->type = nt & 0xF; + ai->attrs_next = ai->attrs; + switch (ai->type) + { + case ATTR_INT: + { + int val; + get_num (ai->attrs_next, val); + ai->as_int = val; + break; + } + case ATTR_ID: + { + Id val; + get_num (ai->attrs_next, val); + ai->as_id = val; + break; + } + case ATTR_CHUNK: + { + unsigned int val1, val2; + get_num (ai->attrs_next, val1); + ai->as_chunk[0] = val1; + get_num (ai->attrs_next, val2); + ai->as_chunk[1] = val2; + break; + } + case ATTR_STRING: + { + ai->as_string = (const char *) ai->attrs_next; + ai->attrs_next += strlen ((const char*)ai->attrs_next) + 1; + break; + } + case ATTR_INTLIST: + { + ai->as_numlist = ai->attrs_next; + while (1) + { + int val; + get_num (ai->attrs_next, val); + if (!val) + break; + } + break; + } + case ATTR_LOCALIDS: + { + ai->as_numlist = ai->attrs_next; + while (1) + { + Id val; + get_num (ai->attrs_next, val); + if (!val) + break; + } + break; + } + default: + break; + } + return 1; +} + +#define FOR_ATTRS(s,i,ai) \ + for (ai_init (s, i, ai); ai_step (s, ai); (ai)->abbrp++,(ai)->attrs = (ai)->attrs_next) + +#ifdef __cplusplus +} +#endif + +#endif Modified: trunk/sat-solver/tools/dumpattr.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/dumpattr.c?rev=… ============================================================================== --- trunk/sat-solver/tools/dumpattr.c (original) +++ trunk/sat-solver/tools/dumpattr.c Tue Oct 30 02:19:17 2007 @@ -13,50 +13,54 @@ static void dump_attrs (Attrstore *s, unsigned int entry) { - LongNV *nv = s->attrs[entry]; - if (nv) + attr_iterator ai; + FOR_ATTRS (s, entry, &ai) { - while (nv->name) - { - fprintf (stdout, "%s:", id2str (s->pool, s->nameids[nv->name])); - switch (nv->type) - { - case ATTR_INT: - fprintf (stdout, "int %u\n", nv->v.i[0]); - break; - case ATTR_CHUNK: - fprintf (stdout, "blob %u+%u\n", nv->v.i[0], nv->v.i[1]); - break; - case ATTR_STRING: - fprintf (stdout, "str %s\n", nv->v.str); - break; - case ATTR_ID: - fprintf (stdout, "id %u\n", nv->v.i[0]); - break; - case ATTR_INTLIST: - { - unsigned i = 0; - int val; - fprintf (stdout, "lint\n "); - while ((val = nv->v.intlist[i++])) - fprintf (stdout, " %d", val); - fprintf (stdout, "\n"); + fprintf (stdout, "%s:", id2str (s->pool, s->nameids[ai.name])); + switch (ai.type) + { + case ATTR_INT: + fprintf (stdout, "int %u\n", ai.as_int); + break; + case ATTR_ID: + fprintf (stdout, "id %u\n", ai.as_id); + break; + case ATTR_CHUNK: + fprintf (stdout, "blob %u+%u\n", ai.as_chunk[0], ai.as_chunk[1]); + break; + case ATTR_STRING: + fprintf (stdout, "str %s\n", ai.as_string); + break; + case ATTR_INTLIST: + { + fprintf (stdout, "lint\n "); + while (1) + { + int val; + get_num (ai.as_numlist, val); + if (!val) break; - } - case ATTR_LOCALIDS: - { - unsigned i = 0; - LocalId id; - fprintf (stdout, "lids"); - while ((id = nv->v.localids[i++])) - fprintf (stdout, "\n %s(%d)", localid2str (s, id), id); - fprintf (stdout, "\n"); + fprintf (stdout, " %d", val); + } + fprintf (stdout, "\n"); + break; + } + case ATTR_LOCALIDS: + { + fprintf (stdout, "lids"); + while (1) + { + Id val; + get_num (ai.as_numlist, val); + if (!val) break; - } - default: - break; - } - nv++; + fprintf (stdout, "\n %s(%d)", localid2str (s, val), val); + } + fprintf (stdout, "\n"); + break; + } + default: + break; } } } @@ -68,8 +72,8 @@ Pool *pool = pool_create (); Attrstore *s = attr_store_read (stdin, pool); /* For now test the packing code. */ - attr_store_pack (s); attr_store_unpack (s); + attr_store_pack (s); fprintf (stdout, "attribute store contains %d entities\n", s->entries); for (i = 0; i < s->entries; i++) { -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7697 - /trunk/sat-solver/tools/attr_store.c
by matz＠svn.opensuse.org 29 Oct '07

29 Oct '07

Author: matz Date: Mon Oct 29 23:22:59 2007 New Revision: 7697 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7697&view=rev Log: Write and read the read-only representation directly. Modified: trunk/sat-solver/tools/attr_store.c Modified: trunk/sat-solver/tools/attr_store.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/attr_store.c?re… ============================================================================== --- trunk/sat-solver/tools/attr_store.c (original) +++ trunk/sat-solver/tools/attr_store.c Mon Oct 29 23:22:59 2007 @@ -501,6 +501,13 @@ free (s->attrs); s->attrs = 0; + /* Remove the hashtable too, it will be build on demand in str2localid + the next time we call it, which should not happen while in packed mode. */ + old_mem += (s->stringhashmask + 1) * sizeof (s->stringhashtbl[0]); + free (s->stringhashtbl); + s->stringhashtbl = 0; + s->stringhashmask = 0; + fprintf (stderr, "%d\n", old_mem); fprintf (stderr, "%d\n", s->entries * sizeof(s->ent2attr[0])); fprintf (stderr, "%d\n", s->attr_next_free); @@ -631,16 +638,6 @@ } static void -write_u8(FILE *fp, unsigned int x) -{ - if (putc(x, fp) == EOF) - { - perror("write error"); - exit(1); - } -} - -static void write_id(FILE *fp, Id x) { if (x >= (1 << 14)) @@ -660,84 +657,14 @@ } } -static void -write_idarray(FILE *fp, Id *ids) -{ - Id id; - if (!ids) - return; - if (!*ids) - { - write_u8(fp, 0); - return; - } - for (;;) - { - id = *ids++; - if (id >= 64) - id = (id & 63) | ((id & ~63) << 1); - if (!*ids) - { - write_id(fp, id); - return; - } - write_id(fp, id | 64); - } -} - -static void -write_attrs (FILE *fp, LongNV *nv) -{ - if (!nv) - { - write_id (fp, 0); - return; - } - while (nv->name) - { - write_id (fp, nv->name); - write_u8 (fp, nv->type); - switch (nv->type) - { - case ATTR_INT: - case ATTR_ID: - write_id (fp, nv->v.i[0]); - break; - case ATTR_CHUNK: - write_id (fp, nv->v.i[0]); - write_id (fp, nv->v.i[1]); - break; - case ATTR_STRING: - if (fputs (nv->v.str, fp) == EOF - || putc (0, fp) == EOF) - { - perror ("write error"); - exit (1); - } - break; - case ATTR_INTLIST: - { - write_idarray (fp, nv->v.intlist); - break; - } - case ATTR_LOCALIDS: - { - write_idarray (fp, nv->v.localids); - break; - } - default: - break; - } - nv++; - } - write_id (fp, 0); -} - void write_attr_store (FILE *fp, Attrstore *s) { unsigned i; unsigned local_ssize; + + attr_store_pack (s); + write_u32 (fp, s->entries); write_u32 (fp, s->num_nameids); write_u32 (fp, s->nstrings); @@ -765,8 +692,30 @@ } } + int last = 0; for (i = 0; i < s->entries; i++) - write_attrs (fp, s->attrs[i]); + if (i == 0 || s->ent2attr[i] == 0) + write_id (fp, s->ent2attr[i]); + else + { + write_id (fp, s->ent2attr[i] - last); + assert (last < s->ent2attr[i]); + last = s->ent2attr[i]; + } + + write_u32 (fp, s->attr_next_free); + if (fwrite (s->flat_attrs, s->attr_next_free, 1, fp) != 1) + { + perror ("write error"); + exit (1); + } + + write_u32 (fp, s->flat_abbr_next_free); + if (fwrite (s->flat_abbr, s->flat_abbr_next_free * sizeof (s->flat_abbr[0]), 1, fp) != 1) + { + perror ("write error"); + exit (1); + } } static unsigned int @@ -801,35 +750,6 @@ return c; } -static const char * -read_string (FILE *fp) -{ - char *buf; - size_t buflen; - buflen = 128; - buf = malloc (buflen); - size_t p = 0; - while (1) - { - int c = getc (fp); - if (c == EOF) - { - perror ("error reading string"); - exit (1); - } - if (p == buflen) - { - buflen += 128; - buf = realloc (buf, buflen); - } - buf[p++] = c; - if (!c) - break; - } - buf = realloc (buf, p); - return buf; -} - static Id read_id(FILE *fp, Id max) { @@ -860,105 +780,6 @@ exit(1); } -static Id * -read_idarray (FILE *fp, Id max) -{ - Id *ret, id; - unsigned int len, num_elem; - - id = read_id (fp, 0); - if (!id) - { - ret = malloc (sizeof (ret[0])); - ret[0] = 0; - return ret; - } - - num_elem = 0; - len = 8; - ret = malloc (len * sizeof (ret[0])); - for (;;) - { - Id real = (id & 63) | ((id >> 1) & ~63); - if (max && real >= max) - { - fprintf(stderr, "read_id: id too large (%u/%u)\n", real, max); - exit(1); - } - ret[num_elem++] = real; - if (num_elem == len) - { - len += 8; - ret = realloc (ret, len * sizeof (ret[0])); - } - if ((id & 64) == 0) - { - ret[num_elem++] = 0; - break; - } - id = read_id (fp, 0); - } - ret = realloc (ret, num_elem * sizeof (ret[0])); - return ret; -} - -static LongNV * -read_attrs (FILE *fp, Attrstore *s) -{ - LongNV *ret, *nv; - unsigned int len, num_elem; - Id id = read_id (fp, s->num_nameids); - if (!id) - return 0; - len = 16; - num_elem = 0; - ret = malloc (len * sizeof (ret[0])); - nv = ret; - while (id) - { - nv->name = id; - nv->type = read_u8 (fp); - switch (nv->type) - { - case ATTR_INT: - case ATTR_ID: - nv->v.i[0] = read_id (fp, 0); - break; - case ATTR_CHUNK: - nv->v.i[0] = read_id (fp, 0); - nv->v.i[1] = read_id (fp, 0); - break; - case ATTR_STRING: - nv->v.str = read_string (fp); - break; - case ATTR_INTLIST: - { - nv->v.intlist = read_idarray (fp, 0); - break; - } - case ATTR_LOCALIDS: - { - nv->v.localids = read_idarray (fp, s->nstrings); - break; - } - default: - break; - } - num_elem++; - if (num_elem == len) - { - len += 16; - ret = realloc (ret, len * sizeof (ret[0])); - } - nv = ret + num_elem; - id = read_id (fp, s->num_nameids); - } - nv->name = 0; - num_elem++; - ret = realloc (ret, num_elem * sizeof (ret[0])); - return ret; -} - Attrstore * attr_store_read (FILE *fp, Pool *pool) { @@ -974,8 +795,6 @@ s->num_nameids = read_u32 (fp); nstrings = read_u32 (fp); - ensure_entry (s, nentries); - buflen = 128; buf = malloc (buflen); @@ -985,12 +804,7 @@ size_t p = 0; while (1) { - int c = getc (fp); - if (c == EOF) - { - perror ("error reading namestrings"); - exit (1); - } + int c = read_u8 (fp); if (p == buflen) { buflen += 128; @@ -1018,31 +832,67 @@ } strsp[local_ssize] = 0; - s->stringhashmask = mkmask(nstrings); - xfree (s->stringhashtbl); - s->stringhashtbl = (Hashtable)xcalloc(s->stringhashmask + 1, sizeof(Id)); + /* Don't build hashtable here, it will be built on demand by str2localid + should we call that. */ strsp = s->stringspace; s->nstrings = nstrings; for (i = 0; i < nstrings; i++) { str[i] = strsp - s->stringspace; - Hashval h = strhash(strsp) & s->stringhashmask; - unsigned int hh = HASHCHAIN_START; - while (s->stringhashtbl[h] != 0) - h = HASHCHAIN_NEXT(h, hh, s->stringhashmask); - s->stringhashtbl[h] = i; strsp += strlen (strsp) + 1; } s->sstrings = strsp - s->stringspace; - for (i = 0; i < nentries; i++) - s->attrs[i] = read_attrs (fp, s); - s->entries = nentries; + s->ent2attr = xmalloc (s->entries * sizeof (s->ent2attr[0])); + int last = 0; + for (i = 0; i < s->entries; i++) + { + int d = read_id (fp, 0); + if (i == 0 || d == 0) + s->ent2attr[i] = d; + else + { + last += d; + s->ent2attr[i] = last; + } + } + + s->attr_next_free = read_u32 (fp); + s->flat_attrs = xmalloc (((s->attr_next_free + FLAT_ATTR_BLOCK) & ~(FLAT_ATTR_BLOCK + 1)) * sizeof (s->flat_attrs[0])); + if (fread (s->flat_attrs, s->attr_next_free, 1, fp) != 1) + { + perror ("read error"); + exit (1); + } + + s->flat_abbr_next_free = read_u32 (fp); + s->flat_abbr = xmalloc (((s->flat_abbr_next_free + FLAT_ABBR_BLOCK) & ~(FLAT_ABBR_BLOCK + 1)) * sizeof (s->flat_abbr[0])); + if (fread (s->flat_abbr, s->flat_abbr_next_free * sizeof (s->flat_abbr[0]), 1, fp) != 1) + { + perror ("read error"); + exit (1); + } + + assert (s->flat_abbr[0] == 0); + s->abbr_next_free = 0; + s->abbr = 0; + add_elem (s->abbr, s->abbr_next_free, 0, ABBR_BLOCK); + + unsigned int abbi; + for (abbi = 0; abbi < s->flat_abbr_next_free - 1; abbi++) + if (s->flat_abbr[abbi] == 0) + add_elem (s->abbr, s->abbr_next_free, abbi + 1, ABBR_BLOCK); + assert (s->flat_abbr[abbi] == 0); + + s->packed = 1; + free (buf); + attr_store_unpack (s); + return s; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7696 - in /trunk/sat-solver: src/solver.c testsuite/README.FAILS
by mlschroe＠svn.opensuse.org 29 Oct '07

29 Oct '07

Author: mlschroe Date: Mon Oct 29 20:02:15 2007 New Revision: 7696 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7696&view=rev Log: - fix last failing testcase classified as bug Modified: trunk/sat-solver/src/solver.c trunk/sat-solver/testsuite/README.FAILS Modified: trunk/sat-solver/src/solver.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.c?rev=7696… ============================================================================== --- trunk/sat-solver/src/solver.c (original) +++ trunk/sat-solver/src/solver.c Mon Oct 29 20:02:15 2007 @@ -30,9 +30,13 @@ prune_best_version_arch_sortcmp(const void *ap, const void *bp) { Pool *pool = prune_best_version_arch_sortcmp_data; + int r; Id a = *(Id *)ap; Id b = *(Id *)bp; - return pool->solvables[a].name - pool->solvables[b].name; + r = pool->solvables[a].name - pool->solvables[b].name; + if (r) + return r; + return a - b; } @@ -58,6 +62,9 @@ static int dep_installed(Solver *solv, Id dep) { + /* disable for now, splitprovides don't work anyway and it breaks + a testcase */ +#if 0 Pool *pool = solv->pool; Id p, *pp; @@ -78,6 +85,7 @@ if (p >= solv->installed->start && p < solv->installed->start + solv->installed->nsolvables) return 1; } +#endif return 0; } @@ -267,6 +275,7 @@ */ /* FIXME: must also look at update packages */ +/* FIXME: should prefer installed if identical version */ void prune_best_version_arch(Pool *pool, Queue *plist) @@ -312,8 +321,36 @@ /* sort by name first */ qsort(plist->elements, plist->count, sizeof(Id), prune_best_version_arch_sortcmp); + /* delete obsoleted. hmm, looks expensive! */ + for (i = 0; i < plist->count; i++) + { + Id p, *pp, obs, *obsp; + s = pool->solvables + plist->elements[i]; + if (!s->obsoletes) + continue; + obsp = s->repo->idarraydata + s->obsoletes; + while ((obs = *obsp++) != 0) + { + FOR_PROVIDES(p, pp, obs) + { + if (pool->solvables[p].name == s->name) + continue; + for (j = 0; j < plist->count; j++) + { + if (i == j) + continue; + if (plist->elements[j] == p) + plist->elements[j] = 0; + } + } + } + } + for (i = j = 0; i < plist->count; i++) + if (plist->elements[i]) + plist->elements[j++] = plist->elements[i]; + plist->count = j; + /* now find best 'per name' */ - /* FIXME: also check obsoletes! */ for (i = j = 0; i < plist->count; i++) { s = pool->solvables + plist->elements[i]; @@ -1965,8 +2002,6 @@ if (solv->decisionmap[i] > 0 || (solv->decisionmap[i] < 0 && solv->weaksystemrules[i - solv->installed->start] == 0)) continue; queue_empty(&dq); - if (solv->decisionmap[i] == 0) - queue_push(&dq, i); if (solv->weaksystemrules[i - solv->installed->start]) { dp = pool->whatprovidesdata + solv->weaksystemrules[i - solv->installed->start]; @@ -1980,13 +2015,17 @@ if (p) continue; /* rule is already true */ } - if (!dq.count) + if (!dq.count && solv->decisionmap[i] != 0) continue; if (dq.count > 1) prune_to_highest_prio(pool, &dq); if (dq.count > 1) prune_to_recommended(solv, &dq); + /* FIXME we push it that late so that it doesn't get + * pruned. should do things a bit different instead! */ + if (solv->decisionmap[i] == 0) + queue_push(&dq, i); if (dq.count > 1) prune_best_version_arch(pool, &dq); #if 0 @@ -2394,7 +2433,6 @@ obsoletesmap = (Id *)xcalloc(pool->nsolvables, sizeof(Id)); for (i = 0; i < solv->decisionq.count; i++) { - Id obs, *obsp; Id *pp, n; n = solv->decisionq.elements[i]; @@ -2405,29 +2443,42 @@ if (n >= solv->installed->start && n < solv->installed->start + solv->installed->nsolvables) continue; s = pool->solvables + n; - if (s->obsoletes) - { - obsp = s->repo->idarraydata + s->obsoletes; - while ((obs = *obsp++) != 0) - FOR_PROVIDES(p, pp, obs) - { - if (p >= solv->installed->start && p < solv->installed->start + solv->installed->nsolvables) - { - obsoletesmap[p] = n; - obsoletesmap[n]++; - } - } - } FOR_PROVIDES(p, pp, s->name) if (s->name == pool->solvables[p].name) { - if (p >= solv->installed->start && p < solv->installed->start + solv->installed->nsolvables) + if (p >= solv->installed->start && p < solv->installed->start + solv->installed->nsolvables && !obsoletesmap[p]) { obsoletesmap[p] = n; obsoletesmap[n]++; } } } + for (i = 0; i < solv->decisionq.count; i++) + { + Id obs, *obsp; + Id *pp, n; + + n = solv->decisionq.elements[i]; + if (n < 0) + continue; + if (n == SYSTEMSOLVABLE) + continue; + if (n >= solv->installed->start && n < solv->installed->start + solv->installed->nsolvables) + continue; + s = pool->solvables + n; + if (!s->obsoletes) + continue; + obsp = s->repo->idarraydata + s->obsoletes; + while ((obs = *obsp++) != 0) + FOR_PROVIDES(p, pp, obs) + { + if (p >= solv->installed->start && p < solv->installed->start + solv->installed->nsolvables && !obsoletesmap[p]) + { + obsoletesmap[p] = n; + obsoletesmap[n]++; + } + } + } if (solv->rc_output) printf(">!> Solution #1:\n"); Modified: trunk/sat-solver/testsuite/README.FAILS URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/README.FAIL… ============================================================================== --- trunk/sat-solver/testsuite/README.FAILS (original) +++ trunk/sat-solver/testsuite/README.FAILS Mon Oct 29 20:02:15 2007 @@ -24,8 +24,6 @@ lock should be broken by a install (possibly not a solver bug) # BUGS -./data.libzypp/bugzilla-tests/bug310618-test.xml - sat-solver used to not like it, now it's just different # MISSINGS ./data.libzypp/bugzilla-tests/bug308252-test.xml -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7695 - in /trunk/libzypp/zypp/sat: SATResolver.cc SATResolver.h
by mlandres＠svn.opensuse.org 29 Oct '07

29 Oct '07

Author: mlandres Date: Mon Oct 29 18:34:36 2007 New Revision: 7695 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7695&view=rev Log: adapt to satsolver API changes Modified: trunk/libzypp/zypp/sat/SATResolver.cc trunk/libzypp/zypp/sat/SATResolver.h Modified: trunk/libzypp/zypp/sat/SATResolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/SATResolver.cc?… ============================================================================== --- trunk/libzypp/zypp/sat/SATResolver.cc (original) +++ trunk/libzypp/zypp/sat/SATResolver.cc Mon Oct 29 18:34:36 2007 @@ -33,7 +33,7 @@ #include "zypp/sat/SATResolver.h" extern "C" { -#include "satsolver/source_solv.h" +#include "satsolver/repo_solv.h" #include "satsolver/poolarch.h" } @@ -80,7 +80,7 @@ SATResolver::SATResolver (const ResPool & pool, Pool *SATPool) : _pool (pool) - , _SATPool (SATPool) + , _SATPool (SATPool) , _timeout_seconds (0) , _maxSolverPasses (0) , _testing (false) @@ -172,7 +172,7 @@ SATResolver::addPoolItemToKepp (PoolItem_Ref item) { _items_to_keep.push_back (item); - _items_to_keep.unique (); + _items_to_keep.unique (); } @@ -321,7 +321,7 @@ static PoolItem_Ref -get_poolItem (const ResPool & pool, const string & source_alias, const string & package_name, const string & kind_name = "", const string & edition = "", const string & arch = "") +get_poolItem (const ResPool & pool, const string & repo_alias, const string & package_name, const string & kind_name = "", const string & edition = "", const string & arch = "") { PoolItem_Ref poolItem; Resolvable::Kind kind = string2kind (kind_name); @@ -331,7 +331,7 @@ invokeOnEach( pool.byNameBegin( package_name ), pool.byNameEnd( package_name ), - functor::chain( resfilter::ByRepository(source_alias), resfilter::ByKind (kind) ), + functor::chain( resfilter::ByRepository(repo_alias), resfilter::ByKind (kind) ), functor::functorRef<bool,PoolItem> (info) ); poolItem = info.poolItem; @@ -346,14 +346,14 @@ } catch (Exception & excpt_r) { ZYPP_CAUGHT (excpt_r); - ERR << "Can't find kind[" << kind_name << "]:'" << package_name << "': source '" << source_alias << "' not defined" << endl; + ERR << "Can't find kind[" << kind_name << "]:'" << package_name << "': repo '" << repo_alias << "' not defined" << endl; if (kind_name.empty()) ERR << "Please specify kind=\"...\" in the <install.../> request." << endl; return poolItem; } if (!poolItem) { - ERR << "Can't find kind: " << kind << ":'" << package_name << "' in source '" << source_alias << "': no such name/kind" << endl; + ERR << "Can't find kind: " << kind << ":'" << package_name << "' in repo '" << repo_alias << "': no such name/kind" << endl; } return poolItem; @@ -417,8 +417,8 @@ // Helper functions for the SAT-Pool //------------------------------------------------------------------------------------------------------------ -// find solvable id by name and source -// If source != NULL, find there +// find solvable id by name and repo +// If repo != NULL, find there // else find in pool (available packages) // @@ -432,21 +432,21 @@ string packageName = str::form (_("%s:%s"), item->kind().asString().c_str(), item->name().c_str() - ); + ); string repoName = item->repository().info().alias(); - // Searching concerning source - Source *source = NULL; - for (int i = 0; i < pool->nsources; i++) + // Searching concerning repo + Repo *repo = NULL; + for (int i = 0; i < pool->nrepos; i++) { - string compName(source_name(pool->sources[i])); + string compName(repo_name(pool->repos[i])); if (repoName == compName) { - source = pool->sources[i]; + repo = pool->repos[i]; break; } } - + id = str2id( pool, packageName.c_str(), 0 ); if (id == ID_NULL) { return id; @@ -456,9 +456,9 @@ if (archid == ID_NULL) { return ID_NULL; } - - end = source ? source->start + source->nsolvables : pool->nsolvables; - for (int i = source ? source->start : 1 ; i < end; i++) + + end = repo ? repo->start + repo->nsolvables : pool->nsolvables; + for (int i = repo ? repo->start : 1 ; i < end; i++) { if (archid && pool->solvables[i].arch != archid) continue; @@ -498,9 +498,9 @@ invokeOnEach ( _pool.begin(), _pool.end(), resfilter::ByKeep( ), // collect keeps from Pool to resolver queue - functor::functorRef<bool,PoolItem>(info) ); + functor::functorRef<bool,PoolItem>(info) ); - Queue trials; + Queue trials; for (PoolItemList::const_iterator iter = _items_to_install.begin(); iter != _items_to_install.end(); iter++) { PoolItem_Ref r = *iter; @@ -509,32 +509,32 @@ if (id == ID_NULL) { ERR << "Install: " << *iter << " not found" << endl; } - queuepush( &(trials), SOLVER_INSTALL_SOLVABLE ); - queuepush( &(trials), id ); + queue_push( &(trials), SOLVER_INSTALL_SOLVABLE ); + queue_push( &(trials), id ); } for (PoolItemList::const_iterator iter = _items_to_remove.begin(); iter != _items_to_remove.end(); iter++) { string packageName = str::form (_("%s:%s"), iter->resolvable()->kind().asString().c_str(), iter->resolvable()->name().c_str() - ); + ); Id id = str2id( _SATPool, packageName.c_str(), 1 ); - queuepush( &(trials), SOLVER_ERASE_SOLVABLE_NAME ); - queuepush( &(trials), id); + queue_push( &(trials), SOLVER_ERASE_SOLVABLE_NAME ); + queue_push( &(trials), id); } - // Searching concerning system source - Source *systemSource = NULL; - for (int i = 0; i < _SATPool->nsources; i++) + // Searching concerning system repo + Repo *systemRepo = NULL; + for (int i = 0; i < _SATPool->nrepos; i++) { - string compName(source_name(_SATPool->sources[i])); + string compName(repo_name(_SATPool->repos[i])); if (compName == "system") { - systemSource = _SATPool->sources[i]; + systemRepo = _SATPool->repos[i]; break; } } - - Solver *solv = solver_create( _SATPool, systemSource ); + + Solver *solv = solver_create( _SATPool, systemRepo ); solv->fixsystem = false; solv->updatesystem = false; solv->allowdowngrade = false; @@ -549,26 +549,26 @@ //----------------------------------------- Id p; Solvable *s; - + /* solvables to be erased */ for (int i = solv->system->start; i < solv->system->start + solv->system->nsolvables; i++) { if (solv->decisionmap[i] > 0) continue; - // getting source + // getting repo s = _SATPool->solvables + i; - Source *source = s->source; + Repo *repo = s->repo; PoolItem_Ref poolItem; string kindName(id2str(_SATPool, s->name)); std::vector<std::string> nameVector; - + // expect "<kind>::<name>" unsigned count = str::split( kindName, std::back_inserter(nameVector), ":" ); - + if ( count == 3 ) { PoolItem_Ref poolItem = get_poolItem (_pool, - source ? string(source_name(source)) : "", + repo ? string(repo_name(repo)) : "", nameVector[2], // name nameVector[0], // kind, string(id2str(_SATPool, s->evr)), @@ -594,19 +594,19 @@ if (p >= solv->system->start && p < solv->system->start + solv->system->nsolvables) continue; - // getting source + // getting repo s = _SATPool->solvables + p; - Source *source = s->source; + Repo *repo = s->repo; PoolItem_Ref poolItem; string kindName(id2str(_SATPool, s->name)); std::vector<std::string> nameVector; // expect "<kind>::<name>" unsigned count = str::split( kindName, std::back_inserter(nameVector), ":" ); - + if ( count == 3 ) { PoolItem_Ref poolItem = get_poolItem (_pool, - source ? string(source_name(source)) : "", + repo ? string(repo_name(repo)) : "", nameVector[2], // name nameVector[0], // kind, string(id2str(_SATPool, s->evr)), @@ -625,8 +625,8 @@ // clean up solver_free(solv); - queuefree( &(trials) ); - + queue_free( &(trials) ); + return true; } Modified: trunk/libzypp/zypp/sat/SATResolver.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/SATResolver.h?r… ============================================================================== --- trunk/libzypp/zypp/sat/SATResolver.h (original) +++ trunk/libzypp/zypp/sat/SATResolver.h Mon Oct 29 18:34:36 2007 @@ -60,7 +60,7 @@ private: ResPool _pool; Pool *_SATPool; - + unsigned _timeout_seconds; unsigned _maxSolverPasses; bool _testing; @@ -72,7 +72,7 @@ PoolItemList _items_to_install; PoolItemList _items_to_remove; PoolItemList _items_to_lockUninstalled; - PoolItemList _items_to_keep; + PoolItemList _items_to_keep; public: @@ -114,7 +114,7 @@ void addPoolItemToRemove (PoolItem_Ref item); void addPoolItemsToRemoveFromList (PoolItemList & rl); - + }; /////////////////////////////////////////////////////////////////// -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7694 - in /trunk/sat-solver/src: pool.c poolid.c repo.c repo.h
by mlschroe＠svn.opensuse.org 29 Oct '07

29 Oct '07

Author: mlschroe Date: Mon Oct 29 18:25:45 2007 New Revision: 7694 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7694&view=rev Log: Use Offset instead of unsigned int. Modified: trunk/sat-solver/src/pool.c trunk/sat-solver/src/poolid.c trunk/sat-solver/src/repo.c trunk/sat-solver/src/repo.h Modified: trunk/sat-solver/src/pool.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/pool.c?rev=7694&r… ============================================================================== --- trunk/sat-solver/src/pool.c (original) +++ trunk/sat-solver/src/pool.c Mon Oct 29 18:25:45 2007 @@ -250,11 +250,10 @@ pool_prepare(Pool *pool) { int i, num, np, extra; - unsigned int n; Offset off; Solvable *s; Id id; - Offset *idp; + Offset *idp, n; Offset *whatprovides; Id *whatprovidesdata, *d; Modified: trunk/sat-solver/src/poolid.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/poolid.c?rev=7694… ============================================================================== --- trunk/sat-solver/src/poolid.c (original) +++ trunk/sat-solver/src/poolid.c Mon Oct 29 18:25:45 2007 @@ -231,8 +231,6 @@ return pool->stringspace + pool->strings[rd->evr]; } -#define DEP2STRBUF 16 - const char * dep2str(Pool *pool, Id id) { Modified: trunk/sat-solver/src/repo.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/repo.c?rev=7694&r… ============================================================================== --- trunk/sat-solver/src/repo.c (original) +++ trunk/sat-solver/src/repo.c Mon Oct 29 18:25:45 2007 @@ -44,7 +44,7 @@ * */ -unsigned int +Offset repo_addid(Repo *repo, Offset olddeps, Id id) { Id *idarray; @@ -108,7 +108,7 @@ * */ -unsigned int +Offset repo_addid_dep(Repo *repo, Offset olddeps, Id id, int isreq) { Id oid, *oidp, *marker = 0; @@ -175,8 +175,8 @@ * make space for 'num' more dependencies */ -unsigned int -repo_reserve_ids(Repo *repo, unsigned int olddeps, int num) +Offset +repo_reserve_ids(Repo *repo, Offset olddeps, int num) { num++; /* room for trailing ID_NULL */ @@ -272,8 +272,8 @@ xfree(repo); } -unsigned int -repo_fix_legacy(Repo *repo, unsigned int provides, unsigned int supplements) +Offset +repo_fix_legacy(Repo *repo, Offset provides, Offset supplements) { Pool *pool = repo->pool; Id id, idp, idl, idns; Modified: trunk/sat-solver/src/repo.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/repo.h?rev=7694&r… ============================================================================== --- trunk/sat-solver/src/repo.h (original) +++ trunk/sat-solver/src/repo.h Mon Oct 29 18:25:45 2007 @@ -23,10 +23,10 @@ Id *rpmdbid; } Repo; -extern unsigned int repo_addid(Repo *repo, unsigned int olddeps, Id id); -extern unsigned int repo_addid_dep(Repo *repo, unsigned int olddeps, Id id, int isreq); -extern unsigned int repo_reserve_ids(Repo *repo, unsigned int olddeps, int num); -extern unsigned int repo_fix_legacy(Repo *repo, unsigned int provides, unsigned int supplements); +extern Offset repo_addid(Repo *repo, Offset olddeps, Id id); +extern Offset repo_addid_dep(Repo *repo, Offset olddeps, Id id, int isreq); +extern Offset repo_reserve_ids(Repo *repo, Offset olddeps, int num); +extern Offset repo_fix_legacy(Repo *repo, Offset provides, Offset supplements); extern Repo *pool_addrepo_empty(Pool *pool); extern void pool_freerepo(Pool *pool, Repo *repo); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7693 - in /branches/SuSE-SLE-10-SP2-Branch: backend/package/libzypp-zmd-backend.changes backend/src/dbsource/zmd-backend.cc libzypp/package/libzypp.changes libzypp/zypp/ZYppFactory.cc
by aschnell＠svn.opensuse.org 29 Oct '07

29 Oct '07

Author: aschnell Date: Mon Oct 29 17:47:30 2007 New Revision: 7693 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7693&view=rev Log: - extended message of ZYppFactoryException (bug #191147) Modified: branches/SuSE-SLE-10-SP2-Branch/backend/package/libzypp-zmd-backend.changes branches/SuSE-SLE-10-SP2-Branch/backend/src/dbsource/zmd-backend.cc branches/SuSE-SLE-10-SP2-Branch/libzypp/package/libzypp.changes branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/ZYppFactory.cc Modified: branches/SuSE-SLE-10-SP2-Branch/backend/package/libzypp-zmd-backend.changes URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-SP2-Branch/backen… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/backend/package/libzypp-zmd-backend.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/backend/package/libzypp-zmd-backend.changes Mon Oct 29 17:47:30 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Oct 29 17:33:06 CET 2007 - aschnell(a)suse.de + +- report message of ZYppFactoryException (bug #191147) + +------------------------------------------------------------------- Thu Oct 25 16:03:03 CEST 2007 - duncan(a)suse.de - Add zmd-solver-testcase binary which allows for easy generation of Modified: branches/SuSE-SLE-10-SP2-Branch/backend/src/dbsource/zmd-backend.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-SP2-Branch/backen… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/backend/src/dbsource/zmd-backend.cc (original) +++ branches/SuSE-SLE-10-SP2-Branch/backend/src/dbsource/zmd-backend.cc Mon Oct 29 17:47:30 2007 @@ -32,8 +32,8 @@ } catch (Exception & excpt_r) { ZYPP_CAUGHT (excpt_r); - cerr << "1|A transaction is already in progress." << endl; - cout << "A transaction is already in progress." << endl; + cerr << "1|" << excpt_r.asUserString() << endl; + cout << excpt_r.asUserString() << endl; exit(1); } return Z; Modified: branches/SuSE-SLE-10-SP2-Branch/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-SP2-Branch/libzyp… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/libzypp/package/libzypp.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/libzypp/package/libzypp.changes Mon Oct 29 17:47:30 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Oct 29 17:31:45 CET 2007 - aschnell(a)suse.de + +- extended message of ZYppFactoryException (bug #191147) + +------------------------------------------------------------------- Fri Oct 26 15:33:01 CEST 2007 - aschnell(a)suse.de - fixed retrieval of epoch from rpmdb (bug #246680) Modified: branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/ZYppFactory.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-SP2-Branch/libzyp… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/ZYppFactory.cc (original) +++ branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/ZYppFactory.cc Mon Oct 29 17:47:30 2007 @@ -63,6 +63,7 @@ ZYppGlobalLock() : _clean_lock(false) , _zypp_lockfile(0) + , _locker_pid(0) {} ~ZYppGlobalLock() @@ -89,10 +90,13 @@ catch(...) {} // let no exception escape. } + pid_t locker_pid() const { return _locker_pid; } + bool _clean_lock; private: FILE *_zypp_lockfile; + pid_t _locker_pid; void openLockFile(const char *mode) { @@ -173,13 +177,13 @@ pid_t lockerPid() { pid_t curr_pid = getpid(); - pid_t locked_pid = 0; + pid_t locker_pid = 0; long readpid = 0; fscanf(_zypp_lockfile, "%ld", &readpid); MIL << "read: Lockfile " << ZYPP_LOCK_FILE << " has pid " << readpid << " (our pid: " << curr_pid << ") "<< std::endl; - locked_pid = (pid_t) readpid; - return locked_pid; + locker_pid = (pid_t) readpid; + return locker_pid; } public: @@ -196,7 +200,8 @@ shLockFile(); pid_t locker_pid = lockerPid(); - if ( locker_pid == curr_pid ) + _locker_pid = locker_pid; + if ( locker_pid == curr_pid ) { // alles ok, we are requesting the instance again //MIL << "Lockfile found, but it is myself. Assuming same process getting zypp instance again." << std::endl; @@ -276,7 +281,7 @@ /////////////////////////////////////////////////////////////////// ZYppFactoryException::ZYppFactoryException( const std::string & msg_r ) - : Exception(N_("Software management is already running.")) + : Exception(msg_r) {} /////////////////////////////////////////////////////////////////// @@ -331,7 +336,10 @@ /*--------------------------------------------------*/ if ( globalLock.zyppLocked() ) { - ZYPP_THROW( ZYppFactoryException(N_("Software management is already running.")) ); + string t = str::form(N_("System management is locked by the application with pid %d. " + "Please close this application before trying again."), + globalLock.locker_pid()); + ZYPP_THROW(ZYppFactoryException(t)); } else { -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7692 - in /trunk/sat-solver/src: solver.c solver.h
by mlschroe＠svn.opensuse.org 29 Oct '07

29 Oct '07

Author: mlschroe Date: Mon Oct 29 17:45:27 2007 New Revision: 7692 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7692&view=rev Log: - rename 'system' repo to 'installed' Modified: trunk/sat-solver/src/solver.c trunk/sat-solver/src/solver.h Modified: trunk/sat-solver/src/solver.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.c?rev=7692… ============================================================================== --- trunk/sat-solver/src/solver.c (original) +++ trunk/sat-solver/src/solver.c Mon Oct 29 17:45:27 2007 @@ -38,10 +38,10 @@ #if 0 static Id -replaces_system(Solver *solv, Id id) +replaces_installed(Solver *solv, Id id) { Pool *pool = solv->pool; - Repo *system = solv->system; + Repo *installed = solv->installed; Id *name = pool->solvables[id].name; FOR_PROVIDES(p, pp, id) @@ -49,7 +49,7 @@ s = pool->solvables + p; if (s->name != name) continue; - if (p >= system->start && p < system->start + system->nsolvables) + if (p >= installed->start && p < installed->start + installed->nsolvables) return p; } } @@ -75,7 +75,7 @@ } FOR_PROVIDES(p, pp, dep) { - if (p >= solv->system->start && p < solv->system->start + solv->system->nsolvables) + if (p >= solv->installed->start && p < solv->installed->start + solv->installed->nsolvables) return 1; } return 0; @@ -794,7 +794,7 @@ addrulesforsolvable(Solver *solv, Solvable *s, Map *m) { Pool *pool = solv->pool; - Repo *system = solv->system; + Repo *installed = solv->installed; Queue q; Id qbuf[64]; int i; @@ -826,10 +826,10 @@ s = pool->solvables + n; /* s = Solvable in question */ dontfix = 0; - if (system + if (installed && !solv->fixsystem - && n >= system->start /* is it installed? */ - && n < system->start + system->nsolvables) + && n >= installed->start /* is it installed? */ + && n < installed->start + installed->nsolvables) { dontfix = 1; /* dont care about broken rpm deps */ } @@ -859,12 +859,12 @@ * dependency was not broken before so we enforce it */ for (i = 0; dp[i]; i++) /* for all providers */ { - if (dp[i] >= system->start && dp[i] < system->start + system->nsolvables) + if (dp[i] >= installed->start && dp[i] < installed->start + installed->nsolvables) break; /* provider was installed */ } if (!dp[i]) /* previously broken dependency */ { - if (pool->verbose) printf("ignoring broken requires %s of system package %s-%s.%s\n", dep2str(pool, req), id2str(pool, s->name), id2str(pool, s->evr), id2str(pool, s->arch)); + if (pool->verbose) printf("ignoring broken requires %s of installed package %s-%s.%s\n", dep2str(pool, req), id2str(pool, s->name), id2str(pool, s->evr), id2str(pool, s->arch)); continue; } } @@ -914,7 +914,7 @@ FOR_PROVIDES(p, pp, con) { /* dontfix: dont care about conflicts with already installed packs */ - if (dontfix && p >= system->start && p < system->start + system->nsolvables) + if (dontfix && p >= installed->start && p < installed->start + installed->nsolvables) continue; /* rule: -n|-p: either solvable _or_ provider of conflict */ addrule(solv, -n, -p); @@ -925,7 +925,7 @@ /*----------------------------------------- * check obsoletes if not installed */ - if (!system || n < system->start || n >= (system->start + system->nsolvables)) + if (!installed || n < installed->start || n >= (installed->start + installed->nsolvables)) { /* not installed */ if (s->obsoletes) { @@ -1039,7 +1039,7 @@ static void findupdatepackages(Solver *solv, Solvable *s, Queue *qs, Map *m, int allowdowngrade, int allowarchchange) { - /* system packages get a special upgrade allowed rule */ + /* installed packages get a special upgrade allowed rule */ Pool *pool = solv->pool; Id p, *pp, n, p2, *pp2; Id obs, *obsp; @@ -1098,9 +1098,9 @@ if (m && !MAPTST(m, p)) /* mark p for install if not already done */ addrulesforsolvable(solv, pool->solvables + p, m); } - if (solv->noupdateprovide && solv->obsoletes && solv->obsoletes[n - solv->system->start]) + if (solv->noupdateprovide && solv->obsoletes && solv->obsoletes[n - solv->installed->start]) { - for (pp = solv->obsoletes_data + solv->obsoletes[n - solv->system->start]; (p = *pp++) != 0;) + for (pp = solv->obsoletes_data + solv->obsoletes[n - solv->installed->start]; (p = *pp++) != 0;) { queue_push(qs, p); if (m && !MAPTST(m, p)) /* mark p for install if not already done */ @@ -1120,7 +1120,7 @@ static void addupdaterule(Solver *solv, Solvable *s, Map *m, int allowdowngrade, int allowarchchange, int dontaddrule) { - /* system packages get a special upgrade allowed rule */ + /* installed packages get a special upgrade allowed rule */ Pool *pool = solv->pool; Id p, d; Rule *r; @@ -1793,20 +1793,20 @@ * create solver structure * * pool: all available solvables - * system: installed Solvables + * installed: installed Solvables * * * Upon solving, rules are created to flag the Solvables - * of the 'system' Repo as installed. + * of the 'installed' Repo as installed. */ Solver * -solver_create(Pool *pool, Repo *system) +solver_create(Pool *pool, Repo *installed) { Solver *solv; solv = (Solver *)xcalloc(1, sizeof(Solver)); solv->pool = pool; - solv->system = system; + solv->installed = installed; pool->verbose = 1; queue_init(&solv->ruletojob); @@ -1922,26 +1922,26 @@ } /* - * system packages + * installed packages */ - if (level < systemlevel && solv->system->nsolvables) + if (level < systemlevel && solv->installed->nsolvables) { if (!solv->updatesystem) { /* try to keep as many packages as possible */ if (pool->verbose) printf("installing system packages\n"); - for (i = solv->system->start, n = 0; ; i++, n++) + for (i = solv->installed->start, n = 0; ; i++, n++) { - if (n == solv->system->nsolvables) + if (n == solv->installed->nsolvables) break; - if (i == solv->system->start + solv->system->nsolvables) - i = solv->system->start; + if (i == solv->installed->start + solv->installed->nsolvables) + i = solv->installed->start; s = pool->solvables + i; if (solv->decisionmap[i] != 0) continue; #if 0 - printf("system installing %s-%s.%s\n", id2str(pool, s->name), id2str(pool, s->evr), id2str(pool, s->arch)); + printf("keeping %s-%s.%s\n", id2str(pool, s->name), id2str(pool, s->evr), id2str(pool, s->arch)); #endif olevel = level; level = setpropagatelearn(solv, level, i, disablerules); @@ -1958,18 +1958,18 @@ if (solv->weaksystemrules) { if (pool->verbose) printf("installing weak system packages\n"); - for (i = solv->system->start, n = 0; ; i++, n++) + for (i = solv->installed->start, n = 0; ; i++, n++) { - if (n == solv->system->nsolvables) + if (n == solv->installed->nsolvables) break; - if (solv->decisionmap[i] > 0 || (solv->decisionmap[i] < 0 && solv->weaksystemrules[i - solv->system->start] == 0)) + if (solv->decisionmap[i] > 0 || (solv->decisionmap[i] < 0 && solv->weaksystemrules[i - solv->installed->start] == 0)) continue; queue_empty(&dq); if (solv->decisionmap[i] == 0) queue_push(&dq, i); - if (solv->weaksystemrules[i - solv->system->start]) + if (solv->weaksystemrules[i - solv->installed->start]) { - dp = pool->whatprovidesdata + solv->weaksystemrules[i - solv->system->start]; + dp = pool->whatprovidesdata + solv->weaksystemrules[i - solv->installed->start]; while ((p = *dp++) != 0) { if (solv->decisionmap[p] > 0) @@ -2007,7 +2007,7 @@ break; } } - if (n != solv->system->nsolvables) + if (n != solv->installed->nsolvables) continue; } systemlevel = level; @@ -2402,7 +2402,7 @@ continue; if (n == SYSTEMSOLVABLE) continue; - if (n >= solv->system->start && n < solv->system->start + solv->system->nsolvables) + if (n >= solv->installed->start && n < solv->installed->start + solv->installed->nsolvables) continue; s = pool->solvables + n; if (s->obsoletes) @@ -2411,7 +2411,7 @@ while ((obs = *obsp++) != 0) FOR_PROVIDES(p, pp, obs) { - if (p >= solv->system->start && p < solv->system->start + solv->system->nsolvables) + if (p >= solv->installed->start && p < solv->installed->start + solv->installed->nsolvables) { obsoletesmap[p] = n; obsoletesmap[n]++; @@ -2421,7 +2421,7 @@ FOR_PROVIDES(p, pp, s->name) if (s->name == pool->solvables[p].name) { - if (p >= solv->system->start && p < solv->system->start + solv->system->nsolvables) + if (p >= solv->installed->start && p < solv->installed->start + solv->installed->nsolvables) { obsoletesmap[p] = n; obsoletesmap[n]++; @@ -2436,7 +2436,7 @@ /* print solvables to be erased */ - for (i = solv->system->start; i < solv->system->start + solv->system->nsolvables; i++) + for (i = solv->installed->start; i < solv->installed->start + solv->installed->nsolvables; i++) { if (solv->decisionmap[i] > 0) continue; @@ -2462,7 +2462,7 @@ continue; if (p == SYSTEMSOLVABLE) continue; - if (p >= solv->system->start && p < solv->system->start + solv->system->nsolvables) + if (p >= solv->installed->start && p < solv->installed->start + solv->installed->nsolvables) continue; s = pool->solvables + p; @@ -2478,7 +2478,7 @@ else if (!solv->rc_output) { printf("update %s-%s.%s (obsoletes", id2str(pool, s->name), id2str(pool, s->evr), id2str(pool, s->arch)); - for (j = solv->system->start; j < solv->system->start + solv->system->nsolvables; j++) + for (j = solv->installed->start; j < solv->installed->start + solv->installed->nsolvables; j++) { if (obsoletesmap[j] != p) continue; @@ -2491,7 +2491,7 @@ else { Solvable *f, *fn = 0; - for (j = solv->system->start; j < solv->system->start + solv->system->nsolvables; j++) + for (j = solv->installed->start; j < solv->installed->start + solv->installed->nsolvables; j++) { if (obsoletesmap[j] != p) continue; @@ -2543,12 +2543,12 @@ { Pool *pool = solv->pool; Solvable *s; - Repo *system = solv->system; + Repo *installed = solv->installed; Id p, *pp, obs, *obsp, *obsoletes, *obsoletes_data; int i, n; - /* create reverse obsoletes map for system solvables */ - solv->obsoletes = obsoletes = xcalloc(system->nsolvables, sizeof(Id)); + /* create reverse obsoletes map for installed solvables */ + solv->obsoletes = obsoletes = xcalloc(installed->nsolvables, sizeof(Id)); for (i = 1; i < pool->nsolvables; i++) { s = pool->solvables + i; @@ -2560,15 +2560,15 @@ while ((obs = *obsp++) != 0) FOR_PROVIDES(p, pp, obs) { - if (p < system->start || p >= system->start + system->nsolvables) + if (p < installed->start || p >= installed->start + installed->nsolvables) continue; if (pool->solvables[p].name == s->name) continue; - obsoletes[p - system->start]++; + obsoletes[p - installed->start]++; } } n = 0; - for (i = 0; i < system->nsolvables; i++) + for (i = 0; i < installed->nsolvables; i++) if (obsoletes[i]) { n += obsoletes[i] + 1; @@ -2587,11 +2587,11 @@ while ((obs = *obsp++) != 0) FOR_PROVIDES(p, pp, obs) { - if (p < system->start || p >= system->start + system->nsolvables) + if (p < installed->start || p >= installed->start + installed->nsolvables) continue; if (pool->solvables[p].name == s->name) continue; - p -= system->start; + p -= installed->start; if (obsoletes_data[obsoletes[p]] != i) obsoletes_data[--obsoletes[p]] = i; } @@ -2644,7 +2644,7 @@ * */ - for (i = solv->system->start; i < solv->system->start + solv->system->nsolvables; i++) + for (i = solv->installed->start; i < solv->installed->start + solv->installed->nsolvables; i++) addrulesforsolvable(solv, pool->solvables + i, &addedmap); /* @@ -2654,7 +2654,7 @@ * */ - if (solv->noupdateprovide && solv->system->nsolvables) + if (solv->noupdateprovide && solv->installed->nsolvables) create_obsolete_index(solv); /* @@ -2701,11 +2701,11 @@ if (!solv->allowuninstall) { /* add update rule for every installed package */ - for (i = solv->system->start; i < solv->system->start + solv->system->nsolvables; i++) + for (i = solv->installed->start; i < solv->installed->start + solv->installed->nsolvables; i++) addupdaterule(solv, pool->solvables + i, &addedmap, solv->allowdowngrade, solv->allowarchchange, 1); } #else /* this is just to add the needed rpm rules to our set */ - for (i = solv->system->start; i < solv->system->start + solv->system->nsolvables; i++) + for (i = solv->installed->start; i < solv->installed->start + solv->installed->nsolvables; i++) addupdaterule(solv, pool->solvables + i, &addedmap, 1, 1, 1); #endif @@ -2830,7 +2830,7 @@ if (!solv->allowuninstall) { /* loop over all installed solvables */ - for (i = solv->system->start; i < solv->system->start + solv->system->nsolvables; i++) + for (i = solv->installed->start; i < solv->installed->start + solv->installed->nsolvables; i++) { if (!MAPTST(&noupdaterule, i)) /* if not marked as 'noupdate' */ addupdaterule(solv, pool->solvables + i, &addedmap, solv->allowdowngrade, solv->allowarchchange, 0); @@ -2838,21 +2838,21 @@ addrule(solv, 0, 0); /* place holder */ } /* consistency check: we added a rule for _every_ system solvable */ - if (solv->nrules - solv->systemrules != solv->system->nsolvables) + if (solv->nrules - solv->systemrules != solv->installed->nsolvables) abort(); } if (pool->verbose) printf("problems so far: %d\n", solv->problems.count); /* create special weak system rules */ - if (solv->system->nsolvables) + if (solv->installed->nsolvables) { - solv->weaksystemrules = xcalloc(solv->system->nsolvables, sizeof(Id)); - for (i = 0; i < solv->system->nsolvables; i++) + solv->weaksystemrules = xcalloc(solv->installed->nsolvables, sizeof(Id)); + for (i = 0; i < solv->installed->nsolvables; i++) { - if (MAPTST(&noupdaterule, solv->system->start + i)) + if (MAPTST(&noupdaterule, solv->installed->start + i)) continue; - findupdatepackages(solv, pool->solvables + solv->system->start + i, &q, (Map *)0, 1, 1); + findupdatepackages(solv, pool->solvables + solv->installed->start + i, &q, (Map *)0, 1, 1); if (q.count) solv->weaksystemrules[i] = pool_queuetowhatprovides(pool, &q); } @@ -2868,10 +2868,10 @@ /* try real hard to keep packages installed */ if (0) { - for (i = 0; i < solv->system->nsolvables; i++) + for (i = 0; i < solv->installed->nsolvables; i++) { d = solv->weaksystemrules[i]; - addrule(solv, solv->system->start + i, d); + addrule(solv, solv->installed->start + i, d); } } @@ -3023,13 +3023,13 @@ else if (why >= solv->systemrules && why < solv->weakrules) { Solvable *sd = 0; - s = pool->solvables + solv->system->start + (why - solv->systemrules); + s = pool->solvables + solv->installed->start + (why - solv->systemrules); if (solv->weaksystemrules && solv->weaksystemrules[why - solv->systemrules]) { Id *dp = pool->whatprovidesdata + solv->weaksystemrules[why - solv->systemrules]; for (; *dp; dp++) { - if (*dp >= solv->system->start && *dp < solv->system->start + solv->system->nsolvables) + if (*dp >= solv->installed->start && *dp < solv->installed->start + solv->installed->nsolvables) continue; if (solv->decisionmap[*dp] > 0) { Modified: trunk/sat-solver/src/solver.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.h?rev=7692… ============================================================================== --- trunk/sat-solver/src/solver.h (original) +++ trunk/sat-solver/src/solver.h Mon Oct 29 17:45:27 2007 @@ -39,12 +39,12 @@ typedef struct solver { Pool *pool; - Repo *system; + Repo *installed; int fixsystem; /* repair errors in rpm dependency graph */ int allowdowngrade; /* allow to downgrade installed solvable */ int allowarchchange; /* allow to change architecture of installed solvables */ - int allowuninstall; /* allow removal of system solvables, else keep all installed solvables */ + int allowuninstall; /* allow removal of installed solvables */ int updatesystem; /* distupgrade */ int allowvirtualconflicts; /* false: conflicts on package name, true: conflicts on package provides */ int noupdateprovide; /* true: update packages needs not to provide old package */ @@ -85,7 +85,7 @@ Map suggestsmap; /* suggested packages from decisionmap */ int recommends_index; /* recommended level */ - Id *obsoletes; /* obsoletes for each system solvable */ + Id *obsoletes; /* obsoletes for each installed solvable */ Id *obsoletes_data; /* data area for obsoletes */ int rc_output; /* output result compatible to redcarpet/zypp testsuite, set == 2 for pure rc (will suppress architecture) */ @@ -106,7 +106,7 @@ SOLVER_INSTALL_SOLVABLE_UPDATE } SolverCmd; -extern Solver *solver_create(Pool *pool, Repo *system); +extern Solver *solver_create(Pool *pool, Repo *installed); extern void solver_free(Solver *solv); extern void solve(Solver *solv, Queue *job); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0