Powertop2 uses debugfs. Currently it uses /bin/mount to mount
the debugfs. This doesnt work in Android. This patch enables mounting
of debugfs in Android and also adds new file paths to store powertop
data for android.
---
main.cpp | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 51 insertions(+), 11 deletions(-)
diff --git a/main.cpp b/main.cpp
index 9fc358c..464273a 100644
--- a/main.cpp
+++ b/main.cpp
@@ -213,14 +213,33 @@ int main(int argc, char **argv)
}
system("/sbin/modprobe cpufreq_stats > /dev/null 2>&1");
system("/sbin/modprobe msr > /dev/null 2>&1");
- system("/bin/mount -t debugfs debugfs /sys/kernel/debug > /dev/null
2>&1");
+ if (access("/sys/kernel/debug/tracing", R_OK) != 0) {
+ if (access("/bin/mount", X_OK) == 0) {
+ system("/bin/mount -t debugfs debugfs /sys/kernel/debug
> /dev/null 2>&1");
+ } else {
+ //system("/sbin/mount -t debugfs debugfs
/sys/kernel/debug"); //doesnt work
+ pid_t child_pid = fork();
+ if(child_pid == 0) {
+ char *args[] = {"mount", "-t", "debugfs",
"debugfs", "/sys/kernel/debug", NULL};
+ execvp(args[0],args);
+ printf("mount failed\n");
+ exit(EXIT_FAILURE);
+ }
+ }
+ }
srand(time(NULL));
- mkdir("/var/cache/powertop", 0600);
-
- load_results("/var/cache/powertop/saved_results.powertop");
- load_parameters("/var/cache/powertop/saved_parameters.powertop");
+ if (access("/var/", W_OK ) == 0){
+ mkdir("/var/cache/powertop", 0600);
+ load_results("/var/cache/powertop/saved_results.powertop");
+
load_parameters("/var/cache/powertop/saved_parameters.powertop");
+ }
+ else if (access("/data/", W_OK ) == 0) {
+ mkdir("/data/local/powertop", 0600);
+ load_results("/data/local/powertop/saved_results.powertop");
+
load_parameters("/data/local/powertop/saved_parameters.powertop");
+ }
enumerate_cpus();
create_all_devices();
@@ -274,8 +293,15 @@ int main(int argc, char **argv)
/* and wrap up */
learn_parameters(50, 0);
-
save_all_results("/var/cache/powertop/saved_results.powertop");
-
save_parameters("/var/cache/powertop/saved_parameters.powertop");
+
+ if (access("/var/", W_OK ) == 0){
+
save_all_results("/var/cache/powertop/saved_results.powertop");
+
save_parameters("/var/cache/powertop/saved_parameters.powertop");
+ }
+ else if (access("/data/", W_OK ) == 0){
+
save_all_results("/data/local/powertop/saved_results.powertop");
+
save_parameters("/data/local/powertop/saved_parameters.powertop");
+ }
end_pci_access();
exit(0);
break;
@@ -292,8 +318,11 @@ int main(int argc, char **argv)
learn_parameters(250, 0);
- save_parameters("/var/cache/powertop/saved_parameters.powertop");
+ if (access("/var/", W_OK ) == 0)
+
save_parameters("/var/cache/powertop/saved_parameters.powertop");
+ else if (access("/data/", W_OK ) == 0)
+
save_parameters("/data/local/powertop/saved_parameters.powertop");
if (debug_learning) {
learn_parameters(1000, 1);
@@ -325,10 +354,21 @@ int main(int argc, char **argv)
end_process_data();
end_cpu_data();
- save_all_results("/var/cache/powertop/saved_results.powertop");
- save_parameters("/var/cache/powertop/saved_parameters.powertop");
+ if (access("/var/", W_OK ) == 0){
+ save_all_results("/var/cache/powertop/saved_results.powertop");
+
save_parameters("/var/cache/powertop/saved_parameters.powertop");
+ }
+ else if (access("/data/", W_OK ) == 0){
+ save_all_results("/data/local/powertop/saved_results.powertop");
+
save_parameters("/data/local/powertop/saved_parameters.powertop");
+ }
+
learn_parameters(500, 0);
- save_parameters("/var/cache/powertop/saved_parameters.powertop");
+
+ if (access("/var/", W_OK ) == 0)
+
save_parameters("/var/cache/powertop/saved_parameters.powertop");
+ else if (access("/data/", W_OK ) == 0)
+
save_parameters("/data/local/powertop/saved_parameters.powertop");
end_pci_access();
reset_display();
--
1.7.0.4
---------------------------------------------------------------------
Intel Corporation SAS (French simplified joint stock company)
Registered headquarters: "Les Montalets"- 2, rue de Paris,
92196 Meudon Cedex, France
Registration Number: 302 456 199 R.C.S. NANTERRE
Capital: 4,572,000 Euros
This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
_______________________________________________
Power mailing list
[email protected]
https://bughost.org/mailman/listinfo/power
