1.1 --- a/VMS.h	Wed Jan 04 16:40:10 2012 +0100
     1.2 +++ b/VMS.h	Fri Jan 06 18:55:05 2012 +0100
     1.3 @@ -279,9 +279,6 @@
     1.4     CounterRecord** counter_history;
     1.5     PrivDynArrayInfo* counter_history_array_info;
     1.6     #endif
     1.7 -   #ifdef DETECT_LOOP_GRAPH
     1.8 -
     1.9 -   #endif
    1.10   }
    1.11  MasterEnv;
    1.12  
    1.13 @@ -380,16 +377,16 @@
    1.14  inline void
    1.15  VMS__add_sem_request_in_mallocd_VMSReqst( void *semReqData, VirtProcr *callingPr );
    1.16  
    1.17 -/*inline*/ __attribute__ ((noinline)) void
    1.18 +inline void
    1.19  VMS__send_sem_request( void *semReqData, VirtProcr *callingPr );
    1.20  
    1.21  void
    1.22  VMS__send_create_procr_req( void *semReqData, VirtProcr *reqstingPr );
    1.23  
    1.24 -void /*inline**/ __attribute__ ((noinline))
    1.25 +void inline
    1.26  VMS__send_dissipate_req( VirtProcr *prToDissipate );
    1.27  
    1.28 -/*inline**/ __attribute__ ((noinline)) void
    1.29 +inline void
    1.30  VMS__send_VMSSem_request( void *semReqData, VirtProcr *callingPr );
    1.31  
    1.32  VMSReqst *
    1.33 @@ -461,11 +458,11 @@
    1.34  #ifdef VPTHREAD
    1.35  
    1.36  //VPThread
    1.37 -#define createHistIdx      1
    1.38 -#define mutexLockHistIdx   2
    1.39 -#define mutexUnlockHistIdx 3
    1.40 -#define condWaitHistIdx    4
    1.41 -#define condSignalHistIdx  5
    1.42 +#define createHistIdx      0
    1.43 +#define mutexLockHistIdx   1
    1.44 +#define mutexUnlockHistIdx 2
    1.45 +#define condWaitHistIdx    3
    1.46 +#define condSignalHistIdx  4
    1.47  
    1.48  #define MakeTheMeasHists() \
    1.49     _VMSMasterEnv->measHistsInfo = \
    1.50 @@ -482,8 +479,8 @@
    1.51  #ifdef VCILK
    1.52  
    1.53  //VCilk
    1.54 -#define spawnHistIdx      1
    1.55 -#define syncHistIdx       2
    1.56 +#define spawnHistIdx      0
    1.57 +#define syncHistIdx       1
    1.58  
    1.59  #define MakeTheMeasHists() \
    1.60     _VMSMasterEnv->measHistsInfo = \
    1.61 @@ -497,10 +494,10 @@
    1.62  #ifdef SSR
    1.63  
    1.64  //SSR
    1.65 -#define SendFromToHistIdx      1
    1.66 -#define SendOfTypeHistIdx      2
    1.67 -#define ReceiveFromToHistIdx   3
    1.68 -#define ReceiveOfTypeHistIdx   4
    1.69 +#define SendFromToHistIdx      0
    1.70 +#define SendOfTypeHistIdx      1
    1.71 +#define ReceiveFromToHistIdx   2
    1.72 +#define ReceiveOfTypeHistIdx   3
    1.73  
    1.74  #define MakeTheMeasHists() \
    1.75     _VMSMasterEnv->measHistsInfo = \