Merge cherrypicks of ['googleplex-android-review.googlesource.com/24028968',... (e8f6fd71) · Commits · e / os / android_system_core

init/property_service.cpp

+42 −57

Original line number	Diff line number	Diff line
		@@ -57,12 +57,12 @@
		#include <android-base/result.h>
		#include <android-base/stringprintf.h>
		#include <android-base/strings.h>
		#include <private/android_filesystem_config.h>
		#include <property_info_parser/property_info_parser.h>
		#include <property_info_serializer/property_info_serializer.h>
		#include <selinux/android.h>
		#include <selinux/label.h>
		#include <selinux/selinux.h>

		#include "debug_ramdisk.h"
		#include "epoll.h"
		#include "init.h"
		@@ -111,12 +111,12 @@ constexpr auto API_LEVEL_CURRENT = 10000;

		static bool persistent_properties_loaded = false;

		static int property_set_fd = -1;
		static int from_init_socket = -1;
		static int init_socket = -1;
		static bool accept_messages = false;
		static std::mutex accept_messages_lock;
		static std::thread property_service_thread;
		static std::thread property_service_for_system_thread;

		static std::unique_ptr<PersistWriteThread> persist_write_thread;

		@@ -394,11 +394,6 @@ static std::optional<uint32_t> PropertySet(const std::string& name, const std::s
		return {PROP_ERROR_INVALID_VALUE};
		}

		if (name == "sys.powerctl") {
		// No action here - NotifyPropertyChange will trigger the appropriate action, and since this
		// can come to the second thread, we mustn't call out to the __system_property_* functions
		// which support multiple readers but only one mutator.
		} else {
		prop_info* pi = (prop_info*)__system_property_find(name.c_str());
		if (pi != nullptr) {
		// ro.* properties are actually "write-once".
		@@ -425,7 +420,6 @@ static std::optional<uint32_t> PropertySet(const std::string& name, const std::s
		}
		WritePersistentProperty(name, value);
		}
		}

		NotifyPropertyChange(name, value);
		return {PROP_SUCCESS};
		@@ -585,10 +579,10 @@ uint32_t HandlePropertySetNoSocket(const std::string& name, const std::string& v
		return *ret;
		}

		static void handle_property_set_fd(int fd) {
		static void handle_property_set_fd() {
		static constexpr uint32_t kDefaultSocketTimeout = 2000; /* ms */

		int s = accept4(fd, nullptr, nullptr, SOCK_CLOEXEC);
		int s = accept4(property_set_fd, nullptr, nullptr, SOCK_CLOEXEC);
		if (s == -1) {
		return;
		}
		@@ -1425,22 +1419,20 @@ static void HandleInitSocket() {
		}
		}

		static void PropertyServiceThread(int fd, bool listen_init) {
		static void PropertyServiceThread() {
		Epoll epoll;
		if (auto result = epoll.Open(); !result.ok()) {
		LOG(FATAL) << result.error();
		}

		if (auto result = epoll.RegisterHandler(fd, std::bind(handle_property_set_fd, fd));
		if (auto result = epoll.RegisterHandler(property_set_fd, handle_property_set_fd);
		!result.ok()) {
		LOG(FATAL) << result.error();
		}

		if (listen_init) {
		if (auto result = epoll.RegisterHandler(init_socket, HandleInitSocket); !result.ok()) {
		LOG(FATAL) << result.error();
		}
		}

		while (true) {
		auto epoll_result = epoll.Wait(std::nullopt);
		@@ -1490,23 +1482,6 @@ void PersistWriteThread::Write(std::string name, std::string value, SocketConnec
		cv_.notify_all();
		}

		void StartThread(const char* name, int mode, int gid, std::thread& t, bool listen_init) {
		int fd = -1;
		if (auto result = CreateSocket(name, SOCK_STREAM \| SOCK_CLOEXEC \| SOCK_NONBLOCK,
		/passcred=/false, /should_listen=/false, mode, /uid=/0,
		/gid=/gid, /socketcon=/{});
		result.ok()) {
		fd = *result;
		} else {
		LOG(FATAL) << "start_property_service socket creation failed: " << result.error();
		}

		listen(fd, 8);

		auto new_thread = std::thread(PropertyServiceThread, fd, listen_init);
		t.swap(new_thread);
		}

		void StartPropertyService(int* epoll_socket) {
		InitPropertySet("ro.property_service.version", "2");

		@@ -1518,9 +1493,19 @@ void StartPropertyService(int* epoll_socket) {
		init_socket = sockets[1];
		StartSendingMessages();

		StartThread(PROP_SERVICE_FOR_SYSTEM_NAME, 0660, AID_SYSTEM, property_service_for_system_thread,
		true);
		StartThread(PROP_SERVICE_NAME, 0666, 0, property_service_thread, false);
		if (auto result = CreateSocket(PROP_SERVICE_NAME, SOCK_STREAM \| SOCK_CLOEXEC \| SOCK_NONBLOCK,
		/passcred=/false, /should_listen=/false, 0666, /uid=/0,
		/gid=/0, /socketcon=/{});
		result.ok()) {
		property_set_fd = *result;
		} else {
		LOG(FATAL) << "start_property_service socket creation failed: " << result.error();
		}

		listen(property_set_fd, 8);

		auto new_thread = std::thread{PropertyServiceThread};
		property_service_thread.swap(new_thread);

		auto async_persist_writes =
		android::base::GetBoolProperty("ro.property_service.async_persist_writes", false);