diff VSs.h @ 10:b13fbd445e0a

Compiles and some bugs corrected.. still does double free of taskStub
author Sean Halle <seanhalle@yahoo.com>
date Fri, 17 Aug 2012 17:12:50 -0700
parents 832bc715fbf2
children f56e3beac86b
line diff
     1.1 --- a/VSs.h	Mon Aug 06 01:14:41 2012 -0700
     1.2 +++ b/VSs.h	Fri Aug 17 17:12:50 2012 -0700
     1.3 @@ -71,8 +71,9 @@
     1.4     VSsTaskType *taskType;
     1.5     int32       *taskID;
     1.6     int32        numBlockingProp;
     1.7 -   SlaveVP     *slaveAssignedTo;
     1.8 +   SlaveVP     *slaveAssignedTo; //only valid before end task (thread)
     1.9     VSsPointerEntry  **ptrEntries;
    1.10 +   
    1.11     void*        parentTasksStub;
    1.12     int32        numLiveChildTasks;
    1.13     int32        numLiveChildThreads;
    1.14 @@ -185,7 +186,7 @@
    1.15     PrivQueueStruc  *slavesReadyToResumeQ; //Shared (slaves not pinned)
    1.16     PrivQueueStruc  *freeExtraTaskSlvQ;    //Shared
    1.17     PrivQueueStruc  *taskReadyQ;           //Shared (tasks not pinned)
    1.18 -   SlaveVP         *currTaskSlvs[NUM_CORES][NUM_ANIM_SLOTS];
    1.19 +   SlaveVP         *slotTaskSlvs[NUM_CORES][NUM_ANIM_SLOTS];
    1.20     HashTable       *argPtrHashTbl;
    1.21     HashTable       *commHashTbl;
    1.22     int32            numLiveExtraTaskSlvs;
    1.23 @@ -229,9 +230,9 @@
    1.24  //TransListElem
    1.25   
    1.26  enum VSsSlvType
    1.27 - { extraTaskSlv = 1,
    1.28 -   slotTaskSlv,
    1.29 -   threadSlv
    1.30 + { ExtraTaskSlv = 1,
    1.31 +   SlotTaskSlv,
    1.32 +   ThreadSlv
    1.33   };
    1.34   
    1.35  typedef struct