Mercurial > hg > Game > Cerium
changeset 1490:5517f93e2706 draft
CellTaskManager call CpuThreads
author | Yuhi TOMARI <yuhi@cr.ie.u-ryukyu.ac.jp> |
---|---|
date | Tue, 07 Aug 2012 14:04:49 +0900 |
parents | cf475f0a9b80 |
children | fd09cdf2f531 |
files | TaskManager/Cell/CellTaskManagerImpl.cc TaskManager/Gpu/GpuThreads.cc TaskManager/Gpu/GpuThreads.h |
diffstat | 3 files changed, 5 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/TaskManager/Cell/CellTaskManagerImpl.cc Mon Aug 06 23:03:42 2012 +0900 +++ b/TaskManager/Cell/CellTaskManagerImpl.cc Tue Aug 07 14:04:49 2012 +0900 @@ -11,7 +11,9 @@ #include "MainScheduler.h" #include "types.h" #include "SysFunc.h" - +#ifdef __CERIUM_GPU__ +#include "GpuThreads.h" +#endif static void send_alloc_reply(CellTaskManagerImpl *tm, int id, Threads *speThreads); @@ -378,5 +380,3 @@ return new CellTaskManagerImpl(num, cpus); } #endif // __CERIUM_CELL - -
--- a/TaskManager/Gpu/GpuThreads.cc Mon Aug 06 23:03:42 2012 +0900 +++ b/TaskManager/Gpu/GpuThreads.cc Tue Aug 07 14:04:49 2012 +0900 @@ -31,7 +31,6 @@ pthread_create(threads, NULL, &gpu_thread_run, args); - } void *
--- a/TaskManager/Gpu/GpuThreads.h Mon Aug 06 23:03:42 2012 +0900 +++ b/TaskManager/Gpu/GpuThreads.h Tue Aug 07 14:04:49 2012 +0900 @@ -42,11 +42,8 @@ void add_output_tasklist(int command, memaddr buff, int alloc_size); void set_wait(SemPtr); - public: - - - -private: + private: + SemPtr wait; gpu_thread_arg_t *args; pthread_t *threads; int use_refdma;