drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am cce0cd13: Merge "Looper: use pthread_once for TLS key initialization." into gingerbread

Browse Source 
Merge commit 'cce0cd138dd0dc338db59083052aca01a51bd52d' into gingerbread-plus-aosp

* commit 'cce0cd138dd0dc338db59083052aca01a51bd52d':
  Looper: use pthread_once for TLS key initialization.
This commit is contained in:
Jeff Brown
2010-09-21 15:52:09 -07:00
committed by Android Git Automerger
parent 0b2affe8f0 cce0cd138d
commit 4ec134cdba
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/utils/Looper.h
View File

@ -205,6 +205,7 @@ private:
int pollInner(int timeoutMillis); int pollInner(int timeoutMillis);
static void initTLSKey();
static void threadDestructor(void *st); static void threadDestructor(void *st);
}; };

29
libs/utils/Looper.cpp
View File

@ -24,16 +24,15 @@
namespace android { namespace android {
static pthread_mutex_t gTLSMutex = PTHREAD_MUTEX_INITIALIZER;
static bool gHaveTLS = false;
static pthread_key_t gTLS = 0;
// Hint for number of file descriptors to be associated with the epoll instance. // Hint for number of file descriptors to be associated with the epoll instance.
static const int EPOLL_SIZE_HINT = 8; static const int EPOLL_SIZE_HINT = 8;
// Maximum number of file descriptors for which to retrieve poll events each iteration. // Maximum number of file descriptors for which to retrieve poll events each iteration.
static const int EPOLL_MAX_EVENTS = 16; static const int EPOLL_MAX_EVENTS = 16;
static pthread_once_t gTLSOnce = PTHREAD_ONCE_INIT;
static pthread_key_t gTLSKey = 0;
Looper::Looper(bool allowNonCallbacks) : Looper::Looper(bool allowNonCallbacks) :
mAllowNonCallbacks(allowNonCallbacks), mAllowNonCallbacks(allowNonCallbacks),
mResponseIndex(0) { mResponseIndex(0) {
@ -56,6 +55,7 @@ Looper::Looper(bool allowNonCallbacks) :
errno); errno);
struct epoll_event eventItem; struct epoll_event eventItem;
memset(& eventItem, 0, sizeof(epoll_event)); // zero out unused members of data field union
eventItem.events = EPOLLIN; eventItem.events = EPOLLIN;
eventItem.data.fd = mWakeReadPipeFd; eventItem.data.fd = mWakeReadPipeFd;
result = epoll_ctl(mEpollFd, EPOLL_CTL_ADD, mWakeReadPipeFd, & eventItem); result = epoll_ctl(mEpollFd, EPOLL_CTL_ADD, mWakeReadPipeFd, & eventItem);
@ -69,6 +69,11 @@ Looper::~Looper() {
close(mEpollFd); close(mEpollFd);
} }
void Looper::initTLSKey() {
int result = pthread_key_create(& gTLSKey, threadDestructor);
LOG_ALWAYS_FATAL_IF(result != 0, "Could not allocate TLS key.");
}
void Looper::threadDestructor(void *st) { void Looper::threadDestructor(void *st) {
Looper* const self = static_cast<Looper*>(st); Looper* const self = static_cast<Looper*>(st);
if (self != NULL) { if (self != NULL) {
@ -83,7 +88,7 @@ void Looper::setForThread(const sp<Looper>& looper) {
looper->incStrong((void*)threadDestructor); looper->incStrong((void*)threadDestructor);
} }
pthread_setspecific(gTLS, looper.get()); pthread_setspecific(gTLSKey, looper.get());
if (old != NULL) { if (old != NULL) {
old->decStrong((void*)threadDestructor); old->decStrong((void*)threadDestructor);
@ -91,17 +96,10 @@ void Looper::setForThread(const sp<Looper>& looper) {
} }
sp<Looper> Looper::getForThread() { sp<Looper> Looper::getForThread() {
if (!gHaveTLS) { int result = pthread_once(& gTLSOnce, initTLSKey);
pthread_mutex_lock(&gTLSMutex); LOG_ALWAYS_FATAL_IF(result != 0, "pthread_once failed");
if (pthread_key_create(&gTLS, threadDestructor) != 0) {
pthread_mutex_unlock(&gTLSMutex);
return NULL;
}
gHaveTLS = true;
pthread_mutex_unlock(&gTLSMutex);
}
return (Looper*)pthread_getspecific(gTLS); return (Looper*)pthread_getspecific(gTLSKey);
} }
sp<Looper> Looper::prepare(int opts) { sp<Looper> Looper::prepare(int opts) {
@ -331,6 +329,7 @@ int Looper::addFd(int fd, int ident, int events, ALooper_callbackFunc callback,
request.data = data; request.data = data;
struct epoll_event eventItem; struct epoll_event eventItem;
memset(& eventItem, 0, sizeof(epoll_event)); // zero out unused members of data field union
eventItem.events = epollEvents; eventItem.events = epollEvents;
eventItem.data.fd = fd; eventItem.data.fd = fd;