1946d3bca8
The cost of generating and throwing away a bunch of stuff that no one normally sees is high enough to be worth avoiding. Here's AOSP ToT on N9... init: (Parsing /system/etc/init/atrace.rc took 0.0112s.) init: (Parsing /system/etc/init/bootanim.rc took 0.0094s.) init: (Parsing /system/etc/init/crash_reporter.rc took 0.0103s.) init: (Parsing /system/etc/init/debuggerd.rc took 0.0090s.) init: (Parsing /system/etc/init/debuggerd64.rc took 0.0085s.) init: (Parsing /system/etc/init/drmserver.rc took 0.0078s.) init: (Parsing /system/etc/init/dumpstate.rc took 0.0073s.) init: (Parsing /system/etc/init/gatekeeperd.rc took 0.0063s.) init: (Parsing /system/etc/init/installd.rc took 0.0067s.) init: (Parsing /system/etc/init/keystore.rc took 0.0060s.) init: (Parsing /system/etc/init/lmkd.rc took 0.0060s.) init: (Parsing /system/etc/init/logcatd.rc took 0.0059s.) init: (Parsing /system/etc/init/logd.rc took 0.0068s.) init: (Parsing /system/etc/init/mdnsd.rc took 0.0057s.) init: (Parsing /system/etc/init/mediaserver.rc took 0.0064s.) init: (Parsing /system/etc/init/metrics_daemon.rc took 0.0063s.) init: (Parsing /system/etc/init/mtpd.rc took 0.0055s.) init: (Parsing /system/etc/init/netd.rc took 0.0066s.) init: (Parsing /system/etc/init/perfprofd.rc took 0.0057s.) init: (Parsing /system/etc/init/racoon.rc took 0.0054s.) init: (Parsing /system/etc/init/rild.rc took 0.0061s.) init: (Parsing /system/etc/init/servicemanager.rc took 0.0063s.) init: (Parsing /system/etc/init/surfaceflinger.rc took 0.0061s.) init: (Parsing /system/etc/init/uncrypt.rc took 0.0068s.) init: (Parsing /system/etc/init/vdc.rc took 0.0065s.) init: (Parsing /system/etc/init/vold.rc took 0.0063s.) 0.0112+0.0094+0.0103+0.0090+0.0085+0.0078+0.0073+0.0063+0.0067+0.0060+ 0.0060+0.0059+0.0068+0.0057+0.0064+0.0063+0.0055+0.0066+0.0057+0.0054+ 0.0061+0.0063+0.0061+0.0068+0.0065+0.0063 = 0.1809 And here it is again with the logging disabled: init: (Parsing /system/etc/init/atrace.rc took 0.0021s.) init: (Parsing /system/etc/init/bootanim.rc took 0.0006s.) init: (Parsing /system/etc/init/crash_reporter.rc took 0.0007s.) init: (Parsing /system/etc/init/debuggerd.rc took 0.0004s.) init: (Parsing /system/etc/init/debuggerd64.rc took 0.0005s.) init: (Parsing /system/etc/init/drmserver.rc took 0.0005s.) init: (Parsing /system/etc/init/dumpstate.rc took 0.0005s.) init: (Parsing /system/etc/init/gatekeeperd.rc took 0.0005s.) init: (Parsing /system/etc/init/installd.rc took 0.0005s.) init: (Parsing /system/etc/init/keystore.rc took 0.0013s.) init: (Parsing /system/etc/init/lmkd.rc took 0.0006s.) init: (Parsing /system/etc/init/logcatd.rc took 0.0013s.) init: (Parsing /system/etc/init/logd.rc took 0.0007s.) init: (Parsing /system/etc/init/mdnsd.rc took 0.0005s.) init: (Parsing /system/etc/init/mediaserver.rc took 0.0009s.) init: (Parsing /system/etc/init/metrics_daemon.rc took 0.0008s.) init: (Parsing /system/etc/init/mtpd.rc took 0.0011s.) init: (Parsing /system/etc/init/netd.rc took 0.0005s.) init: (Parsing /system/etc/init/perfprofd.rc took 0.0005s.) init: (Parsing /system/etc/init/racoon.rc took 0.0005s.) init: (Parsing /system/etc/init/rild.rc took 0.0005s.) init: (Parsing /system/etc/init/servicemanager.rc took 0.0005s.) init: (Parsing /system/etc/init/surfaceflinger.rc took 0.0005s.) init: (Parsing /system/etc/init/uncrypt.rc took 0.0005s.) init: (Parsing /system/etc/init/vdc.rc took 0.0005s.) init: (Parsing /system/etc/init/vold.rc took 0.0006s.) 0.0021+0.0006+0.0007+0.0004+0.0005+0.0005+0.0005+0.0005+0.0005+0.0013+ 0.0006+0.0013+0.0007+0.0005+0.0009+0.0008+0.0011+0.0005+0.0005+0.0005+ 0.0005+0.0005+0.0005+0.0005+0.0005+0.0006 = 0.0181 It's less than a second, but one problem is that the cost of the current dumping is proportional to the number of init.rc files, so the more cleanly you factor things, the more it would cost. Change-Id: Id96f59e7d0b082d8cfdba4bdbff43a922ba4eeee
148 lines
4.4 KiB
C++
148 lines
4.4 KiB
C++
/*
|
|
* Copyright (C) 2010 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#include <dirent.h>
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
|
|
#include "action.h"
|
|
#include "init_parser.h"
|
|
#include "log.h"
|
|
#include "parser.h"
|
|
#include "service.h"
|
|
#include "util.h"
|
|
|
|
#include <base/stringprintf.h>
|
|
|
|
Parser::Parser() {
|
|
}
|
|
|
|
Parser& Parser::GetInstance() {
|
|
static Parser instance;
|
|
return instance;
|
|
}
|
|
|
|
void Parser::AddSectionParser(const std::string& name,
|
|
std::unique_ptr<SectionParser> parser) {
|
|
section_parsers_[name] = std::move(parser);
|
|
}
|
|
|
|
void Parser::ParseData(const std::string& filename, const std::string& data) {
|
|
//TODO: Use a parser with const input and remove this copy
|
|
std::vector<char> data_copy(data.begin(), data.end());
|
|
data_copy.push_back('\0');
|
|
|
|
parse_state state;
|
|
state.filename = filename.c_str();
|
|
state.line = 0;
|
|
state.ptr = &data_copy[0];
|
|
state.nexttoken = 0;
|
|
|
|
SectionParser* section_parser = nullptr;
|
|
std::vector<std::string> args;
|
|
|
|
for (;;) {
|
|
switch (next_token(&state)) {
|
|
case T_EOF:
|
|
if (section_parser) {
|
|
section_parser->EndSection();
|
|
}
|
|
return;
|
|
case T_NEWLINE:
|
|
state.line++;
|
|
if (args.empty()) {
|
|
break;
|
|
}
|
|
if (section_parsers_.count(args[0])) {
|
|
if (section_parser) {
|
|
section_parser->EndSection();
|
|
}
|
|
section_parser = section_parsers_[args[0]].get();
|
|
std::string ret_err;
|
|
if (!section_parser->ParseSection(args, &ret_err)) {
|
|
parse_error(&state, "%s\n", ret_err.c_str());
|
|
section_parser = nullptr;
|
|
}
|
|
} else if (section_parser) {
|
|
std::string ret_err;
|
|
if (!section_parser->ParseLineSection(args, state.filename,
|
|
state.line, &ret_err)) {
|
|
parse_error(&state, "%s\n", ret_err.c_str());
|
|
}
|
|
}
|
|
args.clear();
|
|
break;
|
|
case T_TEXT:
|
|
args.emplace_back(state.text);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
bool Parser::ParseConfigFile(const std::string& path) {
|
|
INFO("Parsing file %s...\n", path.c_str());
|
|
Timer t;
|
|
std::string data;
|
|
if (!read_file(path.c_str(), &data)) {
|
|
return false;
|
|
}
|
|
|
|
data.push_back('\n'); // TODO: fix parse_config.
|
|
ParseData(path, data);
|
|
for (const auto& sp : section_parsers_) {
|
|
sp.second->EndFile(path);
|
|
}
|
|
|
|
// Turning this on and letting the INFO logging be discarded adds 0.2s to
|
|
// Nexus 9 boot time, so it's disabled by default.
|
|
if (false) DumpState();
|
|
|
|
NOTICE("(Parsing %s took %.2fs.)\n", path.c_str(), t.duration());
|
|
return true;
|
|
}
|
|
|
|
bool Parser::ParseConfigDir(const std::string& path) {
|
|
INFO("Parsing directory %s...\n", path.c_str());
|
|
std::unique_ptr<DIR, int(*)(DIR*)> config_dir(opendir(path.c_str()), closedir);
|
|
if (!config_dir) {
|
|
ERROR("Could not import directory '%s'\n", path.c_str());
|
|
return false;
|
|
}
|
|
dirent* current_file;
|
|
while ((current_file = readdir(config_dir.get()))) {
|
|
std::string current_path =
|
|
android::base::StringPrintf("%s/%s", path.c_str(), current_file->d_name);
|
|
// Ignore directories and only process regular files.
|
|
if (current_file->d_type == DT_REG) {
|
|
if (!ParseConfigFile(current_path)) {
|
|
ERROR("could not import file '%s'\n", current_path.c_str());
|
|
}
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
|
|
bool Parser::ParseConfig(const std::string& path) {
|
|
if (is_dir(path.c_str())) {
|
|
return ParseConfigDir(path);
|
|
}
|
|
return ParseConfigFile(path);
|
|
}
|
|
|
|
void Parser::DumpState() const {
|
|
ServiceManager::GetInstance().DumpState();
|
|
ActionManager::GetInstance().DumpState();
|
|
}
|