1.1 --- a/VMS.h	Fri Jan 13 15:03:32 2012 +0100
     1.2 +++ b/VMS.h	Fri Jan 13 18:34:31 2012 +0100
     1.3 @@ -16,7 +16,6 @@
     1.4  #include "DynArray/DynArray.h"
     1.5  #include "Hash_impl/PrivateHash.h"
     1.6  #include "vmalloc.h"
     1.7 -#include "Counters/Counters.h"
     1.8  #include "loop.h"
     1.9  #include "ListOfArrays/ListOfArrays.h"
    1.10  
    1.11 @@ -130,7 +129,7 @@
    1.12  typedef void  (*VirtProcrFnPtr)  ( void *, VirtProcr * ); //initData, animPr
    1.13  typedef void    VirtProcrFn      ( void *, VirtProcr * ); //initData, animPr
    1.14  typedef void  (*ResumePrFnPtr)   ( VirtProcr *, void * );
    1.15 -typedef void (*CounterHandler) (int,int,int,VirtProcr*,uint64,uint64);
    1.16 +typedef void (*CounterHandler) (int,VirtProcr*,uint64,uint64);
    1.17  
    1.18  //============= Requests ===========
    1.19  //
    1.20 @@ -273,9 +272,7 @@
    1.21     #ifdef MEAS__PERF_COUNTERS
    1.22     int cycles_counter_fd[NUM_CORES];
    1.23     int instrs_counter_fd[NUM_CORES];
    1.24 -   FILE* counteroutput;
    1.25 -   #endif
    1.26 -   #ifdef MEAS__PERF_COUNTERS //
    1.27 +   //FILE* counteroutput;
    1.28     //CounterRecord** counter_history;
    1.29     //PrivDynArrayInfo* counter_history_array_info;
    1.30     CounterHandler counterHandler;
    1.31 @@ -449,7 +446,9 @@
    1.32      MasterLoop_beforeReqHdlr = 1,
    1.33      MasterLoop_afterReqHdlr,
    1.34      MasterLoop_beforeAssign,
    1.35 -    MasterLoop_afterAssign
    1.36 +    MasterLoop_afterAssign,
    1.37 +    CoreLoop_afterWork,
    1.38 +    CoreLoop_beforeWork
    1.39  };
    1.40  
    1.41  #define getReturnAddressBeforeLibraryCall(vp_ptr, res_ptr) do{     \