Changeset: 3d8dfa64e72e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3d8dfa64e72e
Modified Files:
monetdb5/mal/mal_resource.c
Branch: Feb2013
Log Message:
MALresourceFairness(): fixed type: MT_getrss() returns type size_t, not type
long
Ceterum censeo type long MUST NOT be used as it is everything but portable;
for instance, on our beloved Windows platforms, long is always 32-bit,
even on 64-bit systems.
diffs (21 lines):
diff --git a/monetdb5/mal/mal_resource.c b/monetdb5/mal/mal_resource.c
--- a/monetdb5/mal/mal_resource.c
+++ b/monetdb5/mal/mal_resource.c
@@ -175,7 +175,7 @@ static int running; /* should be protect
void
MALresourceFairness(Client cntxt, MalBlkPtr mb, lng usec)
{
- long rss;
+ size_t rss;
lng delay, clk;
int threads;
double factor;
@@ -220,7 +220,7 @@ MALresourceFairness(Client cntxt, MalBlk
running--;
if (delay) {
if ( delayed++ == 0){
- mnstr_printf(GDKstdout, "#delay
%d initial "LLFMT"["LLFMT"] memory %ld[%f]\n", cntxt->idx, delay, clk, rss,
MEMORY_THRESHOLD * monet_memory);
+ mnstr_printf(GDKstdout, "#delay
%d initial "LLFMT"["LLFMT"] memory "SZFMT"[%f]\n", cntxt->idx, delay, clk,
rss, MEMORY_THRESHOLD * monet_memory);
mnstr_flush(GDKstdout);
}
MT_sleep_ms(delay);
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
