summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2021-02-04 01:58:48 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-02-04 01:58:48 +0000
commit78384d55f61e8efb64e5a3de074c7853cc41ad24 (patch)
tree5eabef0651bf7f8424ca953da600ae759f42bb70
parent48690d84c5cd2e3b834592960e8642d4cd6dc526 (diff)
parent9f8f012254704d2339d071bf14130a59cf0ff11c (diff)
Merge "dumpstate: print DMA-BUF sysfs stats in bugreport" am: 9560ed622b am: 9f8f012254
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1545596 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I28edec52aa9881f1fc20548b2560c6e2454cd4cb
-rw-r--r--cmds/dumpstate/Android.bp1
-rw-r--r--cmds/dumpstate/dumpstate.cpp6
2 files changed, 3 insertions, 4 deletions
diff --git a/cmds/dumpstate/Android.bp b/cmds/dumpstate/Android.bp
index 80d14ac3c4..34e9a85af3 100644
--- a/cmds/dumpstate/Android.bp
+++ b/cmds/dumpstate/Android.bp
@@ -112,6 +112,7 @@ cc_binary {
],
required: [
"atrace",
+ "dmabuf_dump",
"ip",
"iptables",
"librank",
diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index fbb0a18174..9e73dcc4d5 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -1845,10 +1845,8 @@ Dumpstate::RunStatus Dumpstate::DumpstateDefaultAfterCritical() {
RunCommand("IOTOP", {"iotop", "-n", "1", "-m", "100"});
// Gather shared memory buffer info if the product implements it
- struct stat st;
- if (!stat("/product/bin/dmabuf_dump", &st)) {
- RunCommand("Dmabuf dump", {"/product/bin/dmabuf_dump"});
- }
+ RunCommand("Dmabuf dump", {"dmabuf_dump"});
+ RunCommand("Dmabuf per-buffer/per-exporter/per-device stats", {"dmabuf_dump", "-b"});
DumpFile("PSI cpu", "/proc/pressure/cpu");
DumpFile("PSI memory", "/proc/pressure/memory");