Changeset: c18cb571a4ee for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c18cb571a4ee
Modified Files:
monetdb5/mal/mal_resource.c
monetdb5/optimizer/opt_wrapper.c
Branch: Feb2013
Log Message:
Minor cleanup of resource management
diffs (50 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
@@ -188,21 +188,20 @@ MALresourceFairness(Client cntxt, MalBlk
if ( rss < MEMORY_THRESHOLD * monet_memory)
return;
- clk = GDKusec();
if ( usec )
/* worker reporting time spent ! */
- clk = (clk - usec) / 1000;
+ clk = usec / 1000;
else {
/* interpreter calling without timing */
/* punish based on total duration of call */
- clk = (clk-mb->starttime)/1000;
+ clk = (GDKusec() - mb->starttime)/1000;
if ( clk <= TIMESLICE)
/* use fake time for penalty */
clk = DELAYUNIT;
}
- if ( clk >= DELAYUNIT ) {
- mnstr_printf(GDKstdout, "#delay %d initial "LLFMT"n",
cntxt->idx, clk);
+ if ( clk > DELAYUNIT ) {
+ PARDEBUG mnstr_printf(GDKstdout, "#delay %d initial "LLFMT"n",
cntxt->idx, clk);
while (clk > 0) {
/* always keep one running to avoid all waiting */
if (running < 2)
@@ -213,7 +212,7 @@ MALresourceFairness(Client cntxt, MalBlk
break;
factor = ((double) rss) / (MEMORY_THRESHOLD *
monet_memory);
delay = (long) (DELAYUNIT * (factor > 1.0 ? 1.0 :
factor));
- delay = (long) (delay * running / threads);
+ delay = (long) ( ((double)delay) * running / threads);
running--;
if (delay)
MT_sleep_ms(delay);
diff --git a/monetdb5/optimizer/opt_wrapper.c b/monetdb5/optimizer/opt_wrapper.c
--- a/monetdb5/optimizer/opt_wrapper.c
+++ b/monetdb5/optimizer/opt_wrapper.c
@@ -182,7 +182,7 @@ str OPTwrapper (Client cntxt, MalBlkPtr
}
DEBUGoptimizers
mnstr_printf(cntxt->fdout,"#optimizer %-11s %3d actions %5d MAL
instructions (%3d K) " LLFMT" ms\n", optimizer, actions, mb->stop,
- ((sizeof( MalBlkRecord) +mb->ssize * sizeof(InstrRecord)+
mb->vtop * sizeof(int) /* argv estimate */ +mb->vtop* sizeof(VarRecord) +
mb->vsize*sizeof(VarPtr)+1023)/1024),
+ (int)((sizeof( MalBlkRecord) +mb->ssize * sizeof(InstrRecord)+
mb->vtop * sizeof(int) /* argv estimate */ +mb->vtop* sizeof(VarRecord) +
mb->vsize*sizeof(VarPtr)+1023)/1024),
t);
QOTupdateStatistics(getModuleId(q),actions,t);
addtoMalBlkHistory(mb,getModuleId(q));
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
