Mercurial > hg > Members > kono > Cerium
diff TaskManager/Fifo/FifoTaskManagerImpl.cc @ 635:8cc609285bbe
SimpleTask worked on Mac OS X
| author | Shinji KONO <kono@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Wed, 18 Nov 2009 18:36:25 +0900 |
| parents | 0558abba673c |
| children | 5530fa36d42e |
line wrap: on
line diff
--- a/TaskManager/Fifo/FifoTaskManagerImpl.cc Wed Nov 18 17:29:14 2009 +0900 +++ b/TaskManager/Fifo/FifoTaskManagerImpl.cc Wed Nov 18 18:36:25 2009 +0900 @@ -30,10 +30,9 @@ mailManager->init(20); scheduler = new MainScheduler(); - scheduler->init(); + scheduler->init(this); scheduler->set_mailManager(mailManager); scheduler->id = 0; - scheduler->set_manager(this); taskListImpl = new TaskListInfo; taskQueueImpl = new TaskQueueInfo; @@ -60,7 +59,7 @@ //scheduler = new MainScheduler(); scheduler = _sched; - scheduler->init(); + scheduler->init(this); scheduler->set_mailManager(mailManager); taskListImpl = tm-> taskListImpl ; @@ -224,7 +223,8 @@ void* FifoTaskManagerImpl::allocate(int size, int alignment) { -#ifdef __APPLE__ + if (size==0) return 0; +#if defined(__APPLE__) && ! defined(HAS_POSIZ_MEMALIGN) return malloc(size); #else void *buff; @@ -236,7 +236,8 @@ void* FifoTaskManagerImpl::allocate(int size) { -#ifdef __APPLE__ + if (size==0) return 0; +#if defined(__APPLE__) && ! defined(HAS_POSIZ_MEMALIGN) return malloc(size); #else void *buff;