Log additional NuPlayer information in bug reports
This change adds more logging from NuPlayer when obtaining
a bug report. NuPlayer's renderer will print whether it has occupied
the wake lock and for how much time. In addition, handlers attached
to the player's looper will also log if they are currently executing
a message (at the time of the bug report).
The above logs will help detect if the NuPlayer's wake lock is kept
acquired because the player looper is blocked on a specific handler.
Test: manual on device test, grabbed a bug-report while playing media
Change-Id: I3e91da9ea45a5fe270a0866054f695f5e844e8c7
Bug: 265531109
diff --git a/media/module/foundation/AHandler.cpp b/media/module/foundation/AHandler.cpp
index 7dbbe54..d8b0aaf 100644
--- a/media/module/foundation/AHandler.cpp
+++ b/media/module/foundation/AHandler.cpp
@@ -24,8 +24,10 @@
namespace android {
void AHandler::deliverMessage(const sp<AMessage> &msg) {
+ setDeliveryStatus(true, msg->what(), ALooper::GetNowUs());
onMessageReceived(msg);
mMessageCounter++;
+ setDeliveryStatus(false, 0, 0);
if (mVerboseStats) {
uint32_t what = msg->what();
@@ -38,4 +40,19 @@
}
}
+void AHandler::setDeliveryStatus(bool delivering, uint32_t what, int64_t startUs) {
+ AutoMutex autoLock(mLock);
+ mDeliveringMessage = delivering;
+ mCurrentMessageWhat = what;
+ mCurrentMessageStartTimeUs = startUs;
+}
+
+void AHandler::getDeliveryStatus(bool& delivering, uint32_t& what, int64_t& durationUs) {
+ AutoMutex autoLock(mLock);
+ delivering = mDeliveringMessage;
+ what = mCurrentMessageWhat;
+ durationUs = mCurrentMessageStartTimeUs == 0 ?
+ 0 : ALooper::GetNowUs() - mCurrentMessageStartTimeUs;
+}
+
} // namespace android
diff --git a/media/module/foundation/ALooperRoster.cpp b/media/module/foundation/ALooperRoster.cpp
index 4334f1e..5625c7f 100644
--- a/media/module/foundation/ALooperRoster.cpp
+++ b/media/module/foundation/ALooperRoster.cpp
@@ -143,8 +143,20 @@
s.append(looper->getName());
sp<AHandler> handler = info.mHandler.promote();
if (handler != NULL) {
+ bool deliveringMessages;
+ uint32_t currentMessageWhat;
+ int64_t currentDeliveryDurationUs;
+ handler->getDeliveryStatus(deliveringMessages,
+ currentMessageWhat,
+ currentDeliveryDurationUs);
handler->mVerboseStats = verboseStats;
- s.appendFormat(": %" PRIu64 " messages processed", handler->mMessageCounter);
+ s.appendFormat(": %" PRIu64 " messages processed, delivering "
+ "%d, current msg %" PRIu32 ", current msg "
+ "durationUs %" PRIu64 "",
+ handler->mMessageCounter,
+ deliveringMessages,
+ currentMessageWhat,
+ currentDeliveryDurationUs);
if (verboseStats) {
for (size_t j = 0; j < handler->mMessages.size(); j++) {
char fourcc[15];
diff --git a/media/module/foundation/include/media/stagefright/foundation/AHandler.h b/media/module/foundation/include/media/stagefright/foundation/AHandler.h
index 337460a..c9e4f69 100644
--- a/media/module/foundation/include/media/stagefright/foundation/AHandler.h
+++ b/media/module/foundation/include/media/stagefright/foundation/AHandler.h
@@ -30,7 +30,10 @@
AHandler()
: mID(0),
mVerboseStats(false),
- mMessageCounter(0) {
+ mMessageCounter(0),
+ mDeliveringMessage(false),
+ mCurrentMessageWhat(0),
+ mCurrentMessageStartTimeUs(0){
}
ALooper::handler_id id() const {
@@ -69,8 +72,17 @@
uint64_t mMessageCounter;
KeyedVector<uint32_t, uint32_t> mMessages;
+ Mutex mLock;
+ bool mDeliveringMessage;
+ uint32_t mCurrentMessageWhat;
+ int64_t mCurrentMessageStartTimeUs;
+
void deliverMessage(const sp<AMessage> &msg);
+ void setDeliveryStatus(bool, uint32_t, int64_t);
+ void getDeliveryStatus(bool&, uint32_t&, int64_t&);
+
+
DISALLOW_EVIL_CONSTRUCTORS(AHandler);
};