Mercurial > hg > Members > kono > Cerium
changeset 80:1c648675c2bd
*** empty log message ***
| author | gongo |
|---|---|
| date | Wed, 20 Feb 2008 10:56:37 +0900 |
| parents | 83b57e03d3ef |
| children | b03a4d3565c0 |
| files | TaskManager/Cell/CellTaskManagerImpl.cc TaskManager/Changelog TaskManager/Makefile TaskManager/Makefile.cell TaskManager/Makefile.def TaskManager/Makefile.fifo TaskManager/kernel/ppe/BufferManager.cc TaskManager/kernel/ppe/HTaskInfo.cc TaskManager/kernel/ppe/TaskManager.cc TaskManager/kernel/ppe/TaskManagerImpl.cc include/TaskManager/BufferManager.h include/TaskManager/HTaskInfo.h include/TaskManager/TaskManager.h include/TaskManager/TaskManagerImpl.h |
| diffstat | 14 files changed, 51 insertions(+), 39 deletions(-) [+] |
line wrap: on
line diff
--- a/TaskManager/Cell/CellTaskManagerImpl.cc Tue Feb 19 17:28:04 2008 +0900 +++ b/TaskManager/Cell/CellTaskManagerImpl.cc Wed Feb 20 10:56:37 2008 +0900 @@ -51,7 +51,7 @@ task = &list->tasks[list->length++]; task->command = htask->command; -#if 0 +#ifndef _NO_DOUBLE_BUFFER // Fix me !!!!! // ださいというか動かないだろこれ。 // かっこいい class 判定がないものか。typeinfoだっけ？
--- a/TaskManager/Changelog Tue Feb 19 17:28:04 2008 +0900 +++ b/TaskManager/Changelog Wed Feb 20 10:56:37 2008 +0900 @@ -1,5 +1,8 @@ 2008-02-17 Wataru MIYAGUNI <gongo@cr.ie.u-ryukyu.ac.jp> + * Todo: 悩んでる所 + + * fix: kernel/ppe/HTask.cpp 今まで、manager->create_task で生成したタスクは
--- a/TaskManager/Makefile Tue Feb 19 17:28:04 2008 +0900 +++ b/TaskManager/Makefile Wed Feb 20 10:56:37 2008 +0900 @@ -16,6 +16,8 @@ distclean: clean rm -f $(TAGSFILE) + $(MAKE) -f Makefile.cell celldistclean + $(MAKE) -f Makefile.fifo fifodistclean clean: rm -f *~ \#* @@ -27,6 +29,7 @@ rm -f $(KERN_PPE_OBJS) $(KERN_SPE_OBJS) $(KERN_SCHED_OBJS) rm -f $(IMPL_FIFO_OBJS) $(IMPL_CELL_OBJS) $(MAKE) -f Makefile.cell cellclean + $(MAKE) -f Makefile.fifo fifoclean tags: $(TAGS) $(TAGSOPTION) \ No newline at end of file
--- a/TaskManager/Makefile.cell Tue Feb 19 17:28:04 2008 +0900 +++ b/TaskManager/Makefile.cell Wed Feb 20 10:56:37 2008 +0900 @@ -1,5 +1,6 @@ include ./Makefile.def +TARGET = libCellManager.a SPETARGET = libspemanager.a CELL_SPE_DIR = $(IMPL_CELL_DIR)/spe @@ -10,8 +11,6 @@ EXTRA_CFLAGS = -fno-strict-aliasing -TARGET = libCellManager.a - all: default default: $(TARGET) $(SPETARGET) @@ -28,7 +27,12 @@ $(CELL_SPE_OBJS): %.o : %.cpp $(SPUCC) $(CFLAGS) $(INCLUDE) -c $< -o $@ +celldistclean: cellclean + rm -f $(TARGET) + rm -f $(SPETARGET) + cellclean: rm -f $(CELL_SPE_OBJS) cd $(CELL_SPE_DIR); rm -f *~ \#* + rm -f $(TARGET) rm -f $(SPETARGET) \ No newline at end of file
--- a/TaskManager/Makefile.def Tue Feb 19 17:28:04 2008 +0900 +++ b/TaskManager/Makefile.def Wed Feb 20 10:56:37 2008 +0900 @@ -1,6 +1,3 @@ -TARGET = ppe-main -TARGET = libmanager.a - KERN_DIR = kernel KERN_PPE_DIR = $(KERN_DIR)/ppe @@ -24,7 +21,7 @@ IMPL_CELL_OBJS = $(IMPL_CELL_SRCS:.cpp=.o) CC = g++ -CFLAGS = -O9 -Wall -g -D_PPE_DEBUG# -DDEBUG +CFLAGS = -O9 -Wall -g -DDEBUG #-D_PPE_DEBUG# -DDEBUG LIBS = INCLUDE = -I../include/TaskManager \ No newline at end of file
--- a/TaskManager/Makefile.fifo Tue Feb 19 17:28:04 2008 +0900 +++ b/TaskManager/Makefile.fifo Wed Feb 20 10:56:37 2008 +0900 @@ -1,5 +1,8 @@ include ./Makefile.def +TARGET = libFifoManager.a + + .SUFFIXES: .cpp .o .cpp.o: @@ -10,6 +13,10 @@ ALL_OBJS = $(KERN_PPE_OBJS) $(KERN_SCHED_OBJS) $(IMPL_FIFO_OBJS) -#$(TARGET): $(KERN_PPE_OBJS) $(KERN_SPE_OBJS) $(IMPL_FIFO_OBJS) $(TARGET): $(ALL_OBJS) ar crus $@ $(ALL_OBJS) + +fifodistclean: fifoclean + rm -f $(TARGET) + +fifoclean: \ No newline at end of file
--- a/TaskManager/kernel/ppe/BufferManager.cc Tue Feb 19 17:28:04 2008 +0900 +++ b/TaskManager/kernel/ppe/BufferManager.cc Wed Feb 20 10:56:37 2008 +0900 @@ -28,8 +28,8 @@ } HTaskPtr -//BufferManager::create_task(int cmd, int siz, DmaBuffer *in, DmaBuffer *out) -BufferManager::create_task(int cmd, int siz, unsigned int in, unsigned int out) +BufferManager::create_task(int cmd, int siz, DmaBuffer *in, DmaBuffer *out) +//BufferManager::create_task(int cmd, int siz, unsigned int in, unsigned int out) { return htaskImpl->create(cmd, siz, in, out); }
--- a/TaskManager/kernel/ppe/HTaskInfo.cc Tue Feb 19 17:28:04 2008 +0900 +++ b/TaskManager/kernel/ppe/HTaskInfo.cc Wed Feb 20 10:56:37 2008 +0900 @@ -45,8 +45,8 @@ } HTaskPtr -//HTaskInfo::create(int cmd, int size, DmaBuffer *in_addr, DmaBuffer *out_addr) -HTaskInfo::create(int cmd, int size, unsigned int in_addr, unsigned int out_addr) +HTaskInfo::create(int cmd, int size, DmaBuffer *in_addr, DmaBuffer *out_addr) +//HTaskInfo::create(int cmd, int size, unsigned int in_addr, unsigned int out_addr) { HTaskPtr q;
--- a/TaskManager/kernel/ppe/TaskManager.cc Tue Feb 19 17:28:04 2008 +0900 +++ b/TaskManager/kernel/ppe/TaskManager.cc Wed Feb 20 10:56:37 2008 +0900 @@ -49,10 +49,10 @@ */ HTaskPtr -//TaskManager::create_task(int cmd, int size, DmaBuffer *in, -// DmaBuffer *out, void (*func)(void)) -TaskManager::create_task(int cmd, int size, unsigned int in, - unsigned int out, void (*func)(void)) +TaskManager::create_task(int cmd, int size, DmaBuffer *in, + DmaBuffer *out, void (*func)(void)) +//TaskManager::create_task(int cmd, int size, unsigned int in, +// unsigned int out, void (*func)(void)) { return m_impl->create_task(cmd, size, in, out, func); }
--- a/TaskManager/kernel/ppe/TaskManagerImpl.cc Tue Feb 19 17:28:04 2008 +0900 +++ b/TaskManager/kernel/ppe/TaskManagerImpl.cc Wed Feb 20 10:56:37 2008 +0900 @@ -29,10 +29,10 @@ } HTaskPtr -//TaskManagerImpl::create_task(int cmd, int size, DmaBuffer *in_addr, -// DmaBuffer *out_addr, void (*func)(void)) -TaskManagerImpl::create_task(int cmd, int size, unsigned int in_addr, - unsigned int out_addr, void (*func)(void)) +TaskManagerImpl::create_task(int cmd, int size, DmaBuffer *in_addr, + DmaBuffer *out_addr, void (*func)(void)) +//TaskManagerImpl::create_task(int cmd, int size, unsigned int in_addr, +// unsigned int out_addr, void (*func)(void)) { HTaskPtr new_task; @@ -107,7 +107,7 @@ task = &list->tasks[list->length++]; task->command = htask->command; -#if 0 +#ifndef _NO_DOUBLE_BUFFER // Fix me !!!!! // ださい // かっこいい class 判定がないものか。typeinfoだっけ？ @@ -126,13 +126,11 @@ task->in_addr = htask->in_addr; task->out_addr = htask->out_addr; #endif - task->in_size = htask->in_size; task->self = htask; bufferManager->free_taskQueue(d); } - bufferManager->activeTaskQueue = NULL; return list;
--- a/include/TaskManager/BufferManager.h Tue Feb 19 17:28:04 2008 +0900 +++ b/include/TaskManager/BufferManager.h Wed Feb 20 10:56:37 2008 +0900 @@ -45,8 +45,8 @@ virtual void init(void); TaskQueuePtr create_taskQueue(HTaskPtr); - //HTaskPtr create_task(int cmd, int siz, DmaBuffer *in, DmaBuffer *out); - HTaskPtr create_task(int cmd, int siz, unsigned int in, unsigned int out); + HTaskPtr create_task(int cmd, int siz, DmaBuffer *in, DmaBuffer *out); + //HTaskPtr create_task(int cmd, int siz, unsigned int in, unsigned int out); void free_taskQueue(TaskQueuePtr); void free_task(HTaskPtr);
--- a/include/TaskManager/HTaskInfo.h Tue Feb 19 17:28:04 2008 +0900 +++ b/include/TaskManager/HTaskInfo.h Wed Feb 20 10:56:37 2008 +0900 @@ -18,10 +18,10 @@ struct htask { int command; int in_size; - unsigned int in_addr; - unsigned int out_addr; - //DmaBuffer *in_addr; - //DmaBuffer *out_addr; + //unsigned int in_addr; + //unsigned int out_addr; + DmaBuffer *in_addr; + DmaBuffer *out_addr; TaskQueuePtr wait_me; // List of task waiting for me TaskQueuePtr wait_i; // List of task for which I am waiting void (*post_func)(void); @@ -42,8 +42,8 @@ /* functions */ int init(int num); - //HTaskPtr create(int cmd,int size,DmaBuffer *in_addr, DmaBuffer *out_addr); - HTaskPtr create(int cmd,int size, unsigned int in_addr, unsigned int out_addr); + HTaskPtr create(int cmd,int size,DmaBuffer *in_addr, DmaBuffer *out_addr); + //HTaskPtr create(int cmd,int size, unsigned int in_addr, unsigned int out_addr); void free(HTaskPtr q); private:
--- a/include/TaskManager/TaskManager.h Tue Feb 19 17:28:04 2008 +0900 +++ b/include/TaskManager/TaskManager.h Wed Feb 20 10:56:37 2008 +0900 @@ -21,10 +21,10 @@ /* functions */ void init(void); void finish(void); - //HTaskPtr create_task(int cmd, int siz, DmaBuffer *in_addr, - //DmaBuffer *out_addr, void (*func)(void)); - HTaskPtr create_task(int cmd, int siz, unsigned int in_addr, - unsigned int out_addr, void (*func)(void)); + HTaskPtr create_task(int cmd, int siz, DmaBuffer *in_addr, + DmaBuffer *out_addr, void (*func)(void)); + //HTaskPtr create_task(int cmd, int siz, unsigned int in_addr, + //unsigned int out_addr, void (*func)(void)); //void set_task_depend(HTaskPtr master, HTaskPtr slave); //void spawn_task(HTaskPtr); void run(void);
--- a/include/TaskManager/TaskManagerImpl.h Tue Feb 19 17:28:04 2008 +0900 +++ b/include/TaskManager/TaskManagerImpl.h Wed Feb 20 10:56:37 2008 +0900 @@ -31,10 +31,10 @@ void run(void); virtual MailQueuePtr mail_check(MailQueuePtr mail_list); - //HTaskPtr create_task(int cmd, int siz, DmaBuffer *in_addr, - //DmaBuffer *out_addr, void (*func)(void)); - HTaskPtr create_task(int cmd, int siz, unsigned int in_addr, - unsigned int out_addr, void (*func)(void)); + HTaskPtr create_task(int cmd, int siz, DmaBuffer *in_addr, + DmaBuffer *out_addr, void (*func)(void)); + //HTaskPtr create_task(int cmd, int siz, unsigned int in_addr, + //unsigned int out_addr, void (*func)(void)); void set_task_depend(HTaskPtr master, HTaskPtr slave); virtual TaskListPtr set_task(void); virtual void spawn_task(HTaskPtr);