tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

minui: Managed FDs with smart pointers.

Browse source 
Also clean up a few variable names.

Test: Boot into recovery. Check key inputs.
Change-Id: I058475ac22f3db8523bd8aa30ccb61be1ef45559
This commit is contained in:
Tao Bao 2019-03-11 14:13:21 -07:00
parent aefc9e3ba9
commit 835bf09a14
2 changed files with 111 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

215
minui/events.cpp
View file

@ -23,144 +23,148 @@
#include <string.h> #include <string.h>
#include <sys/epoll.h> #include <sys/epoll.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#include <functional> #include <functional>
#include <memory>
#include <android-base/unique_fd.h>
#include "minui/minui.h" #include "minui/minui.h"
#define MAX_DEVICES 16 constexpr size_t MAX_DEVICES = 16;
#define MAX_MISC_FDS 16 constexpr size_t MAX_MISC_FDS = 16;
#define BITS_PER_LONG (sizeof(unsigned long) * 8) constexpr size_t BITS_PER_LONG = sizeof(unsigned long) * 8;
#define BITS_TO_LONGS(x) (((x) + BITS_PER_LONG - 1) / BITS_PER_LONG) constexpr size_t BITS_TO_LONGS(size_t bits) {
return ((bits + BITS_PER_LONG - 1) / BITS_PER_LONG);
}
struct fd_info { struct FdInfo {
int fd; android::base::unique_fd fd;
ev_callback cb; ev_callback cb;
}; };
static int g_epoll_fd; static android::base::unique_fd g_epoll_fd;
static epoll_event polledevents[MAX_DEVICES + MAX_MISC_FDS]; static epoll_event g_polled_events[MAX_DEVICES + MAX_MISC_FDS];
static int npolledevents; static int g_polled_events_count;
static fd_info ev_fdinfo[MAX_DEVICES + MAX_MISC_FDS]; static FdInfo ev_fdinfo[MAX_DEVICES + MAX_MISC_FDS];
static unsigned ev_count = 0; static size_t g_ev_count = 0;
static unsigned ev_dev_count = 0; static size_t g_ev_dev_count = 0;
static unsigned ev_misc_count = 0; static size_t g_ev_misc_count = 0;
static bool test_bit(size_t bit, unsigned long* array) { // NOLINT static bool test_bit(size_t bit, unsigned long* array) { // NOLINT
return (array[bit/BITS_PER_LONG] & (1UL << (bit % BITS_PER_LONG))) != 0; return (array[bit / BITS_PER_LONG] & (1UL << (bit % BITS_PER_LONG))) != 0;
} }
int ev_init(ev_callback input_cb, bool allow_touch_inputs) { int ev_init(ev_callback input_cb, bool allow_touch_inputs) {
g_epoll_fd = epoll_create1(EPOLL_CLOEXEC); g_epoll_fd.reset();
if (g_epoll_fd == -1) {
android::base::unique_fd epoll_fd(epoll_create1(EPOLL_CLOEXEC));
if (epoll_fd == -1) {
return -1; return -1;
} }
bool epollctlfail = false; std::unique_ptr<DIR, decltype(&closedir)> dir(opendir("/dev/input"), closedir);
DIR* dir = opendir("/dev/input"); if (!dir) {
if (dir != nullptr) { return -1;
dirent* de; }
while ((de = readdir(dir))) {
if (strncmp(de->d_name, "event", 5)) continue;
int fd = openat(dirfd(dir), de->d_name, O_RDONLY | O_CLOEXEC);
if (fd == -1) continue;
// Use unsigned long to match ioctl's parameter type. bool epoll_ctl_failed = false;
unsigned long ev_bits[BITS_TO_LONGS(EV_MAX)]; // NOLINT dirent* de;
while ((de = readdir(dir.get())) != nullptr) {
if (strncmp(de->d_name, "event", 5)) continue;
android::base::unique_fd fd(openat(dirfd(dir.get()), de->d_name, O_RDONLY | O_CLOEXEC));
if (fd == -1) continue;
// Read the evbits of the input device. // Use unsigned long to match ioctl's parameter type.
if (ioctl(fd, EVIOCGBIT(0, sizeof(ev_bits)), ev_bits) == -1) { unsigned long ev_bits[BITS_TO_LONGS(EV_MAX)]; // NOLINT
close(fd);
continue;
}
// We assume that only EV_KEY, EV_REL, and EV_SW event types are ever needed. EV_ABS is also // Read the evbits of the input device.
// allowed if allow_touch_inputs is set. if (ioctl(fd, EVIOCGBIT(0, sizeof(ev_bits)), ev_bits) == -1) {
if (!test_bit(EV_KEY, ev_bits) && !test_bit(EV_REL, ev_bits) && !test_bit(EV_SW, ev_bits)) { continue;
if (!allow_touch_inputs || !test_bit(EV_ABS, ev_bits)) {
close(fd);
continue;
}
}
epoll_event ev;
ev.events = EPOLLIN | EPOLLWAKEUP;
ev.data.ptr = &ev_fdinfo[ev_count];
if (epoll_ctl(g_epoll_fd, EPOLL_CTL_ADD, fd, &ev) == -1) {
close(fd);
epollctlfail = true;
continue;
}
ev_fdinfo[ev_count].fd = fd;
ev_fdinfo[ev_count].cb = input_cb;
ev_count++;
ev_dev_count++;
if (ev_dev_count == MAX_DEVICES) break;
} }
closedir(dir); // We assume that only EV_KEY, EV_REL, and EV_SW event types are ever needed. EV_ABS is also
// allowed if allow_touch_inputs is set.
if (!test_bit(EV_KEY, ev_bits) && !test_bit(EV_REL, ev_bits) && !test_bit(EV_SW, ev_bits)) {
if (!allow_touch_inputs || !test_bit(EV_ABS, ev_bits)) {
continue;
}
}
epoll_event ev;
ev.events = EPOLLIN | EPOLLWAKEUP;
ev.data.ptr = &ev_fdinfo[g_ev_count];
if (epoll_ctl(epoll_fd, EPOLL_CTL_ADD, fd, &ev) == -1) {
epoll_ctl_failed = true;
continue;
}
ev_fdinfo[g_ev_count].fd.reset(fd.release());
ev_fdinfo[g_ev_count].cb = input_cb;
g_ev_count++;
g_ev_dev_count++;
if (g_ev_dev_count == MAX_DEVICES) break;
} }
if (epollctlfail && !ev_count) { if (epoll_ctl_failed && !g_ev_count) {
close(g_epoll_fd);
g_epoll_fd = -1;
return -1; return -1;
} }
g_epoll_fd.reset(epoll_fd.release());
return 0; return 0;
} }
int ev_get_epollfd(void) { int ev_get_epollfd(void) {
return g_epoll_fd; return g_epoll_fd.get();
} }
int ev_add_fd(int fd, ev_callback cb) { int ev_add_fd(android::base::unique_fd&& fd, ev_callback cb) {
if (ev_misc_count == MAX_MISC_FDS || cb == NULL) { if (g_ev_misc_count == MAX_MISC_FDS || cb == nullptr) {
return -1; return -1;
} }
epoll_event ev; epoll_event ev;
ev.events = EPOLLIN | EPOLLWAKEUP; ev.events = EPOLLIN | EPOLLWAKEUP;
ev.data.ptr = static_cast<void*>(&ev_fdinfo[ev_count]); ev.data.ptr = static_cast<void*>(&ev_fdinfo[g_ev_count]);
int ret = epoll_ctl(g_epoll_fd, EPOLL_CTL_ADD, fd, &ev); int ret = epoll_ctl(g_epoll_fd, EPOLL_CTL_ADD, fd, &ev);
if (!ret) { if (!ret) {
ev_fdinfo[ev_count].fd = fd; ev_fdinfo[g_ev_count].fd.reset(fd.release());
ev_fdinfo[ev_count].cb = std::move(cb); ev_fdinfo[g_ev_count].cb = std::move(cb);
ev_count++; g_ev_count++;
ev_misc_count++; g_ev_misc_count++;
} }
return ret; return ret;
} }
void ev_exit(void) { void ev_exit(void) {
while (ev_count > 0) { while (g_ev_count > 0) {
close(ev_fdinfo[--ev_count].fd); ev_fdinfo[--g_ev_count].fd.reset();
} }
ev_misc_count = 0; g_ev_misc_count = 0;
ev_dev_count = 0; g_ev_dev_count = 0;
close(g_epoll_fd); g_epoll_fd.reset();
} }
int ev_wait(int timeout) { int ev_wait(int timeout) {
npolledevents = epoll_wait(g_epoll_fd, polledevents, ev_count, timeout); g_polled_events_count = epoll_wait(g_epoll_fd, g_polled_events, g_ev_count, timeout);
if (npolledevents <= 0) { if (g_polled_events_count <= 0) {
return -1; return -1;
} }
return 0; return 0;
} }
void ev_dispatch(void) { void ev_dispatch(void) {
for (int n = 0; n < npolledevents; n++) { for (int n = 0; n < g_polled_events_count; n++) {
fd_info* fdi = static_cast<fd_info*>(polledevents[n].data.ptr); FdInfo* fdi = static_cast<FdInfo*>(g_polled_events[n].data.ptr);
const ev_callback& cb = fdi->cb; const ev_callback& cb = fdi->cb;
if (cb) { if (cb) {
cb(fdi->fd, polledevents[n].events); cb(fdi->fd, g_polled_events[n].events);
} }
} }
} }
@ -180,7 +184,7 @@ int ev_sync_key_state(const ev_set_key_callback& set_key_cb) {
unsigned long ev_bits[BITS_TO_LONGS(EV_MAX)]; // NOLINT unsigned long ev_bits[BITS_TO_LONGS(EV_MAX)]; // NOLINT
unsigned long key_bits[BITS_TO_LONGS(KEY_MAX)]; // NOLINT unsigned long key_bits[BITS_TO_LONGS(KEY_MAX)]; // NOLINT
for (size_t i = 0; i < ev_dev_count; ++i) { for (size_t i = 0; i < g_ev_dev_count; ++i) {
memset(ev_bits, 0, sizeof(ev_bits)); memset(ev_bits, 0, sizeof(ev_bits));
memset(key_bits, 0, sizeof(key_bits)); memset(key_bits, 0, sizeof(key_bits));
@ -205,37 +209,36 @@ int ev_sync_key_state(const ev_set_key_callback& set_key_cb) {
} }
void ev_iterate_available_keys(const std::function<void(int)>& f) { void ev_iterate_available_keys(const std::function<void(int)>& f) {
// Use unsigned long to match ioctl's parameter type. // Use unsigned long to match ioctl's parameter type.
unsigned long ev_bits[BITS_TO_LONGS(EV_MAX)]; // NOLINT unsigned long ev_bits[BITS_TO_LONGS(EV_MAX)]; // NOLINT
unsigned long key_bits[BITS_TO_LONGS(KEY_MAX)]; // NOLINT unsigned long key_bits[BITS_TO_LONGS(KEY_MAX)]; // NOLINT
for (size_t i = 0; i < ev_dev_count; ++i) { for (size_t i = 0; i < g_ev_dev_count; ++i) {
memset(ev_bits, 0, sizeof(ev_bits)); memset(ev_bits, 0, sizeof(ev_bits));
memset(key_bits, 0, sizeof(key_bits)); memset(key_bits, 0, sizeof(key_bits));
// Does this device even have keys? // Does this device even have keys?
if (ioctl(ev_fdinfo[i].fd, EVIOCGBIT(0, sizeof(ev_bits)), ev_bits) == -1) { if (ioctl(ev_fdinfo[i].fd, EVIOCGBIT(0, sizeof(ev_bits)), ev_bits) == -1) {
continue; continue;
}
if (!test_bit(EV_KEY, ev_bits)) {
continue;
}
int rc = ioctl(ev_fdinfo[i].fd, EVIOCGBIT(EV_KEY, KEY_MAX), key_bits);
if (rc == -1) {
continue;
}
for (int key_code = 0; key_code <= KEY_MAX; ++key_code) {
if (test_bit(key_code, key_bits)) {
f(key_code);
}
}
} }
if (!test_bit(EV_KEY, ev_bits)) {
continue;
}
if (ioctl(ev_fdinfo[i].fd, EVIOCGBIT(EV_KEY, KEY_MAX), key_bits) == -1) {
continue;
}
for (int key_code = 0; key_code <= KEY_MAX; ++key_code) {
if (test_bit(key_code, key_bits)) {
f(key_code);
}
}
}
} }
void ev_iterate_touch_inputs(const std::function<void(int)>& action) { void ev_iterate_touch_inputs(const std::function<void(int)>& action) {
for (size_t i = 0; i < ev_dev_count; ++i) { for (size_t i = 0; i < g_ev_dev_count; ++i) {
// Use unsigned long to match ioctl's parameter type. // Use unsigned long to match ioctl's parameter type.
unsigned long ev_bits[BITS_TO_LONGS(EV_MAX)] = {}; // NOLINT unsigned long ev_bits[BITS_TO_LONGS(EV_MAX)] = {}; // NOLINT
if (ioctl(ev_fdinfo[i].fd, EVIOCGBIT(0, sizeof(ev_bits)), ev_bits) == -1) { if (ioctl(ev_fdinfo[i].fd, EVIOCGBIT(0, sizeof(ev_bits)), ev_bits) == -1) {

3
minui/include/minui/minui.h
View file

@ -26,6 +26,7 @@
#include <vector> #include <vector>
#include <android-base/macros.h> #include <android-base/macros.h>
#include <android-base/unique_fd.h>
// //
// Graphics. // Graphics.
@ -153,7 +154,7 @@ using ev_set_key_callback = std::function<int(int code, int value)>;
int ev_init(ev_callback input_cb, bool allow_touch_inputs = false); int ev_init(ev_callback input_cb, bool allow_touch_inputs = false);
void ev_exit(); void ev_exit();
int ev_add_fd(int fd, ev_callback cb); int ev_add_fd(android::base::unique_fd&& fd, ev_callback cb);
void ev_iterate_available_keys(const std::function<void(int)>& f); void ev_iterate_available_keys(const std::function<void(int)>& f);
void ev_iterate_touch_inputs(const std::function<void(int)>& action); void ev_iterate_touch_inputs(const std::function<void(int)>& action);
int ev_sync_key_state(const ev_set_key_callback& set_key_cb); int ev_sync_key_state(const ev_set_key_callback& set_key_cb);