diff options
author | Treehugger Robot | 2017-05-16 10:11:31 -0500 |
---|---|---|
committer | Gerrit Code Review | 2017-05-16 10:11:34 -0500 |
commit | c8c49988b149dc65c56bd6f3dbd4daac40d7420a (patch) | |
tree | 2e86071aca623f29ea36a910812162cde55c8d53 | |
parent | b9b95ee3a9dfa05008d783081d6e7db7d56d0574 (diff) | |
parent | 982ad208b5e4d83f966ee4c10ad4f606417bcda6 (diff) | |
download | platform-system-core-c8c49988b149dc65c56bd6f3dbd4daac40d7420a.tar.gz platform-system-core-c8c49988b149dc65c56bd6f3dbd4daac40d7420a.tar.xz platform-system-core-c8c49988b149dc65c56bd6f3dbd4daac40d7420a.zip |
Merge "logd: remove start filtration from flushTo"
-rw-r--r-- | logd/LogBuffer.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/logd/LogBuffer.cpp b/logd/LogBuffer.cpp index ded6c8cc7..fbed83b76 100644 --- a/logd/LogBuffer.cpp +++ b/logd/LogBuffer.cpp | |||
@@ -1142,10 +1142,6 @@ log_time LogBuffer::flushTo(SocketClient* reader, const log_time& start, | |||
1142 | continue; | 1142 | continue; |
1143 | } | 1143 | } |
1144 | 1144 | ||
1145 | if (element->getRealTime() <= start) { | ||
1146 | continue; | ||
1147 | } | ||
1148 | |||
1149 | // NB: calling out to another object with wrlock() held (safe) | 1145 | // NB: calling out to another object with wrlock() held (safe) |
1150 | if (filter) { | 1146 | if (filter) { |
1151 | int ret = (*filter)(element, arg); | 1147 | int ret = (*filter)(element, arg); |
@@ -1172,11 +1168,10 @@ log_time LogBuffer::flushTo(SocketClient* reader, const log_time& start, | |||
1172 | unlock(); | 1168 | unlock(); |
1173 | 1169 | ||
1174 | // range locking in LastLogTimes looks after us | 1170 | // range locking in LastLogTimes looks after us |
1175 | max = element->flushTo(reader, this, privileged, sameTid); | 1171 | log_time next = element->flushTo(reader, this, privileged, sameTid); |
1176 | 1172 | ||
1177 | if (max == element->FLUSH_ERROR) { | 1173 | if (next == element->FLUSH_ERROR) return next; |
1178 | return max; | 1174 | if (next > max) max = next; |
1179 | } | ||
1180 | 1175 | ||
1181 | skip = maxSkip; | 1176 | skip = maxSkip; |
1182 | rdlock(); | 1177 | rdlock(); |