ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Mutex: add timedLock() method"

Browse source
This commit is contained in:
Jesse Hall 2015-01-07 18:01:10 +00:00 • committed by Gerrit Code Review
commit 7208a01514
1 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
include/utils/Mutex.h
View file

@ -26,6 +26,7 @@
#endif #endif
#include <utils/Errors.h> #include <utils/Errors.h>
#include <utils/Timers.h>
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
namespace android { namespace android {
@ -58,6 +59,16 @@ public:
// lock if possible; returns 0 on success, error otherwise // lock if possible; returns 0 on success, error otherwise
status_t tryLock(); status_t tryLock();
#if HAVE_ANDROID_OS
// lock the mutex, but don't wait longer than timeoutMilliseconds.
// Returns 0 on success, TIMED_OUT for failure due to timeout expiration.
//
// OSX doesn't have pthread_mutex_timedlock() or equivalent. To keep
// capabilities consistent across host OSes, this method is only available
// when building Android binaries.
status_t timedLock(nsecs_t timeoutMilliseconds);
#endif
// Manages the mutex automatically. It'll be locked when Autolock is // Manages the mutex automatically. It'll be locked when Autolock is
// constructed and released when Autolock goes out of scope. // constructed and released when Autolock goes out of scope.
class Autolock { class Autolock {
@ -117,6 +128,15 @@ inline void Mutex::unlock() {
inline status_t Mutex::tryLock() { inline status_t Mutex::tryLock() {
return -pthread_mutex_trylock(&mMutex); return -pthread_mutex_trylock(&mMutex);
} }
#if HAVE_ANDROID_OS
inline status_t Mutex::timedLock(nsecs_t timeoutNs) {
const struct timespec ts = {
/* .tv_sec = */ timeoutNs / 1000000000,
/* .tv_nsec = */ timeoutNs % 1000000000,
};
return -pthread_mutex_timedlock(&mMutex, &ts);
}
#endif
#endif // HAVE_PTHREADS #endif // HAVE_PTHREADS