1.1 --- a/VSs.h	Fri Feb 01 17:18:57 2013 +0100
     1.2 +++ b/VSs.h	Wed Mar 06 14:32:33 2013 +0100
     1.3 @@ -14,6 +14,7 @@
     1.4  #include "VMS_impl/VMS.h"
     1.5  #include "Measurement/dependency.h"
     1.6  
     1.7 +void free_pointer_entry(void* ptrEntry);
     1.8  /* Switch for Nexus support
     1.9   * Note: nexus incompatible with holistic recording (constraints not accessible)
    1.10   * But counter recording still functional, can build constraintless display
    1.11 @@ -78,25 +79,25 @@
    1.12   }
    1.13  VSsPointerEntry;
    1.14  
    1.15 -typedef struct
    1.16 - {
    1.17 -   void       **args; //ctld args must come first, as ptrs
    1.18 -   VSsTaskType *taskType;
    1.19 -   int32       *taskID;
    1.20 -   int32        numBlockingProp;
    1.21 -   SlaveVP     *slaveAssignedTo; //only valid before end task (thread)
    1.22 -   VSsPointerEntry  **ptrEntries;
    1.23 -   void*        parentTaskStub;
    1.24 -   int32        numLiveChildTasks;
    1.25 -   int32        numLiveChildThreads;
    1.26 -   bool32       isWaitingForChildTasksToEnd;
    1.27 -   bool32       isWaitingForChildThreadsToEnd;
    1.28 -   bool32       isEnded;
    1.29 -   #ifdef HOLISTIC__TURN_ON_OBSERVE_UCC
    1.30 -   Unit parentUnit;
    1.31 -   Unit firstOfTask;
    1.32 -   #endif
    1.33 - }
    1.34 +typedef struct {
    1.35 +    void **args; //ctld args must come first, as ptrs
    1.36 +    VSsTaskType *taskType;
    1.37 +    int32 *taskID;
    1.38 +    int32 numBlockingProp;
    1.39 +    SlaveVP *slaveAssignedTo; //only valid before end task (thread)
    1.40 +    VSsPointerEntry **ptrEntries;
    1.41 +    void* parentTaskStub;
    1.42 +    int32 numLiveChildTasks;
    1.43 +    int32 numLiveChildThreads;
    1.44 +    bool32 isWaitingForChildTasksToEnd;
    1.45 +    bool32 isWaitingForChildThreadsToEnd;
    1.46 +    bool32 isEnded;
    1.47 +    int *argsMask;
    1.48 +#ifdef HOLISTIC__TURN_ON_OBSERVE_UCC
    1.49 +    Unit parentUnit;
    1.50 +    Unit firstOfTask;
    1.51 +#endif
    1.52 +}
    1.53  VSsTaskStub;
    1.54  
    1.55  
    1.56 @@ -253,7 +254,7 @@
    1.57     #ifdef IDLE_SLAVES
    1.58     SlaveVP* idleSlv[NUM_CORES][NUM_ANIM_SLOTS];
    1.59     #endif
    1.60 -   int shutdownInitiated;
    1.61 +   //int shutdownInitiated;
    1.62   }
    1.63  VSsSemEnv;
    1.64