Merge "SensorService fixes." into lmp-dev
diff --git a/include/gui/SensorEventQueue.h b/include/gui/SensorEventQueue.h
index 4e8a2d2..019308d 100644
--- a/include/gui/SensorEventQueue.h
+++ b/include/gui/SensorEventQueue.h
@@ -27,7 +27,7 @@
#include <gui/BitTube.h>
// ----------------------------------------------------------------------------
-#define WAKE_UP_SENSOR_EVENT_NEEDS_ACK (1 << 31)
+#define WAKE_UP_SENSOR_EVENT_NEEDS_ACK (1U << 31)
struct ALooper;
struct ASensorEvent;
diff --git a/services/sensorservice/SensorDevice.cpp b/services/sensorservice/SensorDevice.cpp
index 3934509..80845a2 100644
--- a/services/sensorservice/SensorDevice.cpp
+++ b/services/sensorservice/SensorDevice.cpp
@@ -54,6 +54,11 @@
SENSORS_HARDWARE_MODULE_ID, strerror(-err));
if (mSensorDevice) {
+ if (mSensorDevice->common.version == SENSORS_DEVICE_API_VERSION_1_1 ||
+ mSensorDevice->common.version == SENSORS_DEVICE_API_VERSION_1_2) {
+ ALOGE(">>>> WARNING <<< Upgrade sensor HAL to version 1_3");
+ }
+
sensor_t const* list;
ssize_t count = mSensorModule->get_sensors_list(mSensorModule, &list);
mActivationCount.setCapacity(count);
@@ -74,6 +79,7 @@
sensor_t const* list;
ssize_t count = mSensorModule->get_sensors_list(mSensorModule, &list);
+ result.appendFormat("halVersion %d\n", getHalDeviceVersion());
result.appendFormat("%d h/w sensors:\n", int(count));
Mutex::Autolock _l(mLock);
@@ -210,24 +216,8 @@
}
const int halVersion = getHalDeviceVersion();
- if (halVersion >= SENSORS_DEVICE_API_VERSION_1_1) {
- if (flags & SENSORS_BATCH_DRY_RUN) {
- return mSensorDevice->batch(mSensorDevice, handle, flags, samplingPeriodNs,
- maxBatchReportLatencyNs);
- } else {
- // Call h/w with dry run to see if the given parameters are feasible or not. Return if
- // there is an error.
- status_t errDryRun(NO_ERROR);
- errDryRun = mSensorDevice->batch(mSensorDevice, handle, flags | SENSORS_BATCH_DRY_RUN,
- samplingPeriodNs, maxBatchReportLatencyNs);
- if (errDryRun != NO_ERROR) {
- ALOGD_IF(DEBUG_CONNECTIONS, "SensorDevice::batch dry run error %s",
- strerror(-errDryRun));
- return errDryRun;
- }
- }
- } else if (maxBatchReportLatencyNs != 0) {
- // Batch is not supported on older devices.
+ if (halVersion < SENSORS_DEVICE_API_VERSION_1_1 && maxBatchReportLatencyNs != 0) {
+ // Batch is not supported on older devices return invalid operation.
return INVALID_OPERATION;
}
diff --git a/services/sensorservice/SensorService.cpp b/services/sensorservice/SensorService.cpp
index 8fe79d0..bee5062 100644
--- a/services/sensorservice/SensorService.cpp
+++ b/services/sensorservice/SensorService.cpp
@@ -218,69 +218,85 @@
const Sensor& s(mSensorList[i]);
const sensors_event_t& e(mLastEventSeen.valueFor(s.getHandle()));
result.appendFormat(
- "%-48s| %-32s| %-48s| 0x%08x | \"%s\"\n\t",
+ "%-15s| %-10s| %-20s| 0x%08x | \"%s\" | type=%d |",
s.getName().string(),
s.getVendor().string(),
s.getStringType().string(),
s.getHandle(),
- s.getRequiredPermission().string());
+ s.getRequiredPermission().string(),
+ s.getType());
const int reportingMode = s.getReportingMode();
if (reportingMode == AREPORTING_MODE_CONTINUOUS) {
- result.append("continuous |");
+ result.append(" continuous | ");
} else if (reportingMode == AREPORTING_MODE_ON_CHANGE) {
- result.append("on-change | ");
+ result.append(" on-change | ");
} else if (reportingMode == AREPORTING_MODE_ONE_SHOT) {
- result.append("one-shot | ");
+ result.append(" one-shot | ");
} else {
- result.append("special-trigger | ");
+ result.append(" special-trigger | ");
+ }
+
+ if (s.getMaxDelay() > 0) {
+ result.appendFormat("minRate=%.2fHz | ", 1e6f / s.getMaxDelay());
+ } else {
+ result.appendFormat("maxDelay=%dus |", s.getMaxDelay());
}
if (s.getMinDelay() > 0) {
- result.appendFormat("maxRate=%7.2fHz | ", 1e6f / s.getMinDelay());
+ result.appendFormat("maxRate=%.2fHz | ", 1e6f / s.getMinDelay());
} else {
- result.appendFormat("minDelay=%5dus |", s.getMinDelay());
+ result.appendFormat("minDelay=%dus |", s.getMinDelay());
}
if (s.getFifoMaxEventCount() > 0) {
result.appendFormat("FifoMax=%d events | ",
s.getFifoMaxEventCount());
} else {
- result.append("no batching support | ");
+ result.append("no batching | ");
+ }
+
+ if (s.isWakeUpSensor()) {
+ result.appendFormat("wakeUp | ");
+ } else {
+ result.appendFormat("non-wakeUp | ");
}
switch (s.getType()) {
case SENSOR_TYPE_ROTATION_VECTOR:
case SENSOR_TYPE_GEOMAGNETIC_ROTATION_VECTOR:
result.appendFormat(
- "last=<%5.1f,%5.1f,%5.1f,%5.1f,%5.1f>\n",
- e.data[0], e.data[1], e.data[2], e.data[3], e.data[4]);
+ "last=<%5.1f,%5.1f,%5.1f,%5.1f,%5.1f, %" PRId64 ">\n",
+ e.data[0], e.data[1], e.data[2], e.data[3], e.data[4], e.timestamp);
break;
case SENSOR_TYPE_MAGNETIC_FIELD_UNCALIBRATED:
case SENSOR_TYPE_GYROSCOPE_UNCALIBRATED:
result.appendFormat(
- "last=<%5.1f,%5.1f,%5.1f,%5.1f,%5.1f,%5.1f>\n",
- e.data[0], e.data[1], e.data[2], e.data[3], e.data[4], e.data[5]);
+ "last=<%5.1f,%5.1f,%5.1f,%5.1f,%5.1f,%5.1f, %" PRId64 ">\n",
+ e.data[0], e.data[1], e.data[2], e.data[3], e.data[4], e.data[5],
+ e.timestamp);
break;
case SENSOR_TYPE_GAME_ROTATION_VECTOR:
result.appendFormat(
- "last=<%5.1f,%5.1f,%5.1f,%5.1f>\n",
- e.data[0], e.data[1], e.data[2], e.data[3]);
+ "last=<%5.1f,%5.1f,%5.1f,%5.1f, %" PRId64 ">\n",
+ e.data[0], e.data[1], e.data[2], e.data[3], e.timestamp);
break;
case SENSOR_TYPE_SIGNIFICANT_MOTION:
case SENSOR_TYPE_STEP_DETECTOR:
- result.appendFormat( "last=<%f>\n", e.data[0]);
+ result.appendFormat( "last=<%f %" PRId64 ">\n", e.data[0], e.timestamp);
break;
case SENSOR_TYPE_STEP_COUNTER:
- result.appendFormat( "last=<%" PRIu64 ">\n", e.u64.step_counter);
+ result.appendFormat( "last=<%" PRIu64 ", %" PRId64 ">\n", e.u64.step_counter,
+ e.timestamp);
break;
default:
// default to 3 values
result.appendFormat(
- "last=<%5.1f,%5.1f,%5.1f>\n",
- e.data[0], e.data[1], e.data[2]);
+ "last=<%5.1f,%5.1f,%5.1f, %" PRId64 ">\n",
+ e.data[0], e.data[1], e.data[2], e.timestamp);
break;
}
+ result.append("\n");
}
SensorFusion::getInstance().dump(result);
SensorDevice::getInstance().dump(result);
@@ -294,7 +310,8 @@
mActiveSensors.valueAt(i)->getNumConnections());
}
- result.appendFormat("%zu Max Socket Buffer size\n", mSocketBufferSize);
+ result.appendFormat("Max Socket Buffer size = %d events\n",
+ mSocketBufferSize/sizeof(sensors_event_t));
result.appendFormat("WakeLock Status: %s \n", mWakeLockAcquired ? "acquired" : "not held");
result.appendFormat("%zd active connections\n", mActiveConnections.size());
@@ -520,6 +537,11 @@
return sensor != NULL && sensor->getSensor().isWakeUpSensor();
}
+
+SensorService::SensorRecord * SensorService::getSensorRecord(int handle) {
+ return mActiveSensors.valueFor(handle);
+}
+
Vector<Sensor> SensorService::getSensorList()
{
char value[PROPERTY_VALUE_MAX];
@@ -658,18 +680,20 @@
samplingPeriodNs = minDelayNs;
}
- ALOGD_IF(DEBUG_CONNECTIONS, "Calling batch handle==%d flags=%d rate=%" PRId64 " timeout== %" PRId64,
+ ALOGD_IF(DEBUG_CONNECTIONS, "Calling batch handle==%d flags=%d"
+ "rate=%" PRId64 " timeout== %" PRId64"",
handle, reservedFlags, samplingPeriodNs, maxBatchReportLatencyNs);
status_t err = sensor->batch(connection.get(), handle, reservedFlags, samplingPeriodNs,
maxBatchReportLatencyNs);
- if (err == NO_ERROR) {
- connection->setFirstFlushPending(handle, true);
+
+ if (err == NO_ERROR && sensor->getSensor().getReportingMode() != AREPORTING_MODE_ONE_SHOT) {
status_t err_flush = sensor->flush(connection.get(), handle);
// Flush may return error if the sensor is not activated or the underlying h/w sensor does
// not support flush.
- if (err_flush != NO_ERROR) {
- connection->setFirstFlushPending(handle, false);
+ if (err_flush == NO_ERROR) {
+ connection->setFirstFlushPending(handle, true);
+ rec->addPendingFlushConnection(connection.get());
}
}
@@ -775,7 +799,13 @@
ALOGE("flush called on a one-shot sensor");
return INVALID_OPERATION;
}
- return sensor->flush(connection.get(), handle);
+
+ status_t ret = sensor->flush(connection.get(), handle);
+ if (ret == NO_ERROR) {
+ SensorRecord* rec = mActiveSensors.valueFor(handle);
+ if (rec != NULL) rec->addPendingFlushConnection(connection);
+ }
+ return ret;
}
@@ -823,6 +853,7 @@
mWakeLockAcquired = false;
}
}
+
// ---------------------------------------------------------------------------
SensorService::SensorRecord::SensorRecord(
const sp<SensorEventConnection>& connection)
@@ -847,9 +878,37 @@
if (index >= 0) {
mConnections.removeItemsAt(index, 1);
}
+ // Remove this connections from the queue of flush() calls made on this sensor.
+ for (Vector< wp<SensorEventConnection> >::iterator it =
+ mPendingFlushConnections.begin(); it != mPendingFlushConnections.end();) {
+ if (it->unsafe_get() == connection.unsafe_get()) {
+ it = mPendingFlushConnections.erase(it);
+ } else {
+ ++it;
+ }
+ }
return mConnections.size() ? false : true;
}
+void SensorService::SensorRecord::addPendingFlushConnection(
+ const sp<SensorEventConnection>& connection) {
+ mPendingFlushConnections.add(connection);
+}
+
+void SensorService::SensorRecord::removeFirstPendingFlushConnection() {
+ if (mPendingFlushConnections.size() > 0) {
+ mPendingFlushConnections.removeAt(0);
+ }
+}
+
+SensorService::SensorEventConnection *
+SensorService::SensorRecord::getFirstPendingFlushConnection() {
+ if (mPendingFlushConnections.size() > 0) {
+ return mPendingFlushConnections[0].unsafe_get();
+ }
+ return NULL;
+}
+
// ---------------------------------------------------------------------------
SensorService::SensorEventConnection::SensorEventConnection(
@@ -890,13 +949,13 @@
result.appendFormat("\t %d WakeLockRefCount \n", mWakeLockRefCount);
for (size_t i = 0; i < mSensorInfo.size(); ++i) {
const FlushInfo& flushInfo = mSensorInfo.valueAt(i);
- result.appendFormat("\t %s | status: %s | pending flush events %d | flush calls %d| uid %d|"
+ result.appendFormat("\t %s 0x%08x | status: %s | pending flush events %d | uid %d|"
"cache size: %d max cache size %d\n",
mService->getSensorName(mSensorInfo.keyAt(i)).string(),
+ mSensorInfo.keyAt(i),
flushInfo.mFirstFlushPending ? "First flush pending" :
"active",
flushInfo.mPendingFlushEventsToSend,
- flushInfo.mNumFlushCalls,
mUid,
mCacheSize,
mMaxCacheSize);
@@ -905,7 +964,7 @@
mEventsReceived,
mEventsSent,
mEventsSentFromCache,
- mEventsReceived - (mEventsSentFromCache +
+ mEventsReceived - (mEventsSentFromCache
mEventsSent + mCacheSize));
#endif
@@ -961,15 +1020,15 @@
if (scratch) {
size_t i=0;
while (i<numEvents) {
- int32_t curr = buffer[i].sensor;
+ int32_t sensor_handle = buffer[i].sensor;
if (buffer[i].type == SENSOR_TYPE_META_DATA) {
ALOGD_IF(DEBUG_CONNECTIONS, "flush complete event sensor==%d ",
buffer[i].meta_data.sensor);
- // Setting curr to the correct sensor to ensure the sensor events per connection are
+ // Setting sensor_handle to the correct sensor to ensure the sensor events per connection are
// filtered correctly. buffer[i].sensor is zero for meta_data events.
- curr = buffer[i].meta_data.sensor;
+ sensor_handle = buffer[i].meta_data.sensor;
}
- ssize_t index = mSensorInfo.indexOfKey(curr);
+ ssize_t index = mSensorInfo.indexOfKey(sensor_handle);
// Check if this connection has registered for this sensor. If not continue to the
// next sensor_event.
if (index < 0) {
@@ -977,16 +1036,16 @@
continue;
}
- // Check if there is a pending flush_complete event for this sensor on this connection.
FlushInfo& flushInfo = mSensorInfo.editValueAt(index);
- if (buffer[i].type == SENSOR_TYPE_META_DATA) {
- if (flushInfo.mFirstFlushPending == true) {
- // This is the first flush before activate is called. Events can now be sent for
- // this sensor on this connection.
- ALOGD_IF(DEBUG_CONNECTIONS, "First flush event for sensor==%d ",
- buffer[i].meta_data.sensor);
+ // Check if there is a pending flush_complete event for this sensor on this connection.
+ if (buffer[i].type == SENSOR_TYPE_META_DATA && flushInfo.mFirstFlushPending == true) {
+ SensorService::SensorRecord *rec = mService->getSensorRecord(sensor_handle);
+ if (rec && rec->getFirstPendingFlushConnection() == this) {
+ rec->removeFirstPendingFlushConnection();
flushInfo.mFirstFlushPending = false;
++i;
+ ALOGD_IF(DEBUG_CONNECTIONS, "First flush event for sensor==%d ",
+ buffer[i].meta_data.sensor);
continue;
}
}
@@ -1000,26 +1059,28 @@
do {
if (buffer[i].type == SENSOR_TYPE_META_DATA) {
- // Send flush complete event only if flush() has been explicitly called by
- // this app else ignore.
- if (flushInfo.mNumFlushCalls > 0) {
+ // Check if this connection has called flush() on this sensor. Only if
+ // a flush() has been explicitly called, send a flush_complete_event.
+ SensorService::SensorRecord *rec = mService->getSensorRecord(sensor_handle);
+ if (rec && rec->getFirstPendingFlushConnection() == this) {
+ rec->removeFirstPendingFlushConnection();
scratch[count++] = buffer[i];
- flushInfo.mNumFlushCalls--;
}
++i;
} else {
// Regular sensor event, just copy it to the scratch buffer.
scratch[count++] = buffer[i++];
}
- } while ((i<numEvents) && ((buffer[i].sensor == curr) ||
+ } while ((i<numEvents) && ((buffer[i].sensor == sensor_handle) ||
(buffer[i].type == SENSOR_TYPE_META_DATA &&
- buffer[i].meta_data.sensor == curr)));
+ buffer[i].meta_data.sensor == sensor_handle)));
}
} else {
scratch = const_cast<sensors_event_t *>(buffer);
count = numEvents;
}
+ sendPendingFlushEventsLocked();
// Early return if there are no events for this connection.
if (count == 0) {
return status_t(NO_ERROR);
@@ -1035,6 +1096,12 @@
memcpy(&mEventCache[mCacheSize], scratch, count * sizeof(sensors_event_t));
mCacheSize += count;
} else {
+ // Check if any new sensors have registered on this connection which may have increased
+ // the max cache size that is desired.
+ if (mCacheSize + count < computeMaxCacheSizeLocked()) {
+ reAllocateCacheLocked(scratch, count);
+ return status_t(NO_ERROR);
+ }
// Some events need to be dropped.
int remaningCacheSize = mMaxCacheSize - mCacheSize;
if (remaningCacheSize != 0) {
@@ -1054,15 +1121,22 @@
return status_t(NO_ERROR);
}
- int numWakeUpSensorEvents = countWakeUpSensorEventsLocked(scratch, count);
- mWakeLockRefCount += numWakeUpSensorEvents;
+ int index_wake_up_event = findWakeUpSensorEventLocked(scratch, count);
+ if (index_wake_up_event >= 0) {
+ scratch[index_wake_up_event].flags |= WAKE_UP_SENSOR_EVENT_NEEDS_ACK;
+ ++mWakeLockRefCount;
+ }
// NOTE: ASensorEvent and sensors_event_t are the same type.
ssize_t size = SensorEventQueue::write(mChannel,
reinterpret_cast<ASensorEvent const*>(scratch), count);
if (size < 0) {
// Write error, copy events to local cache.
- mWakeLockRefCount -= numWakeUpSensorEvents;
+ if (index_wake_up_event >= 0) {
+ // If there was a wake_up sensor_event, reset the flag.
+ scratch[index_wake_up_event].flags &= ~WAKE_UP_SENSOR_EVENT_NEEDS_ACK;
+ --mWakeLockRefCount;
+ }
if (mEventCache == NULL) {
mMaxCacheSize = computeMaxCacheSizeLocked();
mEventCache = new sensors_event_t[mMaxCacheSize];
@@ -1087,53 +1161,81 @@
return size < 0 ? status_t(size) : status_t(NO_ERROR);
}
+void SensorService::SensorEventConnection::reAllocateCacheLocked(sensors_event_t const* scratch,
+ int count) {
+ sensors_event_t *eventCache_new;
+ const int new_cache_size = computeMaxCacheSizeLocked();
+ // Allocate new cache, copy over events from the old cache & scratch, free up memory.
+ eventCache_new = new sensors_event_t[new_cache_size];
+ memcpy(eventCache_new, mEventCache, mCacheSize * sizeof(sensors_event_t));
+ memcpy(&eventCache_new[mCacheSize], scratch, count * sizeof(sensors_event_t));
+
+ ALOGD_IF(DEBUG_CONNECTIONS, "reAllocateCacheLocked maxCacheSize=%d %d", mMaxCacheSize,
+ new_cache_size);
+
+ delete mEventCache;
+ mEventCache = eventCache_new;
+ mCacheSize += count;
+ mMaxCacheSize = new_cache_size;
+}
+
+void SensorService::SensorEventConnection::sendPendingFlushEventsLocked() {
+ ASensorEvent flushCompleteEvent;
+ flushCompleteEvent.type = SENSOR_TYPE_META_DATA;
+ flushCompleteEvent.sensor = 0;
+ // Loop through all the sensors for this connection and check if there are any pending
+ // flush complete events to be sent.
+ for (size_t i = 0; i < mSensorInfo.size(); ++i) {
+ FlushInfo& flushInfo = mSensorInfo.editValueAt(i);
+ while (flushInfo.mPendingFlushEventsToSend > 0) {
+ flushCompleteEvent.meta_data.sensor = mSensorInfo.keyAt(i);
+ ssize_t size = SensorEventQueue::write(mChannel, &flushCompleteEvent, 1);
+ if (size < 0) {
+ return;
+ }
+ ALOGD_IF(DEBUG_CONNECTIONS, "sent dropped flush complete event==%d ",
+ flushCompleteEvent.meta_data.sensor);
+ flushInfo.mPendingFlushEventsToSend--;
+ }
+ }
+}
+
void SensorService::SensorEventConnection::writeToSocketFromCacheLocked() {
// At a time write at most half the size of the receiver buffer in SensorEventQueue.
const int maxWriteSize = SensorEventQueue::MAX_RECEIVE_BUFFER_EVENT_COUNT/2;
- // Send pending flush events (if any) before sending events from the buffer.
- {
- ASensorEvent flushCompleteEvent;
- flushCompleteEvent.type = SENSOR_TYPE_META_DATA;
- flushCompleteEvent.sensor = 0;
- // Loop through all the sensors for this connection and check if there are any pending
- // flush complete events to be sent.
- for (size_t i = 0; i < mSensorInfo.size(); ++i) {
- FlushInfo& flushInfo = mSensorInfo.editValueAt(i);
- while (flushInfo.mPendingFlushEventsToSend > 0) {
- flushCompleteEvent.meta_data.sensor = mSensorInfo.keyAt(i);
- ssize_t size = SensorEventQueue::write(mChannel, &flushCompleteEvent, 1);
- if (size < 0) {
- return;
- }
- ALOGD_IF(DEBUG_CONNECTIONS, "sent dropped flush complete event==%d ",
- flushCompleteEvent.meta_data.sensor);
- flushInfo.mPendingFlushEventsToSend--;
- }
- }
- }
+ sendPendingFlushEventsLocked();
// Write "count" events at a time.
for (int numEventsSent = 0; numEventsSent < mCacheSize;) {
- const int count = (mCacheSize - numEventsSent) < maxWriteSize ?
+ const int numEventsToWrite = (mCacheSize - numEventsSent) < maxWriteSize ?
mCacheSize - numEventsSent : maxWriteSize;
- int numWakeUpSensorEvents =
- countWakeUpSensorEventsLocked(mEventCache + numEventsSent, count);
- mWakeLockRefCount += numWakeUpSensorEvents;
+ int index_wake_up_event =
+ findWakeUpSensorEventLocked(mEventCache + numEventsSent, numEventsToWrite);
+ if (index_wake_up_event >= 0) {
+ mEventCache[index_wake_up_event + numEventsSent].flags |=
+ WAKE_UP_SENSOR_EVENT_NEEDS_ACK;
+ ++mWakeLockRefCount;
+ }
ssize_t size = SensorEventQueue::write(mChannel,
reinterpret_cast<ASensorEvent const*>(mEventCache + numEventsSent),
- count);
+ numEventsToWrite);
if (size < 0) {
+ if (index_wake_up_event >= 0) {
+ // If there was a wake_up sensor_event, reset the flag.
+ mEventCache[index_wake_up_event + numEventsSent].flags &=
+ ~WAKE_UP_SENSOR_EVENT_NEEDS_ACK;
+ --mWakeLockRefCount;
+ }
memmove(mEventCache, &mEventCache[numEventsSent],
(mCacheSize - numEventsSent) * sizeof(sensors_event_t));
ALOGD_IF(DEBUG_CONNECTIONS, "wrote %d events from cache size==%d ",
- numEventsSent, mCacheSize);
+ numEventsSent, mCacheSize);
mCacheSize -= numEventsSent;
- mWakeLockRefCount -= numWakeUpSensorEvents;
return;
}
- numEventsSent += count;
+ numEventsSent += numEventsToWrite;
#if DEBUG_CONNECTIONS
- mEventsSentFromCache += count;
+ mEventsSentFromCache += numEventsToWrite;
#endif
}
ALOGD_IF(DEBUG_CONNECTIONS, "wrote all events from cache size=%d ", mCacheSize);
@@ -1159,15 +1261,14 @@
return;
}
-int SensorService::SensorEventConnection::countWakeUpSensorEventsLocked(
- sensors_event_t* scratch, const int count) {
+int SensorService::SensorEventConnection::findWakeUpSensorEventLocked(
+ sensors_event_t const* scratch, const int count) {
for (int i = 0; i < count; ++i) {
if (mService->isWakeUpSensorEvent(scratch[i])) {
- scratch[i].flags |= WAKE_UP_SENSOR_EVENT_NEEDS_ACK;
- return 1;
+ return i;
}
}
- return 0;
+ return -1;
}
sp<BitTube> SensorService::SensorEventConnection::getSensorChannel() const
@@ -1211,9 +1312,7 @@
flushInfo.mPendingFlushEventsToSend++;
} else {
status_t err_flush = mService->flushSensor(this, handle);
- if (err_flush == NO_ERROR) {
- flushInfo.mNumFlushCalls++;
- } else {
+ if (err_flush != NO_ERROR) {
ALOGE("Flush error handle=%d %s", handle, strerror(-err_flush));
}
err = (err_flush != NO_ERROR) ? err_flush : err;
@@ -1280,9 +1379,9 @@
}
if (fifoWakeUpSensors + fifoNonWakeUpSensors == 0) {
// It is extremely unlikely that there is a write failure in non batch mode. Return a cache
- // size of 100.
+ // size that is equal to that of the batch mode.
ALOGI("Write failure in non-batch mode");
- return 100;
+ return MAX_SOCKET_BUFFER_SIZE_BATCHED/sizeof(sensors_event_t);
}
return fifoWakeUpSensors + fifoNonWakeUpSensors;
}
diff --git a/services/sensorservice/SensorService.h b/services/sensorservice/SensorService.h
index 3cdc825..15759ae 100644
--- a/services/sensorservice/SensorService.h
+++ b/services/sensorservice/SensorService.h
@@ -44,7 +44,6 @@
#define MAX_SOCKET_BUFFER_SIZE_BATCHED 100 * 1024
// For older HALs which don't support batching, use a smaller socket buffer size.
#define SOCKET_BUFFER_SIZE_NON_BATCHED 4 * 1024
-#define WAKE_UP_SENSOR_EVENT_NEEDS_ACK (1U << 31)
struct sensors_poll_device_t;
struct sensors_module_t;
@@ -89,11 +88,17 @@
// sent separately before the next batch of events.
void countFlushCompleteEventsLocked(sensors_event_t* scratch, int numEventsDropped);
- // Check if there are any wake up events in the buffer. If yes, increment the ref count.
- // Increment it by exactly one unit for each packet sent on the socket. SOCK_SEQPACKET for
- // the socket ensures that either the entire packet is read or dropped.
- // Return 1 if mWakeLockRefCount has been incremented, zero if not.
- int countWakeUpSensorEventsLocked(sensors_event_t* scratch, int count);
+ // Check if there are any wake up events in the buffer. If yes, return the index of the
+ // first wake_up sensor event in the buffer else return -1. This wake_up sensor event will
+ // have the flag WAKE_UP_SENSOR_EVENT_NEEDS_ACK set. Exactly one event per packet will have
+ // the wake_up flag set. SOCK_SEQPACKET ensures that either the entire packet is read or
+ // dropped.
+ int findWakeUpSensorEventLocked(sensors_event_t const* scratch, int count);
+
+ // Send pending flush_complete events. There may have been flush_complete_events that are
+ // dropped which need to be sent separately before other events. On older HALs (1_0) this
+ // method emulates the behavior of flush().
+ void sendPendingFlushEventsLocked();
// Writes events from mEventCache to the socket.
void writeToSocketFromCacheLocked();
@@ -103,6 +108,10 @@
// shared amongst wake-up sensors and non-wake up sensors.
int computeMaxCacheSizeLocked() const;
+ // When more sensors register, the maximum cache size desired may change. Compute max cache
+ // size, reallocate memory and copy over events from the older cache.
+ void reAllocateCacheLocked(sensors_event_t const* scratch, int count);
+
// LooperCallback method. If there is data to read on this fd, it is an ack from the
// app that it has read events from a wake up sensor, decrement mWakeLockRefCount.
// If this fd is available for writing send the data from the cache.
@@ -124,11 +133,7 @@
// Every activate is preceded by a flush. Only after the first flush complete is
// received, the events for the sensor are sent on that *connection*.
bool mFirstFlushPending;
- // Number of time flush() was called on this connection. This is incremented every time
- // flush() is called and decremented when flush_complete_event is received.
- int mNumFlushCalls;
- FlushInfo() : mPendingFlushEventsToSend(0), mFirstFlushPending(false),
- mNumFlushCalls(0) {}
+ FlushInfo() : mPendingFlushEventsToSend(0), mFirstFlushPending(false) {}
};
// protected by SensorService::mLock. Key for this vector is the sensor handle.
KeyedVector<int, FlushInfo> mSensorInfo;
@@ -157,11 +162,18 @@
class SensorRecord {
SortedVector< wp<SensorEventConnection> > mConnections;
+ // A queue of all flush() calls made on this sensor. Flush complete events will be
+ // sent in this order.
+ Vector< wp<SensorEventConnection> > mPendingFlushConnections;
public:
SensorRecord(const sp<SensorEventConnection>& connection);
bool addConnection(const sp<SensorEventConnection>& connection);
bool removeConnection(const wp<SensorEventConnection>& connection);
size_t getNumConnections() const { return mConnections.size(); }
+
+ void addPendingFlushConnection(const sp<SensorEventConnection>& connection);
+ void removeFirstPendingFlushConnection();
+ SensorEventConnection * getFirstPendingFlushConnection();
};
class SensorEventAckReceiver : public Thread {
@@ -194,6 +206,8 @@
void checkWakeLockStateLocked();
bool isWakeUpSensorEvent(const sensors_event_t& event) const;
+ SensorRecord * getSensorRecord(int handle);
+
sp<Looper> getLooper() const;
// constants