Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Disable statsd and make StatsLog no-op if ro.statsd.enable=false" into pi-dev

Browse Source
This commit is contained in:
Yao Chen
2018-06-07 21:10:16 +00:00
committed by Android (Google) Code Review
parent e752b75dad cf3829a696
commit 38b92986df
3 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmds/statsd/statsd.rc
View File

@@ -19,6 +19,9 @@ service statsd /system/bin/statsd
group statsd log group statsd log
writepid /dev/cpuset/system-background/tasks writepid /dev/cpuset/system-background/tasks
on property:ro.statsd.enable=false
stop statsd
on post-fs-data on post-fs-data
# Create directory for statsd # Create directory for statsd
mkdir /data/misc/stats-data/ 0770 statsd system mkdir /data/misc/stats-data/ 0770 statsd system

1
tools/stats_log_api_gen/Android.bp
View File

@@ -106,6 +106,7 @@ cc_library_shared {
shared_libs: [ shared_libs: [
"liblog", "liblog",
"libutils", "libutils",
"libcutils",
], ],
static_libs: ["libstatssocket"], static_libs: ["libstatssocket"],
} }

12
tools/stats_log_api_gen/main.cpp
View File

@@ -104,6 +104,7 @@ static int write_stats_log_cpp(FILE *out, const Atoms &atoms,
fprintf(out, "#include <mutex>\n"); fprintf(out, "#include <mutex>\n");
fprintf(out, "#include <chrono>\n"); fprintf(out, "#include <chrono>\n");
fprintf(out, "#include <thread>\n"); fprintf(out, "#include <thread>\n");
fprintf(out, "#include <cutils/properties.h>\n");
fprintf(out, "#include <stats_event_list.h>\n"); fprintf(out, "#include <stats_event_list.h>\n");
fprintf(out, "#include <log/log.h>\n"); fprintf(out, "#include <log/log.h>\n");
fprintf(out, "#include <statslog.h>\n"); fprintf(out, "#include <statslog.h>\n");
@@ -114,6 +115,7 @@ static int write_stats_log_cpp(FILE *out, const Atoms &atoms,
fprintf(out, "namespace util {\n"); fprintf(out, "namespace util {\n");
fprintf(out, "// the single event tag id for all stats logs\n"); fprintf(out, "// the single event tag id for all stats logs\n");
fprintf(out, "const static int kStatsEventTag = 1937006964;\n"); fprintf(out, "const static int kStatsEventTag = 1937006964;\n");
fprintf(out, "const static bool kStatsdEnabled = property_get_bool(\"ro.statsd.enable\", true);\n");
std::set<string> kTruncatingAtomNames = {"mobile_radio_power_state_changed", std::set<string> kTruncatingAtomNames = {"mobile_radio_power_state_changed",
"audio_state_changed", "audio_state_changed",
@@ -242,6 +244,7 @@ static int write_stats_log_cpp(FILE *out, const Atoms &atoms,
fprintf(out, "{\n"); fprintf(out, "{\n");
argIndex = 1; argIndex = 1;
fprintf(out, " if (kStatsdEnabled) {\n");
fprintf(out, " stats_event_list event(kStatsEventTag);\n"); fprintf(out, " stats_event_list event(kStatsEventTag);\n");
fprintf(out, " event << android::elapsedRealtimeNano();\n\n"); fprintf(out, " event << android::elapsedRealtimeNano();\n\n");
fprintf(out, " event << code;\n\n"); fprintf(out, " event << code;\n\n");
@@ -286,6 +289,9 @@ static int write_stats_log_cpp(FILE *out, const Atoms &atoms,
} }
fprintf(out, " return event.write(LOG_ID_STATS);\n"); fprintf(out, " return event.write(LOG_ID_STATS);\n");
fprintf(out, " } else {\n");
fprintf(out, " return 1;\n");
fprintf(out, " }\n");
fprintf(out, "}\n"); fprintf(out, "}\n");
fprintf(out, "\n"); fprintf(out, "\n");
} }
@@ -375,6 +381,7 @@ static int write_stats_log_cpp(FILE *out, const Atoms &atoms,
fprintf(out, "{\n"); fprintf(out, "{\n");
argIndex = 1; argIndex = 1;
fprintf(out, " if (kStatsdEnabled) {\n");
fprintf(out, " stats_event_list event(kStatsEventTag);\n"); fprintf(out, " stats_event_list event(kStatsEventTag);\n");
fprintf(out, " event << android::elapsedRealtimeNano();\n\n"); fprintf(out, " event << android::elapsedRealtimeNano();\n\n");
fprintf(out, " event << code;\n\n"); fprintf(out, " event << code;\n\n");
@@ -398,6 +405,9 @@ static int write_stats_log_cpp(FILE *out, const Atoms &atoms,
} }
fprintf(out, " return event.write(LOG_ID_STATS);\n"); fprintf(out, " return event.write(LOG_ID_STATS);\n");
fprintf(out, " } else {\n");
fprintf(out, " return 1;\n");
fprintf(out, " }\n");
fprintf(out, "}\n"); fprintf(out, "}\n");
fprintf(out, "\n"); fprintf(out, "\n");
} }
@@ -1193,4 +1203,4 @@ main(int argc, char const*const* argv)
GOOGLE_PROTOBUF_VERIFY_VERSION; GOOGLE_PROTOBUF_VERIFY_VERSION;
return android::stats_log_api_gen::run(argc, argv); return android::stats_log_api_gen::run(argc, argv);
} }