# HG changeset patch
# User Shinji KONO <kono@ie.u-ryukyu.ac.jp>
# Date 1244457158 -32400
# Node ID 7075842aa15552f0ae2b5b6abe0c823d1c1e71d6
# Parent  f8184487cf2c420e836e2e4b6f7ed6913b5c196e
clean up include

diff -r f8184487cf2c -r 7075842aa155 TaskManager/ChangeLog
--- a/TaskManager/ChangeLog	Mon Jun 08 19:22:27 2009 +0900
+++ b/TaskManager/ChangeLog	Mon Jun 08 19:32:38 2009 +0900
@@ -1,3 +1,14 @@
+2009-06-8  Shinji KONO  <kono@ie.u-ryukyu.ac.jp>
+
+	SchedTask/SchedTaskImpl の分離はあんまり意味がなかった。
+	SchedTaskBase が既にあるし。
+	とりあえず、__list とかは、private にしただけ。
+	ScheTaskImple を作っても、継承してprivateにすると、
+	warning は出るが、 User Task space の名前空間は結局汚れてしまう。
+
+	delegate するべきだと思うが、SchedTaskBase でないと、
+	動かないらしい。それだと、indirect が増えるので、ちょっといや。
+
 2009-06-4  Shinji KONO  <kono@ie.u-ryukyu.ac.jp>
 
 	set_symbol は、もういらないよね?
diff -r f8184487cf2c -r 7075842aa155 include/TaskManager/BufferManager.h
--- a/include/TaskManager/BufferManager.h	Mon Jun 08 19:22:27 2009 +0900
+++ b/include/TaskManager/BufferManager.h	Mon Jun 08 19:32:38 2009 +0900
@@ -1,21 +1,10 @@
 #ifndef INCLUDED_BUFFER_MANAGER
 #define INCLUDED_BUFFER_MANAGER
 
-#ifndef INCLUDED_TYPES
-#  include "types.h"
-#endif
-
-#ifndef INCLUDED_TASK_LIST_INFO
-#  include "TaskListInfo.h"
-#endif
-
-#ifndef INCLUDED_TASK_QUEUE_INFO
-#  include "TaskQueueInfo.h"
-#endif
-
-#ifndef INCLUDED_HTASK_INFO
-#  include "HTaskInfo.h"
-#endif
+#include "types.h"
+#include "TaskListInfo.h"
+#include "TaskQueueInfo.h"
+#include "HTaskInfo.h"
 
 /*!
  *   Task Input/Output buffer manager
diff -r f8184487cf2c -r 7075842aa155 include/TaskManager/CellBufferManager.h
--- a/include/TaskManager/CellBufferManager.h	Mon Jun 08 19:22:27 2009 +0900
+++ b/include/TaskManager/CellBufferManager.h	Mon Jun 08 19:32:38 2009 +0900
@@ -1,13 +1,8 @@
 #ifndef INCLUDED_CELL_BUFFER_MANAGER
 #define INCLUDED_CELL_BUFFER_MANAGER
 
-#ifndef INCLUDED_BASE_H_
-#  include "base.h"
-#endif
-
-#ifndef INCLUDED_BUFFER_MANAGER
-#  include "BufferManager.h"
-#endif
+#include "base.h"
+#include "BufferManager.h"
 
 class CellBufferManager : public BufferManager {
 public:
diff -r f8184487cf2c -r 7075842aa155 include/TaskManager/CellDmaManager.h
--- a/include/TaskManager/CellDmaManager.h	Mon Jun 08 19:22:27 2009 +0900
+++ b/include/TaskManager/CellDmaManager.h	Mon Jun 08 19:32:38 2009 +0900
@@ -1,13 +1,8 @@
 #ifndef INCLUDED_CELL_DMA_MANAGER
 #define INCLUDED_CELL_DMA_MANAGER
 
-#ifndef INCLUDED_BASE_H_
-#  include "base.h"
-#endif
-
-#ifndef INCLUDED_DMA_MANAGER
-#  include "DmaManager.h"
-#endif
+#include "base.h"
+#include "DmaManager.h"
 
 #include <spu_mfcio.h>
 
diff -r f8184487cf2c -r 7075842aa155 include/TaskManager/CellHTaskInfo.h
--- a/include/TaskManager/CellHTaskInfo.h	Mon Jun 08 19:22:27 2009 +0900
+++ b/include/TaskManager/CellHTaskInfo.h	Mon Jun 08 19:32:38 2009 +0900
@@ -1,9 +1,7 @@
 #ifndef INCLUDED_CELL_HTASK_INFO
 #define INCLUDED_CELL_HTASK_INFO
 
-#ifndef INCLUDED_HTASK_INFO
-#  include "HTaskInfo.h"
-#endif
+#include "HTaskInfo.h"
 
 class CellHTaskInfo : public HTaskInfo {
 public:
diff -r f8184487cf2c -r 7075842aa155 include/TaskManager/CellScheduler.h
--- a/include/TaskManager/CellScheduler.h	Mon Jun 08 19:22:27 2009 +0900
+++ b/include/TaskManager/CellScheduler.h	Mon Jun 08 19:32:38 2009 +0900
@@ -1,13 +1,8 @@
 #ifndef INCLUDED_CELL_SCHEDULER
 #define INCLUDED_CELL_SCHEDULER
 
-#ifndef INCLUDED_BASE_H_
-#  include "base.h"
-#endif
-
-#ifndef INCLUDED_SCHEDULER
-#  include "Scheduler.h"
-#endif
+#include "base.h"
+#include "Scheduler.h"
 
 class CellScheduler : public Scheduler {
 public:
diff -r f8184487cf2c -r 7075842aa155 include/TaskManager/CellTaskInfo.h
--- a/include/TaskManager/CellTaskInfo.h	Mon Jun 08 19:22:27 2009 +0900
+++ b/include/TaskManager/CellTaskInfo.h	Mon Jun 08 19:32:38 2009 +0900
@@ -1,13 +1,8 @@
 #ifndef INCLUDED_CELL_TASK_INFO
 #define INCLUDED_CELL_TASK_INFO
 
-#ifndef INCLUDED_BASE_H_
-#  include "base.h"
-#endif
-
-#ifndef INCLUDED_TASK_INFO
-#  include "TaskInfo.h"
-#endif
+#include "base.h"
+#include "TaskInfo.h"
 
 class CellTaskInfo : public TaskInfo {
 public:
diff -r f8184487cf2c -r 7075842aa155 include/TaskManager/CellTaskListInfo.h
--- a/include/TaskManager/CellTaskListInfo.h	Mon Jun 08 19:22:27 2009 +0900
+++ b/include/TaskManager/CellTaskListInfo.h	Mon Jun 08 19:32:38 2009 +0900
@@ -1,9 +1,7 @@
 #ifndef INCLUDED_CELL_TASK_LIST_INFO
 #define INCLUDED_CELL_TASK_LIST_INFO
 
-#ifndef INCLUDED_TASK_LIST_INFO
-#  include "TaskListInfo.h"
-#endif
+#include "TaskListInfo.h"
 
 class CellTaskListInfo : public TaskListInfo {
 public:
diff -r f8184487cf2c -r 7075842aa155 include/TaskManager/CellTaskManagerImpl.h
--- a/include/TaskManager/CellTaskManagerImpl.h	Mon Jun 08 19:22:27 2009 +0900
+++ b/include/TaskManager/CellTaskManagerImpl.h	Mon Jun 08 19:32:38 2009 +0900
@@ -1,17 +1,9 @@
 #ifndef INCLUDED_CELL_TASK_MANAGER_IMPL
 #define INCLUDED_CELL_TASK_MANAGER_IMPL
 
-#ifndef INCLUDED_TASK_MANAGER_IMPL
-#  include "TaskManagerImpl.h"
-#endif
-
-#ifndef INCLUDED_FIFO_TASK_MANAGER_IMPL
-#  include "FifoTaskManagerImpl.h"
-#endif
-
-#ifndef INCLUDED_SPE_THREADS
-#  include "SpeThreads.h"
-#endif
+#include "TaskManagerImpl.h"
+#include "FifoTaskManagerImpl.h"
+#include "SpeThreads.h"
 
 class CellTaskManagerImpl : public TaskManagerImpl {
 public:
diff -r f8184487cf2c -r 7075842aa155 include/TaskManager/DmaBuffer.h
--- a/include/TaskManager/DmaBuffer.h	Mon Jun 08 19:22:27 2009 +0900
+++ b/include/TaskManager/DmaBuffer.h	Mon Jun 08 19:32:38 2009 +0900
@@ -1,9 +1,7 @@
 #ifndef INCLUDED_DMA_BUFFER
 #define INCLUDED_DMA_BUFFER
 
-#ifndef INCLUDED_BASE_H_
-#  include "base.h"
-#endif
+#include "base.h"
 
 class DmaBuffer {
 public:
diff -r f8184487cf2c -r 7075842aa155 include/TaskManager/DmaManager.h
--- a/include/TaskManager/DmaManager.h	Mon Jun 08 19:22:27 2009 +0900
+++ b/include/TaskManager/DmaManager.h	Mon Jun 08 19:32:38 2009 +0900
@@ -1,17 +1,9 @@
 #ifndef INCLUDED_DMA_MANAGER
 #define INCLUDED_DMA_MANAGER
 
-#ifndef INCLUDED_BASE_H_
-#  include "base.h"
-#endif
-
-#ifndef INCLUDED_LIST_DATA
-#  include "ListData.h"
-#endif
-
-#ifndef INCLUDED_TYPES
-#  include "types.h"
- #endif
+#include "base.h"
+#include "ListData.h"
+#include "types.h"
 
 enum dma_tag {
     DMA_READ  = 25,
diff -r f8184487cf2c -r 7075842aa155 include/TaskManager/FifoDmaManager.h
--- a/include/TaskManager/FifoDmaManager.h	Mon Jun 08 19:22:27 2009 +0900
+++ b/include/TaskManager/FifoDmaManager.h	Mon Jun 08 19:32:38 2009 +0900
@@ -1,17 +1,9 @@
 #ifndef INCLUDED_FIFO_DMA_MANAGER
 #define INCLUDED_FIFO_DMA_MANAGER
 
-#ifndef INCLUDED_BASE_H_
-#  include "base.h"
-#endif
-
-#ifndef INCLUDED_DMA_MANAGER
-#  include "DmaManager.h"
-#endif
-
-#ifndef INCLUDED_MAIL_MANAGER
-#  include "MailManager.h"
-#endif
+#include "base.h"
+#include "DmaManager.h"
+#include "MailManager.h"
 
 class FifoDmaManager : public DmaManager {
 public:
diff -r f8184487cf2c -r 7075842aa155 include/TaskManager/FifoTaskManagerImpl.h
--- a/include/TaskManager/FifoTaskManagerImpl.h	Mon Jun 08 19:22:27 2009 +0900
+++ b/include/TaskManager/FifoTaskManagerImpl.h	Mon Jun 08 19:32:38 2009 +0900
@@ -1,13 +1,8 @@
 #ifndef INCLUDED_FIFO_TASK_MANAGER_IMPL
 #define INCLUDED_FIFO_TASK_MANAGER_IMPL
 
-#ifndef INCLUDED_TASK_MANAGER_IMPL
-#  include "TaskManagerImpl.h"
-#endif
-
-#ifndef INCLUDED_MAIN_SCHEDULER
-#  include "MainScheduler.h"
-#endif
+#include "TaskManagerImpl.h"
+#include "MainScheduler.h"
 
 class FifoTaskManagerImpl : public TaskManagerImpl {
 public:
diff -r f8184487cf2c -r 7075842aa155 include/TaskManager/HTask.h
--- a/include/TaskManager/HTask.h	Mon Jun 08 19:22:27 2009 +0900
+++ b/include/TaskManager/HTask.h	Mon Jun 08 19:32:38 2009 +0900
@@ -1,21 +1,10 @@
 #ifndef INCLUDED_HTASK
 #define INCLUDED_HTASK
 
-#ifndef INCLUDED_BASE_H_
-#  include "base.h"
-#endif
-
-#ifndef INCLUDED_TYPES
-#  include "types.h"
-#endif
-
-#ifndef INCLUDED_TASK
-#  include "Task.h"
-#endif
-
-#ifndef INCLUDED_TASK_QUEUE_INFO
-#  include "TaskQueueInfo.h"
-#endif
+#include "base.h"
+#include "types.h"
+#include "Task.h"
+#include "TaskQueueInfo.h"
 
 class TaskManagerImpl;
 
diff -r f8184487cf2c -r 7075842aa155 include/TaskManager/HTaskInfo.h
--- a/include/TaskManager/HTaskInfo.h	Mon Jun 08 19:22:27 2009 +0900
+++ b/include/TaskManager/HTaskInfo.h	Mon Jun 08 19:32:38 2009 +0900
@@ -1,9 +1,7 @@
 #ifndef INCLUDED_HTASK_INFO
 #define INCLUDED_HTASK_INFO
 
-#ifndef INCLUDED_HTASK
-#  include "HTask.h"
-#endif
+#include "HTask.h"
 
 class HTaskInfo {
 public:
diff -r f8184487cf2c -r 7075842aa155 include/TaskManager/MainScheduler.h
--- a/include/TaskManager/MainScheduler.h	Mon Jun 08 19:22:27 2009 +0900
+++ b/include/TaskManager/MainScheduler.h	Mon Jun 08 19:32:38 2009 +0900
@@ -1,13 +1,8 @@
 #ifndef INCLUDED_MAIN_SCHEDULER
 #define INCLUDED_MAIN_SCHEDULER
 
-#ifndef INCLUDED_SCHEDULER
-#  include "Scheduler.h"
-#endif
-
-#ifndef INCLUDED_MAIL_MANAGER
-#  include "MailManager.h"
-#endif
+#include "Scheduler.h"
+#include "MailManager.h"
 
 class MainScheduler : public Scheduler {
 public:
diff -r f8184487cf2c -r 7075842aa155 include/TaskManager/PpeScheduler.h
--- a/include/TaskManager/PpeScheduler.h	Mon Jun 08 19:22:27 2009 +0900
+++ b/include/TaskManager/PpeScheduler.h	Mon Jun 08 19:32:38 2009 +0900
@@ -1,9 +1,7 @@
 #ifndef INCLUDED_PPE_SCHEDULER
 #define INCLUDED_PPE_SCHEDULER
 
-#ifndef INCLUDED_MAIN_SCHEDULER
-#  include "MainScheduler.h"
-#endif
+#include "MainScheduler.h"
 
 class PpeScheduler : public MainScheduler {
 public:
diff -r f8184487cf2c -r 7075842aa155 include/TaskManager/SchedMail.h
--- a/include/TaskManager/SchedMail.h	Mon Jun 08 19:22:27 2009 +0900
+++ b/include/TaskManager/SchedMail.h	Mon Jun 08 19:32:38 2009 +0900
@@ -1,17 +1,9 @@
 #ifndef INCLUDED_SCHED_MAIL
 #define INCLUDED_SCHED_MAIL
 
-#ifndef INCLUDED_BASE_H_
-#  include "base.h"
-#endif
-
-#ifndef INCLUDED_SCHEDULER
-#  include "Scheduler.h"
-#endif
-
-#ifndef INCLUDED_SCHED_TASK_BASE
-#  include "SchedTaskBase.h"
-#endif
+#include "base.h"
+#include "Scheduler.h"
+#include "SchedTaskBase.h"
 
 #include "error.h"
 
diff -r f8184487cf2c -r 7075842aa155 include/TaskManager/SchedNop.h
--- a/include/TaskManager/SchedNop.h	Mon Jun 08 19:22:27 2009 +0900
+++ b/include/TaskManager/SchedNop.h	Mon Jun 08 19:32:38 2009 +0900
@@ -1,17 +1,9 @@
 #ifndef INCLUDED_SCHED_NOP
 #define INCLUDED_SCHED_NOP
 
-#ifndef INCLUDED_BASE_H_
-#  include "base.h"
-#endif
-
-#ifndef INCLUDED_SCHEDULER
-#  include "Scheduler.h"
-#endif
-
-#ifndef INCLUDED_SCHED_TASK_BASE
-#  include "SchedTaskBase.h"
-#endif
+#include "base.h"
+#include "Scheduler.h"
+#include "SchedTaskBase.h"
 
 #include "error.h"
 
diff -r f8184487cf2c -r 7075842aa155 include/TaskManager/SchedNop2Ready.h
--- a/include/TaskManager/SchedNop2Ready.h	Mon Jun 08 19:22:27 2009 +0900
+++ b/include/TaskManager/SchedNop2Ready.h	Mon Jun 08 19:32:38 2009 +0900
@@ -1,21 +1,10 @@
 #ifndef INCLUDED_SCHED_NOP2READY
 #define INCLUDED_SCHED_NOP2READY
 
-#ifndef INCLUDED_BASE_H_
-#  include "base.h"
-#endif
-
-#ifndef INCLUDED_SCHEDULER
-#  include "Scheduler.h"
-#endif
-
-#ifndef INCLUDED_SCHED_TASK_BASE
-#  include "SchedTaskBase.h"
-#endif
-
-#ifndef INCLUDED_SCHED_NOP
-#  include "SchedNop.h"
-#endif
+#include "base.h"
+#include "Scheduler.h"
+#include "SchedTaskBase.h"
+#include "SchedNop.h"
 
 #include "error.h"
 
diff -r f8184487cf2c -r 7075842aa155 include/TaskManager/SchedTaskList.h
--- a/include/TaskManager/SchedTaskList.h	Mon Jun 08 19:22:27 2009 +0900
+++ b/include/TaskManager/SchedTaskList.h	Mon Jun 08 19:32:38 2009 +0900
@@ -1,17 +1,9 @@
 #ifndef INCLUDED_SCHED_TASKLIST
 #define INCLUDED_SCHED_TASKLIST
 
-#ifndef INCLUDED_BASE_H_
-#  include "base.h"
-#endif
-
-#ifndef INCLUDED_SCHEDULER
-#  include "Scheduler.h"
-#endif
-
-#ifndef INCLUDED_SCHED_TASK_BASE
-#  include "SchedTaskBase.h"
-#endif
+#include "base.h"
+#include "Scheduler.h"
+#include "SchedTaskBase.h"
 
 #include "error.h"
 
diff -r f8184487cf2c -r 7075842aa155 include/TaskManager/Task.h
--- a/include/TaskManager/Task.h	Mon Jun 08 19:22:27 2009 +0900
+++ b/include/TaskManager/Task.h	Mon Jun 08 19:32:38 2009 +0900
@@ -1,17 +1,9 @@
 #ifndef INCLUDED_TASK
 #define INCLUDED_TASK
 
-#ifndef INCLUDED_BASE_H_
-#  include "base.h"
-#endif
-
-#ifndef INCLUDED_TYPES
-#  include "types.h"
-#endif
-
-#ifndef INCLUDED_LIST_DATA
-#  include "ListData.h"
-#endif
+#include "base.h"
+#include "types.h"
+#include "ListData.h"
 
 #define MAX_PARAMS 8
 
diff -r f8184487cf2c -r 7075842aa155 include/TaskManager/TaskGroup.h
--- a/include/TaskManager/TaskGroup.h	Mon Jun 08 19:22:27 2009 +0900
+++ b/include/TaskManager/TaskGroup.h	Mon Jun 08 19:32:38 2009 +0900
@@ -1,13 +1,8 @@
 #ifndef INCLUDED_TASK_GROUP
 #define INCLUDED_TASK_GROUP
 
-#ifndef INCLUDED_BASE_H_
-#  include "base.h"
-#endif
-
-#ifndef INCLUDED_TASK_QUEUE
-#  include "TaskQueue.h"
-#endif
+#include "base.h"
+#include "TaskQueue.h"
 
 class TaskGroup {
 public:
diff -r f8184487cf2c -r 7075842aa155 include/TaskManager/TaskListInfo.h
--- a/include/TaskManager/TaskListInfo.h	Mon Jun 08 19:22:27 2009 +0900
+++ b/include/TaskManager/TaskListInfo.h	Mon Jun 08 19:32:38 2009 +0900
@@ -1,13 +1,8 @@
 #ifndef INCLUDED_TASK_LIST_INFO
 #define INCLUDED_TASK_LIST_INFO
 
-#ifndef INCLUDED_TYPES
-#  include "types.h"
-#endif
-
-#ifndef INCLUDED_TASKLIST
-#  include "TaskList.h"
-#endif
+#include "types.h"
+#include "TaskList.h"
 
 class TaskListInfo {
 public:
diff -r f8184487cf2c -r 7075842aa155 include/TaskManager/TaskManager.h
--- a/include/TaskManager/TaskManager.h	Mon Jun 08 19:22:27 2009 +0900
+++ b/include/TaskManager/TaskManager.h	Mon Jun 08 19:32:38 2009 +0900
@@ -1,13 +1,8 @@
 #ifndef INCLUDED_TASK_MANAGER
 #define INCLUDED_TASK_MANAGER
 
-#ifndef INCLUDED_TASK_MANAGER_IMPL
-#  include "TaskManagerImpl.h"
-#endif
-
-#ifndef INCLUDED_RANDOM
-#  include "Random.h"
-#endif
+#include "TaskManagerImpl.h"
+#include "Random.h"
 
 class TaskManager {
 public:
diff -r f8184487cf2c -r 7075842aa155 include/TaskManager/TaskManagerImpl.h
--- a/include/TaskManager/TaskManagerImpl.h	Mon Jun 08 19:22:27 2009 +0900
+++ b/include/TaskManager/TaskManagerImpl.h	Mon Jun 08 19:32:38 2009 +0900
@@ -1,17 +1,9 @@
 #ifndef INCLUDED_TASK_MANAGER_IMPL
 #define INCLUDED_TASK_MANAGER_IMPL
 
-#ifndef INCLUDED_MAIL_MANAGER
-#  include "MailManager.h"
-#endif
-
-#ifndef INCLUDED_BUFFER_MANAGER
-#  include "BufferManager.h"
-#endif
-
-#ifndef INCLUDED_LIST_DATA
-#  include "ListData.h"
-#endif
+#include "MailManager.h"
+#include "BufferManager.h"
+#include "ListData.h"
 
 class TaskManagerImpl {
 public:
diff -r f8184487cf2c -r 7075842aa155 include/TaskManager/TaskQueue.h
--- a/include/TaskManager/TaskQueue.h	Mon Jun 08 19:22:27 2009 +0900
+++ b/include/TaskManager/TaskQueue.h	Mon Jun 08 19:32:38 2009 +0900
@@ -1,13 +1,8 @@
 #ifndef INCLUDED_TASK_QUEUE
 #define INCLUDED_TASK_QUEUE
 
-#ifndef INCLUDED_BASE_H_
-#  include "base.h"
-#endif
-
-#ifndef INCLUDED_TASK
-#  include "Task.h"
-#endif
+#include "base.h"
+#include "Task.h"
 
 #include <stdio.h>
 
diff -r f8184487cf2c -r 7075842aa155 include/TaskManager/TaskQueueInfo.h
--- a/include/TaskManager/TaskQueueInfo.h	Mon Jun 08 19:22:27 2009 +0900
+++ b/include/TaskManager/TaskQueueInfo.h	Mon Jun 08 19:32:38 2009 +0900
@@ -1,9 +1,7 @@
 #ifndef INCLUDED_TASK_QUEUE_INFO
 #define INCLUDED_TASK_QUEUE_INFO
 
-#ifndef INCLUDED_TASK_QUEUE
-#  include "TaskQueue.h"
-#endif
+#include "TaskQueue.h"
 
 class TaskQueueInfo {
 public: