Mailinglist Archive: zypp-commit (266 mails)

< Previous Next >
[zypp-commit] r11580 - in /trunk/sat-solver: src/pool.c src/repo_helix.c src/repo_solv.c src/solver.c tools/repo_rpmdb.c tools/repo_rpmmd.c
  • From: mlschroe@xxxxxxxxxxxxxxxx
  • Date: Wed, 05 Nov 2008 13:46:27 -0000
  • Message-id: <20081105134627.EEBDBA06DC@xxxxxxxxxxxxxxxx>
Author: mlschroe
Date: Wed Nov 5 14:46:27 2008
New Revision: 11580

URL: http://svn.opensuse.org/viewcvs/zypp?rev=11580&view=rev
Log:
- actually "unsigned long" is wrong, too. It should be "size_t" and
"%z". But I don't see why the arithmetics have to be 64bit, going
the other way instead by casting to "int".

Modified:
trunk/sat-solver/src/pool.c
trunk/sat-solver/src/repo_helix.c
trunk/sat-solver/src/repo_solv.c
trunk/sat-solver/src/solver.c
trunk/sat-solver/tools/repo_rpmdb.c
trunk/sat-solver/tools/repo_rpmmd.c

Modified: trunk/sat-solver/src/pool.c
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/pool.c?rev=11580&r1=11579&r2=11580&view=diff
==============================================================================
--- trunk/sat-solver/src/pool.c (original)
+++ trunk/sat-solver/src/pool.c Wed Nov 5 14:46:27 2008
@@ -356,7 +356,7 @@
pool->whatprovidesdataoff = off;
pool->whatprovidesdataleft = extra;
pool_shrink_whatprovides(pool);
- POOL_DEBUG(SAT_DEBUG_STATS, "whatprovides memory used: %ld K id array, %ld K
data\n", ((unsigned long)pool->ss.nstrings + pool->nrels + WHATPROVIDES_BLOCK)
/ (1024/sizeof(Id)), ((unsigned long)pool->whatprovidesdataoff +
pool->whatprovidesdataleft) / (1024/sizeof(Id)));
+ POOL_DEBUG(SAT_DEBUG_STATS, "whatprovides memory used: %d K id array, %d K
data\n", (pool->ss.nstrings + pool->nrels + WHATPROVIDES_BLOCK) /
(int)(1024/sizeof(Id)), (pool->whatprovidesdataoff +
pool->whatprovidesdataleft) / (int)(1024/sizeof(Id)));
POOL_DEBUG(SAT_DEBUG_STATS, "createwhatprovides took %d ms\n",
sat_timems(now));
}


Modified: trunk/sat-solver/src/repo_helix.c
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/repo_helix.c?rev=11580&r1=11579&r2=11580&view=diff
==============================================================================
--- trunk/sat-solver/src/repo_helix.c (original)
+++ trunk/sat-solver/src/repo_helix.c Wed Nov 5 14:46:27 2008
@@ -876,5 +876,5 @@
repodata_internalize(data);
POOL_DEBUG(SAT_DEBUG_STATS, "repo_add_helix took %d ms\n", sat_timems(now));
POOL_DEBUG(SAT_DEBUG_STATS, "repo size: %d solvables\n", repo->nsolvables);
- POOL_DEBUG(SAT_DEBUG_STATS, "repo memory used: %ld K incore, %ld K
idarray\n", (unsigned long)data->incoredatalen/1024, (unsigned
long)repo->idarraysize / (1024/sizeof(Id)));
+ POOL_DEBUG(SAT_DEBUG_STATS, "repo memory used: %d K incore, %d K idarray\n",
data->incoredatalen/1024, repo->idarraysize / (int)(1024/sizeof(Id)));
}

Modified: trunk/sat-solver/src/repo_solv.c
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/repo_solv.c?rev=11580&r1=11579&r2=11580&view=diff
==============================================================================
--- trunk/sat-solver/src/repo_solv.c (original)
+++ trunk/sat-solver/src/repo_solv.c Wed Nov 5 14:46:27 2008
@@ -1369,7 +1369,7 @@

POOL_DEBUG(SAT_DEBUG_STATS, "repo_add_solv took %d ms\n", sat_timems(now));
POOL_DEBUG(SAT_DEBUG_STATS, "repo size: %d solvables\n", repo->nsolvables);
- POOL_DEBUG(SAT_DEBUG_STATS, "repo memory used: %ld K incore, %ld K
idarray\n", (unsigned long)data.incoredatalen/1024, (unsigned
long)repo->idarraysize / (1024/sizeof(Id)));
+ POOL_DEBUG(SAT_DEBUG_STATS, "repo memory used: %d K incore, %d K idarray\n",
data.incoredatalen/1024, repo->idarraysize / (int)(1024/sizeof(Id)));
return 0;
}


Modified: trunk/sat-solver/src/solver.c
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.c?rev=11580&r1=11579&r2=11580&view=diff
==============================================================================
--- trunk/sat-solver/src/solver.c (original)
+++ trunk/sat-solver/src/solver.c Wed Nov 5 14:46:27 2008
@@ -4108,7 +4108,7 @@
solv->rpmrules_end = solv->nrules; /* mark end of rpm rules */

solv->directdecisions = solv->decisionq.count;
- POOL_DEBUG(SAT_DEBUG_STATS, "rpm rule memory usage: %ld K\n", (unsigned
long)solv->nrules * sizeof(Rule) / 1024);
+ POOL_DEBUG(SAT_DEBUG_STATS, "rpm rule memory usage: %d K\n", solv->nrules *
(int)sizeof(Rule) / 1024);
POOL_DEBUG(SAT_DEBUG_STATS, "decisions so far: %d\n", solv->decisionq.count);
POOL_DEBUG(SAT_DEBUG_STATS, "rpm rule creation took %d ms\n",
sat_timems(now));


Modified: trunk/sat-solver/tools/repo_rpmdb.c
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_rpmdb.c?rev=11580&r1=11579&r2=11580&view=diff
==============================================================================
--- trunk/sat-solver/tools/repo_rpmdb.c (original)
+++ trunk/sat-solver/tools/repo_rpmdb.c Wed Nov 5 14:46:27 2008
@@ -1623,7 +1623,7 @@
pool_debug(pool, SAT_ERROR, "%%%% 100\n");
POOL_DEBUG(SAT_DEBUG_STATS, "repo_add_rpmdb took %d ms\n", sat_timems(now));
POOL_DEBUG(SAT_DEBUG_STATS, "repo size: %d solvables\n", repo->nsolvables);
- POOL_DEBUG(SAT_DEBUG_STATS, "repo memory used: %ld K incore, %ld K
idarray\n", (unsigned long)data->incoredatalen/1024, (unsigned
long)repo->idarraysize / (1024/sizeof(Id)));
+ POOL_DEBUG(SAT_DEBUG_STATS, "repo memory used: %d K incore, %d K idarray\n",
data->incoredatalen/1024, repo->idarraysize / (int)(1024/sizeof(Id)));
}



Modified: trunk/sat-solver/tools/repo_rpmmd.c
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_rpmmd.c?rev=11580&r1=11579&r2=11580&view=diff
==============================================================================
--- trunk/sat-solver/tools/repo_rpmmd.c (original)
+++ trunk/sat-solver/tools/repo_rpmmd.c Wed Nov 5 14:46:27 2008
@@ -1150,5 +1150,5 @@
repodata_internalize(data);
POOL_DEBUG(SAT_DEBUG_STATS, "repo_add_rpmmd took %d ms\n", sat_timems(now));
POOL_DEBUG(SAT_DEBUG_STATS, "repo size: %d solvables\n", repo->nsolvables);
- POOL_DEBUG(SAT_DEBUG_STATS, "repo memory used: %ld K incore, %ld K
idarray\n", (unsigned long)data->incoredatalen/1024, (unsigned
long)repo->idarraysize / (1024/sizeof(Id)));
+ POOL_DEBUG(SAT_DEBUG_STATS, "repo memory used: %d K incore, %d K idarray\n",
data->incoredatalen/1024, repo->idarraysize / (int)(1024/sizeof(Id)));
}

--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages