annotate TaskManager/kernel/ppe/TaskManagerImpl.cc @ 115:44e3bf914155

fix Makefile
author gongo@charles.cr.ie.u-ryukyu.ac.jp
date Thu, 13 Nov 2008 10:46:36 +0900
parents 5c194c71eca8
children 29e338dbc280
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5
75f184d16fa5 *** empty log message ***
gongo
parents: 3
diff changeset
1 #include <stdio.h>
3
2356238ebea7 *** empty log message ***
gongo
parents:
diff changeset
2 #include "TaskManagerImpl.h"
46
f154d9d07a42 *** empty log message ***
gongo
parents: 42
diff changeset
3 #include "types.h"
f154d9d07a42 *** empty log message ***
gongo
parents: 42
diff changeset
4 #include "error.h"
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
5 #include "../sys_task/SysTask.h"
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
6
115
44e3bf914155 fix Makefile
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 109
diff changeset
7 //static HTaskPtr systask_start;
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
8 static HTaskPtr systask_finish;
42
aa11038dbdc1 *** empty log message ***
gongo
parents: 18
diff changeset
9
3
2356238ebea7 *** empty log message ***
gongo
parents:
diff changeset
10 void
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
11 noaction(void *p)
3
2356238ebea7 *** empty log message ***
gongo
parents:
diff changeset
12 {
2356238ebea7 *** empty log message ***
gongo
parents:
diff changeset
13 }
2356238ebea7 *** empty log message ***
gongo
parents:
diff changeset
14
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
15 TaskManagerImpl::TaskManagerImpl(int num)
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
16 : machineNum(num), activeTaskQueue(NULL), waitTaskQueue(NULL) {}
50
7927e00fb8e2 *** empty log message ***
gongo
parents: 48
diff changeset
17
42
aa11038dbdc1 *** empty log message ***
gongo
parents: 18
diff changeset
18 void
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
19 TaskManagerImpl::systask_init(void)
42
aa11038dbdc1 *** empty log message ***
gongo
parents: 18
diff changeset
20 {
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
21 systask_register();
42
aa11038dbdc1 *** empty log message ***
gongo
parents: 18
diff changeset
22
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
23 systask_finish = create_task(SYSTASK_FINISH);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
24 append_waitTask(systask_finish);
42
aa11038dbdc1 *** empty log message ***
gongo
parents: 18
diff changeset
25 }
aa11038dbdc1 *** empty log message ***
gongo
parents: 18
diff changeset
26
3
2356238ebea7 *** empty log message ***
gongo
parents:
diff changeset
27 HTaskPtr
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
28 TaskManagerImpl::create_task(int cmd)
3
2356238ebea7 *** empty log message ***
gongo
parents:
diff changeset
29 {
2356238ebea7 *** empty log message ***
gongo
parents:
diff changeset
30 HTaskPtr new_task;
2356238ebea7 *** empty log message ***
gongo
parents:
diff changeset
31
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
32 new_task = bufferManager->create_task(cmd);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
33 new_task->post_func = noaction;
63
54355e641172 *** empty log message ***
gongo
parents: 58
diff changeset
34 new_task->mimpl = this;
54355e641172 *** empty log message ***
gongo
parents: 58
diff changeset
35
3
2356238ebea7 *** empty log message ***
gongo
parents:
diff changeset
36 return new_task;
2356238ebea7 *** empty log message ***
gongo
parents:
diff changeset
37 }
2356238ebea7 *** empty log message ***
gongo
parents:
diff changeset
38
2356238ebea7 *** empty log message ***
gongo
parents:
diff changeset
39 /**
2356238ebea7 *** empty log message ***
gongo
parents:
diff changeset
40 * task の依存関係を設定
2356238ebea7 *** empty log message ***
gongo
parents:
diff changeset
41 * master task が終わってから、slave task を実行するように
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
42 * master->wait_for(slave);
3
2356238ebea7 *** empty log message ***
gongo
parents:
diff changeset
43 */
2356238ebea7 *** empty log message ***
gongo
parents:
diff changeset
44 void
2356238ebea7 *** empty log message ***
gongo
parents:
diff changeset
45 TaskManagerImpl::set_task_depend(HTaskPtr master, HTaskPtr slave)
2356238ebea7 *** empty log message ***
gongo
parents:
diff changeset
46 {
2356238ebea7 *** empty log message ***
gongo
parents:
diff changeset
47 TaskQueuePtr m, s;
2356238ebea7 *** empty log message ***
gongo
parents:
diff changeset
48
58
7492eb28b577 *** empty log message ***
gongo
parents: 54
diff changeset
49 m = bufferManager->create_taskQueue(master);
7492eb28b577 *** empty log message ***
gongo
parents: 54
diff changeset
50 s = bufferManager->create_taskQueue(slave);
3
2356238ebea7 *** empty log message ***
gongo
parents:
diff changeset
51
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
52 master->wait_me = TaskQueue::append(master->wait_me, s);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
53 slave->wait_i = TaskQueue::append(slave->wait_i, m);
3
2356238ebea7 *** empty log message ***
gongo
parents:
diff changeset
54 }
2356238ebea7 *** empty log message ***
gongo
parents:
diff changeset
55
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
56 /**
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
57 * タスクを実行可能キューまたは待機キューへ追加する。
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
58 * 依存関係が満たされていれば active, まだだったら wait へ。
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
59 * task->spawn();
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
60 */
3
2356238ebea7 *** empty log message ***
gongo
parents:
diff changeset
61 void
18
0c9341da4522 *** empty log message ***
gongo
parents: 5
diff changeset
62 TaskManagerImpl::spawn_task(HTaskPtr task)
3
2356238ebea7 *** empty log message ***
gongo
parents:
diff changeset
63 {
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
64 // waiter // master
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
65 // waitee // slave
3
2356238ebea7 *** empty log message ***
gongo
parents:
diff changeset
66 if (task->wait_i == NULL) {
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
67 append_activeTask(task);
3
2356238ebea7 *** empty log message ***
gongo
parents:
diff changeset
68 } else {
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
69 append_waitTask(task);
3
2356238ebea7 *** empty log message ***
gongo
parents:
diff changeset
70 }
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
71
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
72 systask_finish->wait_for(task);
3
2356238ebea7 *** empty log message ***
gongo
parents:
diff changeset
73 }
42
aa11038dbdc1 *** empty log message ***
gongo
parents: 18
diff changeset
74
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
75 /**
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
76 * Task を実行可能キューに追加する
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
77 */
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
78 void
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
79 TaskManagerImpl::append_activeTask(HTaskPtr task)
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
80 {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
81 TaskQueuePtr q;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
82
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
83 q = bufferManager->create_taskQueue(task);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
84 activeTaskQueue = TaskQueue::append(activeTaskQueue, q);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
85 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
86
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
87 /**
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
88 * タスクが実行する CPU を選択する
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
89 *
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
90 * 現在は CPU_PPE, CPU_SPE, SPE_ANY, SPE_0, SPE_1, ..., SPE_5
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
91 * types.h に書いてます。
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
92 */
65
519d24aa7ac8 *** empty log message ***
gongo
parents: 63
diff changeset
93 void
519d24aa7ac8 *** empty log message ***
gongo
parents: 63
diff changeset
94 TaskManagerImpl::set_task_cpu(HTaskPtr task, CPU_TYPE type)
519d24aa7ac8 *** empty log message ***
gongo
parents: 63
diff changeset
95 {
519d24aa7ac8 *** empty log message ***
gongo
parents: 63
diff changeset
96 task->cpu_type = type;
519d24aa7ac8 *** empty log message ***
gongo
parents: 63
diff changeset
97 }
519d24aa7ac8 *** empty log message ***
gongo
parents: 63
diff changeset
98
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
99 /**
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
100 * 終了したタスクから依存の処理とか
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
101 * post_func() はこのタスクが終了したら実行する関数。
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
102 * 今のところ使ってないっす
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
103 *
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
104 * @param [task] 終了したタスク
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
105 */
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
106 void
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
107 TaskManagerImpl::check_task_finish(HTaskPtr task)
42
aa11038dbdc1 *** empty log message ***
gongo
parents: 18
diff changeset
108 {
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
109 notify_wait_taskQueue(task, task->wait_me);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
110 task->post_func(task->post_arg);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
111 bufferManager->free_task(task);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
112 }
42
aa11038dbdc1 *** empty log message ***
gongo
parents: 18
diff changeset
113
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
114 /**
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
115 * 終了したタスク [depend] を待っている TaskList に
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
116 * 終わった事を知らせる(削除する
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
117 */
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
118 void
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
119 TaskManagerImpl::notify_wait_taskQueue(HTaskPtr depend, TaskQueuePtr list)
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
120 {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
121 TaskQueuePtr p;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
122 HTaskPtr task;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
123
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
124 p = list; // wait task list
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
125
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
126 while (p) {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
127 task = (HTaskPtr)p->task;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
128 task->wait_i = remove_taskQueue_eq_task(task->wait_i, depend);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
129 p = p->next;
42
aa11038dbdc1 *** empty log message ***
gongo
parents: 18
diff changeset
130 }
aa11038dbdc1 *** empty log message ***
gongo
parents: 18
diff changeset
131
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
132 remove_taskQueue_all(list);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
133 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
134
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
135 void
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
136 TaskManagerImpl::append_waitTask(HTaskPtr task)
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
137 {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
138 TaskQueuePtr q;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
139
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
140 q = bufferManager->create_taskQueue(task);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
141 waitTaskQueue = TaskQueue::append(waitTaskQueue, q);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
142 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
143
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
144 /**
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
145 * waitQueue の中で依存関係を満たしたタスクは
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
146 * activeQueue へ移す
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
147 */
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
148 void
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
149 TaskManagerImpl::wakeup_waitTask(void)
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
150 {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
151 TaskQueuePtr p, tmp;
42
aa11038dbdc1 *** empty log message ***
gongo
parents: 18
diff changeset
152
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
153 p = waitTaskQueue;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
154 while (p) {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
155 HTaskPtr task = (HTaskPtr)p->task;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
156 tmp = p;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
157 p = p->next;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
158 if (task->wait_i == NULL) {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
159 append_activeTask(task);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
160 waitTaskQueue = remove_taskQueue(waitTaskQueue, tmp);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
161 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
162 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
163 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
164
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
165 void
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
166 TaskManagerImpl::remove_taskQueue_all(TaskQueuePtr list)
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
167 {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
168 TaskQueuePtr p = list;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
169 TaskQueuePtr p1;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
170
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
171 while (p != NULL) {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
172 p1 = p->next;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
173 bufferManager->free_taskQueue(p);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
174 p = p1;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
175 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
176 }
54
90523ccc4dff *** empty log message ***
gongo
parents: 50
diff changeset
177
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
178 /**
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
179 * [list] が持つ queue->task の中に [task] と同じ奴があれば
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
180 * 削除する。まあ remove_taskQueue() の HTask で比較するverです。
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
181 * こういうのはオーバーロードでやるもんなのかな?
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
182 */
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
183 TaskQueuePtr
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
184 TaskManagerImpl::remove_taskQueue_eq_task(TaskQueuePtr list, HTaskPtr task)
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
185 {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
186 TaskQueuePtr p = list;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
187 TaskQueuePtr p1;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
188
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
189 if (p == NULL) return p;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
190
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
191 if (p->task == task) {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
192 list = list->next;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
193 bufferManager->free_taskQueue(p);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
194 } else {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
195 p1 = p->next;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
196 while (p1 && p1->task && p1->task != task) {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
197 p1 = p1->next;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
198 p = p->next;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
199 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
200 if (p1) {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
201 p->next = p1->next;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
202 bufferManager->free_taskQueue(p1);
54
90523ccc4dff *** empty log message ***
gongo
parents: 50
diff changeset
203 }
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
204 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
205
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
206 return list;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
207 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
208
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
209 TaskQueuePtr
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
210 TaskManagerImpl::remove_taskQueue(TaskQueuePtr list, TaskQueuePtr q)
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
211 {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
212 TaskQueuePtr p = list;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
213 TaskQueuePtr p1;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
214
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
215 if (!p) return p;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
216
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
217 if (p == q) {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
218 list = list->next;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
219 bufferManager->free_taskQueue(p);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
220 } else {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
221 p1 = p->next;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
222 while (p1 && p1 != q) {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
223 p1 = p1->next;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
224 p = p->next;
54
90523ccc4dff *** empty log message ***
gongo
parents: 50
diff changeset
225 }
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
226 if (p1) {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
227 p->next = p1->next;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
228 bufferManager->free_taskQueue(p1);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 94
diff changeset
229 }
46
f154d9d07a42 *** empty log message ***
gongo
parents: 42
diff changeset
230 }
42
aa11038dbdc1 *** empty log message ***
gongo
parents: 18
diff changeset
231
aa11038dbdc1 *** empty log message ***
gongo
parents: 18
diff changeset
232 return list;
aa11038dbdc1 *** empty log message ***
gongo
parents: 18
diff changeset
233 }
aa11038dbdc1 *** empty log message ***
gongo
parents: 18
diff changeset
234