Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e0b1e84 authored by Jeff Brown's avatar Jeff Brown Committed by Mathias Agopian
Browse files

Replace epoll() with poll() and rename PollLoop to Looper. 

As part of this change, consolidated and cleaned up the Looper API so
that there are fewer distinctions between the NDK and non-NDK declarations
(no need for two callback types, etc.).

Removed the dependence on specific constants from sys/poll.h such as
POLLIN.  Instead looper.h defines events like LOOPER_EVENT_INPUT for
the events that it supports.  That should help make any future
under-the-hood implementation changes easier.

Fixed a couple of compiler warnings along the way.

Change-Id: I449a7ec780bf061bdd325452f823673e2b39b6ae
parent c4a930d1

services/sensorservice/SensorService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -529,7 +529,7 @@ status_t SensorService::SensorEventConnection::sendEvents( 
    LOGE_IF(size<0, "dropping %d events on the floor (%s)",

            count, strerror(-size));



    return size < 0 ? size : NO_ERROR;

    return size < 0 ? status_t(size) : status_t(NO_ERROR);

}



sp<SensorChannel> SensorService::SensorEventConnection::getSensorChannel() const

services/sensorservice/tests/sensorservicetest.cpp

+10 −7
Original line number Diff line number Diff line
@@ -18,11 +18,11 @@ 
#include <gui/Sensor.h>

#include <gui/SensorManager.h>

#include <gui/SensorEventQueue.h>

#include <utils/PollLoop.h>

#include <utils/Looper.h>



using namespace android;



bool receiver(int fd, int events, void* data)

int receiver(int fd, int events, void* data)

{

    sp<SensorEventQueue> q((SensorEventQueue*)data);

    ssize_t n;
@@ -41,7 +41,7 @@ bool receiver(int fd, int events, void* data) 
    if (n<0 && n != -EAGAIN) {

        printf("error reading events (%s)\n", strerror(-n));

    }

    return true;

    return 1;

}
@@ -51,7 +51,7 @@ int main(int argc, char** argv) 


    Sensor const* const* list;

    ssize_t count = mgr.getSensorList(&list);

    printf("numSensors=%d\n", count);

    printf("numSensors=%d\n", int(count));



    sp<SensorEventQueue> q = mgr.createEventQueue();

    printf("queue=%p\n", q.get());
@@ -63,13 +63,16 @@ int main(int argc, char** argv) 


    q->setEventRate(accelerometer, ms2ns(10));



    sp<PollLoop> loop = new PollLoop(false);

    loop->setCallback(q->getFd(), POLLIN, receiver, q.get());

    sp<Looper> loop = new Looper(false);

    loop->addFd(q->getFd(), 0, ALOOPER_EVENT_INPUT, receiver, q.get());



    do {

        //printf("about to poll...\n");

        int32_t ret = loop->pollOnce(-1, 0, 0);

        int32_t ret = loop->pollOnce(-1);

        switch (ret) {

            case ALOOPER_POLL_WAKE:

                //("ALOOPER_POLL_WAKE\n");

                break;

            case ALOOPER_POLL_CALLBACK:

                //("ALOOPER_POLL_CALLBACK\n");

                break;