1.1 --- a/VMS.h	Fri Mar 09 10:46:36 2012 -0800
     1.2 +++ b/VMS.h	Fri Mar 09 22:30:26 2012 -0800
     1.3 @@ -11,10 +11,10 @@
     1.4  #define _GNU_SOURCE
     1.5  
     1.6  #include "VMS_primitive_data_types.h"
     1.7 -#include "C_Libraries/DynArray/DynArray.h"
     1.8 -#include "C_Libraries/Hash_impl/PrivateHash.h"
     1.9 -#include "C_Libraries/Histogram/Histogram.h"
    1.10 -#include "C_Libraries/Queue_impl/PrivateQueue.h"
    1.11 +#include "DynArray/DynArray.h"
    1.12 +#include "Hash_impl/PrivateHash.h"
    1.13 +#include "Histogram/Histogram.h"
    1.14 +#include "Queue_impl/PrivateQueue.h"
    1.15  #include "vmalloc.h"
    1.16  
    1.17  #include <pthread.h>
    1.18 @@ -107,7 +107,7 @@
    1.19   *         assembly code to fail -- hard-codes offsets of fields
    1.20   */
    1.21  struct _SlaveVP
    1.22 - { int         procrID;  //each slave given a unique ID
    1.23 + { int         slaveID;  //each slave given a unique ID
    1.24     int         coreAnimatedBy;
    1.25     void       *startOfStack;
    1.26     void       *stackPtr;
    1.27 @@ -212,15 +212,12 @@
    1.28  
    1.29  //=============================  Global Vars ================================
    1.30  
    1.31 +volatile MasterEnv      *_VMSMasterEnv __align_to_cacheline__;
    1.32 +
    1.33  pthread_t       coreLoopThdHandles[ NUM_CORES ];  //pthread's virt-procr state
    1.34  ThdParams      *coreLoopThdParams [ NUM_CORES ];
    1.35 -pthread_mutex_t suspendLock;
    1.36 -pthread_cond_t  suspend_cond;
    1.37 -
    1.38 -volatile MasterEnv      *_VMSMasterEnv __align_to_cacheline__;
    1.39 -
    1.40 -pthread_mutex_t suspendLock = PTHREAD_MUTEX_INITIALIZER;
    1.41 -pthread_cond_t  suspend_cond  = PTHREAD_COND_INITIALIZER;
    1.42 +pthread_mutex_t suspendLock   = PTHREAD_MUTEX_INITIALIZER;
    1.43 +pthread_cond_t  suspendCond  = PTHREAD_COND_INITIALIZER;
    1.44  
    1.45  //=========================  Function Prototypes  ===========================
    1.46  
    1.47 @@ -237,7 +234,7 @@
    1.48  VMS_SS__init();
    1.49  
    1.50  //Fix; 
    1.51 -/*seed-procr creation -- put box around language, have lang register stuff
    1.52 +/*seed-slaveVP creation -- put box around language, have lang register stuff
    1.53          with VMS.
    1.54          have main program explicitly INIT Lang! -- makes more sense to
    1.55          C programmers -- makes it clear that there's a transition.