Mercurial > hg > Game > Cerium
changeset 1452:e7be2c3f2c5c draft
fix
| author | Daichi TOMA <toma@cr.ie.u-ryukyu.ac.jp> |
|---|---|
| date | Tue, 24 Apr 2012 19:50:34 +0900 |
| parents | 7ab643c30a71 |
| children | 756470aab7b3 |
| files | TaskManager/Gpu/GpuTaskManagerImpl.h TaskManager/Gpu/GpuThreads.cc TaskManager/Gpu/GpuThreads.h TaskManager/kernel/ppe/TaskManagerImpl.h |
| diffstat | 4 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/TaskManager/Gpu/GpuTaskManagerImpl.h Tue Apr 24 19:16:44 2012 +0900 +++ b/TaskManager/Gpu/GpuTaskManagerImpl.h Tue Apr 24 19:50:34 2012 +0900 @@ -20,7 +20,6 @@ void send_taskList(); void mail_check(); - void export_task_log(){} void start_profile(){} void show_profile(){} void polling(){}
--- a/TaskManager/Gpu/GpuThreads.cc Tue Apr 24 19:16:44 2012 +0900 +++ b/TaskManager/Gpu/GpuThreads.cc Tue Apr 24 19:50:34 2012 +0900 @@ -72,7 +72,7 @@ } void -CpuThreads::send_mail(int speid, int num, memaddr *data) +GpuThreads::send_mail(int speid, int num, memaddr *data) { args->scheduler->mail_write_from_host(*data); }
--- a/TaskManager/Gpu/GpuThreads.h Tue Apr 24 19:16:44 2012 +0900 +++ b/TaskManager/Gpu/GpuThreads.h Tue Apr 24 19:50:34 2012 +0900 @@ -20,8 +20,8 @@ class GpuThreads : public Threads { public: static GpuThreads* getInstance() { - static GpuThreads* singleton = new GpuThreads(); - return singleton; + static GpuThreads singleton; + return &singleton; } ~GpuThreads();
--- a/TaskManager/kernel/ppe/TaskManagerImpl.h Tue Apr 24 19:16:44 2012 +0900 +++ b/TaskManager/kernel/ppe/TaskManagerImpl.h Tue Apr 24 19:50:34 2012 +0900 @@ -43,7 +43,7 @@ virtual void run() = 0; virtual void start_profile() = 0; virtual void show_profile() = 0; - virtual void export_task_log() = 0; + virtual void export_task_log(){} virtual void append_activeTask(HTaskPtr); virtual void append_waitTask(HTaskPtr); virtual void polling() = 0;