Mercurial > hg > Members > kono > Cerium

changeset 22:b7e6899ebb3b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author gongo
date Sun, 10 Feb 2008 16:51:20 +0900
parents b86782f881de
children b4f6da36607f
files TaskManager/Fifo/FifoTaskManagerImpl.cc TaskManager/Fifo/spe-main.cc TaskManager/Makefile.def TaskManager/Test/Sum/Makefile TaskManager/kernel/spe/SpeManager.cc
diffstat 5 files changed, 18 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/TaskManager/Fifo/FifoTaskManagerImpl.cc	Sun Feb 10 16:26:17 2008 +0900
+++ b/TaskManager/Fifo/FifoTaskManagerImpl.cc	Sun Feb 10 16:51:20 2008 +0900
@@ -24,21 +24,21 @@
 FifoTaskManagerImpl::set_task(void)
 {
     // ここ...直すかな
-    TaskListPtr list = taskInfo->machineTaskList[0];
-    TaskQueuePtr queue = taskInfo->activeTaskQueue;
+    TaskListPtr list;
+    TaskQueuePtr queue;
     TaskQueuePtr d;
     HTaskPtr htask;
     TaskPtr task;
 
+    queue = taskInfo->activeTaskQueue;
     if (queue == NULL) {
 	return NULL;
     }
 
-    // Fixme
-    // ここは、clear_taskList とか？
-    list->length = 0;
-
+    taskInfo->clear_taskList();
+ 
     while (queue) {
+	list = taskInfo->get_available_taskList();
 	htask = queue->task;
 	d = queue;
 	queue = queue->next;
--- a/TaskManager/Fifo/spe-main.cc	Sun Feb 10 16:26:17 2008 +0900
+++ b/TaskManager/Fifo/spe-main.cc	Sun Feb 10 16:51:20 2008 +0900
@@ -23,7 +23,9 @@
     connect->mailManager = _mailManager;
     manager->set_connect((DmaManager*)connect);
 
-    printf("[FIFO] start\n");
+#ifdef _PPE_DEBUG
+    printf("[FIFO] finish\n");
+#endif
 
     manager->init();
     manager->run();
--- a/TaskManager/Makefile.def	Sun Feb 10 16:26:17 2008 +0900
+++ b/TaskManager/Makefile.def	Sun Feb 10 16:51:20 2008 +0900
@@ -20,7 +20,7 @@
 IMPL_CELL_OBJS = $(IMPL_CELL_SRCS:.cpp=.o)
 
 CC     = g++
-CFLAGS = -Wall -g -O2 -D_PPE_DEBUG
+CFLAGS = -Wall -g -D_PPE_DEBUG
 LIBS   = 
 
 INCLUDE = -I../include/TaskManager
\ No newline at end of file
--- a/TaskManager/Test/Sum/Makefile	Sun Feb 10 16:26:17 2008 +0900
+++ b/TaskManager/Test/Sum/Makefile	Sun Feb 10 16:51:20 2008 +0900
@@ -1,7 +1,7 @@
 TARGET = main
 
 CC      = g++
-CFLAGS  = -Wall -O2 -g
+CFLAGS  = -Wall -g
 LIBS    = -L../../ -lmanager
 INCLUDE = -I../../../include/TaskManager
 
--- a/TaskManager/kernel/spe/SpeManager.cc	Sun Feb 10 16:26:17 2008 +0900
+++ b/TaskManager/kernel/spe/SpeManager.cc	Sun Feb 10 16:51:20 2008 +0900
@@ -45,12 +45,11 @@
 	readBuf[i]  = memalign(DEFAULT_ALIGNMENT, 4*1024);
 	writeBuf[i] = memalign(DEFAULT_ALIGNMENT, 4*1024);
 #else
-	listBuf[i] = new TaskList;
+	listBuf[i] = (TaskListPtr)malloc(sizeof(TaskList));
 	readBuf[i] = malloc(4*1024);
 	writeBuf[i] = malloc(4*1024);
 #endif
     }
-
     listBufFlg = 0;
     readBufFlg = 0;
     writeBufFlg = 0;
@@ -91,17 +90,12 @@
 void
 SpeManager::finish(void)
 {
-    int i;
-
-    for (i = 0; i < 2; i++) {
-#ifdef CELL
-	free(listBuf[i]);
-#else
-	delete listBuf[i];
-#endif
-	free(readBuf[i]);
-	free(writeBuf[i]);
-    }
+    free(listBuf[0]);
+    free(listBuf[1]);
+    free(readBuf[0]);
+    free(readBuf[1]);
+    free(writeBuf[0]);
+    free(writeBuf[1]);
 }
 
 TaskListPtr