comparison 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
comparison
equal deleted inserted replaced
9:a63d0ab10c53 10:b117de704587
69 { 69 {
70 void **args; //ctld args must come first, as ptrs 70 void **args; //ctld args must come first, as ptrs
71 VSsTaskType *taskType; 71 VSsTaskType *taskType;
72 int32 *taskID; 72 int32 *taskID;
73 int32 numBlockingProp; 73 int32 numBlockingProp;
74 SlaveVP *slaveAssignedTo; 74 SlaveVP *slaveAssignedTo; //only valid before end task (thread)
75 VSsPointerEntry **ptrEntries; 75 VSsPointerEntry **ptrEntries;
76
76 void* parentTasksStub; 77 void* parentTasksStub;
77 int32 numLiveChildTasks; 78 int32 numLiveChildTasks;
78 int32 numLiveChildThreads; 79 int32 numLiveChildThreads;
79 bool32 isWaitingForChildTasksToEnd; 80 bool32 isWaitingForChildTasksToEnd;
80 bool32 isWaitingForChildThreadsToEnd; 81 bool32 isWaitingForChildThreadsToEnd;
183 typedef struct 184 typedef struct
184 { 185 {
185 PrivQueueStruc *slavesReadyToResumeQ; //Shared (slaves not pinned) 186 PrivQueueStruc *slavesReadyToResumeQ; //Shared (slaves not pinned)
186 PrivQueueStruc *freeExtraTaskSlvQ; //Shared 187 PrivQueueStruc *freeExtraTaskSlvQ; //Shared
187 PrivQueueStruc *taskReadyQ; //Shared (tasks not pinned) 188 PrivQueueStruc *taskReadyQ; //Shared (tasks not pinned)
188 SlaveVP *currTaskSlvs[NUM_CORES][NUM_ANIM_SLOTS]; 189 SlaveVP *slotTaskSlvs[NUM_CORES][NUM_ANIM_SLOTS];
189 HashTable *argPtrHashTbl; 190 HashTable *argPtrHashTbl;
190 HashTable *commHashTbl; 191 HashTable *commHashTbl;
191 int32 numLiveExtraTaskSlvs; 192 int32 numLiveExtraTaskSlvs;
192 int32 numLiveThreadSlvs; 193 int32 numLiveThreadSlvs;
193 int32 nextCoreToGetNewSlv; 194 int32 nextCoreToGetNewSlv;
227 TransListElem *nextTrans; 228 TransListElem *nextTrans;
228 }; 229 };
229 //TransListElem 230 //TransListElem
230 231
231 enum VSsSlvType 232 enum VSsSlvType
232 { extraTaskSlv = 1, 233 { ExtraTaskSlv = 1,
233 slotTaskSlv, 234 SlotTaskSlv,
234 threadSlv 235 ThreadSlv
235 }; 236 };
236 237
237 typedef struct 238 typedef struct
238 { 239 {
239 int32 highestTransEntered; 240 int32 highestTransEntered;