NBLog change timespec to int64_t nanoseconds
Bug: 36794556
Test: No change in functionality, everything keeps working
Change-Id: I19384478d94243a9d2a6fb48950963d8b9ec1efa
diff --git a/media/libnbaio/NBLog.cpp b/media/libnbaio/NBLog.cpp
index 834e3ef..1d1d61b 100644
--- a/media/libnbaio/NBLog.cpp
+++ b/media/libnbaio/NBLog.cpp
@@ -96,11 +96,11 @@
return it;
}
-timespec NBLog::FormatEntry::timestamp() const {
+int64_t NBLog::FormatEntry::timestamp() const {
auto it = begin();
// skip start fmt
++it;
- return it.payload<timespec>();
+ return it.payload<int64_t>();
}
NBLog::log_hash_t NBLog::FormatEntry::hash() const {
@@ -222,7 +222,7 @@
// ---------------------------------------------------------------------------
-timespec NBLog::HistogramEntry::timestamp() const {
+int64_t NBLog::HistogramEntry::timestamp() const {
return EntryIterator(mEntry).payload<HistTsEntry>().ts;
}
@@ -370,13 +370,15 @@
if (!mEnabled) {
return;
}
- struct timespec ts;
- if (!clock_gettime(CLOCK_MONOTONIC, &ts)) {
+ int64_t ts = get_monotonic_ns();
+ if (ts > 0) {
log(EVENT_TIMESTAMP, &ts, sizeof(ts));
+ } else {
+ ALOGE("Failed to get timestamp");
}
}
-void NBLog::Writer::logTimestamp(const struct timespec &ts)
+void NBLog::Writer::logTimestamp(const int64_t ts)
{
if (!mEnabled) {
return;
@@ -444,11 +446,11 @@
}
HistTsEntry data;
data.hash = hash;
- int error = clock_gettime(CLOCK_MONOTONIC, &data.ts);
- if (error == 0) {
+ data.ts = get_monotonic_ns();
+ if (data.ts > 0) {
log(EVENT_HISTOGRAM_ENTRY_TS, &data, sizeof(data));
} else {
- ALOGE("Failed to get timestamp: error %d", error);
+ ALOGE("Failed to get timestamp");
}
}
@@ -459,11 +461,11 @@
}
HistTsEntry data;
data.hash = hash;
- int error = clock_gettime(CLOCK_MONOTONIC, &data.ts);
- if (error == 0) {
+ data.ts = get_monotonic_ns();
+ if (data.ts > 0) {
log(EVENT_HISTOGRAM_FLUSH, &data, sizeof(data));
} else {
- ALOGE("Failed to get timestamp: error %d", error);
+ ALOGE("Failed to get timestamp");
}
}
@@ -488,7 +490,7 @@
int i;
double f;
char* s;
- struct timespec t;
+ int64_t t;
Writer::logTimestamp();
Writer::logHash(hash);
for (const char *p = fmt; *p != '\0'; p++) {
@@ -503,7 +505,7 @@
break;
case 't': // timestamp
- t = va_arg(argp, struct timespec);
+ t = va_arg(argp, int64_t);
Writer::logTimestamp(t);
break;
@@ -631,7 +633,7 @@
Writer::logTimestamp();
}
-void NBLog::LockedWriter::logTimestamp(const struct timespec &ts)
+void NBLog::LockedWriter::logTimestamp(const int64_t ts)
{
Mutex::Autolock _l(mLock);
Writer::logTimestamp(ts);
@@ -798,8 +800,8 @@
}
-int deltaMs(timespec *t1, timespec *t2) {
- return (t2->tv_sec - t1->tv_sec) * 1000 + t2->tv_nsec / 1000000 - t1->tv_nsec / 1000000;
+inline static int deltaMs(int64_t t1, int64_t t2) {
+ return (t2 - t1) / (1000 * 1000);
}
void NBLog::Reader::dump(int fd, size_t indent, NBLog::Reader::Snapshot &snapshot)
@@ -847,7 +849,7 @@
bool deferredTimestamp = false;
#endif
std::map<std::pair<log_hash_t, int>, std::vector<int>> hists;
- std::map<std::pair<log_hash_t, int>, timespec*> lastTSs;
+ std::map<std::pair<log_hash_t, int>, int64_t*> lastTSs;
for (auto entry = snapshot.begin(); entry != snapshot.end();) {
switch (entry->type) {
@@ -928,13 +930,13 @@
memcpy(&hash, &(data->hash), sizeof(hash));
const std::pair<log_hash_t, int> key(hash, data->author);
if (lastTSs[key] != nullptr) {
- timespec ts1;
- memcpy(&ts1, lastTSs[key], sizeof(timespec));
- timespec ts2;
- memcpy(&ts2, &data->ts, sizeof(timespec));
+ int64_t ts1;
+ memcpy(&ts1, lastTSs[key], sizeof(ts1));
+ int64_t ts2;
+ memcpy(&ts2, &data->ts, sizeof(ts2));
// TODO might want to filter excessively high outliers, which are usually caused
// by the thread being inactive.
- hists[key].push_back(deltaMs(&ts1, &ts2));
+ hists[key].push_back(deltaMs(ts1, ts2));
}
lastTSs[key] = &(data->ts);
++entry;
@@ -995,10 +997,10 @@
}
void NBLog::appendTimestamp(String8 *body, const void *data) {
- struct timespec ts;
- memcpy(&ts, data, sizeof(struct timespec));
- body->appendFormat("[%d.%03d]", (int) ts.tv_sec,
- (int) (ts.tv_nsec / 1000000));
+ int64_t ts;
+ memcpy(&ts, data, sizeof(ts));
+ body->appendFormat("[%d.%03d]", (int) (ts / (1000 * 1000 * 1000)),
+ (int) ((ts / (1000 * 1000)) % 1000));
}
void NBLog::appendInt(String8 *body, const void *data) {
@@ -1018,31 +1020,31 @@
body->appendFormat("<PID: %d, name: %.*s>", id, (int) (length - sizeof(pid_t)), name);
}
-String8 NBLog::bufferHexDump(const uint8_t *buffer, size_t size)
+String8 NBLog::bufferDump(const uint8_t *buffer, size_t size)
{
String8 str;
str.append("[ ");
for(size_t i = 0; i < size; i++)
{
- str.appendFormat("%02x ", buffer[i]);
+ str.appendFormat("%d ", buffer[i]);
}
str.append("]");
return str;
}
-String8 NBLog::bufferHexDump(const EntryIterator &it)
+String8 NBLog::bufferDump(const EntryIterator &it)
{
- return bufferHexDump(it, it->length + Entry::kOverhead);
+ return bufferDump(it, it->length + Entry::kOverhead);
}
NBLog::EntryIterator NBLog::Reader::handleFormat(const FormatEntry &fmtEntry,
String8 *timestamp,
String8 *body) {
// log timestamp
- struct timespec ts = fmtEntry.timestamp();
+ int64_t ts = fmtEntry.timestamp();
timestamp->clear();
- timestamp->appendFormat("[%d.%03d]", (int) ts.tv_sec,
- (int) (ts.tv_nsec / 1000000));
+ timestamp->appendFormat("[%d.%03d]", (int) (ts / (1000 * 1000 * 1000)),
+ (int) ((ts / (1000 * 1000)) % 1000));
// log unique hash
log_hash_t hash = fmtEntry.hash();
@@ -1214,19 +1216,18 @@
// composed by a timestamp and the index of the snapshot where the timestamp came from
struct MergeItem
{
- struct timespec ts;
+ int64_t ts;
int index;
- MergeItem(struct timespec ts, int index): ts(ts), index(index) {}
+ MergeItem(int64_t ts, int index): ts(ts), index(index) {}
};
// operators needed for priority queue in merge
-bool operator>(const struct timespec &t1, const struct timespec &t2) {
- return t1.tv_sec > t2.tv_sec || (t1.tv_sec == t2.tv_sec && t1.tv_nsec > t2.tv_nsec);
-}
+// bool operator>(const int64_t &t1, const int64_t &t2) {
+// return t1.tv_sec > t2.tv_sec || (t1.tv_sec == t2.tv_sec && t1.tv_nsec > t2.tv_nsec);
+// }
bool operator>(const struct MergeItem &i1, const struct MergeItem &i2) {
- return i1.ts > i2.ts ||
- (i1.ts.tv_sec == i2.ts.tv_sec && i1.ts.tv_nsec == i2.ts.tv_nsec && i1.index > i2.index);
+ return i1.ts > i2.ts || (i1.ts == i2.ts && i1.index > i2.index);
}
// Merge registered readers, sorted by timestamp
@@ -1245,7 +1246,7 @@
for (int i = 0; i < nLogs; ++i)
{
if (offsets[i] != snapshots[i]->end()) {
- timespec ts = AbstractEntry::buildEntry(offsets[i])->timestamp();
+ int64_t ts = AbstractEntry::buildEntry(offsets[i])->timestamp();
timestamps.emplace(ts, i);
}
}
@@ -1259,7 +1260,7 @@
// update data structures
timestamps.pop();
if (offsets[index] != snapshots[index]->end()) {
- timespec ts = AbstractEntry::buildEntry(offsets[index])->timestamp();
+ int64_t ts = AbstractEntry::buildEntry(offsets[index])->timestamp();
timestamps.emplace(ts, index);
}
}
diff --git a/media/libnbaio/include/NBLog.h b/media/libnbaio/include/NBLog.h
index f2fdf12..403f692 100644
--- a/media/libnbaio/include/NBLog.h
+++ b/media/libnbaio/include/NBLog.h
@@ -136,7 +136,7 @@
// get format entry timestamp
// TODO consider changing to uint64_t
- virtual timespec timestamp() const = 0;
+ virtual int64_t timestamp() const = 0;
// get format entry's unique id
virtual log_hash_t hash() const = 0;
@@ -172,7 +172,7 @@
EntryIterator args() const;
// get format entry timestamp
- virtual timespec timestamp() const override;
+ virtual int64_t timestamp() const override;
// get format entry's unique id
virtual log_hash_t hash() const override;
@@ -194,7 +194,7 @@
explicit HistogramEntry(const uint8_t *ptr) : AbstractEntry(ptr) {
}
- virtual timespec timestamp() const override;
+ virtual int64_t timestamp() const override;
virtual log_hash_t hash() const override;
@@ -231,12 +231,12 @@
struct HistTsEntry {
log_hash_t hash;
- timespec ts;
+ int64_t ts;
}; //TODO __attribute__((packed));
struct HistTsEntryWithAuthor {
log_hash_t hash;
- timespec ts;
+ int64_t ts;
int author;
}; //TODO __attribute__((packed));
@@ -261,8 +261,8 @@
static void appendPID(String8 *body, const void *data, size_t length);
static void appendTimestamp(String8 *body, const void *data);
static size_t fmtEntryLength(const uint8_t *data);
- static String8 bufferHexDump(const uint8_t *buffer, size_t size);
- static String8 bufferHexDump(const EntryIterator &it);
+ static String8 bufferDump(const uint8_t *buffer, size_t size);
+ static String8 bufferDump(const EntryIterator &it);
public:
// Located in shared memory, must be POD.
@@ -323,7 +323,7 @@
virtual void logf(const char *fmt, ...) __attribute__ ((format (printf, 2, 3)));
virtual void logvf(const char *fmt, va_list ap);
virtual void logTimestamp();
- virtual void logTimestamp(const struct timespec &ts);
+ virtual void logTimestamp(const int64_t ts);
virtual void logInteger(const int x);
virtual void logFloat(const float x);
virtual void logPID();
@@ -375,7 +375,7 @@
virtual void logf(const char *fmt, ...) __attribute__ ((format (printf, 2, 3)));
virtual void logvf(const char *fmt, va_list ap);
virtual void logTimestamp();
- virtual void logTimestamp(const struct timespec &ts);
+ virtual void logTimestamp(const int64_t ts);
virtual void logInteger(const int x);
virtual void logFloat(const float x);
virtual void logPID();
@@ -509,8 +509,6 @@
Shared * const mShared;
std::unique_ptr<audio_utils_fifo> mFifo;
std::unique_ptr<audio_utils_fifo_writer> mFifoWriter;
-
- static struct timespec getTimestamp(const uint8_t *data);
};
class MergeReader : public Reader {
@@ -562,6 +560,15 @@
}; // class NBLog
+// TODO put somewhere else
+static inline int64_t get_monotonic_ns() {
+ timespec ts;
+ if (clock_gettime(CLOCK_MONOTONIC, &ts) == 0) {
+ return (uint64_t) ts.tv_sec * 1000 * 1000 * 1000 + ts.tv_nsec;
+ }
+ return 0; // should not happen.
+}
+
} // namespace android
#endif // ANDROID_MEDIA_NBLOG_H