Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 1 | /* |
| 2 | * Copyright (C) 2013 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 | |
| 17 | #define LOG_TAG "NBLog" |
| 18 | //#define LOG_NDEBUG 0 |
| 19 | |
Nicolas Roulet | dcdfaec | 2017-02-14 10:18:39 -0800 | [diff] [blame] | 20 | #include <climits> |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 21 | #include <stdarg.h> |
| 22 | #include <stdint.h> |
| 23 | #include <stdio.h> |
| 24 | #include <string.h> |
Nicolas Roulet | c20cb50 | 2017-02-01 12:35:24 -0800 | [diff] [blame] | 25 | #include <sys/prctl.h> |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 26 | #include <time.h> |
| 27 | #include <new> |
Glenn Kasten | 535e161 | 2016-12-05 12:19:36 -0800 | [diff] [blame] | 28 | #include <audio_utils/roundup.h> |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 29 | #include <media/nbaio/NBLog.h> |
| 30 | #include <utils/Log.h> |
Glenn Kasten | 4e01ef6 | 2013-07-11 14:29:59 -0700 | [diff] [blame] | 31 | #include <utils/String8.h> |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 32 | |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 33 | #include <queue> |
| 34 | |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 35 | namespace android { |
| 36 | |
| 37 | int NBLog::Entry::readAt(size_t offset) const |
| 38 | { |
| 39 | // FIXME This is too slow, despite the name it is used during writing |
| 40 | if (offset == 0) |
| 41 | return mEvent; |
| 42 | else if (offset == 1) |
| 43 | return mLength; |
| 44 | else if (offset < (size_t) (mLength + 2)) |
| 45 | return ((char *) mData)[offset - 2]; |
| 46 | else if (offset == (size_t) (mLength + 2)) |
| 47 | return mLength; |
| 48 | else |
| 49 | return 0; |
| 50 | } |
| 51 | |
| 52 | // --------------------------------------------------------------------------- |
| 53 | |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 54 | NBLog::FormatEntry::FormatEntry(const uint8_t *entry) : mEntry(entry) { |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 55 | ALOGW_IF(entry[offsetof(struct entry, type)] != EVENT_START_FMT, |
| 56 | "Created format entry with invalid event type %d", entry[offsetof(struct entry, type)]); |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 57 | } |
| 58 | |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 59 | NBLog::FormatEntry::FormatEntry(const NBLog::FormatEntry::iterator &it) : FormatEntry(it.ptr) {} |
| 60 | |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 61 | const char *NBLog::FormatEntry::formatString() const { |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 62 | return (const char*) mEntry + offsetof(entry, data); |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 63 | } |
| 64 | |
| 65 | size_t NBLog::FormatEntry::formatStringLength() const { |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 66 | return mEntry[offsetof(entry, length)]; |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 67 | } |
| 68 | |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 69 | NBLog::FormatEntry::iterator NBLog::FormatEntry::args() const { |
| 70 | auto it = begin(); |
| 71 | // Second entry can be author or timestamp. Skip author if present |
| 72 | if ((++it)->type == EVENT_AUTHOR) { |
| 73 | ++it; |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 74 | } |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 75 | return ++it; |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 76 | } |
| 77 | |
| 78 | timespec NBLog::FormatEntry::timestamp() const { |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 79 | auto it = begin(); |
| 80 | if ((++it)->type != EVENT_TIMESTAMP) { |
| 81 | ++it; |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 82 | } |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 83 | return it.payload<timespec>(); |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 84 | } |
| 85 | |
| 86 | pid_t NBLog::FormatEntry::author() const { |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 87 | auto it = begin(); |
| 88 | if ((++it)->type == EVENT_AUTHOR) { |
| 89 | return it.payload<int>(); |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 90 | } |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 91 | return -1; |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 92 | } |
| 93 | |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame^] | 94 | NBLog::FormatEntry::iterator NBLog::FormatEntry::copyWithAuthor( |
| 95 | std::unique_ptr<audio_utils_fifo_writer> &dst, int author) const { |
| 96 | auto it = begin(); |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 97 | // copy fmt start entry |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 98 | it.copyTo(dst); |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 99 | // insert author entry |
| 100 | size_t authorEntrySize = NBLog::Entry::kOverhead + sizeof(author); |
| 101 | uint8_t authorEntry[authorEntrySize]; |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 102 | authorEntry[offsetof(entry, type)] = EVENT_AUTHOR; |
| 103 | authorEntry[offsetof(entry, length)] = |
| 104 | authorEntry[authorEntrySize + NBLog::Entry::kPreviousLengthOffset] = |
| 105 | sizeof(author); |
| 106 | *(int*) (&authorEntry[offsetof(entry, data)]) = author; |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 107 | dst->write(authorEntry, authorEntrySize); |
| 108 | // copy rest of entries |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 109 | while ((++it)->type != EVENT_END_FMT) { |
| 110 | it.copyTo(dst); |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 111 | } |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 112 | it.copyTo(dst); |
| 113 | ++it; |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame^] | 114 | return it; |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 115 | } |
| 116 | |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 117 | void NBLog::FormatEntry::iterator::copyTo(std::unique_ptr<audio_utils_fifo_writer> &dst) const { |
| 118 | size_t length = ptr[offsetof(entry, length)] + NBLog::Entry::kOverhead; |
| 119 | dst->write(ptr, length); |
| 120 | } |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 121 | |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 122 | void NBLog::FormatEntry::iterator::copyData(uint8_t *dst) const { |
| 123 | memcpy((void*) dst, ptr + offsetof(entry, data), ptr[offsetof(entry, length)]); |
| 124 | } |
| 125 | |
| 126 | NBLog::FormatEntry::iterator NBLog::FormatEntry::begin() const { |
| 127 | return iterator(mEntry); |
| 128 | } |
| 129 | |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame^] | 130 | NBLog::FormatEntry::iterator::iterator() |
| 131 | : ptr(nullptr) {} |
| 132 | |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 133 | NBLog::FormatEntry::iterator::iterator(const uint8_t *entry) |
| 134 | : ptr(entry) {} |
| 135 | |
| 136 | NBLog::FormatEntry::iterator::iterator(const NBLog::FormatEntry::iterator &other) |
| 137 | : ptr(other.ptr) {} |
| 138 | |
| 139 | const NBLog::FormatEntry::entry& NBLog::FormatEntry::iterator::operator*() const { |
| 140 | return *(entry*) ptr; |
| 141 | } |
| 142 | |
| 143 | const NBLog::FormatEntry::entry* NBLog::FormatEntry::iterator::operator->() const { |
| 144 | return (entry*) ptr; |
| 145 | } |
| 146 | |
| 147 | NBLog::FormatEntry::iterator& NBLog::FormatEntry::iterator::operator++() { |
| 148 | ptr += ptr[offsetof(entry, length)] + NBLog::Entry::kOverhead; |
| 149 | return *this; |
| 150 | } |
| 151 | |
| 152 | NBLog::FormatEntry::iterator& NBLog::FormatEntry::iterator::operator--() { |
| 153 | ptr -= ptr[NBLog::Entry::kPreviousLengthOffset] + NBLog::Entry::kOverhead; |
| 154 | return *this; |
| 155 | } |
| 156 | |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame^] | 157 | NBLog::FormatEntry::iterator NBLog::FormatEntry::iterator::next() const { |
| 158 | iterator aux(*this); |
| 159 | return ++aux; |
| 160 | } |
| 161 | |
| 162 | NBLog::FormatEntry::iterator NBLog::FormatEntry::iterator::prev() const { |
| 163 | iterator aux(*this); |
| 164 | return --aux; |
| 165 | } |
| 166 | |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 167 | int NBLog::FormatEntry::iterator::operator-(const NBLog::FormatEntry::iterator &other) const { |
| 168 | return ptr - other.ptr; |
| 169 | } |
| 170 | |
| 171 | bool NBLog::FormatEntry::iterator::operator!=(const iterator &other) const { |
| 172 | return ptr != other.ptr; |
| 173 | } |
| 174 | |
| 175 | bool NBLog::FormatEntry::iterator::hasConsistentLength() const { |
| 176 | return ptr[offsetof(entry, length)] == ptr[ptr[offsetof(entry, length)] + |
| 177 | NBLog::Entry::kOverhead + NBLog::Entry::kPreviousLengthOffset]; |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 178 | } |
| 179 | |
| 180 | // --------------------------------------------------------------------------- |
| 181 | |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 182 | #if 0 // FIXME see note in NBLog.h |
| 183 | NBLog::Timeline::Timeline(size_t size, void *shared) |
| 184 | : mSize(roundup(size)), mOwn(shared == NULL), |
| 185 | mShared((Shared *) (mOwn ? new char[sharedSize(size)] : shared)) |
| 186 | { |
| 187 | new (mShared) Shared; |
| 188 | } |
| 189 | |
| 190 | NBLog::Timeline::~Timeline() |
| 191 | { |
| 192 | mShared->~Shared(); |
| 193 | if (mOwn) { |
| 194 | delete[] (char *) mShared; |
| 195 | } |
| 196 | } |
| 197 | #endif |
| 198 | |
| 199 | /*static*/ |
| 200 | size_t NBLog::Timeline::sharedSize(size_t size) |
| 201 | { |
Glenn Kasten | ed99c2b | 2016-12-12 08:31:24 -0800 | [diff] [blame] | 202 | // TODO fifo now supports non-power-of-2 buffer sizes, so could remove the roundup |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 203 | return sizeof(Shared) + roundup(size); |
| 204 | } |
| 205 | |
| 206 | // --------------------------------------------------------------------------- |
| 207 | |
| 208 | NBLog::Writer::Writer() |
Nicolas Roulet | c20cb50 | 2017-02-01 12:35:24 -0800 | [diff] [blame] | 209 | : mShared(NULL), mFifo(NULL), mFifoWriter(NULL), mEnabled(false), mPidTag(NULL), mPidTagSize(0) |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 210 | { |
| 211 | } |
| 212 | |
Glenn Kasten | 535e161 | 2016-12-05 12:19:36 -0800 | [diff] [blame] | 213 | NBLog::Writer::Writer(void *shared, size_t size) |
| 214 | : mShared((Shared *) shared), |
| 215 | mFifo(mShared != NULL ? |
| 216 | new audio_utils_fifo(size, sizeof(uint8_t), |
| 217 | mShared->mBuffer, mShared->mRear, NULL /*throttlesFront*/) : NULL), |
| 218 | mFifoWriter(mFifo != NULL ? new audio_utils_fifo_writer(*mFifo) : NULL), |
| 219 | mEnabled(mFifoWriter != NULL) |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 220 | { |
Nicolas Roulet | c20cb50 | 2017-02-01 12:35:24 -0800 | [diff] [blame] | 221 | // caching pid and process name |
| 222 | pid_t id = ::getpid(); |
| 223 | char procName[16]; |
| 224 | int status = prctl(PR_GET_NAME, procName); |
| 225 | if (status) { // error getting process name |
| 226 | procName[0] = '\0'; |
| 227 | } |
| 228 | size_t length = strlen(procName); |
| 229 | mPidTagSize = length + sizeof(pid_t); |
| 230 | mPidTag = new char[mPidTagSize]; |
| 231 | memcpy(mPidTag, &id, sizeof(pid_t)); |
| 232 | memcpy(mPidTag + sizeof(pid_t), procName, length); |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 233 | } |
| 234 | |
Glenn Kasten | 535e161 | 2016-12-05 12:19:36 -0800 | [diff] [blame] | 235 | NBLog::Writer::Writer(const sp<IMemory>& iMemory, size_t size) |
| 236 | : Writer(iMemory != 0 ? (Shared *) iMemory->pointer() : NULL, size) |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 237 | { |
Glenn Kasten | 535e161 | 2016-12-05 12:19:36 -0800 | [diff] [blame] | 238 | mIMemory = iMemory; |
| 239 | } |
| 240 | |
| 241 | NBLog::Writer::~Writer() |
| 242 | { |
| 243 | delete mFifoWriter; |
| 244 | delete mFifo; |
Nicolas Roulet | c20cb50 | 2017-02-01 12:35:24 -0800 | [diff] [blame] | 245 | delete[] mPidTag; |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 246 | } |
| 247 | |
| 248 | void NBLog::Writer::log(const char *string) |
| 249 | { |
| 250 | if (!mEnabled) { |
| 251 | return; |
| 252 | } |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 253 | LOG_ALWAYS_FATAL_IF(string == NULL, "Attempted to log NULL string"); |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 254 | size_t length = strlen(string); |
Glenn Kasten | 535e161 | 2016-12-05 12:19:36 -0800 | [diff] [blame] | 255 | if (length > Entry::kMaxLength) { |
| 256 | length = Entry::kMaxLength; |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 257 | } |
| 258 | log(EVENT_STRING, string, length); |
| 259 | } |
| 260 | |
| 261 | void NBLog::Writer::logf(const char *fmt, ...) |
| 262 | { |
| 263 | if (!mEnabled) { |
| 264 | return; |
| 265 | } |
| 266 | va_list ap; |
| 267 | va_start(ap, fmt); |
| 268 | Writer::logvf(fmt, ap); // the Writer:: is needed to avoid virtual dispatch for LockedWriter |
| 269 | va_end(ap); |
| 270 | } |
| 271 | |
| 272 | void NBLog::Writer::logvf(const char *fmt, va_list ap) |
| 273 | { |
| 274 | if (!mEnabled) { |
| 275 | return; |
| 276 | } |
Glenn Kasten | 535e161 | 2016-12-05 12:19:36 -0800 | [diff] [blame] | 277 | char buffer[Entry::kMaxLength + 1 /*NUL*/]; |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 278 | int length = vsnprintf(buffer, sizeof(buffer), fmt, ap); |
| 279 | if (length >= (int) sizeof(buffer)) { |
| 280 | length = sizeof(buffer) - 1; |
| 281 | // NUL termination is not required |
| 282 | // buffer[length] = '\0'; |
| 283 | } |
| 284 | if (length >= 0) { |
| 285 | log(EVENT_STRING, buffer, length); |
| 286 | } |
| 287 | } |
| 288 | |
| 289 | void NBLog::Writer::logTimestamp() |
| 290 | { |
| 291 | if (!mEnabled) { |
| 292 | return; |
| 293 | } |
| 294 | struct timespec ts; |
| 295 | if (!clock_gettime(CLOCK_MONOTONIC, &ts)) { |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 296 | log(EVENT_TIMESTAMP, &ts, sizeof(ts)); |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 297 | } |
| 298 | } |
| 299 | |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 300 | void NBLog::Writer::logTimestamp(const struct timespec &ts) |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 301 | { |
| 302 | if (!mEnabled) { |
| 303 | return; |
| 304 | } |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 305 | log(EVENT_TIMESTAMP, &ts, sizeof(ts)); |
| 306 | } |
| 307 | |
| 308 | void NBLog::Writer::logInteger(const int x) |
| 309 | { |
| 310 | if (!mEnabled) { |
| 311 | return; |
| 312 | } |
| 313 | log(EVENT_INTEGER, &x, sizeof(x)); |
| 314 | } |
| 315 | |
| 316 | void NBLog::Writer::logFloat(const float x) |
| 317 | { |
| 318 | if (!mEnabled) { |
| 319 | return; |
| 320 | } |
| 321 | log(EVENT_FLOAT, &x, sizeof(x)); |
| 322 | } |
| 323 | |
| 324 | void NBLog::Writer::logPID() |
| 325 | { |
| 326 | if (!mEnabled) { |
| 327 | return; |
| 328 | } |
Nicolas Roulet | c20cb50 | 2017-02-01 12:35:24 -0800 | [diff] [blame] | 329 | log(EVENT_PID, mPidTag, mPidTagSize); |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 330 | } |
| 331 | |
| 332 | void NBLog::Writer::logStart(const char *fmt) |
| 333 | { |
| 334 | if (!mEnabled) { |
| 335 | return; |
| 336 | } |
| 337 | size_t length = strlen(fmt); |
| 338 | if (length > Entry::kMaxLength) { |
| 339 | length = Entry::kMaxLength; |
| 340 | } |
| 341 | log(EVENT_START_FMT, fmt, length); |
| 342 | } |
| 343 | |
| 344 | void NBLog::Writer::logEnd() |
| 345 | { |
| 346 | if (!mEnabled) { |
| 347 | return; |
| 348 | } |
| 349 | Entry entry = Entry(EVENT_END_FMT, NULL, 0); |
| 350 | log(&entry, true); |
| 351 | } |
| 352 | |
| 353 | void NBLog::Writer::logFormat(const char *fmt, ...) |
| 354 | { |
| 355 | if (!mEnabled) { |
| 356 | return; |
| 357 | } |
| 358 | |
| 359 | va_list ap; |
| 360 | va_start(ap, fmt); |
| 361 | Writer::logVFormat(fmt, ap); |
| 362 | va_end(ap); |
| 363 | } |
| 364 | |
| 365 | void NBLog::Writer::logVFormat(const char *fmt, va_list argp) |
| 366 | { |
| 367 | if (!mEnabled) { |
| 368 | return; |
| 369 | } |
| 370 | Writer::logStart(fmt); |
| 371 | int i; |
| 372 | double f; |
| 373 | char* s; |
| 374 | struct timespec t; |
| 375 | Writer::logTimestamp(); |
| 376 | for (const char *p = fmt; *p != '\0'; p++) { |
| 377 | // TODO: implement more complex formatting such as %.3f |
| 378 | if (*p != '%') { |
| 379 | continue; |
| 380 | } |
| 381 | switch(*++p) { |
| 382 | case 's': // string |
| 383 | s = va_arg(argp, char *); |
| 384 | Writer::log(s); |
| 385 | break; |
| 386 | |
| 387 | case 't': // timestamp |
| 388 | t = va_arg(argp, struct timespec); |
| 389 | Writer::logTimestamp(t); |
| 390 | break; |
| 391 | |
| 392 | case 'd': // integer |
| 393 | i = va_arg(argp, int); |
| 394 | Writer::logInteger(i); |
| 395 | break; |
| 396 | |
| 397 | case 'f': // float |
| 398 | f = va_arg(argp, double); // float arguments are promoted to double in vararg lists |
| 399 | Writer::logFloat((float)f); |
| 400 | break; |
| 401 | |
| 402 | case 'p': // pid |
| 403 | Writer::logPID(); |
| 404 | break; |
| 405 | |
| 406 | // the "%\0" case finishes parsing |
| 407 | case '\0': |
| 408 | --p; |
| 409 | break; |
| 410 | |
Nicolas Roulet | c20cb50 | 2017-02-01 12:35:24 -0800 | [diff] [blame] | 411 | case '%': |
| 412 | break; |
| 413 | |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 414 | default: |
| 415 | ALOGW("NBLog Writer parsed invalid format specifier: %c", *p); |
| 416 | break; |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 417 | } |
| 418 | } |
| 419 | Writer::logEnd(); |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 420 | } |
| 421 | |
| 422 | void NBLog::Writer::log(Event event, const void *data, size_t length) |
| 423 | { |
| 424 | if (!mEnabled) { |
| 425 | return; |
| 426 | } |
Glenn Kasten | 535e161 | 2016-12-05 12:19:36 -0800 | [diff] [blame] | 427 | if (data == NULL || length > Entry::kMaxLength) { |
| 428 | // TODO Perhaps it makes sense to display truncated data or at least a |
| 429 | // message that the data is too long? The current behavior can create |
| 430 | // a confusion for a programmer debugging their code. |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 431 | return; |
| 432 | } |
| 433 | switch (event) { |
| 434 | case EVENT_STRING: |
| 435 | case EVENT_TIMESTAMP: |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 436 | case EVENT_INTEGER: |
| 437 | case EVENT_FLOAT: |
| 438 | case EVENT_PID: |
| 439 | case EVENT_START_FMT: |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 440 | break; |
| 441 | case EVENT_RESERVED: |
| 442 | default: |
| 443 | return; |
| 444 | } |
| 445 | Entry entry(event, data, length); |
| 446 | log(&entry, true /*trusted*/); |
| 447 | } |
| 448 | |
| 449 | void NBLog::Writer::log(const NBLog::Entry *entry, bool trusted) |
| 450 | { |
| 451 | if (!mEnabled) { |
| 452 | return; |
| 453 | } |
| 454 | if (!trusted) { |
| 455 | log(entry->mEvent, entry->mData, entry->mLength); |
| 456 | return; |
| 457 | } |
Glenn Kasten | 535e161 | 2016-12-05 12:19:36 -0800 | [diff] [blame] | 458 | size_t need = entry->mLength + Entry::kOverhead; // mEvent, mLength, data[length], mLength |
| 459 | // need = number of bytes remaining to write |
| 460 | |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 461 | // FIXME optimize this using memcpy for the data part of the Entry. |
| 462 | // The Entry could have a method copyTo(ptr, offset, size) to optimize the copy. |
Glenn Kasten | 535e161 | 2016-12-05 12:19:36 -0800 | [diff] [blame] | 463 | uint8_t temp[Entry::kMaxLength + Entry::kOverhead]; |
| 464 | for (size_t i = 0; i < need; i++) { |
| 465 | temp[i] = entry->readAt(i); |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 466 | } |
Glenn Kasten | 535e161 | 2016-12-05 12:19:36 -0800 | [diff] [blame] | 467 | mFifoWriter->write(temp, need); |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 468 | } |
| 469 | |
| 470 | bool NBLog::Writer::isEnabled() const |
| 471 | { |
| 472 | return mEnabled; |
| 473 | } |
| 474 | |
| 475 | bool NBLog::Writer::setEnabled(bool enabled) |
| 476 | { |
| 477 | bool old = mEnabled; |
| 478 | mEnabled = enabled && mShared != NULL; |
| 479 | return old; |
| 480 | } |
| 481 | |
| 482 | // --------------------------------------------------------------------------- |
| 483 | |
| 484 | NBLog::LockedWriter::LockedWriter() |
| 485 | : Writer() |
| 486 | { |
| 487 | } |
| 488 | |
Glenn Kasten | 535e161 | 2016-12-05 12:19:36 -0800 | [diff] [blame] | 489 | NBLog::LockedWriter::LockedWriter(void *shared, size_t size) |
| 490 | : Writer(shared, size) |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 491 | { |
| 492 | } |
| 493 | |
| 494 | void NBLog::LockedWriter::log(const char *string) |
| 495 | { |
| 496 | Mutex::Autolock _l(mLock); |
| 497 | Writer::log(string); |
| 498 | } |
| 499 | |
| 500 | void NBLog::LockedWriter::logf(const char *fmt, ...) |
| 501 | { |
| 502 | // FIXME should not take the lock until after formatting is done |
| 503 | Mutex::Autolock _l(mLock); |
| 504 | va_list ap; |
| 505 | va_start(ap, fmt); |
| 506 | Writer::logvf(fmt, ap); |
| 507 | va_end(ap); |
| 508 | } |
| 509 | |
| 510 | void NBLog::LockedWriter::logvf(const char *fmt, va_list ap) |
| 511 | { |
| 512 | // FIXME should not take the lock until after formatting is done |
| 513 | Mutex::Autolock _l(mLock); |
| 514 | Writer::logvf(fmt, ap); |
| 515 | } |
| 516 | |
| 517 | void NBLog::LockedWriter::logTimestamp() |
| 518 | { |
| 519 | // FIXME should not take the lock until after the clock_gettime() syscall |
| 520 | Mutex::Autolock _l(mLock); |
| 521 | Writer::logTimestamp(); |
| 522 | } |
| 523 | |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 524 | void NBLog::LockedWriter::logTimestamp(const struct timespec &ts) |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 525 | { |
| 526 | Mutex::Autolock _l(mLock); |
| 527 | Writer::logTimestamp(ts); |
| 528 | } |
| 529 | |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 530 | void NBLog::LockedWriter::logInteger(const int x) |
| 531 | { |
| 532 | Mutex::Autolock _l(mLock); |
| 533 | Writer::logInteger(x); |
| 534 | } |
| 535 | |
| 536 | void NBLog::LockedWriter::logFloat(const float x) |
| 537 | { |
| 538 | Mutex::Autolock _l(mLock); |
| 539 | Writer::logFloat(x); |
| 540 | } |
| 541 | |
| 542 | void NBLog::LockedWriter::logPID() |
| 543 | { |
| 544 | Mutex::Autolock _l(mLock); |
| 545 | Writer::logPID(); |
| 546 | } |
| 547 | |
| 548 | void NBLog::LockedWriter::logStart(const char *fmt) |
| 549 | { |
| 550 | Mutex::Autolock _l(mLock); |
| 551 | Writer::logStart(fmt); |
| 552 | } |
| 553 | |
| 554 | |
| 555 | void NBLog::LockedWriter::logEnd() |
| 556 | { |
| 557 | Mutex::Autolock _l(mLock); |
| 558 | Writer::logEnd(); |
| 559 | } |
| 560 | |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 561 | bool NBLog::LockedWriter::isEnabled() const |
| 562 | { |
| 563 | Mutex::Autolock _l(mLock); |
| 564 | return Writer::isEnabled(); |
| 565 | } |
| 566 | |
| 567 | bool NBLog::LockedWriter::setEnabled(bool enabled) |
| 568 | { |
| 569 | Mutex::Autolock _l(mLock); |
| 570 | return Writer::setEnabled(enabled); |
| 571 | } |
| 572 | |
| 573 | // --------------------------------------------------------------------------- |
| 574 | |
Glenn Kasten | 535e161 | 2016-12-05 12:19:36 -0800 | [diff] [blame] | 575 | NBLog::Reader::Reader(const void *shared, size_t size) |
| 576 | : mShared((/*const*/ Shared *) shared), /*mIMemory*/ |
| 577 | mFd(-1), mIndent(0), |
| 578 | mFifo(mShared != NULL ? |
| 579 | new audio_utils_fifo(size, sizeof(uint8_t), |
| 580 | mShared->mBuffer, mShared->mRear, NULL /*throttlesFront*/) : NULL), |
| 581 | mFifoReader(mFifo != NULL ? new audio_utils_fifo_reader(*mFifo) : NULL) |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 582 | { |
| 583 | } |
| 584 | |
Glenn Kasten | 535e161 | 2016-12-05 12:19:36 -0800 | [diff] [blame] | 585 | NBLog::Reader::Reader(const sp<IMemory>& iMemory, size_t size) |
| 586 | : Reader(iMemory != 0 ? (Shared *) iMemory->pointer() : NULL, size) |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 587 | { |
Glenn Kasten | 535e161 | 2016-12-05 12:19:36 -0800 | [diff] [blame] | 588 | mIMemory = iMemory; |
| 589 | } |
| 590 | |
| 591 | NBLog::Reader::~Reader() |
| 592 | { |
| 593 | delete mFifoReader; |
| 594 | delete mFifo; |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 595 | } |
| 596 | |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame^] | 597 | uint8_t *NBLog::Reader::findLastEntryOfType(uint8_t *front, uint8_t *back, uint8_t type) { |
| 598 | while (back + Entry::kPreviousLengthOffset >= front) { |
| 599 | uint8_t *prev = back - back[Entry::kPreviousLengthOffset] - Entry::kOverhead; |
| 600 | if (prev < front || prev + prev[offsetof(FormatEntry::entry, length)] + |
| 601 | Entry::kOverhead != back) { |
| 602 | |
| 603 | // prev points to an out of limits or inconsistent entry |
| 604 | return nullptr; |
| 605 | } |
| 606 | if (prev[offsetof(FormatEntry::entry, type)] == type) { |
| 607 | return prev; |
| 608 | } |
| 609 | back = prev; |
| 610 | } |
| 611 | return nullptr; // no entry found |
| 612 | } |
| 613 | |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 614 | std::unique_ptr<NBLog::Reader::Snapshot> NBLog::Reader::getSnapshot() |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 615 | { |
Glenn Kasten | 535e161 | 2016-12-05 12:19:36 -0800 | [diff] [blame] | 616 | if (mFifoReader == NULL) { |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 617 | return std::unique_ptr<NBLog::Reader::Snapshot>(new Snapshot()); |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 618 | } |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 619 | // make a copy to avoid race condition with writer |
Glenn Kasten | 535e161 | 2016-12-05 12:19:36 -0800 | [diff] [blame] | 620 | size_t capacity = mFifo->capacity(); |
| 621 | |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame^] | 622 | // This emulates the behaviour of audio_utils_fifo_reader::read, but without incrementing the |
| 623 | // reader index. The index is incremented after handling corruption, to after the last complete |
| 624 | // entry of the buffer |
| 625 | size_t lost; |
| 626 | audio_utils_iovec iovec[2]; |
| 627 | ssize_t availToRead = mFifoReader->obtain(iovec, capacity, NULL /*timeout*/, &lost); |
| 628 | if (availToRead <= 0) { |
| 629 | return std::unique_ptr<NBLog::Reader::Snapshot>(new Snapshot()); |
| 630 | } |
Glenn Kasten | 535e161 | 2016-12-05 12:19:36 -0800 | [diff] [blame] | 631 | |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame^] | 632 | std::unique_ptr<Snapshot> snapshot(new Snapshot(availToRead)); |
| 633 | memcpy(snapshot->mData, (const char *) mFifo->buffer() + iovec[0].mOffset, iovec[0].mLength); |
| 634 | if (iovec[1].mLength > 0) { |
| 635 | memcpy(snapshot->mData + (iovec[0].mLength), |
| 636 | (const char *) mFifo->buffer() + iovec[1].mOffset, iovec[1].mLength); |
| 637 | } |
| 638 | |
| 639 | // Handle corrupted buffer |
| 640 | // Potentially, a buffer has corrupted data on both beginning (due to overflow) and end |
| 641 | // (due to incomplete format entry). But even if the end format entry is incomplete, |
| 642 | // it ends in a complete entry (which is not an END_FMT). So is safe to traverse backwards. |
| 643 | // TODO: handle client corruption (in the middle of a buffer) |
| 644 | |
| 645 | uint8_t *back = snapshot->mData + availToRead; |
| 646 | uint8_t *front = snapshot->mData; |
| 647 | |
| 648 | // Find last END_FMT. <back> is sitting on an entry which might be the middle of a FormatEntry. |
| 649 | // We go backwards until we find an EVENT_END_FMT. |
| 650 | uint8_t *lastEnd = findLastEntryOfType(front, back, EVENT_END_FMT); |
| 651 | if (lastEnd == nullptr) { |
| 652 | snapshot->mEnd = snapshot->mBegin = FormatEntry::iterator(front); |
| 653 | } else { |
| 654 | // end of snapshot points to after last END_FMT entry |
| 655 | snapshot->mEnd = FormatEntry::iterator(lastEnd + Entry::kOverhead); |
| 656 | // find first START_FMT |
| 657 | uint8_t *firstStart = nullptr; |
| 658 | uint8_t *firstStartTmp = lastEnd; |
| 659 | while ((firstStartTmp = findLastEntryOfType(front, firstStartTmp, EVENT_START_FMT)) |
| 660 | != nullptr) { |
| 661 | firstStart = firstStartTmp; |
| 662 | } |
| 663 | // firstStart is null if no START_FMT entry was found before lastEnd |
| 664 | if (firstStart == nullptr) { |
| 665 | snapshot->mBegin = snapshot->mEnd; |
| 666 | } else { |
| 667 | snapshot->mBegin = FormatEntry::iterator(firstStart); |
| 668 | } |
| 669 | } |
| 670 | |
| 671 | // advance fifo reader index to after last entry read. |
| 672 | mFifoReader->release(snapshot->mEnd - front); |
| 673 | |
| 674 | snapshot->mLost = lost; |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 675 | return snapshot; |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame^] | 676 | |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 677 | } |
| 678 | |
| 679 | void NBLog::Reader::dump(int fd, size_t indent, NBLog::Reader::Snapshot &snapshot) |
| 680 | { |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame^] | 681 | #if 0 |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 682 | struct timespec ts; |
| 683 | time_t maxSec = -1; |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 684 | while (entry - start >= (int) Entry::kOverhead) { |
| 685 | if (prevEntry - start < 0 || !prevEntry.hasConsistentLength()) { |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 686 | break; |
| 687 | } |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 688 | if (prevEntry->type == EVENT_TIMESTAMP) { |
| 689 | if (prevEntry->length != sizeof(struct timespec)) { |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 690 | // corrupt |
| 691 | break; |
| 692 | } |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 693 | prevEntry.copyData((uint8_t*) &ts); |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 694 | if (ts.tv_sec > maxSec) { |
| 695 | maxSec = ts.tv_sec; |
| 696 | } |
| 697 | } |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 698 | --entry; |
| 699 | --prevEntry; |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 700 | } |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame^] | 701 | #endif |
Glenn Kasten | 4e01ef6 | 2013-07-11 14:29:59 -0700 | [diff] [blame] | 702 | mFd = fd; |
| 703 | mIndent = indent; |
| 704 | String8 timestamp, body; |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame^] | 705 | size_t lost = snapshot.lost() + (snapshot.begin() - FormatEntry::iterator(snapshot.data())); |
Glenn Kasten | c02c961 | 2013-10-15 09:25:11 -0700 | [diff] [blame] | 706 | if (lost > 0) { |
Glenn Kasten | 95d287d | 2014-04-28 14:11:45 -0700 | [diff] [blame] | 707 | body.appendFormat("warning: lost %zu bytes worth of events", lost); |
Glenn Kasten | 4e01ef6 | 2013-07-11 14:29:59 -0700 | [diff] [blame] | 708 | // TODO timestamp empty here, only other choice to wait for the first timestamp event in the |
| 709 | // log to push it out. Consider keeping the timestamp/body between calls to readAt(). |
| 710 | dumpLine(timestamp, body); |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 711 | } |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame^] | 712 | #if 0 |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 713 | size_t width = 1; |
| 714 | while (maxSec >= 10) { |
| 715 | ++width; |
| 716 | maxSec /= 10; |
| 717 | } |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 718 | if (maxSec >= 0) { |
Glenn Kasten | 95d287d | 2014-04-28 14:11:45 -0700 | [diff] [blame] | 719 | timestamp.appendFormat("[%*s]", (int) width + 4, ""); |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 720 | } |
Glenn Kasten | 4e01ef6 | 2013-07-11 14:29:59 -0700 | [diff] [blame] | 721 | bool deferredTimestamp = false; |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame^] | 722 | #endif |
| 723 | for (auto entry = snapshot.begin(); entry != snapshot.end();) { |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 724 | switch (entry->type) { |
| 725 | #if 0 |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 726 | case EVENT_STRING: |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 727 | body.appendFormat("%.*s", (int) entry.length(), entry.data()); |
Glenn Kasten | 4e01ef6 | 2013-07-11 14:29:59 -0700 | [diff] [blame] | 728 | break; |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 729 | case EVENT_TIMESTAMP: { |
| 730 | // already checked that length == sizeof(struct timespec); |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 731 | entry.copyData((const uint8_t*) &ts); |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 732 | long prevNsec = ts.tv_nsec; |
| 733 | long deltaMin = LONG_MAX; |
| 734 | long deltaMax = -1; |
| 735 | long deltaTotal = 0; |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 736 | auto aux(entry); |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 737 | for (;;) { |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 738 | ++aux; |
| 739 | if (end - aux >= 0 || aux.type() != EVENT_TIMESTAMP) { |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 740 | break; |
| 741 | } |
| 742 | struct timespec tsNext; |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 743 | aux.copyData((const uint8_t*) &tsNext); |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 744 | if (tsNext.tv_sec != ts.tv_sec) { |
| 745 | break; |
| 746 | } |
| 747 | long delta = tsNext.tv_nsec - prevNsec; |
| 748 | if (delta < 0) { |
| 749 | break; |
| 750 | } |
| 751 | if (delta < deltaMin) { |
| 752 | deltaMin = delta; |
| 753 | } |
| 754 | if (delta > deltaMax) { |
| 755 | deltaMax = delta; |
| 756 | } |
| 757 | deltaTotal += delta; |
| 758 | prevNsec = tsNext.tv_nsec; |
| 759 | } |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 760 | size_t n = (aux - entry) / (sizeof(struct timespec) + 3 /*Entry::kOverhead?*/); |
Glenn Kasten | 4e01ef6 | 2013-07-11 14:29:59 -0700 | [diff] [blame] | 761 | if (deferredTimestamp) { |
| 762 | dumpLine(timestamp, body); |
| 763 | deferredTimestamp = false; |
| 764 | } |
| 765 | timestamp.clear(); |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 766 | if (n >= kSquashTimestamp) { |
Glenn Kasten | 4e01ef6 | 2013-07-11 14:29:59 -0700 | [diff] [blame] | 767 | timestamp.appendFormat("[%d.%03d to .%.03d by .%.03d to .%.03d]", |
| 768 | (int) ts.tv_sec, (int) (ts.tv_nsec / 1000000), |
| 769 | (int) ((ts.tv_nsec + deltaTotal) / 1000000), |
| 770 | (int) (deltaMin / 1000000), (int) (deltaMax / 1000000)); |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 771 | entry = aux; |
| 772 | // advance = 0; |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 773 | break; |
| 774 | } |
Glenn Kasten | 4e01ef6 | 2013-07-11 14:29:59 -0700 | [diff] [blame] | 775 | timestamp.appendFormat("[%d.%03d]", (int) ts.tv_sec, |
| 776 | (int) (ts.tv_nsec / 1000000)); |
| 777 | deferredTimestamp = true; |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 778 | } |
| 779 | break; |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 780 | case EVENT_INTEGER: |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 781 | appendInt(&body, entry.data()); |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 782 | break; |
| 783 | case EVENT_FLOAT: |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 784 | appendFloat(&body, entry.data()); |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 785 | break; |
| 786 | case EVENT_PID: |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 787 | appendPID(&body, entry.data(), entry.length()); |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 788 | break; |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 789 | #endif |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 790 | case EVENT_START_FMT: |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 791 | // right now, this is the only supported case |
| 792 | entry = handleFormat(FormatEntry(entry), ×tamp, &body); |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 793 | break; |
| 794 | case EVENT_END_FMT: |
| 795 | body.appendFormat("warning: got to end format event"); |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame^] | 796 | ++entry; |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 797 | break; |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 798 | case EVENT_RESERVED: |
| 799 | default: |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame^] | 800 | body.appendFormat("warning: unexpected event %d", entry->type); |
| 801 | ++entry; |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 802 | break; |
| 803 | } |
Glenn Kasten | 4e01ef6 | 2013-07-11 14:29:59 -0700 | [diff] [blame] | 804 | |
| 805 | if (!body.isEmpty()) { |
| 806 | dumpLine(timestamp, body); |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame^] | 807 | // deferredTimestamp = false; |
Glenn Kasten | 4e01ef6 | 2013-07-11 14:29:59 -0700 | [diff] [blame] | 808 | } |
| 809 | } |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame^] | 810 | // if (deferredTimestamp) { |
| 811 | // dumpLine(timestamp, body); |
| 812 | // } |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 813 | } |
| 814 | |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 815 | void NBLog::Reader::dump(int fd, size_t indent) |
| 816 | { |
| 817 | // get a snapshot, dump it |
| 818 | std::unique_ptr<Snapshot> snap = getSnapshot(); |
| 819 | dump(fd, indent, *snap); |
| 820 | } |
| 821 | |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 822 | void NBLog::Reader::dumpLine(const String8 ×tamp, String8 &body) |
Glenn Kasten | 4e01ef6 | 2013-07-11 14:29:59 -0700 | [diff] [blame] | 823 | { |
| 824 | if (mFd >= 0) { |
Elliott Hughes | 8b5f642 | 2014-05-22 01:22:06 -0700 | [diff] [blame] | 825 | dprintf(mFd, "%.*s%s %s\n", mIndent, "", timestamp.string(), body.string()); |
Glenn Kasten | 4e01ef6 | 2013-07-11 14:29:59 -0700 | [diff] [blame] | 826 | } else { |
| 827 | ALOGI("%.*s%s %s", mIndent, "", timestamp.string(), body.string()); |
| 828 | } |
| 829 | body.clear(); |
| 830 | } |
| 831 | |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 832 | bool NBLog::Reader::isIMemory(const sp<IMemory>& iMemory) const |
| 833 | { |
Glenn Kasten | 481fb67 | 2013-09-30 14:39:28 -0700 | [diff] [blame] | 834 | return iMemory != 0 && mIMemory != 0 && iMemory->pointer() == mIMemory->pointer(); |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 835 | } |
| 836 | |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 837 | void NBLog::appendTimestamp(String8 *body, const void *data) { |
| 838 | struct timespec ts; |
| 839 | memcpy(&ts, data, sizeof(struct timespec)); |
| 840 | body->appendFormat("[%d.%03d]", (int) ts.tv_sec, |
| 841 | (int) (ts.tv_nsec / 1000000)); |
| 842 | } |
| 843 | |
| 844 | void NBLog::appendInt(String8 *body, const void *data) { |
| 845 | int x = *((int*) data); |
| 846 | body->appendFormat("<%d>", x); |
| 847 | } |
| 848 | |
| 849 | void NBLog::appendFloat(String8 *body, const void *data) { |
| 850 | float f; |
| 851 | memcpy(&f, data, sizeof(float)); |
| 852 | body->appendFormat("<%f>", f); |
| 853 | } |
| 854 | |
Nicolas Roulet | c20cb50 | 2017-02-01 12:35:24 -0800 | [diff] [blame] | 855 | void NBLog::appendPID(String8 *body, const void* data, size_t length) { |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 856 | pid_t id = *((pid_t*) data); |
Nicolas Roulet | c20cb50 | 2017-02-01 12:35:24 -0800 | [diff] [blame] | 857 | char * name = &((char*) data)[sizeof(pid_t)]; |
| 858 | body->appendFormat("<PID: %d, name: %.*s>", id, (int) (length - sizeof(pid_t)), name); |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 859 | } |
| 860 | |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 861 | NBLog::FormatEntry::iterator NBLog::Reader::handleFormat(const FormatEntry &fmtEntry, |
| 862 | String8 *timestamp, |
| 863 | String8 *body) { |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 864 | // log timestamp |
| 865 | struct timespec ts = fmtEntry.timestamp(); |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 866 | timestamp->clear(); |
| 867 | timestamp->appendFormat("[%d.%03d]", (int) ts.tv_sec, |
| 868 | (int) (ts.tv_nsec / 1000000)); |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 869 | |
| 870 | // log author (if present) |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 871 | handleAuthor(fmtEntry, body); |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 872 | |
| 873 | // log string |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 874 | NBLog::FormatEntry::iterator arg = fmtEntry.args(); |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 875 | |
| 876 | const char* fmt = fmtEntry.formatString(); |
| 877 | size_t fmt_length = fmtEntry.formatStringLength(); |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 878 | |
| 879 | for (size_t fmt_offset = 0; fmt_offset < fmt_length; ++fmt_offset) { |
| 880 | if (fmt[fmt_offset] != '%') { |
| 881 | body->append(&fmt[fmt_offset], 1); // TODO optimize to write consecutive strings at once |
| 882 | continue; |
| 883 | } |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 884 | // case "%%"" |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 885 | if (fmt[++fmt_offset] == '%') { |
| 886 | body->append("%"); |
| 887 | continue; |
| 888 | } |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 889 | // case "%\0" |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 890 | if (fmt_offset == fmt_length) { |
| 891 | continue; |
| 892 | } |
| 893 | |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 894 | NBLog::Event event = (NBLog::Event) arg->type; |
| 895 | size_t length = arg->length; |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 896 | |
| 897 | // TODO check length for event type is correct |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 898 | |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 899 | if (event == EVENT_END_FMT) { |
| 900 | break; |
| 901 | } |
| 902 | |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 903 | // TODO: implement more complex formatting such as %.3f |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 904 | const uint8_t *datum = arg->data; // pointer to the current event args |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 905 | switch(fmt[fmt_offset]) |
| 906 | { |
| 907 | case 's': // string |
Nicolas Roulet | 4da7820 | 2017-02-03 12:53:39 -0800 | [diff] [blame] | 908 | ALOGW_IF(event != EVENT_STRING, |
| 909 | "NBLog Reader incompatible event for string specifier: %d", event); |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 910 | body->append((const char*) datum, length); |
| 911 | break; |
| 912 | |
| 913 | case 't': // timestamp |
Nicolas Roulet | 4da7820 | 2017-02-03 12:53:39 -0800 | [diff] [blame] | 914 | ALOGW_IF(event != EVENT_TIMESTAMP, |
| 915 | "NBLog Reader incompatible event for timestamp specifier: %d", event); |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 916 | appendTimestamp(body, datum); |
| 917 | break; |
| 918 | |
| 919 | case 'd': // integer |
Nicolas Roulet | 4da7820 | 2017-02-03 12:53:39 -0800 | [diff] [blame] | 920 | ALOGW_IF(event != EVENT_INTEGER, |
| 921 | "NBLog Reader incompatible event for integer specifier: %d", event); |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 922 | appendInt(body, datum); |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 923 | break; |
| 924 | |
| 925 | case 'f': // float |
Nicolas Roulet | 4da7820 | 2017-02-03 12:53:39 -0800 | [diff] [blame] | 926 | ALOGW_IF(event != EVENT_FLOAT, |
| 927 | "NBLog Reader incompatible event for float specifier: %d", event); |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 928 | appendFloat(body, datum); |
| 929 | break; |
| 930 | |
| 931 | case 'p': // pid |
Nicolas Roulet | 4da7820 | 2017-02-03 12:53:39 -0800 | [diff] [blame] | 932 | ALOGW_IF(event != EVENT_PID, |
| 933 | "NBLog Reader incompatible event for pid specifier: %d", event); |
Nicolas Roulet | c20cb50 | 2017-02-01 12:35:24 -0800 | [diff] [blame] | 934 | appendPID(body, datum, length); |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 935 | break; |
| 936 | |
| 937 | default: |
| 938 | ALOGW("NBLog Reader encountered unknown character %c", fmt[fmt_offset]); |
| 939 | } |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 940 | ++arg; |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 941 | } |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 942 | ALOGW_IF(arg->type != EVENT_END_FMT, "Expected end of format, got %d", arg->type); |
| 943 | ++arg; |
| 944 | return arg; |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 945 | } |
| 946 | |
| 947 | // --------------------------------------------------------------------------- |
| 948 | |
| 949 | NBLog::Merger::Merger(const void *shared, size_t size): |
| 950 | mBuffer(NULL), |
| 951 | mShared((Shared *) shared), |
| 952 | mFifo(mShared != NULL ? |
| 953 | new audio_utils_fifo(size, sizeof(uint8_t), |
| 954 | mShared->mBuffer, mShared->mRear, NULL /*throttlesFront*/) : NULL), |
| 955 | mFifoWriter(mFifo != NULL ? new audio_utils_fifo_writer(*mFifo) : NULL) |
| 956 | {} |
| 957 | |
| 958 | void NBLog::Merger::addReader(const NBLog::NamedReader &reader) { |
| 959 | mNamedReaders.push_back(reader); |
| 960 | } |
| 961 | |
| 962 | // items placed in priority queue during merge |
| 963 | // composed by a timestamp and the index of the snapshot where the timestamp came from |
| 964 | struct MergeItem |
| 965 | { |
| 966 | struct timespec ts; |
| 967 | int index; |
| 968 | MergeItem(struct timespec ts, int index): ts(ts), index(index) {} |
| 969 | }; |
| 970 | |
| 971 | // operators needed for priority queue in merge |
| 972 | bool operator>(const struct timespec &t1, const struct timespec &t2) { |
| 973 | return t1.tv_sec > t2.tv_sec || (t1.tv_sec == t2.tv_sec && t1.tv_nsec > t2.tv_nsec); |
| 974 | } |
| 975 | |
| 976 | bool operator>(const struct MergeItem &i1, const struct MergeItem &i2) { |
| 977 | return i1.ts > i2.ts || |
| 978 | (i1.ts.tv_sec == i2.ts.tv_sec && i1.ts.tv_nsec == i2.ts.tv_nsec && i1.index > i2.index); |
| 979 | } |
| 980 | |
| 981 | // Merge registered readers, sorted by timestamp |
| 982 | void NBLog::Merger::merge() { |
| 983 | int nLogs = mNamedReaders.size(); |
| 984 | std::vector<std::unique_ptr<NBLog::Reader::Snapshot>> snapshots(nLogs); |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame^] | 985 | std::vector<NBLog::FormatEntry::iterator> offsets(nLogs); |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 986 | for (int i = 0; i < nLogs; ++i) { |
| 987 | snapshots[i] = mNamedReaders[i].reader()->getSnapshot(); |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame^] | 988 | offsets[i] = snapshots[i]->begin(); |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 989 | } |
| 990 | // initialize offsets |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 991 | // TODO custom heap implementation could allow to update top, improving performance |
| 992 | // for bursty buffers |
| 993 | std::priority_queue<MergeItem, std::vector<MergeItem>, std::greater<MergeItem>> timestamps; |
| 994 | for (int i = 0; i < nLogs; ++i) |
| 995 | { |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame^] | 996 | if (offsets[i] != snapshots[i]->end()) { |
| 997 | timespec ts = FormatEntry(offsets[i]).timestamp(); |
| 998 | timestamps.emplace(ts, i); |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 999 | } |
| 1000 | } |
| 1001 | |
| 1002 | while (!timestamps.empty()) { |
| 1003 | // find minimum timestamp |
| 1004 | int index = timestamps.top().index; |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame^] | 1005 | // copy it to the log, increasing offset |
| 1006 | offsets[index] = FormatEntry(offsets[index]).copyWithAuthor(mFifoWriter, index); |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 1007 | // update data structures |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 1008 | timestamps.pop(); |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame^] | 1009 | if (offsets[index] != snapshots[index]->end()) { |
| 1010 | timespec ts = FormatEntry(offsets[index]).timestamp(); |
| 1011 | timestamps.emplace(ts, index); |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 1012 | } |
| 1013 | } |
| 1014 | } |
| 1015 | |
| 1016 | const std::vector<NBLog::NamedReader> *NBLog::Merger::getNamedReaders() const { |
| 1017 | return &mNamedReaders; |
| 1018 | } |
| 1019 | |
| 1020 | NBLog::MergeReader::MergeReader(const void *shared, size_t size, Merger &merger) |
| 1021 | : Reader(shared, size), mNamedReaders(merger.getNamedReaders()) {} |
| 1022 | |
| 1023 | size_t NBLog::MergeReader::handleAuthor(const NBLog::FormatEntry &fmtEntry, String8 *body) { |
| 1024 | int author = fmtEntry.author(); |
| 1025 | const char* name = (*mNamedReaders)[author].name(); |
| 1026 | body->appendFormat("%s: ", name); |
| 1027 | return NBLog::Entry::kOverhead + sizeof(author); |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 1028 | } |
| 1029 | |
Nicolas Roulet | dcdfaec | 2017-02-14 10:18:39 -0800 | [diff] [blame] | 1030 | NBLog::MergeThread::MergeThread(NBLog::Merger &merger) |
| 1031 | : mMerger(merger), |
| 1032 | mTimeoutUs(0) {} |
| 1033 | |
| 1034 | NBLog::MergeThread::~MergeThread() { |
| 1035 | // set exit flag, set timeout to 0 to force threadLoop to exit and wait for the thread to join |
| 1036 | requestExit(); |
| 1037 | setTimeoutUs(0); |
| 1038 | join(); |
| 1039 | } |
| 1040 | |
| 1041 | bool NBLog::MergeThread::threadLoop() { |
| 1042 | bool doMerge; |
| 1043 | { |
| 1044 | AutoMutex _l(mMutex); |
| 1045 | // If mTimeoutUs is negative, wait on the condition variable until it's positive. |
| 1046 | // If it's positive, wait kThreadSleepPeriodUs and then merge |
| 1047 | nsecs_t waitTime = mTimeoutUs > 0 ? kThreadSleepPeriodUs * 1000 : LLONG_MAX; |
| 1048 | mCond.waitRelative(mMutex, waitTime); |
| 1049 | doMerge = mTimeoutUs > 0; |
| 1050 | mTimeoutUs -= kThreadSleepPeriodUs; |
| 1051 | } |
| 1052 | if (doMerge) { |
| 1053 | mMerger.merge(); |
| 1054 | } |
| 1055 | return true; |
| 1056 | } |
| 1057 | |
| 1058 | void NBLog::MergeThread::wakeup() { |
| 1059 | setTimeoutUs(kThreadWakeupPeriodUs); |
| 1060 | } |
| 1061 | |
| 1062 | void NBLog::MergeThread::setTimeoutUs(int time) { |
| 1063 | AutoMutex _l(mMutex); |
| 1064 | mTimeoutUs = time; |
| 1065 | mCond.signal(); |
| 1066 | } |
| 1067 | |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 1068 | } // namespace android |