diff options
author | Mark Salyzyn | 2017-05-16 10:24:23 -0500 |
---|---|---|
committer | android-build-merger | 2017-05-16 10:24:23 -0500 |
commit | 8ab4f5eafc7d183c1c618209bc7c83de79b0cf37 (patch) | |
tree | 6d221b72ad7b69ebac65ee21b5109a34e59de6f9 | |
parent | c7690e0abe7f283c4d6fc4d3a067795a24271d8c (diff) | |
parent | 27d54dd4ac6a1d14c513115598859c699e4ea76b (diff) | |
download | platform-system-core-8ab4f5eafc7d183c1c618209bc7c83de79b0cf37.tar.gz platform-system-core-8ab4f5eafc7d183c1c618209bc7c83de79b0cf37.tar.xz platform-system-core-8ab4f5eafc7d183c1c618209bc7c83de79b0cf37.zip |
Merge "logd: remove start filtration from flushTo" am: c8c49988b1
am: 27d54dd4ac
Change-Id: Ied7a62d1ec231da5b6969c7642d4843912bf6203
-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(); |