MonetDB: Feb2013 - disabled resource control for now...

[Niels Nes]

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

disabled resource control for now...
(transplanted from 1578ef1061df38521b588958e774ee745fe4cd7a)


diffs (65 lines):

diff --git a/monetdb5/mal/mal_dataflow.c b/monetdb5/mal/mal_dataflow.c
--- a/monetdb5/mal/mal_dataflow.c
+++ b/monetdb5/mal/mal_dataflow.c
@@ -158,6 +158,7 @@ q_enqueue(queue *q, FlowEvent d)
  * that want to use a big recent result
  */
 
+#ifdef USE_MAL_ADMISSION
 static void
 q_requeue_(queue *q, FlowEvent d)
 {
@@ -183,6 +184,7 @@ q_requeue(queue *q, FlowEvent d)
        MT_lock_unset(&q->l, "q_requeue");
        MT_sema_up(&q->s, "q_requeue");
 }
+#endif
 
 static void *
 q_dequeue(queue *q)
@@ -241,7 +243,6 @@ DFLOWworker(void *t)
        Thread thr;
        str error = 0;
 
-       InstrPtr p;
        int i;
        long usec = 0;
 
@@ -304,10 +305,12 @@ DFLOWworker(void *t)
                 * All eligible instructions are queued
                 */
 #ifdef USE_MAL_ADMISSION
+               {
+               InstrPtr p = getInstrPtr(flow->mb, fe->pc);
                fe->hotclaim = 0;
-               p = getInstrPtr(flow->mb, fe->pc);
                for (i = 0; i < p->retc; i++)
                        fe->hotclaim += getMemoryClaim(flow->mb, flow->stk, 
fe->pc, i, FALSE);
+               }
 #endif
                MT_lock_set(&flow->flowlock, "MALworker");
        
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
@@ -203,7 +203,7 @@ MALresourceFairness(Client cntxt, MalBlk
                        clk = DELAYUNIT;
                }
 
-       if ( clk > DELAYUNIT ) {
+       if ( 0 && 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  */
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