libutils Condition are now PRIVATE by default
Condition must be initialized with SHARED for the old behavior, where they can be used accross processes. Updated the two places android that require SHARED conditions. PRIVATE conditions (and mutexes) use more efficient syscalls. Change-Id: I9a281a4b88206e92ac559c66554e886b9c62db3a
This commit is contained in:
@@ -209,7 +209,7 @@ inline thread_id_t getThreadId() {
|
||||
class Mutex {
|
||||
public:
|
||||
enum {
|
||||
NORMAL = 0,
|
||||
PRIVATE = 0,
|
||||
SHARED = 1
|
||||
};
|
||||
|
||||
@@ -305,7 +305,13 @@ typedef Mutex::Autolock AutoMutex;
|
||||
*/
|
||||
class Condition {
|
||||
public:
|
||||
enum {
|
||||
PRIVATE = 0,
|
||||
SHARED = 1
|
||||
};
|
||||
|
||||
Condition();
|
||||
Condition(int type);
|
||||
~Condition();
|
||||
// Wait on the condition variable. Lock the mutex before calling.
|
||||
status_t wait(Mutex& mutex);
|
||||
@@ -329,6 +335,17 @@ private:
|
||||
inline Condition::Condition() {
|
||||
pthread_cond_init(&mCond, NULL);
|
||||
}
|
||||
inline Condition::Condition(int type) {
|
||||
if (type == SHARED) {
|
||||
pthread_condattr_t attr;
|
||||
pthread_condattr_init(&attr);
|
||||
pthread_condattr_setpshared(&attr, PTHREAD_PROCESS_SHARED);
|
||||
pthread_cond_init(&mCond, &attr);
|
||||
pthread_condattr_destroy(&attr);
|
||||
} else {
|
||||
pthread_cond_init(&mCond, NULL);
|
||||
}
|
||||
}
|
||||
inline Condition::~Condition() {
|
||||
pthread_cond_destroy(&mCond);
|
||||
}
|
||||
|
||||
@@ -34,7 +34,7 @@ namespace android {
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
SharedClient::SharedClient()
|
||||
: lock(Mutex::SHARED)
|
||||
: lock(Mutex::SHARED), cv(Condition::SHARED)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@@ -983,8 +983,10 @@ void AudioTrack::AudioTrackThread::onFirstRef()
|
||||
// =========================================================================
|
||||
|
||||
audio_track_cblk_t::audio_track_cblk_t()
|
||||
: lock(Mutex::SHARED), user(0), server(0), userBase(0), serverBase(0), buffers(0), frameCount(0),
|
||||
loopStart(UINT_MAX), loopEnd(UINT_MAX), loopCount(0), volumeLR(0), flowControlFlag(1), forceReady(0)
|
||||
: lock(Mutex::SHARED), cv(Condition::SHARED), user(0), server(0),
|
||||
userBase(0), serverBase(0), buffers(0), frameCount(0),
|
||||
loopStart(UINT_MAX), loopEnd(UINT_MAX), loopCount(0), volumeLR(0),
|
||||
flowControlFlag(1), forceReady(0)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user