logd: remove LogBufferElement dependency of LogReaderThread
In the future, not all log buffers will be implemented in terms of
LogBufferElement.
Test: build
Change-Id: I5cf0d01414857b1bfa08c92a4f8035b43ef2aad7
diff --git a/logd/LogReader.cpp b/logd/LogReader.cpp
index 26f2ed2..35c46aa 100644
--- a/logd/LogReader.cpp
+++ b/logd/LogReader.cpp
@@ -171,25 +171,27 @@
if (start != log_time::EPOCH) {
bool start_time_set = false;
uint64_t last = sequence;
- auto log_find_start = [pid, logMask, start, &sequence, &start_time_set,
- &last](const LogBufferElement* element) -> FilterResult {
- if (pid && pid != element->getPid()) {
+ auto log_find_start = [pid, logMask, start, &sequence, &start_time_set, &last](
+ log_id_t element_log_id, pid_t element_pid,
+ uint64_t element_sequence, log_time element_realtime,
+ uint16_t) -> FilterResult {
+ if (pid && pid != element_pid) {
return FilterResult::kSkip;
}
- if ((logMask & (1 << element->getLogId())) == 0) {
+ if ((logMask & (1 << element_log_id)) == 0) {
return FilterResult::kSkip;
}
- if (start == element->getRealTime()) {
- sequence = element->getSequence();
+ if (start == element_realtime) {
+ sequence = element_sequence;
start_time_set = true;
return FilterResult::kStop;
} else {
- if (start < element->getRealTime()) {
+ if (start < element_realtime) {
sequence = last;
start_time_set = true;
return FilterResult::kStop;
}
- last = element->getSequence();
+ last = element_sequence;
}
return FilterResult::kSkip;
};