Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 1 | /* |
| 2 | * Copyright (C) 2012-2014 The Android Open Source Project |
| 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. |
| 6 | * You may obtain a copy of the License at |
| 7 | * |
| 8 | * http://www.apache.org/licenses/LICENSE-2.0 |
| 9 | * |
| 10 | * Unless required by applicable law or agreed to in writing, software |
| 11 | * distributed under the License is distributed on an "AS IS" BASIS, |
| 12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. |
| 15 | */ |
| 16 | |
Mark Salyzyn | 671e343 | 2014-05-06 07:34:59 -0700 | [diff] [blame] | 17 | #include <ctype.h> |
Mark Salyzyn | 202e153 | 2015-02-09 08:21:05 -0800 | [diff] [blame] | 18 | #include <errno.h> |
Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 19 | #include <stdio.h> |
| 20 | #include <string.h> |
Mark Salyzyn | 57a0af9 | 2014-05-09 17:44:18 -0700 | [diff] [blame] | 21 | #include <sys/user.h> |
Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 22 | #include <time.h> |
| 23 | #include <unistd.h> |
| 24 | |
Mark Salyzyn | 511338d | 2015-05-19 09:12:30 -0700 | [diff] [blame] | 25 | #include <unordered_map> |
| 26 | |
Mark Salyzyn | 671e343 | 2014-05-06 07:34:59 -0700 | [diff] [blame] | 27 | #include <cutils/properties.h> |
Mark Salyzyn | f10e273 | 2016-09-27 13:08:23 -0700 | [diff] [blame^] | 28 | #include <private/android_logger.h> |
Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 29 | |
| 30 | #include "LogBuffer.h" |
Mark Salyzyn | b6bee33 | 2015-09-08 08:56:32 -0700 | [diff] [blame] | 31 | #include "LogKlog.h" |
Mark Salyzyn | 671e343 | 2014-05-06 07:34:59 -0700 | [diff] [blame] | 32 | #include "LogReader.h" |
Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 33 | |
Mark Salyzyn | dfa7a07 | 2014-02-11 12:29:31 -0800 | [diff] [blame] | 34 | // Default |
Mark Salyzyn | dfa7a07 | 2014-02-11 12:29:31 -0800 | [diff] [blame] | 35 | #define log_buffer_size(id) mMaxSize[id] |
Mark Salyzyn | 671e343 | 2014-05-06 07:34:59 -0700 | [diff] [blame] | 36 | |
Mark Salyzyn | 11e55cb | 2015-03-10 16:45:17 -0700 | [diff] [blame] | 37 | void LogBuffer::init() { |
Mark Salyzyn | dfa7a07 | 2014-02-11 12:29:31 -0800 | [diff] [blame] | 38 | log_id_for_each(i) { |
Mark Salyzyn | 507eb9f | 2016-01-11 10:58:09 -0800 | [diff] [blame] | 39 | mLastSet[i] = false; |
| 40 | mLast[i] = mLogElements.begin(); |
| 41 | |
Mark Salyzyn | f10e273 | 2016-09-27 13:08:23 -0700 | [diff] [blame^] | 42 | if (setSize(i, __android_logger_get_buffer_size(i))) { |
Mark Salyzyn | 57a0af9 | 2014-05-09 17:44:18 -0700 | [diff] [blame] | 43 | setSize(i, LOG_BUFFER_MIN_SIZE); |
| 44 | } |
Mark Salyzyn | dfa7a07 | 2014-02-11 12:29:31 -0800 | [diff] [blame] | 45 | } |
Mark Salyzyn | b6bee33 | 2015-09-08 08:56:32 -0700 | [diff] [blame] | 46 | bool lastMonotonic = monotonic; |
Mark Salyzyn | ba7a9a0 | 2015-12-01 15:57:25 -0800 | [diff] [blame] | 47 | monotonic = android_log_clockid() == CLOCK_MONOTONIC; |
Mark Salyzyn | b75cce0 | 2015-11-30 11:35:56 -0800 | [diff] [blame] | 48 | if (lastMonotonic != monotonic) { |
| 49 | // |
| 50 | // Fixup all timestamps, may not be 100% accurate, but better than |
| 51 | // throwing what we have away when we get 'surprised' by a change. |
| 52 | // In-place element fixup so no need to check reader-lock. Entries |
| 53 | // should already be in timestamp order, but we could end up with a |
| 54 | // few out-of-order entries if new monotonics come in before we |
| 55 | // are notified of the reinit change in status. A Typical example would |
| 56 | // be: |
| 57 | // --------- beginning of system |
| 58 | // 10.494082 184 201 D Cryptfs : Just triggered post_fs_data |
| 59 | // --------- beginning of kernel |
| 60 | // 0.000000 0 0 I : Initializing cgroup subsys |
| 61 | // as the act of mounting /data would trigger persist.logd.timestamp to |
| 62 | // be corrected. 1/30 corner case YMMV. |
| 63 | // |
| 64 | pthread_mutex_lock(&mLogElementsLock); |
| 65 | LogBufferElementCollection::iterator it = mLogElements.begin(); |
| 66 | while((it != mLogElements.end())) { |
| 67 | LogBufferElement *e = *it; |
| 68 | if (monotonic) { |
| 69 | if (!android::isMonotonic(e->mRealTime)) { |
| 70 | LogKlog::convertRealToMonotonic(e->mRealTime); |
| 71 | } |
| 72 | } else { |
| 73 | if (android::isMonotonic(e->mRealTime)) { |
| 74 | LogKlog::convertMonotonicToReal(e->mRealTime); |
| 75 | } |
| 76 | } |
| 77 | ++it; |
| 78 | } |
| 79 | pthread_mutex_unlock(&mLogElementsLock); |
Mark Salyzyn | b6bee33 | 2015-09-08 08:56:32 -0700 | [diff] [blame] | 80 | } |
| 81 | |
Mark Salyzyn | b75cce0 | 2015-11-30 11:35:56 -0800 | [diff] [blame] | 82 | // We may have been triggered by a SIGHUP. Release any sleeping reader |
| 83 | // threads to dump their current content. |
Mark Salyzyn | b6bee33 | 2015-09-08 08:56:32 -0700 | [diff] [blame] | 84 | // |
Mark Salyzyn | b75cce0 | 2015-11-30 11:35:56 -0800 | [diff] [blame] | 85 | // NB: this is _not_ performed in the context of a SIGHUP, it is |
| 86 | // performed during startup, and in context of reinit administrative thread |
| 87 | LogTimeEntry::lock(); |
| 88 | |
| 89 | LastLogTimes::iterator times = mTimes.begin(); |
| 90 | while(times != mTimes.end()) { |
| 91 | LogTimeEntry *entry = (*times); |
| 92 | if (entry->owned_Locked()) { |
| 93 | entry->triggerReader_Locked(); |
Mark Salyzyn | b6bee33 | 2015-09-08 08:56:32 -0700 | [diff] [blame] | 94 | } |
Mark Salyzyn | b75cce0 | 2015-11-30 11:35:56 -0800 | [diff] [blame] | 95 | times++; |
Mark Salyzyn | b6bee33 | 2015-09-08 08:56:32 -0700 | [diff] [blame] | 96 | } |
Mark Salyzyn | b75cce0 | 2015-11-30 11:35:56 -0800 | [diff] [blame] | 97 | |
| 98 | LogTimeEntry::unlock(); |
Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 99 | } |
| 100 | |
Mark Salyzyn | b6bee33 | 2015-09-08 08:56:32 -0700 | [diff] [blame] | 101 | LogBuffer::LogBuffer(LastLogTimes *times): |
Mark Salyzyn | ba7a9a0 | 2015-12-01 15:57:25 -0800 | [diff] [blame] | 102 | monotonic(android_log_clockid() == CLOCK_MONOTONIC), |
Mark Salyzyn | b6bee33 | 2015-09-08 08:56:32 -0700 | [diff] [blame] | 103 | mTimes(*times) { |
Mark Salyzyn | 11e55cb | 2015-03-10 16:45:17 -0700 | [diff] [blame] | 104 | pthread_mutex_init(&mLogElementsLock, NULL); |
| 105 | |
| 106 | init(); |
| 107 | } |
| 108 | |
Mark Salyzyn | 202e153 | 2015-02-09 08:21:05 -0800 | [diff] [blame] | 109 | int LogBuffer::log(log_id_t log_id, log_time realtime, |
| 110 | uid_t uid, pid_t pid, pid_t tid, |
| 111 | const char *msg, unsigned short len) { |
Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 112 | if ((log_id >= LOG_ID_MAX) || (log_id < 0)) { |
Mark Salyzyn | 202e153 | 2015-02-09 08:21:05 -0800 | [diff] [blame] | 113 | return -EINVAL; |
Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 114 | } |
Mark Salyzyn | e59c469 | 2014-10-02 13:07:05 -0700 | [diff] [blame] | 115 | |
Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 116 | LogBufferElement *elem = new LogBufferElement(log_id, realtime, |
Mark Salyzyn | b992d0d | 2014-03-20 16:09:38 -0700 | [diff] [blame] | 117 | uid, pid, tid, msg, len); |
Mark Salyzyn | 0ee8de3 | 2016-01-06 21:17:43 +0000 | [diff] [blame] | 118 | if (log_id != LOG_ID_SECURITY) { |
Mark Salyzyn | 083b037 | 2015-12-04 10:59:45 -0800 | [diff] [blame] | 119 | int prio = ANDROID_LOG_INFO; |
Mark Salyzyn | 0ee8de3 | 2016-01-06 21:17:43 +0000 | [diff] [blame] | 120 | const char *tag = NULL; |
Mark Salyzyn | 807e40e | 2016-09-22 09:56:51 -0700 | [diff] [blame] | 121 | size_t len = 0; |
Mark Salyzyn | 083b037 | 2015-12-04 10:59:45 -0800 | [diff] [blame] | 122 | if (log_id == LOG_ID_EVENTS) { |
Mark Salyzyn | 807e40e | 2016-09-22 09:56:51 -0700 | [diff] [blame] | 123 | tag = android::tagToName(&len, elem->getTag()); |
Mark Salyzyn | 083b037 | 2015-12-04 10:59:45 -0800 | [diff] [blame] | 124 | } else { |
| 125 | prio = *msg; |
| 126 | tag = msg + 1; |
Mark Salyzyn | 807e40e | 2016-09-22 09:56:51 -0700 | [diff] [blame] | 127 | len = strlen(tag); |
Mark Salyzyn | 083b037 | 2015-12-04 10:59:45 -0800 | [diff] [blame] | 128 | } |
Mark Salyzyn | 807e40e | 2016-09-22 09:56:51 -0700 | [diff] [blame] | 129 | if (!__android_log_is_loggable_len(prio, tag, len, ANDROID_LOG_VERBOSE)) { |
Mark Salyzyn | 083b037 | 2015-12-04 10:59:45 -0800 | [diff] [blame] | 130 | // Log traffic received to total |
| 131 | pthread_mutex_lock(&mLogElementsLock); |
| 132 | stats.add(elem); |
| 133 | stats.subtract(elem); |
| 134 | pthread_mutex_unlock(&mLogElementsLock); |
| 135 | delete elem; |
| 136 | return -EACCES; |
| 137 | } |
Mark Salyzyn | e59c469 | 2014-10-02 13:07:05 -0700 | [diff] [blame] | 138 | } |
Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 139 | |
| 140 | pthread_mutex_lock(&mLogElementsLock); |
| 141 | |
| 142 | // Insert elements in time sorted order if possible |
| 143 | // NB: if end is region locked, place element at end of list |
| 144 | LogBufferElementCollection::iterator it = mLogElements.end(); |
| 145 | LogBufferElementCollection::iterator last = it; |
Mark Salyzyn | eae155e | 2014-10-13 16:49:47 -0700 | [diff] [blame] | 146 | while (last != mLogElements.begin()) { |
| 147 | --it; |
Mark Salyzyn | c03e72c | 2014-02-18 11:23:53 -0800 | [diff] [blame] | 148 | if ((*it)->getRealTime() <= realtime) { |
Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 149 | break; |
| 150 | } |
| 151 | last = it; |
| 152 | } |
Mark Salyzyn | c03e72c | 2014-02-18 11:23:53 -0800 | [diff] [blame] | 153 | |
Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 154 | if (last == mLogElements.end()) { |
| 155 | mLogElements.push_back(elem); |
| 156 | } else { |
Mark Salyzyn | f7c0f75 | 2015-03-03 13:39:37 -0800 | [diff] [blame] | 157 | uint64_t end = 1; |
Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 158 | bool end_set = false; |
| 159 | bool end_always = false; |
| 160 | |
| 161 | LogTimeEntry::lock(); |
| 162 | |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 163 | LastLogTimes::iterator times = mTimes.begin(); |
| 164 | while(times != mTimes.end()) { |
| 165 | LogTimeEntry *entry = (*times); |
Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 166 | if (entry->owned_Locked()) { |
| 167 | if (!entry->mNonBlock) { |
| 168 | end_always = true; |
| 169 | break; |
| 170 | } |
| 171 | if (!end_set || (end <= entry->mEnd)) { |
| 172 | end = entry->mEnd; |
| 173 | end_set = true; |
| 174 | } |
| 175 | } |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 176 | times++; |
Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 177 | } |
| 178 | |
| 179 | if (end_always |
Mark Salyzyn | f7c0f75 | 2015-03-03 13:39:37 -0800 | [diff] [blame] | 180 | || (end_set && (end >= (*last)->getSequence()))) { |
Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 181 | mLogElements.push_back(elem); |
| 182 | } else { |
| 183 | mLogElements.insert(last,elem); |
| 184 | } |
| 185 | |
| 186 | LogTimeEntry::unlock(); |
| 187 | } |
| 188 | |
Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 189 | stats.add(elem); |
Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 190 | maybePrune(log_id); |
| 191 | pthread_mutex_unlock(&mLogElementsLock); |
Mark Salyzyn | 202e153 | 2015-02-09 08:21:05 -0800 | [diff] [blame] | 192 | |
| 193 | return len; |
Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 194 | } |
| 195 | |
Mark Salyzyn | aaad42f | 2015-09-30 07:40:09 -0700 | [diff] [blame] | 196 | // Prune at most 10% of the log entries or maxPrune, whichever is less. |
Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 197 | // |
| 198 | // mLogElementsLock must be held when this function is called. |
| 199 | void LogBuffer::maybePrune(log_id_t id) { |
Mark Salyzyn | 34facab | 2014-02-06 14:48:50 -0800 | [diff] [blame] | 200 | size_t sizes = stats.sizes(id); |
Mark Salyzyn | 62ab0fd | 2015-08-10 10:23:56 -0700 | [diff] [blame] | 201 | unsigned long maxSize = log_buffer_size(id); |
| 202 | if (sizes > maxSize) { |
Mark Salyzyn | b39ed0c | 2015-08-19 12:20:36 -0700 | [diff] [blame] | 203 | size_t sizeOver = sizes - ((maxSize * 9) / 10); |
Mark Salyzyn | 58b8be8 | 2015-09-30 07:40:09 -0700 | [diff] [blame] | 204 | size_t elements = stats.realElements(id); |
| 205 | size_t minElements = elements / 100; |
| 206 | if (minElements < minPrune) { |
| 207 | minElements = minPrune; |
| 208 | } |
Mark Salyzyn | 62ab0fd | 2015-08-10 10:23:56 -0700 | [diff] [blame] | 209 | unsigned long pruneRows = elements * sizeOver / sizes; |
Mark Salyzyn | aaad42f | 2015-09-30 07:40:09 -0700 | [diff] [blame] | 210 | if (pruneRows < minElements) { |
Mark Salyzyn | 62ab0fd | 2015-08-10 10:23:56 -0700 | [diff] [blame] | 211 | pruneRows = minElements; |
Mark Salyzyn | 740f9b4 | 2014-01-13 16:37:51 -0800 | [diff] [blame] | 212 | } |
Mark Salyzyn | aaad42f | 2015-09-30 07:40:09 -0700 | [diff] [blame] | 213 | if (pruneRows > maxPrune) { |
| 214 | pruneRows = maxPrune; |
Mark Salyzyn | b39ed0c | 2015-08-19 12:20:36 -0700 | [diff] [blame] | 215 | } |
Mark Salyzyn | 740f9b4 | 2014-01-13 16:37:51 -0800 | [diff] [blame] | 216 | prune(id, pruneRows); |
Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 217 | } |
| 218 | } |
| 219 | |
Mark Salyzyn | 831aa29 | 2015-09-03 16:08:50 -0700 | [diff] [blame] | 220 | LogBufferElementCollection::iterator LogBuffer::erase( |
Mark Salyzyn | aaad42f | 2015-09-30 07:40:09 -0700 | [diff] [blame] | 221 | LogBufferElementCollection::iterator it, bool coalesce) { |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 222 | LogBufferElement *element = *it; |
| 223 | log_id_t id = element->getLogId(); |
Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 224 | |
Mark Salyzyn | 6a06694 | 2016-07-14 15:34:30 -0700 | [diff] [blame] | 225 | { // start of scope for found iterator |
| 226 | int key = ((id == LOG_ID_EVENTS) || (id == LOG_ID_SECURITY)) ? |
| 227 | element->getTag() : element->getUid(); |
| 228 | LogBufferIteratorMap::iterator found = mLastWorst[id].find(key); |
| 229 | if ((found != mLastWorst[id].end()) && (it == found->second)) { |
| 230 | mLastWorst[id].erase(found); |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 231 | } |
Mark Salyzyn | c892ea3 | 2015-08-19 17:06:11 -0700 | [diff] [blame] | 232 | } |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 233 | |
Mark Salyzyn | 6a06694 | 2016-07-14 15:34:30 -0700 | [diff] [blame] | 234 | if ((id != LOG_ID_EVENTS) && (id != LOG_ID_SECURITY) && (element->getUid() == AID_SYSTEM)) { |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 235 | // start of scope for pid found iterator |
| 236 | LogBufferPidIteratorMap::iterator found = |
| 237 | mLastWorstPidOfSystem[id].find(element->getPid()); |
| 238 | if ((found != mLastWorstPidOfSystem[id].end()) |
| 239 | && (it == found->second)) { |
| 240 | mLastWorstPidOfSystem[id].erase(found); |
| 241 | } |
| 242 | } |
| 243 | |
Mark Salyzyn | 7fd6c5c | 2016-01-19 16:04:41 -0800 | [diff] [blame] | 244 | bool setLast[LOG_ID_MAX]; |
| 245 | bool doSetLast = false; |
| 246 | log_id_for_each(i) { |
| 247 | doSetLast |= setLast[i] = mLastSet[i] && (it == mLast[i]); |
| 248 | } |
Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 249 | it = mLogElements.erase(it); |
Mark Salyzyn | 7fd6c5c | 2016-01-19 16:04:41 -0800 | [diff] [blame] | 250 | if (doSetLast) { |
| 251 | log_id_for_each(i) { |
| 252 | if (setLast[i]) { |
| 253 | if (it == mLogElements.end()) { // unlikely |
| 254 | mLastSet[i] = false; |
| 255 | } else { |
| 256 | mLast[i] = it; |
| 257 | } |
| 258 | } |
Mark Salyzyn | 507eb9f | 2016-01-11 10:58:09 -0800 | [diff] [blame] | 259 | } |
| 260 | } |
Mark Salyzyn | aaad42f | 2015-09-30 07:40:09 -0700 | [diff] [blame] | 261 | if (coalesce) { |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 262 | stats.erase(element); |
Mark Salyzyn | aaad42f | 2015-09-30 07:40:09 -0700 | [diff] [blame] | 263 | } else { |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 264 | stats.subtract(element); |
Mark Salyzyn | 831aa29 | 2015-09-03 16:08:50 -0700 | [diff] [blame] | 265 | } |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 266 | delete element; |
Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 267 | |
| 268 | return it; |
| 269 | } |
| 270 | |
Mark Salyzyn | 2c9d909 | 2015-04-17 15:38:04 -0700 | [diff] [blame] | 271 | // Define a temporary mechanism to report the last LogBufferElement pointer |
| 272 | // for the specified uid, pid and tid. Used below to help merge-sort when |
| 273 | // pruning for worst UID. |
| 274 | class LogBufferElementKey { |
| 275 | const union { |
| 276 | struct { |
| 277 | uint16_t uid; |
| 278 | uint16_t pid; |
| 279 | uint16_t tid; |
| 280 | uint16_t padding; |
| 281 | } __packed; |
| 282 | uint64_t value; |
| 283 | } __packed; |
| 284 | |
| 285 | public: |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 286 | LogBufferElementKey(uid_t uid, pid_t pid, pid_t tid): |
| 287 | uid(uid), |
| 288 | pid(pid), |
| 289 | tid(tid), |
| 290 | padding(0) { |
| 291 | } |
Chih-Hung Hsieh | 1cc82ce | 2016-04-25 13:49:46 -0700 | [diff] [blame] | 292 | explicit LogBufferElementKey(uint64_t key):value(key) { } |
Mark Salyzyn | 2c9d909 | 2015-04-17 15:38:04 -0700 | [diff] [blame] | 293 | |
| 294 | uint64_t getKey() { return value; } |
| 295 | }; |
| 296 | |
Mark Salyzyn | 511338d | 2015-05-19 09:12:30 -0700 | [diff] [blame] | 297 | class LogBufferElementLast { |
| 298 | |
| 299 | typedef std::unordered_map<uint64_t, LogBufferElement *> LogBufferElementMap; |
| 300 | LogBufferElementMap map; |
Mark Salyzyn | 2c9d909 | 2015-04-17 15:38:04 -0700 | [diff] [blame] | 301 | |
| 302 | public: |
Mark Salyzyn | 2c9d909 | 2015-04-17 15:38:04 -0700 | [diff] [blame] | 303 | |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 304 | bool coalesce(LogBufferElement *element, unsigned short dropped) { |
| 305 | LogBufferElementKey key(element->getUid(), |
| 306 | element->getPid(), |
| 307 | element->getTid()); |
Mark Salyzyn | 511338d | 2015-05-19 09:12:30 -0700 | [diff] [blame] | 308 | LogBufferElementMap::iterator it = map.find(key.getKey()); |
| 309 | if (it != map.end()) { |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 310 | LogBufferElement *found = it->second; |
| 311 | unsigned short moreDropped = found->getDropped(); |
| 312 | if ((dropped + moreDropped) > USHRT_MAX) { |
Mark Salyzyn | 511338d | 2015-05-19 09:12:30 -0700 | [diff] [blame] | 313 | map.erase(it); |
Mark Salyzyn | 2c9d909 | 2015-04-17 15:38:04 -0700 | [diff] [blame] | 314 | } else { |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 315 | found->setDropped(dropped + moreDropped); |
Mark Salyzyn | 2c9d909 | 2015-04-17 15:38:04 -0700 | [diff] [blame] | 316 | return true; |
| 317 | } |
| 318 | } |
| 319 | return false; |
| 320 | } |
| 321 | |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 322 | void add(LogBufferElement *element) { |
| 323 | LogBufferElementKey key(element->getUid(), |
| 324 | element->getPid(), |
| 325 | element->getTid()); |
| 326 | map[key.getKey()] = element; |
Mark Salyzyn | 2c9d909 | 2015-04-17 15:38:04 -0700 | [diff] [blame] | 327 | } |
| 328 | |
Mark Salyzyn | e06a6e0 | 2015-04-20 14:08:56 -0700 | [diff] [blame] | 329 | inline void clear() { |
Mark Salyzyn | 511338d | 2015-05-19 09:12:30 -0700 | [diff] [blame] | 330 | map.clear(); |
Mark Salyzyn | e06a6e0 | 2015-04-20 14:08:56 -0700 | [diff] [blame] | 331 | } |
| 332 | |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 333 | void clear(LogBufferElement *element) { |
| 334 | uint64_t current = element->getRealTime().nsec() |
Mark Salyzyn | 047cc07 | 2015-06-04 13:35:30 -0700 | [diff] [blame] | 335 | - (EXPIRE_RATELIMIT * NS_PER_SEC); |
Mark Salyzyn | 511338d | 2015-05-19 09:12:30 -0700 | [diff] [blame] | 336 | for(LogBufferElementMap::iterator it = map.begin(); it != map.end();) { |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 337 | LogBufferElement *mapElement = it->second; |
| 338 | if ((mapElement->getDropped() >= EXPIRE_THRESHOLD) |
| 339 | && (current > mapElement->getRealTime().nsec())) { |
Mark Salyzyn | 511338d | 2015-05-19 09:12:30 -0700 | [diff] [blame] | 340 | it = map.erase(it); |
| 341 | } else { |
| 342 | ++it; |
Mark Salyzyn | e06a6e0 | 2015-04-20 14:08:56 -0700 | [diff] [blame] | 343 | } |
| 344 | } |
| 345 | } |
| 346 | |
Mark Salyzyn | 2c9d909 | 2015-04-17 15:38:04 -0700 | [diff] [blame] | 347 | }; |
| 348 | |
Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 349 | // prune "pruneRows" of type "id" from the buffer. |
| 350 | // |
Mark Salyzyn | 5bb2972 | 2015-09-08 09:12:51 -0700 | [diff] [blame] | 351 | // This garbage collection task is used to expire log entries. It is called to |
| 352 | // remove all logs (clear), all UID logs (unprivileged clear), or every |
| 353 | // 256 or 10% of the total logs (whichever is less) to prune the logs. |
| 354 | // |
| 355 | // First there is a prep phase where we discover the reader region lock that |
| 356 | // acts as a backstop to any pruning activity to stop there and go no further. |
| 357 | // |
| 358 | // There are three major pruning loops that follow. All expire from the oldest |
| 359 | // entries. Since there are multiple log buffers, the Android logging facility |
| 360 | // will appear to drop entries 'in the middle' when looking at multiple log |
| 361 | // sources and buffers. This effect is slightly more prominent when we prune |
| 362 | // the worst offender by logging source. Thus the logs slowly loose content |
| 363 | // and value as you move back in time. This is preferred since chatty sources |
| 364 | // invariably move the logs value down faster as less chatty sources would be |
| 365 | // expired in the noise. |
| 366 | // |
| 367 | // The first loop performs blacklisting and worst offender pruning. Falling |
| 368 | // through when there are no notable worst offenders and have not hit the |
| 369 | // region lock preventing further worst offender pruning. This loop also looks |
| 370 | // after managing the chatty log entries and merging to help provide |
| 371 | // statistical basis for blame. The chatty entries are not a notification of |
| 372 | // how much logs you may have, but instead represent how much logs you would |
| 373 | // have had in a virtual log buffer that is extended to cover all the in-memory |
| 374 | // logs without loss. They last much longer than the represented pruned logs |
| 375 | // since they get multiplied by the gains in the non-chatty log sources. |
| 376 | // |
| 377 | // The second loop get complicated because an algorithm of watermarks and |
| 378 | // history is maintained to reduce the order and keep processing time |
| 379 | // down to a minimum at scale. These algorithms can be costly in the face |
| 380 | // of larger log buffers, or severly limited processing time granted to a |
| 381 | // background task at lowest priority. |
| 382 | // |
| 383 | // This second loop does straight-up expiration from the end of the logs |
| 384 | // (again, remember for the specified log buffer id) but does some whitelist |
| 385 | // preservation. Thus whitelist is a Hail Mary low priority, blacklists and |
| 386 | // spam filtration all take priority. This second loop also checks if a region |
| 387 | // lock is causing us to buffer too much in the logs to help the reader(s), |
| 388 | // and will tell the slowest reader thread to skip log entries, and if |
| 389 | // persistent and hits a further threshold, kill the reader thread. |
| 390 | // |
| 391 | // The third thread is optional, and only gets hit if there was a whitelist |
| 392 | // and more needs to be pruned against the backstop of the region lock. |
| 393 | // |
Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 394 | // mLogElementsLock must be held when this function is called. |
Mark Salyzyn | 5bb2972 | 2015-09-08 09:12:51 -0700 | [diff] [blame] | 395 | // |
Mark Salyzyn | c5dc970 | 2015-09-16 15:34:00 -0700 | [diff] [blame] | 396 | bool LogBuffer::prune(log_id_t id, unsigned long pruneRows, uid_t caller_uid) { |
Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 397 | LogTimeEntry *oldest = NULL; |
Mark Salyzyn | c5dc970 | 2015-09-16 15:34:00 -0700 | [diff] [blame] | 398 | bool busy = false; |
Mark Salyzyn | 2b25c66 | 2015-09-16 15:34:00 -0700 | [diff] [blame] | 399 | bool clearAll = pruneRows == ULONG_MAX; |
Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 400 | |
| 401 | LogTimeEntry::lock(); |
| 402 | |
| 403 | // Region locked? |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 404 | LastLogTimes::iterator times = mTimes.begin(); |
| 405 | while(times != mTimes.end()) { |
| 406 | LogTimeEntry *entry = (*times); |
TraianX Schiau | da6495d | 2014-12-17 10:53:41 +0200 | [diff] [blame] | 407 | if (entry->owned_Locked() && entry->isWatching(id) |
Mark Salyzyn | b75cce0 | 2015-11-30 11:35:56 -0800 | [diff] [blame] | 408 | && (!oldest || |
| 409 | (oldest->mStart > entry->mStart) || |
| 410 | ((oldest->mStart == entry->mStart) && |
| 411 | (entry->mTimeout.tv_sec || entry->mTimeout.tv_nsec)))) { |
Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 412 | oldest = entry; |
| 413 | } |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 414 | times++; |
Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 415 | } |
| 416 | |
Mark Salyzyn | 64d6fe9 | 2014-02-06 18:11:13 -0800 | [diff] [blame] | 417 | LogBufferElementCollection::iterator it; |
| 418 | |
Mark Salyzyn | 1a240b4 | 2014-06-12 11:16:16 -0700 | [diff] [blame] | 419 | if (caller_uid != AID_ROOT) { |
Mark Salyzyn | 43a5f31 | 2016-09-01 15:48:36 -0700 | [diff] [blame] | 420 | // Only here if clear all request from non system source, so chatty |
| 421 | // filter logistics is not required. |
Mark Salyzyn | 507eb9f | 2016-01-11 10:58:09 -0800 | [diff] [blame] | 422 | it = mLastSet[id] ? mLast[id] : mLogElements.begin(); |
| 423 | while (it != mLogElements.end()) { |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 424 | LogBufferElement *element = *it; |
Mark Salyzyn | 1a240b4 | 2014-06-12 11:16:16 -0700 | [diff] [blame] | 425 | |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 426 | if ((element->getLogId() != id) || (element->getUid() != caller_uid)) { |
Mark Salyzyn | 2b25c66 | 2015-09-16 15:34:00 -0700 | [diff] [blame] | 427 | ++it; |
| 428 | continue; |
| 429 | } |
| 430 | |
Mark Salyzyn | 507eb9f | 2016-01-11 10:58:09 -0800 | [diff] [blame] | 431 | if (!mLastSet[id] || ((*mLast[id])->getLogId() != id)) { |
| 432 | mLast[id] = it; |
| 433 | mLastSet[id] = true; |
| 434 | } |
| 435 | |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 436 | if (oldest && (oldest->mStart <= element->getSequence())) { |
Mark Salyzyn | c5dc970 | 2015-09-16 15:34:00 -0700 | [diff] [blame] | 437 | busy = true; |
Mark Salyzyn | b75cce0 | 2015-11-30 11:35:56 -0800 | [diff] [blame] | 438 | if (oldest->mTimeout.tv_sec || oldest->mTimeout.tv_nsec) { |
| 439 | oldest->triggerReader_Locked(); |
| 440 | } else { |
| 441 | oldest->triggerSkip_Locked(id, pruneRows); |
| 442 | } |
Mark Salyzyn | 1a240b4 | 2014-06-12 11:16:16 -0700 | [diff] [blame] | 443 | break; |
| 444 | } |
| 445 | |
Mark Salyzyn | 2b25c66 | 2015-09-16 15:34:00 -0700 | [diff] [blame] | 446 | it = erase(it); |
Mark Salyzyn | 43a5f31 | 2016-09-01 15:48:36 -0700 | [diff] [blame] | 447 | if (--pruneRows == 0) { |
| 448 | break; |
| 449 | } |
Mark Salyzyn | 1a240b4 | 2014-06-12 11:16:16 -0700 | [diff] [blame] | 450 | } |
| 451 | LogTimeEntry::unlock(); |
Mark Salyzyn | c5dc970 | 2015-09-16 15:34:00 -0700 | [diff] [blame] | 452 | return busy; |
Mark Salyzyn | 1a240b4 | 2014-06-12 11:16:16 -0700 | [diff] [blame] | 453 | } |
| 454 | |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 455 | // prune by worst offenders; by blacklist, UID, and by PID of system UID |
Mark Salyzyn | 083b037 | 2015-12-04 10:59:45 -0800 | [diff] [blame] | 456 | bool hasBlacklist = (id != LOG_ID_SECURITY) && mPrune.naughty(); |
Mark Salyzyn | 2b25c66 | 2015-09-16 15:34:00 -0700 | [diff] [blame] | 457 | while (!clearAll && (pruneRows > 0)) { |
Mark Salyzyn | 64d6fe9 | 2014-02-06 18:11:13 -0800 | [diff] [blame] | 458 | // recalculate the worst offender on every batched pass |
Mark Salyzyn | 6a06694 | 2016-07-14 15:34:30 -0700 | [diff] [blame] | 459 | int worst = -1; // not valid for getUid() or getKey() |
Mark Salyzyn | 64d6fe9 | 2014-02-06 18:11:13 -0800 | [diff] [blame] | 460 | size_t worst_sizes = 0; |
| 461 | size_t second_worst_sizes = 0; |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 462 | pid_t worstPid = 0; // POSIX guarantees PID != 0 |
Mark Salyzyn | 64d6fe9 | 2014-02-06 18:11:13 -0800 | [diff] [blame] | 463 | |
Mark Salyzyn | ae76923 | 2015-03-17 17:17:25 -0700 | [diff] [blame] | 464 | if (worstUidEnabledForLogid(id) && mPrune.worstUidEnabled()) { |
Mark Salyzyn | 6a06694 | 2016-07-14 15:34:30 -0700 | [diff] [blame] | 465 | // Calculate threshold as 12.5% of available storage |
| 466 | size_t threshold = log_buffer_size(id) / 8; |
Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 467 | |
Mark Salyzyn | 6a06694 | 2016-07-14 15:34:30 -0700 | [diff] [blame] | 468 | if ((id == LOG_ID_EVENTS) || (id == LOG_ID_SECURITY)) { |
| 469 | stats.sortTags(AID_ROOT, (pid_t)0, 2, id).findWorst( |
| 470 | worst, worst_sizes, second_worst_sizes, threshold); |
| 471 | } else { |
| 472 | stats.sort(AID_ROOT, (pid_t)0, 2, id).findWorst( |
| 473 | worst, worst_sizes, second_worst_sizes, threshold); |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 474 | |
Mark Salyzyn | 6a06694 | 2016-07-14 15:34:30 -0700 | [diff] [blame] | 475 | if ((worst == AID_SYSTEM) && mPrune.worstPidOfSystemEnabled()) { |
| 476 | stats.sortPids(worst, (pid_t)0, 2, id).findWorst( |
| 477 | worstPid, worst_sizes, second_worst_sizes); |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 478 | } |
| 479 | } |
Mark Salyzyn | 64d6fe9 | 2014-02-06 18:11:13 -0800 | [diff] [blame] | 480 | } |
| 481 | |
Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 482 | // skip if we have neither worst nor naughty filters |
Mark Salyzyn | 6a06694 | 2016-07-14 15:34:30 -0700 | [diff] [blame] | 483 | if ((worst == -1) && !hasBlacklist) { |
Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 484 | break; |
| 485 | } |
| 486 | |
Mark Salyzyn | 64d6fe9 | 2014-02-06 18:11:13 -0800 | [diff] [blame] | 487 | bool kick = false; |
Mark Salyzyn | ab0dcf6 | 2015-03-16 12:04:09 -0700 | [diff] [blame] | 488 | bool leading = true; |
Mark Salyzyn | 507eb9f | 2016-01-11 10:58:09 -0800 | [diff] [blame] | 489 | it = mLastSet[id] ? mLast[id] : mLogElements.begin(); |
Mark Salyzyn | 5bb2972 | 2015-09-08 09:12:51 -0700 | [diff] [blame] | 490 | // Perform at least one mandatory garbage collection cycle in following |
| 491 | // - clear leading chatty tags |
Mark Salyzyn | aaad42f | 2015-09-30 07:40:09 -0700 | [diff] [blame] | 492 | // - coalesce chatty tags |
Mark Salyzyn | 5bb2972 | 2015-09-08 09:12:51 -0700 | [diff] [blame] | 493 | // - check age-out of preserved logs |
| 494 | bool gc = pruneRows <= 1; |
Mark Salyzyn | 6a06694 | 2016-07-14 15:34:30 -0700 | [diff] [blame] | 495 | if (!gc && (worst != -1)) { |
| 496 | { // begin scope for worst found iterator |
| 497 | LogBufferIteratorMap::iterator found = mLastWorst[id].find(worst); |
| 498 | if ((found != mLastWorst[id].end()) |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 499 | && (found->second != mLogElements.end())) { |
| 500 | leading = false; |
| 501 | it = found->second; |
| 502 | } |
| 503 | } |
| 504 | if (worstPid) { |
| 505 | // begin scope for pid worst found iterator |
| 506 | LogBufferPidIteratorMap::iterator found |
| 507 | = mLastWorstPidOfSystem[id].find(worstPid); |
| 508 | if ((found != mLastWorstPidOfSystem[id].end()) |
| 509 | && (found->second != mLogElements.end())) { |
| 510 | leading = false; |
| 511 | it = found->second; |
| 512 | } |
Mark Salyzyn | c892ea3 | 2015-08-19 17:06:11 -0700 | [diff] [blame] | 513 | } |
| 514 | } |
Mark Salyzyn | ccfe844 | 2015-08-24 13:43:27 -0700 | [diff] [blame] | 515 | static const timespec too_old = { |
| 516 | EXPIRE_HOUR_THRESHOLD * 60 * 60, 0 |
| 517 | }; |
| 518 | LogBufferElementCollection::iterator lastt; |
| 519 | lastt = mLogElements.end(); |
| 520 | --lastt; |
Mark Salyzyn | 2c9d909 | 2015-04-17 15:38:04 -0700 | [diff] [blame] | 521 | LogBufferElementLast last; |
Mark Salyzyn | c892ea3 | 2015-08-19 17:06:11 -0700 | [diff] [blame] | 522 | while (it != mLogElements.end()) { |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 523 | LogBufferElement *element = *it; |
Mark Salyzyn | 64d6fe9 | 2014-02-06 18:11:13 -0800 | [diff] [blame] | 524 | |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 525 | if (oldest && (oldest->mStart <= element->getSequence())) { |
Mark Salyzyn | c5dc970 | 2015-09-16 15:34:00 -0700 | [diff] [blame] | 526 | busy = true; |
Mark Salyzyn | b75cce0 | 2015-11-30 11:35:56 -0800 | [diff] [blame] | 527 | if (oldest->mTimeout.tv_sec || oldest->mTimeout.tv_nsec) { |
| 528 | oldest->triggerReader_Locked(); |
| 529 | } |
Mark Salyzyn | 64d6fe9 | 2014-02-06 18:11:13 -0800 | [diff] [blame] | 530 | break; |
| 531 | } |
| 532 | |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 533 | if (element->getLogId() != id) { |
Mark Salyzyn | dfa7a07 | 2014-02-11 12:29:31 -0800 | [diff] [blame] | 534 | ++it; |
| 535 | continue; |
| 536 | } |
| 537 | |
Mark Salyzyn | 507eb9f | 2016-01-11 10:58:09 -0800 | [diff] [blame] | 538 | if (leading && (!mLastSet[id] || ((*mLast[id])->getLogId() != id))) { |
| 539 | mLast[id] = it; |
| 540 | mLastSet[id] = true; |
| 541 | } |
| 542 | |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 543 | unsigned short dropped = element->getDropped(); |
Mark Salyzyn | dfa7a07 | 2014-02-11 12:29:31 -0800 | [diff] [blame] | 544 | |
Mark Salyzyn | ab0dcf6 | 2015-03-16 12:04:09 -0700 | [diff] [blame] | 545 | // remove any leading drops |
| 546 | if (leading && dropped) { |
| 547 | it = erase(it); |
| 548 | continue; |
| 549 | } |
| 550 | |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 551 | if (dropped && last.coalesce(element, dropped)) { |
Mark Salyzyn | aaad42f | 2015-09-30 07:40:09 -0700 | [diff] [blame] | 552 | it = erase(it, true); |
Mark Salyzyn | ab0dcf6 | 2015-03-16 12:04:09 -0700 | [diff] [blame] | 553 | continue; |
| 554 | } |
| 555 | |
Mark Salyzyn | 6a06694 | 2016-07-14 15:34:30 -0700 | [diff] [blame] | 556 | int key = ((id == LOG_ID_EVENTS) || (id == LOG_ID_SECURITY)) ? |
| 557 | element->getTag() : |
| 558 | element->getUid(); |
| 559 | |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 560 | if (hasBlacklist && mPrune.naughty(element)) { |
| 561 | last.clear(element); |
Mark Salyzyn | ab0dcf6 | 2015-03-16 12:04:09 -0700 | [diff] [blame] | 562 | it = erase(it); |
| 563 | if (dropped) { |
| 564 | continue; |
| 565 | } |
| 566 | |
| 567 | pruneRows--; |
| 568 | if (pruneRows == 0) { |
| 569 | break; |
| 570 | } |
| 571 | |
Mark Salyzyn | 6a06694 | 2016-07-14 15:34:30 -0700 | [diff] [blame] | 572 | if (key == worst) { |
Mark Salyzyn | ab0dcf6 | 2015-03-16 12:04:09 -0700 | [diff] [blame] | 573 | kick = true; |
| 574 | if (worst_sizes < second_worst_sizes) { |
| 575 | break; |
| 576 | } |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 577 | worst_sizes -= element->getMsgLen(); |
Mark Salyzyn | ab0dcf6 | 2015-03-16 12:04:09 -0700 | [diff] [blame] | 578 | } |
| 579 | continue; |
| 580 | } |
| 581 | |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 582 | if ((element->getRealTime() < ((*lastt)->getRealTime() - too_old)) |
| 583 | || (element->getRealTime() > (*lastt)->getRealTime())) { |
Mark Salyzyn | ccfe844 | 2015-08-24 13:43:27 -0700 | [diff] [blame] | 584 | break; |
| 585 | } |
| 586 | |
Mark Salyzyn | ab0dcf6 | 2015-03-16 12:04:09 -0700 | [diff] [blame] | 587 | if (dropped) { |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 588 | last.add(element); |
| 589 | if (worstPid |
| 590 | && ((!gc && (element->getPid() == worstPid)) |
Mark Salyzyn | 6a06694 | 2016-07-14 15:34:30 -0700 | [diff] [blame] | 591 | || (mLastWorstPidOfSystem[id].find(element->getPid()) |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 592 | == mLastWorstPidOfSystem[id].end()))) { |
Mark Salyzyn | 1eefca2 | 2016-09-01 07:28:44 -0700 | [diff] [blame] | 593 | mLastWorstPidOfSystem[id][element->getPid()] = it; |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 594 | } |
Mark Salyzyn | 6a06694 | 2016-07-14 15:34:30 -0700 | [diff] [blame] | 595 | if ((!gc && !worstPid && (key == worst)) |
| 596 | || (mLastWorst[id].find(key) == mLastWorst[id].end())) { |
| 597 | mLastWorst[id][key] = it; |
Mark Salyzyn | 49afe0d | 2015-08-24 13:43:27 -0700 | [diff] [blame] | 598 | } |
Mark Salyzyn | 64d6fe9 | 2014-02-06 18:11:13 -0800 | [diff] [blame] | 599 | ++it; |
Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 600 | continue; |
Mark Salyzyn | 64d6fe9 | 2014-02-06 18:11:13 -0800 | [diff] [blame] | 601 | } |
Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 602 | |
Mark Salyzyn | 6a06694 | 2016-07-14 15:34:30 -0700 | [diff] [blame] | 603 | if ((key != worst) |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 604 | || (worstPid && (element->getPid() != worstPid))) { |
Mark Salyzyn | 5921276 | 2015-06-01 09:41:19 -0700 | [diff] [blame] | 605 | leading = false; |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 606 | last.clear(element); |
Mark Salyzyn | ab0dcf6 | 2015-03-16 12:04:09 -0700 | [diff] [blame] | 607 | ++it; |
| 608 | continue; |
| 609 | } |
| 610 | |
Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 611 | pruneRows--; |
| 612 | if (pruneRows == 0) { |
| 613 | break; |
| 614 | } |
| 615 | |
Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 616 | kick = true; |
Mark Salyzyn | ab0dcf6 | 2015-03-16 12:04:09 -0700 | [diff] [blame] | 617 | |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 618 | unsigned short len = element->getMsgLen(); |
Mark Salyzyn | 5392aac | 2015-05-22 10:03:31 -0700 | [diff] [blame] | 619 | |
| 620 | // do not create any leading drops |
| 621 | if (leading) { |
| 622 | it = erase(it); |
Mark Salyzyn | ab0dcf6 | 2015-03-16 12:04:09 -0700 | [diff] [blame] | 623 | } else { |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 624 | stats.drop(element); |
| 625 | element->setDropped(1); |
| 626 | if (last.coalesce(element, 1)) { |
Mark Salyzyn | aaad42f | 2015-09-30 07:40:09 -0700 | [diff] [blame] | 627 | it = erase(it, true); |
Mark Salyzyn | 5392aac | 2015-05-22 10:03:31 -0700 | [diff] [blame] | 628 | } else { |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 629 | last.add(element); |
| 630 | if (worstPid && (!gc |
| 631 | || (mLastWorstPidOfSystem[id].find(worstPid) |
| 632 | == mLastWorstPidOfSystem[id].end()))) { |
| 633 | mLastWorstPidOfSystem[id][worstPid] = it; |
| 634 | } |
Mark Salyzyn | 6a06694 | 2016-07-14 15:34:30 -0700 | [diff] [blame] | 635 | if ((!gc && !worstPid) || |
| 636 | (mLastWorst[id].find(worst) == mLastWorst[id].end())) { |
| 637 | mLastWorst[id][worst] = it; |
Mark Salyzyn | 5bb2972 | 2015-09-08 09:12:51 -0700 | [diff] [blame] | 638 | } |
Mark Salyzyn | 5392aac | 2015-05-22 10:03:31 -0700 | [diff] [blame] | 639 | ++it; |
| 640 | } |
Mark Salyzyn | ab0dcf6 | 2015-03-16 12:04:09 -0700 | [diff] [blame] | 641 | } |
Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 642 | if (worst_sizes < second_worst_sizes) { |
| 643 | break; |
| 644 | } |
| 645 | worst_sizes -= len; |
Mark Salyzyn | 64d6fe9 | 2014-02-06 18:11:13 -0800 | [diff] [blame] | 646 | } |
Mark Salyzyn | 2c9d909 | 2015-04-17 15:38:04 -0700 | [diff] [blame] | 647 | last.clear(); |
Mark Salyzyn | 64d6fe9 | 2014-02-06 18:11:13 -0800 | [diff] [blame] | 648 | |
Mark Salyzyn | 1c95047 | 2014-04-01 17:19:47 -0700 | [diff] [blame] | 649 | if (!kick || !mPrune.worstUidEnabled()) { |
Mark Salyzyn | 64d6fe9 | 2014-02-06 18:11:13 -0800 | [diff] [blame] | 650 | break; // the following loop will ask bad clients to skip/drop |
| 651 | } |
| 652 | } |
| 653 | |
Mark Salyzyn | dfa7a07 | 2014-02-11 12:29:31 -0800 | [diff] [blame] | 654 | bool whitelist = false; |
Mark Salyzyn | 083b037 | 2015-12-04 10:59:45 -0800 | [diff] [blame] | 655 | bool hasWhitelist = (id != LOG_ID_SECURITY) && mPrune.nice() && !clearAll; |
Mark Salyzyn | 507eb9f | 2016-01-11 10:58:09 -0800 | [diff] [blame] | 656 | it = mLastSet[id] ? mLast[id] : mLogElements.begin(); |
Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 657 | while((pruneRows > 0) && (it != mLogElements.end())) { |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 658 | LogBufferElement *element = *it; |
Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 659 | |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 660 | if (element->getLogId() != id) { |
Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 661 | it++; |
| 662 | continue; |
| 663 | } |
| 664 | |
Mark Salyzyn | 507eb9f | 2016-01-11 10:58:09 -0800 | [diff] [blame] | 665 | if (!mLastSet[id] || ((*mLast[id])->getLogId() != id)) { |
| 666 | mLast[id] = it; |
| 667 | mLastSet[id] = true; |
| 668 | } |
| 669 | |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 670 | if (oldest && (oldest->mStart <= element->getSequence())) { |
Mark Salyzyn | c5dc970 | 2015-09-16 15:34:00 -0700 | [diff] [blame] | 671 | busy = true; |
Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 672 | if (whitelist) { |
Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 673 | break; |
| 674 | } |
Mark Salyzyn | 1c95047 | 2014-04-01 17:19:47 -0700 | [diff] [blame] | 675 | |
Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 676 | if (stats.sizes(id) > (2 * log_buffer_size(id))) { |
| 677 | // kick a misbehaving log reader client off the island |
| 678 | oldest->release_Locked(); |
Mark Salyzyn | b75cce0 | 2015-11-30 11:35:56 -0800 | [diff] [blame] | 679 | } else if (oldest->mTimeout.tv_sec || oldest->mTimeout.tv_nsec) { |
| 680 | oldest->triggerReader_Locked(); |
Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 681 | } else { |
| 682 | oldest->triggerSkip_Locked(id, pruneRows); |
Mark Salyzyn | dfa7a07 | 2014-02-11 12:29:31 -0800 | [diff] [blame] | 683 | } |
Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 684 | break; |
Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 685 | } |
Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 686 | |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 687 | if (hasWhitelist && !element->getDropped() && mPrune.nice(element)) { |
| 688 | // WhiteListed |
Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 689 | whitelist = true; |
| 690 | it++; |
| 691 | continue; |
| 692 | } |
| 693 | |
| 694 | it = erase(it); |
| 695 | pruneRows--; |
Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 696 | } |
| 697 | |
Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 698 | // Do not save the whitelist if we are reader range limited |
Mark Salyzyn | dfa7a07 | 2014-02-11 12:29:31 -0800 | [diff] [blame] | 699 | if (whitelist && (pruneRows > 0)) { |
Mark Salyzyn | 507eb9f | 2016-01-11 10:58:09 -0800 | [diff] [blame] | 700 | it = mLastSet[id] ? mLast[id] : mLogElements.begin(); |
Mark Salyzyn | dfa7a07 | 2014-02-11 12:29:31 -0800 | [diff] [blame] | 701 | while((it != mLogElements.end()) && (pruneRows > 0)) { |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 702 | LogBufferElement *element = *it; |
Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 703 | |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 704 | if (element->getLogId() != id) { |
Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 705 | ++it; |
| 706 | continue; |
Mark Salyzyn | dfa7a07 | 2014-02-11 12:29:31 -0800 | [diff] [blame] | 707 | } |
Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 708 | |
Mark Salyzyn | 507eb9f | 2016-01-11 10:58:09 -0800 | [diff] [blame] | 709 | if (!mLastSet[id] || ((*mLast[id])->getLogId() != id)) { |
| 710 | mLast[id] = it; |
| 711 | mLastSet[id] = true; |
| 712 | } |
| 713 | |
Mark Salyzyn | bec3c3d | 2015-08-28 08:02:59 -0700 | [diff] [blame] | 714 | if (oldest && (oldest->mStart <= element->getSequence())) { |
Mark Salyzyn | c5dc970 | 2015-09-16 15:34:00 -0700 | [diff] [blame] | 715 | busy = true; |
Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 716 | if (stats.sizes(id) > (2 * log_buffer_size(id))) { |
| 717 | // kick a misbehaving log reader client off the island |
| 718 | oldest->release_Locked(); |
Mark Salyzyn | b75cce0 | 2015-11-30 11:35:56 -0800 | [diff] [blame] | 719 | } else if (oldest->mTimeout.tv_sec || oldest->mTimeout.tv_nsec) { |
| 720 | oldest->triggerReader_Locked(); |
Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 721 | } else { |
| 722 | oldest->triggerSkip_Locked(id, pruneRows); |
| 723 | } |
| 724 | break; |
| 725 | } |
| 726 | |
| 727 | it = erase(it); |
| 728 | pruneRows--; |
Mark Salyzyn | dfa7a07 | 2014-02-11 12:29:31 -0800 | [diff] [blame] | 729 | } |
| 730 | } |
Mark Salyzyn | dfa7a07 | 2014-02-11 12:29:31 -0800 | [diff] [blame] | 731 | |
Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 732 | LogTimeEntry::unlock(); |
Mark Salyzyn | c5dc970 | 2015-09-16 15:34:00 -0700 | [diff] [blame] | 733 | |
| 734 | return (pruneRows > 0) && busy; |
Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 735 | } |
| 736 | |
| 737 | // clear all rows of type "id" from the buffer. |
Mark Salyzyn | c5dc970 | 2015-09-16 15:34:00 -0700 | [diff] [blame] | 738 | bool LogBuffer::clear(log_id_t id, uid_t uid) { |
| 739 | bool busy = true; |
| 740 | // If it takes more than 4 tries (seconds) to clear, then kill reader(s) |
| 741 | for (int retry = 4;;) { |
| 742 | if (retry == 1) { // last pass |
| 743 | // Check if it is still busy after the sleep, we say prune |
| 744 | // one entry, not another clear run, so we are looking for |
| 745 | // the quick side effect of the return value to tell us if |
| 746 | // we have a _blocked_ reader. |
| 747 | pthread_mutex_lock(&mLogElementsLock); |
| 748 | busy = prune(id, 1, uid); |
| 749 | pthread_mutex_unlock(&mLogElementsLock); |
| 750 | // It is still busy, blocked reader(s), lets kill them all! |
| 751 | // otherwise, lets be a good citizen and preserve the slow |
| 752 | // readers and let the clear run (below) deal with determining |
| 753 | // if we are still blocked and return an error code to caller. |
| 754 | if (busy) { |
| 755 | LogTimeEntry::lock(); |
| 756 | LastLogTimes::iterator times = mTimes.begin(); |
| 757 | while (times != mTimes.end()) { |
| 758 | LogTimeEntry *entry = (*times); |
| 759 | // Killer punch |
| 760 | if (entry->owned_Locked() && entry->isWatching(id)) { |
| 761 | entry->release_Locked(); |
| 762 | } |
| 763 | times++; |
| 764 | } |
| 765 | LogTimeEntry::unlock(); |
| 766 | } |
| 767 | } |
| 768 | pthread_mutex_lock(&mLogElementsLock); |
| 769 | busy = prune(id, ULONG_MAX, uid); |
| 770 | pthread_mutex_unlock(&mLogElementsLock); |
| 771 | if (!busy || !--retry) { |
| 772 | break; |
| 773 | } |
| 774 | sleep (1); // Let reader(s) catch up after notification |
| 775 | } |
| 776 | return busy; |
Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 777 | } |
| 778 | |
| 779 | // get the used space associated with "id". |
| 780 | unsigned long LogBuffer::getSizeUsed(log_id_t id) { |
| 781 | pthread_mutex_lock(&mLogElementsLock); |
Mark Salyzyn | 34facab | 2014-02-06 14:48:50 -0800 | [diff] [blame] | 782 | size_t retval = stats.sizes(id); |
Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 783 | pthread_mutex_unlock(&mLogElementsLock); |
| 784 | return retval; |
| 785 | } |
| 786 | |
Mark Salyzyn | dfa7a07 | 2014-02-11 12:29:31 -0800 | [diff] [blame] | 787 | // set the total space allocated to "id" |
| 788 | int LogBuffer::setSize(log_id_t id, unsigned long size) { |
| 789 | // Reasonable limits ... |
Mark Salyzyn | f10e273 | 2016-09-27 13:08:23 -0700 | [diff] [blame^] | 790 | if (!__android_logger_valid_buffer_size(size)) { |
Mark Salyzyn | dfa7a07 | 2014-02-11 12:29:31 -0800 | [diff] [blame] | 791 | return -1; |
| 792 | } |
| 793 | pthread_mutex_lock(&mLogElementsLock); |
| 794 | log_buffer_size(id) = size; |
| 795 | pthread_mutex_unlock(&mLogElementsLock); |
| 796 | return 0; |
| 797 | } |
| 798 | |
| 799 | // get the total space allocated to "id" |
| 800 | unsigned long LogBuffer::getSize(log_id_t id) { |
| 801 | pthread_mutex_lock(&mLogElementsLock); |
| 802 | size_t retval = log_buffer_size(id); |
| 803 | pthread_mutex_unlock(&mLogElementsLock); |
| 804 | return retval; |
| 805 | } |
| 806 | |
Mark Salyzyn | f7c0f75 | 2015-03-03 13:39:37 -0800 | [diff] [blame] | 807 | uint64_t LogBuffer::flushTo( |
Mark Salyzyn | 8fa8896 | 2016-01-26 14:32:35 -0800 | [diff] [blame] | 808 | SocketClient *reader, const uint64_t start, |
| 809 | bool privileged, bool security, |
Mark Salyzyn | f7c0f75 | 2015-03-03 13:39:37 -0800 | [diff] [blame] | 810 | int (*filter)(const LogBufferElement *element, void *arg), void *arg) { |
Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 811 | LogBufferElementCollection::iterator it; |
Mark Salyzyn | f7c0f75 | 2015-03-03 13:39:37 -0800 | [diff] [blame] | 812 | uint64_t max = start; |
Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 813 | uid_t uid = reader->getUid(); |
| 814 | |
| 815 | pthread_mutex_lock(&mLogElementsLock); |
Dragoslav Mitrinovic | 8e8e8db | 2015-01-15 09:29:43 -0600 | [diff] [blame] | 816 | |
Mark Salyzyn | f7c0f75 | 2015-03-03 13:39:37 -0800 | [diff] [blame] | 817 | if (start <= 1) { |
Dragoslav Mitrinovic | 8e8e8db | 2015-01-15 09:29:43 -0600 | [diff] [blame] | 818 | // client wants to start from the beginning |
| 819 | it = mLogElements.begin(); |
| 820 | } else { |
| 821 | // Client wants to start from some specified time. Chances are |
| 822 | // we are better off starting from the end of the time sorted list. |
| 823 | for (it = mLogElements.end(); it != mLogElements.begin(); /* do nothing */) { |
| 824 | --it; |
| 825 | LogBufferElement *element = *it; |
Mark Salyzyn | f7c0f75 | 2015-03-03 13:39:37 -0800 | [diff] [blame] | 826 | if (element->getSequence() <= start) { |
Dragoslav Mitrinovic | 8e8e8db | 2015-01-15 09:29:43 -0600 | [diff] [blame] | 827 | it++; |
| 828 | break; |
| 829 | } |
| 830 | } |
| 831 | } |
| 832 | |
| 833 | for (; it != mLogElements.end(); ++it) { |
Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 834 | LogBufferElement *element = *it; |
| 835 | |
| 836 | if (!privileged && (element->getUid() != uid)) { |
| 837 | continue; |
| 838 | } |
| 839 | |
Mark Salyzyn | 8fa8896 | 2016-01-26 14:32:35 -0800 | [diff] [blame] | 840 | if (!security && (element->getLogId() == LOG_ID_SECURITY)) { |
| 841 | continue; |
| 842 | } |
| 843 | |
Mark Salyzyn | f7c0f75 | 2015-03-03 13:39:37 -0800 | [diff] [blame] | 844 | if (element->getSequence() <= start) { |
Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 845 | continue; |
| 846 | } |
| 847 | |
| 848 | // NB: calling out to another object with mLogElementsLock held (safe) |
Mark Salyzyn | f7c0f75 | 2015-03-03 13:39:37 -0800 | [diff] [blame] | 849 | if (filter) { |
| 850 | int ret = (*filter)(element, arg); |
| 851 | if (ret == false) { |
| 852 | continue; |
| 853 | } |
| 854 | if (ret != true) { |
| 855 | break; |
| 856 | } |
Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 857 | } |
| 858 | |
| 859 | pthread_mutex_unlock(&mLogElementsLock); |
| 860 | |
| 861 | // range locking in LastLogTimes looks after us |
Mark Salyzyn | 7b87365 | 2015-12-03 15:38:35 -0800 | [diff] [blame] | 862 | max = element->flushTo(reader, this, privileged); |
Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 863 | |
| 864 | if (max == element->FLUSH_ERROR) { |
| 865 | return max; |
| 866 | } |
| 867 | |
| 868 | pthread_mutex_lock(&mLogElementsLock); |
| 869 | } |
| 870 | pthread_mutex_unlock(&mLogElementsLock); |
| 871 | |
| 872 | return max; |
| 873 | } |
Mark Salyzyn | 34facab | 2014-02-06 14:48:50 -0800 | [diff] [blame] | 874 | |
Mark Salyzyn | ee3b838 | 2015-12-17 09:58:43 -0800 | [diff] [blame] | 875 | std::string LogBuffer::formatStatistics(uid_t uid, pid_t pid, |
| 876 | unsigned int logMask) { |
Mark Salyzyn | 34facab | 2014-02-06 14:48:50 -0800 | [diff] [blame] | 877 | pthread_mutex_lock(&mLogElementsLock); |
| 878 | |
Mark Salyzyn | ee3b838 | 2015-12-17 09:58:43 -0800 | [diff] [blame] | 879 | std::string ret = stats.format(uid, pid, logMask); |
Mark Salyzyn | 34facab | 2014-02-06 14:48:50 -0800 | [diff] [blame] | 880 | |
| 881 | pthread_mutex_unlock(&mLogElementsLock); |
Mark Salyzyn | 73160ac | 2015-08-20 10:01:44 -0700 | [diff] [blame] | 882 | |
| 883 | return ret; |
Mark Salyzyn | 34facab | 2014-02-06 14:48:50 -0800 | [diff] [blame] | 884 | } |