ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 4 Pull Requests Releases Wiki Activity

am a1205f07: am 2d3739d4: Merge "Modify native ALooper to take an explicit ident." into gingerbread

Browse Source 
Merge commit 'a1205f07a6f0c745e8f42f16fe38c06af04143c7'

* commit 'a1205f07a6f0c745e8f42f16fe38c06af04143c7':
  Modify native ALooper to take an explicit ident.
This commit is contained in:
Dianne Hackborn 2010-09-07 18:52:06 -07:00 committed by Android Git Automerger
commit c946422d58
3 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/utils/PollLoop.h
View File

@ -111,12 +111,18 @@ public:
* This method can be called on any thread. * This method can be called on any thread.
* This method may block briefly if it needs to wake the poll loop. * This method may block briefly if it needs to wake the poll loop.
*/ */
void setCallback(int fd, int events, Callback callback, void* data = NULL); void setCallback(int fd, int ident, int events, Callback callback, void* data = NULL);
/**
* Convenience for above setCallback when ident is not used. In this case
* the ident is set to POLL_CALLBACK.
*/
void setCallback(int fd, int events, Callback callback, void* data = NULL);
/** /**
* Like setCallback(), but for the NDK callback function. * Like setCallback(), but for the NDK callback function.
*/ */
void setLooperCallback(int fd, int events, ALooper_callbackFunc* callback, void setLooperCallback(int fd, int ident, int events, ALooper_callbackFunc* callback,
void* data); void* data);
/** /**
@ -153,11 +159,13 @@ private:
struct RequestedCallback { struct RequestedCallback {
Callback callback; Callback callback;
ALooper_callbackFunc* looperCallback; ALooper_callbackFunc* looperCallback;
int ident;
void* data; void* data;
}; };
struct PendingCallback { struct PendingCallback {
int fd; int fd;
int ident;
int events; int events;
Callback callback; Callback callback;
ALooper_callbackFunc* looperCallback; ALooper_callbackFunc* looperCallback;
@ -185,7 +193,7 @@ private:
void openWakePipe(); void openWakePipe();
void closeWakePipe(); void closeWakePipe();
void setCallbackCommon(int fd, int events, Callback callback, void setCallbackCommon(int fd, int ident, int events, Callback callback,
ALooper_callbackFunc* looperCallback, void* data); ALooper_callbackFunc* looperCallback, void* data);
ssize_t getRequestIndexLocked(int fd); ssize_t getRequestIndexLocked(int fd);
void wakeAndLock(); void wakeAndLock();

2
libs/gui/SensorEventQueue.cpp
View File

@ -86,7 +86,7 @@ sp<PollLoop> SensorEventQueue::getPollLoop() const
Mutex::Autolock _l(mLock); Mutex::Autolock _l(mLock);
if (mPollLoop == 0) { if (mPollLoop == 0) {
mPollLoop = new PollLoop(true); mPollLoop = new PollLoop(true);
mPollLoop->setCallback(getFd(), POLLIN, NULL, NULL); mPollLoop->setCallback(getFd(), getFd(), POLLIN, NULL, NULL);
} }
return mPollLoop; return mPollLoop;
} }

19
libs/utils/PollLoop.cpp
View File

@ -95,6 +95,7 @@ void PollLoop::openWakePipe() {
RequestedCallback requestedCallback; RequestedCallback requestedCallback;
requestedCallback.callback = NULL; requestedCallback.callback = NULL;
requestedCallback.looperCallback = NULL; requestedCallback.looperCallback = NULL;
requestedCallback.ident = 0;
requestedCallback.data = NULL; requestedCallback.data = NULL;
mRequestedCallbacks.insertAt(requestedCallback, 0); mRequestedCallbacks.insertAt(requestedCallback, 0);
} }
@ -116,7 +117,7 @@ int32_t PollLoop::pollOnce(int timeoutMillis, int* outEvents, void** outData) {
mPendingFdsPos++; mPendingFdsPos++;
if (outEvents != NULL) *outEvents = pending.events; if (outEvents != NULL) *outEvents = pending.events;
if (outData != NULL) *outData = pending.data; if (outData != NULL) *outData = pending.data;
return pending.fd; return pending.ident;
} }
mLock.lock(); mLock.lock();
@ -182,6 +183,7 @@ int32_t PollLoop::pollOnce(int timeoutMillis, int* outEvents, void** outData) {
const RequestedCallback& requestedCallback = mRequestedCallbacks.itemAt(i); const RequestedCallback& requestedCallback = mRequestedCallbacks.itemAt(i);
PendingCallback pending; PendingCallback pending;
pending.fd = requestedFd.fd; pending.fd = requestedFd.fd;
pending.ident = requestedCallback.ident;
pending.events = revents; pending.events = revents;
pending.callback = requestedCallback.callback; pending.callback = requestedCallback.callback;
pending.looperCallback = requestedCallback.looperCallback; pending.looperCallback = requestedCallback.looperCallback;
@ -191,7 +193,7 @@ int32_t PollLoop::pollOnce(int timeoutMillis, int* outEvents, void** outData) {
mPendingCallbacks.push(pending); mPendingCallbacks.push(pending);
} else if (pending.fd != mWakeReadPipeFd) { } else if (pending.fd != mWakeReadPipeFd) {
if (result == POLL_CALLBACK) { if (result == POLL_CALLBACK) {
result = pending.fd; result = pending.ident;
if (outEvents != NULL) *outEvents = pending.events; if (outEvents != NULL) *outEvents = pending.events;
if (outData != NULL) *outData = pending.data; if (outData != NULL) *outData = pending.data;
} else { } else {
@ -268,16 +270,20 @@ bool PollLoop::getAllowNonCallbacks() const {
return mAllowNonCallbacks; return mAllowNonCallbacks;
} }
void PollLoop::setCallback(int fd, int ident, int events, Callback callback, void* data) {
setCallbackCommon(fd, ident, events, callback, NULL, data);
}
void PollLoop::setCallback(int fd, int events, Callback callback, void* data) { void PollLoop::setCallback(int fd, int events, Callback callback, void* data) {
setCallbackCommon(fd, events, callback, NULL, data); setCallbackCommon(fd, POLL_CALLBACK, events, callback, NULL, data);
} }
void PollLoop::setLooperCallback(int fd, int events, ALooper_callbackFunc* callback, void PollLoop::setLooperCallback(int fd, int ident, int events, ALooper_callbackFunc* callback,
void* data) { void* data) {
setCallbackCommon(fd, events, NULL, callback, data); setCallbackCommon(fd, ident, events, NULL, callback, data);
} }
void PollLoop::setCallbackCommon(int fd, int events, Callback callback, void PollLoop::setCallbackCommon(int fd, int ident, int events, Callback callback,
ALooper_callbackFunc* looperCallback, void* data) { ALooper_callbackFunc* looperCallback, void* data) {
#if DEBUG_CALLBACKS #if DEBUG_CALLBACKS
@ -305,6 +311,7 @@ void PollLoop::setCallbackCommon(int fd, int events, Callback callback,
RequestedCallback requestedCallback; RequestedCallback requestedCallback;
requestedCallback.callback = callback; requestedCallback.callback = callback;
requestedCallback.looperCallback = looperCallback; requestedCallback.looperCallback = looperCallback;
requestedCallback.ident = ident;
requestedCallback.data = data; requestedCallback.data = data;
ssize_t index = getRequestIndexLocked(fd); ssize_t index = getRequestIndexLocked(fd);