1.1 --- a/SSR.h	Fri Mar 09 19:01:21 2012 +0100
     1.2 +++ b/SSR.h	Fri Mar 09 22:28:08 2012 -0800
     1.3 @@ -9,9 +9,9 @@
     1.4  #ifndef _SSR_H
     1.5  #define	_SSR_H
     1.6  
     1.7 -#include "../../C_Libraries/Queue_impl/PrivateQueue.h"
     1.8 -#include "../../C_Libraries/Hash_impl/PrivateHash.h"
     1.9 -#include "../VMS_impl/VMS.h"
    1.10 +#include "Queue_impl/PrivateQueue.h"
    1.11 +#include "Hash_impl/PrivateHash.h"
    1.12 +#include "VMS_impl/VMS.h"
    1.13  #include "dependency.h"
    1.14  
    1.15  
    1.16 @@ -31,7 +31,7 @@
    1.17  
    1.18  typedef struct
    1.19   {
    1.20 -   VirtProcr      *VPCurrentlyExecuting;
    1.21 +   SlaveVP      *VPCurrentlyExecuting;
    1.22     PrivQueueStruc *waitingVPQ;
    1.23   }
    1.24  SSRTrans;
    1.25 @@ -69,14 +69,14 @@
    1.26  
    1.27  struct _SSRSemReq
    1.28   { enum SSRReqType    reqType;
    1.29 -   VirtProcr         *sendPr;
    1.30 -   VirtProcr         *receivePr;
    1.31 +   SlaveVP         *sendPr;
    1.32 +   SlaveVP         *receivePr;
    1.33     int32              msgType;
    1.34     void              *msg;
    1.35     SSRSemReq         *nextReqInHashEntry;
    1.36  
    1.37     void              *initData;
    1.38 -   VirtProcrFnPtr     fnPtr;
    1.39 +   TopLevelFnPtr     fnPtr;
    1.40     int32              coreToScheduleOnto;
    1.41  
    1.42     int32              sizeToMalloc;
    1.43 @@ -97,7 +97,7 @@
    1.44   {
    1.45     PrivQueueStruc **readyVPQs;
    1.46     HashTable       *commHashTbl;
    1.47 -   int32            numVirtPr;
    1.48 +   int32            numSlaveVP;
    1.49     int32            nextCoreToGetNewPr;
    1.50     int32            primitiveStartTime;
    1.51  
    1.52 @@ -105,7 +105,7 @@
    1.53     SSRSingleton     fnSingletons[NUM_STRUCS_IN_SEM_ENV];
    1.54     SSRTrans         transactionStrucs[NUM_STRUCS_IN_SEM_ENV];
    1.55     
    1.56 -   #ifdef OBSERVE_UCC
    1.57 +   #ifdef HOLISTIC__TURN_ON_OBSERVE_UCC
    1.58     ListOfArrays* unitList;
    1.59     ListOfArrays* ctlDependenciesList;
    1.60     ListOfArrays* commDependenciesList;
    1.61 @@ -116,10 +116,10 @@
    1.62     ListOfArrays* hwArcs;
    1.63     #endif
    1.64  
    1.65 -   #ifdef MEAS__PERF_COUNTERS
    1.66 +   #ifdef HOLISTIC__TURN_ON_PERF_COUNTERS
    1.67     ListOfArrays* counterList[NUM_CORES];
    1.68     #endif
    1.69 -   VirtProcr* idlePr[NUM_CORES][NUM_SCHED_SLOTS];
    1.70 +   SlaveVP* idlePr[NUM_CORES][NUM_SCHED_SLOTS];
    1.71   }
    1.72  SSRSemEnv;
    1.73  
    1.74 @@ -142,7 +142,7 @@
    1.75  //===========================================================================
    1.76  
    1.77  void
    1.78 -SSR__create_seed_procr_and_do_work( VirtProcrFnPtr fn, void *initData );
    1.79 +SSR__create_seed_procr_and_do_work( TopLevelFnPtr fn, void *initData );
    1.80  
    1.81  int32
    1.82  SSR__giveMinWorkUnitCycles( float32 percentOverhead );
    1.83 @@ -169,33 +169,33 @@
    1.84  
    1.85  //=======================
    1.86  
    1.87 -  VirtProcr *
    1.88 -SSR__create_procr_with( VirtProcrFnPtr fnPtr, void *initData,
    1.89 -                          VirtProcr *creatingPr );
    1.90 +  SlaveVP *
    1.91 +SSR__create_procr_with( TopLevelFnPtr fnPtr, void *initData,
    1.92 +                          SlaveVP *creatingSlv );
    1.93  
    1.94 -  VirtProcr *
    1.95 -SSR__create_procr_with_affinity( VirtProcrFnPtr fnPtr,    void *initData,
    1.96 -                            VirtProcr *creatingPr, int32 coreToScheduleOnto);
    1.97 +  SlaveVP *
    1.98 +SSR__create_procr_with_affinity( TopLevelFnPtr fnPtr,    void *initData,
    1.99 +                            SlaveVP *creatingPr, int32 coreToScheduleOnto);
   1.100  
   1.101  void
   1.102 -SSR__dissipate_procr( VirtProcr *procrToDissipate );
   1.103 +SSR__dissipate_procr( SlaveVP *procrToDissipate );
   1.104  
   1.105  //=======================
   1.106  void *
   1.107 -SSR__malloc_to( int numBytes, VirtProcr *ownerPr );
   1.108 +SSR__malloc_to( int numBytes, SlaveVP *ownerSlv );
   1.109  
   1.110  void
   1.111 -SSR__free( void *ptrToFree, VirtProcr *owningPr );
   1.112 +SSR__free( void *ptrToFree, SlaveVP *owningSlv );
   1.113  
   1.114  void
   1.115 -SSR__transfer_ownership_of_from_to( void *data, VirtProcr *oldOwnerPr,
   1.116 -                                                    VirtProcr *newOwnerPr );
   1.117 +SSR__transfer_ownership_of_from_to( void *data, SlaveVP *oldOwnerPr,
   1.118 +                                                    SlaveVP *newOwnerSlv );
   1.119                                                      
   1.120  void
   1.121 -SSR__add_ownership_by_to( VirtProcr *newOwnerPr, void *data );
   1.122 +SSR__add_ownership_by_to( SlaveVP *newOwnerPr, void *data );
   1.123  
   1.124  void
   1.125 -SSR__remove_ownership_by_from( VirtProcr *loserPr, void *dataLosing );
   1.126 +SSR__remove_ownership_by_from( SlaveVP *loserPr, void *dataLosing );
   1.127  
   1.128  void
   1.129  SSR__transfer_ownership_to_outside( void *dataToTransferOwnershipOf );
   1.130 @@ -204,52 +204,52 @@
   1.131  
   1.132  //=======================
   1.133  void
   1.134 -SSR__send_of_type_to( VirtProcr *sendPr, void *msg, const int type,
   1.135 -                        VirtProcr *receivePr);
   1.136 +SSR__send_of_type_to( SlaveVP *sendPr, void *msg, const int type,
   1.137 +                        SlaveVP *receivePr);
   1.138  
   1.139  void
   1.140 -SSR__send_from_to( void *msg, VirtProcr *sendPr, VirtProcr *receivePr);
   1.141 +SSR__send_from_to( void *msg, SlaveVP *sendPr, SlaveVP *receivePr);
   1.142  
   1.143  void *
   1.144 -SSR__receive_type_to( const int type, VirtProcr *receivePr );
   1.145 +SSR__receive_type_to( const int type, SlaveVP *receiveSlv );
   1.146  
   1.147  void *
   1.148 -SSR__receive_from_to( VirtProcr *sendPr, VirtProcr *receivePr );
   1.149 +SSR__receive_from_to( SlaveVP *sendPr, SlaveVP *receiveSlv );
   1.150  
   1.151  
   1.152  //======================= Concurrency Stuff ======================
   1.153  void
   1.154 -SSR__start_fn_singleton( int32 singletonID, VirtProcr *animPr );
   1.155 +SSR__start_fn_singleton( int32 singletonID, SlaveVP *animSlv );
   1.156  
   1.157  void
   1.158 -SSR__end_fn_singleton( int32 singletonID, VirtProcr *animPr );
   1.159 +SSR__end_fn_singleton( int32 singletonID, SlaveVP *animSlv );
   1.160  
   1.161  void
   1.162 -SSR__start_data_singleton( SSRSingleton **singeltonAddr, VirtProcr *animPr );
   1.163 +SSR__start_data_singleton( SSRSingleton **singeltonAddr, SlaveVP *animSlv );
   1.164  
   1.165  void
   1.166 -SSR__end_data_singleton( SSRSingleton **singletonAddr, VirtProcr *animPr );
   1.167 +SSR__end_data_singleton( SSRSingleton **singletonAddr, SlaveVP *animSlv );
   1.168  
   1.169  void
   1.170  SSR__animate_short_fn_in_isolation( PtrToAtomicFn ptrToFnToExecInMaster,
   1.171 -                                    void *data, VirtProcr *animPr );
   1.172 +                                    void *data, SlaveVP *animSlv );
   1.173  
   1.174  void
   1.175 -SSR__start_transaction( int32 transactionID, VirtProcr *animPr );
   1.176 +SSR__start_transaction( int32 transactionID, SlaveVP *animSlv );
   1.177  
   1.178  void
   1.179 -SSR__end_transaction( int32 transactionID, VirtProcr *animPr );
   1.180 +SSR__end_transaction( int32 transactionID, SlaveVP *animSlv );
   1.181  
   1.182  
   1.183  //=========================  Internal use only  =============================
   1.184  void
   1.185 -SSR__Request_Handler( VirtProcr *requestingPr, void *_semEnv );
   1.186 +SSR__Request_Handler( SlaveVP *requestingPr, void *_semEnv );
   1.187  
   1.188 -VirtProcr *
   1.189 -SSR__schedule_virt_procr( void *_semEnv, int coreNum, int slotNum );
   1.190 +SlaveVP *
   1.191 +SSR__schedule_slaveVP( void *_semEnv, int coreNum, int slotNum );
   1.192  
   1.193 -VirtProcr*
   1.194 -SSR__create_procr_helper( VirtProcrFnPtr fnPtr, void *initData,
   1.195 +SlaveVP*
   1.196 +SSR__create_procr_helper( TopLevelFnPtr fnPtr, void *initData,
   1.197                            SSRSemEnv *semEnv,    int32 coreToScheduleOnto );
   1.198  
   1.199  #endif	/* _SSR_H */