diff options
author | Mark Salyzyn | 2017-05-16 10:27:24 -0500 |
---|---|---|
committer | android-build-merger | 2017-05-16 10:27:24 -0500 |
commit | 4cc651974163a661a150785bd80ce6c1fdbf4559 (patch) | |
tree | c1d78272dec28501f818078dc71844775d575803 | |
parent | ab90853da23110f7492dc2eb1cdae071c3d46837 (diff) | |
parent | 8ab4f5eafc7d183c1c618209bc7c83de79b0cf37 (diff) | |
download | platform-system-core-4cc651974163a661a150785bd80ce6c1fdbf4559.tar.gz platform-system-core-4cc651974163a661a150785bd80ce6c1fdbf4559.tar.xz platform-system-core-4cc651974163a661a150785bd80ce6c1fdbf4559.zip |
Merge "logd: remove start filtration from flushTo" am: c8c49988b1 am: 27d54dd4ac
am: 8ab4f5eafc
Change-Id: I700220b3db7c84de51053b818e4e597552b68c80
-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 e4636c32b..e25a48d91 100644 --- a/logd/LogBuffer.cpp +++ b/logd/LogBuffer.cpp | |||
@@ -1144,10 +1144,6 @@ log_time LogBuffer::flushTo(SocketClient* reader, const log_time& start, | |||
1144 | continue; | 1144 | continue; |
1145 | } | 1145 | } |
1146 | 1146 | ||
1147 | if (element->getRealTime() <= start) { | ||
1148 | continue; | ||
1149 | } | ||
1150 | |||
1151 | // NB: calling out to another object with wrlock() held (safe) | 1147 | // NB: calling out to another object with wrlock() held (safe) |
1152 | if (filter) { | 1148 | if (filter) { |
1153 | int ret = (*filter)(element, arg); | 1149 | int ret = (*filter)(element, arg); |
@@ -1174,11 +1170,10 @@ log_time LogBuffer::flushTo(SocketClient* reader, const log_time& start, | |||
1174 | unlock(); | 1170 | unlock(); |
1175 | 1171 | ||
1176 | // range locking in LastLogTimes looks after us | 1172 | // range locking in LastLogTimes looks after us |
1177 | max = element->flushTo(reader, this, privileged, sameTid); | 1173 | log_time next = element->flushTo(reader, this, privileged, sameTid); |
1178 | 1174 | ||
1179 | if (max == element->FLUSH_ERROR) { | 1175 | if (next == element->FLUSH_ERROR) return next; |
1180 | return max; | 1176 | if (next > max) max = next; |
1181 | } | ||
1182 | 1177 | ||
1183 | skip = maxSkip; | 1178 | skip = maxSkip; |
1184 | rdlock(); | 1179 | rdlock(); |