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 | |
Sanna Catherine de Treville Wager | 2d1631e | 2017-05-30 16:12:36 -0700 | [diff] [blame] | 17 | /* |
| 18 | * Documentation: Workflow summary for histogram data processing: |
| 19 | * For more details on FIFO, please see system/media/audio_utils; doxygen |
| 20 | * TODO: add this documentation to doxygen once it is further developed |
Sanna Catherine de Treville Wager | 1bb6862 | 2017-06-14 14:18:31 -0700 | [diff] [blame] | 21 | * 1) Writing buffer period timestamp to the circular buffer |
| 22 | * onWork() |
Sanna Catherine de Treville Wager | 2d1631e | 2017-05-30 16:12:36 -0700 | [diff] [blame] | 23 | * Called every period length (e.g., 4ms) |
| 24 | * Calls LOG_HIST_TS |
| 25 | * LOG_HIST_TS |
Sanna Catherine de Treville Wager | d4a68f6 | 2017-06-23 16:09:41 -0700 | [diff] [blame] | 26 | * Hashes file name and line number, and writes single timestamp to buffer |
Sanna Catherine de Treville Wager | a8a8a47 | 2017-07-11 09:41:25 -0700 | [diff] [blame] | 27 | * calls NBLOG::Writer::logEventHistTS once |
| 28 | * NBLOG::Writer::logEventHistTS |
Sanna Catherine de Treville Wager | 2d1631e | 2017-05-30 16:12:36 -0700 | [diff] [blame] | 29 | * calls NBLOG::Writer::log on hash and current timestamp |
| 30 | * time is in CLOCK_MONOTONIC converted to ns |
| 31 | * NBLOG::Writer::log(Event, const void*, size_t) |
| 32 | * Initializes Entry, a struct containing one log entry |
| 33 | * Entry contains the event type (mEvent), data length (mLength), |
| 34 | * and data pointer (mData) |
| 35 | * TODO: why mLength (max length of buffer data) must be <= kMaxLength = 255? |
| 36 | * calls NBLOG::Writer::log(Entry *, bool) |
| 37 | * NBLog::Writer::log(Entry *, bool) |
| 38 | * Calls copyEntryDataAt to format data as follows in temp array: |
| 39 | * [type][length][data ... ][length] |
| 40 | * calls audio_utils_fifo_writer.write on temp |
| 41 | * audio_utils_fifo_writer.write |
| 42 | * calls obtain(), memcpy (reference in doxygen) |
| 43 | * returns number of frames written |
| 44 | * ssize_t audio_utils_fifo_reader::obtain |
| 45 | * Determines readable buffer section via pointer arithmetic on reader |
| 46 | * and writer pointers |
Sanna Catherine de Treville Wager | a8a8a47 | 2017-07-11 09:41:25 -0700 | [diff] [blame] | 47 | * Similarly, LOG_AUDIO_STATE() is called by onStateChange whenever audio is |
| 48 | * turned on or off, and writes this notification to the FIFO. |
Sanna Catherine de Treville Wager | 2d1631e | 2017-05-30 16:12:36 -0700 | [diff] [blame] | 49 | * |
Sanna Catherine de Treville Wager | d4a68f6 | 2017-06-23 16:09:41 -0700 | [diff] [blame] | 50 | * 2) reading the data from shared memory |
Sanna Catherine de Treville Wager | 2d1631e | 2017-05-30 16:12:36 -0700 | [diff] [blame] | 51 | * Thread::threadloop() |
| 52 | * TODO: add description? |
| 53 | * NBLog::MergeThread::threadLoop() |
| 54 | * calls NBLog::Merger::merge |
| 55 | * NBLog::Merger::merge |
Sanna Catherine de Treville Wager | 1bb6862 | 2017-06-14 14:18:31 -0700 | [diff] [blame] | 56 | * Merges snapshots sorted by timestamp |
Sanna Catherine de Treville Wager | 2d1631e | 2017-05-30 16:12:36 -0700 | [diff] [blame] | 57 | * for each reader in vector of class NamedReader, |
| 58 | * callsNamedReader::reader()->getSnapshot |
| 59 | * TODO: check whether the rest of this function is relevant |
| 60 | * NBLog::Reader::getSnapshot |
| 61 | * copies snapshot of reader's fifo buffer into its own buffer |
| 62 | * calls mFifoReader->obtain to find readable data |
| 63 | * sets snapshot.begin() and .end() iterators to boundaries of valid entries |
| 64 | * moves the fifo reader index to after the last entry read |
Sanna Catherine de Treville Wager | 1bb6862 | 2017-06-14 14:18:31 -0700 | [diff] [blame] | 65 | * in this case, the buffer is in shared memory. in (4), the buffer is private |
Sanna Catherine de Treville Wager | 2d1631e | 2017-05-30 16:12:36 -0700 | [diff] [blame] | 66 | * |
Sanna Catherine de Treville Wager | d4a68f6 | 2017-06-23 16:09:41 -0700 | [diff] [blame] | 67 | * 3) reading the data from private buffer |
Sanna Catherine de Treville Wager | 2d1631e | 2017-05-30 16:12:36 -0700 | [diff] [blame] | 68 | * MediaLogService::dump |
Sanna Catherine de Treville Wager | 9484bae | 2017-06-15 14:39:44 -0700 | [diff] [blame] | 69 | * calls NBLog::Reader::dump(CONSOLE) |
| 70 | * The private buffer contains all logs for all readers in shared memory |
Sanna Catherine de Treville Wager | 2d1631e | 2017-05-30 16:12:36 -0700 | [diff] [blame] | 71 | * NBLog::Reader::dump(int) |
| 72 | * calls getSnapshot on the current reader |
| 73 | * calls dump(int, size_t, Snapshot) |
| 74 | * NBLog::Reader::dump(int, size, snapshot) |
| 75 | * iterates through snapshot's events and switches based on their type |
| 76 | * (string, timestamp, etc...) |
| 77 | * In the case of EVENT_HISTOGRAM_ENTRY_TS, adds a list of timestamp sequences |
| 78 | * (histogram entry) to NBLog::mHists |
Sanna Catherine de Treville Wager | d4a68f6 | 2017-06-23 16:09:41 -0700 | [diff] [blame] | 79 | * TODO: add every HISTOGRAM_ENTRY_TS to two |
Sanna Catherine de Treville Wager | 1bb6862 | 2017-06-14 14:18:31 -0700 | [diff] [blame] | 80 | * circular buffers: one short-term and one long-term (can add even longer-term |
| 81 | * structures in the future). When dump is called, print everything currently |
| 82 | * in the buffer. |
Sanna Catherine de Treville Wager | 2d1631e | 2017-05-30 16:12:36 -0700 | [diff] [blame] | 83 | * NBLog::drawHistogram |
| 84 | * input: timestamp array |
| 85 | * buckets this to a histogram and prints |
| 86 | * |
| 87 | */ |
| 88 | |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 89 | #define LOG_TAG "NBLog" |
Sanna Catherine de Treville Wager | 1bb6862 | 2017-06-14 14:18:31 -0700 | [diff] [blame] | 90 | // #define LOG_NDEBUG 0 |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 91 | |
Sanna Catherine de Treville Wager | 697a8a5 | 2017-06-01 09:49:05 -0700 | [diff] [blame] | 92 | #include <algorithm> |
Nicolas Roulet | dcdfaec | 2017-02-14 10:18:39 -0800 | [diff] [blame] | 93 | #include <climits> |
Sanna Catherine de Treville Wager | 201079a | 2017-05-18 16:36:29 -0700 | [diff] [blame] | 94 | #include <deque> |
Sanna Catherine de Treville Wager | 697a8a5 | 2017-06-01 09:49:05 -0700 | [diff] [blame] | 95 | #include <fstream> |
| 96 | // #include <inttypes.h> |
| 97 | #include <iostream> |
Sanna Catherine de Treville Wager | cced674 | 2017-05-10 14:42:54 -0700 | [diff] [blame] | 98 | #include <math.h> |
Sanna Catherine de Treville Wager | 201079a | 2017-05-18 16:36:29 -0700 | [diff] [blame] | 99 | #include <numeric> |
Sanna Catherine de Treville Wager | 697a8a5 | 2017-06-01 09:49:05 -0700 | [diff] [blame] | 100 | #include <vector> |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 101 | #include <stdarg.h> |
| 102 | #include <stdint.h> |
| 103 | #include <stdio.h> |
| 104 | #include <string.h> |
Nicolas Roulet | c20cb50 | 2017-02-01 12:35:24 -0800 | [diff] [blame] | 105 | #include <sys/prctl.h> |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 106 | #include <time.h> |
| 107 | #include <new> |
Glenn Kasten | 535e161 | 2016-12-05 12:19:36 -0800 | [diff] [blame] | 108 | #include <audio_utils/roundup.h> |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 109 | #include <media/nbaio/NBLog.h> |
Sanna Catherine de Treville Wager | d0dfe43 | 2017-06-22 15:09:38 -0700 | [diff] [blame] | 110 | #include <media/nbaio/PerformanceAnalysis.h> |
Sanna Catherine de Treville Wager | 8044808 | 2017-07-11 14:07:59 -0700 | [diff] [blame^] | 111 | #include <media/nbaio/ReportPerformance.h> |
Sanna Catherine de Treville Wager | 2d1631e | 2017-05-30 16:12:36 -0700 | [diff] [blame] | 112 | // #include <utils/CallStack.h> // used to print callstack |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 113 | #include <utils/Log.h> |
Glenn Kasten | 4e01ef6 | 2013-07-11 14:29:59 -0700 | [diff] [blame] | 114 | #include <utils/String8.h> |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 115 | |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 116 | #include <queue> |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 117 | #include <utility> |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 118 | |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 119 | namespace android { |
| 120 | |
Sanna Catherine de Treville Wager | 2d1631e | 2017-05-30 16:12:36 -0700 | [diff] [blame] | 121 | int NBLog::Entry::copyEntryDataAt(size_t offset) const |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 122 | { |
Sanna Catherine de Treville Wager | 2d1631e | 2017-05-30 16:12:36 -0700 | [diff] [blame] | 123 | // FIXME This is too slow |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 124 | if (offset == 0) |
| 125 | return mEvent; |
| 126 | else if (offset == 1) |
| 127 | return mLength; |
| 128 | else if (offset < (size_t) (mLength + 2)) |
| 129 | return ((char *) mData)[offset - 2]; |
| 130 | else if (offset == (size_t) (mLength + 2)) |
| 131 | return mLength; |
| 132 | else |
| 133 | return 0; |
| 134 | } |
| 135 | |
| 136 | // --------------------------------------------------------------------------- |
| 137 | |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 138 | /*static*/ |
| 139 | std::unique_ptr<NBLog::AbstractEntry> NBLog::AbstractEntry::buildEntry(const uint8_t *ptr) { |
Sanna Catherine de Treville Wager | cced674 | 2017-05-10 14:42:54 -0700 | [diff] [blame] | 140 | const uint8_t type = EntryIterator(ptr)->type; |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 141 | switch (type) { |
| 142 | case EVENT_START_FMT: |
| 143 | return std::make_unique<FormatEntry>(FormatEntry(ptr)); |
Sanna Catherine de Treville Wager | a8a8a47 | 2017-07-11 09:41:25 -0700 | [diff] [blame] | 144 | case EVENT_AUDIO_STATE: |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 145 | case EVENT_HISTOGRAM_ENTRY_TS: |
| 146 | return std::make_unique<HistogramEntry>(HistogramEntry(ptr)); |
| 147 | default: |
| 148 | ALOGW("Tried to create AbstractEntry of type %d", type); |
| 149 | return nullptr; |
| 150 | } |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 151 | } |
| 152 | |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 153 | NBLog::AbstractEntry::AbstractEntry(const uint8_t *entry) : mEntry(entry) { |
| 154 | } |
| 155 | |
| 156 | // --------------------------------------------------------------------------- |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 157 | |
Sanna Catherine de Treville Wager | dd92d7e | 2017-05-15 14:56:53 -0700 | [diff] [blame] | 158 | NBLog::EntryIterator NBLog::FormatEntry::begin() const { |
| 159 | return EntryIterator(mEntry); |
| 160 | } |
| 161 | |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 162 | const char *NBLog::FormatEntry::formatString() const { |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 163 | return (const char*) mEntry + offsetof(entry, data); |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 164 | } |
| 165 | |
| 166 | size_t NBLog::FormatEntry::formatStringLength() const { |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 167 | return mEntry[offsetof(entry, length)]; |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 168 | } |
| 169 | |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 170 | NBLog::EntryIterator NBLog::FormatEntry::args() const { |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 171 | auto it = begin(); |
Nicolas Roulet | 1ca7512 | 2017-03-16 14:19:59 -0700 | [diff] [blame] | 172 | // skip start fmt |
| 173 | ++it; |
| 174 | // skip timestamp |
| 175 | ++it; |
Nicolas Roulet | bd0c6b4 | 2017-03-16 13:54:23 -0700 | [diff] [blame] | 176 | // skip hash |
| 177 | ++it; |
Nicolas Roulet | 1ca7512 | 2017-03-16 14:19:59 -0700 | [diff] [blame] | 178 | // Skip author if present |
| 179 | if (it->type == EVENT_AUTHOR) { |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 180 | ++it; |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 181 | } |
Nicolas Roulet | 1ca7512 | 2017-03-16 14:19:59 -0700 | [diff] [blame] | 182 | return it; |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 183 | } |
| 184 | |
Nicolas Roulet | f42f156 | 2017-03-30 19:16:22 -0700 | [diff] [blame] | 185 | int64_t NBLog::FormatEntry::timestamp() const { |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 186 | auto it = begin(); |
Nicolas Roulet | 1ca7512 | 2017-03-16 14:19:59 -0700 | [diff] [blame] | 187 | // skip start fmt |
| 188 | ++it; |
Nicolas Roulet | f42f156 | 2017-03-30 19:16:22 -0700 | [diff] [blame] | 189 | return it.payload<int64_t>(); |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 190 | } |
| 191 | |
Nicolas Roulet | bd0c6b4 | 2017-03-16 13:54:23 -0700 | [diff] [blame] | 192 | NBLog::log_hash_t NBLog::FormatEntry::hash() const { |
| 193 | auto it = begin(); |
| 194 | // skip start fmt |
| 195 | ++it; |
| 196 | // skip timestamp |
| 197 | ++it; |
| 198 | // unaligned 64-bit read not supported |
| 199 | log_hash_t hash; |
| 200 | memcpy(&hash, it->data, sizeof(hash)); |
| 201 | return hash; |
| 202 | } |
| 203 | |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 204 | int NBLog::FormatEntry::author() const { |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 205 | auto it = begin(); |
Nicolas Roulet | 1ca7512 | 2017-03-16 14:19:59 -0700 | [diff] [blame] | 206 | // skip start fmt |
| 207 | ++it; |
| 208 | // skip timestamp |
| 209 | ++it; |
Nicolas Roulet | bd0c6b4 | 2017-03-16 13:54:23 -0700 | [diff] [blame] | 210 | // skip hash |
| 211 | ++it; |
Nicolas Roulet | 1ca7512 | 2017-03-16 14:19:59 -0700 | [diff] [blame] | 212 | // if there is an author entry, return it, return -1 otherwise |
| 213 | if (it->type == EVENT_AUTHOR) { |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 214 | return it.payload<int>(); |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 215 | } |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 216 | return -1; |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 217 | } |
| 218 | |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 219 | NBLog::EntryIterator NBLog::FormatEntry::copyWithAuthor( |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame] | 220 | std::unique_ptr<audio_utils_fifo_writer> &dst, int author) const { |
| 221 | auto it = begin(); |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 222 | // copy fmt start entry |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 223 | it.copyTo(dst); |
Nicolas Roulet | 1ca7512 | 2017-03-16 14:19:59 -0700 | [diff] [blame] | 224 | // copy timestamp |
Sanna Catherine de Treville Wager | 2d1631e | 2017-05-30 16:12:36 -0700 | [diff] [blame] | 225 | (++it).copyTo(dst); // copy hash |
Nicolas Roulet | bd0c6b4 | 2017-03-16 13:54:23 -0700 | [diff] [blame] | 226 | (++it).copyTo(dst); |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 227 | // insert author entry |
| 228 | size_t authorEntrySize = NBLog::Entry::kOverhead + sizeof(author); |
| 229 | uint8_t authorEntry[authorEntrySize]; |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 230 | authorEntry[offsetof(entry, type)] = EVENT_AUTHOR; |
| 231 | authorEntry[offsetof(entry, length)] = |
| 232 | authorEntry[authorEntrySize + NBLog::Entry::kPreviousLengthOffset] = |
| 233 | sizeof(author); |
| 234 | *(int*) (&authorEntry[offsetof(entry, data)]) = author; |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 235 | dst->write(authorEntry, authorEntrySize); |
| 236 | // copy rest of entries |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 237 | while ((++it)->type != EVENT_END_FMT) { |
| 238 | it.copyTo(dst); |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 239 | } |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 240 | it.copyTo(dst); |
| 241 | ++it; |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame] | 242 | return it; |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 243 | } |
| 244 | |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 245 | void NBLog::EntryIterator::copyTo(std::unique_ptr<audio_utils_fifo_writer> &dst) const { |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 246 | size_t length = ptr[offsetof(entry, length)] + NBLog::Entry::kOverhead; |
| 247 | dst->write(ptr, length); |
| 248 | } |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 249 | |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 250 | void NBLog::EntryIterator::copyData(uint8_t *dst) const { |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 251 | memcpy((void*) dst, ptr + offsetof(entry, data), ptr[offsetof(entry, length)]); |
| 252 | } |
| 253 | |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 254 | NBLog::EntryIterator::EntryIterator() |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame] | 255 | : ptr(nullptr) {} |
| 256 | |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 257 | NBLog::EntryIterator::EntryIterator(const uint8_t *entry) |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 258 | : ptr(entry) {} |
| 259 | |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 260 | NBLog::EntryIterator::EntryIterator(const NBLog::EntryIterator &other) |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 261 | : ptr(other.ptr) {} |
| 262 | |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 263 | const NBLog::entry& NBLog::EntryIterator::operator*() const { |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 264 | return *(entry*) ptr; |
| 265 | } |
| 266 | |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 267 | const NBLog::entry* NBLog::EntryIterator::operator->() const { |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 268 | return (entry*) ptr; |
| 269 | } |
| 270 | |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 271 | NBLog::EntryIterator& NBLog::EntryIterator::operator++() { |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 272 | ptr += ptr[offsetof(entry, length)] + NBLog::Entry::kOverhead; |
| 273 | return *this; |
| 274 | } |
| 275 | |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 276 | NBLog::EntryIterator& NBLog::EntryIterator::operator--() { |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 277 | ptr -= ptr[NBLog::Entry::kPreviousLengthOffset] + NBLog::Entry::kOverhead; |
| 278 | return *this; |
| 279 | } |
| 280 | |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 281 | NBLog::EntryIterator NBLog::EntryIterator::next() const { |
| 282 | EntryIterator aux(*this); |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame] | 283 | return ++aux; |
| 284 | } |
| 285 | |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 286 | NBLog::EntryIterator NBLog::EntryIterator::prev() const { |
| 287 | EntryIterator aux(*this); |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame] | 288 | return --aux; |
| 289 | } |
| 290 | |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 291 | int NBLog::EntryIterator::operator-(const NBLog::EntryIterator &other) const { |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 292 | return ptr - other.ptr; |
| 293 | } |
| 294 | |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 295 | bool NBLog::EntryIterator::operator!=(const EntryIterator &other) const { |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 296 | return ptr != other.ptr; |
| 297 | } |
| 298 | |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 299 | bool NBLog::EntryIterator::hasConsistentLength() const { |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 300 | return ptr[offsetof(entry, length)] == ptr[ptr[offsetof(entry, length)] + |
| 301 | NBLog::Entry::kOverhead + NBLog::Entry::kPreviousLengthOffset]; |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 302 | } |
| 303 | |
| 304 | // --------------------------------------------------------------------------- |
| 305 | |
Nicolas Roulet | f42f156 | 2017-03-30 19:16:22 -0700 | [diff] [blame] | 306 | int64_t NBLog::HistogramEntry::timestamp() const { |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 307 | return EntryIterator(mEntry).payload<HistTsEntry>().ts; |
| 308 | } |
| 309 | |
| 310 | NBLog::log_hash_t NBLog::HistogramEntry::hash() const { |
| 311 | return EntryIterator(mEntry).payload<HistTsEntry>().hash; |
| 312 | } |
| 313 | |
| 314 | int NBLog::HistogramEntry::author() const { |
| 315 | EntryIterator it(mEntry); |
| 316 | if (it->length == sizeof(HistTsEntryWithAuthor)) { |
| 317 | return it.payload<HistTsEntryWithAuthor>().author; |
| 318 | } else { |
| 319 | return -1; |
| 320 | } |
| 321 | } |
| 322 | |
| 323 | NBLog::EntryIterator NBLog::HistogramEntry::copyWithAuthor( |
| 324 | std::unique_ptr<audio_utils_fifo_writer> &dst, int author) const { |
| 325 | // Current histogram entry has {type, length, struct HistTsEntry, length}. |
| 326 | // We now want {type, length, struct HistTsEntryWithAuthor, length} |
| 327 | uint8_t buffer[Entry::kOverhead + sizeof(HistTsEntryWithAuthor)]; |
| 328 | // Copy content until the point we want to add the author |
| 329 | memcpy(buffer, mEntry, sizeof(entry) + sizeof(HistTsEntry)); |
| 330 | // Copy the author |
| 331 | *(int*) (buffer + sizeof(entry) + sizeof(HistTsEntry)) = author; |
| 332 | // Update lengths |
| 333 | buffer[offsetof(entry, length)] = sizeof(HistTsEntryWithAuthor); |
| 334 | buffer[sizeof(buffer) + Entry::kPreviousLengthOffset] = sizeof(HistTsEntryWithAuthor); |
| 335 | // Write new buffer into FIFO |
| 336 | dst->write(buffer, sizeof(buffer)); |
| 337 | return EntryIterator(mEntry).next(); |
| 338 | } |
| 339 | |
| 340 | // --------------------------------------------------------------------------- |
| 341 | |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 342 | #if 0 // FIXME see note in NBLog.h |
| 343 | NBLog::Timeline::Timeline(size_t size, void *shared) |
| 344 | : mSize(roundup(size)), mOwn(shared == NULL), |
| 345 | mShared((Shared *) (mOwn ? new char[sharedSize(size)] : shared)) |
| 346 | { |
| 347 | new (mShared) Shared; |
| 348 | } |
| 349 | |
| 350 | NBLog::Timeline::~Timeline() |
| 351 | { |
| 352 | mShared->~Shared(); |
| 353 | if (mOwn) { |
| 354 | delete[] (char *) mShared; |
| 355 | } |
| 356 | } |
| 357 | #endif |
| 358 | |
| 359 | /*static*/ |
| 360 | size_t NBLog::Timeline::sharedSize(size_t size) |
| 361 | { |
Glenn Kasten | ed99c2b | 2016-12-12 08:31:24 -0800 | [diff] [blame] | 362 | // 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] | 363 | return sizeof(Shared) + roundup(size); |
| 364 | } |
| 365 | |
| 366 | // --------------------------------------------------------------------------- |
| 367 | |
| 368 | NBLog::Writer::Writer() |
Nicolas Roulet | c20cb50 | 2017-02-01 12:35:24 -0800 | [diff] [blame] | 369 | : mShared(NULL), mFifo(NULL), mFifoWriter(NULL), mEnabled(false), mPidTag(NULL), mPidTagSize(0) |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 370 | { |
| 371 | } |
| 372 | |
Glenn Kasten | 535e161 | 2016-12-05 12:19:36 -0800 | [diff] [blame] | 373 | NBLog::Writer::Writer(void *shared, size_t size) |
| 374 | : mShared((Shared *) shared), |
| 375 | mFifo(mShared != NULL ? |
| 376 | new audio_utils_fifo(size, sizeof(uint8_t), |
| 377 | mShared->mBuffer, mShared->mRear, NULL /*throttlesFront*/) : NULL), |
| 378 | mFifoWriter(mFifo != NULL ? new audio_utils_fifo_writer(*mFifo) : NULL), |
| 379 | mEnabled(mFifoWriter != NULL) |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 380 | { |
Nicolas Roulet | c20cb50 | 2017-02-01 12:35:24 -0800 | [diff] [blame] | 381 | // caching pid and process name |
| 382 | pid_t id = ::getpid(); |
| 383 | char procName[16]; |
| 384 | int status = prctl(PR_GET_NAME, procName); |
| 385 | if (status) { // error getting process name |
| 386 | procName[0] = '\0'; |
| 387 | } |
| 388 | size_t length = strlen(procName); |
| 389 | mPidTagSize = length + sizeof(pid_t); |
| 390 | mPidTag = new char[mPidTagSize]; |
| 391 | memcpy(mPidTag, &id, sizeof(pid_t)); |
| 392 | memcpy(mPidTag + sizeof(pid_t), procName, length); |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 393 | } |
| 394 | |
Glenn Kasten | 535e161 | 2016-12-05 12:19:36 -0800 | [diff] [blame] | 395 | NBLog::Writer::Writer(const sp<IMemory>& iMemory, size_t size) |
| 396 | : Writer(iMemory != 0 ? (Shared *) iMemory->pointer() : NULL, size) |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 397 | { |
Glenn Kasten | 535e161 | 2016-12-05 12:19:36 -0800 | [diff] [blame] | 398 | mIMemory = iMemory; |
| 399 | } |
| 400 | |
| 401 | NBLog::Writer::~Writer() |
| 402 | { |
| 403 | delete mFifoWriter; |
| 404 | delete mFifo; |
Nicolas Roulet | c20cb50 | 2017-02-01 12:35:24 -0800 | [diff] [blame] | 405 | delete[] mPidTag; |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 406 | } |
| 407 | |
| 408 | void NBLog::Writer::log(const char *string) |
| 409 | { |
| 410 | if (!mEnabled) { |
| 411 | return; |
| 412 | } |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 413 | LOG_ALWAYS_FATAL_IF(string == NULL, "Attempted to log NULL string"); |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 414 | size_t length = strlen(string); |
Glenn Kasten | 535e161 | 2016-12-05 12:19:36 -0800 | [diff] [blame] | 415 | if (length > Entry::kMaxLength) { |
| 416 | length = Entry::kMaxLength; |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 417 | } |
| 418 | log(EVENT_STRING, string, length); |
| 419 | } |
| 420 | |
| 421 | void NBLog::Writer::logf(const char *fmt, ...) |
| 422 | { |
| 423 | if (!mEnabled) { |
| 424 | return; |
| 425 | } |
| 426 | va_list ap; |
| 427 | va_start(ap, fmt); |
| 428 | Writer::logvf(fmt, ap); // the Writer:: is needed to avoid virtual dispatch for LockedWriter |
| 429 | va_end(ap); |
| 430 | } |
| 431 | |
| 432 | void NBLog::Writer::logvf(const char *fmt, va_list ap) |
| 433 | { |
| 434 | if (!mEnabled) { |
| 435 | return; |
| 436 | } |
Glenn Kasten | 535e161 | 2016-12-05 12:19:36 -0800 | [diff] [blame] | 437 | char buffer[Entry::kMaxLength + 1 /*NUL*/]; |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 438 | int length = vsnprintf(buffer, sizeof(buffer), fmt, ap); |
| 439 | if (length >= (int) sizeof(buffer)) { |
| 440 | length = sizeof(buffer) - 1; |
| 441 | // NUL termination is not required |
| 442 | // buffer[length] = '\0'; |
| 443 | } |
| 444 | if (length >= 0) { |
| 445 | log(EVENT_STRING, buffer, length); |
| 446 | } |
| 447 | } |
| 448 | |
| 449 | void NBLog::Writer::logTimestamp() |
| 450 | { |
| 451 | if (!mEnabled) { |
| 452 | return; |
| 453 | } |
Nicolas Roulet | f42f156 | 2017-03-30 19:16:22 -0700 | [diff] [blame] | 454 | int64_t ts = get_monotonic_ns(); |
| 455 | if (ts > 0) { |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 456 | log(EVENT_TIMESTAMP, &ts, sizeof(ts)); |
Nicolas Roulet | f42f156 | 2017-03-30 19:16:22 -0700 | [diff] [blame] | 457 | } else { |
| 458 | ALOGE("Failed to get timestamp"); |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 459 | } |
| 460 | } |
| 461 | |
Nicolas Roulet | f42f156 | 2017-03-30 19:16:22 -0700 | [diff] [blame] | 462 | void NBLog::Writer::logTimestamp(const int64_t ts) |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 463 | { |
| 464 | if (!mEnabled) { |
| 465 | return; |
| 466 | } |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 467 | log(EVENT_TIMESTAMP, &ts, sizeof(ts)); |
| 468 | } |
| 469 | |
| 470 | void NBLog::Writer::logInteger(const int x) |
| 471 | { |
| 472 | if (!mEnabled) { |
| 473 | return; |
| 474 | } |
| 475 | log(EVENT_INTEGER, &x, sizeof(x)); |
| 476 | } |
| 477 | |
| 478 | void NBLog::Writer::logFloat(const float x) |
| 479 | { |
| 480 | if (!mEnabled) { |
| 481 | return; |
| 482 | } |
| 483 | log(EVENT_FLOAT, &x, sizeof(x)); |
| 484 | } |
| 485 | |
| 486 | void NBLog::Writer::logPID() |
| 487 | { |
| 488 | if (!mEnabled) { |
| 489 | return; |
| 490 | } |
Nicolas Roulet | c20cb50 | 2017-02-01 12:35:24 -0800 | [diff] [blame] | 491 | log(EVENT_PID, mPidTag, mPidTagSize); |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 492 | } |
| 493 | |
| 494 | void NBLog::Writer::logStart(const char *fmt) |
| 495 | { |
| 496 | if (!mEnabled) { |
| 497 | return; |
| 498 | } |
| 499 | size_t length = strlen(fmt); |
| 500 | if (length > Entry::kMaxLength) { |
| 501 | length = Entry::kMaxLength; |
| 502 | } |
| 503 | log(EVENT_START_FMT, fmt, length); |
| 504 | } |
| 505 | |
| 506 | void NBLog::Writer::logEnd() |
| 507 | { |
| 508 | if (!mEnabled) { |
| 509 | return; |
| 510 | } |
| 511 | Entry entry = Entry(EVENT_END_FMT, NULL, 0); |
| 512 | log(&entry, true); |
| 513 | } |
| 514 | |
Nicolas Roulet | bd0c6b4 | 2017-03-16 13:54:23 -0700 | [diff] [blame] | 515 | void NBLog::Writer::logHash(log_hash_t hash) |
| 516 | { |
| 517 | if (!mEnabled) { |
| 518 | return; |
| 519 | } |
| 520 | log(EVENT_HASH, &hash, sizeof(hash)); |
| 521 | } |
| 522 | |
Sanna Catherine de Treville Wager | a8a8a47 | 2017-07-11 09:41:25 -0700 | [diff] [blame] | 523 | void NBLog::Writer::logEventHistTs(Event event, log_hash_t hash) |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 524 | { |
| 525 | if (!mEnabled) { |
| 526 | return; |
| 527 | } |
| 528 | HistTsEntry data; |
| 529 | data.hash = hash; |
Nicolas Roulet | f42f156 | 2017-03-30 19:16:22 -0700 | [diff] [blame] | 530 | data.ts = get_monotonic_ns(); |
| 531 | if (data.ts > 0) { |
Sanna Catherine de Treville Wager | a8a8a47 | 2017-07-11 09:41:25 -0700 | [diff] [blame] | 532 | log(event, &data, sizeof(data)); |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 533 | } else { |
Nicolas Roulet | f42f156 | 2017-03-30 19:16:22 -0700 | [diff] [blame] | 534 | ALOGE("Failed to get timestamp"); |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 535 | } |
| 536 | } |
| 537 | |
Nicolas Roulet | bd0c6b4 | 2017-03-16 13:54:23 -0700 | [diff] [blame] | 538 | void NBLog::Writer::logFormat(const char *fmt, log_hash_t hash, ...) |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 539 | { |
| 540 | if (!mEnabled) { |
| 541 | return; |
| 542 | } |
| 543 | |
| 544 | va_list ap; |
Nicolas Roulet | bd0c6b4 | 2017-03-16 13:54:23 -0700 | [diff] [blame] | 545 | va_start(ap, hash); |
| 546 | Writer::logVFormat(fmt, hash, ap); |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 547 | va_end(ap); |
| 548 | } |
| 549 | |
Nicolas Roulet | bd0c6b4 | 2017-03-16 13:54:23 -0700 | [diff] [blame] | 550 | void NBLog::Writer::logVFormat(const char *fmt, log_hash_t hash, va_list argp) |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 551 | { |
| 552 | if (!mEnabled) { |
| 553 | return; |
| 554 | } |
| 555 | Writer::logStart(fmt); |
| 556 | int i; |
| 557 | double f; |
| 558 | char* s; |
Nicolas Roulet | f42f156 | 2017-03-30 19:16:22 -0700 | [diff] [blame] | 559 | int64_t t; |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 560 | Writer::logTimestamp(); |
Nicolas Roulet | bd0c6b4 | 2017-03-16 13:54:23 -0700 | [diff] [blame] | 561 | Writer::logHash(hash); |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 562 | for (const char *p = fmt; *p != '\0'; p++) { |
| 563 | // TODO: implement more complex formatting such as %.3f |
| 564 | if (*p != '%') { |
| 565 | continue; |
| 566 | } |
| 567 | switch(*++p) { |
| 568 | case 's': // string |
| 569 | s = va_arg(argp, char *); |
| 570 | Writer::log(s); |
| 571 | break; |
| 572 | |
| 573 | case 't': // timestamp |
Nicolas Roulet | f42f156 | 2017-03-30 19:16:22 -0700 | [diff] [blame] | 574 | t = va_arg(argp, int64_t); |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 575 | Writer::logTimestamp(t); |
| 576 | break; |
| 577 | |
| 578 | case 'd': // integer |
| 579 | i = va_arg(argp, int); |
| 580 | Writer::logInteger(i); |
| 581 | break; |
| 582 | |
| 583 | case 'f': // float |
| 584 | f = va_arg(argp, double); // float arguments are promoted to double in vararg lists |
| 585 | Writer::logFloat((float)f); |
| 586 | break; |
| 587 | |
| 588 | case 'p': // pid |
| 589 | Writer::logPID(); |
| 590 | break; |
| 591 | |
| 592 | // the "%\0" case finishes parsing |
| 593 | case '\0': |
| 594 | --p; |
| 595 | break; |
| 596 | |
Nicolas Roulet | c20cb50 | 2017-02-01 12:35:24 -0800 | [diff] [blame] | 597 | case '%': |
| 598 | break; |
| 599 | |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 600 | default: |
| 601 | ALOGW("NBLog Writer parsed invalid format specifier: %c", *p); |
| 602 | break; |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 603 | } |
| 604 | } |
| 605 | Writer::logEnd(); |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 606 | } |
| 607 | |
| 608 | void NBLog::Writer::log(Event event, const void *data, size_t length) |
| 609 | { |
| 610 | if (!mEnabled) { |
| 611 | return; |
| 612 | } |
Glenn Kasten | 535e161 | 2016-12-05 12:19:36 -0800 | [diff] [blame] | 613 | if (data == NULL || length > Entry::kMaxLength) { |
| 614 | // TODO Perhaps it makes sense to display truncated data or at least a |
| 615 | // message that the data is too long? The current behavior can create |
| 616 | // a confusion for a programmer debugging their code. |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 617 | return; |
| 618 | } |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 619 | // Ignore if invalid event |
| 620 | if (event == EVENT_RESERVED || event >= EVENT_UPPER_BOUND) { |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 621 | return; |
| 622 | } |
Sanna Catherine de Treville Wager | 2d1631e | 2017-05-30 16:12:36 -0700 | [diff] [blame] | 623 | Entry etr(event, data, length); |
| 624 | log(&etr, true /*trusted*/); |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 625 | } |
| 626 | |
Sanna Catherine de Treville Wager | 2d1631e | 2017-05-30 16:12:36 -0700 | [diff] [blame] | 627 | void NBLog::Writer::log(const NBLog::Entry *etr, bool trusted) |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 628 | { |
| 629 | if (!mEnabled) { |
| 630 | return; |
| 631 | } |
| 632 | if (!trusted) { |
Sanna Catherine de Treville Wager | 2d1631e | 2017-05-30 16:12:36 -0700 | [diff] [blame] | 633 | log(etr->mEvent, etr->mData, etr->mLength); |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 634 | return; |
| 635 | } |
Sanna Catherine de Treville Wager | 2d1631e | 2017-05-30 16:12:36 -0700 | [diff] [blame] | 636 | size_t need = etr->mLength + Entry::kOverhead; // mEvent, mLength, data[mLength], mLength |
| 637 | // need = number of bytes written to FIFO |
Glenn Kasten | 535e161 | 2016-12-05 12:19:36 -0800 | [diff] [blame] | 638 | |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 639 | // FIXME optimize this using memcpy for the data part of the Entry. |
| 640 | // The Entry could have a method copyTo(ptr, offset, size) to optimize the copy. |
Sanna Catherine de Treville Wager | 2d1631e | 2017-05-30 16:12:36 -0700 | [diff] [blame] | 641 | // checks size of a single log Entry: type, length, data pointer and ending |
Glenn Kasten | 535e161 | 2016-12-05 12:19:36 -0800 | [diff] [blame] | 642 | uint8_t temp[Entry::kMaxLength + Entry::kOverhead]; |
Sanna Catherine de Treville Wager | 2d1631e | 2017-05-30 16:12:36 -0700 | [diff] [blame] | 643 | // write this data to temp array |
Glenn Kasten | 535e161 | 2016-12-05 12:19:36 -0800 | [diff] [blame] | 644 | for (size_t i = 0; i < need; i++) { |
Sanna Catherine de Treville Wager | 2d1631e | 2017-05-30 16:12:36 -0700 | [diff] [blame] | 645 | temp[i] = etr->copyEntryDataAt(i); |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 646 | } |
Sanna Catherine de Treville Wager | 2d1631e | 2017-05-30 16:12:36 -0700 | [diff] [blame] | 647 | // write to circular buffer |
Glenn Kasten | 535e161 | 2016-12-05 12:19:36 -0800 | [diff] [blame] | 648 | mFifoWriter->write(temp, need); |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 649 | } |
| 650 | |
| 651 | bool NBLog::Writer::isEnabled() const |
| 652 | { |
| 653 | return mEnabled; |
| 654 | } |
| 655 | |
| 656 | bool NBLog::Writer::setEnabled(bool enabled) |
| 657 | { |
| 658 | bool old = mEnabled; |
| 659 | mEnabled = enabled && mShared != NULL; |
| 660 | return old; |
| 661 | } |
| 662 | |
| 663 | // --------------------------------------------------------------------------- |
| 664 | |
| 665 | NBLog::LockedWriter::LockedWriter() |
| 666 | : Writer() |
| 667 | { |
| 668 | } |
| 669 | |
Glenn Kasten | 535e161 | 2016-12-05 12:19:36 -0800 | [diff] [blame] | 670 | NBLog::LockedWriter::LockedWriter(void *shared, size_t size) |
| 671 | : Writer(shared, size) |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 672 | { |
| 673 | } |
| 674 | |
| 675 | void NBLog::LockedWriter::log(const char *string) |
| 676 | { |
| 677 | Mutex::Autolock _l(mLock); |
| 678 | Writer::log(string); |
| 679 | } |
| 680 | |
| 681 | void NBLog::LockedWriter::logf(const char *fmt, ...) |
| 682 | { |
| 683 | // FIXME should not take the lock until after formatting is done |
| 684 | Mutex::Autolock _l(mLock); |
| 685 | va_list ap; |
| 686 | va_start(ap, fmt); |
| 687 | Writer::logvf(fmt, ap); |
| 688 | va_end(ap); |
| 689 | } |
| 690 | |
| 691 | void NBLog::LockedWriter::logvf(const char *fmt, va_list ap) |
| 692 | { |
| 693 | // FIXME should not take the lock until after formatting is done |
| 694 | Mutex::Autolock _l(mLock); |
| 695 | Writer::logvf(fmt, ap); |
| 696 | } |
| 697 | |
| 698 | void NBLog::LockedWriter::logTimestamp() |
| 699 | { |
| 700 | // FIXME should not take the lock until after the clock_gettime() syscall |
| 701 | Mutex::Autolock _l(mLock); |
| 702 | Writer::logTimestamp(); |
| 703 | } |
| 704 | |
Nicolas Roulet | f42f156 | 2017-03-30 19:16:22 -0700 | [diff] [blame] | 705 | void NBLog::LockedWriter::logTimestamp(const int64_t ts) |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 706 | { |
| 707 | Mutex::Autolock _l(mLock); |
| 708 | Writer::logTimestamp(ts); |
| 709 | } |
| 710 | |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 711 | void NBLog::LockedWriter::logInteger(const int x) |
| 712 | { |
| 713 | Mutex::Autolock _l(mLock); |
| 714 | Writer::logInteger(x); |
| 715 | } |
| 716 | |
| 717 | void NBLog::LockedWriter::logFloat(const float x) |
| 718 | { |
| 719 | Mutex::Autolock _l(mLock); |
| 720 | Writer::logFloat(x); |
| 721 | } |
| 722 | |
| 723 | void NBLog::LockedWriter::logPID() |
| 724 | { |
| 725 | Mutex::Autolock _l(mLock); |
| 726 | Writer::logPID(); |
| 727 | } |
| 728 | |
| 729 | void NBLog::LockedWriter::logStart(const char *fmt) |
| 730 | { |
| 731 | Mutex::Autolock _l(mLock); |
| 732 | Writer::logStart(fmt); |
| 733 | } |
| 734 | |
| 735 | |
| 736 | void NBLog::LockedWriter::logEnd() |
| 737 | { |
| 738 | Mutex::Autolock _l(mLock); |
| 739 | Writer::logEnd(); |
| 740 | } |
| 741 | |
Nicolas Roulet | bd0c6b4 | 2017-03-16 13:54:23 -0700 | [diff] [blame] | 742 | void NBLog::LockedWriter::logHash(log_hash_t hash) |
| 743 | { |
| 744 | Mutex::Autolock _l(mLock); |
| 745 | Writer::logHash(hash); |
| 746 | } |
| 747 | |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 748 | bool NBLog::LockedWriter::isEnabled() const |
| 749 | { |
| 750 | Mutex::Autolock _l(mLock); |
| 751 | return Writer::isEnabled(); |
| 752 | } |
| 753 | |
| 754 | bool NBLog::LockedWriter::setEnabled(bool enabled) |
| 755 | { |
| 756 | Mutex::Autolock _l(mLock); |
| 757 | return Writer::setEnabled(enabled); |
| 758 | } |
| 759 | |
| 760 | // --------------------------------------------------------------------------- |
| 761 | |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 762 | const std::set<NBLog::Event> NBLog::Reader::startingTypes {NBLog::Event::EVENT_START_FMT, |
| 763 | NBLog::Event::EVENT_HISTOGRAM_ENTRY_TS}; |
| 764 | const std::set<NBLog::Event> NBLog::Reader::endingTypes {NBLog::Event::EVENT_END_FMT, |
Sanna Catherine de Treville Wager | a8a8a47 | 2017-07-11 09:41:25 -0700 | [diff] [blame] | 765 | NBLog::Event::EVENT_HISTOGRAM_ENTRY_TS, |
| 766 | NBLog::Event::EVENT_AUDIO_STATE}; |
| 767 | |
Glenn Kasten | 535e161 | 2016-12-05 12:19:36 -0800 | [diff] [blame] | 768 | NBLog::Reader::Reader(const void *shared, size_t size) |
| 769 | : mShared((/*const*/ Shared *) shared), /*mIMemory*/ |
| 770 | mFd(-1), mIndent(0), |
| 771 | mFifo(mShared != NULL ? |
| 772 | new audio_utils_fifo(size, sizeof(uint8_t), |
| 773 | mShared->mBuffer, mShared->mRear, NULL /*throttlesFront*/) : NULL), |
Sanna Catherine de Treville Wager | d0dfe43 | 2017-06-22 15:09:38 -0700 | [diff] [blame] | 774 | mFifoReader(mFifo != NULL ? new audio_utils_fifo_reader(*mFifo) : NULL) |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 775 | { |
| 776 | } |
| 777 | |
Glenn Kasten | 535e161 | 2016-12-05 12:19:36 -0800 | [diff] [blame] | 778 | NBLog::Reader::Reader(const sp<IMemory>& iMemory, size_t size) |
| 779 | : Reader(iMemory != 0 ? (Shared *) iMemory->pointer() : NULL, size) |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 780 | { |
Glenn Kasten | 535e161 | 2016-12-05 12:19:36 -0800 | [diff] [blame] | 781 | mIMemory = iMemory; |
| 782 | } |
| 783 | |
| 784 | NBLog::Reader::~Reader() |
| 785 | { |
| 786 | delete mFifoReader; |
| 787 | delete mFifo; |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 788 | } |
| 789 | |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 790 | const uint8_t *NBLog::Reader::findLastEntryOfTypes(const uint8_t *front, const uint8_t *back, |
| 791 | const std::set<Event> &types) { |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame] | 792 | while (back + Entry::kPreviousLengthOffset >= front) { |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 793 | const uint8_t *prev = back - back[Entry::kPreviousLengthOffset] - Entry::kOverhead; |
| 794 | if (prev < front || prev + prev[offsetof(entry, length)] + |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame] | 795 | Entry::kOverhead != back) { |
| 796 | |
| 797 | // prev points to an out of limits or inconsistent entry |
| 798 | return nullptr; |
| 799 | } |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 800 | if (types.find((const Event) prev[offsetof(entry, type)]) != types.end()) { |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame] | 801 | return prev; |
| 802 | } |
| 803 | back = prev; |
| 804 | } |
| 805 | return nullptr; // no entry found |
| 806 | } |
| 807 | |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 808 | std::unique_ptr<NBLog::Reader::Snapshot> NBLog::Reader::getSnapshot() |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 809 | { |
Glenn Kasten | 535e161 | 2016-12-05 12:19:36 -0800 | [diff] [blame] | 810 | if (mFifoReader == NULL) { |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 811 | return std::unique_ptr<NBLog::Reader::Snapshot>(new Snapshot()); |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 812 | } |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 813 | // make a copy to avoid race condition with writer |
Glenn Kasten | 535e161 | 2016-12-05 12:19:36 -0800 | [diff] [blame] | 814 | size_t capacity = mFifo->capacity(); |
| 815 | |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame] | 816 | // This emulates the behaviour of audio_utils_fifo_reader::read, but without incrementing the |
| 817 | // reader index. The index is incremented after handling corruption, to after the last complete |
| 818 | // entry of the buffer |
| 819 | size_t lost; |
| 820 | audio_utils_iovec iovec[2]; |
| 821 | ssize_t availToRead = mFifoReader->obtain(iovec, capacity, NULL /*timeout*/, &lost); |
| 822 | if (availToRead <= 0) { |
| 823 | return std::unique_ptr<NBLog::Reader::Snapshot>(new Snapshot()); |
| 824 | } |
Glenn Kasten | 535e161 | 2016-12-05 12:19:36 -0800 | [diff] [blame] | 825 | |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame] | 826 | std::unique_ptr<Snapshot> snapshot(new Snapshot(availToRead)); |
| 827 | memcpy(snapshot->mData, (const char *) mFifo->buffer() + iovec[0].mOffset, iovec[0].mLength); |
| 828 | if (iovec[1].mLength > 0) { |
| 829 | memcpy(snapshot->mData + (iovec[0].mLength), |
| 830 | (const char *) mFifo->buffer() + iovec[1].mOffset, iovec[1].mLength); |
| 831 | } |
| 832 | |
| 833 | // Handle corrupted buffer |
| 834 | // Potentially, a buffer has corrupted data on both beginning (due to overflow) and end |
| 835 | // (due to incomplete format entry). But even if the end format entry is incomplete, |
| 836 | // it ends in a complete entry (which is not an END_FMT). So is safe to traverse backwards. |
| 837 | // TODO: handle client corruption (in the middle of a buffer) |
| 838 | |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 839 | const uint8_t *back = snapshot->mData + availToRead; |
| 840 | const uint8_t *front = snapshot->mData; |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame] | 841 | |
| 842 | // Find last END_FMT. <back> is sitting on an entry which might be the middle of a FormatEntry. |
| 843 | // We go backwards until we find an EVENT_END_FMT. |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 844 | const uint8_t *lastEnd = findLastEntryOfTypes(front, back, endingTypes); |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame] | 845 | if (lastEnd == nullptr) { |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 846 | snapshot->mEnd = snapshot->mBegin = EntryIterator(front); |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame] | 847 | } else { |
| 848 | // end of snapshot points to after last END_FMT entry |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 849 | snapshot->mEnd = EntryIterator(lastEnd).next(); |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame] | 850 | // find first START_FMT |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 851 | const uint8_t *firstStart = nullptr; |
| 852 | const uint8_t *firstStartTmp = snapshot->mEnd; |
| 853 | while ((firstStartTmp = findLastEntryOfTypes(front, firstStartTmp, startingTypes)) |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame] | 854 | != nullptr) { |
| 855 | firstStart = firstStartTmp; |
| 856 | } |
| 857 | // firstStart is null if no START_FMT entry was found before lastEnd |
| 858 | if (firstStart == nullptr) { |
| 859 | snapshot->mBegin = snapshot->mEnd; |
| 860 | } else { |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 861 | snapshot->mBegin = EntryIterator(firstStart); |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame] | 862 | } |
| 863 | } |
| 864 | |
| 865 | // advance fifo reader index to after last entry read. |
| 866 | mFifoReader->release(snapshot->mEnd - front); |
| 867 | |
| 868 | snapshot->mLost = lost; |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 869 | return snapshot; |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame] | 870 | |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 871 | } |
| 872 | |
Sanna Catherine de Treville Wager | 8044808 | 2017-07-11 14:07:59 -0700 | [diff] [blame^] | 873 | // TODO: move this to PerformanceAnalysis |
| 874 | // TODO: make call to dump periodic so that data in shared FIFO does not get overwritten |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 875 | void NBLog::Reader::dump(int fd, size_t indent, NBLog::Reader::Snapshot &snapshot) |
| 876 | { |
Glenn Kasten | 4e01ef6 | 2013-07-11 14:29:59 -0700 | [diff] [blame] | 877 | mFd = fd; |
| 878 | mIndent = indent; |
| 879 | String8 timestamp, body; |
Sanna Catherine de Treville Wager | 41cad59 | 2017-06-29 14:57:59 -0700 | [diff] [blame] | 880 | // FIXME: this is not thread safe |
Sanna Catherine de Treville Wager | 8044808 | 2017-07-11 14:07:59 -0700 | [diff] [blame^] | 881 | // TODO: need a separate instance of performanceAnalysis for each thread |
| 882 | // used to store data and to call analysis functions |
| 883 | static ReportPerformance::PerformanceAnalysis performanceAnalysis; |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 884 | size_t lost = snapshot.lost() + (snapshot.begin() - EntryIterator(snapshot.data())); |
Glenn Kasten | c02c961 | 2013-10-15 09:25:11 -0700 | [diff] [blame] | 885 | if (lost > 0) { |
Glenn Kasten | 95d287d | 2014-04-28 14:11:45 -0700 | [diff] [blame] | 886 | body.appendFormat("warning: lost %zu bytes worth of events", lost); |
Glenn Kasten | 4e01ef6 | 2013-07-11 14:29:59 -0700 | [diff] [blame] | 887 | // TODO timestamp empty here, only other choice to wait for the first timestamp event in the |
Sanna Catherine de Treville Wager | 2d1631e | 2017-05-30 16:12:36 -0700 | [diff] [blame] | 888 | // log to push it out. Consider keeping the timestamp/body between calls to copyEntryDataAt(). |
Glenn Kasten | 4e01ef6 | 2013-07-11 14:29:59 -0700 | [diff] [blame] | 889 | dumpLine(timestamp, body); |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 890 | } |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 891 | |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame] | 892 | for (auto entry = snapshot.begin(); entry != snapshot.end();) { |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 893 | switch (entry->type) { |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 894 | case EVENT_START_FMT: |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 895 | entry = handleFormat(FormatEntry(entry), ×tamp, &body); |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 896 | break; |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 897 | case EVENT_HISTOGRAM_ENTRY_TS: { |
| 898 | HistTsEntryWithAuthor *data = (HistTsEntryWithAuthor *) (entry->data); |
| 899 | // TODO This memcpies are here to avoid unaligned memory access crash. |
| 900 | // There's probably a more efficient way to do it |
| 901 | log_hash_t hash; |
| 902 | memcpy(&hash, &(data->hash), sizeof(hash)); |
Nicolas Roulet | ad82aa6 | 2017-04-03 19:15:20 -0700 | [diff] [blame] | 903 | int64_t ts; |
| 904 | memcpy(&ts, &data->ts, sizeof(ts)); |
Sanna Catherine de Treville Wager | 8044808 | 2017-07-11 14:07:59 -0700 | [diff] [blame^] | 905 | performanceAnalysis.logTsEntry(ts); |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 906 | ++entry; |
| 907 | break; |
| 908 | } |
Sanna Catherine de Treville Wager | a8a8a47 | 2017-07-11 09:41:25 -0700 | [diff] [blame] | 909 | case EVENT_AUDIO_STATE: { |
Sanna Catherine de Treville Wager | 8044808 | 2017-07-11 14:07:59 -0700 | [diff] [blame^] | 910 | performanceAnalysis.handleStateChange(); |
Sanna Catherine de Treville Wager | a8a8a47 | 2017-07-11 09:41:25 -0700 | [diff] [blame] | 911 | ++entry; |
| 912 | break; |
| 913 | } |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 914 | case EVENT_END_FMT: |
| 915 | body.appendFormat("warning: got to end format event"); |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame] | 916 | ++entry; |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 917 | break; |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 918 | case EVENT_RESERVED: |
| 919 | default: |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame] | 920 | body.appendFormat("warning: unexpected event %d", entry->type); |
| 921 | ++entry; |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 922 | break; |
| 923 | } |
Sanna Catherine de Treville Wager | 9484bae | 2017-06-15 14:39:44 -0700 | [diff] [blame] | 924 | } |
Sanna Catherine de Treville Wager | 41cad59 | 2017-06-29 14:57:59 -0700 | [diff] [blame] | 925 | performanceAnalysis.reportPerformance(&body); |
Sanna Catherine de Treville Wager | 9484bae | 2017-06-15 14:39:44 -0700 | [diff] [blame] | 926 | if (!body.isEmpty()) { |
| 927 | dumpLine(timestamp, body); |
Glenn Kasten | 4e01ef6 | 2013-07-11 14:29:59 -0700 | [diff] [blame] | 928 | } |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 929 | } |
| 930 | |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 931 | void NBLog::Reader::dump(int fd, size_t indent) |
| 932 | { |
| 933 | // get a snapshot, dump it |
| 934 | std::unique_ptr<Snapshot> snap = getSnapshot(); |
| 935 | dump(fd, indent, *snap); |
| 936 | } |
| 937 | |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 938 | void NBLog::Reader::dumpLine(const String8 ×tamp, String8 &body) |
Glenn Kasten | 4e01ef6 | 2013-07-11 14:29:59 -0700 | [diff] [blame] | 939 | { |
| 940 | if (mFd >= 0) { |
Elliott Hughes | 8b5f642 | 2014-05-22 01:22:06 -0700 | [diff] [blame] | 941 | dprintf(mFd, "%.*s%s %s\n", mIndent, "", timestamp.string(), body.string()); |
Glenn Kasten | 4e01ef6 | 2013-07-11 14:29:59 -0700 | [diff] [blame] | 942 | } else { |
| 943 | ALOGI("%.*s%s %s", mIndent, "", timestamp.string(), body.string()); |
| 944 | } |
| 945 | body.clear(); |
| 946 | } |
| 947 | |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 948 | bool NBLog::Reader::isIMemory(const sp<IMemory>& iMemory) const |
| 949 | { |
Glenn Kasten | 481fb67 | 2013-09-30 14:39:28 -0700 | [diff] [blame] | 950 | return iMemory != 0 && mIMemory != 0 && iMemory->pointer() == mIMemory->pointer(); |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 951 | } |
| 952 | |
Glenn Kasten | 1c44627 | 2017-04-07 09:49:07 -0700 | [diff] [blame] | 953 | // --------------------------------------------------------------------------- |
| 954 | |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 955 | void NBLog::appendTimestamp(String8 *body, const void *data) { |
Nicolas Roulet | f42f156 | 2017-03-30 19:16:22 -0700 | [diff] [blame] | 956 | int64_t ts; |
| 957 | memcpy(&ts, data, sizeof(ts)); |
| 958 | body->appendFormat("[%d.%03d]", (int) (ts / (1000 * 1000 * 1000)), |
| 959 | (int) ((ts / (1000 * 1000)) % 1000)); |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 960 | } |
| 961 | |
| 962 | void NBLog::appendInt(String8 *body, const void *data) { |
| 963 | int x = *((int*) data); |
| 964 | body->appendFormat("<%d>", x); |
| 965 | } |
| 966 | |
| 967 | void NBLog::appendFloat(String8 *body, const void *data) { |
| 968 | float f; |
| 969 | memcpy(&f, data, sizeof(float)); |
| 970 | body->appendFormat("<%f>", f); |
| 971 | } |
| 972 | |
Nicolas Roulet | c20cb50 | 2017-02-01 12:35:24 -0800 | [diff] [blame] | 973 | void NBLog::appendPID(String8 *body, const void* data, size_t length) { |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 974 | pid_t id = *((pid_t*) data); |
Nicolas Roulet | c20cb50 | 2017-02-01 12:35:24 -0800 | [diff] [blame] | 975 | char * name = &((char*) data)[sizeof(pid_t)]; |
| 976 | 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] | 977 | } |
| 978 | |
Nicolas Roulet | f42f156 | 2017-03-30 19:16:22 -0700 | [diff] [blame] | 979 | String8 NBLog::bufferDump(const uint8_t *buffer, size_t size) |
Nicolas Roulet | 2aedf37 | 2017-03-29 11:27:03 -0700 | [diff] [blame] | 980 | { |
| 981 | String8 str; |
| 982 | str.append("[ "); |
| 983 | for(size_t i = 0; i < size; i++) |
| 984 | { |
Nicolas Roulet | f42f156 | 2017-03-30 19:16:22 -0700 | [diff] [blame] | 985 | str.appendFormat("%d ", buffer[i]); |
Nicolas Roulet | 2aedf37 | 2017-03-29 11:27:03 -0700 | [diff] [blame] | 986 | } |
| 987 | str.append("]"); |
| 988 | return str; |
| 989 | } |
| 990 | |
Nicolas Roulet | f42f156 | 2017-03-30 19:16:22 -0700 | [diff] [blame] | 991 | String8 NBLog::bufferDump(const EntryIterator &it) |
Nicolas Roulet | 2aedf37 | 2017-03-29 11:27:03 -0700 | [diff] [blame] | 992 | { |
Nicolas Roulet | f42f156 | 2017-03-30 19:16:22 -0700 | [diff] [blame] | 993 | return bufferDump(it, it->length + Entry::kOverhead); |
Nicolas Roulet | 2aedf37 | 2017-03-29 11:27:03 -0700 | [diff] [blame] | 994 | } |
| 995 | |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 996 | NBLog::EntryIterator NBLog::Reader::handleFormat(const FormatEntry &fmtEntry, |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 997 | String8 *timestamp, |
| 998 | String8 *body) { |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 999 | // log timestamp |
Nicolas Roulet | f42f156 | 2017-03-30 19:16:22 -0700 | [diff] [blame] | 1000 | int64_t ts = fmtEntry.timestamp(); |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 1001 | timestamp->clear(); |
Nicolas Roulet | f42f156 | 2017-03-30 19:16:22 -0700 | [diff] [blame] | 1002 | timestamp->appendFormat("[%d.%03d]", (int) (ts / (1000 * 1000 * 1000)), |
| 1003 | (int) ((ts / (1000 * 1000)) % 1000)); |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 1004 | |
Nicolas Roulet | bd0c6b4 | 2017-03-16 13:54:23 -0700 | [diff] [blame] | 1005 | // log unique hash |
| 1006 | log_hash_t hash = fmtEntry.hash(); |
| 1007 | // print only lower 16bit of hash as hex and line as int to reduce spam in the log |
| 1008 | body->appendFormat("%.4X-%d ", (int)(hash >> 16) & 0xFFFF, (int) hash & 0xFFFF); |
| 1009 | |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 1010 | // log author (if present) |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 1011 | handleAuthor(fmtEntry, body); |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 1012 | |
| 1013 | // log string |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 1014 | NBLog::EntryIterator arg = fmtEntry.args(); |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 1015 | |
| 1016 | const char* fmt = fmtEntry.formatString(); |
| 1017 | size_t fmt_length = fmtEntry.formatStringLength(); |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 1018 | |
| 1019 | for (size_t fmt_offset = 0; fmt_offset < fmt_length; ++fmt_offset) { |
| 1020 | if (fmt[fmt_offset] != '%') { |
| 1021 | body->append(&fmt[fmt_offset], 1); // TODO optimize to write consecutive strings at once |
| 1022 | continue; |
| 1023 | } |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 1024 | // case "%%"" |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 1025 | if (fmt[++fmt_offset] == '%') { |
| 1026 | body->append("%"); |
| 1027 | continue; |
| 1028 | } |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 1029 | // case "%\0" |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 1030 | if (fmt_offset == fmt_length) { |
| 1031 | continue; |
| 1032 | } |
| 1033 | |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 1034 | NBLog::Event event = (NBLog::Event) arg->type; |
| 1035 | size_t length = arg->length; |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 1036 | |
| 1037 | // TODO check length for event type is correct |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 1038 | |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 1039 | if (event == EVENT_END_FMT) { |
| 1040 | break; |
| 1041 | } |
| 1042 | |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 1043 | // TODO: implement more complex formatting such as %.3f |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 1044 | const uint8_t *datum = arg->data; // pointer to the current event args |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 1045 | switch(fmt[fmt_offset]) |
| 1046 | { |
| 1047 | case 's': // string |
Nicolas Roulet | 4da7820 | 2017-02-03 12:53:39 -0800 | [diff] [blame] | 1048 | ALOGW_IF(event != EVENT_STRING, |
| 1049 | "NBLog Reader incompatible event for string specifier: %d", event); |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 1050 | body->append((const char*) datum, length); |
| 1051 | break; |
| 1052 | |
| 1053 | case 't': // timestamp |
Nicolas Roulet | 4da7820 | 2017-02-03 12:53:39 -0800 | [diff] [blame] | 1054 | ALOGW_IF(event != EVENT_TIMESTAMP, |
| 1055 | "NBLog Reader incompatible event for timestamp specifier: %d", event); |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 1056 | appendTimestamp(body, datum); |
| 1057 | break; |
| 1058 | |
| 1059 | case 'd': // integer |
Nicolas Roulet | 4da7820 | 2017-02-03 12:53:39 -0800 | [diff] [blame] | 1060 | ALOGW_IF(event != EVENT_INTEGER, |
| 1061 | "NBLog Reader incompatible event for integer specifier: %d", event); |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 1062 | appendInt(body, datum); |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 1063 | break; |
| 1064 | |
| 1065 | case 'f': // float |
Nicolas Roulet | 4da7820 | 2017-02-03 12:53:39 -0800 | [diff] [blame] | 1066 | ALOGW_IF(event != EVENT_FLOAT, |
| 1067 | "NBLog Reader incompatible event for float specifier: %d", event); |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 1068 | appendFloat(body, datum); |
| 1069 | break; |
| 1070 | |
| 1071 | case 'p': // pid |
Nicolas Roulet | 4da7820 | 2017-02-03 12:53:39 -0800 | [diff] [blame] | 1072 | ALOGW_IF(event != EVENT_PID, |
| 1073 | "NBLog Reader incompatible event for pid specifier: %d", event); |
Nicolas Roulet | c20cb50 | 2017-02-01 12:35:24 -0800 | [diff] [blame] | 1074 | appendPID(body, datum, length); |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 1075 | break; |
| 1076 | |
| 1077 | default: |
| 1078 | ALOGW("NBLog Reader encountered unknown character %c", fmt[fmt_offset]); |
| 1079 | } |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 1080 | ++arg; |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 1081 | } |
Nicolas Roulet | cd5dd01 | 2017-02-13 12:09:28 -0800 | [diff] [blame] | 1082 | ALOGW_IF(arg->type != EVENT_END_FMT, "Expected end of format, got %d", arg->type); |
| 1083 | ++arg; |
| 1084 | return arg; |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 1085 | } |
| 1086 | |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 1087 | NBLog::Merger::Merger(const void *shared, size_t size): |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 1088 | mShared((Shared *) shared), |
| 1089 | mFifo(mShared != NULL ? |
| 1090 | new audio_utils_fifo(size, sizeof(uint8_t), |
| 1091 | mShared->mBuffer, mShared->mRear, NULL /*throttlesFront*/) : NULL), |
| 1092 | mFifoWriter(mFifo != NULL ? new audio_utils_fifo_writer(*mFifo) : NULL) |
| 1093 | {} |
| 1094 | |
| 1095 | void NBLog::Merger::addReader(const NBLog::NamedReader &reader) { |
Glenn Kasten | 1c44627 | 2017-04-07 09:49:07 -0700 | [diff] [blame] | 1096 | // FIXME This is called by binder thread in MediaLogService::registerWriter |
| 1097 | // but the access to shared variable mNamedReaders is not yet protected by a lock. |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 1098 | mNamedReaders.push_back(reader); |
| 1099 | } |
| 1100 | |
| 1101 | // items placed in priority queue during merge |
| 1102 | // composed by a timestamp and the index of the snapshot where the timestamp came from |
| 1103 | struct MergeItem |
| 1104 | { |
Nicolas Roulet | f42f156 | 2017-03-30 19:16:22 -0700 | [diff] [blame] | 1105 | int64_t ts; |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 1106 | int index; |
Nicolas Roulet | f42f156 | 2017-03-30 19:16:22 -0700 | [diff] [blame] | 1107 | MergeItem(int64_t ts, int index): ts(ts), index(index) {} |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 1108 | }; |
| 1109 | |
| 1110 | // operators needed for priority queue in merge |
Nicolas Roulet | f42f156 | 2017-03-30 19:16:22 -0700 | [diff] [blame] | 1111 | // bool operator>(const int64_t &t1, const int64_t &t2) { |
| 1112 | // return t1.tv_sec > t2.tv_sec || (t1.tv_sec == t2.tv_sec && t1.tv_nsec > t2.tv_nsec); |
| 1113 | // } |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 1114 | |
| 1115 | bool operator>(const struct MergeItem &i1, const struct MergeItem &i2) { |
Nicolas Roulet | f42f156 | 2017-03-30 19:16:22 -0700 | [diff] [blame] | 1116 | return i1.ts > i2.ts || (i1.ts == i2.ts && i1.index > i2.index); |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 1117 | } |
| 1118 | |
| 1119 | // Merge registered readers, sorted by timestamp |
| 1120 | void NBLog::Merger::merge() { |
Glenn Kasten | 1c44627 | 2017-04-07 09:49:07 -0700 | [diff] [blame] | 1121 | // FIXME This is called by merge thread |
| 1122 | // but the access to shared variable mNamedReaders is not yet protected by a lock. |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 1123 | int nLogs = mNamedReaders.size(); |
| 1124 | std::vector<std::unique_ptr<NBLog::Reader::Snapshot>> snapshots(nLogs); |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 1125 | std::vector<NBLog::EntryIterator> offsets(nLogs); |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 1126 | for (int i = 0; i < nLogs; ++i) { |
| 1127 | snapshots[i] = mNamedReaders[i].reader()->getSnapshot(); |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame] | 1128 | offsets[i] = snapshots[i]->begin(); |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 1129 | } |
| 1130 | // initialize offsets |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 1131 | // TODO custom heap implementation could allow to update top, improving performance |
| 1132 | // for bursty buffers |
| 1133 | std::priority_queue<MergeItem, std::vector<MergeItem>, std::greater<MergeItem>> timestamps; |
| 1134 | for (int i = 0; i < nLogs; ++i) |
| 1135 | { |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame] | 1136 | if (offsets[i] != snapshots[i]->end()) { |
Nicolas Roulet | f42f156 | 2017-03-30 19:16:22 -0700 | [diff] [blame] | 1137 | int64_t ts = AbstractEntry::buildEntry(offsets[i])->timestamp(); |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame] | 1138 | timestamps.emplace(ts, i); |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 1139 | } |
| 1140 | } |
| 1141 | |
| 1142 | while (!timestamps.empty()) { |
| 1143 | // find minimum timestamp |
| 1144 | int index = timestamps.top().index; |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame] | 1145 | // copy it to the log, increasing offset |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 1146 | offsets[index] = AbstractEntry::buildEntry(offsets[index])->copyWithAuthor(mFifoWriter, |
| 1147 | index); |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 1148 | // update data structures |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 1149 | timestamps.pop(); |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame] | 1150 | if (offsets[index] != snapshots[index]->end()) { |
Nicolas Roulet | f42f156 | 2017-03-30 19:16:22 -0700 | [diff] [blame] | 1151 | int64_t ts = AbstractEntry::buildEntry(offsets[index])->timestamp(); |
Nicolas Roulet | 6ea1d7e | 2017-02-14 16:17:31 -0800 | [diff] [blame] | 1152 | timestamps.emplace(ts, index); |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 1153 | } |
| 1154 | } |
| 1155 | } |
| 1156 | |
Glenn Kasten | 1c44627 | 2017-04-07 09:49:07 -0700 | [diff] [blame] | 1157 | const std::vector<NBLog::NamedReader>& NBLog::Merger::getNamedReaders() const { |
| 1158 | // FIXME This is returning a reference to a shared variable that needs a lock |
| 1159 | return mNamedReaders; |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 1160 | } |
| 1161 | |
Glenn Kasten | 1c44627 | 2017-04-07 09:49:07 -0700 | [diff] [blame] | 1162 | // --------------------------------------------------------------------------- |
| 1163 | |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 1164 | NBLog::MergeReader::MergeReader(const void *shared, size_t size, Merger &merger) |
| 1165 | : Reader(shared, size), mNamedReaders(merger.getNamedReaders()) {} |
| 1166 | |
Nicolas Roulet | 537ad7d | 2017-03-21 16:24:30 -0700 | [diff] [blame] | 1167 | void NBLog::MergeReader::handleAuthor(const NBLog::AbstractEntry &entry, String8 *body) { |
| 1168 | int author = entry.author(); |
Glenn Kasten | 1c44627 | 2017-04-07 09:49:07 -0700 | [diff] [blame] | 1169 | // FIXME Needs a lock |
| 1170 | const char* name = mNamedReaders[author].name(); |
Nicolas Roulet | 40a4498 | 2017-02-03 13:39:57 -0800 | [diff] [blame] | 1171 | body->appendFormat("%s: ", name); |
Nicolas Roulet | fe1e144 | 2017-01-30 12:02:03 -0800 | [diff] [blame] | 1172 | } |
| 1173 | |
Glenn Kasten | 1c44627 | 2017-04-07 09:49:07 -0700 | [diff] [blame] | 1174 | // --------------------------------------------------------------------------- |
| 1175 | |
Nicolas Roulet | dcdfaec | 2017-02-14 10:18:39 -0800 | [diff] [blame] | 1176 | NBLog::MergeThread::MergeThread(NBLog::Merger &merger) |
| 1177 | : mMerger(merger), |
| 1178 | mTimeoutUs(0) {} |
| 1179 | |
| 1180 | NBLog::MergeThread::~MergeThread() { |
| 1181 | // set exit flag, set timeout to 0 to force threadLoop to exit and wait for the thread to join |
| 1182 | requestExit(); |
| 1183 | setTimeoutUs(0); |
| 1184 | join(); |
| 1185 | } |
| 1186 | |
| 1187 | bool NBLog::MergeThread::threadLoop() { |
| 1188 | bool doMerge; |
| 1189 | { |
| 1190 | AutoMutex _l(mMutex); |
| 1191 | // If mTimeoutUs is negative, wait on the condition variable until it's positive. |
| 1192 | // If it's positive, wait kThreadSleepPeriodUs and then merge |
| 1193 | nsecs_t waitTime = mTimeoutUs > 0 ? kThreadSleepPeriodUs * 1000 : LLONG_MAX; |
| 1194 | mCond.waitRelative(mMutex, waitTime); |
| 1195 | doMerge = mTimeoutUs > 0; |
| 1196 | mTimeoutUs -= kThreadSleepPeriodUs; |
| 1197 | } |
| 1198 | if (doMerge) { |
| 1199 | mMerger.merge(); |
| 1200 | } |
| 1201 | return true; |
| 1202 | } |
| 1203 | |
| 1204 | void NBLog::MergeThread::wakeup() { |
| 1205 | setTimeoutUs(kThreadWakeupPeriodUs); |
| 1206 | } |
| 1207 | |
| 1208 | void NBLog::MergeThread::setTimeoutUs(int time) { |
| 1209 | AutoMutex _l(mMutex); |
| 1210 | mTimeoutUs = time; |
| 1211 | mCond.signal(); |
| 1212 | } |
| 1213 | |
Glenn Kasten | 11d8dfc | 2013-01-14 14:53:13 -0800 | [diff] [blame] | 1214 | } // namespace android |