1.1 --- a/VMS.h	Sat Nov 20 08:19:05 2010 +0100
     1.2 +++ b/VMS.h	Wed May 11 16:13:24 2011 +0200
     1.3 @@ -17,6 +17,7 @@
     1.4  #include "Hash_impl/PrivateHash.h"
     1.5  #include "vmalloc.h"
     1.6  
     1.7 +//#include <stdio.h>
     1.8  #include <pthread.h>
     1.9  #include <sys/time.h>
    1.10  
    1.11 @@ -50,7 +51,7 @@
    1.12  #define DEBUG2( bool, msg, p1, p2) \
    1.13  //   if(bool) {printf(msg, p1, p2); fflush(stdin);}
    1.14  
    1.15 -#define ERROR(msg) printf(msg); fflush(stdin);
    1.16 +#define ERROR(msg) printf(msg); //fflush(stdin);
    1.17  #define ERROR1(msg, param) printf(msg, param); fflush(stdin);
    1.18  #define ERROR2(msg, p1, p2) printf(msg, p1, p2); fflush(stdin);
    1.19  
    1.20 @@ -76,7 +77,7 @@
    1.21  //=========================  Hardware related Constants =====================
    1.22     //This value is the number of hardware threads in the shared memory
    1.23     // machine
    1.24 -#define NUM_CORES        4
    1.25 +#define NUM_CORES        8
    1.26  
    1.27     // tradeoff amortizing master fixed overhead vs imbalance potential
    1.28     // when work-stealing, can make bigger, at risk of losing cache affinity
    1.29 @@ -401,21 +402,46 @@
    1.30  
    1.31  
    1.32  #define MEAS__SUB_CREATE  /*turn on/off subtraction of create from plugin*/
    1.33 +
    1.34 +//VPThread
    1.35  #define createHistIdx      1
    1.36  #define mutexLockHistIdx   2
    1.37  #define mutexUnlockHistIdx 3
    1.38  #define condWaitHistIdx    4
    1.39  #define condSignalHistIdx  5
    1.40  
    1.41 +//VCilk
    1.42 +#define spawnHistIdx      1
    1.43 +#define syncHistIdx       2
    1.44 +
    1.45 +//SSR
    1.46 +#define SendFromToHistIdx      1
    1.47 +#define SendOfTypeHistIdx      2
    1.48 +#define ReceiveFromToHistIdx   3
    1.49 +#define ReceiveOfTypeHistIdx   4
    1.50 +
    1.51  
    1.52  #define MakeTheMeasHists \
    1.53     _VMSMasterEnv->measHistsInfo = \
    1.54 -              makePrivDynArrayOfSize( &(_VMSMasterEnv->measHists), 200);\
    1.55 -   makeAMeasHist( createHistIdx,      "Create",        50, 0, 200 ) \
    1.56 -   makeAMeasHist( mutexLockHistIdx,   "mutex lock",    50, 0, 100 ) \
    1.57 -   makeAMeasHist( mutexUnlockHistIdx, "mutex unlock",  50, 0, 100 ) \
    1.58 -   makeAMeasHist( condWaitHistIdx,    "cond wait",     50, 0, 100 ) \
    1.59 -   makeAMeasHist( condSignalHistIdx,  "cond signal",   50, 0, 100 )
    1.60 +              makePrivDynArrayOfSize( (void***)&(_VMSMasterEnv->measHists), 200);\
    1.61 +   makeAMeasHist( spawnHistIdx,      "Spawn",        50, 0, 200 ) \
    1.62 +   makeAMeasHist( syncHistIdx,       "Sync",         50, 0, 200 )
    1.63 +
    1.64 +//   makeAMeasHist( createHistIdx,      "Create",        50, 0, 100 ) \
    1.65 +//   makeAMeasHist( mutexLockHistIdx,   "mutex lock",    50, 0, 100 ) \
    1.66 +//   makeAMeasHist( mutexUnlockHistIdx, "mutex unlock",  50, 0, 100 ) \
    1.67 +//   makeAMeasHist( condWaitHistIdx,    "cond wait",     50, 0, 100 ) \
    1.68 +//   makeAMeasHist( condSignalHistIdx,  "cond signal",   50, 0, 100 )
    1.69 +
    1.70 +//   makeAMeasHist( SendFromToHistIdx,   "SendFromTo",    50, 0, 100 ) \
    1.71 +//   makeAMeasHist( SendOfTypeHistIdx,   "SendOfType",    50, 0, 100 ) \
    1.72 +//   makeAMeasHist( ReceiveFromToHistIdx,"ReceiveFromTo", 50, 0, 100 ) \
    1.73 +//   makeAMeasHist( ReceiveOfTypeHistIdx,"ReceiveOfType", 50, 0, 100 )
    1.74 +
    1.75 +
    1.76 +//===========================================================================
    1.77 +//VPThread
    1.78 +
    1.79  
    1.80  #define Meas_startCreate \
    1.81      int32 startStamp, endStamp; \
    1.82 @@ -462,6 +488,63 @@
    1.83      addIntervalToHist( startStamp, endStamp, \
    1.84                               _VMSMasterEnv->measHists[ condSignalHistIdx ] );
    1.85  
    1.86 +//===========================================================================
    1.87 +// VCilk
    1.88 +#define Meas_startSpawn \
    1.89 +    int32 startStamp, endStamp; \
    1.90 +    saveLowTimeStampCountInto( startStamp ); \
    1.91 +
    1.92 +#define Meas_endSpawn \
    1.93 +    saveLowTimeStampCountInto( endStamp ); \
    1.94 +    addIntervalToHist( startStamp, endStamp, \
    1.95 +                             _VMSMasterEnv->measHists[ spawnHistIdx ] );
    1.96 +
    1.97 +#define Meas_startSync \
    1.98 +    int32 startStamp, endStamp; \
    1.99 +    saveLowTimeStampCountInto( startStamp ); \
   1.100 +
   1.101 +#define Meas_endSync \
   1.102 +    saveLowTimeStampCountInto( endStamp ); \
   1.103 +    addIntervalToHist( startStamp, endStamp, \
   1.104 +                             _VMSMasterEnv->measHists[ syncHistIdx ] );
   1.105 +
   1.106 +//===========================================================================
   1.107 +// SSR
   1.108 +#define Meas_startSendFromTo \
   1.109 +    int32 startStamp, endStamp; \
   1.110 +    saveLowTimeStampCountInto( startStamp ); \
   1.111 +
   1.112 +#define Meas_endSendFromTo \
   1.113 +    saveLowTimeStampCountInto( endStamp ); \
   1.114 +    addIntervalToHist( startStamp, endStamp, \
   1.115 +                             _VMSMasterEnv->measHists[ SendFromToHistIdx ] );
   1.116 +
   1.117 +#define Meas_startSendOfType \
   1.118 +    int32 startStamp, endStamp; \
   1.119 +    saveLowTimeStampCountInto( startStamp ); \
   1.120 +
   1.121 +#define Meas_endSendOfType \
   1.122 +    saveLowTimeStampCountInto( endStamp ); \
   1.123 +    addIntervalToHist( startStamp, endStamp, \
   1.124 +                             _VMSMasterEnv->measHists[ SendOfTypeHistIdx ] );
   1.125 +
   1.126 +#define Meas_startReceiveFromTo \
   1.127 +    int32 startStamp, endStamp; \
   1.128 +    saveLowTimeStampCountInto( startStamp ); \
   1.129 +
   1.130 +#define Meas_endReceiveFromTo \
   1.131 +    saveLowTimeStampCountInto( endStamp ); \
   1.132 +    addIntervalToHist( startStamp, endStamp, \
   1.133 +                             _VMSMasterEnv->measHists[ ReceiveFromToHistIdx ] );
   1.134 +
   1.135 +#define Meas_startReceiveOfType \
   1.136 +    int32 startStamp, endStamp; \
   1.137 +    saveLowTimeStampCountInto( startStamp ); \
   1.138 +
   1.139 +#define Meas_endReceiveOfType \
   1.140 +    saveLowTimeStampCountInto( endStamp ); \
   1.141 +    addIntervalToHist( startStamp, endStamp, \
   1.142 +                             _VMSMasterEnv->measHists[ReceiveOfTypeHistIdx ] );
   1.143  
   1.144  //=====
   1.145