Mercurial > hg > Game > Cerium

changeset 890:a5ccf763fc3f draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
minor fix. possible schedTaskArray overrun
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Thu, 15 Jul 2010 11:59:53 +0900
parents 5f5301028e29
children 5e4962b28ceb 2faa1f62d925
files TaskManager/Makefile.def TaskManager/kernel/schedule/SchedTaskArray.h TaskManager/kernel/schedule/SchedTaskArrayLoad.h TaskManager/kernel/schedule/SchedTaskArrayNop.cc TaskManager/kernel/schedule/SchedTaskBase.h
diffstat 5 files changed, 3 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/TaskManager/Makefile.def	Thu Jul 15 00:29:52 2010 +0900
+++ b/TaskManager/Makefile.def	Thu Jul 15 11:59:53 2010 +0900
@@ -30,7 +30,7 @@
 ABIBIT = 32
 
 #OPT = -O9
-OPT =  -g # -DTASK_LIST_MAIL
+OPT =  -g -O9 -DTASK_LIST_MAIL
 
 CC     = g++   
 CFLAGS = -Wall `sdl-config --cflags` -m$(ABIBIT)   $(OPT)
--- a/TaskManager/kernel/schedule/SchedTaskArray.h	Thu Jul 15 00:29:52 2010 +0900
+++ b/TaskManager/kernel/schedule/SchedTaskArray.h	Thu Jul 15 11:59:53 2010 +0900
@@ -17,10 +17,6 @@
 
     virtual ~SchedTaskArray();
 
-
-    SchedTaskBase *savedTask;
-    Task *array;
-
 private:
     /* variables */
 
--- a/TaskManager/kernel/schedule/SchedTaskArrayLoad.h	Thu Jul 15 00:29:52 2010 +0900
+++ b/TaskManager/kernel/schedule/SchedTaskArrayLoad.h	Thu Jul 15 11:59:53 2010 +0900
@@ -13,8 +13,6 @@
 
     BASE_NEW_DELETE(SchedTaskArrayLoad);
 
-    SchedTaskBase *savedTask;
-
 private:
     /* variables */
 
--- a/TaskManager/kernel/schedule/SchedTaskArrayNop.cc	Thu Jul 15 00:29:52 2010 +0900
+++ b/TaskManager/kernel/schedule/SchedTaskArrayNop.cc	Thu Jul 15 11:59:53 2010 +0900
@@ -56,7 +56,7 @@
     savedTask ->write();
     free(atask);
     delete savedTask;
-
+    savedTask = 0;
 }
 
 SchedTaskBase*
--- a/TaskManager/kernel/schedule/SchedTaskBase.h	Thu Jul 15 00:29:52 2010 +0900
+++ b/TaskManager/kernel/schedule/SchedTaskBase.h	Thu Jul 15 11:59:53 2010 +0900
@@ -53,7 +53,7 @@
 
     memaddr params_addr;
     memaddr waiter;
-    memaddr dummy;
+    Task *array;
 
     /**
      * read データ、write 用のバッファ