RT-Thread/rt-thread
1
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2025-10-19 20:43:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix bug in Thread.cpp/Thread.h/components.c files

Browse Source
This commit is contained in:
tyustli
2019-07-27 17:33:36 +08:00
parent 5180262010
commit 85a9f5add9
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
components/cplusplus/Thread.cpp
View File

@@ -80,23 +80,23 @@ void Thread::func(Thread *pThis)
}
else
{
pThis->run();
pThis->run(pThis->_param);
}
rt_event_send(&pThis->_event, 1);
}
void Thread::run()
void Thread::run(void *parameter)
{
/* please overload this method */
}
void Thread::wait(int32_t millisec)
rt_err_t Thread::wait(int32_t millisec)
{
join(millisec);
return join(millisec);
}
void Thread::join(int32_t millisec)
rt_err_t Thread::join(int32_t millisec)
{
if (started)
{
@@ -107,6 +107,10 @@ void Thread::join(int32_t millisec)
else
tick = rt_tick_from_millisecond(millisec);
rt_event_recv(&_event, 1, RT_EVENT_FLAG_OR | RT_EVENT_FLAG_CLEAR, tick, RT_NULL);
return rt_event_recv(&_event, 1, RT_EVENT_FLAG_OR | RT_EVENT_FLAG_CLEAR, tick, RT_NULL);
}
else
{
return -RT_ENOSYS;
}
}

7
components/cplusplus/Thread.h
View File

@@ -45,16 +45,15 @@ public:
static void sleep(int32_t millisec);
void wait(int32_t millisec);
void join(int32_t millisec = -1);
rt_err_t wait(int32_t millisec);
rt_err_t join(int32_t millisec = -1);
protected:
virtual void run();
virtual void run(void *parameter);
private:
static void func(Thread *pThis);
private:
rt_thread_t _thread;
thread_func_t _entry;