ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Move init bootcharting onto its own thread."

Browse source
This commit is contained in:
Elliott Hughes 2016-12-17 17:56:15 +00:00 • committed by Gerrit Code Review
commit 8766ecb78d
3 changed files with 121 additions and 151 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

269
init/bootchart.cpp
View file

@ -15,7 +15,7 @@
*/ */
#include "bootchart.h" #include "bootchart.h"
#include "log.h"
#include "property_service.h" #include "property_service.h"
#include <dirent.h> #include <dirent.h>
@ -29,197 +29,170 @@
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#include <chrono>
#include <condition_variable>
#include <memory> #include <memory>
#include <mutex>
#include <string> #include <string>
#include <thread>
#include <vector> #include <vector>
#include <android-base/file.h> #include <android-base/file.h>
#include <android-base/logging.h>
#include <android-base/stringprintf.h> #include <android-base/stringprintf.h>
using android::base::StringPrintf; using android::base::StringPrintf;
using namespace std::chrono_literals;
static constexpr const char* LOG_STAT = "/data/bootchart/proc_stat.log"; static std::thread* g_bootcharting_thread;
static constexpr const char* LOG_PROC = "/data/bootchart/proc_ps.log";
static constexpr const char* LOG_DISK = "/data/bootchart/proc_diskstats.log";
static constexpr const char* LOG_HEADER = "/data/bootchart/header";
// Polling period in ms. static std::mutex g_bootcharting_finished_mutex;
static constexpr int BOOTCHART_POLLING_MS = 200; static std::condition_variable g_bootcharting_finished_cv;
static bool g_bootcharting_finished;
static long long g_last_bootchart_time;
static bool g_bootcharting = false;
static FILE* g_stat_log;
static FILE* g_proc_log;
static FILE* g_disk_log;
static long long get_uptime_jiffies() { static long long get_uptime_jiffies() {
std::string uptime; std::string uptime;
if (!android::base::ReadFileToString("/proc/uptime", &uptime)) { if (!android::base::ReadFileToString("/proc/uptime", &uptime)) return 0;
return 0; return 100LL * strtod(uptime.c_str(), NULL);
} }
return 100LL * strtod(uptime.c_str(), NULL);
static std::unique_ptr<FILE, decltype(&fclose)> fopen_unique(const char* filename,
const char* mode) {
std::unique_ptr<FILE, decltype(&fclose)> result(fopen(filename, mode), fclose);
if (!result) PLOG(ERROR) << "bootchart: failed to open " << filename;
return result;
} }
static void log_header() { static void log_header() {
char date[32]; char date[32];
time_t now_t = time(NULL); time_t now_t = time(NULL);
struct tm now = *localtime(&now_t); struct tm now = *localtime(&now_t);
strftime(date, sizeof(date), "%F %T", &now); strftime(date, sizeof(date), "%F %T", &now);
utsname uts; utsname uts;
if (uname(&uts) == -1) { if (uname(&uts) == -1) return;
return;
}
std::string fingerprint = property_get("ro.build.fingerprint"); std::string fingerprint = property_get("ro.build.fingerprint");
if (fingerprint.empty()) { if (fingerprint.empty()) return;
return;
}
std::string kernel_cmdline; std::string kernel_cmdline;
android::base::ReadFileToString("/proc/cmdline", &kernel_cmdline); android::base::ReadFileToString("/proc/cmdline", &kernel_cmdline);
FILE* out = fopen(LOG_HEADER, "we"); auto fp = fopen_unique("/data/bootchart/header", "we");
if (out == NULL) { if (!fp) return;
return; fprintf(&*fp, "version = Android init 0.8\n");
} fprintf(&*fp, "title = Boot chart for Android (%s)\n", date);
fprintf(out, "version = Android init 0.8\n"); fprintf(&*fp, "system.uname = %s %s %s %s\n", uts.sysname, uts.release, uts.version, uts.machine);
fprintf(out, "title = Boot chart for Android (%s)\n", date); fprintf(&*fp, "system.release = %s\n", fingerprint.c_str());
fprintf(out, "system.uname = %s %s %s %s\n", uts.sysname, uts.release, uts.version, uts.machine); // TODO: use /proc/cpuinfo "model name" line for x86, "Processor" line for arm.
fprintf(out, "system.release = %s\n", fingerprint.c_str()); fprintf(&*fp, "system.cpu = %s\n", uts.machine);
// TODO: use /proc/cpuinfo "model name" line for x86, "Processor" line for arm. fprintf(&*fp, "system.kernel.options = %s\n", kernel_cmdline.c_str());
fprintf(out, "system.cpu = %s\n", uts.machine);
fprintf(out, "system.kernel.options = %s\n", kernel_cmdline.c_str());
fclose(out);
} }
static void log_uptime(FILE* log) { static void log_uptime(FILE* log) {
fprintf(log, "%lld\n", get_uptime_jiffies()); fprintf(log, "%lld\n", get_uptime_jiffies());
} }
static void log_file(FILE* log, const char* procfile) { static void log_file(FILE* log, const char* procfile) {
log_uptime(log); log_uptime(log);
std::string content; std::string content;
if (android::base::ReadFileToString(procfile, &content)) { if (android::base::ReadFileToString(procfile, &content)) {
fprintf(log, "%s\n", content.c_str()); fprintf(log, "%s\n", content.c_str());
} }
} }
static void log_processes() { static void log_processes(FILE* log) {
log_uptime(g_proc_log); log_uptime(log);
std::unique_ptr<DIR, int(*)(DIR*)> dir(opendir("/proc"), closedir); std::unique_ptr<DIR, int(*)(DIR*)> dir(opendir("/proc"), closedir);
struct dirent* entry; struct dirent* entry;
while ((entry = readdir(dir.get())) != NULL) { while ((entry = readdir(dir.get())) != NULL) {
// Only match numeric values. // Only match numeric values.
int pid = atoi(entry->d_name); int pid = atoi(entry->d_name);
if (pid == 0) continue; if (pid == 0) continue;
// /proc/<pid>/stat only has truncated task names, so get the full // /proc/<pid>/stat only has truncated task names, so get the full
// name from /proc/<pid>/cmdline. // name from /proc/<pid>/cmdline.
std::string cmdline; std::string cmdline;
android::base::ReadFileToString(StringPrintf("/proc/%d/cmdline", pid), &cmdline); android::base::ReadFileToString(StringPrintf("/proc/%d/cmdline", pid), &cmdline);
const char* full_name = cmdline.c_str(); // So we stop at the first NUL. const char* full_name = cmdline.c_str(); // So we stop at the first NUL.
// Read process stat line. // Read process stat line.
std::string stat; std::string stat;
if (android::base::ReadFileToString(StringPrintf("/proc/%d/stat", pid), &stat)) { if (android::base::ReadFileToString(StringPrintf("/proc/%d/stat", pid), &stat)) {
if (!cmdline.empty()) { if (!cmdline.empty()) {
// Substitute the process name with its real name. // Substitute the process name with its real name.
size_t open = stat.find('('); size_t open = stat.find('(');
size_t close = stat.find_last_of(')'); size_t close = stat.find_last_of(')');
if (open != std::string::npos && close != std::string::npos) { if (open != std::string::npos && close != std::string::npos) {
stat.replace(open + 1, close - open - 1, full_name); stat.replace(open + 1, close - open - 1, full_name);
}
}
fputs(stat.c_str(), g_proc_log);
} }
}
fputs(stat.c_str(), log);
}
}
fputc('\n', log);
}
static void bootchart_thread_main() {
LOG(INFO) << "Bootcharting started";
// Open log files.
auto stat_log = fopen_unique("/data/bootchart/proc_stat.log", "we");
if (!stat_log) return;
auto proc_log = fopen_unique("/data/bootchart/proc_ps.log", "we");
if (!proc_log) return;
auto disk_log = fopen_unique("/data/bootchart/proc_diskstats.log", "we");
if (!disk_log) return;
log_header();
while (true) {
{
std::unique_lock<std::mutex> lock(g_bootcharting_finished_mutex);
g_bootcharting_finished_cv.wait_for(lock, 200ms);
if (g_bootcharting_finished) break;
} }
fputc('\n', g_proc_log); log_file(&*stat_log, "/proc/stat");
log_file(&*disk_log, "/proc/diskstats");
log_processes(&*proc_log);
}
LOG(INFO) << "Bootcharting finished";
} }
static int do_bootchart_start() { static int do_bootchart_start() {
// We don't care about the content, but we do care that /data/bootchart/enabled actually exists. // We don't care about the content, but we do care that /data/bootchart/enabled actually exists.
std::string start; std::string start;
if (!android::base::ReadFileToString("/data/bootchart/enabled", &start)) { if (!android::base::ReadFileToString("/data/bootchart/enabled", &start)) {
LOG(VERBOSE) << "Not bootcharting"; LOG(VERBOSE) << "Not bootcharting";
return 0;
}
// Open log files.
std::unique_ptr<FILE, decltype(&fclose)> stat_log(fopen(LOG_STAT, "we"), fclose);
if (!stat_log) {
PLOG(ERROR) << "Bootcharting couldn't open " << LOG_STAT;
return -1;
}
std::unique_ptr<FILE, decltype(&fclose)> proc_log(fopen(LOG_PROC, "we"), fclose);
if (!proc_log) {
PLOG(ERROR) << "Bootcharting couldn't open " << LOG_PROC;
return -1;
}
std::unique_ptr<FILE, decltype(&fclose)> disk_log(fopen(LOG_DISK, "we"), fclose);
if (!disk_log) {
PLOG(ERROR) << "Bootcharting couldn't open " << LOG_DISK;
return -1;
}
LOG(INFO) << "Bootcharting started";
g_stat_log = stat_log.release();
g_proc_log = proc_log.release();
g_disk_log = disk_log.release();
g_bootcharting = true;
log_header();
return 0; return 0;
} }
static void do_bootchart_step() { g_bootcharting_thread = new std::thread(bootchart_thread_main);
log_file(g_stat_log, "/proc/stat"); return 0;
log_file(g_disk_log, "/proc/diskstats");
log_processes();
} }
static int do_bootchart_stop() { static int do_bootchart_stop() {
if (!g_bootcharting) return 0; if (!g_bootcharting_thread) return 0;
LOG(INFO) << "Bootcharting finished"; // Tell the worker thread it's time to quit.
g_bootcharting = false; {
fclose(g_stat_log); std::lock_guard<std::mutex> lock(g_bootcharting_finished_mutex);
fclose(g_disk_log); g_bootcharting_finished = true;
fclose(g_proc_log); g_bootcharting_finished_cv.notify_one();
return 0; }
g_bootcharting_thread->join();
delete g_bootcharting_thread;
g_bootcharting_thread = nullptr;
return 0;
} }
int do_bootchart(const std::vector<std::string>& args) { int do_bootchart(const std::vector<std::string>& args) {
if (args[1] == "start") return do_bootchart_start(); if (args[1] == "start") return do_bootchart_start();
return do_bootchart_stop(); return do_bootchart_stop();
}
void bootchart_sample(int* timeout) {
// Do we have any more bootcharting to do?
if (!g_bootcharting) return;
long long current_time = 10LL * get_uptime_jiffies();
int elapsed_time = current_time - g_last_bootchart_time;
if (elapsed_time >= BOOTCHART_POLLING_MS) {
while (elapsed_time >= BOOTCHART_POLLING_MS) {
elapsed_time -= BOOTCHART_POLLING_MS;
}
g_last_bootchart_time = current_time;
do_bootchart_step();
}
// Schedule another?
if (g_bootcharting) {
int remaining_time = BOOTCHART_POLLING_MS - elapsed_time;
if (*timeout < 0 || *timeout > remaining_time) {
*timeout = remaining_time;
}
}
} }

1
init/bootchart.h
View file

@ -21,6 +21,5 @@
#include <vector> #include <vector>
int do_bootchart(const std::vector<std::string>& args); int do_bootchart(const std::vector<std::string>& args);
void bootchart_sample(int* timeout);
#endif /* _BOOTCHART_H */ #endif /* _BOOTCHART_H */

2
init/init.cpp
View file

@ -850,8 +850,6 @@ int main(int argc, char** argv) {
// If there's more work to do, wake up again immediately. // If there's more work to do, wake up again immediately.
if (am.HasMoreCommands()) epoll_timeout_ms = 0; if (am.HasMoreCommands()) epoll_timeout_ms = 0;
bootchart_sample(&epoll_timeout_ms);
epoll_event ev; epoll_event ev;
int nr = TEMP_FAILURE_RETRY(epoll_wait(epoll_fd, &ev, 1, epoll_timeout_ms)); int nr = TEMP_FAILURE_RETRY(epoll_wait(epoll_fd, &ev, 1, epoll_timeout_ms));
if (nr == -1) { if (nr == -1) {