Uses new Dumpstate class functions on dumpstate_board().
BUG: 26379932
Test: manual / refactored code
Change-Id: I3e3f7fd00c9ae999f52b7bdd520f1ee7aed68627
diff --git a/dumpstate/dumpstate.cpp b/dumpstate/dumpstate.cpp
index dba4779..ba63265 100755
--- a/dumpstate/dumpstate.cpp
+++ b/dumpstate/dumpstate.cpp
@@ -24,20 +24,21 @@
int len;
char *end_ptr;
unsigned long ret_val = 0;
+ Dumpstate& ds = Dumpstate::GetInstance();
- dump_file("CPU present", "/sys/devices/system/cpu/present");
- dump_file("CPU online", "/sys/devices/system/cpu/online");
- dump_file("RPM Stats", "/d/rpm_stats");
- dump_file("Power Management Stats", "/d/rpm_master_stats");
- dump_file("SMD Log", "/d/ipc_logging/smd/log");
- run_command("ION HEAPS", 5, SU_PATH, "root", "/system/bin/sh", "-c", "for d in $(ls -d /d/ion/*); do for f in $(ls $d); do echo --- $d/$f; cat $d/$f; done; done", NULL);
- dump_file("dmabuf info", "/d/dma_buf/bufinfo");
- run_command("Temperatures", 5, SU_PATH, "root", "/system/bin/sh", "-c", "for f in `ls /sys/class/thermal` ; do type=`cat /sys/class/thermal/$f/type` ; temp=`cat /sys/class/thermal/$f/temp` ; echo \"$type: $temp\" ; done", NULL);
- dump_file("cpu0-1 time-in-state", "/sys/devices/system/cpu/cpu0/cpufreq/stats/time_in_state");
- run_command("cpu0-1 cpuidle", 5, SU_PATH, "root", "/system/bin/sh", "-c", "for d in $(ls -d /sys/devices/system/cpu/cpu0/cpuidle/state*); do echo \"$d: `cat $d/name` `cat $d/desc` `cat $d/time` `cat $d/usage`\"; done", NULL);
- dump_file("cpu2-3 time-in-state", "/sys/devices/system/cpu/cpu2/cpufreq/stats/time_in_state");
- run_command("cpu2-3 cpuidle", 5, SU_PATH, "root", "/system/bin/sh", "-c", "for d in $(ls -d /sys/devices/system/cpu/cpu2/cpuidle/state*); do echo \"$d: `cat $d/name` `cat $d/desc` `cat $d/time` `cat $d/usage`\"; done", NULL);
- dump_file("MDP xlogs", "/d/mdp/xlog/dump");
+ ds.DumpFile("CPU present", "/sys/devices/system/cpu/present");
+ ds.DumpFile("CPU online", "/sys/devices/system/cpu/online");
+ ds.DumpFile("RPM Stats", "/d/rpm_stats");
+ ds.DumpFile("Power Management Stats", "/d/rpm_master_stats");
+ ds.DumpFile("SMD Log", "/d/ipc_logging/smd/log");
+ ds.RunCommand("ION HEAPS", {"/system/bin/sh", "-c", "for d in $(ls -d /d/ion/*); do for f in $(ls $d); do echo --- $d/$f; cat $d/$f; done; done"}, CommandOptions::AS_ROOT_5);
+ ds.DumpFile("dmabuf info", "/d/dma_buf/bufinfo");
+ ds.RunCommand("Temperatures", {"/system/bin/sh", "-c", "for f in `ls /sys/class/thermal` ; do type=`cat /sys/class/thermal/$f/type` ; temp=`cat /sys/class/thermal/$f/temp` ; echo \"$type: $temp\" ; done"}, CommandOptions::AS_ROOT_5);
+ ds.DumpFile("cpu0-1 time-in-state", "/sys/devices/system/cpu/cpu0/cpufreq/stats/time_in_state");
+ ds.RunCommand("cpu0-1 cpuidle", {"/system/bin/sh", "-c", "for d in $(ls -d /sys/devices/system/cpu/cpu0/cpuidle/state*); do echo \"$d: `cat $d/name` `cat $d/desc` `cat $d/time` `cat $d/usage`\"; done"}, CommandOptions::AS_ROOT_5);
+ ds.DumpFile("cpu2-3 time-in-state", "/sys/devices/system/cpu/cpu2/cpufreq/stats/time_in_state");
+ ds.RunCommand("cpu2-3 cpuidle", {"/system/bin/sh", "-c", "for d in $(ls -d /sys/devices/system/cpu/cpu2/cpuidle/state*); do echo \"$d: `cat $d/name` `cat $d/desc` `cat $d/time` `cat $d/usage`\"; done"}, CommandOptions::AS_ROOT_5);
+ ds.DumpFile("MDP xlogs", "/d/mdp/xlog/dump");
/* Check if smlog_dump tool exist */
if (!access("/system/bin/smlog_dump", F_OK)) {
@@ -49,14 +50,15 @@
/* Only SMLOG is enable, and SMLOG DUMP would be excuted */
if (ret_val == 1) {
- run_command("SMLOG DUMP", 30, SU_PATH, "root", "smlog_dump", "-d", NULL);
+ CommandOptions options = CommandOptions::WithTimeout(30).AsRoot().Build();
+ ds.RunCommand("SMLOG DUMP", { "smlog_dump", "-d"}, options);
// Remove smlog folders older than 10 days.
- run_command("RM OLD SMLOG", 30, SU_PATH, "root", "/system/bin/sh", "-c", "find /data/smlog_* -mtime +10 -prune -delete", NULL);
+ ds.RunCommand("RM OLD SMLOG", { "/system/bin/sh", "-c", "find /data/smlog_* -mtime +10 -prune -delete"}, options);
}
}
/* Check if qsee_logger tool exists */
if (!access("/system/bin/qsee_logger", F_OK)) {
- run_command("FP LOGS", 10, "qsee_logger", "-d", NULL);
+ ds.RunCommand("FP LOGS", {"qsee_logger", "-d"});
}
};
