annotate TaskManager/Cell/CellTaskManagerImpl.cc @ 638:671fca057ad3

hmmmm
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Thu, 19 Nov 2009 18:18:20 +0900
parents 5530fa36d42e
children a909c50081c2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
321
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
1 #define DEBUG
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
2 #include "error.h"
57
1f8a23cdeec3 *** empty log message ***
gongo
parents:
diff changeset
3 #include <stdio.h>
1f8a23cdeec3 *** empty log message ***
gongo
parents:
diff changeset
4 #include <stdlib.h>
1f8a23cdeec3 *** empty log message ***
gongo
parents:
diff changeset
5 #include <string.h>
1f8a23cdeec3 *** empty log message ***
gongo
parents:
diff changeset
6 #include "CellTaskManagerImpl.h"
476
926d6aff886c CellBufferManager removed
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 380
diff changeset
7 #include "CellTaskListInfo.h"
501
4a2c9ff53605 Cell inData/outData DMA removal
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 496
diff changeset
8 #include "HTaskInfo.h"
621
5b178db5988a Cell fix
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 620
diff changeset
9 #include "SchedTask.h"
635
8cc609285bbe SimpleTask worked on Mac OS X
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 629
diff changeset
10 #include "MainScheduler.h"
57
1f8a23cdeec3 *** empty log message ***
gongo
parents:
diff changeset
11 #include "types.h"
1f8a23cdeec3 *** empty log message ***
gongo
parents:
diff changeset
12
501
4a2c9ff53605 Cell inData/outData DMA removal
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 496
diff changeset
13 CellTaskManagerImpl::~CellTaskManagerImpl()
67
7d2874fb0671 *** empty log message ***
gongo
parents: 66
diff changeset
14 {
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
15 delete speThreads;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
16 delete [] speTaskList;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
17 delete [] speTaskList_bg;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
18 /**
321
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
19 * bufferManager は
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
20 * ppeManager のなかで delete してもらう
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
21 */
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
22 // delete bufferManager;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
23 delete [] flag_sendTaskList;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
24
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
25 delete ppeManager;
67
7d2874fb0671 *** empty log message ***
gongo
parents: 66
diff changeset
26 }
7d2874fb0671 *** empty log message ***
gongo
parents: 66
diff changeset
27
57
1f8a23cdeec3 *** empty log message ***
gongo
parents:
diff changeset
28 void
501
4a2c9ff53605 Cell inData/outData DMA removal
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 496
diff changeset
29 CellTaskManagerImpl::init()
57
1f8a23cdeec3 *** empty log message ***
gongo
parents:
diff changeset
30 {
637
5530fa36d42e not yet worked...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 635
diff changeset
31 spe_running = 0;
476
926d6aff886c CellBufferManager removed
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 380
diff changeset
32 taskListImpl = new CellTaskListInfo;
926d6aff886c CellBufferManager removed
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 380
diff changeset
33 taskListImpl->init(machineNum*2);
926d6aff886c CellBufferManager removed
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 380
diff changeset
34
501
4a2c9ff53605 Cell inData/outData DMA removal
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 496
diff changeset
35 activeTaskQueue = new HTaskInfo();
481
4896dffad67c Double linked list modification done (tested on Mac OS X)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 479
diff changeset
36
501
4a2c9ff53605 Cell inData/outData DMA removal
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 496
diff changeset
37 htaskImpl = activeTaskQueue ; // any HTaskInfo
65
519d24aa7ac8 *** empty log message ***
gongo
parents: 61
diff changeset
38
519d24aa7ac8 *** empty log message ***
gongo
parents: 61
diff changeset
39 speThreads = new SpeThreads(machineNum);
519d24aa7ac8 *** empty log message ***
gongo
parents: 61
diff changeset
40 speThreads->init();
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
41
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
42 speTaskList = new TaskListPtr[machineNum];
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
43 speTaskList_bg = new TaskListPtr[machineNum];
476
926d6aff886c CellBufferManager removed
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 380
diff changeset
44
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
45 for (int i = 0; i < machineNum; i++) {
476
926d6aff886c CellBufferManager removed
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 380
diff changeset
46 speTaskList[i] = taskListImpl->create();
926d6aff886c CellBufferManager removed
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 380
diff changeset
47 speTaskList_bg[i] = taskListImpl->create();
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
48 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
49
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
50 flag_sendTaskList = new int[machineNum];
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
51 for (int i = 0; i < machineNum; i++) {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
52 flag_sendTaskList[i] = 1;
476
926d6aff886c CellBufferManager removed
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 380
diff changeset
53 }
321
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
54 // PPE 側の管理をする Manager
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
55 ppeManager = new FifoTaskManagerImpl(machineNum);
479
5bda98b0b56d Double Linked List base TaskQueue
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 476
diff changeset
56 // 大半のTaskQueueInfoは、共有される
637
5530fa36d42e not yet worked...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 635
diff changeset
57 MainScheduler *mscheduler = new MainScheduler;
5530fa36d42e not yet worked...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 635
diff changeset
58 ppeManager->init(mscheduler, this);
619
0decff4e867b RenewTask removal
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 506
diff changeset
59
0decff4e867b RenewTask removal
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 506
diff changeset
60 ppeManager->get_scheduler()->set_manager(this);
637
5530fa36d42e not yet worked...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 635
diff changeset
61
619
0decff4e867b RenewTask removal
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 506
diff changeset
62 schedTaskManager = new SchedTask();
0decff4e867b RenewTask removal
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 506
diff changeset
63 schedTaskManager->init(0,0,0,ppeManager->get_scheduler());
57
1f8a23cdeec3 *** empty log message ***
gongo
parents:
diff changeset
64 }
1f8a23cdeec3 *** empty log message ***
gongo
parents:
diff changeset
65
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
66 void
501
4a2c9ff53605 Cell inData/outData DMA removal
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 496
diff changeset
67 CellTaskManagerImpl::append_activeTask(HTaskPtr task)
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
68 {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
69 if (task->cpu_type == CPU_PPE) {
501
4a2c9ff53605 Cell inData/outData DMA removal
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 496
diff changeset
70 ppeManager->append_activeTask(task);
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
71 } else {
501
4a2c9ff53605 Cell inData/outData DMA removal
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 496
diff changeset
72 activeTaskQueue->addLast(task);
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
73 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
74 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
75
321
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
76 // SPE_ANY が指定されていた時に
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
77 // これをインクリメントしつつ呼ぶことにする。
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
78 // 乱数使ってもいいけどさ。
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
79 int cur_anySpeid = 0;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
80
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
81 /**
321
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
82 * ActiveTaskQueue から Task を
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
83 * 各 SPE に渡す TaskList に入れる
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
84 *
321
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
85 * ここの activeTaskQueue は FifoTaskManagerImpl のと意味が違い、
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
86 * spe に渡される Task だけ入っている
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
87 */
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
88 void
501
4a2c9ff53605 Cell inData/outData DMA removal
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 496
diff changeset
89 CellTaskManagerImpl::set_runTaskList()
70
178459e03f5c *** empty log message ***
gongo
parents: 67
diff changeset
90 {
321
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
91 // ここ...直すかな
70
178459e03f5c *** empty log message ***
gongo
parents: 67
diff changeset
92 TaskListPtr list;
481
4896dffad67c Double linked list modification done (tested on Mac OS X)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 479
diff changeset
93
70
178459e03f5c *** empty log message ***
gongo
parents: 67
diff changeset
94 TaskPtr task;
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
95 int speid;
70
178459e03f5c *** empty log message ***
gongo
parents: 67
diff changeset
96
501
4a2c9ff53605 Cell inData/outData DMA removal
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 496
diff changeset
97 while (HTaskPtr htask = activeTaskQueue->poll()) {
70
178459e03f5c *** empty log message ***
gongo
parents: 67
diff changeset
98
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
99 if (htask->cpu_type == SPE_ANY) {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
100 speid = cur_anySpeid++;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
101 cur_anySpeid = (cur_anySpeid < machineNum)
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
102 ? cur_anySpeid : 0;
70
178459e03f5c *** empty log message ***
gongo
parents: 67
diff changeset
103 } else {
321
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
104 // -1 してるのは
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
105 // htask->cpu_type - CPU_SPE で
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
106 // SPE0 = 1, SPE1 = 2, ... SPE5 = 6 ってなってるので
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
107 // 配列的 (SPE0 = arr[0], SPE1 = arr[1]) にするため
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
108 speid = htask->cpu_type - CPU_SPE - 1;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
109
321
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
110 // SPU の数以上が指定されていれば
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
111 // とりあえず MAX_USE_SPE_NUM (実際に動く SPE の最大数) で
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
112 // あまり求めてそれを使うことにする。
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
113 // ここで判定するもんでもないか?
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
114 if (speid >= machineNum) {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
115 speid %= machineNum;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
116 }
70
178459e03f5c *** empty log message ***
gongo
parents: 67
diff changeset
117 }
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
118
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
119 list = speTaskList_bg[speid];
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
120
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
121 if (list->length >= TASK_MAX_SIZE) {
476
926d6aff886c CellBufferManager removed
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 380
diff changeset
122 TaskListPtr newList = taskListImpl->create();
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
123 newList = TaskListInfo::append(newList, speTaskList_bg[speid]);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
124 speTaskList_bg[speid] = newList;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
125 list = newList;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
126 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
127
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
128 task = &list->tasks[list->length++];
629
8843edf37c0e Cell 64 bit tried, but not yet worked.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 621
diff changeset
129 TaskPtr stask = (TaskPtr) task;
8843edf37c0e Cell 64 bit tried, but not yet worked.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 621
diff changeset
130 *stask = *(TaskPtr) htask;
70
178459e03f5c *** empty log message ***
gongo
parents: 67
diff changeset
131 }
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
132 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
133
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
134 void
501
4a2c9ff53605 Cell inData/outData DMA removal
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 496
diff changeset
135 CellTaskManagerImpl::run()
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
136 {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
137 TaskListPtr ppeTaskList = NULL;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
138 MailQueuePtr ppeMail = NULL;
70
178459e03f5c *** empty log message ***
gongo
parents: 67
diff changeset
139
321
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
140 // PPE 側で動く TaskList です
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
141 // FifoTaskManagerImpl::run と上手く合うように
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
142 // こんなことやってますよ
637
5530fa36d42e not yet worked...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 635
diff changeset
143 //
5530fa36d42e not yet worked...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 635
diff changeset
144 // 本来は、別 thread で動かすべきだろう...
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
145 ppeTaskList = ppeManager->get_runTaskList();
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
146 if (!ppeTaskList) {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
147 goto cont;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
148 }
70
178459e03f5c *** empty log message ***
gongo
parents: 67
diff changeset
149
321
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
150 // SPE からの Mailbox Check は
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
151 // PPE 側の schedule から抜けて来たときに行う
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
152 // (speThreads で Blocking Mailbox read と
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
153 // セマフォとか使ってやってもいいが、今はこの方式で)
637
5530fa36d42e not yet worked...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 635
diff changeset
154 //
5530fa36d42e not yet worked...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 635
diff changeset
155 // すべてのspe task が finish task を待つ場合は、ppeTaskList の
5530fa36d42e not yet worked...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 635
diff changeset
156 // 判定だけで十分だが、そうでない場合は、spe の task が残っているか
5530fa36d42e not yet worked...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 635
diff changeset
157 // どうかを調べる必要がある。
5530fa36d42e not yet worked...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 635
diff changeset
158 //
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
159 do {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
160 ppeMail = ppeManager->schedule(ppeTaskList);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
161 cont:
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
162 ppeTaskList = mail_check(ppeMail);
637
5530fa36d42e not yet worked...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 635
diff changeset
163 } while (ppeTaskList || spe_running >0);
70
178459e03f5c *** empty log message ***
gongo
parents: 67
diff changeset
164 }
178459e03f5c *** empty log message ***
gongo
parents: 67
diff changeset
165
65
519d24aa7ac8 *** empty log message ***
gongo
parents: 61
diff changeset
166 /**
321
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
167 * SPE からのメールをチェックする
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
168 *
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
169 * @param [mail_list]
321
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
170 * PPE 側で動く Scheduler からのメールリスト
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
171 * この中で PPE 側の mail check も行う
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
172 *
321
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
173 * @return PPE Scheduler に対してのメール。
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
174 * 次に実行する TaskList のアドレスや、終了コマンドを送る
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
175 */TaskListPtr
65
519d24aa7ac8 *** empty log message ***
gongo
parents: 61
diff changeset
176 CellTaskManagerImpl::mail_check(MailQueuePtr mail_list)
57
1f8a23cdeec3 *** empty log message ***
gongo
parents:
diff changeset
177 {
321
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
178 // PPE Scheduler からの mail check
485
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 484
diff changeset
179 ppeManager->mail_check(mail_list, waitTaskQueue);
65
519d24aa7ac8 *** empty log message ***
gongo
parents: 61
diff changeset
180
70
178459e03f5c *** empty log message ***
gongo
parents: 67
diff changeset
181 do {
629
8843edf37c0e Cell 64 bit tried, but not yet worked.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 621
diff changeset
182 memaddr data;
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
183
321
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
184 // SPE Scheduler からの mail check
244
59c3b9df3c67 mail modify
e065746@localhost.localdomain
parents: 109
diff changeset
185 for (int id = 0; id < machineNum; id++) {
59c3b9df3c67 mail modify
e065746@localhost.localdomain
parents: 109
diff changeset
186 while (speThreads->check_mail(id, 1, &data)) {
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
187 /**
321
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
188 * MY_SPE_STATUS_READY: SPE が持ってた Task 全て終了
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
189 * MY_SPE_NOP: 特に意味のないコマンド
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
190 * それ以外:終了したタスク(PPEにあるのでアドレス
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
191 *
321
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
192 * MY_SPE_NOP が 0 なので、
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
193 * 下のように data > MY_SPE_NOP とかしています。
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
194 * 一目でよくわからない書き方なんで、直したいところですが。。。
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
195 */
321
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
196 // 名前あとでちゃんと決めよう => MY_SPE_... とかじゃなくて
629
8843edf37c0e Cell 64 bit tried, but not yet worked.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 621
diff changeset
197 if (data == (memaddr)MY_SPE_STATUS_READY) {
334
20f2459041cb [in test_render] push L key , call show_dma_wait, but incomplete.
e065746@localhost.localdomain
parents: 321
diff changeset
198 //__debug_ppe("[SPE %d] finish\n", id);
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
199 flag_sendTaskList[id] = 1;
637
5530fa36d42e not yet worked...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 635
diff changeset
200 spe_running--;
629
8843edf37c0e Cell 64 bit tried, but not yet worked.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 621
diff changeset
201 } else if (data == (memaddr)MY_SPE_COMMAND_MALLOC) {
334
20f2459041cb [in test_render] push L key , call show_dma_wait, but incomplete.
e065746@localhost.localdomain
parents: 321
diff changeset
202 //__debug_ppe("[PPE] MALLOC COMMAND from [SPE %d]\n", id);
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
203
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
204 /**
321
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
205 * info[0] = alloc_id; (CellScheduler::mainMem_alloc 参照)
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
206 * info[1] = alloc_addr;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
207 */
629
8843edf37c0e Cell 64 bit tried, but not yet worked.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 621
diff changeset
208 memaddr alloc_info[2];
8843edf37c0e Cell 64 bit tried, but not yet worked.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 621
diff changeset
209 long alloc_size;
8843edf37c0e Cell 64 bit tried, but not yet worked.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 621
diff changeset
210 long command;
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
211
244
59c3b9df3c67 mail modify
e065746@localhost.localdomain
parents: 109
diff changeset
212 speThreads->get_mail(id, 2, alloc_info);
629
8843edf37c0e Cell 64 bit tried, but not yet worked.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 621
diff changeset
213 command = (long)alloc_info[0];
8843edf37c0e Cell 64 bit tried, but not yet worked.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 621
diff changeset
214 alloc_size = (long)alloc_info[1];
244
59c3b9df3c67 mail modify
e065746@localhost.localdomain
parents: 109
diff changeset
215
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
216
629
8843edf37c0e Cell 64 bit tried, but not yet worked.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 621
diff changeset
217 alloc_info[1] = (memaddr)allocate(alloc_size);
244
59c3b9df3c67 mail modify
e065746@localhost.localdomain
parents: 109
diff changeset
218 /*
321
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
219 * allocate された領域は今の SPE buffer にリンクとして接続する
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
220 * ここでは TaskList を allocate(new) して登録してやろうか
244
59c3b9df3c67 mail modify
e065746@localhost.localdomain
parents: 109
diff changeset
221 */
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
222
629
8843edf37c0e Cell 64 bit tried, but not yet worked.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 621
diff changeset
223 //__debug_ppe("[PPE] MALLOCED 0x%lx from [SPE %d]\n", alloc_info[1],id);
8843edf37c0e Cell 64 bit tried, but not yet worked.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 621
diff changeset
224 // 今のところ何もしてない。どうも、この allocate を free
8843edf37c0e Cell 64 bit tried, but not yet worked.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 621
diff changeset
225 // するのは、SPE task が返した値を見て行うらしい。それは、
8843edf37c0e Cell 64 bit tried, but not yet worked.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 621
diff changeset
226 // 忘れやすいのではないか?
300
0691f38195f6 remove TaskManager/Fifo/MainScheduler.o TaskManeger/Test/test_render/test_nogl
tkaito@localhost.localdomain
parents: 298
diff changeset
227 speThreads->add_output_tasklist(command, alloc_info[1], alloc_size);
273
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 271
diff changeset
228
621
5b178db5988a Cell fix
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 620
diff changeset
229 speThreads->send_mail(id, 2, alloc_info);
629
8843edf37c0e Cell 64 bit tried, but not yet worked.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 621
diff changeset
230 } else if (data > (memaddr)MY_SPE_NOP) {
334
20f2459041cb [in test_render] push L key , call show_dma_wait, but incomplete.
e065746@localhost.localdomain
parents: 321
diff changeset
231 //__debug_ppe("[PPE] recv from [SPE %d] : 0x%x\n", id, data);
619
0decff4e867b RenewTask removal
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 506
diff changeset
232 HTaskPtr task = (HTaskPtr)data;
0decff4e867b RenewTask removal
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 506
diff changeset
233 task->post_func(schedTaskManager, task->post_arg1, task->post_arg2);
0decff4e867b RenewTask removal
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 506
diff changeset
234 check_task_finish(task);
70
178459e03f5c *** empty log message ***
gongo
parents: 67
diff changeset
235 }
65
519d24aa7ac8 *** empty log message ***
gongo
parents: 61
diff changeset
236 }
519d24aa7ac8 *** empty log message ***
gongo
parents: 61
diff changeset
237 }
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
238
321
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
239 // 依存関係を満たしたタスクをアクティブに
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
240 wakeup_waitTask();
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
241
321
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
242 // SPE に送る TaskList の準備
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
243 set_runTaskList();
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
244
321
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
245 // TaskList 待ちの SPE に TaskList を送る
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
246 for (int i = 0; i < machineNum; i++) {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
247 if (flag_sendTaskList[i] == 1 && speTaskList_bg[i]->length >= 1 ) {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
248 send_taskList(i);
637
5530fa36d42e not yet worked...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 635
diff changeset
249 spe_running++;
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
250 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
251 }
70
178459e03f5c *** empty log message ***
gongo
parents: 67
diff changeset
252
321
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
253 // 現在の FifoTaskManager の仕様では
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
254 // ・PPE で実行するタスクが無くなれば終了する
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
255 // であり、この場合もし SPE にタスクが残っていても
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
256 // メインループから抜けてプログラム終了となってしまうので
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
257 // ここでストップかけてます。
481
4896dffad67c Double linked list modification done (tested on Mac OS X)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 479
diff changeset
258 } while (ppeManager->activeTaskQueue->empty() && !waitTaskQueue->empty());
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
259
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
260 return ppeManager->get_runTaskList();
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
261 }
66
1034077dd217 *** empty log message ***
gongo
parents: 65
diff changeset
262
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
263 /**
321
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
264 * 条件を満たしたら SPE に TaskList を送信する
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
265 * 条件1. SPE が持ってた TaskList を終了して、次の TaskList を待ってる
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
266 * 条件2. SPE に送る TaskList に Task がある
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
267 *
321
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
268 * SPE で実行終了した TaskList [speTaskList] と
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
269 * これから実行する TaskList [speTaskList_bg] のバッファを入れ替える
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
270 * ついでに実行終了したやつは clear しておく。
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
271 */
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
272 void
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
273 CellTaskManagerImpl::send_taskList(int id)
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
274 {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
275 TaskListPtr tmp;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
276
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
277 tmp = speTaskList[id];
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
278 speTaskList[id] = speTaskList_bg[id];
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
279 speTaskList_bg[id] = tmp;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
280
476
926d6aff886c CellBufferManager removed
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 380
diff changeset
281 taskListImpl->clear_taskList(speTaskList_bg[id]);
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
282
629
8843edf37c0e Cell 64 bit tried, but not yet worked.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 621
diff changeset
283 speThreads->send_mail(id, 1, (memaddr *)&speTaskList[id]);
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
284 flag_sendTaskList[id] = 0;
57
1f8a23cdeec3 *** empty log message ***
gongo
parents:
diff changeset
285 }
1f8a23cdeec3 *** empty log message ***
gongo
parents:
diff changeset
286
637
5530fa36d42e not yet worked...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 635
diff changeset
287 #if 0
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
288 void*
506
1d4a8a86f26b code_load in read()
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 501
diff changeset
289 CellTaskManagerImpl::allocate(int size, int alignment)
1d4a8a86f26b code_load in read()
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 501
diff changeset
290 {
635
8cc609285bbe SimpleTask worked on Mac OS X
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 629
diff changeset
291 if (size==0) return 0;
506
1d4a8a86f26b code_load in read()
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 501
diff changeset
292 void *buff;
1d4a8a86f26b code_load in read()
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 501
diff changeset
293 posix_memalign(&buff, alignment, size);
1d4a8a86f26b code_load in read()
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 501
diff changeset
294 return buff;
1d4a8a86f26b code_load in read()
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 501
diff changeset
295 }
1d4a8a86f26b code_load in read()
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 501
diff changeset
296
1d4a8a86f26b code_load in read()
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 501
diff changeset
297 void*
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
298 CellTaskManagerImpl::allocate(int size)
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
299 {
635
8cc609285bbe SimpleTask worked on Mac OS X
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 629
diff changeset
300 if (size==0) return 0;
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
301 void *buff;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
302
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
303 posix_memalign(&buff, DEFAULT_ALIGNMENT, size);
244
59c3b9df3c67 mail modify
e065746@localhost.localdomain
parents: 109
diff changeset
304
321
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
305 // bzero はコストが高いのでやりたくない
506
1d4a8a86f26b code_load in read()
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 501
diff changeset
306 // bzero(buff, size);
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
307
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
308 return buff;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
309 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
310
380
b4b8345b5366 ps3 fix
e065701@localhost.localdomain
parents: 356
diff changeset
311 Scheduler*
b4b8345b5366 ps3 fix
e065701@localhost.localdomain
parents: 356
diff changeset
312 CellTaskManagerImpl::get_scheduler()
b4b8345b5366 ps3 fix
e065701@localhost.localdomain
parents: 356
diff changeset
313 {
b4b8345b5366 ps3 fix
e065701@localhost.localdomain
parents: 356
diff changeset
314 return ppeManager->get_scheduler();
b4b8345b5366 ps3 fix
e065701@localhost.localdomain
parents: 356
diff changeset
315 }
637
5530fa36d42e not yet worked...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 635
diff changeset
316 #endif
380
b4b8345b5366 ps3 fix
e065701@localhost.localdomain
parents: 356
diff changeset
317
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
318 #ifdef __CERIUM_CELL__
57
1f8a23cdeec3 *** empty log message ***
gongo
parents:
diff changeset
319 TaskManagerImpl*
1f8a23cdeec3 *** empty log message ***
gongo
parents:
diff changeset
320 create_impl(int num)
1f8a23cdeec3 *** empty log message ***
gongo
parents:
diff changeset
321 {
67
7d2874fb0671 *** empty log message ***
gongo
parents: 66
diff changeset
322 return new CellTaskManagerImpl(num);
57
1f8a23cdeec3 *** empty log message ***
gongo
parents:
diff changeset
323 }
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents: 88
diff changeset
324 #endif // __CERIUM_CELL