repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into release
[deb_libcec.git]
/
src
/
lib
/
platform
/
threads
/
threads.h
diff --git
a/src/lib/platform/threads/threads.h
b/src/lib/platform/threads/threads.h
index f2de310a23749f7960ef3882008c61e317c5eeb9..36477708d4750e6c2e035ca739d067f06cdff26a 100644
(file)
--- a/
src/lib/platform/threads/threads.h
+++ b/
src/lib/platform/threads/threads.h
@@
-41,11
+41,15
@@
namespace PLATFORM
CThread(void) :
m_bStop(false),
m_bRunning(false),
CThread(void) :
m_bStop(false),
m_bRunning(false),
- m_bStopped(false) {}
+ m_bStopped(false),
+ m_thread(INVALID_THREAD_VALUE) {}
virtual ~CThread(void)
{
virtual ~CThread(void)
{
- StopThread();
+ StopThread(0);
+ void *retVal = NULL;
+ if (m_thread != INVALID_THREAD_VALUE)
+ ThreadsWait(m_thread, &retVal);
}
static void *ThreadHandler(CThread *thread)
}
static void *ThreadHandler(CThread *thread)
@@
-88,22
+92,26
@@
namespace PLATFORM
virtual bool CreateThread(bool bWait = true)
{
virtual bool CreateThread(bool bWait = true)
{
- bool bReturn(false);
- CLockObject lock(m_threadMutex);
- if (!IsRunning())
+ bool bReturn(false);
+ CLockObject lock(m_threadMutex);
+ if (!IsRunning())
+ {
+ m_bStop = false;
+ if (ThreadsCreate(m_thread, CThread::ThreadHandler, ((void*)static_cast<CThread *>(this))))
{
{
- m_bStop = false;
- if (ThreadsCreate(m_thread, CThread::ThreadHandler, ((void*)static_cast<CThread *>(this))))
- {
- if (bWait)
- m_threadCondition.Wait(m_threadMutex, m_bRunning);
- bReturn = true;
- }
+ if (bWait)
+ m_threadCondition.Wait(m_threadMutex, m_bRunning);
+ bReturn = true;
}
}
+ }
return bReturn;
}
return bReturn;
}
- virtual bool StopThread(bool bWaitForExit = true)
+ /*!
+ * @brief Stop the thread
+ * @param iWaitMs negative = don't wait, 0 = infinite, or the amount of ms to wait
+ */
+ virtual bool StopThread(int iWaitMs = 5000)
{
bool bReturn(true);
bool bRunning(false);
{
bool bReturn(true);
bool bRunning(false);
@@
-113,12
+121,17
@@
namespace PLATFORM
m_bStop = true;
}
m_bStop = true;
}
- if (bRunning &&
bWaitForExit
)
+ if (bRunning &&
iWaitMs >= 0
)
{
{
- void *retVal = NULL;
- bReturn = ThreadsWait(m_thread, &retVal);
+ CLockObject lock(m_threadMutex);
+ bReturn = m_threadCondition.Wait(m_threadMutex, m_bStopped, iWaitMs);
+ }
+ else
+ {
+ bReturn = true;
}
}
- return true;
+
+ return bReturn;
}
virtual bool Sleep(uint32_t iTimeout)
}
virtual bool Sleep(uint32_t iTimeout)
@@
-131,13
+144,13
@@
namespace PLATFORM
protected:
void SetRunning(bool bSetTo);
protected:
void SetRunning(bool bSetTo);
+ CMutex m_threadMutex;
private:
private:
- bool m_bStop;
- bool m_bRunning;
- bool m_bStopped;
- CCondition<bool &> m_threadCondition;
- CMutex m_threadMutex;
- thread_t m_thread;
+ bool m_bStop;
+ bool m_bRunning;
+ bool m_bStopped;
+ CCondition<bool> m_threadCondition;
+ thread_t m_thread;
};
};
};
};