NBLog: Restore log dump and add new logging types
Merging is temporarily disabled for now because the readers managed by
the merger are the same as the ones used for the dumpsys log dump, and
reading from the log effectively consumes the buffer. Eventually, the
readers for the two functionalities will need to be separated to avoid
conflict. The dump of the merged buffer is also disabled, which removes
the dumping of histograms.
The new types added are monotonic thread cycle time, CPU thread cycle
time, CPU frequency, and latency (which will need to be specified in
further detail later). Logging support is added only for monotonic
thread cycle time at the moment.
Test: build, log monotonic thread cycle time in FastThread, check output
in dumpsys media.log -r.
Change-Id: I1b781d6db102fb917fd0bac964eeebd0309234c0
Bug: 68148948
diff --git a/services/medialog/MediaLogService.cpp b/services/medialog/MediaLogService.cpp
index e58dff7..095dd5c 100644
--- a/services/medialog/MediaLogService.cpp
+++ b/services/medialog/MediaLogService.cpp
@@ -58,11 +58,10 @@
shared->size() < NBLog::Timeline::sharedSize(size)) {
return;
}
- sp<NBLog::Reader> reader(new NBLog::Reader(shared, size));
- NBLog::NamedReader namedReader(reader, name);
+ sp<NBLog::Reader> reader(new NBLog::Reader(shared, size, name));
Mutex::Autolock _l(mLock);
- mNamedReaders.add(namedReader);
- mMerger.addReader(namedReader);
+ mReaders.add(reader);
+ mMerger.addReader(reader);
}
void MediaLogService::unregisterWriter(const sp<IMemory>& shared)
@@ -71,9 +70,9 @@
return;
}
Mutex::Autolock _l(mLock);
- for (size_t i = 0; i < mNamedReaders.size(); ) {
- if (mNamedReaders[i].reader()->isIMemory(shared)) {
- mNamedReaders.removeAt(i);
+ for (size_t i = 0; i < mReaders.size(); ) {
+ if (mReaders[i]->isIMemory(shared)) {
+ mReaders.removeAt(i);
} else {
i++;
}
@@ -106,7 +105,7 @@
if (args.size() > 0) {
const String8 arg0(args[0]);
if (!strcmp(arg0.string(), "-r")) {
- // needed because mNamedReaders is protected by mLock
+ // needed because mReaders is protected by mLock
bool locked = dumpTryLock(mLock);
// failed to lock - MediaLogService is probably deadlocked
@@ -121,17 +120,18 @@
return NO_ERROR;
}
- for (const auto& namedReader : mNamedReaders) {
+ for (auto reader : mReaders) {
if (fd >= 0) {
- dprintf(fd, "\n%s:\n", namedReader.name());
+ dprintf(fd, "\n%s:\n", reader->name().c_str());
+ reader->dump(fd, 0 /*indent*/);
} else {
- ALOGI("%s:", namedReader.name());
+ ALOGI("%s:", reader->name().c_str());
}
}
mLock.unlock();
}
}
- mMergeReader.dump(fd);
+ //mMergeReader.dump(fd);
return NO_ERROR;
}