1.1 --- a/VMS.h	Sat Nov 13 14:39:40 2010 -0800
     1.2 +++ b/VMS.h	Sun Nov 14 11:17:52 2010 -0800
     1.3 @@ -61,8 +61,11 @@
     1.4     // suspending a processor and just after resuming that processor.  It is
     1.5     // saved into a field added to VirtProcr.  Have to sanity-check for
     1.6     // rollover of low portion into high portion.
     1.7 -#define MEAS__TIME_STAMP_SUSP
     1.8 -#define MEAS__TIME_MASTER
     1.9 +//#define MEAS__TIME_STAMP_SUSP
    1.10 +//#define MEAS__TIME_MASTER
    1.11 +//#define MEAS__TIME_PLUGIN
    1.12 +//#define MEAS__TIME_MALLOC
    1.13 +#define MEAS__TIME_MASTER_LOCK
    1.14  #define MEAS__NUM_TIMES_TO_RUN 100000
    1.15  
    1.16     //For code that calculates normalization-offset between TSC counts of
    1.17 @@ -192,10 +195,11 @@
    1.18     unsigned int preSuspTSCLow;
    1.19     unsigned int postSuspTSCLow;
    1.20     #endif
    1.21 -   #ifdef MEAS__TIME_MASTER
    1.22 +   #ifdef MEAS__TIME_MASTER /* in VirtProcr because multiple masterVPs*/
    1.23     unsigned int startMasterTSCLow;
    1.24     unsigned int endMasterTSCLow;
    1.25     #endif
    1.26 +      //========================================
    1.27     
    1.28     float64      createPtInSecs;  //have space but don't use on some configs
    1.29   };
    1.30 @@ -238,6 +242,18 @@
    1.31     HashTable       *probeNameHashTbl;
    1.32     int32            masterCreateProbeID;
    1.33     float64          createPtInSecs;
    1.34 +   #ifdef MEAS__TIME_PLUGIN
    1.35 +   Histogram       *pluginLowTimeHist;
    1.36 +   Histogram       *pluginHighTimeHist;
    1.37 +   #endif
    1.38 +   #ifdef MEAS__TIME_MALLOC
    1.39 +   Histogram       *mallocTimeHist;
    1.40 +   Histogram       *freeTimeHist;
    1.41 +   #endif
    1.42 +   #ifdef MEAS__TIME_MASTER_LOCK
    1.43 +   Histogram       *masterLockLowTimeHist;
    1.44 +   Histogram       *masterLockHighTimeHist;
    1.45 +   #endif
    1.46   }
    1.47  MasterEnv;
    1.48  
    1.49 @@ -378,6 +394,7 @@
    1.50  
    1.51  #include "SwitchAnimators.h"
    1.52  #include "probes.h"
    1.53 +#include "vutilities.h"
    1.54  
    1.55  #endif	/* _VMS_H */
    1.56