Remove redundant EventHub variables
Some of the variables are just copies of the same constant. Consolidate
to simply use 'capacity'.
Bug: 211379801
Test: atest inputflinger_tests
Change-Id: I6e51ba5671a31c6dc89c4511a37f0448934a1a3e
diff --git a/services/inputflinger/reader/EventHub.cpp b/services/inputflinger/reader/EventHub.cpp
index 5c24244..443c89a 100644
--- a/services/inputflinger/reader/EventHub.cpp
+++ b/services/inputflinger/reader/EventHub.cpp
@@ -1638,11 +1638,9 @@
std::vector<RawEvent> EventHub::getEvents(int timeoutMillis) {
std::scoped_lock _l(mLock);
- constexpr size_t bufferSize = EVENT_BUFFER_SIZE;
- struct input_event readBuffer[bufferSize];
+ std::array<input_event, EVENT_BUFFER_SIZE> readBuffer;
std::vector<RawEvent> events;
- size_t capacity = bufferSize;
bool awoken = false;
for (;;) {
nsecs_t now = systemTime(SYSTEM_TIME_MONOTONIC);
@@ -1672,7 +1670,7 @@
});
it = mClosingDevices.erase(it);
mNeedToSendFinishedDeviceScan = true;
- if (events.size() == capacity) {
+ if (events.size() == EVENT_BUFFER_SIZE) {
break;
}
}
@@ -1710,7 +1708,7 @@
ALOGW("Device id %d exists, replaced.", device->id);
}
mNeedToSendFinishedDeviceScan = true;
- if (events.size() == capacity) {
+ if (events.size() == EVENT_BUFFER_SIZE) {
break;
}
}
@@ -1721,7 +1719,7 @@
.when = now,
.type = FINISHED_DEVICE_SCAN,
});
- if (events.size() == capacity) {
+ if (events.size() == EVENT_BUFFER_SIZE) {
break;
}
}
@@ -1785,12 +1783,13 @@
// This must be an input event
if (eventItem.events & EPOLLIN) {
int32_t readSize =
- read(device->fd, readBuffer, sizeof(struct input_event) * capacity);
+ read(device->fd, readBuffer.data(),
+ sizeof(decltype(readBuffer)::value_type) * readBuffer.size());
if (readSize == 0 || (readSize < 0 && errno == ENODEV)) {
// Device was removed before INotify noticed.
ALOGW("could not get event, removed? (fd: %d size: %" PRId32
- " bufferSize: %zu capacity: %zu errno: %d)\n",
- device->fd, readSize, bufferSize, capacity, errno);
+ " capacity: %zu errno: %d)\n",
+ device->fd, readSize, readBuffer.size(), errno);
deviceChanged = true;
closeDeviceLocked(*device);
} else if (readSize < 0) {
@@ -1814,7 +1813,7 @@
.value = iev.value,
});
}
- if (events.size() >= capacity) {
+ if (events.size() >= EVENT_BUFFER_SIZE) {
// The result buffer is full. Reset the pending event index
// so we will try to read the device again on the next iteration.
mPendingEventIndex -= 1;