1.1 --- a/MasterLoop.c	Fri Jan 13 18:34:31 2012 +0100
     1.2 +++ b/MasterLoop.c	Tue Jan 31 18:30:35 2012 +0100
     1.3 @@ -115,6 +115,7 @@
     1.4        // smaller due to higher predictability of the fixed jmp.
     1.5     saveLowTimeStampCountInto( masterPr->startMasterTSCLow );
     1.6     #endif
     1.7 +
     1.8     //========================================================================
     1.9  
    1.10     masterEnv        = (MasterEnv*)_VMSMasterEnv;
    1.11 @@ -129,9 +130,9 @@
    1.12     slaveScheduler   = masterEnv->slaveScheduler;
    1.13     semanticEnv      = masterEnv->semanticEnv;
    1.14     
    1.15 -#ifdef MEAS__PERF_COUNTERS
    1.16 -   CounterHandler counterHandler = masterEnv->counterHandler;
    1.17 -#endif
    1.18 +   #ifdef MEAS__PERF_COUNTERS
    1.19 +   CounterHandler counterHandler = masterEnv->counterHandler;             
    1.20 +   #endif
    1.21  
    1.22        //Poll each slot's Done flag
    1.23     numSlotsFilled = 0;
    1.24 @@ -153,7 +154,7 @@
    1.25                 #ifdef MEAS__PERF_COUNTERS
    1.26                 uint64 cycles, instrs;
    1.27                 saveCyclesAndInstrs(thisCoresIdx,cycles, instrs);
    1.28 -               (*counterHandler)(MasterLoop_beforeReqHdlr,currSlot->procrAssignedToSlot,cycles,instrs);              
    1.29 +               //(*counterHandler)(MasterLoop_beforeReqHdlr,currSlot->procrAssignedToSlot,cycles,instrs);
    1.30                 #endif
    1.31                 //============================================================
    1.32           (*requestHandler)( currSlot->procrAssignedToSlot, semanticEnv );
    1.33 @@ -180,6 +181,8 @@
    1.34                 uint64 tmp_cycles;
    1.35                 uint64 tmp_instrs;
    1.36                 saveCyclesAndInstrs(thisCoresIdx,tmp_cycles,tmp_instrs);
    1.37 +               //FIXME WTF AM I DOING WHY DOES THIS EVEN WORK
    1.38 +               //(*counterHandler)(MasterLoop_beforeNextAssign,schedVirtPr,tmp_cycles,tmp_instrs);
    1.39                 #endif
    1.40           schedVirtPr =
    1.41            (*slaveScheduler)( semanticEnv, thisCoresIdx, slotIdx );