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

Merge "filter sensor event by connection" into gingerbread

Browse Source
This commit is contained in:
Mathias Agopian
2010-07-22 17:23:17 -07:00
committed by Android (Google) Code Review
parent 53d4e0d58e efba8bf53a
commit 19f082ebe8
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
services/sensorservice/SensorService.cpp
View File

@ -40,7 +40,6 @@ namespace android {
/* /*
* TODO: * TODO:
* - filter events per connection
* - make sure to keep the last value of each event type so we can quickly * - make sure to keep the last value of each event type so we can quickly
* send something to application when they enable a sensor that is already * send something to application when they enable a sensor that is already
* active (the issue here is that it can take time before a value is * active (the issue here is that it can take time before a value is
@ -162,6 +161,7 @@ bool SensorService::threadLoop()
LOGD("nuSensorService thread starting..."); LOGD("nuSensorService thread starting...");
sensors_event_t buffer[16]; sensors_event_t buffer[16];
sensors_event_t scratch[16];
struct sensors_poll_device_t* device = mSensorDevice; struct sensors_poll_device_t* device = mSensorDevice;
ssize_t count; ssize_t count;
@ -177,10 +177,11 @@ bool SensorService::threadLoop()
size_t numConnections = activeConnections.size(); size_t numConnections = activeConnections.size();
if (numConnections) { if (numConnections) {
Mutex::Autolock _l(mLock);
for (size_t i=0 ; i<numConnections ; i++) { for (size_t i=0 ; i<numConnections ; i++) {
sp<SensorEventConnection> connection(activeConnections[i].promote()); sp<SensorEventConnection> connection(activeConnections[i].promote());
if (connection != 0) { if (connection != 0) {
connection->sendEvents(buffer, count); connection->sendEvents(buffer, count, scratch);
} }
} }
} }
@ -425,12 +426,23 @@ status_t SensorService::SensorEventConnection::setEventRateLocked(
} }
status_t SensorService::SensorEventConnection::sendEvents( status_t SensorService::SensorEventConnection::sendEvents(
sensors_event_t const* buffer, size_t count) sensors_event_t const* buffer, size_t numEvents,
sensors_event_t* scratch)
{ {
// TODO: we should only send the events for the sensors this connection // filter out events not for this connection
// is registered for. size_t count=0, i=0;
while (i<numEvents) {
const int32_t curr = buffer[i].sensor;
if (mSensorInfo.indexOfKey(curr) >= 0) {
do {
scratch[count++] = buffer[i++];
} while ((i<numEvents) && (buffer[i].sensor == curr));
} else {
i++;
}
}
ssize_t size = mChannel->write(buffer, count*sizeof(sensors_event_t)); ssize_t size = mChannel->write(scratch, count*sizeof(sensors_event_t));
if (size == -EAGAIN) { if (size == -EAGAIN) {
// the destination doesn't accept events anymore, it's probably // the destination doesn't accept events anymore, it's probably
// full. For now, we just drop the events on the floor. // full. For now, we just drop the events on the floor.

5
services/sensorservice/SensorService.h
View File

@ -77,8 +77,6 @@ class SensorService :
sp<SensorChannel> const mChannel; sp<SensorChannel> const mChannel;
// protected by SensorService::mLock // protected by SensorService::mLock
//SortedVector<int32_t> mSensorList;
struct SensorInfo { struct SensorInfo {
SensorInfo() : ns(DEFAULT_EVENTS_PERIOD) { } SensorInfo() : ns(DEFAULT_EVENTS_PERIOD) { }
nsecs_t ns; nsecs_t ns;
@ -88,7 +86,8 @@ class SensorService :
public: public:
SensorEventConnection(const sp<SensorService>& service); SensorEventConnection(const sp<SensorService>& service);
status_t sendEvents(sensors_event_t const* buffer, size_t count); status_t sendEvents(sensors_event_t const* buffer, size_t count,
sensors_event_t* scratch);
bool hasSensor(int32_t handle) const; bool hasSensor(int32_t handle) const;
bool hasAnySensor() const; bool hasAnySensor() const;
bool addSensor(int32_t handle); bool addSensor(int32_t handle);