Author: schubi2
Date: Mon Nov 26 17:36:01 2007
New Revision: 7928
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7928&view=rev
Log:
replaced printf by a locking function
Added:
trunk/sat-solver/src/sat_debug.c
trunk/sat-solver/src/sat_debug.h
Modified:
trunk/sat-solver/src/CMakeLists.txt
trunk/sat-solver/src/evr.c
trunk/sat-solver/src/policy.c
trunk/sat-solver/src/pool.c
trunk/sat-solver/src/repo_solv.c
trunk/sat-solver/src/solver.c
trunk/sat-solver/src/util.c
trunk/sat-solver/testsuite/deptestomatic.c
Modified: trunk/sat-solver/src/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/CMakeLists.txt?rev=7928&r1=7927&r2=7928&view=diff
==============================================================================
--- trunk/sat-solver/src/CMakeLists.txt (original)
+++ trunk/sat-solver/src/CMakeLists.txt Mon Nov 26 17:36:01 2007
@@ -1,10 +1,10 @@
SET(libsatsolver_SRCS bitmap.c poolarch.c poolvendor.c poolid.c strpool.c
-solver.c repo_solv.c evr.c pool.c queue.c repo.c util.c policy.c )
+solver.c repo_solv.c evr.c pool.c queue.c repo.c util.c policy.c sat_debug.c)
ADD_LIBRARY(satsolver STATIC ${libsatsolver_SRCS})
-SET(libsatsolver_HEADERS bitmap.h evr.h hash.h policy.h poolarch.h poolvendor.h pool.h poolid.h pooltypes.h queue.h solvable.h solver.h repo.h repo_solv.h util.h strpool.h )
+SET(libsatsolver_HEADERS bitmap.h evr.h hash.h policy.h poolarch.h poolvendor.h pool.h poolid.h pooltypes.h queue.h solvable.h solver.h repo.h repo_solv.h util.h strpool.h sat_debug.h)
SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O3 -Wall -fPIC" )
Modified: trunk/sat-solver/src/evr.c
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/evr.c?rev=7928&r1=7927&r2=7928&view=diff
==============================================================================
--- trunk/sat-solver/src/evr.c (original)
+++ trunk/sat-solver/src/evr.c Mon Nov 26 17:36:01 2007
@@ -15,6 +15,7 @@
#include
#include "evr.h"
#include "pool.h"
+#include "sat_debug.h"
int
vercmp(const char *s1, const char *q1, const char *s2, const char *q2)
@@ -89,7 +90,7 @@
evr2 = id2str(pool, evr2id);
#if 0
- printf("evrcmp %s %s\n", evr1, evr2);
+ sat_debug (DEBUG_5,"evrcmp %s %s\n", evr1, evr2);
#endif
for (s1 = evr1; *s1 >= '0' && *s1 <= '9'; s1++)
;
Modified: trunk/sat-solver/src/policy.c
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/policy.c?rev=7928&r1=7927&r2=7928&view=diff
==============================================================================
--- trunk/sat-solver/src/policy.c (original)
+++ trunk/sat-solver/src/policy.c Mon Nov 26 17:36:01 2007
@@ -20,6 +20,7 @@
#include "policy.h"
#include "poolvendor.h"
#include "poolarch.h"
+#include "sat_debug.h"
static Pool *prune_best_version_arch_sortcmp_data;
@@ -222,7 +223,7 @@
if (plist->count < 2) /* no need to prune for a single entry */
return;
- if (pool->verbose > 1) printf("prune_to_best_version %d\n", plist->count);
+ sat_debug (DEBUG_2, "prune_to_best_version %d\n", plist->count);
/* prune to best architecture */
if (pool->id2arch)
@@ -267,7 +268,7 @@
{
s = pool->solvables + plist->elements[i];
- if (pool->verbose > 1) printf("- %s\n", solvable2str(pool, s));
+ sat_debug (DEBUG_2, "- %s\n", solvable2str(pool, s));
if (!best) /* if no best yet, the current is best */
{
Modified: trunk/sat-solver/src/pool.c
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/pool.c?rev=7928&r1=7927&r2=7928&view=diff
==============================================================================
--- trunk/sat-solver/src/pool.c (original)
+++ trunk/sat-solver/src/pool.c Mon Nov 26 17:36:01 2007
@@ -24,6 +24,7 @@
#include "poolarch.h"
#include "util.h"
#include "evr.h"
+#include "sat_debug.h"
#define SOLVABLE_BLOCK 255
@@ -269,8 +270,7 @@
;
}
o = dp - pool->whatprovidesdata;
- if (pool->verbose)
- printf("shrunk whatprovidesdata from %d to %d\n", pool->whatprovidesdataoff, o);
+ sat_debug (DEBUG_1, "shrunk whatprovidesdata from %d to %d\n", pool->whatprovidesdataoff, o);
if (pool->whatprovidesdataoff == o)
return;
r = pool->whatprovidesdataoff - o;
@@ -300,10 +300,8 @@
Offset *whatprovides;
Id *whatprovidesdata, *d;
- if (pool->verbose)
- printf("number of solvables: %d\n", pool->nsolvables);
- if (pool->verbose)
- printf("number of ids: %d + %d\n", pool->ss.nstrings, pool->nrels);
+ sat_debug (DEBUG_1,"number of solvables: %d\n", pool->nsolvables);
+ sat_debug (DEBUG_1,"number of ids: %d + %d\n", pool->ss.nstrings, pool->nrels);
pool_freeidhashes(pool);
pool_freewhatprovides(pool);
@@ -344,15 +342,13 @@
np++; /* inc # of provider 'slots' */
}
- if (pool->verbose)
- printf("provide ids: %d\n", np);
+ sat_debug (DEBUG_1, "provide ids: %d\n", np);
extra = 2 * pool->nrels;
if (extra < 256)
extra = 256;
- if (pool->verbose)
- printf("provide space needed: %d + %d\n", off, extra);
+ sat_debug (DEBUG_1, "provide space needed: %d + %d\n", off, extra);
/* alloc space for all providers + extra */
whatprovidesdata = (Id *)xcalloc(off + extra, sizeof(Id));
@@ -385,7 +381,7 @@
if (d[-1] == i)
{
#if 0
- if (pool->verbose) printf("duplicate entry for %s in package %s.%s\n", id2str(pool, id), id2str(pool, s->name), id2str(pool, s->arch));
+ sat_debug (DEBUG_4, "duplicate entry for %s in package %s.%s\n", id2str(pool, id), id2str(pool, s->name), id2str(pool, s->arch));
#endif
continue;
}
@@ -424,8 +420,7 @@
/* extend whatprovidesdata if needed, +1 for ID_NULL-termination */
if (pool->whatprovidesdataleft < count + 1)
{
- if (pool->verbose)
- printf("growing provides hash data...\n");
+ sat_debug (DEBUG_1, "growing provides hash data...\n");
pool->whatprovidesdata = (Id *)xrealloc(pool->whatprovidesdata, (pool->whatprovidesdataoff + count + 4096) * sizeof(Id));
pool->whatprovidesdataleft = count + 4096;
}
@@ -512,16 +507,14 @@
/* convert to whatprovides id */
#if 0
- if (pool->verbose)
- printf("addrelproviders: what provides %s?\n", id2str(pool, name));
+ sat_debug (DEBUG_1, "addrelproviders: what provides %s?\n", id2str(pool, name));
#endif
if (flags && flags < 8)
{
FOR_PROVIDES(p, pp, name)
{
#if 0
- if (pool->verbose)
- printf("addrelproviders: checking package %s\n", id2str(pool, pool->p[p].name));
+ sat_debug (DEBUG_1, "addrelproviders: checking package %s\n", id2str(pool, pool->p[p].name));
#endif
/* solvable p provides name in some rels */
pidp = pool->solvables[p].repo->idarraydata + pool->solvables[p].provides;
@@ -568,7 +561,7 @@
}
/* add providers to whatprovides */
#if 0
- if (pool->verbose) printf("addrelproviders: adding %d packages to %d\n", plist.count, d);
+ sat_debug (DEBUG_1, "addrelproviders: adding %d packages to %d\n", plist.count, d);
#endif
pool->whatprovides[d] = pool_queuetowhatprovides(pool, &plist);
queue_free(&plist);
Modified: trunk/sat-solver/src/repo_solv.c
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/repo_solv.c?rev=7928&r1=7927&r2=7928&view=diff
==============================================================================
--- trunk/sat-solver/src/repo_solv.c (original)
+++ trunk/sat-solver/src/repo_solv.c Mon Nov 26 17:36:01 2007
@@ -25,6 +25,7 @@
#include "repo_solv.h"
#include "util.h"
+#include "sat_debug.h"
#define INTERESTED_START SOLVABLE_NAME
#define INTERESTED_END SOLVABLE_FRESHENS
@@ -47,7 +48,7 @@
c = getc(fp);
if (c == EOF)
{
- fprintf(stderr, "unexpected EOF\n");
+ sat_debug (ERROR, "unexpected EOF\n");
exit(1);
}
x = (x << 8) | c;
@@ -67,7 +68,7 @@
c = getc(fp);
if (c == EOF)
{
- fprintf(stderr, "unexpected EOF\n");
+ sat_debug (ERROR, "unexpected EOF\n");
exit(1);
}
return c;
@@ -89,7 +90,7 @@
c = getc(fp);
if (c == EOF)
{
- fprintf(stderr, "unexpected EOF\n");
+ sat_debug (ERROR, "unexpected EOF\n");
exit(1);
}
if (!(c & 128))
@@ -97,14 +98,14 @@
x = (x << 7) | c;
if (x >= max)
{
- fprintf(stderr, "read_id: id too large (%u/%u)\n", x, max);
+ sat_debug (ERROR, "read_id: id too large (%u/%u)\n", x, max);
exit(1);
}
return x;
}
x = (x << 7) ^ c ^ 128;
}
- fprintf(stderr, "read_id: id too long\n");
+ sat_debug (ERROR, "read_id: id too long\n");
exit(1);
}
@@ -123,7 +124,7 @@
c = getc(fp);
if (c == EOF)
{
- fprintf(stderr, "unexpected EOF\n");
+ sat_debug (ERROR, "unexpected EOF\n");
exit(1);
}
if ((c & 128) == 0)
@@ -131,12 +132,12 @@
x = (x << 6) | (c & 63);
if (x >= max)
{
- fprintf(stderr, "read_idarray: id too large (%u/%u)\n", x, max);
+ sat_debug (ERROR, "read_idarray: id too large (%u/%u)\n", x, max);
exit(1);
}
if (store == end)
{
- fprintf(stderr, "read_idarray: array overflow\n");
+ sat_debug (ERROR, "read_idarray: array overflow\n");
exit(1);
}
*store++ = map[x];
@@ -144,7 +145,7 @@
{
if (store == end)
{
- fprintf(stderr, "read_idarray: array overflow\n");
+ sat_debug (ERROR, "read_idarray: array overflow\n");
exit(1);
}
*store++ = 0;
@@ -202,12 +203,12 @@
if (read_u32(fp) != ('S' << 24 | 'O' << 16 | 'L' << 8 | 'V'))
{
- fprintf(stderr, "not a SOLV file\n");
+ sat_debug (ERROR, "not a SOLV file\n");
exit(1);
}
if (read_u32(fp) != SOLV_VERSION)
{
- fprintf(stderr, "unsupported SOLV version\n");
+ sat_debug (ERROR, "unsupported SOLV version\n");
exit(1);
}
@@ -250,7 +251,7 @@
if (fread(strsp, sizeid, 1, fp) != 1)
{
- fprintf(stderr, "read error while reading strings\n");
+ sat_debug (ERROR, "read error while reading strings\n");
exit(1);
}
strsp[sizeid] = 0; /* make string space \0 terminated */
@@ -264,8 +265,8 @@
hashmask = mkmask(pool->ss.nstrings + numid);
#if 0
- printf("read %d strings\n", numid);
- printf("string hash buckets: %d\n", hashmask + 1);
+ sat_debug (ALWAYS, "read %d strings\n", numid);
+ sat_debug (ALWAYS, "string hash buckets: %d\n", hashmask + 1);
#endif
/*
@@ -297,7 +298,7 @@
{
if (sp >= strsp + sizeid)
{
- fprintf(stderr, "not enough strings\n");
+ sat_debug (ERROR, "not enough strings\n");
exit(1);
}
if (!*sp) /* empty string */
@@ -349,15 +350,15 @@
ran = (Reldep *)xrealloc(pool->rels, (pool->nrels + numrel) * sizeof(Reldep));
if (!ran)
{
- fprintf(stderr, "no mem for rel space\n");
+ sat_debug (ERROR, "no mem for rel space\n");
exit(1);
}
pool->rels = ran; /* extended rel space */
hashmask = mkmask(pool->nrels + numrel);
#if 0
- printf("read %d rels\n", numrel);
- printf("rel hash buckets: %d\n", hashmask + 1);
+ sat_debug (ALWAYS, "read %d rels\n", numrel);
+ sat_debug (ALWAYS, "rel hash buckets: %d\n", hashmask + 1);
#endif
/*
* prep hash table with already existing RelDeps
@@ -414,7 +415,7 @@
*/
#if 0
- printf("read repo data\n");
+ sat_debug (ALWAYS, "read repo data\n");
#endif
numsrcdata = read_u32(fp);
for (i = 0; i < numsrcdata; i++)
@@ -434,7 +435,7 @@
;
break;
default:
- fprintf(stderr, "unknown type\n");
+ sat_debug (ERROR, "unknown type\n");
exit(0);
}
}
@@ -445,7 +446,7 @@
*/
#if 0
- printf("read solvable data info\n");
+ sat_debug (ALWAYS, "read solvable data info\n");
#endif
numsolvdata = read_u32(fp);
numsolvdatabits = 0;
@@ -464,7 +465,7 @@
}
id = idmap[read_id(fp, numid)];
#if 0
- printf("#%d: %s\n", i, id2str(pool, id));
+ sat_debug (ALWAYS, "#%d: %s\n", i, id2str(pool, id));
#endif
solvdata[i].id = id;
size = read_u32(fp);
@@ -480,7 +481,7 @@
if (numsolvdatabits >= 32)
{
- fprintf(stderr, "too many data map bits\n");
+ sat_debug (ERROR, "too many data map bits\n");
exit(1);
}
@@ -504,7 +505,7 @@
*/
#if 0
- printf("read solvables\n");
+ sat_debug (ALWAYS, "read solvables\n");
#endif
s = pool_id2solvable(pool, repo_add_solvable_block(repo, numsolv));
for (i = 0; i < numsolv; i++, s++)
@@ -542,13 +543,13 @@
else if (id == SOLVABLE_VENDOR)
s->vendor = did;
#if 0
- printf("%s -> %s\n", id2str(pool, id), id2str(pool, did));
+ sat_debug (ALWAYS, "%s -> %s\n", id2str(pool, id), id2str(pool, did));
#endif
break;
case TYPE_U32:
h = read_u32(fp);
#if 0
- printf("%s -> %u\n", id2str(pool, id), h);
+ sat_debug (ALWAYS, "%s -> %u\n", id2str(pool, id), h);
#endif
if (id == RPM_RPMDBID)
{
@@ -590,9 +591,9 @@
else if (id == SOLVABLE_FRESHENS)
s->freshens = ido;
#if 0
- printf("%s ->\n", id2str(pool, id));
+ sat_debug (ALWAYS, "%s ->\n", id2str(pool, id));
for (; repo->idarraydata[ido]; ido++)
- printf(" %s\n", dep2str(pool, repo->idarraydata[ido]));
+ sat_debug (ALWAYS," %s\n", dep2str(pool, repo->idarraydata[ido]));
#endif
break;
}
Added: trunk/sat-solver/src/sat_debug.c
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/sat_debug.c?rev=7928&view=auto
==============================================================================
--- trunk/sat-solver/src/sat_debug.c (added)
+++ trunk/sat-solver/src/sat_debug.c Mon Nov 26 17:36:01 2007
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2007, Novell Inc.
+ *
+ * This program is licensed under the BSD license, read LICENSE.BSD
+ * for further information
+ *
+ * debug.c
+ * general logging function
+ *
+ */
+
+
+#include
+#include
+#include
+#include
+
+#define MAX_OUTPUT_LEN 200
+
+// debug level which can be set
+static DebugLevel debug_level = ERROR;
+// log file,function,line too
+static int sat_log_lineNr = 0;
+
+
+void
+sat_set_debug (DebugLevel level, int log_line_nr)
+{
+ debug_level = level;
+ sat_log_lineNr = log_line_nr;
+}
+
+DebugLevel sat_debug_level ()
+{
+ return debug_level;
+}
+
+void
+sat_debug (DebugLevel level, const char *format, ...)
+{
+ va_list args;
+ char str[MAX_OUTPUT_LEN];
+
+ va_start (args, format);
+ vsnprintf (str, MAX_OUTPUT_LEN, format, args);
+ va_end (args);
+
+ if (sat_debug_level() >= level) {
+ if (sat_log_lineNr) {
+ char pre[MAX_OUTPUT_LEN];
+ snprintf (pre, MAX_OUTPUT_LEN, "(%s, %s:%d) ", __FUNCTION__, __FILE__, __LINE__);
+ printf("%s", pre);
+ }
+ printf ("%s", str);
+ }
+}
Added: trunk/sat-solver/src/sat_debug.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/sat_debug.h?rev=7928&view=auto
==============================================================================
--- trunk/sat-solver/src/sat_debug.h (added)
+++ trunk/sat-solver/src/sat_debug.h Mon Nov 26 17:36:01 2007
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2007, Novell Inc.
+ *
+ * This program is licensed under the BSD license, read LICENSE.BSD
+ * for further information
+ *
+ * debug.h
+ * general logging function
+ *
+ */
+
+#ifndef _SAT_DEBUG_H
+#define _SAT_DEBUG_H
+
+#include
+#include
+
+typedef enum {
+ NONE = -2,
+ ALWAYS = -1,
+ ERROR = 0,
+ DEBUG_1 = 1,
+ DEBUG_2 = 2,
+ DEBUG_3 = 3,
+ DEBUG_4 = 4,
+ DEBUG_5 = 5
+} DebugLevel;
+
+// debug level
+void sat_set_debug (DebugLevel level, int log_line_nr);
+DebugLevel sat_debug_level ();
+
+void sat_debug (DebugLevel level, const char *format, ...);
+
+
+
+#endif /* _SAT_DEBUG_H */
Modified: trunk/sat-solver/src/solver.c
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.c?rev=7928&r1=7927&r2=7928&view=diff
==============================================================================
--- trunk/sat-solver/src/solver.c (original)
+++ trunk/sat-solver/src/solver.c Mon Nov 26 17:36:01 2007
@@ -22,6 +22,7 @@
#include "util.h"
#include "evr.h"
#include "policy.h"
+#include "sat_debug.h"
#define RULES_BLOCK 63
@@ -98,25 +99,25 @@
if (v < 0)
{
s = pool->solvables + -v;
- printf(" !%s [%d]", solvable2str(pool, s), -v);
+ sat_debug (ALWAYS, " !%s [%d]", solvable2str(pool, s), -v);
}
else
{
s = pool->solvables + v;
- printf(" %s [%d]", solvable2str(pool, s), v);
+ sat_debug (ALWAYS, " %s [%d]", solvable2str(pool, s), v);
}
if (r)
{
if (r->w1 == v)
- printf(" (w1)");
+ sat_debug (ALWAYS, " (w1)");
if (r->w2 == v)
- printf(" (w2)");
+ sat_debug (ALWAYS, " (w2)");
}
if (solv->decisionmap[s - pool->solvables] > 0)
- printf(" Install.level%d", solv->decisionmap[s - pool->solvables]);
+ sat_debug (ALWAYS, " Install.level%d", solv->decisionmap[s - pool->solvables]);
if (solv->decisionmap[s - pool->solvables] < 0)
- printf(" Conflict.level%d", -solv->decisionmap[s - pool->solvables]);
- printf("\n");
+ sat_debug (ALWAYS, " Conflict.level%d", -solv->decisionmap[s - pool->solvables]);
+ sat_debug (ALWAYS, "\n");
}
@@ -131,12 +132,12 @@
Id v;
if (r >= solv->rules && r < solv->rules + solv->nrules) /* r is a solver rule */
- printf("Rule #%d:", (int)(r - solv->rules));
+ sat_debug (ALWAYS, "Rule #%d:", (int)(r - solv->rules));
else
- printf("Rule:"); /* r is any rule */
+ sat_debug (ALWAYS, "Rule:"); /* r is any rule */
if (r && r->w1 == 0)
- printf(" (disabled)");
- printf("\n");
+ sat_debug (ALWAYS, " (disabled)");
+ sat_debug (ALWAYS, "\n");
for (i = 0; ; i++)
{
if (i == 0)
@@ -153,20 +154,20 @@
break;
printruleelement(solv, r, v);
}
- printf(" next: %d %d\n", r->n1, r->n2);
+ sat_debug (ALWAYS, " next: %d %d\n", r->n1, r->n2);
}
static void
printruleclass(Solver *solv, Rule *r)
{
if (r - solv->rules >= solv->learntrules)
- printf("LEARNT ");
+ sat_debug (ALWAYS, "LEARNT ");
else if (r - solv->rules >= solv->weakrules)
- printf("WEAK ");
+ sat_debug (ALWAYS, "WEAK ");
else if (r - solv->rules >= solv->systemrules)
- printf("SYSTEM ");
+ sat_debug (ALWAYS, "SYSTEM ");
else if (r - solv->rules >= solv->jobrules)
- printf("JOB ");
+ sat_debug (ALWAYS, "JOB ");
printrule(solv, r);
}
@@ -235,8 +236,7 @@
if (solv->nrules <= 1) /* nothing to unify */
return;
- if (solv->pool->verbose > 3)
- printf ("----- unifyrules -----\n");
+ sat_debug (DEBUG_4, "----- unifyrules -----\n");
/* sort rules first */
unifyrules_sortcmp_data = solv->pool;
@@ -257,13 +257,13 @@
}
/* reduced count from nrules to j rules */
- if (solv->pool->verbose) printf("pruned rules from %d to %d\n", solv->nrules, j);
+ sat_debug (DEBUG_1, "pruned rules from %d to %d\n", solv->nrules, j);
/* adapt rule buffer */
solv->nrules = j;
solv->rules = (Rule *)xrealloc(solv->rules, ((solv->nrules + RULES_BLOCK) & ~RULES_BLOCK) * sizeof(Rule));
#if 1
- if (solv->pool->verbose)
+ if (sat_debug_level() >= DEBUG_1)
{
int binr = 0;
int lits = 0;
@@ -282,12 +282,11 @@
lits++;
}
}
- printf(" binary: %d\n", binr);
- printf(" normal: %d, %d literals\n", solv->nrules - 1 - binr, lits);
+ sat_debug (DEBUG_1, " binary: %d\n", binr);
+ sat_debug (DEBUG_1," normal: %d, %d literals\n", solv->nrules - 1 - binr, lits);
}
#endif
- if (solv->pool->verbose > 3)
- printf ("----- unifyrules end -----\n");
+ sat_debug (DEBUG_4, "----- unifyrules end -----\n");
}
#if 0
@@ -463,9 +462,9 @@
r->n1 = 0;
r->n2 = 0;
- if (solv->pool->verbose > 3)
+ if (sat_debug_level() >= DEBUG_3)
{
- printf (" Add rule: ");
+ sat_debug (DEBUG_4, " Add rule: ");
printrule (solv, r);
}
@@ -545,15 +544,15 @@
else
{
v = -(v + 1);
- printf("JOB %d\n", v);
+ sat_debug (ALWAYS, "JOB %d\n", v);
jp = solv->ruletojob.elements;
for (i = solv->jobrules, r = solv->rules + i; i < solv->systemrules; i++, r++, jp++)
if (*jp == v)
{
- printf(" -");
+ sat_debug (ALWAYS, " -");
printrule(solv, r);
}
- printf("ENDJOB\n");
+ sat_debug (ALWAYS, "ENDJOB\n");
}
}
@@ -574,8 +573,7 @@
Id v, vv;
int decisionstart;
- if (solv->pool->verbose > 3)
- printf ("----- makeruledecisions ; size decisionq: %d -----\n",solv->decisionq.count);
+ sat_debug (DEBUG_4, "----- makeruledecisions ; size decisionq: %d -----\n",solv->decisionq.count);
decisionstart = solv->decisionq.count;
/* rpm rules don't have assertions, so we can start with the job
@@ -591,13 +589,13 @@
queue_push(&solv->decisionq, v);
queue_push(&solv->decisionq_why, r - solv->rules);
solv->decisionmap[vv] = v > 0 ? 1 : -1;
- if (solv->pool->verbose > 3)
+ if (sat_debug_level() >= DEBUG_4)
{
Solvable *s = solv->pool->solvables + vv;
if (v < 0)
- printf("removing %s\n", solvable2str(solv->pool, s));
+ sat_debug (ALWAYS, "removing %s\n", solvable2str(solv->pool, s));
else
- printf("installing %s\n", solvable2str(solv->pool, s));
+ sat_debug (ALWAYS, "installing %s\n", solvable2str(solv->pool, s));
}
continue;
}
@@ -616,7 +614,7 @@
/* if we are weak, just disable ourself */
if (ri >= solv->weakrules)
{
- printf("conflict, but I am weak, disabling ");
+ sat_debug (ALWAYS, "conflict, but I am weak, disabling ");
printrule(solv, r);
disablerule(solv, r);
continue;
@@ -638,7 +636,7 @@
queue_push(&solv->learnt_pool, ri);
queue_push(&solv->learnt_pool, v != -SYSTEMSOLVABLE ? -v : v);
queue_push(&solv->learnt_pool, 0);
- printf("conflict with rpm rule, disabling rule #%d\n", ri);
+ sat_debug (ALWAYS, "conflict with rpm rule, disabling rule #%d\n", ri);
if (ri < solv->systemrules)
v = -(solv->ruletojob.elements[ri - solv->jobrules] + 1);
else
@@ -655,7 +653,7 @@
queue_push(&solv->learnt_pool, 0);
/* conflict with another job or system rule */
- printf("conflicting system/job rules over literal %d\n", vv);
+ sat_debug (ALWAYS, "conflicting system/job rules over literal %d\n", vv);
/* push all of our rules asserting this literal on the problem stack */
for (i = solv->jobrules, rr = solv->rules + i; i < solv->nrules; i++, rr++)
{
@@ -663,7 +661,7 @@
continue;
if (rr->p != vv && rr->p != -vv)
continue;
- printf(" - disabling rule #%d\n", i);
+ sat_debug (ALWAYS, " - disabling rule #%d\n", i);
v = i;
if (i < solv->systemrules)
v = -(solv->ruletojob.elements[i - solv->jobrules] + 1);
@@ -684,8 +682,7 @@
r = solv->rules + ri;
}
- if (solv->pool->verbose > 3)
- printf ("----- makeruledecisions end; size decisionq: %d -----\n",solv->decisionq.count);
+ sat_debug (DEBUG_4, "----- makeruledecisions end; size decisionq: %d -----\n",solv->decisionq.count);
}
/*
@@ -696,13 +693,11 @@
static void
enabledisablelearntrules(Solver *solv)
{
- Pool *pool = solv->pool;
Rule *r;
Id why, *whyp;
int i;
- if (pool->verbose)
- printf("enabledisablelearntrules called\n");
+ sat_debug (DEBUG_1, "enabledisablelearntrules called\n");
for (i = solv->learntrules, r = solv->rules + i; i < solv->nrules; i++, r++)
{
whyp = solv->learnt_pool.elements + solv->learnt_why.elements[i - solv->learntrules];
@@ -716,18 +711,18 @@
/* why != 0: we found a disabled rule, disable the learnt rule */
if (why && r->w1)
{
- if (pool->verbose)
+ if (sat_debug_level() >= DEBUG_1)
{
- printf("disabling learnt ");
+ sat_debug (DEBUG_1, "disabling learnt ");
printrule(solv, r);
}
disablerule(solv, r);
}
else if (!why && !r->w1)
{
- if (pool->verbose)
+ if (sat_debug_level() >= DEBUG_1)
{
- printf("re-enabling learnt ");
+ sat_debug (DEBUG_1, "re-enabling learnt ");
printrule(solv, r);
}
enablerule(solv, r);
@@ -837,9 +832,9 @@
if (r->w1)
continue;
enablerule(solv, r);
- if (pool->verbose)
+ if (sat_debug_level() >= DEBUG_1)
{
- printf("@@@ re-enabling ");
+ sat_debug (DEBUG_1, "@@@ re-enabling ");
printrule(solv, r);
}
}
@@ -854,9 +849,9 @@
if (r->w1)
break;
enablerule(solv, r);
- if (pool->verbose)
+ if (sat_debug_level() >= DEBUG_1)
{
- printf("@@@ re-enabling ");
+ sat_debug (DEBUG_1, "@@@ re-enabling ");
printrule(solv, r);
}
break;
@@ -874,9 +869,9 @@
if (r->w1)
continue;
enablerule(solv, r);
- if (pool->verbose)
+ if (sat_debug_level() >= DEBUG_1)
{
- printf("@@@ re-enabling ");
+ sat_debug (DEBUG_1, "@@@ re-enabling ");
printrule(solv, r);
}
}
@@ -920,8 +915,7 @@
Id *dp;
Id n;
- if (solv->pool->verbose > 3)
- printf ("----- addrpmrulesforsolvable -----\n");
+ sat_debug (DEBUG_4, "----- addrpmrulesforsolvable -----\n");
queue_init_buffer(&q, qbuf, sizeof(qbuf)/sizeof(*qbuf));
queue_push(&q, s - pool->solvables); /* push solvable Id */
@@ -950,8 +944,7 @@
if (!dontfix && s->arch != ARCH_SRC && s->arch != ARCH_NOSRC && !pool_installable(pool, s))
{
- if (pool->verbose)
- printf("package %s [%d] is not installable\n", solvable2str(pool, s), (Id)(s - pool->solvables));
+ sat_debug (DEBUG_1, "package %s [%d] is not installable\n", solvable2str(pool, s), (Id)(s - pool->solvables));
addrule(solv, -n, 0); /* uninstallable */
}
@@ -985,8 +978,7 @@
}
if (!p) /* previously broken dependency */
{
- if (pool->verbose)
- printf("ignoring broken requires %s of installed package %s\n", dep2str(pool, req), solvable2str(pool, s));
+ sat_debug (DEBUG_1, "ignoring broken requires %s of installed package %s\n", dep2str(pool, req), solvable2str(pool, s));
continue;
}
}
@@ -994,17 +986,16 @@
if (!*dp)
{
/* nothing provides req! */
- if (pool->verbose)
- printf("package %s [%d] is not installable (%s)\n", solvable2str(pool, s), (Id)(s - pool->solvables), dep2str(pool, req));
+ sat_debug (DEBUG_1, "package %s [%d] is not installable (%s)\n", solvable2str(pool, s), (Id)(s - pool->solvables), dep2str(pool, req));
addrule(solv, -n, 0); /* mark requestor as uninstallable */
continue;
}
- if (pool->verbose > 2)
+ if (sat_debug_level() >= DEBUG_2)
{
- printf(" %s requires %s\n", solvable2str(pool, s), dep2str(pool, req));
+ sat_debug (DEBUG_2," %s requires %s\n", solvable2str(pool, s), dep2str(pool, req));
for (i = 0; dp[i]; i++)
- printf(" provided by %s\n", solvable2str(pool, pool->solvables + dp[i]));
+ sat_debug (DEBUG_2, " provided by %s\n", solvable2str(pool, pool->solvables + dp[i]));
}
/* add 'requires' dependency */
@@ -1092,8 +1083,7 @@
}
}
queue_free(&q);
- if (solv->pool->verbose > 3)
- printf ("----- addrpmrulesforsolvable end -----\n");
+ sat_debug (DEBUG_4, "----- addrpmrulesforsolvable end -----\n");
}
@@ -1105,8 +1095,7 @@
Id sup, *supp;
int i, n;
- if (solv->pool->verbose > 3)
- printf ("----- addrpmrulesforweak -----\n");
+ sat_debug (DEBUG_4, "----- addrpmrulesforweak -----\n");
for (i = n = 1; n < pool->nsolvables; i++, n++)
{
if (i == pool->nsolvables)
@@ -1143,8 +1132,7 @@
addrpmrulesforsolvable(solv, s, m);
n = 0;
}
- if (solv->pool->verbose > 3)
- printf ("----- addrpmrulesforweak end -----\n");
+ sat_debug (DEBUG_4, "----- addrpmrulesforweak end -----\n");
}
static void
@@ -1155,8 +1143,7 @@
Queue qs;
Id qsbuf[64];
- if (solv->pool->verbose > 3)
- printf ("----- addrpmrulesforupdaters -----\n");
+ sat_debug (DEBUG_4, "----- addrpmrulesforupdaters -----\n");
queue_init_buffer(&qs, qsbuf, sizeof(qsbuf)/sizeof(*qsbuf));
policy_findupdatepackages(solv, s, &qs, allowall);
@@ -1167,8 +1154,7 @@
addrpmrulesforsolvable(solv, pool->solvables + qs.elements[i], m);
queue_free(&qs);
- if (solv->pool->verbose > 3)
- printf ("----- addrpmrulesforupdaters -----\n");
+ sat_debug (DEBUG_1, "----- addrpmrulesforupdaters -----\n");
}
@@ -1188,8 +1174,7 @@
Queue qs;
Id qsbuf[64];
- if (solv->pool->verbose > 3)
- printf ("----- addupdaterule -----\n");
+ sat_debug (DEBUG_4, "----- addupdaterule -----\n");
queue_init_buffer(&qs, qsbuf, sizeof(qsbuf)/sizeof(*qsbuf));
policy_findupdatepackages(solv, s, &qs, allowall);
@@ -1199,8 +1184,7 @@
d = pool_queuetowhatprovides(pool, &qs); /* intern computed queue */
queue_free(&qs);
addrule(solv, s - pool->solvables, d); /* allow update of s */
- if (solv->pool->verbose > 3)
- printf ("----- addupdaterule end -----\n");
+ sat_debug (DEBUG_4, "----- addupdaterule end -----\n");
}
@@ -1284,16 +1268,15 @@
Id *decisionmap = solv->decisionmap;
Id *watches = solv->watches + pool->nsolvables;
- if (solv->pool->verbose > 3)
- printf ("----- propagate -----\n");
+ sat_debug (DEBUG_4, "----- propagate -----\n");
while (solv->propagate_index < solv->decisionq.count)
{
/* negate because our watches trigger if literal goes FALSE */
pkg = -solv->decisionq.elements[solv->propagate_index++];
- if (pool->verbose > 3)
+ if (sat_debug_level() >= DEBUG_4)
{
- printf("popagate for decision %d level %d\n", -pkg, level);
+ sat_debug (DEBUG_4, "popagate for decision %d level %d\n", -pkg, level);
printruleelement(solv, 0, -pkg);
}
@@ -1301,9 +1284,9 @@
{
r = solv->rules + *rp;
- if (pool->verbose > 3)
+ if (sat_debug_level() >= DEBUG_4)
{
- printf(" watch triggered ");
+ sat_debug (DEBUG_4," watch triggered ");
printrule(solv, r);
}
@@ -1335,12 +1318,12 @@
if (p)
{
/* p is free to watch, move watch to p */
- if (pool->verbose > 3)
+ if (sat_debug_level() >= DEBUG_4)
{
if (p > 0)
- printf(" -> move w%d to %s\n", (pkg == r->w1 ? 1 : 2), solvable2str(pool, pool->solvables + p));
+ sat_debug (DEBUG_4, " -> move w%d to %s\n", (pkg == r->w1 ? 1 : 2), solvable2str(pool, pool->solvables + p));
else
- printf(" -> move w%d to !%s\n", (pkg == r->w1 ? 1 : 2), solvable2str(pool, pool->solvables - p));
+ sat_debug (DEBUG_4," -> move w%d to !%s\n", (pkg == r->w1 ? 1 : 2), solvable2str(pool, pool->solvables - p));
}
*rp = *nrp;
nrp = rp;
@@ -1361,9 +1344,9 @@
/* unit clause found, set other watch to TRUE */
if (DECISIONMAP_TRUE(-ow))
return r; /* eek, a conflict! */
- if (pool->verbose > 2)
+ if (sat_debug_level() >= DEBUG_2)
{
- printf("unit ");
+ sat_debug (DEBUG_2, "unit ");
printrule(solv, r);
}
if (ow > 0)
@@ -1372,18 +1355,17 @@
decisionmap[-ow] = -level;
queue_push(&solv->decisionq, ow);
queue_push(&solv->decisionq_why, r - solv->rules);
- if (pool->verbose > 3)
+ if (sat_debug_level() >= DEBUG_4)
{
Solvable *s = pool->solvables + (ow > 0 ? ow : -ow);
if (ow > 0)
- printf(" -> decided to install %s\n", solvable2str(pool, s));
+ sat_debug (DEBUG_4, " -> decided to install %s\n", solvable2str(pool, s));
else
- printf(" -> decided to conflict %s\n", solvable2str(pool, s));
+ sat_debug (DEBUG_4, " -> decided to conflict %s\n", solvable2str(pool, s));
}
}
}
- if (solv->pool->verbose > 3)
- printf ("----- propagate end-----\n");
+ sat_debug (DEBUG_4, "----- propagate end-----\n");
return 0; /* all is well */
}
@@ -1412,12 +1394,12 @@
queue_init(&r);
- if (pool->verbose > 1) printf("ANALYZE at %d ----------------------\n", level);
+ sat_debug (DEBUG_1, "ANALYZE at %d ----------------------\n", level);
map_init(&seen, pool->nsolvables);
idx = solv->decisionq.count;
for (;;)
{
- if (pool->verbose > 1)
+ if (sat_debug_level() >= DEBUG_2)
printruleclass(solv, c);
queue_push(&solv->learnt_pool, c - solv->rules);
dp = c->d ? pool->whatprovidesdata + c->d : 0;
@@ -1458,17 +1440,16 @@
else
{
queue_push(&r, v);
- if (pool->verbose > 3)
+ if (sat_debug_level() >= DEBUG_4)
{
- printf("PUSH %d ", v);
+ sat_debug (DEBUG_4, "PUSH %d ", v);
printruleelement(solv, 0, v);
}
if (l > rlevel)
rlevel = l;
}
}
- if (pool->verbose > 3)
- printf("num = %d\n", num);
+ sat_debug (DEBUG_4, "num = %d\n", num);
if (num <= 0)
abort();
for (;;)
@@ -1490,9 +1471,9 @@
*dr = r.elements[0];
else
*dr = pool_queuetowhatprovides(pool, &r);
- if (pool->verbose > 1)
+ if (sat_debug_level() >= DEBUG_1)
{
- printf("learned rule for level %d (am %d)\n", rlevel, level);
+ sat_debug (DEBUG_1, "learned rule for level %d (am %d)\n", rlevel, level);
printruleelement(solv, 0, -v);
for (i = 0; i < r.count; i++)
{
@@ -1502,11 +1483,11 @@
}
map_free(&seen);
queue_push(&solv->learnt_pool, 0);
- if (pool->verbose > 3)
+ if (sat_debug_level() >= DEBUG_4)
{
for (i = learnt_why; solv->learnt_pool.elements[i]; i++)
{
- printf("learnt_why ");
+ sat_debug (DEBUG_4, "learnt_why ");
printrule(solv, solv->rules + solv->learnt_pool.elements[i]);
}
}
@@ -1547,8 +1528,7 @@
solv->decisionmap[v > 0 ? v : -v] = v > 0 ? 1 : -1;
}
- if (solv->pool->verbose > 1)
- printf("decisions done reduced from %d to %d\n", solv->decisionq.count, i);
+ sat_debug (DEBUG_2, "decisions done reduced from %d to %d\n", solv->decisionq.count, i);
solv->decisionq_why.count = i;
solv->decisionq.count = i;
@@ -1557,8 +1537,7 @@
/* redo all job/system decisions */
makeruledecisions(solv);
- if (solv->pool->verbose > 1)
- printf("decisions so far: %d\n", solv->decisionq.count);
+ sat_debug (DEBUG_2, "decisions so far: %d\n", solv->decisionq.count);
/* recreate watch chains */
makewatches(solv);
}
@@ -1573,7 +1552,7 @@
{
int i;
Id why = r - solv->rules;
- if (solv->pool->verbose > 1)
+ if (sat_debug_level() >= DEBUG_2)
printruleclass(solv, r);
if (solv->learntrules && why >= solv->learntrules)
{
@@ -1620,8 +1599,7 @@
int oldlearntpoolcount;
int lastweak;
- if (pool->verbose > 1)
- printf("ANALYZE UNSOLVABLE ----------------------\n");
+ sat_debug (DEBUG_2, "ANALYZE UNSOLVABLE ----------------------\n");
oldproblemcount = solv->problems.count;
oldlearntpoolcount = solv->learnt_pool.count;
@@ -1664,9 +1642,9 @@
if (!why)
{
/* level 1 and no why, must be an rpm assertion */
- if (pool->verbose > 3)
+ if (sat_debug_level() >= DEBUG_4)
{
- printf("RPM ");
+ sat_debug (DEBUG_4, "RPM ");
printruleelement(solv, 0, v);
}
/* this is the only positive rpm assertion */
@@ -1721,7 +1699,7 @@
solv->problems.count = oldproblemcount;
solv->learnt_pool.count = oldlearntpoolcount;
r = solv->rules + lastweak;
- printf("disabling weak ");
+ sat_debug (ALWAYS, "disabling weak ");
printrule(solv, r);
disablerule(solv, r);
reset_solver(solv);
@@ -1739,8 +1717,7 @@
reset_solver(solv);
return 1;
}
- if (pool->verbose)
- printf("UNSOLVABLE\n");
+ sat_debug (DEBUG_1, "UNSOLVABLE\n");
return 0;
}
@@ -1763,8 +1740,7 @@
vv = v > 0 ? v : -v;
if (solv->decisionmap[vv] <= level && solv->decisionmap[vv] >= -level)
break;
- if (solv->pool->verbose > 3)
- printf("reverting decision %d at %d\n", v, solv->decisionmap[vv]);
+ sat_debug (DEBUG_4, "reverting decision %d at %d\n", v, solv->decisionmap[vv]);
solv->decisionmap[vv] = 0;
solv->decisionq.count--;
solv->decisionq_why.count--;
@@ -1841,11 +1817,11 @@
break;
if (level == 1)
return analyze_unsolvable(solv, r, disablerules);
- printf("conflict with rule #%d\n", (int)(r - solv->rules));
+ sat_debug (ALWAYS, "conflict with rule #%d\n", (int)(r - solv->rules));
l = analyze(solv, level, r, &p, &d, &why); /* learnt rule in p and d */
if (l >= level || l <= 0)
abort();
- printf("reverting decisions (level %d -> %d)\n", level, l);
+ sat_debug (ALWAYS, "reverting decisions (level %d -> %d)\n", level, l);
level = l;
revert(solv, level);
r = addrule(solv, p, d); /* p requires d */
@@ -1853,7 +1829,7 @@
abort();
if (solv->learnt_why.count != (r - solv->rules) - solv->learntrules)
{
- printf("%d %d\n", solv->learnt_why.count, (int)(r - solv->rules) - solv->learntrules);
+ sat_debug (ALWAYS, "%d %d\n", solv->learnt_why.count, (int)(r - solv->rules) - solv->learntrules);
abort();
}
queue_push(&solv->learnt_why, why);
@@ -1866,11 +1842,11 @@
solv->decisionmap[p > 0 ? p : -p] = p > 0 ? level : -level;
queue_push(&solv->decisionq, p);
queue_push(&solv->decisionq_why, r - solv->rules);
- if (solv->pool->verbose > 1)
+ if (sat_debug_level() >= DEBUG_2)
{
- printf("decision: ");
+ sat_debug (DEBUG_2, "decision: ");
printruleelement(solv, 0, p);
- printf("new rule: ");
+ sat_debug (DEBUG_2, "new rule: ");
printrule(solv, r);
}
}
@@ -1909,8 +1885,7 @@
}
p = dq->elements[i];
- if (pool->verbose > 3)
- printf("installing %s\n", solvable2str(pool, pool->solvables + p));
+ sat_debug (DEBUG_4, "installing %s\n", solvable2str(pool, pool->solvables + p));
return setpropagatelearn(solv, level, p, disablerules);
}
@@ -2013,9 +1988,9 @@
Pool *pool = solv->pool;
Id p, *dp;
- if (pool->verbose > 3)
+ if (sat_debug_level() >= DEBUG_4)
{
- printf("number of rules: %d\n", solv->nrules);
+ sat_debug (DEBUG_4, "number of rules: %d\n", solv->nrules);
for (i = 0; i < solv->nrules; i++)
printrule(solv, solv->rules + i);
}
@@ -2023,14 +1998,14 @@
/* create watches chains */
makewatches(solv);
- if (pool->verbose) printf("initial decisions: %d\n", solv->decisionq.count);
- if (pool->verbose > 3)
+ sat_debug (DEBUG_1, "initial decisions: %d\n", solv->decisionq.count);
+ if (sat_debug_level() >= DEBUG_4)
printdecisions(solv);
/* start SAT algorithm */
level = 1;
systemlevel = level + 1;
- if (pool->verbose) printf("solving...\n");
+ sat_debug (DEBUG_1, "solving...\n");
queue_init(&dq);
for (;;)
@@ -2041,7 +2016,7 @@
if (level == 1)
{
- if (pool->verbose) printf("propagating (propagate_index: %d; size decisionq: %d)...\n", solv->propagate_index, solv->decisionq.count);
+ sat_debug (DEBUG_1, "propagating (propagate_index: %d; size decisionq: %d)...\n", solv->propagate_index, solv->decisionq.count);
if ((r = propagate(solv, level)) != 0)
{
if (analyze_unsolvable(solv, r, disablerules))
@@ -2060,7 +2035,7 @@
if (!solv->updatesystem)
{
/* try to keep as many packages as possible */
- if (pool->verbose) printf("installing system packages\n");
+ sat_debug (DEBUG_1, "installing system packages\n");
for (i = solv->installed->start, n = 0; ; i++)
{
if (n == solv->installed->nsolvables)
@@ -2073,8 +2048,7 @@
n++;
if (solv->decisionmap[i] != 0)
continue;
- if (pool->verbose > 3)
- printf("keeping %s\n", solvable2str(pool, s));
+ sat_debug (DEBUG_4, "keeping %s\n", solvable2str(pool, s));
olevel = level;
level = setpropagatelearn(solv, level, i, disablerules);
if (level == 0)
@@ -2088,7 +2062,7 @@
}
if (solv->weaksystemrules)
{
- if (pool->verbose) printf("installing weak system packages\n");
+ sat_debug (DEBUG_1, "installing weak system packages\n");
for (i = solv->installed->start; i < solv->installed->end; i++)
{
if (pool->solvables[i].repo != solv->installed)
@@ -2137,7 +2111,7 @@
* decide
*/
- if (pool->verbose) printf("deciding unresolved rules\n");
+ sat_debug (DEBUG_1, "deciding unresolved rules\n");
for (i = 1, n = 1; ; i++, n++)
{
if (n == solv->nrules)
@@ -2205,7 +2179,7 @@
printrule(solv, r);
abort();
}
- if (pool->verbose > 2)
+ if (sat_debug_level() >= DEBUG_3)
printrule(solv, r);
olevel = level;
@@ -2227,7 +2201,7 @@
{
int qcount;
- if (pool->verbose) printf("installing recommended packages\n");
+ sat_debug (DEBUG_1, "installing recommended packages\n");
if (0)
{
for (i = 0; i < solv->decisionq.count; i++)
@@ -2294,8 +2268,7 @@
if (dq.count > 1)
policy_filter_unwanted(solv, &dq, 0, POLICY_MODE_RECOMMEND);
p = dq.elements[0];
- if (pool->verbose > 0)
- printf("installing recommended %s\n", solvable2str(pool, pool->solvables + p));
+ sat_debug (DEBUG_1, "installing recommended %s\n", solvable2str(pool, pool->solvables + p));
level = setpropagatelearn(solv, level, p, 0);
continue;
}
@@ -2312,8 +2285,7 @@
if (solv->branches.elements[i - 1] < 0)
break;
p = solv->branches.elements[i];
- if (pool->verbose > 0)
- printf("branching with %s\n", solvable2str(pool, pool->solvables + p));
+ sat_debug (DEBUG_1, "branching with %s\n", solvable2str(pool, pool->solvables + p));
queue_empty(&dq);
for (j = i + 1; j < solv->branches.count; j++)
queue_push(&dq, solv->branches.elements[j]);
@@ -2357,8 +2329,7 @@
/* kill old solvable so that we do not loop */
p = solv->branches.elements[lasti];
solv->branches.elements[lasti] = 0;
- if (pool->verbose > 0)
- printf("minimizing %d -> %d with %s\n", solv->decisionmap[p], l, solvable2str(pool, pool->solvables + p));
+ sat_debug (DEBUG_1, "minimizing %d -> %d with %s\n", solv->decisionmap[p], l, solvable2str(pool, pool->solvables + p));
level = lastl;
revert(solv, level);
@@ -2390,20 +2361,19 @@
static void
refine_suggestion(Solver *solv, Queue *job, Id *problem, Id sug, Queue *refined)
{
- Pool *pool = solv->pool;
Rule *r;
int i, j;
Id v;
Queue disabled;
int disabledcnt;
- if (pool->verbose)
+ if (sat_debug_level() >= DEBUG_1)
{
- printf("refine_suggestion start\n");
+ sat_debug (DEBUG_1, "refine_suggestion start\n");
for (i = 0; problem[i]; i++)
{
if (problem[i] == sug)
- printf("=> ");
+ sat_debug (DEBUG_1, "=> ");
printproblem(solv, problem[i]);
}
}
@@ -2439,9 +2409,8 @@
run_solver(solv, 0, 0);
if (!solv->problems.count)
{
- if (pool->verbose)
- printf("no more problems!\n");
- if (pool->verbose > 3)
+ sat_debug (DEBUG_1, "no more problems!\n");
+ if (sat_debug_level() >= DEBUG_4)
printdecisions(solv);
break; /* great, no more problems */
}
@@ -2463,8 +2432,7 @@
if (disabled.count == disabledcnt)
{
/* no solution found, this was an invalid suggestion! */
- if (pool->verbose)
- printf("no solution found!\n");
+ sat_debug (DEBUG_1, "no solution found!\n");
refined->count = 0;
break;
}
@@ -2481,9 +2449,9 @@
{
/* more than one solution, disable all */
/* do not push anything on refine list */
- if (pool->verbose > 1)
+ if (sat_debug_level() >= DEBUG_2)
{
- printf("more than one solution found:\n");
+ sat_debug (DEBUG_2, "more than one solution found:\n");
for (i = disabledcnt; i < disabled.count; i++)
printproblem(solv, disabled.elements[i]);
}
@@ -2499,8 +2467,7 @@
for (i = 0; problem[i]; i++)
disableproblem(solv, problem[i]);
disableupdaterules(solv, job, -1);
- if (pool->verbose)
- printf("refine_suggestion end\n");
+ sat_debug (DEBUG_1,"refine_suggestion end\n");
}
static void
@@ -2728,7 +2695,7 @@
continue;
if (obsoletesmap[p])
continue;
- printf("erase %s\n", solvable2str(pool, s));
+ sat_debug (ALWAYS, "erase %s\n", solvable2str(pool, s));
}
}
@@ -2748,29 +2715,29 @@
if (!obsoletesmap[p])
{
- printf("install %s", solvable2str(pool, s));
+ sat_debug (ALWAYS, "install %s", solvable2str(pool, s));
}
else
{
- printf("update %s", solvable2str(pool, s));
- printf(" (obsoletes");
+ sat_debug (ALWAYS, "update %s", solvable2str(pool, s));
+ sat_debug (ALWAYS, " (obsoletes");
for (j = installed->start; j < installed->end; j++)
if (obsoletesmap[j] == p)
- printf(" %s", solvable2str(pool, pool->solvables + j));
- printf(")");
+ sat_debug (ALWAYS," %s", solvable2str(pool, pool->solvables + j));
+ sat_debug (ALWAYS,")");
}
- printf("\n");
+ sat_debug (ALWAYS, "\n");
}
xfree(obsoletesmap);
if (solv->suggestions.count)
{
- printf("\nsuggested packages:\n");
+ sat_debug (ALWAYS, "\nsuggested packages:\n");
for (i = 0; i < solv->suggestions.count; i++)
{
s = pool->solvables + solv->suggestions.elements[i];
- printf("- %s\n", solvable2str(pool, s));
+ sat_debug (ALWAYS, "- %s\n", solvable2str(pool, s));
}
}
}
@@ -2792,7 +2759,7 @@
{
if (p != pc)
continue;
- printf("packags %s conflicts with %s, which is provided by %s\n", solvable2str(pool, s), dep2str(pool, con), solvable2str(pool, sc));
+ sat_debug (ALWAYS, "packags %s conflicts with %s, which is provided by %s\n", solvable2str(pool, s), dep2str(pool, con), solvable2str(pool, sc));
numc++;
}
}
@@ -2806,7 +2773,7 @@
{
if (p != pc)
continue;
- printf("packags %s obsolets %s, which is provided by %s\n", solvable2str(pool, s), dep2str(pool, obs), solvable2str(pool, sc));
+ sat_debug (ALWAYS, "packags %s obsolets %s, which is provided by %s\n", solvable2str(pool, s), dep2str(pool, obs), solvable2str(pool, sc));
numc++;
}
}
@@ -2853,13 +2820,13 @@
switch (job->elements[ji])
{
case SOLVER_INSTALL_SOLVABLE_NAME:
- printf("no solvable exists with name %s\n", dep2str(pool, what));
+ sat_debug (ALWAYS, "no solvable exists with name %s\n", dep2str(pool, what));
break;
case SOLVER_INSTALL_SOLVABLE_PROVIDES:
- printf("no solvable provides %s\n", dep2str(pool, what));
+ sat_debug (ALWAYS, "no solvable provides %s\n", dep2str(pool, what));
break;
default:
- printf("unknown job\n");
+ sat_debug (ALWAYS, "unknown job\n");
abort();
}
return;
@@ -2873,7 +2840,7 @@
}
if (rn >= solv->jobrules)
{
- printf("some job/system/learnt rule\n");
+ sat_debug (ALWAYS, "some job/system/learnt rule\n");
printrule(solv, r);
return;
}
@@ -2891,33 +2858,33 @@
dp = pool_whatprovides(pool, req);
if (*dp)
continue;
- printf("package %s requires %s, but no package provides it\n", solvable2str(pool, s), dep2str(pool, req));
+ sat_debug (ALWAYS, "package %s requires %s, but no package provides it\n", solvable2str(pool, s), dep2str(pool, req));
count++;
}
}
if (!count)
- printf("package %s is not installable\n", solvable2str(pool, s));
+ sat_debug (ALWAYS, "package %s is not installable\n", solvable2str(pool, s));
return;
}
if (rn >= solv->learntrules)
{
/* learnt rule, ignore for now */
- printf("some learnt rule...\n");
+ sat_debug (ALWAYS, "some learnt rule...\n");
printrule(solv, r);
return;
}
if (rn >= solv->systemrules)
{
/* system rule, ignore for now */
- printf("some system rule...\n");
+ sat_debug (ALWAYS, "some system rule...\n");
printrule(solv, r);
return;
}
if (rn >= solv->jobrules)
{
/* job rule, ignore for now */
- printf("some job rule...\n");
+ sat_debug (ALWAYS, "some job rule...\n");
printrule(solv, r);
return;
}
@@ -2934,7 +2901,7 @@
sd = pool->solvables + (-d);
if (sp->name == sd->name)
{
- printf("cannot install both %s and %s\n", solvable2str(pool, sp), solvable2str(pool, sd));
+ sat_debug (ALWAYS, "cannot install both %s and %s\n", solvable2str(pool, sp), solvable2str(pool, sd));
}
else
{
@@ -2963,10 +2930,10 @@
}
if (!req)
{
- printf("req not found\n");
+ sat_debug (ALWAYS, "req not found\n");
abort();
}
- printf("package %s requires %s, but none of its providers can be installed\n", solvable2str(pool, s), dep2str(pool, req));
+ sat_debug (ALWAYS, "package %s requires %s, but none of its providers can be installed\n", solvable2str(pool, s), dep2str(pool, req));
}
}
@@ -2979,15 +2946,15 @@
Id problem, solution, element;
Solvable *s, *sd;
- printf("Encountered problems! Here are the solutions:\n\n");
+ sat_debug (ALWAYS, "Encountered problems! Here are the solutions:\n\n");
pcnt = 1;
problem = 0;
while ((problem = solver_next_problem(solv, problem)) != 0)
{
- printf("Problem %d:\n", pcnt++);
- printf("====================================\n");
+ sat_debug (ALWAYS, "Problem %d:\n", pcnt++);
+ sat_debug (ALWAYS, "====================================\n");
printprobleminfo(solv, job, problem);
- printf("\n");
+ sat_debug (ALWAYS, "\n");
solution = 0;
while ((solution = solver_next_solution(solv, problem, solution)) != 0)
{
@@ -3003,35 +2970,35 @@
case SOLVER_INSTALL_SOLVABLE:
s = pool->solvables + what;
if (solv->installed && s->repo == solv->installed)
- printf("- do not keep %s installed\n", solvable2str(pool, s));
+ sat_debug (ALWAYS, "- do not keep %s installed\n", solvable2str(pool, s));
else
- printf("- do not install %s\n", solvable2str(pool, s));
+ sat_debug (ALWAYS, "- do not install %s\n", solvable2str(pool, s));
break;
case SOLVER_ERASE_SOLVABLE:
s = pool->solvables + what;
if (solv->installed && s->repo == solv->installed)
- printf("- do not deinstall %s\n", solvable2str(pool, s));
+ sat_debug (ALWAYS, "- do not deinstall %s\n", solvable2str(pool, s));
else
- printf("- do not forbid installation of %s\n", solvable2str(pool, s));
+ sat_debug (ALWAYS, "- do not forbid installation of %s\n", solvable2str(pool, s));
break;
case SOLVER_INSTALL_SOLVABLE_NAME:
- printf("- do not install %s\n", id2str(pool, what));
+ sat_debug (ALWAYS, "- do not install %s\n", id2str(pool, what));
break;
case SOLVER_ERASE_SOLVABLE_NAME:
- printf("- do not deinstall %s\n", id2str(pool, what));
+ sat_debug (ALWAYS, "- do not deinstall %s\n", id2str(pool, what));
break;
case SOLVER_INSTALL_SOLVABLE_PROVIDES:
- printf("- do not install a solvable providing %s\n", dep2str(pool, what));
+ sat_debug (ALWAYS, "- do not install a solvable providing %s\n", dep2str(pool, what));
break;
case SOLVER_ERASE_SOLVABLE_PROVIDES:
- printf("- do not deinstall all solvables providing %s\n", dep2str(pool, what));
+ sat_debug (ALWAYS, "- do not deinstall all solvables providing %s\n", dep2str(pool, what));
break;
case SOLVER_INSTALL_SOLVABLE_UPDATE:
s = pool->solvables + what;
- printf("- do not install most recent version of %s\n", solvable2str(pool, s));
+ sat_debug (ALWAYS, "- do not install most recent version of %s\n", solvable2str(pool, s));
break;
default:
- printf("- do something different\n");
+ sat_debug (ALWAYS, "- do something different\n");
break;
}
}
@@ -3045,33 +3012,33 @@
int gotone = 0;
if (!solv->allowdowngrade && evrcmp(pool, s->evr, sd->evr) > 0)
{
- printf("- allow downgrade of %s to %s\n", solvable2str(pool, s), solvable2str(pool, sd));
+ sat_debug (ALWAYS, "- allow downgrade of %s to %s\n", solvable2str(pool, s), solvable2str(pool, sd));
gotone = 1;
}
if (!solv->allowarchchange && s->name == sd->name && s->arch != sd->arch && policy_illegal_archchange(pool, s, sd))
{
- printf("- allow architecture change of %s to %s\n", solvable2str(pool, s), solvable2str(pool, sd));
+ sat_debug (ALWAYS, "- allow architecture change of %s to %s\n", solvable2str(pool, s), solvable2str(pool, sd));
gotone = 1;
}
if (!solv->allowvendorchange && s->name == sd->name && s->vendor != sd->vendor && policy_illegal_vendorchange(pool, s, sd))
{
if (sd->vendor)
- printf("- allow vendor change from '%s' (%s) to '%s' (%s)\n", id2str(pool, s->vendor), solvable2str(pool, s), id2str(pool, sd->vendor), solvable2str(pool, sd));
+ sat_debug (ALWAYS, "- allow vendor change from '%s' (%s) to '%s' (%s)\n", id2str(pool, s->vendor), solvable2str(pool, s), id2str(pool, sd->vendor), solvable2str(pool, sd));
else
- printf("- allow vendor change from '%s' (%s) to no vendor (%s)\n", id2str(pool, s->vendor), solvable2str(pool, s), solvable2str(pool, sd));
+ sat_debug (ALWAYS, "- allow vendor change from '%s' (%s) to no vendor (%s)\n", id2str(pool, s->vendor), solvable2str(pool, s), solvable2str(pool, sd));
gotone = 1;
}
if (!gotone)
- printf("- allow replacement of %s with %s\n", solvable2str(pool, s), solvable2str(pool, sd));
+ sat_debug (ALWAYS, "- allow replacement of %s with %s\n", solvable2str(pool, s), solvable2str(pool, sd));
}
else
{
- printf("- allow deinstallation of %s\n", solvable2str(pool, s));
+ sat_debug (ALWAYS, "- allow deinstallation of %s\n", solvable2str(pool, s));
}
}
}
- printf("\n");
+ sat_debug (ALWAYS, "\n");
}
}
}
@@ -3123,7 +3090,7 @@
obsoletes[i] = n;
}
solv->obsoletes_data = obsoletes_data = xcalloc(n + 1, sizeof(Id));
- if (pool->verbose) printf("obsoletes data: %d entries\n", n + 1);
+ sat_debug (DEBUG_1, "obsoletes data: %d entries\n", n + 1);
for (i = pool->nsolvables - 1; i > 0; i--)
{
s = pool->solvables + i;
@@ -3199,23 +3166,18 @@
if (installed)
{
oldnrules = solv->nrules;
- if (pool->verbose > 3)
- printf ("*** create rpm rules for installed solvables ***\n");
+ sat_debug (DEBUG_4, "*** create rpm rules for installed solvables ***\n");
FOR_REPO_SOLVABLES(installed, p, s)
addrpmrulesforsolvable(solv, s, &addedmap);
- if (pool->verbose)
- printf("added %d rpm rules for installed solvables\n", solv->nrules - oldnrules);
- if (pool->verbose > 3)
- printf ("*** create rpm rules for updaters of installed solvables ***\n");
+ sat_debug (DEBUG_1, "added %d rpm rules for installed solvables\n", solv->nrules - oldnrules);
+ sat_debug (DEBUG_4, "*** create rpm rules for updaters of installed solvables ***\n");
oldnrules = solv->nrules;
FOR_REPO_SOLVABLES(installed, p, s)
addrpmrulesforupdaters(solv, s, &addedmap, 1);
- if (pool->verbose)
- printf("added %d rpm rules for updaters of installed solvables\n", solv->nrules - oldnrules);
+ sat_debug (DEBUG_1, "added %d rpm rules for updaters of installed solvables\n", solv->nrules - oldnrules);
}
- if (solv->pool->verbose > 3)
- printf ("*** create rpm rules for packages involved with a job ***\n");
+ sat_debug (DEBUG_4, "*** create rpm rules for packages involved with a job ***\n");
oldnrules = solv->nrules;
for (i = 0; i < job->count; i += 2)
{
@@ -3243,19 +3205,16 @@
break;
}
}
- if (pool->verbose)
- printf("added %d rpm rules for packages involved in a job\n", solv->nrules - oldnrules);
+ sat_debug (DEBUG_1, "added %d rpm rules for packages involved in a job\n", solv->nrules - oldnrules);
- if (solv->pool->verbose > 3)
- printf ("*** create rpm rules for recommended/suggested packages ***\n");
+ sat_debug (DEBUG_4, "*** create rpm rules for recommended/suggested packages ***\n");
oldnrules = solv->nrules;
addrpmrulesforweak(solv, &addedmap);
- if (pool->verbose)
- printf("added %d rpm rules because of weak dependencies\n", solv->nrules - oldnrules);
+ sat_debug (DEBUG_1, "added %d rpm rules because of weak dependencies\n", solv->nrules - oldnrules);
#if 1
- if (pool->verbose)
+ if (sat_debug_level() >= DEBUG_1)
{
int possible = 0, installable = 0;
for (i = 1; i < pool->nsolvables; i++)
@@ -3265,7 +3224,7 @@
if (MAPTST(&addedmap, i))
possible++;
}
- printf("%d of %d installable solvables considered for solving\n", possible, installable);
+ sat_debug (DEBUG_1, "%d of %d installable solvables considered for solving\n", possible, installable);
}
#endif
@@ -3279,16 +3238,15 @@
unifyrules(solv); /* remove duplicate rpm rules */
- if (pool->verbose) printf("decisions so far: %d\n", solv->decisionq.count);
- if (pool->verbose > 3)
+ sat_debug (DEBUG_1, "decisions so far: %d\n", solv->decisionq.count);
+ if (sat_debug_level() >= DEBUG_4)
printdecisions (solv);
/*
* now add all job rules
*/
- if (solv->pool->verbose > 3)
- printf ("*** Add JOB rules ***\n");
+ sat_debug (DEBUG_4, "*** Add JOB rules ***\n");
solv->jobrules = solv->nrules;
@@ -3300,24 +3258,22 @@
{
case SOLVER_INSTALL_SOLVABLE: /* install specific solvable */
s = pool->solvables + what;
- if (pool->verbose)
- printf("job: install solvable %s\n", solvable2str(pool, s));
+ sat_debug (DEBUG_1, "job: install solvable %s\n", solvable2str(pool, s));
addrule(solv, what, 0); /* install by Id */
queue_push(&solv->ruletojob, i);
break;
case SOLVER_ERASE_SOLVABLE:
s = pool->solvables + what;
- if (pool->verbose)
- printf("job: erase solvable %s\n", solvable2str(pool, s));
+ sat_debug (DEBUG_1, "job: erase solvable %s\n", solvable2str(pool, s));
addrule(solv, -what, 0); /* remove by Id */
queue_push(&solv->ruletojob, i);
break;
case SOLVER_INSTALL_SOLVABLE_NAME: /* install by capability */
case SOLVER_INSTALL_SOLVABLE_PROVIDES:
- if (pool->verbose && how == SOLVER_INSTALL_SOLVABLE_NAME)
- printf("job: install name %s\n", id2str(pool, what));
- if (pool->verbose && how == SOLVER_INSTALL_SOLVABLE_PROVIDES)
- printf("job: install provides %s\n", dep2str(pool, what));
+ if (how == SOLVER_INSTALL_SOLVABLE_NAME)
+ sat_debug (DEBUG_1, "job: install name %s\n", id2str(pool, what));
+ if (how == SOLVER_INSTALL_SOLVABLE_PROVIDES)
+ sat_debug (DEBUG_1, "job: install provides %s\n", dep2str(pool, what));
queue_empty(&q);
FOR_PROVIDES(p, pp, what)
{
@@ -3342,10 +3298,10 @@
break;
case SOLVER_ERASE_SOLVABLE_NAME: /* remove by capability */
case SOLVER_ERASE_SOLVABLE_PROVIDES:
- if (pool->verbose && how == SOLVER_ERASE_SOLVABLE_NAME)
- printf("job: erase name %s\n", id2str(pool, what));
- if (pool->verbose && how == SOLVER_ERASE_SOLVABLE_PROVIDES)
- printf("job: erase provides %s\n", dep2str(pool, what));
+ if (how == SOLVER_ERASE_SOLVABLE_NAME)
+ sat_debug (DEBUG_1, "job: erase name %s\n", id2str(pool, what));
+ if (how == SOLVER_ERASE_SOLVABLE_PROVIDES)
+ sat_debug (DEBUG_1, "job: erase provides %s\n", dep2str(pool, what));
FOR_PROVIDES(p, pp, what)
{
/* if by name, ensure that the name matches */
@@ -3357,8 +3313,7 @@
break;
case SOLVER_INSTALL_SOLVABLE_UPDATE: /* find update for solvable */
s = pool->solvables + what;
- if (pool->verbose)
- printf("job: update %s\n", solvable2str(pool, s));
+ sat_debug (DEBUG_1, "job: update %s\n", solvable2str(pool, s));
addupdaterule(solv, s, 0);
queue_push(&solv->ruletojob, i);
break;
@@ -3373,8 +3328,7 @@
*
*/
- if (solv->pool->verbose > 3)
- printf ("*** Add system rules ***\n");
+ sat_debug (DEBUG_4, "*** Add system rules ***\n");
solv->systemrules = solv->nrules;
@@ -3442,7 +3396,7 @@
disableupdaterules(solv, job, -1);
makeruledecisions(solv);
- if (pool->verbose) printf("problems so far: %d\n", solv->problems.count);
+ sat_debug (DEBUG_1, "problems so far: %d\n", solv->problems.count);
run_solver(solv, 1, 1);
Modified: trunk/sat-solver/src/util.c
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/util.c?rev=7928&r1=7927&r2=7928&view=diff
==============================================================================
--- trunk/sat-solver/src/util.c (original)
+++ trunk/sat-solver/src/util.c Mon Nov 26 17:36:01 2007
@@ -11,6 +11,7 @@
#include
#include "util.h"
+#include "sat_debug.h"
void *
xmalloc(size_t len)
@@ -18,7 +19,7 @@
void *r = malloc(len ? len : 1);
if (r)
return r;
- fprintf(stderr, "Out of memory allocating %zu bytes!\n", len);
+ sat_debug (ERROR, "Out of memory allocating %zu bytes!\n", len);
exit(1);
}
@@ -27,7 +28,7 @@
{
if (len && (num * len) / len != num)
{
- fprintf(stderr, "Out of memory allocating %zu*%zu bytes!\n", num, len);
+ sat_debug (ERROR, "Out of memory allocating %zu*%zu bytes!\n", num, len);
exit(1);
}
return xmalloc(num * len);
@@ -42,7 +43,7 @@
old = realloc(old, len ? len : 1);
if (old)
return old;
- fprintf(stderr, "Out of memory reallocating %zu bytes!\n", len);
+ sat_debug (ERROR, "Out of memory reallocating %zu bytes!\n", len);
exit(1);
}
@@ -51,7 +52,7 @@
{
if (len && (num * len) / len != num)
{
- fprintf(stderr, "Out of memory allocating %zu*%zu bytes!\n", num, len);
+ sat_debug (ERROR, "Out of memory allocating %zu*%zu bytes!\n", num, len);
exit(1);
}
return xrealloc(old, num * len);
@@ -67,7 +68,7 @@
r = calloc(num, len);
if (r)
return r;
- fprintf(stderr, "Out of memory allocating %zu bytes!\n", num * len);
+ sat_debug (ERROR, "Out of memory allocating %zu bytes!\n", num * len);
exit(1);
}
Modified: trunk/sat-solver/testsuite/deptestomatic.c
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/deptestomatic.c?rev=7928&r1=7927&r2=7928&view=diff
==============================================================================
--- trunk/sat-solver/testsuite/deptestomatic.c (original)
+++ trunk/sat-solver/testsuite/deptestomatic.c Mon Nov 26 17:36:01 2007
@@ -30,6 +30,7 @@
#include "repo_solv.h"
#include "poolarch.h"
#include "evr.h"
+#include "sat_debug.h"
static int verbose = 0;
static int redcarpet = 0;
@@ -1535,6 +1536,9 @@
++argp;
}
+ /* setting loglevel */
+ sat_set_debug (verbose, 0); /* Without logging source code lines */
+
if (argp >= argc || !strcmp( argv[argp], "-h" ))
{
usage();
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
