diff --git a/include/utils/Condition.h b/include/utils/Condition.h index 8852d5333..e63ba7e69 100644 --- a/include/utils/Condition.h +++ b/include/utils/Condition.h @@ -48,6 +48,11 @@ public: SHARED = 1 }; + enum WakeUpType { + WAKE_UP_ONE = 0, + WAKE_UP_ALL = 1 + }; + Condition(); Condition(int type); ~Condition(); @@ -57,6 +62,14 @@ public: status_t waitRelative(Mutex& mutex, nsecs_t reltime); // Signal the condition variable, allowing one thread to continue. void signal(); + // Signal the condition variable, allowing one or all threads to continue. + void signal(WakeUpType type) { + if (type == WAKE_UP_ONE) { + signal(); + } else { + broadcast(); + } + } // Signal the condition variable, allowing all threads to continue. void broadcast(); diff --git a/include/utils/Thread.h b/include/utils/Thread.h index 4a34abd78..df3061135 100644 --- a/include/utils/Thread.h +++ b/include/utils/Thread.h @@ -67,6 +67,9 @@ public: // Do not call from this object's thread; will return WOULD_BLOCK in that case. status_t join(); + // Indicates whether this thread is running or not. + bool isRunning() const; + #ifdef HAVE_ANDROID_OS // Return the thread's kernel ID, same as the thread itself calling gettid() or // androidGetTid(), or -1 if the thread is not running. diff --git a/libs/utils/Threads.cpp b/libs/utils/Threads.cpp index a25a81fbe..1d61457b4 100644 --- a/libs/utils/Threads.cpp +++ b/libs/utils/Threads.cpp @@ -871,6 +871,11 @@ status_t Thread::join() return mStatus; } +bool Thread::isRunning() const { + Mutex::Autolock _l(mLock); + return mRunning; +} + #ifdef HAVE_ANDROID_OS pid_t Thread::getTid() const {