MonetDB: Feb2013 - Re-enable resource management

[Martin Kersten]

Changeset: 0b123e05010f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0b123e05010f
Modified Files:
        monetdb5/mal/mal_resource.c
        monetdb5/mal/mal_resource.h
Branch: Feb2013
Log Message:

Re-enable resource management
Avoid needed messages until they really matter.
(transplanted from 61e182323067856a4a1da14b39d126b5c5ae4269)


diffs (45 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
@@ -179,6 +179,7 @@ MALresourceFairness(Client cntxt, MalBlk
        lng delay, clk;
        int threads;
        double factor;
+       int delayed= 0;
 
        if ( usec > 0 && ( (usec = GDKusec()-usec)) <= TIMESLICE )
                return;
@@ -203,7 +204,7 @@ MALresourceFairness(Client cntxt, MalBlk
                        clk = DELAYUNIT;
                }
 
-       if ( 0 && clk > DELAYUNIT ) {
+       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  */
@@ -217,8 +218,11 @@ MALresourceFairness(Client cntxt, MalBlk
                        delay = (long) (DELAYUNIT * (factor > 1.0 ? 1.0 : 
factor));
                        delay = (long) ( ((double)delay) * running / threads);
                        running--;
-                       if (delay)
+                       if (delay) {
+                               if ( delayed++ == 0)
+                                               mnstr_printf(GDKstdout, "#delay 
%d initial "LLFMT"n", cntxt->idx, clk);
                                MT_sleep_ms(delay);
+                       }
                        running++;
                        clk -= DELAYUNIT;
                }
diff --git a/monetdb5/mal/mal_resource.h b/monetdb5/mal/mal_resource.h
--- a/monetdb5/mal/mal_resource.h
+++ b/monetdb5/mal/mal_resource.h
@@ -25,7 +25,7 @@
 #define TIMESLICE  2000 /* ms */
 #define DELAYUNIT 100 /* ms delay in parallel processing decissions */
 
-//#define USE_MAL_ADMISSION
+#define USE_MAL_ADMISSION
 #ifdef USE_MAL_ADMISSION
 mal_export int MALadmission(lng argclaim, lng hotclaim);
 #endif
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list