summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Salyzyn2017-05-16 10:21:23 -0500
committerandroid-build-merger2017-05-16 10:21:23 -0500
commit27d54dd4ac6a1d14c513115598859c699e4ea76b (patch)
tree2e86071aca623f29ea36a910812162cde55c8d53
parentd1a2aac294cda96943be60608012248124c5fb0c (diff)
parentc8c49988b149dc65c56bd6f3dbd4daac40d7420a (diff)
downloadplatform-system-core-27d54dd4ac6a1d14c513115598859c699e4ea76b.tar.gz
platform-system-core-27d54dd4ac6a1d14c513115598859c699e4ea76b.tar.xz
platform-system-core-27d54dd4ac6a1d14c513115598859c699e4ea76b.zip
Merge "logd: remove start filtration from flushTo"
am: c8c49988b1 Change-Id: I7be86455b6bb3930e8e37810208f237df202af31
-rw-r--r--logd/LogBuffer.cpp11
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();