1.1 --- a/VMS.h	Mon May 30 18:28:41 2011 +0200
     1.2 +++ b/VMS.h	Thu Jun 02 12:36:14 2011 +0200
     1.3 @@ -225,8 +225,7 @@
     1.4     MallocProlog    *freeListHead;
     1.5     int32            amtOfOutstandingMem; //total currently allocated
     1.6  
     1.7 -   void            *coreLoopStartPt;//addr to jump to to re-enter coreLoop
     1.8 -   void            *coreLoopEndPt;  //addr to jump to to shut down a coreLoop
     1.9 +   void            *coreLoopReturnPt;//addr to jump to to re-enter coreLoop
    1.10  
    1.11     int32            setupComplete;
    1.12     volatile int32   masterLock;
    1.13 @@ -403,6 +402,8 @@
    1.14  
    1.15  #define MEAS__SUB_CREATE  /*turn on/off subtraction of create from plugin*/
    1.16  
    1.17 +#ifdef VPTHREAD
    1.18 +
    1.19  //VPThread
    1.20  #define createHistIdx      1
    1.21  #define mutexLockHistIdx   2
    1.22 @@ -410,34 +411,50 @@
    1.23  #define condWaitHistIdx    4
    1.24  #define condSignalHistIdx  5
    1.25  
    1.26 +#define MakeTheMeasHists \
    1.27 +   _VMSMasterEnv->measHistsInfo = \
    1.28 +              makePrivDynArrayOfSize( (void***)&(_VMSMasterEnv->measHists), 200); \
    1.29 +   makeAMeasHist( createHistIdx,      "Create",        50, 0, 100 ) \
    1.30 +   makeAMeasHist( mutexLockHistIdx,   "mutex lock",    50, 0, 100 ) \
    1.31 +   makeAMeasHist( mutexUnlockHistIdx, "mutex unlock",  50, 0, 100 ) \
    1.32 +   makeAMeasHist( condWaitHistIdx,    "cond wait",     50, 0, 100 ) \
    1.33 +   makeAMeasHist( condSignalHistIdx,  "cond signal",   50, 0, 100 )
    1.34 +
    1.35 +#endif
    1.36 +
    1.37 +
    1.38 +#ifdef VCILK
    1.39 +
    1.40  //VCilk
    1.41  #define spawnHistIdx      1
    1.42  #define syncHistIdx       2
    1.43  
    1.44 +#define MakeTheMeasHists \
    1.45 +   _VMSMasterEnv->measHistsInfo = \
    1.46 +              makePrivDynArrayOfSize( (void***)&(_VMSMasterEnv->measHists), 200); \
    1.47 +    makeAMeasHist( spawnHistIdx,      "Spawn",        50, 0, 200 ) \
    1.48 +    makeAMeasHist( syncHistIdx,       "Sync",         50, 0, 200 )
    1.49 +
    1.50 +
    1.51 +#endif
    1.52 +
    1.53 +#ifdef SSR
    1.54 +
    1.55  //SSR
    1.56  #define SendFromToHistIdx      1
    1.57  #define SendOfTypeHistIdx      2
    1.58  #define ReceiveFromToHistIdx   3
    1.59  #define ReceiveOfTypeHistIdx   4
    1.60  
    1.61 -
    1.62  #define MakeTheMeasHists \
    1.63     _VMSMasterEnv->measHistsInfo = \
    1.64 -              makePrivDynArrayOfSize( (void***)&(_VMSMasterEnv->measHists), 200);\
    1.65 -   makeAMeasHist( spawnHistIdx,      "Spawn",        50, 0, 200 ) \
    1.66 -   makeAMeasHist( syncHistIdx,       "Sync",         50, 0, 200 )
    1.67 +              makePrivDynArrayOfSize( (void***)&(_VMSMasterEnv->measHists), 200); \
    1.68 +    makeAMeasHist( SendFromToHistIdx,   "SendFromTo",    50, 0, 100 ) \
    1.69 +    makeAMeasHist( SendOfTypeHistIdx,   "SendOfType",    50, 0, 100 ) \
    1.70 +    makeAMeasHist( ReceiveFromToHistIdx,"ReceiveFromTo", 50, 0, 100 ) \
    1.71 +    makeAMeasHist( ReceiveOfTypeHistIdx,"ReceiveOfType", 50, 0, 100 )
    1.72  
    1.73 -//   makeAMeasHist( createHistIdx,      "Create",        50, 0, 100 ) \
    1.74 -//   makeAMeasHist( mutexLockHistIdx,   "mutex lock",    50, 0, 100 ) \
    1.75 -//   makeAMeasHist( mutexUnlockHistIdx, "mutex unlock",  50, 0, 100 ) \
    1.76 -//   makeAMeasHist( condWaitHistIdx,    "cond wait",     50, 0, 100 ) \
    1.77 -//   makeAMeasHist( condSignalHistIdx,  "cond signal",   50, 0, 100 )
    1.78 -
    1.79 -//   makeAMeasHist( SendFromToHistIdx,   "SendFromTo",    50, 0, 100 ) \
    1.80 -//   makeAMeasHist( SendOfTypeHistIdx,   "SendOfType",    50, 0, 100 ) \
    1.81 -//   makeAMeasHist( ReceiveFromToHistIdx,"ReceiveFromTo", 50, 0, 100 ) \
    1.82 -//   makeAMeasHist( ReceiveOfTypeHistIdx,"ReceiveOfType", 50, 0, 100 )
    1.83 -
    1.84 +#endif
    1.85  
    1.86  //===========================================================================
    1.87  //VPThread