From 8b2201a09ddd2ba551b48f0dbed930e971012148 Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Sun, 18 Oct 2026 11:41:32 -0400 Subject: [PATCH] MT#55283 further upgrade poller union Use epoll's u64 field Change-Id: If56e980b2d65cc0e32736c58a12cad1000628f2a (cherry picked from commit c6508f4fd9b48e4c3691f31701e46f82615edbc2) (cherry picked from commit 11ed687e351883c3eed6fea99b3a1953185be462) --- lib/poller.c | 12 +++++++----- lib/poller.h | 3 +++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/poller.c b/lib/poller.c index e5546c7c7..8b1e912db 100644 --- a/lib/poller.c +++ b/lib/poller.c @@ -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); } diff --git a/lib/poller.h b/lib/poller.h index 53d2f82d7..bbaf43ab8 100644 --- a/lib/poller.h +++ b/lib/poller.h @@ -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 {