Mercurial > hg > Members > kono > Cerium
annotate TaskManager/kernel/ppe/TaskManagerImpl.cc @ 940:0d404f6c36a8
unknown dead lock still...
author | Shinji KONO <kono@ie.u-ryukyu.ac.jp> |
---|---|
date | Sat, 31 Jul 2010 16:44:10 +0900 |
parents | 9cfac2e8fc2e |
children | 0c11c2fd7e63 |
rev | line source |
---|---|
5 | 1 #include <stdio.h> |
3 | 2 #include "TaskManagerImpl.h" |
46 | 3 #include "types.h" |
4 #include "error.h" | |
518 | 5 #include "SchedTask.h" |
619 | 6 #include "Scheduler.h" |
634 | 7 #include "SysTask.h" |
8 #include "SysFunc.h" | |
801 | 9 #include <string.h> |
10 | |
619 | 11 |
220 | 12 static HTaskPtr systask_start; |
109 | 13 static HTaskPtr systask_finish; |
42 | 14 |
514 | 15 static void |
16 noaction(SchedTask *s, void *read, void *write) | |
3 | 17 { |
18 } | |
19 | |
835 | 20 TaskManagerImpl::TaskManagerImpl(int num) |
21 : machineNum(num){ | |
853 | 22 // 実行可能なHTaskのリスト |
498
cb5ecfc5aaa3
double linked HTaskInfo/HTask
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
497
diff
changeset
|
23 activeTaskQueue = new HTaskInfo(); |
853 | 24 // wait_forで止まっているHTaskのリスト。必要ないが、Dead lock detection に使う |
498
cb5ecfc5aaa3
double linked HTaskInfo/HTask
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
497
diff
changeset
|
25 waitTaskQueue = new HTaskInfo(); |
853 | 26 // HTask の factory. HTaskInfo ならなんでもいい。 |
498
cb5ecfc5aaa3
double linked HTaskInfo/HTask
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
497
diff
changeset
|
27 htaskImpl = waitTaskQueue ; // any HTaskInfo |
853 | 28 // Task の dependency を表現する double linked list. HTaskInfo とは別に必要。 |
498
cb5ecfc5aaa3
double linked HTaskInfo/HTask
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
497
diff
changeset
|
29 taskQueueImpl = new TaskQueueInfo(); |
480
46464727d825
TaskQueueInfo initiaization...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
479
diff
changeset
|
30 } |
50 | 31 |
220 | 32 /** |
298 | 33 * 一番最初に PPE で実行される systask_start |
220 | 34 */ |
42 | 35 void |
499 | 36 TaskManagerImpl::systask_init() |
42 | 37 { |
109 | 38 systask_register(); |
897
ad95be23c794
add return address in SimpleTask for debugging.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
855
diff
changeset
|
39 systask_start = create_task(StartTask,0,0,0,0,__builtin_return_address(0)); |
ad95be23c794
add return address in SimpleTask for debugging.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
855
diff
changeset
|
40 systask_finish = create_task(FinishTask,0,0,0,0,__builtin_return_address(0)); |
220 | 41 |
42 systask_start->spawn(); | |
43 | |
634 | 44 // すべての Task が FinishTask を wait_for すると、 |
45 // あらゆる Task が FinishTask の waiting task queue を操作する | |
46 // ことになる。それは、重すぎる。PPE/SPE Task が終了した時点で、 | |
47 // TaskManager が実行する方が安い。 | |
48 // append_waitTask(systask_finish); | |
49 } | |
50 | |
51 HTaskPtr | |
897
ad95be23c794
add return address in SimpleTask for debugging.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
855
diff
changeset
|
52 TaskManagerImpl::create_task(int cmd,memaddr rbuf, long r_size, memaddr wbuf, long w_size, void *from) { |
634 | 53 HTaskPtr new_task; |
54 | |
55 new_task = htaskImpl->create(cmd, rbuf, r_size, wbuf, w_size); | |
56 new_task->post_func = noaction; | |
57 new_task->mimpl = this; | |
897
ad95be23c794
add return address in SimpleTask for debugging.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
855
diff
changeset
|
58 new_task->from = (memaddr)from; |
634 | 59 |
60 return new_task; | |
42 | 61 } |
62 | |
3 | 63 HTaskPtr |
897
ad95be23c794
add return address in SimpleTask for debugging.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
855
diff
changeset
|
64 TaskManagerImpl::create_task(int cmd,void *from) |
3 | 65 { |
66 HTaskPtr new_task; | |
67 | |
703 | 68 // for compatibility |
69 new_task = htaskImpl->create(TaskArray1); | |
70 new_task->post_func = noaction; | |
71 new_task->mimpl = this; | |
736 | 72 new_task->create_task_array(cmd,1,8,8,8); |
713
f725c6455d19
remove SIMPLE_TASK conditional
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
704
diff
changeset
|
73 // rbuf, r_size were set |
704
6d497c098455
Compatibility mode works.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
703
diff
changeset
|
74 new_task->command = TaskArray1; |
897
ad95be23c794
add return address in SimpleTask for debugging.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
855
diff
changeset
|
75 new_task->from = (memaddr)from; |
63 | 76 |
3 | 77 return new_task; |
78 } | |
79 | |
800
2708c4a7bade
run16 word count ( not yet worked. )
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
736
diff
changeset
|
80 HTaskPtr |
897
ad95be23c794
add return address in SimpleTask for debugging.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
855
diff
changeset
|
81 TaskManagerImpl::create_task_array(int id, int num_task, int num_param, int num_inData, int num_outData, void *from) |
800
2708c4a7bade
run16 word count ( not yet worked. )
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
736
diff
changeset
|
82 { |
897
ad95be23c794
add return address in SimpleTask for debugging.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
855
diff
changeset
|
83 HTaskPtr ta = create_task(TaskArray,0,0,0,0, from); |
800
2708c4a7bade
run16 word count ( not yet worked. )
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
736
diff
changeset
|
84 ta->create_task_array(id, num_task, num_param, num_inData, num_outData) ; |
2708c4a7bade
run16 word count ( not yet worked. )
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
736
diff
changeset
|
85 return ta; |
2708c4a7bade
run16 word count ( not yet worked. )
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
736
diff
changeset
|
86 } |
2708c4a7bade
run16 word count ( not yet worked. )
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
736
diff
changeset
|
87 |
3 | 88 /** |
298 | 89 * task の依存関係を設定 |
90 * master task が終わってから、slave task を実行するように | |
109 | 91 * master->wait_for(slave); |
3 | 92 */ |
93 void | |
94 TaskManagerImpl::set_task_depend(HTaskPtr master, HTaskPtr slave) | |
519 | 95 { |
3 | 96 TaskQueuePtr m, s; |
519 | 97 |
475
e083c4ff91c1
BufferManager removed.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
373
diff
changeset
|
98 m = taskQueueImpl->create(master); |
e083c4ff91c1
BufferManager removed.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
373
diff
changeset
|
99 s = taskQueueImpl->create(slave); |
519 | 100 |
479
5bda98b0b56d
Double Linked List base TaskQueue
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
475
diff
changeset
|
101 master->wait_me->addLast(s); |
5bda98b0b56d
Double Linked List base TaskQueue
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
475
diff
changeset
|
102 slave->wait_i->addLast(m); |
481
4896dffad67c
Double linked list modification done (tested on Mac OS X)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
480
diff
changeset
|
103 s->waiter = m; |
519 | 104 } |
105 | |
3 | 106 /** |
298 | 107 * タスクを実行可能キューまたは待機キューへ追加する。 |
108 * 依存関係が満たされていれば active, まだだったら wait へ。 | |
109 | 109 * task->spawn(); |
110 */ | |
3 | 111 void |
18 | 112 TaskManagerImpl::spawn_task(HTaskPtr task) |
3 | 113 { |
109 | 114 // waiter // master |
115 // waitee // slave | |
480
46464727d825
TaskQueueInfo initiaization...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
479
diff
changeset
|
116 if (task->wait_i->empty()) { |
498
cb5ecfc5aaa3
double linked HTaskInfo/HTask
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
497
diff
changeset
|
117 append_activeTask(task); |
3 | 118 } else { |
498
cb5ecfc5aaa3
double linked HTaskInfo/HTask
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
497
diff
changeset
|
119 append_waitTask(task); |
3 | 120 } |
109 | 121 |
635
8cc609285bbe
SimpleTask worked on Mac OS X
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
634
diff
changeset
|
122 // systask_finish->wait_for(task); |
3 | 123 } |
42 | 124 |
800
2708c4a7bade
run16 word count ( not yet worked. )
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
736
diff
changeset
|
125 |
109 | 126 /** |
298 | 127 * Task を実行可能キューに追加する |
109 | 128 */ |
129 void | |
498
cb5ecfc5aaa3
double linked HTaskInfo/HTask
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
497
diff
changeset
|
130 TaskManagerImpl::append_activeTask(HTaskPtr q) |
109 | 131 { |
479
5bda98b0b56d
Double Linked List base TaskQueue
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
475
diff
changeset
|
132 activeTaskQueue->addLast(q); |
109 | 133 } |
134 | |
135 /** | |
298 | 136 * タスクが実行する CPU を選択する |
109 | 137 * |
298 | 138 * 現在は CPU_PPE, CPU_SPE, SPE_ANY, SPE_0, SPE_1, ..., SPE_5 |
139 * types.h に書いてます。 | |
109 | 140 */ |
65 | 141 void |
142 TaskManagerImpl::set_task_cpu(HTaskPtr task, CPU_TYPE type) | |
143 { | |
664 | 144 if (machineNum==0) |
145 task->cpu_type = CPU_PPE ; | |
146 else | |
147 task->cpu_type = type; | |
65 | 148 } |
149 | |
940
0d404f6c36a8
unknown dead lock still...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
939
diff
changeset
|
150 #if 0 |
0d404f6c36a8
unknown dead lock still...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
939
diff
changeset
|
151 static void |
0d404f6c36a8
unknown dead lock still...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
939
diff
changeset
|
152 check_wait(TaskManagerImpl *tm, TaskQueueInfo *wait_i) { |
0d404f6c36a8
unknown dead lock still...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
939
diff
changeset
|
153 for(TaskQueue *t = wait_i->getFirst(); t; t = wait_i->getNext(t)) { |
0d404f6c36a8
unknown dead lock still...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
939
diff
changeset
|
154 if (!tm->waitTaskQueue->find(t->task)) { |
0d404f6c36a8
unknown dead lock still...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
939
diff
changeset
|
155 printf("stray waiting task%d %lx\n",t->task->command, (long)t->task); |
0d404f6c36a8
unknown dead lock still...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
939
diff
changeset
|
156 } else if (tm->activeTaskQueue->find(t->task)) { |
0d404f6c36a8
unknown dead lock still...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
939
diff
changeset
|
157 printf(" active task%d in waiting queue %lx\n",t->task->command, (long)t->task); |
0d404f6c36a8
unknown dead lock still...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
939
diff
changeset
|
158 } else |
0d404f6c36a8
unknown dead lock still...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
939
diff
changeset
|
159 printf("."); |
0d404f6c36a8
unknown dead lock still...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
939
diff
changeset
|
160 } |
0d404f6c36a8
unknown dead lock still...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
939
diff
changeset
|
161 } |
0d404f6c36a8
unknown dead lock still...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
939
diff
changeset
|
162 #endif |
0d404f6c36a8
unknown dead lock still...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
939
diff
changeset
|
163 |
109 | 164 /** |
830 | 165 * @brief 終了したタスクから依存の処理とか |
298 | 166 * post_func() はこのタスクが終了したら実行する関数。 |
109 | 167 * |
298 | 168 * @param [task] 終了したタスク |
109 | 169 */ |
170 void | |
647
7c9ded1ea750
MailManager rewrite. not yet worked.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
639
diff
changeset
|
171 TaskManagerImpl::check_task_finish(HTaskPtr me, HTaskInfo *wait_queue) |
42 | 172 { |
497 | 173 while(TaskQueue *p = me->wait_me->poll()) { |
499 | 174 HTaskPtr you = p->task; |
497 | 175 TaskQueueInfo *wait_i = you->wait_i; |
479
5bda98b0b56d
Double Linked List base TaskQueue
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
475
diff
changeset
|
176 // 相手の wait queue から自分(を指しているTaskQueue)を削除 |
5bda98b0b56d
Double Linked List base TaskQueue
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
475
diff
changeset
|
177 wait_i->remove(p->waiter); |
5bda98b0b56d
Double Linked List base TaskQueue
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
475
diff
changeset
|
178 // queue を free する |
493 | 179 wait_i->free_(p->waiter); |
483
0b933bef0328
renew task worked. but not test_nogl...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
481
diff
changeset
|
180 |
497 | 181 if (wait_i->empty()) { |
647
7c9ded1ea750
MailManager rewrite. not yet worked.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
639
diff
changeset
|
182 wait_queue->remove(you); |
499 | 183 append_activeTask(you); |
497 | 184 } |
185 | |
940
0d404f6c36a8
unknown dead lock still...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
939
diff
changeset
|
186 wait_i->free_(p); // p->wait_i, p->wait_me は再利用される |
479
5bda98b0b56d
Double Linked List base TaskQueue
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
475
diff
changeset
|
187 } |
5bda98b0b56d
Double Linked List base TaskQueue
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
475
diff
changeset
|
188 |
939 | 189 // me を誰かが持っていて、me が finish した後に、 |
190 // me->wait_for(i) とか、やられると気まずい。 | |
191 // 特に、me が他人に再利用されていると。そういう時には、 | |
192 // このfreeをコメントアウトしてみる。 | |
193 | |
194 // id かななんかでチェックした方が良いが... | |
195 | |
196 me->self = 0; | |
498
cb5ecfc5aaa3
double linked HTaskInfo/HTask
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
497
diff
changeset
|
197 htaskImpl->free_(me); |
109 | 198 } |
42 | 199 |
830 | 200 /** |
201 * @brief 終了したタスクリストの依存の処理 | |
202 * @param [task] 終了したタスク | |
203 */ | |
204 void | |
205 TaskManagerImpl::check_task_list_finish(SchedTask *s, TaskListPtr list, HTaskInfo *wait_queue) | |
206 { | |
855 | 207 for(int i = 0;i<list->length;i++) { |
831
65e9eab53f50
CheckTaskList Mail working
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
830
diff
changeset
|
208 SimpleTaskPtr task = &list->tasks[i]; |
830 | 209 HTask *me = (HTask*)task->self; |
210 me->post_func(s, me->post_arg1, me->post_arg2); | |
211 if (task->command==TaskArray1) { | |
831
65e9eab53f50
CheckTaskList Mail working
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
830
diff
changeset
|
212 int next = ((task->r_size)/sizeof(SimpleTask))+1; |
830 | 213 // assert(next<list->length); |
214 i+=next; | |
215 } | |
832
29094b48d966
poling (may recurse..)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
831
diff
changeset
|
216 s->polling(); |
830 | 217 check_task_finish(me, wait_queue); |
218 } | |
219 } | |
109 | 220 |
830 | 221 /** |
222 * @brief waitTaskqueue への挿入 。必須ではない。 | |
223 * 現状では、dead lock 検出にしか使ってない | |
224 * | |
225 * @param [task] 終了したタスク | |
226 */ | |
109 | 227 void |
498
cb5ecfc5aaa3
double linked HTaskInfo/HTask
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
497
diff
changeset
|
228 TaskManagerImpl::append_waitTask(HTaskPtr q) |
109 | 229 { |
479
5bda98b0b56d
Double Linked List base TaskQueue
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
475
diff
changeset
|
230 waitTaskQueue ->addLast(q); |
109 | 231 } |
232 | |
830 | 233 /** |
234 @brief htask を DMA でCPUに渡すための TaskList に入れる (copy) | |
235 @param htask | |
236 @param taskList | |
237 TaskList は自動的に延長される | |
238 */ | |
801 | 239 void |
240 TaskManagerImpl::set_taskList(HTaskPtr htask, TaskListInfoPtr taskList) { | |
809 | 241 TaskListPtr list ; |
242 if ( taskList->empty() ) { | |
243 list = taskList->create(); | |
244 taskList->addLast(list); | |
245 } else | |
246 list = taskList->getLast(); | |
801 | 247 SimpleTaskPtr task = &list->tasks[list->length++]; |
248 if (htask->command==TaskArray1) { | |
249 // compatibility | |
250 int next = ((htask->r_size)/sizeof(SimpleTask))+1; | |
251 if (list->length+next>=TASK_MAX_SIZE) { | |
252 list->length--; | |
809 | 253 TaskListPtr newList = taskList->create(); |
801 | 254 taskList->addLast(newList); |
255 list = newList; | |
256 task = &list->tasks[list->length++]; | |
257 } | |
258 Task *array = (Task*)&list->tasks[list->length]; | |
259 list->length += next; | |
260 if (list->length>=TASK_MAX_SIZE) { | |
261 perror("task array1 overflow\n"); | |
262 } | |
263 memcpy(array, htask->rbuf, htask->r_size); | |
264 free(htask->rbuf); | |
831
65e9eab53f50
CheckTaskList Mail working
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
830
diff
changeset
|
265 // htask->rbuf = 0; htask->r_size = 0; we need this... |
801 | 266 *task = *(SimpleTask*)htask; |
267 } else { | |
268 *task = *(SimpleTask*)htask; | |
269 } | |
270 if (list->length >= TASK_MAX_SIZE) { | |
809 | 271 TaskListPtr newList = taskList->create(); |
801 | 272 taskList->addLast(newList); |
273 list = newList; | |
274 } | |
275 } | |
276 | |
54 | 277 |
619 | 278 |
479
5bda98b0b56d
Double Linked List base TaskQueue
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
475
diff
changeset
|
279 /* end */ |