Mercurial > hg > Game > Cerium

changeset 1214:44d9b08519e0 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sched task fix
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Fri, 22 Jul 2011 15:32:41 +0900
parents a49c02dffe6f
children 4b85fcf3c34d
files TaskManager/Makefile.def TaskManager/kernel/schedule/SchedMail.cc TaskManager/kernel/schedule/SchedTask.cc TaskManager/kernel/schedule/SchedTaskArray.cc TaskManager/kernel/schedule/SchedTaskArrayLoad.cc TaskManager/kernel/schedule/SchedTaskArrayNop.cc TaskManager/kernel/schedule/SchedTaskList.cc example/Bulk/Makefile.def example/Simple/Makefile.macosx
diffstat 9 files changed, 13 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/TaskManager/Makefile.def	Fri Jul 22 13:25:30 2011 +0900
+++ b/TaskManager/Makefile.def	Fri Jul 22 15:32:41 2011 +0900
@@ -29,8 +29,8 @@
 
 ABIBIT = 64
 
-#OPT = -g -DMAIL_QUEUE -DNOT_CHECK #-DTASK_LIST_MAIL #-DEARLY_TOUCH -DUSE_CACHE
-OPT = -O9 -DMAIL_QUEUE -DNOT_CHECK #-DTASK_LIST_MAIL #-DEARLY_TOUCH -DUSE_CACHE 
+OPT = -g -DMAIL_QUEUE -DNOT_CHECK #-DTASK_LIST_MAIL #-DEARLY_TOUCH -DUSE_CACHE
+# OPT = -O9 -DMAIL_QUEUE -DNOT_CHECK #-DTASK_LIST_MAIL #-DEARLY_TOUCH -DUSE_CACHE 
 
 
 
--- a/TaskManager/kernel/schedule/SchedMail.cc	Fri Jul 22 13:25:30 2011 +0900
+++ b/TaskManager/kernel/schedule/SchedMail.cc	Fri Jul 22 15:32:41 2011 +0900
@@ -7,7 +7,8 @@
 SchedMail::next(Scheduler *scheduler, SchedTaskBase *p)
 {
     
-   params_addr = connector->task_list_mail_read();
+    connector = scheduler->connector;
+    params_addr = connector->task_list_mail_read();
 
     __debug("[SchedMail:%s]\n", __FUNCTION__);
 
--- a/TaskManager/kernel/schedule/SchedTask.cc	Fri Jul 22 13:25:30 2011 +0900
+++ b/TaskManager/kernel/schedule/SchedTask.cc	Fri Jul 22 15:32:41 2011 +0900
@@ -233,7 +233,7 @@
 
 void
 SchedTask::dma_load(void *buf, memaddr addr, uint32 size, uint32 mask) {
-    connector->dma_load(scheduler,buf, addr, size, mask);
+    connector->dma_load(0,buf, addr, size, mask);
 }
 
 void
--- a/TaskManager/kernel/schedule/SchedTaskArray.cc	Fri Jul 22 13:25:30 2011 +0900
+++ b/TaskManager/kernel/schedule/SchedTaskArray.cc	Fri Jul 22 15:32:41 2011 +0900
@@ -10,6 +10,7 @@
     atask = curTask_;
     array = _array;
     scheduler = s;
+    connector = s->connector;
 
     inListData.bound = 0;
     inListData.size = 0;
@@ -37,6 +38,7 @@
 {
     savedTask = savedTask_;
     scheduler = s;
+    connector = s->connector;
 
     inListData.bound = 0;
     inListData.size = 0;
@@ -64,23 +66,6 @@
 {
 }
 
-#if 0
-/**
- *  DMA buffer offset in rbuf
- */
-static void
-bound(ListData *list)
-{
-    ListElement *elm = list->element;
-    int *bound = list->bound;
-    int offset=0;
-    for(int i=0;i<list->length;i++) {
-	bound[i] = offset;
-	offset += elm[i].size;
-    }
-}
-#endif
-
 
 /**
  * Task data / code read
--- a/TaskManager/kernel/schedule/SchedTaskArrayLoad.cc	Fri Jul 22 13:25:30 2011 +0900
+++ b/TaskManager/kernel/schedule/SchedTaskArrayLoad.cc	Fri Jul 22 15:32:41 2011 +0900
@@ -7,6 +7,7 @@
 SchedTaskArrayLoad::SchedTaskArrayLoad(Scheduler *s, SchedTaskBase *savedTask_, int dma_tag_switch)
 {
     scheduler = s;
+    connector = s->connector;
     savedTask = savedTask_;
     task = savedTask->task;
     cur_index = -2;
--- a/TaskManager/kernel/schedule/SchedTaskArrayNop.cc	Fri Jul 22 13:25:30 2011 +0900
+++ b/TaskManager/kernel/schedule/SchedTaskArrayNop.cc	Fri Jul 22 15:32:41 2011 +0900
@@ -7,6 +7,7 @@
     savedTask = savedTask_;
     atask = _array;
     scheduler = s;
+    connector = s->connector;
 
     inListData.bound = 0;
     inListData.size = 0;
--- a/TaskManager/kernel/schedule/SchedTaskList.cc	Fri Jul 22 13:25:30 2011 +0900
+++ b/TaskManager/kernel/schedule/SchedTaskList.cc	Fri Jul 22 15:32:41 2011 +0900
@@ -26,7 +26,8 @@
     scheduler = sched;
     cur_index = 0;
     list = scheduler->get_curListBuf();
-    connector->dma_load(scheduler, list, params_addr,
+    connector = scheduler->connector;
+    connector->dma_load(0, list, params_addr,
                         sizeof(TaskList), DMA_READ_TASKLIST);
 
     this->tag = tag;
--- a/example/Bulk/Makefile.def	Fri Jul 22 13:25:30 2011 +0900
+++ b/example/Bulk/Makefile.def	Fri Jul 22 15:32:41 2011 +0900
@@ -11,7 +11,7 @@
 OPT = -g -O9
 CFLAGS  =  -Wall $(OPT)  
 
-ABIBIT = 32
+ABIBIT = 64
 
 #INCLUDE = -I${CERIUM}/include/TaskManager -I. -I..
 #LIBS = -L${CERIUM}/TaskManager
--- a/example/Simple/Makefile.macosx	Fri Jul 22 13:25:30 2011 +0900
+++ b/example/Simple/Makefile.macosx	Fri Jul 22 15:32:41 2011 +0900
@@ -11,7 +11,7 @@
 TASK_SRCS = $(filter-out $(TASK_DIR)/$(TASK_SRCS_EXCLUDE),$(TASK_SRCS_TMP))
 TASK_OBJS = $(TASK_SRCS:.cc=.o)
 
-LIBS += -lParallelManager `sdl-config --libs`
+LIBS += -lFifoManager `sdl-config --libs`
 CC += -m$(ABIBIT)
 
 .SUFFIXES: .cc .o