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

Merge "init: switch out keychord id with std::vector match of chords"

Browse source
This commit is contained in:
Treehugger Robot 2018-05-30 16:12:36 +00:00 • committed by Gerrit Code Review
commit e6a878644c
6 changed files with 42 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
init/init.cpp
View file

@ -553,22 +553,30 @@ static void InstallSignalFdHandler(Epoll* epoll) {
} }
} }
void HandleKeychord(int id) { void HandleKeychord(const std::vector<int>& keycodes) {
// Only handle keychords if adb is enabled. // Only handle keychords if adb is enabled.
std::string adb_enabled = android::base::GetProperty("init.svc.adbd", ""); std::string adb_enabled = android::base::GetProperty("init.svc.adbd", "");
if (adb_enabled == "running") { if (adb_enabled != "running") {
Service* svc = ServiceList::GetInstance().FindService(id, &Service::keychord_id); LOG(WARNING) << "Not starting service for keychord " << android::base::Join(keycodes, ' ')
if (svc) { << " because ADB is disabled";
LOG(INFO) << "Starting service '" << svc->name() << "' from keychord " << id; return;
}
auto found = false;
for (const auto& service : ServiceList::GetInstance()) {
auto svc = service.get();
if (svc->keycodes() == keycodes) {
found = true;
LOG(INFO) << "Starting service '" << svc->name() << "' from keychord "
<< android::base::Join(keycodes, ' ');
if (auto result = svc->Start(); !result) { if (auto result = svc->Start(); !result) {
LOG(ERROR) << "Could not start service '" << svc->name() << "' from keychord " << id LOG(ERROR) << "Could not start service '" << svc->name() << "' from keychord "
<< ": " << result.error(); << android::base::Join(keycodes, ' ') << ": " << result.error();
} }
} else {
LOG(ERROR) << "Service for keychord " << id << " not found";
} }
} else { }
LOG(WARNING) << "Not starting service for keychord " << id << " because ADB is disabled"; if (!found) {
LOG(ERROR) << "Service for keychord " << android::base::Join(keycodes, ' ') << " not found";
} }
} }
@ -753,7 +761,7 @@ int main(int argc, char** argv) {
am.QueueBuiltinAction( am.QueueBuiltinAction(
[&epoll, &keychords](const BuiltinArguments& args) -> Result<Success> { [&epoll, &keychords](const BuiltinArguments& args) -> Result<Success> {
for (const auto& svc : ServiceList::GetInstance()) { for (const auto& svc : ServiceList::GetInstance()) {
svc->set_keychord_id(keychords.GetId(svc->keycodes())); keychords.Register(svc->keycodes());
} }
keychords.Start(&epoll, HandleKeychord); keychords.Start(&epoll, HandleKeychord);
return Success(); return Success();

33
init/keychords.cpp
View file

@ -37,7 +37,7 @@
namespace android { namespace android {
namespace init { namespace init {
Keychords::Keychords() : epoll_(nullptr), count_(0), inotify_fd_(-1) {} Keychords::Keychords() : epoll_(nullptr), inotify_fd_(-1) {}
Keychords::~Keychords() noexcept { Keychords::~Keychords() noexcept {
if (inotify_fd_ >= 0) { if (inotify_fd_ >= 0) {
@ -108,23 +108,22 @@ void Keychords::Mask::operator|=(const Keychords::Mask& rval) {
} }
} }
Keychords::Entry::Entry(const std::vector<int>& keycodes, int id) Keychords::Entry::Entry() : notified(false) {}
: keycodes(keycodes), id(id), notified(false) {}
void Keychords::LambdaCheck() { void Keychords::LambdaCheck() {
for (auto& e : entries_) { for (auto& [keycodes, entry] : entries_) {
auto found = true; auto found = true;
for (auto& code : e.keycodes) { for (auto& code : keycodes) {
if (!current_.GetBit(code)) { if (!current_.GetBit(code)) {
e.notified = false; entry.notified = false;
found = false; found = false;
break; break;
} }
} }
if (!found) continue; if (!found) continue;
if (e.notified) continue; if (entry.notified) continue;
e.notified = true; entry.notified = true;
handler_(e.id); handler_(keycodes);
} }
} }
@ -158,8 +157,8 @@ bool Keychords::GeteventEnable(int fd) {
#endif #endif
Keychords::Mask mask; Keychords::Mask mask;
for (auto& e : entries_) { for (auto& [keycodes, entry] : entries_) {
for (auto& code : e.keycodes) { for (auto& code : keycodes) {
mask.resize(code); mask.resize(code);
mask.SetBit(code); mask.SetBit(code);
} }
@ -271,17 +270,15 @@ void Keychords::GeteventOpenDevice() {
} }
} }
int Keychords::GetId(const std::vector<int>& keycodes) { void Keychords::Register(const std::vector<int>& keycodes) {
if (keycodes.empty()) return 0; if (keycodes.empty()) return;
++count_; entries_.try_emplace(keycodes, Entry());
entries_.emplace_back(Entry(keycodes, count_));
return count_;
} }
void Keychords::Start(Epoll* epoll, std::function<void(int)> handler) { void Keychords::Start(Epoll* epoll, std::function<void(const std::vector<int>&)> handler) {
epoll_ = epoll; epoll_ = epoll;
handler_ = handler; handler_ = handler;
if (count_) GeteventOpenDevice(); if (entries_.size()) GeteventOpenDevice();
} }
} // namespace init } // namespace init

13
init/keychords.h
View file

@ -36,8 +36,8 @@ class Keychords {
Keychords& operator=(Keychords&&) = delete; Keychords& operator=(Keychords&&) = delete;
~Keychords() noexcept; ~Keychords() noexcept;
int GetId(const std::vector<int>& keycodes); void Register(const std::vector<int>& keycodes);
void Start(Epoll* epoll, std::function<void(int)> handler); void Start(Epoll* epoll, std::function<void(const std::vector<int>&)> handler);
private: private:
// Bit management // Bit management
@ -65,10 +65,8 @@ class Keychords {
}; };
struct Entry { struct Entry {
Entry(const std::vector<int>& keycodes, int id); Entry();
const std::vector<int> keycodes;
const int id;
bool notified; bool notified;
}; };
@ -84,12 +82,11 @@ class Keychords {
void GeteventCloseDevice(const std::string& device); void GeteventCloseDevice(const std::string& device);
Epoll* epoll_; Epoll* epoll_;
std::function<void(int)> handler_; std::function<void(const std::vector<int>&)> handler_;
std::map<std::string, int> registration_; std::map<std::string, int> registration_;
int count_; std::map<const std::vector<int>, Entry> entries_;
std::vector<Entry> entries_;
Mask current_; Mask current_;

3
init/service.cpp
View file

@ -228,7 +228,6 @@ Service::Service(const std::string& name, unsigned flags, uid_t uid, gid_t gid,
seclabel_(seclabel), seclabel_(seclabel),
onrestart_(false, subcontext_for_restart_commands, "<Service '" + name + "' onrestart>", 0, onrestart_(false, subcontext_for_restart_commands, "<Service '" + name + "' onrestart>", 0,
"onrestart", {}), "onrestart", {}),
keychord_id_(0),
ioprio_class_(IoSchedClass_NONE), ioprio_class_(IoSchedClass_NONE),
ioprio_pri_(0), ioprio_pri_(0),
priority_(0), priority_(0),
@ -548,7 +547,7 @@ Result<Success> Service::ParseKeycodes(const std::vector<std::string>& args) {
for (auto& key : keycodes_) { for (auto& key : keycodes_) {
if (key == code) return Error() << "duplicate keycode: " << args[i]; if (key == code) return Error() << "duplicate keycode: " << args[i];
} }
keycodes_.emplace_back(code); keycodes_.insert(std::upper_bound(keycodes_.begin(), keycodes_.end(), code), code);
} else { } else {
return Error() << "invalid keycode: " << args[i]; return Error() << "invalid keycode: " << args[i];
} }

5
init/service.h
View file

@ -108,8 +108,6 @@ class Service {
const std::vector<gid_t>& supp_gids() const { return supp_gids_; } const std::vector<gid_t>& supp_gids() const { return supp_gids_; }
const std::string& seclabel() const { return seclabel_; } const std::string& seclabel() const { return seclabel_; }
const std::vector<int>& keycodes() const { return keycodes_; } const std::vector<int>& keycodes() const { return keycodes_; }
int keychord_id() const { return keychord_id_; }
void set_keychord_id(int keychord_id) { keychord_id_ = keychord_id; }
IoSchedClass ioprio_class() const { return ioprio_class_; } IoSchedClass ioprio_class() const { return ioprio_class_; }
int ioprio_pri() const { return ioprio_pri_; } int ioprio_pri() const { return ioprio_pri_; }
const std::set<std::string>& interfaces() const { return interfaces_; } const std::set<std::string>& interfaces() const { return interfaces_; }
@ -199,9 +197,8 @@ class Service {
std::set<std::string> interfaces_; // e.g. some.package.foo@1.0::IBaz/instance-name std::set<std::string> interfaces_; // e.g. some.package.foo@1.0::IBaz/instance-name
// keycodes for triggering this service via /dev/keychord // keycodes for triggering this service via /dev/input/input*
std::vector<int> keycodes_; std::vector<int> keycodes_;
int keychord_id_;
IoSchedClass ioprio_class_; IoSchedClass ioprio_class_;
int ioprio_pri_; int ioprio_pri_;

2
init/service_test.cpp
View file

@ -46,7 +46,6 @@ TEST(service, pod_initialized) {
EXPECT_EQ(0U, service_in_old_memory->uid()); EXPECT_EQ(0U, service_in_old_memory->uid());
EXPECT_EQ(0U, service_in_old_memory->gid()); EXPECT_EQ(0U, service_in_old_memory->gid());
EXPECT_EQ(0U, service_in_old_memory->namespace_flags()); EXPECT_EQ(0U, service_in_old_memory->namespace_flags());
EXPECT_EQ(0, service_in_old_memory->keychord_id());
EXPECT_EQ(IoSchedClass_NONE, service_in_old_memory->ioprio_class()); EXPECT_EQ(IoSchedClass_NONE, service_in_old_memory->ioprio_class());
EXPECT_EQ(0, service_in_old_memory->ioprio_pri()); EXPECT_EQ(0, service_in_old_memory->ioprio_pri());
EXPECT_EQ(0, service_in_old_memory->priority()); EXPECT_EQ(0, service_in_old_memory->priority());
@ -66,7 +65,6 @@ TEST(service, pod_initialized) {
EXPECT_EQ(0U, service_in_old_memory2->uid()); EXPECT_EQ(0U, service_in_old_memory2->uid());
EXPECT_EQ(0U, service_in_old_memory2->gid()); EXPECT_EQ(0U, service_in_old_memory2->gid());
EXPECT_EQ(0U, service_in_old_memory2->namespace_flags()); EXPECT_EQ(0U, service_in_old_memory2->namespace_flags());
EXPECT_EQ(0, service_in_old_memory2->keychord_id());
EXPECT_EQ(IoSchedClass_NONE, service_in_old_memory2->ioprio_class()); EXPECT_EQ(IoSchedClass_NONE, service_in_old_memory2->ioprio_class());
EXPECT_EQ(0, service_in_old_memory2->ioprio_pri()); EXPECT_EQ(0, service_in_old_memory2->ioprio_pri());
EXPECT_EQ(0, service_in_old_memory2->priority()); EXPECT_EQ(0, service_in_old_memory2->priority());