logd: rename FlushToResult to FilterResult
This was a typo; the enum corresponds to the result of the 'Filter'
function, not the 'FlushTo' function.
Test: build
Change-Id: Ib46f0646570b6dbaac17ae9fc95c990128cdbe72
diff --git a/logd/LogBuffer.h b/logd/LogBuffer.h
index 7f1e128..d38c018 100644
--- a/logd/LogBuffer.h
+++ b/logd/LogBuffer.h
@@ -27,7 +27,7 @@
class LogWriter;
-enum class FlushToResult {
+enum class FilterResult {
kSkip,
kStop,
kWrite,
@@ -48,7 +48,7 @@
virtual uint64_t FlushTo(
LogWriter* writer, uint64_t start,
pid_t* last_tid, // nullable
- const std::function<FlushToResult(const LogBufferElement* element)>& filter) = 0;
+ const std::function<FilterResult(const LogBufferElement* element)>& filter) = 0;
virtual bool Clear(log_id_t id, uid_t uid) = 0;
virtual unsigned long GetSize(log_id_t id) = 0;
diff --git a/logd/LogReader.cpp b/logd/LogReader.cpp
index 234ddc7..26f2ed2 100644
--- a/logd/LogReader.cpp
+++ b/logd/LogReader.cpp
@@ -172,26 +172,26 @@
bool start_time_set = false;
uint64_t last = sequence;
auto log_find_start = [pid, logMask, start, &sequence, &start_time_set,
- &last](const LogBufferElement* element) -> FlushToResult {
+ &last](const LogBufferElement* element) -> FilterResult {
if (pid && pid != element->getPid()) {
- return FlushToResult::kSkip;
+ return FilterResult::kSkip;
}
if ((logMask & (1 << element->getLogId())) == 0) {
- return FlushToResult::kSkip;
+ return FilterResult::kSkip;
}
if (start == element->getRealTime()) {
sequence = element->getSequence();
start_time_set = true;
- return FlushToResult::kStop;
+ return FilterResult::kStop;
} else {
if (start < element->getRealTime()) {
sequence = last;
start_time_set = true;
- return FlushToResult::kStop;
+ return FilterResult::kStop;
}
last = element->getSequence();
}
- return FlushToResult::kSkip;
+ return FilterResult::kSkip;
};
log_buffer_->FlushTo(socket_log_writer.get(), sequence, nullptr, log_find_start);
diff --git a/logd/LogReaderThread.cpp b/logd/LogReaderThread.cpp
index b2001b5..8de9622 100644
--- a/logd/LogReaderThread.cpp
+++ b/logd/LogReaderThread.cpp
@@ -123,12 +123,12 @@
}
// A first pass to count the number of elements
-FlushToResult LogReaderThread::FilterFirstPass(const LogBufferElement* element) {
+FilterResult LogReaderThread::FilterFirstPass(const LogBufferElement* element) {
auto lock = std::lock_guard{reader_list_->reader_threads_lock()};
if (leading_dropped_) {
if (element->getDropped()) {
- return FlushToResult::kSkip;
+ return FilterResult::kSkip;
}
leading_dropped_ = false;
}
@@ -142,46 +142,46 @@
++count_;
}
- return FlushToResult::kSkip;
+ return FilterResult::kSkip;
}
// A second pass to send the selected elements
-FlushToResult LogReaderThread::FilterSecondPass(const LogBufferElement* element) {
+FilterResult LogReaderThread::FilterSecondPass(const LogBufferElement* element) {
auto lock = std::lock_guard{reader_list_->reader_threads_lock()};
start_ = element->getSequence();
if (skip_ahead_[element->getLogId()]) {
skip_ahead_[element->getLogId()]--;
- return FlushToResult::kSkip;
+ return FilterResult::kSkip;
}
if (leading_dropped_) {
if (element->getDropped()) {
- return FlushToResult::kSkip;
+ return FilterResult::kSkip;
}
leading_dropped_ = false;
}
// Truncate to close race between first and second pass
if (non_block_ && tail_ && index_ >= count_) {
- return FlushToResult::kStop;
+ return FilterResult::kStop;
}
if (!IsWatching(element->getLogId())) {
- return FlushToResult::kSkip;
+ return FilterResult::kSkip;
}
if (pid_ && pid_ != element->getPid()) {
- return FlushToResult::kSkip;
+ return FilterResult::kSkip;
}
if (start_time_ != log_time::EPOCH && element->getRealTime() <= start_time_) {
- return FlushToResult::kSkip;
+ return FilterResult::kSkip;
}
if (release_) {
- return FlushToResult::kStop;
+ return FilterResult::kStop;
}
if (!tail_) {
@@ -191,7 +191,7 @@
++index_;
if (count_ > tail_ && index_ <= (count_ - tail_)) {
- return FlushToResult::kSkip;
+ return FilterResult::kSkip;
}
if (!non_block_) {
@@ -200,9 +200,9 @@
ok:
if (!skip_ahead_[element->getLogId()]) {
- return FlushToResult::kWrite;
+ return FilterResult::kWrite;
}
- return FlushToResult::kSkip;
+ return FilterResult::kSkip;
}
void LogReaderThread::cleanSkip_Locked(void) {
diff --git a/logd/LogReaderThread.h b/logd/LogReaderThread.h
index e48a3ca..907bc83 100644
--- a/logd/LogReaderThread.h
+++ b/logd/LogReaderThread.h
@@ -63,8 +63,8 @@
private:
void ThreadFunction();
// flushTo filter callbacks
- FlushToResult FilterFirstPass(const LogBufferElement* element);
- FlushToResult FilterSecondPass(const LogBufferElement* element);
+ FilterResult FilterFirstPass(const LogBufferElement* element);
+ FilterResult FilterSecondPass(const LogBufferElement* element);
std::condition_variable thread_triggered_condition_;
LogBuffer* log_buffer_;
diff --git a/logd/SimpleLogBuffer.cpp b/logd/SimpleLogBuffer.cpp
index 1c83428..d60805d 100644
--- a/logd/SimpleLogBuffer.cpp
+++ b/logd/SimpleLogBuffer.cpp
@@ -112,7 +112,7 @@
uint64_t SimpleLogBuffer::FlushTo(
LogWriter* writer, uint64_t start, pid_t* last_tid,
- const std::function<FlushToResult(const LogBufferElement* element)>& filter) {
+ const std::function<FilterResult(const LogBufferElement* element)>& filter) {
auto shared_lock = SharedLock{lock_};
std::list<LogBufferElement>::iterator it;
@@ -146,11 +146,11 @@
}
if (filter) {
- FlushToResult ret = filter(&element);
- if (ret == FlushToResult::kSkip) {
+ FilterResult ret = filter(&element);
+ if (ret == FilterResult::kSkip) {
continue;
}
- if (ret == FlushToResult::kStop) {
+ if (ret == FilterResult::kStop) {
break;
}
}
diff --git a/logd/SimpleLogBuffer.h b/logd/SimpleLogBuffer.h
index 9a2d01a..cd08acf 100644
--- a/logd/SimpleLogBuffer.h
+++ b/logd/SimpleLogBuffer.h
@@ -37,7 +37,7 @@
uint16_t len) override;
uint64_t FlushTo(
LogWriter* writer, uint64_t start, pid_t* lastTid,
- const std::function<FlushToResult(const LogBufferElement* element)>& filter) override;
+ const std::function<FilterResult(const LogBufferElement* element)>& filter) override;
bool Clear(log_id_t id, uid_t uid) override;
unsigned long GetSize(log_id_t id) override;