diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-07-02 18:52:01 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2010-07-02 18:57:02 -0700 |
| commit | 682674154e3fe88f6061245145f934f25f1a2eb8 (patch) | |
| tree | a105ce9f0ae4d88732bfc8fb1a52d4474f17bc86 /include/utils | |
| parent | 8ecfb60a8e74dfcd51bbf3f236d5f414a4d5ac7d (diff) | |
| download | frameworks_base-682674154e3fe88f6061245145f934f25f1a2eb8.zip frameworks_base-682674154e3fe88f6061245145f934f25f1a2eb8.tar.gz frameworks_base-682674154e3fe88f6061245145f934f25f1a2eb8.tar.bz2 | |
Add new native Looper API.
This allows us to avoid exposing the file descriptor of
the event queue; instead, you attach an event queue to
a looper. This will also should allow native apps to be
written without the need for a separate thread, by attaching
the event queue to the main thread's looper and scheduling
their own messages there.
Change-Id: I38489282635895ae2cbfacb88599c1b1cad9b239
Diffstat (limited to 'include/utils')
| -rw-r--r-- | include/utils/PollLoop.h | 34 |
1 files changed, 33 insertions, 1 deletions
diff --git a/include/utils/PollLoop.h b/include/utils/PollLoop.h index a95fb17..b3651ca 100644 --- a/include/utils/PollLoop.h +++ b/include/utils/PollLoop.h @@ -22,12 +22,22 @@ #include <sys/poll.h> +#include <android/looper.h> + +struct ALooper : public android::RefBase { +protected: + virtual ~ALooper() { } + +public: + ALooper() { } +}; + namespace android { /** * A basic file descriptor polling loop based on poll() with callbacks. */ -class PollLoop : public RefBase { +class PollLoop : public ALooper { protected: virtual ~PollLoop(); @@ -83,6 +93,11 @@ public: void setCallback(int fd, int events, Callback callback, void* data = NULL); /** + * Like setCallback(), but for the NDK callback function. + */ + void setLooperCallback(int fd, int events, ALooper_callbackFunc* callback, void* data); + + /** * Removes the callback for a file descriptor, if one exists. * * When this method returns, it is safe to close the file descriptor since the poll loop @@ -100,9 +115,22 @@ public: */ bool removeCallback(int fd); + /** + * Set the given PollLoop to be associated with the + * calling thread. There must be a 1:1 relationship between + * PollLoop and thread. + */ + static void setForThread(const sp<PollLoop>& pollLoop); + + /** + * Return the PollLoop associated with the calling thread. + */ + static sp<PollLoop> getForThread(); + private: struct RequestedCallback { Callback callback; + ALooper_callbackFunc* looperCallback; void* data; }; @@ -110,6 +138,7 @@ private: int fd; int events; Callback callback; + ALooper_callbackFunc* looperCallback; void* data; }; @@ -130,8 +159,11 @@ private: void openWakePipe(); void closeWakePipe(); + void setCallbackCommon(int fd, int events, Callback callback, + ALooper_callbackFunc* looperCallback, void* data); ssize_t getRequestIndexLocked(int fd); void wakeAndLock(); + static void threadDestructor(void *st); }; } // namespace android |