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

Merge "Add proto output of statsd stats in adb" into pi-dev

Browse Source
This commit is contained in:
Tej Singh
2018-04-06 20:42:22 +00:00
committed by Android (Google) Code Review
parent e0dfebcce3 41b3f9a8cf
commit c63fdfe02c
2 changed files with 40 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
cmds/statsd/src/StatsService.cpp
View File

@@ -178,23 +178,34 @@ status_t StatsService::dump(int fd, const Vector<String16>& args) {
}
bool verbose = false;
bool proto = false;
if (args.size() > 0 && !args[0].compare(String16("-v"))) {
verbose = true;
}
if (args.size() > 0 && !args[args.size()-1].compare(String16("--proto"))) {
proto = true;
}
// TODO: Proto format for incident reports
dump_impl(out, verbose);
dump_impl(out, verbose, proto);
fclose(out);
return NO_ERROR;
}
/**
* Write debugging data about statsd in text format.
* Write debugging data about statsd in text or proto format.
*/
void StatsService::dump_impl(FILE* out, bool verbose) {
StatsdStats::getInstance().dumpStats(out);
mProcessor->dumpStates(out, verbose);
void StatsService::dump_impl(FILE* out, bool verbose, bool proto) {
if (proto) {
vector<uint8_t> data;
StatsdStats::getInstance().dumpStats(&data, false); // does not reset statsdStats.
for (size_t i = 0; i < data.size(); i ++) {
fprintf(out, "%c", data[i]);
}
} else {
StatsdStats::getInstance().dumpStats(out);
mProcessor->dumpStates(out, verbose);
}
}
/**
@@ -325,6 +336,7 @@ void StatsService::print_cmd_help(FILE* out) {
fprintf(out, "\n");
fprintf(out, "usage: adb shell cmd stats print-stats\n");
fprintf(out, " Prints some basic stats.\n");
fprintf(out, " --proto Print proto binary instead of string format.\n");
fprintf(out, "\n");
fprintf(out, "\n");
fprintf(out, "usage: adb shell cmd stats clear-puller-cache\n");
@@ -524,13 +536,28 @@ status_t StatsService::cmd_dump_report(FILE* out, FILE* err, const Vector<String
}
status_t StatsService::cmd_print_stats(FILE* out, const Vector<String8>& args) {
vector<ConfigKey> configs = mConfigManager->GetAllConfigKeys();
for (const ConfigKey& key : configs) {
fprintf(out, "Config %s uses %zu bytes\n", key.ToString().c_str(),
mProcessor->GetMetricsSize(key));
int argCount = args.size();
bool proto = false;
if (!std::strcmp("--proto", args[argCount-1].c_str())) {
proto = true;
argCount -= 1;
}
StatsdStats& statsdStats = StatsdStats::getInstance();
statsdStats.dumpStats(out);
if (proto) {
vector<uint8_t> data;
statsdStats.dumpStats(&data, false); // does not reset statsdStats.
for (size_t i = 0; i < data.size(); i ++) {
fprintf(out, "%c", data[i]);
}
} else {
vector<ConfigKey> configs = mConfigManager->GetAllConfigKeys();
for (const ConfigKey& key : configs) {
fprintf(out, "Config %s uses %zu bytes\n", key.ToString().c_str(),
mProcessor->GetMetricsSize(key));
}
statsdStats.dumpStats(out);
}
return NO_ERROR;
}

4
cmds/statsd/src/StatsService.h
View File

@@ -149,9 +149,9 @@ private:
uint32_t serial);
/**
* Text output of dumpsys.
* Text or proto output of dumpsys.
*/
void dump_impl(FILE* out, bool verbose);
void dump_impl(FILE* out, bool verbose, bool proto);
/**
* Print usage information for the commands