1.1 --- a/VMS.h	Sun Mar 04 14:26:35 2012 -0800
     1.2 +++ b/VMS.h	Wed Mar 07 22:53:50 2012 -0800
     1.3 @@ -20,15 +20,11 @@
     1.4  #include <pthread.h>
     1.5  #include <sys/time.h>
     1.6  
     1.7 -#ifndef _LANG_NAME_
     1.8 -#define _LANG_NAME_ ""
     1.9 -#endif
    1.10 -
    1.11  //=================  Defines: included from separate files  =================
    1.12  //
    1.13  // Note: ALL defines are in other files, none are in here
    1.14  //
    1.15 -#include "VMS_defs__main.h"
    1.16 +#include "Defines/VMS_defs__main.h"
    1.17  
    1.18  
    1.19  //================================ Typedefs =================================
    1.20 @@ -111,7 +107,7 @@
    1.21   *         assembly code to fail -- hard-codes offsets of fields
    1.22   */
    1.23  struct _SlaveVP
    1.24 - { int         procrID;  //for debugging -- count up each time create
    1.25 + { int         procrID;  //each slave given a unique ID
    1.26     int         coreAnimatedBy;
    1.27     void       *startOfStack;
    1.28     void       *stackPtr;
    1.29 @@ -125,8 +121,8 @@
    1.30     SchedSlot  *schedSlot;
    1.31     VMSReqst   *requests;
    1.32  
    1.33 -   void       *semanticData; //this livesUSE_GNU here for the life of Slv
    1.34 -   void       *dataRetFromReq;//values returned from plugin to Slv go here
    1.35 +   void       *semanticData; //this is live for the life of Slv
    1.36 +   void       *dataRetFromReq;//Used to return vals from plugin to Wrapper Lib
    1.37  
    1.38        //=========== MEASUREMENT STUFF ==========
    1.39         MEAS__Insert_Meas_Fields_into_Slave;
    1.40 @@ -147,8 +143,8 @@
    1.41     RequestHandler   requestHandler;
    1.42     
    1.43     SchedSlot     ***allSchedSlots;
    1.44 -   VMSQueueStruc **readyToAnimateQs;
    1.45 -   SlaveVP      **masterVPs;
    1.46 +   VMSQueueStruc  **readyToAnimateQs;
    1.47 +   SlaveVP        **masterVPs;
    1.48  
    1.49     void            *semanticEnv;
    1.50     void            *OSEventStruc;   //for future, when add I/O to BLIS
    1.51 @@ -288,21 +284,23 @@
    1.52  #define VMS_PI__create_slaveVP VMS_int__create_slaveVP
    1.53  #define VMS_WL__create_slaveVP VMS_int__create_slaveVP
    1.54  
    1.55 +   //Use this to create processor inside entry point & other places outside
    1.56 +   // the VMS system boundary (IE, don't animate with a SlaveVP or MasterVP)
    1.57 +SlaveVP *
    1.58 +VMS_ext__create_slaveVP( TopLevelFnPtr fnPtr, void *dataParam );
    1.59 +
    1.60 +inline SlaveVP *
    1.61 +VMS_int__create_slaveVP_helper( SlaveVP *newSlv,       TopLevelFnPtr  fnPtr,
    1.62 +                                void      *dataParam, void           *stackLocs );
    1.63 +
    1.64  inline void
    1.65  VMS_int__point_slaveVP_to_Fn( SlaveVP *slaveVP, TopLevelFnPtr fnPtr,
    1.66                              void    *dataParam);
    1.67 -#define VMS_PI__point_slaveVP_to_Fn  VMS_int__point_slaveVP_to_Fn
    1.68 -#define VMS_WL__point_slaveVP_to_Fn  VMS_int__point_slaveVP_to_Fn
    1.69  
    1.70  void
    1.71 -VMS_int__dissipate_SlaveVP( SlaveVP *slaveToDissipate );
    1.72 -#define VMS_PI__dissipate_SlaveVP VMS_int__dissipateSlaveVP
    1.73 -//From WL, dissipate a SlaveVP by sending a request
    1.74 -
    1.75 -   //Use this to create processor inside entry point & other places outside
    1.76 -   // the VMS system boundary (IE, not run in slave nor Master)
    1.77 -SlaveVP *
    1.78 -VMS_ext__create_slaveVP( TopLevelFnPtr fnPtr, void *dataParam );
    1.79 +VMS_int__dissipate_slaveVP( SlaveVP *slaveToDissipate );
    1.80 +#define VMS_PI__dissipate_slaveVP VMS_int__dissipate_slaveVP
    1.81 +//WL: dissipate a SlaveVP by sending a request
    1.82  
    1.83  void
    1.84  VMS_ext__dissipate_slaveVP( SlaveVP *slaveToDissipate );
    1.85 @@ -355,8 +353,14 @@
    1.86  VMS_WL__give_num_plugin_animations();
    1.87  
    1.88  
    1.89 -#include "probes.h"
    1.90 -#include "vutilities.h"
    1.91 +//========================= Utilities =======================
    1.92 +inline char *
    1.93 +VMS_int__strDup( char *str );
    1.94  
    1.95 +
    1.96 +//========================= Probes =======================
    1.97 +#include "Probes/probes.h"
    1.98 +
    1.99 +//================================================
   1.100  #endif	/* _VMS_H */
   1.101