MT#55283 further upgrade poller union

Use epoll's u64 field

Change-Id: If56e980b2d65cc0e32736c58a12cad1000628f2a
(cherry picked from commit c6508f4fd9)
mr26.0
Richard Fuchs 4 weeks ago
parent bc6a35656c
commit f03c19febe

@ -119,7 +119,7 @@ bool poller_add_item(struct poller *p, struct poller_item *i) {
ZERO(e);
e.events = epoll_events(i, NULL);
e.data.fd = i->u.fd;
e.data.u64 = i->u.u64;
if (epoll_ctl(p->fd, EPOLL_CTL_ADD, i->u.fd, &e))
return false;
@ -206,10 +206,12 @@ static int poller_poll(struct poller *p, int timeout, struct epoll_event *evs, i
for (i = 0; i < ret; i++) {
ev = &evs[i];
if (ev->data.fd < 0)
union poller_item_u64 u64 = { .u64 = ev->data.u64 };
if (u64.fd < 0)
continue;
it = (ev->data.fd < p->items->len) ? p->items->pdata[ev->data.fd] : NULL;
it = (u64.fd < p->items->len) ? p->items->pdata[u64.fd] : NULL;
if (!it)
continue;
@ -229,7 +231,7 @@ static int poller_poll(struct poller *p, int timeout, struct epoll_event *evs, i
ZERO(e);
e.events = epoll_events(NULL, it);
e.data.fd = it->item.u.fd;
e.data.u64 = it->item.u.u64;
int eret = epoll_ctl(p->fd, EPOLL_CTL_MOD, it->item.u.fd, &e);
mutex_unlock(&p->lock);
@ -278,7 +280,7 @@ void poller_blocked(struct poller *p, void *fdp) {
ZERO(e);
e.events = epoll_events(NULL, it);
e.data.fd = fd;
e.data.u64 = it->item.u.u64;
epoll_ctl(p->fd, EPOLL_CTL_MOD, fd, &e);
}

@ -28,6 +28,7 @@ union poller_item_u64 {
struct {
int fd;
} __attribute__((packed));
uint64_t u64;
};
struct poller_item {
@ -40,6 +41,8 @@ struct poller_item {
poller_func_t closed;
};
static_assert(sizeof(union poller_item_u64) == sizeof(uint64_t), "wrong packing of union poller_item_u64");
struct poller;
struct poller_thread {

Loading…
Cancel
Save