openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

init: replace property_get with its android::base equivalent 

Slowly try to decouple property_service.cpp from the rest of init.

Test: Boot bullhead
Change-Id: I267ae0b057bca0bf657b97cb8bfbb18199282729
This commit is contained in:
Tom Cherry 2017-03-28 16:40:41 -07:00 committed by Keun-young Park
parent ec16825cb8
commit ccf23537ee
11 changed files with 32 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
init/action.cpp
View File

@ -18,14 +18,14 @@
#include <errno.h>
#include <android-base/strings.h>
#include <android-base/properties.h>
#include <android-base/stringprintf.h>
#include <android-base/strings.h>
#include "builtins.h"
#include "error.h"
#include "init_parser.h"
#include "log.h"
#include "property_service.h"
#include "util.h"
using android::base::Join;
@ -219,9 +219,8 @@ bool Action::CheckPropertyTriggers(const std::string& name,
found = true;
}
} else {
std::string prop_val = property_get(trigger_name.c_str());
if (prop_val.empty() || (trigger_value != "*" &&
trigger_value != prop_val)) {
std::string prop_val = android::base::GetProperty(trigger_name, "");
if (prop_val.empty() || (trigger_value != "*" && trigger_value != prop_val)) {
return false;
}
}

5
init/bootchart.cpp
View File

@ -16,8 +16,6 @@
#include "bootchart.h"
#include "property_service.h"
#include <dirent.h>
#include <errno.h>
#include <fcntl.h>
@ -39,6 +37,7 @@
#include <android-base/file.h>
#include <android-base/logging.h>
#include <android-base/properties.h>
#include <android-base/stringprintf.h>
using android::base::StringPrintf;
@ -72,7 +71,7 @@ static void log_header() {
utsname uts;
if (uname(&uts) == -1) return;
std::string fingerprint = property_get("ro.build.fingerprint");
std::string fingerprint = android::base::GetProperty("ro.build.fingerprint", "");
if (fingerprint.empty()) return;
std::string kernel_cmdline;

8
init/builtins.cpp
View File

@ -45,15 +45,16 @@
#include <selinux/selinux.h>
#include <selinux/label.h>
#include <fs_mgr.h>
#include <android-base/file.h>
#include <android-base/parseint.h>
#include <android-base/strings.h>
#include <android-base/properties.h>
#include <android-base/stringprintf.h>
#include <android-base/strings.h>
#include <bootloader_message/bootloader_message.h>
#include <cutils/android_reboot.h>
#include <ext4_utils/ext4_crypt.h>
#include <ext4_utils/ext4_crypt_init_extensions.h>
#include <fs_mgr.h>
#include <logwrap/logwrap.h>
#include "action.h"
@ -879,8 +880,7 @@ static int do_installkeys_ensure_dir_exists(const char* dir) {
}
static bool is_file_crypto() {
std::string value = property_get("ro.crypto.type");
return value == "file";
return android::base::GetProperty("ro.crypto.type", "") == "file";
}
static int do_installkey(const std::vector<std::string>& args) {

16
init/init.cpp
View File

@ -41,6 +41,7 @@
#include <selinux/android.h>
#include <android-base/file.h>
#include <android-base/properties.h>
#include <android-base/stringprintf.h>
#include <android-base/strings.h>
#include <android-base/unique_fd.h>
@ -68,6 +69,7 @@
#include "util.h"
#include "watchdogd.h"
using android::base::GetProperty;
using android::base::StringPrintf;
struct selabel_handle *sehandle;
@ -153,7 +155,7 @@ bool start_waiting_for_property(const char *name, const char *value)
if (waiting_for_prop) {
return false;
}
if (property_get(name) != value) {
if (GetProperty(name, "") != value) {
// Current property value is not equal to expected value
wait_prop_name = name;
wait_prop_value = value;
@ -441,7 +443,7 @@ static int keychord_init_action(const std::vector<std::string>& args)
static int console_init_action(const std::vector<std::string>& args)
{
std::string console = property_get("ro.boot.console");
std::string console = GetProperty("ro.boot.console", "");
if (!console.empty()) {
default_console = "/dev/" + console;
}
@ -465,11 +467,11 @@ static void import_kernel_nv(const std::string& key, const std::string& value, b
}
static void export_oem_lock_status() {
if (property_get("ro.oem_unlock_supported") != "1") {
if (!android::base::GetBoolProperty("ro.oem_unlock_supported", false)) {
return;
}
std::string value = property_get("ro.boot.verifiedbootstate");
std::string value = GetProperty("ro.boot.verifiedbootstate", "");
if (!value.empty()) {
property_set("ro.boot.flash.locked", value == "orange" ? "0" : "1");
@ -490,7 +492,7 @@ static void export_kernel_boot_props() {
{ "ro.boot.revision", "ro.revision", "0", },
};
for (size_t i = 0; i < arraysize(prop_map); i++) {
std::string value = property_get(prop_map[i].src_prop);
std::string value = GetProperty(prop_map[i].src_prop, "");
property_set(prop_map[i].dst_prop, (!value.empty()) ? value.c_str() : prop_map[i].default_value);
}
}
@ -1267,7 +1269,7 @@ int main(int argc, char** argv) {
parser.AddSectionParser("service",std::make_unique<ServiceParser>());
parser.AddSectionParser("on", std::make_unique<ActionParser>());
parser.AddSectionParser("import", std::make_unique<ImportParser>());
std::string bootscript = property_get("ro.boot.init_rc");
std::string bootscript = GetProperty("ro.boot.init_rc", "");
if (bootscript.empty()) {
parser.ParseConfig("/init.rc");
parser.set_is_system_etc_init_loaded(
@ -1307,7 +1309,7 @@ int main(int argc, char** argv) {
am.QueueBuiltinAction(mix_hwrng_into_linux_rng_action, "mix_hwrng_into_linux_rng");
// Don't mount filesystems or start core system services in charger mode.
std::string bootmode = property_get("ro.bootmode");
std::string bootmode = GetProperty("ro.bootmode", "");
if (bootmode == "charger") {
am.QueueEventTrigger("charger");
} else {

5
init/keychords.cpp
View File

@ -23,9 +23,10 @@
#include <linux/keychord.h>
#include <unistd.h>
#include <android-base/properties.h>
#include "init.h"
#include "log.h"
#include "property_service.h"
#include "service.h"
static struct input_keychord *keychords = 0;
@ -74,7 +75,7 @@ static void handle_keychord() {
}
// Only handle keychords if adb is enabled.
std::string adb_enabled = property_get("init.svc.adbd");
std::string adb_enabled = android::base::GetProperty("init.svc.adbd", "");
if (adb_enabled == "running") {
Service* svc = ServiceManager::GetInstance().FindServiceByKeychord(id);
if (svc) {

11
init/property_service.cpp
View File

@ -114,12 +114,6 @@ static int check_control_mac_perms(const char *name, char *sctx, struct ucred *c
return check_mac_perms(ctl_name, sctx, cr);
}
std::string property_get(const char* name) {
char value[PROP_VALUE_MAX] = {0};
__system_property_get(name, value);
return value;
}
static void write_persistent_property(const char *name, const char *value)
{
char tempPath[PATH_MAX];
@ -588,10 +582,7 @@ void property_load_boot_defaults() {
static void load_override_properties() {
if (ALLOW_LOCAL_PROP_OVERRIDE) {
std::string debuggable = property_get("ro.debuggable");
if (debuggable == "1") {
load_properties_from_file("/data/local.prop", NULL);
}
load_properties_from_file("/data/local.prop", NULL);
}
}

1
init/property_service.h
View File

@ -32,7 +32,6 @@ void property_load_boot_defaults(void);
void load_persist_props(void);
void load_system_props(void);
void start_property_service(void);
std::string property_get(const char* name);
uint32_t property_set(const std::string& name, const std::string& value);
bool is_legal_property_name(const std::string& name);

10
init/reboot.cpp
View File

@ -32,7 +32,7 @@
#include <android-base/file.h>
#include <android-base/macros.h>
#include <android-base/parseint.h>
#include <android-base/properties.h>
#include <android-base/stringprintf.h>
#include <android-base/strings.h>
#include <bootloader_message/bootloader_message.h>
@ -41,7 +41,6 @@
#include <logwrap/logwrap.h>
#include "log.h"
#include "property_service.h"
#include "reboot.h"
#include "service.h"
#include "util.h"
@ -341,12 +340,9 @@ void DoReboot(unsigned int cmd, const std::string& reason, const std::string& re
abort();
}
std::string timeout = property_get("ro.build.shutdown_timeout");
/* TODO update default waiting time based on usage data */
unsigned int shutdownTimeout = 10; // default value
if (android::base::ParseUint(timeout, &shutdownTimeout)) {
LOG(INFO) << "ro.build.shutdown_timeout set:" << shutdownTimeout;
}
unsigned int shutdownTimeout = android::base::GetUintProperty("ro.build.shutdown_timeout", 10u);
LOG(INFO) << "Shutdown timeout: " << shutdownTimeout;
static const constexpr char* shutdown_critical_services[] = {"vold", "watchdogd"};
for (const char* name : shutdown_critical_services) {

3
init/service.cpp
View File

@ -34,6 +34,7 @@
#include <android-base/file.h>
#include <android-base/parseint.h>
#include <android-base/properties.h>
#include <android-base/stringprintf.h>
#include <android-base/strings.h>
#include <system/thread_defs.h>
@ -657,7 +658,7 @@ bool Service::Start() {
if (iter == writepid_files_.end()) {
// There were no "writepid" instructions for cpusets, check if the system default
// cpuset is specified to be used for the process.
std::string default_cpuset = property_get("ro.cpuset.default");
std::string default_cpuset = android::base::GetProperty("ro.cpuset.default", "");
if (!default_cpuset.empty()) {
// Make sure the cpuset name starts and ends with '/'.
// A single '/' means the 'root' cpuset.

4
init/ueventd.cpp
View File

@ -26,6 +26,7 @@
#include <sys/types.h>
#include <android-base/properties.h>
#include <android-base/stringprintf.h>
#include <selinux/selinux.h>
@ -34,7 +35,6 @@
#include "util.h"
#include "devices.h"
#include "ueventd_parser.h"
#include "property_service.h"
int ueventd_main(int argc, char **argv)
{
@ -71,7 +71,7 @@ int ueventd_main(int argc, char **argv)
* TODO: cleanup platform ueventd.rc to remove vendor specific
* device node entries (b/34968103)
*/
std::string hardware = property_get("ro.hardware");
std::string hardware = android::base::GetProperty("ro.hardware", "");
ueventd_parse_config_file(android::base::StringPrintf("/ueventd.%s.rc", hardware.c_str()).c_str());
device_init();

4
init/util.cpp
View File

@ -38,6 +38,7 @@
#include <android-base/file.h>
#include <android-base/logging.h>
#include <android-base/properties.h>
#include <android-base/stringprintf.h>
#include <android-base/strings.h>
#include <android-base/unique_fd.h>
@ -48,7 +49,6 @@
#include "init.h"
#include "log.h"
#include "property_service.h"
#include "reboot.h"
#include "util.h"
@ -395,7 +395,7 @@ bool expand_props(const std::string& src, std::string* dst) {
return false;
}
std::string prop_val = property_get(prop_name.c_str());
std::string prop_val = android::base::GetProperty(prop_name, "");
if (prop_val.empty()) {
if (def_val.empty()) {
LOG(ERROR) << "property '" << prop_name << "' doesn't exist while expanding '" << src << "'";