MonetDB: default - Change interface to getMemoryClaim

[Martin Kersten]

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

Change interface to getMemoryClaim


diffs (49 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
@@ -325,7 +325,7 @@ DFLOWworker(void *t)
                assert(p);
                fe->hotclaim = 0;
                for (i = 0; i < p->retc; i++)
-                       fe->hotclaim += getMemoryClaim(flow->mb, flow->stk, 
fe->pc, i, FALSE);
+                       fe->hotclaim += getMemoryClaim(flow->mb, flow->stk, p, 
i, FALSE);
                }
 #endif
                MT_lock_set(&flow->flowlock, "MALworker");
@@ -558,7 +558,7 @@ DFLOWscheduler(DataFlow flow)
                                throw(MAL, "dataflow", "DFLOWscheduler(): 
getInstrPtr(flow->mb,fe[i].pc) returned NULL");
                        }
                        for (j = p->retc; j < p->argc; j++)
-                               fe[i].argclaim = getMemoryClaim(fe[0].flow->mb, 
fe[0].flow->stk, fe[i].pc, j, FALSE);
+                               fe[i].argclaim = getMemoryClaim(fe[0].flow->mb, 
fe[0].flow->stk, p, j, FALSE);
 #endif
                        q_enqueue(todo, flow->status + i);
                        flow->status[i].state = DFLOWrunning;
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
@@ -66,11 +66,10 @@ int memoryclaims = 0;    /* number of th
  * Views are consider cheap and ignored
  */
 lng
-getMemoryClaim(MalBlkPtr mb, MalStkPtr stk, int pc, int i, int flag)
+getMemoryClaim(MalBlkPtr mb, MalStkPtr stk, InstrPtr pci, int i, int flag)
 {
        lng total = 0, vol = 0;
        BAT *b;
-       InstrPtr pci = getInstrPtr(mb,pc);
        BUN cnt;
 
        (void)mb;
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
@@ -30,7 +30,7 @@
 mal_export int MALadmission(lng argclaim, lng hotclaim);
 #endif
 
-mal_export lng getMemoryClaim(MalBlkPtr mb, MalStkPtr stk, int pc, int i, int 
flag);
+mal_export lng getMemoryClaim(MalBlkPtr mb, MalStkPtr stk, InstrPtr pci, int 
i, int flag);
 mal_export void MALresourceFairness(lng usec);
 mal_export void initResource(void);
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list