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

healthd: move binder fd to not use EPOLLWAKEUP am: e89ea5eb85 

am: 098babc7c8

Change-Id: I9ff934ef70aa89c02edcc8687249655ad86d806f
This commit is contained in:
Tim Murray 2016-10-21 21:53:49 +00:00 committed by android-build-merger
parent 7650bc6318 098babc7c8
commit b9ede3dbba
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
healthd/healthd.cpp
View File

@ -143,10 +143,14 @@ static void healthd_mode_nop_battery_update(
struct android::BatteryProperties* /*props*/) {
}
int healthd_register_event(int fd, void (*handler)(uint32_t)) {
int healthd_register_event(int fd, void (*handler)(uint32_t), EventWakeup wakeup) {
struct epoll_event ev;
ev.events = EPOLLIN | EPOLLWAKEUP;
ev.events = EPOLLIN;
if (wakeup == EVENT_WAKEUP_FD)
ev.events |= EPOLLWAKEUP;
ev.data.ptr = (void *)handler;
if (epoll_ctl(epollfd, EPOLL_CTL_ADD, fd, &ev) == -1) {
KLOG_ERROR(LOG_TAG,
@ -252,7 +256,7 @@ static void uevent_init(void) {
}
fcntl(uevent_fd, F_SETFL, O_NONBLOCK);
if (healthd_register_event(uevent_fd, uevent_event))
if (healthd_register_event(uevent_fd, uevent_event, EVENT_WAKEUP_FD))
KLOG_ERROR(LOG_TAG,
"register for uevent events failed\n");
}
@ -275,7 +279,7 @@ static void wakealarm_init(void) {
return;
}
if (healthd_register_event(wakealarm_fd, wakealarm_event))
if (healthd_register_event(wakealarm_fd, wakealarm_event, EVENT_WAKEUP_FD))
KLOG_ERROR(LOG_TAG,
"Registration of wakealarm event failed\n");
@ -293,7 +297,6 @@ static void healthd_mainloop(void) {
if (timeout < 0 || (mode_timeout > 0 && mode_timeout < timeout))
timeout = mode_timeout;
nevents = epoll_wait(epollfd, events, eventct, timeout);
if (nevents == -1) {
if (errno == EINTR)
continue;

2
healthd/healthd_mode_charger.cpp
View File

@ -839,7 +839,7 @@ void healthd_mode_charger_init(struct healthd_config* config)
ret = ev_init(input_callback, charger);
if (!ret) {
epollfd = ev_get_epollfd();
healthd_register_event(epollfd, charger_event_handler);
healthd_register_event(epollfd, charger_event_handler, EVENT_WAKEUP_FD);
}
struct animation* anim = init_animation();

7
healthd/include/healthd/healthd.h
View File

@ -73,9 +73,14 @@ struct healthd_config {
bool (*screen_on)(android::BatteryProperties *props);
};
enum EventWakeup {
EVENT_NO_WAKEUP_FD,
EVENT_WAKEUP_FD,
};
// Global helper functions
int healthd_register_event(int fd, void (*handler)(uint32_t));
int healthd_register_event(int fd, void (*handler)(uint32_t), EventWakeup wakeup = EVENT_NO_WAKEUP_FD);
void healthd_battery_update();
android::status_t healthd_get_property(int id,
struct android::BatteryProperty *val);