comparison VSs.h @ 34:71a20aa9d17a

merge, fix __brch file
author Nina Engelhardt <nengel@mailbox.tu-berlin.de>
date Wed, 06 Mar 2013 15:56:09 +0100
parents b787a5234406
children c8d4f6d3c7d3
comparison
equal deleted inserted replaced
21:7cb408d23023 27:19fd5e5b8079
12 #include "Queue_impl/PrivateQueue.h" 12 #include "Queue_impl/PrivateQueue.h"
13 #include "Hash_impl/PrivateHash.h" 13 #include "Hash_impl/PrivateHash.h"
14 #include "VMS_impl/VMS.h" 14 #include "VMS_impl/VMS.h"
15 #include "Measurement/dependency.h" 15 #include "Measurement/dependency.h"
16 16
17 void free_pointer_entry(void* ptrEntry);
17 /* Switch for Nexus support 18 /* Switch for Nexus support
18 * Note: nexus incompatible with holistic recording (constraints not accessible) 19 * Note: nexus incompatible with holistic recording (constraints not accessible)
19 * But counter recording still functional, can build constraintless display 20 * But counter recording still functional, can build constraintless display
20 * with wallclock time 21 * with wallclock time
21 */ 22 */
76 ListOfArrays* readersSinceLastWriter; 77 ListOfArrays* readersSinceLastWriter;
77 #endif 78 #endif
78 } 79 }
79 VSsPointerEntry; 80 VSsPointerEntry;
80 81
81 typedef struct 82 typedef struct {
82 { 83 void **args; //ctld args must come first, as ptrs
83 void **args; //ctld args must come first, as ptrs 84 VSsTaskType *taskType;
84 VSsTaskType *taskType; 85 int32 *taskID;
85 int32 *taskID; 86 int32 numBlockingProp;
86 int32 numBlockingProp; 87 SlaveVP *slaveAssignedTo; //only valid before end task (thread)
87 SlaveVP *slaveAssignedTo; //only valid before end task (thread) 88 VSsPointerEntry **ptrEntries;
88 VSsPointerEntry **ptrEntries; 89 void* parentTaskStub;
89 void* parentTaskStub; 90 int32 numLiveChildTasks;
90 int32 numLiveChildTasks; 91 int32 numLiveChildThreads;
91 int32 numLiveChildThreads; 92 bool32 isWaitingForChildTasksToEnd;
92 bool32 isWaitingForChildTasksToEnd; 93 bool32 isWaitingForChildThreadsToEnd;
93 bool32 isWaitingForChildThreadsToEnd; 94 bool32 isEnded;
94 bool32 isEnded; 95 int *argsMask;
95 #ifdef HOLISTIC__TURN_ON_OBSERVE_UCC 96 #ifdef HOLISTIC__TURN_ON_OBSERVE_UCC
96 Unit parentUnit; 97 Unit parentUnit;
97 Unit firstOfTask; 98 Unit firstOfTask;
98 #endif 99 #endif
99 } 100 }
100 VSsTaskStub; 101 VSsTaskStub;
101 102
102 103
103 typedef struct 104 typedef struct
104 { 105 {
251 ListOfArrays* counterList[NUM_CORES]; 252 ListOfArrays* counterList[NUM_CORES];
252 #endif 253 #endif
253 #ifdef IDLE_SLAVES 254 #ifdef IDLE_SLAVES
254 SlaveVP* idleSlv[NUM_CORES][NUM_ANIM_SLOTS]; 255 SlaveVP* idleSlv[NUM_CORES][NUM_ANIM_SLOTS];
255 #endif 256 #endif
256 int shutdownInitiated; 257 //int shutdownInitiated;
257 } 258 }
258 VSsSemEnv; 259 VSsSemEnv;
259 260
260 261
261 typedef struct _TransListElem TransListElem; 262 typedef struct _TransListElem TransListElem;