| 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 | 671e343 | 2014-05-06 07:34:59 -0700 | [diff] [blame] | 25 | #include <cutils/properties.h> | 
| Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 26 | #include <log/logger.h> | 
|  | 27 |  | 
|  | 28 | #include "LogBuffer.h" | 
| Mark Salyzyn | 671e343 | 2014-05-06 07:34:59 -0700 | [diff] [blame] | 29 | #include "LogReader.h" | 
| Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 30 |  | 
| Mark Salyzyn | dfa7a07 | 2014-02-11 12:29:31 -0800 | [diff] [blame] | 31 | // Default | 
| Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 32 | #define LOG_BUFFER_SIZE (256 * 1024) // Tuned on a per-platform basis here? | 
| Mark Salyzyn | dfa7a07 | 2014-02-11 12:29:31 -0800 | [diff] [blame] | 33 | #define log_buffer_size(id) mMaxSize[id] | 
| Mark Salyzyn | 57a0af9 | 2014-05-09 17:44:18 -0700 | [diff] [blame] | 34 | #define LOG_BUFFER_MIN_SIZE (64 * 1024UL) | 
|  | 35 | #define LOG_BUFFER_MAX_SIZE (256 * 1024 * 1024UL) | 
|  | 36 |  | 
|  | 37 | static bool valid_size(unsigned long value) { | 
|  | 38 | if ((value < LOG_BUFFER_MIN_SIZE) || (LOG_BUFFER_MAX_SIZE < value)) { | 
|  | 39 | return false; | 
|  | 40 | } | 
|  | 41 |  | 
|  | 42 | long pages = sysconf(_SC_PHYS_PAGES); | 
|  | 43 | if (pages < 1) { | 
|  | 44 | return true; | 
|  | 45 | } | 
|  | 46 |  | 
|  | 47 | long pagesize = sysconf(_SC_PAGESIZE); | 
|  | 48 | if (pagesize <= 1) { | 
|  | 49 | pagesize = PAGE_SIZE; | 
|  | 50 | } | 
|  | 51 |  | 
|  | 52 | // maximum memory impact a somewhat arbitrary ~3% | 
|  | 53 | pages = (pages + 31) / 32; | 
|  | 54 | unsigned long maximum = pages * pagesize; | 
|  | 55 |  | 
|  | 56 | if ((maximum < LOG_BUFFER_MIN_SIZE) || (LOG_BUFFER_MAX_SIZE < maximum)) { | 
|  | 57 | return true; | 
|  | 58 | } | 
|  | 59 |  | 
|  | 60 | return value <= maximum; | 
|  | 61 | } | 
| Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 62 |  | 
| Mark Salyzyn | 671e343 | 2014-05-06 07:34:59 -0700 | [diff] [blame] | 63 | static unsigned long property_get_size(const char *key) { | 
|  | 64 | char property[PROPERTY_VALUE_MAX]; | 
|  | 65 | property_get(key, property, ""); | 
|  | 66 |  | 
|  | 67 | char *cp; | 
|  | 68 | unsigned long value = strtoul(property, &cp, 10); | 
|  | 69 |  | 
|  | 70 | switch(*cp) { | 
|  | 71 | case 'm': | 
|  | 72 | case 'M': | 
|  | 73 | value *= 1024; | 
|  | 74 | /* FALLTHRU */ | 
|  | 75 | case 'k': | 
|  | 76 | case 'K': | 
|  | 77 | value *= 1024; | 
|  | 78 | /* FALLTHRU */ | 
|  | 79 | case '\0': | 
|  | 80 | break; | 
|  | 81 |  | 
|  | 82 | default: | 
|  | 83 | value = 0; | 
|  | 84 | } | 
|  | 85 |  | 
| Mark Salyzyn | 57a0af9 | 2014-05-09 17:44:18 -0700 | [diff] [blame] | 86 | if (!valid_size(value)) { | 
|  | 87 | value = 0; | 
|  | 88 | } | 
|  | 89 |  | 
| Mark Salyzyn | 671e343 | 2014-05-06 07:34:59 -0700 | [diff] [blame] | 90 | return value; | 
|  | 91 | } | 
|  | 92 |  | 
| Mark Salyzyn | 11e55cb | 2015-03-10 16:45:17 -0700 | [diff] [blame] | 93 | void LogBuffer::init() { | 
| Mark Salyzyn | 57a0af9 | 2014-05-09 17:44:18 -0700 | [diff] [blame] | 94 | static const char global_tuneable[] = "persist.logd.size"; // Settings App | 
|  | 95 | static const char global_default[] = "ro.logd.size";       // BoardConfig.mk | 
|  | 96 |  | 
|  | 97 | unsigned long default_size = property_get_size(global_tuneable); | 
|  | 98 | if (!default_size) { | 
|  | 99 | default_size = property_get_size(global_default); | 
|  | 100 | } | 
| Mark Salyzyn | 671e343 | 2014-05-06 07:34:59 -0700 | [diff] [blame] | 101 |  | 
| Mark Salyzyn | dfa7a07 | 2014-02-11 12:29:31 -0800 | [diff] [blame] | 102 | log_id_for_each(i) { | 
| Mark Salyzyn | 671e343 | 2014-05-06 07:34:59 -0700 | [diff] [blame] | 103 | char key[PROP_NAME_MAX]; | 
| Mark Salyzyn | 671e343 | 2014-05-06 07:34:59 -0700 | [diff] [blame] | 104 |  | 
| Mark Salyzyn | 57a0af9 | 2014-05-09 17:44:18 -0700 | [diff] [blame] | 105 | snprintf(key, sizeof(key), "%s.%s", | 
|  | 106 | global_tuneable, android_log_id_to_name(i)); | 
|  | 107 | unsigned long property_size = property_get_size(key); | 
|  | 108 |  | 
|  | 109 | if (!property_size) { | 
|  | 110 | snprintf(key, sizeof(key), "%s.%s", | 
|  | 111 | global_default, android_log_id_to_name(i)); | 
|  | 112 | property_size = property_get_size(key); | 
|  | 113 | } | 
|  | 114 |  | 
|  | 115 | if (!property_size) { | 
|  | 116 | property_size = default_size; | 
|  | 117 | } | 
|  | 118 |  | 
|  | 119 | if (!property_size) { | 
|  | 120 | property_size = LOG_BUFFER_SIZE; | 
|  | 121 | } | 
|  | 122 |  | 
|  | 123 | if (setSize(i, property_size)) { | 
|  | 124 | setSize(i, LOG_BUFFER_MIN_SIZE); | 
|  | 125 | } | 
| Mark Salyzyn | dfa7a07 | 2014-02-11 12:29:31 -0800 | [diff] [blame] | 126 | } | 
| Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 127 | } | 
|  | 128 |  | 
| Mark Salyzyn | 11e55cb | 2015-03-10 16:45:17 -0700 | [diff] [blame] | 129 | LogBuffer::LogBuffer(LastLogTimes *times) | 
|  | 130 | : mTimes(*times) { | 
|  | 131 | pthread_mutex_init(&mLogElementsLock, NULL); | 
|  | 132 |  | 
|  | 133 | init(); | 
|  | 134 | } | 
|  | 135 |  | 
| Mark Salyzyn | 202e153 | 2015-02-09 08:21:05 -0800 | [diff] [blame] | 136 | int LogBuffer::log(log_id_t log_id, log_time realtime, | 
|  | 137 | uid_t uid, pid_t pid, pid_t tid, | 
|  | 138 | const char *msg, unsigned short len) { | 
| Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 139 | if ((log_id >= LOG_ID_MAX) || (log_id < 0)) { | 
| Mark Salyzyn | 202e153 | 2015-02-09 08:21:05 -0800 | [diff] [blame] | 140 | return -EINVAL; | 
| Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 141 | } | 
|  | 142 | LogBufferElement *elem = new LogBufferElement(log_id, realtime, | 
| Mark Salyzyn | b992d0d | 2014-03-20 16:09:38 -0700 | [diff] [blame] | 143 | uid, pid, tid, msg, len); | 
| Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 144 |  | 
|  | 145 | pthread_mutex_lock(&mLogElementsLock); | 
|  | 146 |  | 
|  | 147 | // Insert elements in time sorted order if possible | 
|  | 148 | //  NB: if end is region locked, place element at end of list | 
|  | 149 | LogBufferElementCollection::iterator it = mLogElements.end(); | 
|  | 150 | LogBufferElementCollection::iterator last = it; | 
| Mark Salyzyn | eae155e | 2014-10-13 16:49:47 -0700 | [diff] [blame] | 151 | while (last != mLogElements.begin()) { | 
|  | 152 | --it; | 
| Mark Salyzyn | c03e72c | 2014-02-18 11:23:53 -0800 | [diff] [blame] | 153 | if ((*it)->getRealTime() <= realtime) { | 
| Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 154 | break; | 
|  | 155 | } | 
|  | 156 | last = it; | 
|  | 157 | } | 
| Mark Salyzyn | c03e72c | 2014-02-18 11:23:53 -0800 | [diff] [blame] | 158 |  | 
| Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 159 | if (last == mLogElements.end()) { | 
|  | 160 | mLogElements.push_back(elem); | 
|  | 161 | } else { | 
| Mark Salyzyn | f7c0f75 | 2015-03-03 13:39:37 -0800 | [diff] [blame] | 162 | uint64_t end = 1; | 
| Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 163 | bool end_set = false; | 
|  | 164 | bool end_always = false; | 
|  | 165 |  | 
|  | 166 | LogTimeEntry::lock(); | 
|  | 167 |  | 
|  | 168 | LastLogTimes::iterator t = mTimes.begin(); | 
|  | 169 | while(t != mTimes.end()) { | 
|  | 170 | LogTimeEntry *entry = (*t); | 
|  | 171 | if (entry->owned_Locked()) { | 
|  | 172 | if (!entry->mNonBlock) { | 
|  | 173 | end_always = true; | 
|  | 174 | break; | 
|  | 175 | } | 
|  | 176 | if (!end_set || (end <= entry->mEnd)) { | 
|  | 177 | end = entry->mEnd; | 
|  | 178 | end_set = true; | 
|  | 179 | } | 
|  | 180 | } | 
|  | 181 | t++; | 
|  | 182 | } | 
|  | 183 |  | 
|  | 184 | if (end_always | 
| Mark Salyzyn | f7c0f75 | 2015-03-03 13:39:37 -0800 | [diff] [blame] | 185 | || (end_set && (end >= (*last)->getSequence()))) { | 
| Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 186 | mLogElements.push_back(elem); | 
|  | 187 | } else { | 
|  | 188 | mLogElements.insert(last,elem); | 
|  | 189 | } | 
|  | 190 |  | 
|  | 191 | LogTimeEntry::unlock(); | 
|  | 192 | } | 
|  | 193 |  | 
| Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 194 | stats.add(elem); | 
| Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 195 | maybePrune(log_id); | 
|  | 196 | pthread_mutex_unlock(&mLogElementsLock); | 
| Mark Salyzyn | 202e153 | 2015-02-09 08:21:05 -0800 | [diff] [blame] | 197 |  | 
|  | 198 | return len; | 
| Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 199 | } | 
|  | 200 |  | 
|  | 201 | // If we're using more than 256K of memory for log entries, prune | 
| Mark Salyzyn | 740f9b4 | 2014-01-13 16:37:51 -0800 | [diff] [blame] | 202 | // at least 10% of the log entries. | 
| Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 203 | // | 
|  | 204 | // mLogElementsLock must be held when this function is called. | 
|  | 205 | void LogBuffer::maybePrune(log_id_t id) { | 
| Mark Salyzyn | 34facab | 2014-02-06 14:48:50 -0800 | [diff] [blame] | 206 | size_t sizes = stats.sizes(id); | 
| Mark Salyzyn | dfa7a07 | 2014-02-11 12:29:31 -0800 | [diff] [blame] | 207 | if (sizes > log_buffer_size(id)) { | 
|  | 208 | size_t sizeOver90Percent = sizes - ((log_buffer_size(id) * 9) / 10); | 
| Mark Salyzyn | 34facab | 2014-02-06 14:48:50 -0800 | [diff] [blame] | 209 | size_t elements = stats.elements(id); | 
| Mark Salyzyn | 740f9b4 | 2014-01-13 16:37:51 -0800 | [diff] [blame] | 210 | unsigned long pruneRows = elements * sizeOver90Percent / sizes; | 
|  | 211 | elements /= 10; | 
|  | 212 | if (pruneRows <= elements) { | 
|  | 213 | pruneRows = elements; | 
|  | 214 | } | 
|  | 215 | prune(id, pruneRows); | 
| Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 216 | } | 
|  | 217 | } | 
|  | 218 |  | 
| Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 219 | LogBufferElementCollection::iterator LogBuffer::erase(LogBufferElementCollection::iterator it) { | 
|  | 220 | LogBufferElement *e = *it; | 
|  | 221 |  | 
|  | 222 | it = mLogElements.erase(it); | 
|  | 223 | stats.subtract(e); | 
|  | 224 | delete e; | 
|  | 225 |  | 
|  | 226 | return it; | 
|  | 227 | } | 
|  | 228 |  | 
| Mark Salyzyn | 2c9d909 | 2015-04-17 15:38:04 -0700 | [diff] [blame] | 229 | // Define a temporary mechanism to report the last LogBufferElement pointer | 
|  | 230 | // for the specified uid, pid and tid. Used below to help merge-sort when | 
|  | 231 | // pruning for worst UID. | 
|  | 232 | class LogBufferElementKey { | 
|  | 233 | const union { | 
|  | 234 | struct { | 
|  | 235 | uint16_t uid; | 
|  | 236 | uint16_t pid; | 
|  | 237 | uint16_t tid; | 
|  | 238 | uint16_t padding; | 
|  | 239 | } __packed; | 
|  | 240 | uint64_t value; | 
|  | 241 | } __packed; | 
|  | 242 |  | 
|  | 243 | public: | 
|  | 244 | LogBufferElementKey(uid_t u, pid_t p, pid_t t):uid(u),pid(p),tid(t),padding(0) { } | 
|  | 245 | LogBufferElementKey(uint64_t k):value(k) { } | 
|  | 246 |  | 
|  | 247 | uint64_t getKey() { return value; } | 
|  | 248 | }; | 
|  | 249 |  | 
| Mark Salyzyn | e06a6e0 | 2015-04-20 14:08:56 -0700 | [diff] [blame] | 250 | class LogBufferElementEntry { | 
| Mark Salyzyn | 2c9d909 | 2015-04-17 15:38:04 -0700 | [diff] [blame] | 251 | const uint64_t key; | 
|  | 252 | LogBufferElement *last; | 
|  | 253 |  | 
|  | 254 | public: | 
|  | 255 | LogBufferElementEntry(const uint64_t &k, LogBufferElement *e):key(k),last(e) { } | 
|  | 256 |  | 
|  | 257 | const uint64_t&getKey() const { return key; } | 
|  | 258 |  | 
|  | 259 | LogBufferElement *getLast() { return last; } | 
|  | 260 | }; | 
|  | 261 |  | 
| Mark Salyzyn | e06a6e0 | 2015-04-20 14:08:56 -0700 | [diff] [blame] | 262 | class LogBufferElementLast : public android::BasicHashtable<uint64_t, LogBufferElementEntry> { | 
| Mark Salyzyn | 2c9d909 | 2015-04-17 15:38:04 -0700 | [diff] [blame] | 263 |  | 
| Mark Salyzyn | e06a6e0 | 2015-04-20 14:08:56 -0700 | [diff] [blame] | 264 | public: | 
| Mark Salyzyn | 2c9d909 | 2015-04-17 15:38:04 -0700 | [diff] [blame] | 265 | bool merge(LogBufferElement *e, unsigned short dropped) { | 
|  | 266 | LogBufferElementKey key(e->getUid(), e->getPid(), e->getTid()); | 
|  | 267 | android::hash_t hash = android::hash_type(key.getKey()); | 
|  | 268 | ssize_t index = find(-1, hash, key.getKey()); | 
|  | 269 | if (index != -1) { | 
|  | 270 | LogBufferElementEntry &entry = editEntryAt(index); | 
|  | 271 | LogBufferElement *l = entry.getLast(); | 
|  | 272 | unsigned short d = l->getDropped(); | 
|  | 273 | if ((dropped + d) > USHRT_MAX) { | 
|  | 274 | removeAt(index); | 
|  | 275 | } else { | 
|  | 276 | l->setDropped(dropped + d); | 
|  | 277 | return true; | 
|  | 278 | } | 
|  | 279 | } | 
|  | 280 | return false; | 
|  | 281 | } | 
|  | 282 |  | 
|  | 283 | size_t add(LogBufferElement *e) { | 
|  | 284 | LogBufferElementKey key(e->getUid(), e->getPid(), e->getTid()); | 
|  | 285 | android::hash_t hash = android::hash_type(key.getKey()); | 
|  | 286 | return android::BasicHashtable<uint64_t, LogBufferElementEntry>:: | 
|  | 287 | add(hash, LogBufferElementEntry(key.getKey(), e)); | 
|  | 288 | } | 
|  | 289 |  | 
| Mark Salyzyn | e06a6e0 | 2015-04-20 14:08:56 -0700 | [diff] [blame] | 290 | inline void clear() { | 
|  | 291 | android::BasicHashtable<uint64_t, LogBufferElementEntry>::clear(); | 
|  | 292 | } | 
|  | 293 |  | 
|  | 294 | void clear(LogBufferElement *e) { | 
|  | 295 | uint64_t current = e->getRealTime().nsec() - NS_PER_SEC; | 
|  | 296 | ssize_t index = -1; | 
|  | 297 | while((index = next(index)) >= 0) { | 
| Mark Salyzyn | 35173a9 | 2015-04-23 07:47:54 -0700 | [diff] [blame] | 298 | LogBufferElement *l = editEntryAt(index).getLast(); | 
|  | 299 | if ((l->getDropped() >= 4) && (current > l->getRealTime().nsec())) { | 
| Mark Salyzyn | e06a6e0 | 2015-04-20 14:08:56 -0700 | [diff] [blame] | 300 | removeAt(index); | 
|  | 301 | index = -1; | 
|  | 302 | } | 
|  | 303 | } | 
|  | 304 | } | 
|  | 305 |  | 
| Mark Salyzyn | 2c9d909 | 2015-04-17 15:38:04 -0700 | [diff] [blame] | 306 | }; | 
|  | 307 |  | 
| Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 308 | // prune "pruneRows" of type "id" from the buffer. | 
|  | 309 | // | 
|  | 310 | // mLogElementsLock must be held when this function is called. | 
| Mark Salyzyn | 1a240b4 | 2014-06-12 11:16:16 -0700 | [diff] [blame] | 311 | void 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] | 312 | LogTimeEntry *oldest = NULL; | 
|  | 313 |  | 
|  | 314 | LogTimeEntry::lock(); | 
|  | 315 |  | 
|  | 316 | // Region locked? | 
|  | 317 | LastLogTimes::iterator t = mTimes.begin(); | 
|  | 318 | while(t != mTimes.end()) { | 
|  | 319 | LogTimeEntry *entry = (*t); | 
| TraianX Schiau | da6495d | 2014-12-17 10:53:41 +0200 | [diff] [blame] | 320 | if (entry->owned_Locked() && entry->isWatching(id) | 
| Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 321 | && (!oldest || (oldest->mStart > entry->mStart))) { | 
|  | 322 | oldest = entry; | 
|  | 323 | } | 
|  | 324 | t++; | 
|  | 325 | } | 
|  | 326 |  | 
| Mark Salyzyn | 64d6fe9 | 2014-02-06 18:11:13 -0800 | [diff] [blame] | 327 | LogBufferElementCollection::iterator it; | 
|  | 328 |  | 
| Mark Salyzyn | 1a240b4 | 2014-06-12 11:16:16 -0700 | [diff] [blame] | 329 | if (caller_uid != AID_ROOT) { | 
|  | 330 | for(it = mLogElements.begin(); it != mLogElements.end();) { | 
|  | 331 | LogBufferElement *e = *it; | 
|  | 332 |  | 
| Mark Salyzyn | f7c0f75 | 2015-03-03 13:39:37 -0800 | [diff] [blame] | 333 | if (oldest && (oldest->mStart <= e->getSequence())) { | 
| Mark Salyzyn | 1a240b4 | 2014-06-12 11:16:16 -0700 | [diff] [blame] | 334 | break; | 
|  | 335 | } | 
|  | 336 |  | 
|  | 337 | if (e->getLogId() != id) { | 
|  | 338 | ++it; | 
|  | 339 | continue; | 
|  | 340 | } | 
|  | 341 |  | 
| Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 342 | if (e->getUid() == caller_uid) { | 
|  | 343 | it = erase(it); | 
| Mark Salyzyn | 1a240b4 | 2014-06-12 11:16:16 -0700 | [diff] [blame] | 344 | pruneRows--; | 
|  | 345 | if (pruneRows == 0) { | 
|  | 346 | break; | 
|  | 347 | } | 
|  | 348 | } else { | 
|  | 349 | ++it; | 
|  | 350 | } | 
|  | 351 | } | 
|  | 352 | LogTimeEntry::unlock(); | 
|  | 353 | return; | 
|  | 354 | } | 
|  | 355 |  | 
| Mark Salyzyn | 64d6fe9 | 2014-02-06 18:11:13 -0800 | [diff] [blame] | 356 | // prune by worst offender by uid | 
| Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 357 | bool hasBlacklist = mPrune.naughty(); | 
| Mark Salyzyn | 64d6fe9 | 2014-02-06 18:11:13 -0800 | [diff] [blame] | 358 | while (pruneRows > 0) { | 
|  | 359 | // recalculate the worst offender on every batched pass | 
|  | 360 | uid_t worst = (uid_t) -1; | 
|  | 361 | size_t worst_sizes = 0; | 
|  | 362 | size_t second_worst_sizes = 0; | 
|  | 363 |  | 
| Mark Salyzyn | ae76923 | 2015-03-17 17:17:25 -0700 | [diff] [blame] | 364 | if (worstUidEnabledForLogid(id) && mPrune.worstUidEnabled()) { | 
| Mark Salyzyn | 720f6d1 | 2015-03-16 08:26:05 -0700 | [diff] [blame] | 365 | std::unique_ptr<const UidEntry *[]> sorted = stats.sort(2, id); | 
| Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 366 |  | 
| Mark Salyzyn | 720f6d1 | 2015-03-16 08:26:05 -0700 | [diff] [blame] | 367 | if (sorted.get()) { | 
| Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 368 | if (sorted[0] && sorted[1]) { | 
| Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 369 | worst_sizes = sorted[0]->getSizes(); | 
| Mark Salyzyn | d717d80 | 2015-04-20 15:36:12 -0700 | [diff] [blame] | 370 | // Calculate threshold as 12.5% of available storage | 
|  | 371 | size_t threshold = log_buffer_size(id) / 8; | 
|  | 372 | if (worst_sizes > threshold) { | 
|  | 373 | worst = sorted[0]->getKey(); | 
|  | 374 | second_worst_sizes = sorted[1]->getSizes(); | 
|  | 375 | if (second_worst_sizes < threshold) { | 
|  | 376 | second_worst_sizes = threshold; | 
|  | 377 | } | 
|  | 378 | } | 
| Mark Salyzyn | dfa7a07 | 2014-02-11 12:29:31 -0800 | [diff] [blame] | 379 | } | 
| Mark Salyzyn | 64d6fe9 | 2014-02-06 18:11:13 -0800 | [diff] [blame] | 380 | } | 
|  | 381 | } | 
|  | 382 |  | 
| Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 383 | // skip if we have neither worst nor naughty filters | 
|  | 384 | if ((worst == (uid_t) -1) && !hasBlacklist) { | 
|  | 385 | break; | 
|  | 386 | } | 
|  | 387 |  | 
| Mark Salyzyn | 64d6fe9 | 2014-02-06 18:11:13 -0800 | [diff] [blame] | 388 | bool kick = false; | 
| Mark Salyzyn | ab0dcf6 | 2015-03-16 12:04:09 -0700 | [diff] [blame] | 389 | bool leading = true; | 
| Mark Salyzyn | 2c9d909 | 2015-04-17 15:38:04 -0700 | [diff] [blame] | 390 | LogBufferElementLast last; | 
| Mark Salyzyn | 64d6fe9 | 2014-02-06 18:11:13 -0800 | [diff] [blame] | 391 | for(it = mLogElements.begin(); it != mLogElements.end();) { | 
|  | 392 | LogBufferElement *e = *it; | 
|  | 393 |  | 
| Mark Salyzyn | f7c0f75 | 2015-03-03 13:39:37 -0800 | [diff] [blame] | 394 | if (oldest && (oldest->mStart <= e->getSequence())) { | 
| Mark Salyzyn | 64d6fe9 | 2014-02-06 18:11:13 -0800 | [diff] [blame] | 395 | break; | 
|  | 396 | } | 
|  | 397 |  | 
| Mark Salyzyn | dfa7a07 | 2014-02-11 12:29:31 -0800 | [diff] [blame] | 398 | if (e->getLogId() != id) { | 
|  | 399 | ++it; | 
|  | 400 | continue; | 
|  | 401 | } | 
|  | 402 |  | 
| Mark Salyzyn | ab0dcf6 | 2015-03-16 12:04:09 -0700 | [diff] [blame] | 403 | unsigned short dropped = e->getDropped(); | 
| Mark Salyzyn | dfa7a07 | 2014-02-11 12:29:31 -0800 | [diff] [blame] | 404 |  | 
| Mark Salyzyn | ab0dcf6 | 2015-03-16 12:04:09 -0700 | [diff] [blame] | 405 | // remove any leading drops | 
|  | 406 | if (leading && dropped) { | 
|  | 407 | it = erase(it); | 
|  | 408 | continue; | 
|  | 409 | } | 
|  | 410 |  | 
| Mark Salyzyn | ab0dcf6 | 2015-03-16 12:04:09 -0700 | [diff] [blame] | 411 | // merge any drops | 
| Mark Salyzyn | 2c9d909 | 2015-04-17 15:38:04 -0700 | [diff] [blame] | 412 | if (dropped && last.merge(e, dropped)) { | 
| Mark Salyzyn | ab0dcf6 | 2015-03-16 12:04:09 -0700 | [diff] [blame] | 413 | it = mLogElements.erase(it); | 
|  | 414 | stats.erase(e); | 
|  | 415 | delete e; | 
| Mark Salyzyn | ab0dcf6 | 2015-03-16 12:04:09 -0700 | [diff] [blame] | 416 | continue; | 
|  | 417 | } | 
|  | 418 |  | 
|  | 419 | leading = false; | 
|  | 420 |  | 
|  | 421 | if (hasBlacklist && mPrune.naughty(e)) { | 
| Mark Salyzyn | e06a6e0 | 2015-04-20 14:08:56 -0700 | [diff] [blame] | 422 | last.clear(e); | 
| Mark Salyzyn | ab0dcf6 | 2015-03-16 12:04:09 -0700 | [diff] [blame] | 423 | it = erase(it); | 
|  | 424 | if (dropped) { | 
|  | 425 | continue; | 
|  | 426 | } | 
|  | 427 |  | 
|  | 428 | pruneRows--; | 
|  | 429 | if (pruneRows == 0) { | 
|  | 430 | break; | 
|  | 431 | } | 
|  | 432 |  | 
|  | 433 | if (e->getUid() == worst) { | 
|  | 434 | kick = true; | 
|  | 435 | if (worst_sizes < second_worst_sizes) { | 
|  | 436 | break; | 
|  | 437 | } | 
|  | 438 | worst_sizes -= e->getMsgLen(); | 
|  | 439 | } | 
|  | 440 | continue; | 
|  | 441 | } | 
|  | 442 |  | 
|  | 443 | if (dropped) { | 
| Mark Salyzyn | 2c9d909 | 2015-04-17 15:38:04 -0700 | [diff] [blame] | 444 | last.add(e); | 
| Mark Salyzyn | 64d6fe9 | 2014-02-06 18:11:13 -0800 | [diff] [blame] | 445 | ++it; | 
| Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 446 | continue; | 
| Mark Salyzyn | 64d6fe9 | 2014-02-06 18:11:13 -0800 | [diff] [blame] | 447 | } | 
| Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 448 |  | 
| Mark Salyzyn | ab0dcf6 | 2015-03-16 12:04:09 -0700 | [diff] [blame] | 449 | if (e->getUid() != worst) { | 
| Mark Salyzyn | e06a6e0 | 2015-04-20 14:08:56 -0700 | [diff] [blame] | 450 | last.clear(e); | 
| Mark Salyzyn | ab0dcf6 | 2015-03-16 12:04:09 -0700 | [diff] [blame] | 451 | ++it; | 
|  | 452 | continue; | 
|  | 453 | } | 
|  | 454 |  | 
| Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 455 | pruneRows--; | 
|  | 456 | if (pruneRows == 0) { | 
|  | 457 | break; | 
|  | 458 | } | 
|  | 459 |  | 
| Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 460 | kick = true; | 
| Mark Salyzyn | ab0dcf6 | 2015-03-16 12:04:09 -0700 | [diff] [blame] | 461 |  | 
|  | 462 | unsigned short len = e->getMsgLen(); | 
|  | 463 | stats.drop(e); | 
|  | 464 | e->setDropped(1); | 
| Mark Salyzyn | 2c9d909 | 2015-04-17 15:38:04 -0700 | [diff] [blame] | 465 | if (last.merge(e, 1)) { | 
| Mark Salyzyn | ab0dcf6 | 2015-03-16 12:04:09 -0700 | [diff] [blame] | 466 | it = mLogElements.erase(it); | 
|  | 467 | stats.erase(e); | 
|  | 468 | delete e; | 
| Mark Salyzyn | ab0dcf6 | 2015-03-16 12:04:09 -0700 | [diff] [blame] | 469 | } else { | 
| Mark Salyzyn | 2c9d909 | 2015-04-17 15:38:04 -0700 | [diff] [blame] | 470 | last.add(e); | 
| Mark Salyzyn | ab0dcf6 | 2015-03-16 12:04:09 -0700 | [diff] [blame] | 471 | ++it; | 
|  | 472 | } | 
| Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 473 | if (worst_sizes < second_worst_sizes) { | 
|  | 474 | break; | 
|  | 475 | } | 
|  | 476 | worst_sizes -= len; | 
| Mark Salyzyn | 64d6fe9 | 2014-02-06 18:11:13 -0800 | [diff] [blame] | 477 | } | 
| Mark Salyzyn | 2c9d909 | 2015-04-17 15:38:04 -0700 | [diff] [blame] | 478 | last.clear(); | 
| Mark Salyzyn | 64d6fe9 | 2014-02-06 18:11:13 -0800 | [diff] [blame] | 479 |  | 
| Mark Salyzyn | 1c95047 | 2014-04-01 17:19:47 -0700 | [diff] [blame] | 480 | if (!kick || !mPrune.worstUidEnabled()) { | 
| Mark Salyzyn | 64d6fe9 | 2014-02-06 18:11:13 -0800 | [diff] [blame] | 481 | break; // the following loop will ask bad clients to skip/drop | 
|  | 482 | } | 
|  | 483 | } | 
|  | 484 |  | 
| Mark Salyzyn | dfa7a07 | 2014-02-11 12:29:31 -0800 | [diff] [blame] | 485 | bool whitelist = false; | 
| Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 486 | bool hasWhitelist = mPrune.nice(); | 
| Mark Salyzyn | 64d6fe9 | 2014-02-06 18:11:13 -0800 | [diff] [blame] | 487 | it = mLogElements.begin(); | 
| Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 488 | while((pruneRows > 0) && (it != mLogElements.end())) { | 
|  | 489 | LogBufferElement *e = *it; | 
| Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 490 |  | 
|  | 491 | if (e->getLogId() != id) { | 
|  | 492 | it++; | 
|  | 493 | continue; | 
|  | 494 | } | 
|  | 495 |  | 
|  | 496 | if (oldest && (oldest->mStart <= e->getSequence())) { | 
|  | 497 | if (whitelist) { | 
| Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 498 | break; | 
|  | 499 | } | 
| Mark Salyzyn | 1c95047 | 2014-04-01 17:19:47 -0700 | [diff] [blame] | 500 |  | 
| Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 501 | if (stats.sizes(id) > (2 * log_buffer_size(id))) { | 
|  | 502 | // kick a misbehaving log reader client off the island | 
|  | 503 | oldest->release_Locked(); | 
|  | 504 | } else { | 
|  | 505 | oldest->triggerSkip_Locked(id, pruneRows); | 
| Mark Salyzyn | dfa7a07 | 2014-02-11 12:29:31 -0800 | [diff] [blame] | 506 | } | 
| Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 507 | break; | 
| Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 508 | } | 
| Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 509 |  | 
|  | 510 | if (hasWhitelist && mPrune.nice(e)) { // WhiteListed | 
|  | 511 | whitelist = true; | 
|  | 512 | it++; | 
|  | 513 | continue; | 
|  | 514 | } | 
|  | 515 |  | 
|  | 516 | it = erase(it); | 
|  | 517 | pruneRows--; | 
| Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 518 | } | 
|  | 519 |  | 
| Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 520 | // Do not save the whitelist if we are reader range limited | 
| Mark Salyzyn | dfa7a07 | 2014-02-11 12:29:31 -0800 | [diff] [blame] | 521 | if (whitelist && (pruneRows > 0)) { | 
|  | 522 | it = mLogElements.begin(); | 
|  | 523 | while((it != mLogElements.end()) && (pruneRows > 0)) { | 
|  | 524 | LogBufferElement *e = *it; | 
| Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 525 |  | 
|  | 526 | if (e->getLogId() != id) { | 
|  | 527 | ++it; | 
|  | 528 | continue; | 
| Mark Salyzyn | dfa7a07 | 2014-02-11 12:29:31 -0800 | [diff] [blame] | 529 | } | 
| Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 530 |  | 
|  | 531 | if (oldest && (oldest->mStart <= e->getSequence())) { | 
|  | 532 | if (stats.sizes(id) > (2 * log_buffer_size(id))) { | 
|  | 533 | // kick a misbehaving log reader client off the island | 
|  | 534 | oldest->release_Locked(); | 
|  | 535 | } else { | 
|  | 536 | oldest->triggerSkip_Locked(id, pruneRows); | 
|  | 537 | } | 
|  | 538 | break; | 
|  | 539 | } | 
|  | 540 |  | 
|  | 541 | it = erase(it); | 
|  | 542 | pruneRows--; | 
| Mark Salyzyn | dfa7a07 | 2014-02-11 12:29:31 -0800 | [diff] [blame] | 543 | } | 
|  | 544 | } | 
| Mark Salyzyn | dfa7a07 | 2014-02-11 12:29:31 -0800 | [diff] [blame] | 545 |  | 
| Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 546 | LogTimeEntry::unlock(); | 
|  | 547 | } | 
|  | 548 |  | 
|  | 549 | // clear all rows of type "id" from the buffer. | 
| Mark Salyzyn | 1a240b4 | 2014-06-12 11:16:16 -0700 | [diff] [blame] | 550 | void LogBuffer::clear(log_id_t id, uid_t uid) { | 
| Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 551 | pthread_mutex_lock(&mLogElementsLock); | 
| Mark Salyzyn | 1a240b4 | 2014-06-12 11:16:16 -0700 | [diff] [blame] | 552 | prune(id, ULONG_MAX, uid); | 
| Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 553 | pthread_mutex_unlock(&mLogElementsLock); | 
|  | 554 | } | 
|  | 555 |  | 
|  | 556 | // get the used space associated with "id". | 
|  | 557 | unsigned long LogBuffer::getSizeUsed(log_id_t id) { | 
|  | 558 | pthread_mutex_lock(&mLogElementsLock); | 
| Mark Salyzyn | 34facab | 2014-02-06 14:48:50 -0800 | [diff] [blame] | 559 | size_t retval = stats.sizes(id); | 
| Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 560 | pthread_mutex_unlock(&mLogElementsLock); | 
|  | 561 | return retval; | 
|  | 562 | } | 
|  | 563 |  | 
| Mark Salyzyn | dfa7a07 | 2014-02-11 12:29:31 -0800 | [diff] [blame] | 564 | // set the total space allocated to "id" | 
|  | 565 | int LogBuffer::setSize(log_id_t id, unsigned long size) { | 
|  | 566 | // Reasonable limits ... | 
| Mark Salyzyn | 57a0af9 | 2014-05-09 17:44:18 -0700 | [diff] [blame] | 567 | if (!valid_size(size)) { | 
| Mark Salyzyn | dfa7a07 | 2014-02-11 12:29:31 -0800 | [diff] [blame] | 568 | return -1; | 
|  | 569 | } | 
|  | 570 | pthread_mutex_lock(&mLogElementsLock); | 
|  | 571 | log_buffer_size(id) = size; | 
|  | 572 | pthread_mutex_unlock(&mLogElementsLock); | 
|  | 573 | return 0; | 
|  | 574 | } | 
|  | 575 |  | 
|  | 576 | // get the total space allocated to "id" | 
|  | 577 | unsigned long LogBuffer::getSize(log_id_t id) { | 
|  | 578 | pthread_mutex_lock(&mLogElementsLock); | 
|  | 579 | size_t retval = log_buffer_size(id); | 
|  | 580 | pthread_mutex_unlock(&mLogElementsLock); | 
|  | 581 | return retval; | 
|  | 582 | } | 
|  | 583 |  | 
| Mark Salyzyn | f7c0f75 | 2015-03-03 13:39:37 -0800 | [diff] [blame] | 584 | uint64_t LogBuffer::flushTo( | 
|  | 585 | SocketClient *reader, const uint64_t start, bool privileged, | 
|  | 586 | int (*filter)(const LogBufferElement *element, void *arg), void *arg) { | 
| Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 587 | LogBufferElementCollection::iterator it; | 
| Mark Salyzyn | f7c0f75 | 2015-03-03 13:39:37 -0800 | [diff] [blame] | 588 | uint64_t max = start; | 
| Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 589 | uid_t uid = reader->getUid(); | 
|  | 590 |  | 
|  | 591 | pthread_mutex_lock(&mLogElementsLock); | 
| Dragoslav Mitrinovic | 8e8e8db | 2015-01-15 09:29:43 -0600 | [diff] [blame] | 592 |  | 
| Mark Salyzyn | f7c0f75 | 2015-03-03 13:39:37 -0800 | [diff] [blame] | 593 | if (start <= 1) { | 
| Dragoslav Mitrinovic | 8e8e8db | 2015-01-15 09:29:43 -0600 | [diff] [blame] | 594 | // client wants to start from the beginning | 
|  | 595 | it = mLogElements.begin(); | 
|  | 596 | } else { | 
|  | 597 | // Client wants to start from some specified time. Chances are | 
|  | 598 | // we are better off starting from the end of the time sorted list. | 
|  | 599 | for (it = mLogElements.end(); it != mLogElements.begin(); /* do nothing */) { | 
|  | 600 | --it; | 
|  | 601 | LogBufferElement *element = *it; | 
| Mark Salyzyn | f7c0f75 | 2015-03-03 13:39:37 -0800 | [diff] [blame] | 602 | if (element->getSequence() <= start) { | 
| Dragoslav Mitrinovic | 8e8e8db | 2015-01-15 09:29:43 -0600 | [diff] [blame] | 603 | it++; | 
|  | 604 | break; | 
|  | 605 | } | 
|  | 606 | } | 
|  | 607 | } | 
|  | 608 |  | 
|  | 609 | for (; it != mLogElements.end(); ++it) { | 
| Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 610 | LogBufferElement *element = *it; | 
|  | 611 |  | 
|  | 612 | if (!privileged && (element->getUid() != uid)) { | 
|  | 613 | continue; | 
|  | 614 | } | 
|  | 615 |  | 
| Mark Salyzyn | f7c0f75 | 2015-03-03 13:39:37 -0800 | [diff] [blame] | 616 | if (element->getSequence() <= start) { | 
| Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 617 | continue; | 
|  | 618 | } | 
|  | 619 |  | 
|  | 620 | // NB: calling out to another object with mLogElementsLock held (safe) | 
| Mark Salyzyn | f7c0f75 | 2015-03-03 13:39:37 -0800 | [diff] [blame] | 621 | if (filter) { | 
|  | 622 | int ret = (*filter)(element, arg); | 
|  | 623 | if (ret == false) { | 
|  | 624 | continue; | 
|  | 625 | } | 
|  | 626 | if (ret != true) { | 
|  | 627 | break; | 
|  | 628 | } | 
| Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 629 | } | 
|  | 630 |  | 
|  | 631 | pthread_mutex_unlock(&mLogElementsLock); | 
|  | 632 |  | 
|  | 633 | // range locking in LastLogTimes looks after us | 
| Mark Salyzyn | 21fb7e0 | 2015-04-20 07:26:27 -0700 | [diff] [blame^] | 634 | max = element->flushTo(reader, this); | 
| Mark Salyzyn | 0175b07 | 2014-02-26 09:50:16 -0800 | [diff] [blame] | 635 |  | 
|  | 636 | if (max == element->FLUSH_ERROR) { | 
|  | 637 | return max; | 
|  | 638 | } | 
|  | 639 |  | 
|  | 640 | pthread_mutex_lock(&mLogElementsLock); | 
|  | 641 | } | 
|  | 642 | pthread_mutex_unlock(&mLogElementsLock); | 
|  | 643 |  | 
|  | 644 | return max; | 
|  | 645 | } | 
| Mark Salyzyn | 34facab | 2014-02-06 14:48:50 -0800 | [diff] [blame] | 646 |  | 
| Mark Salyzyn | dfa7a07 | 2014-02-11 12:29:31 -0800 | [diff] [blame] | 647 | void LogBuffer::formatStatistics(char **strp, uid_t uid, unsigned int logMask) { | 
| Mark Salyzyn | 34facab | 2014-02-06 14:48:50 -0800 | [diff] [blame] | 648 | pthread_mutex_lock(&mLogElementsLock); | 
|  | 649 |  | 
| Mark Salyzyn | 97c1c2b | 2015-03-10 13:51:35 -0700 | [diff] [blame] | 650 | stats.format(strp, uid, logMask); | 
| Mark Salyzyn | 34facab | 2014-02-06 14:48:50 -0800 | [diff] [blame] | 651 |  | 
|  | 652 | pthread_mutex_unlock(&mLogElementsLock); | 
| Mark Salyzyn | 34facab | 2014-02-06 14:48:50 -0800 | [diff] [blame] | 653 | } |