Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-31 05:55:46 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fs/epoll: using filep with reference counting instead of file descriptors

Browse Source 
Signed-off-by: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
This commit is contained in:
dongjiuzhu1
2025-03-25 11:36:02 +08:00
committed by Xiang Xiao
parent 82effd4b2f
commit 77a0478095
1 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fs/vfs/fs_epoll.c
+25 -14
View File
@@ -56,6 +56,7 @@ struct epoll_node_s
epoll_data_t data; epoll_data_t data;
bool notified; bool notified;
struct pollfd pfd; struct pollfd pfd;
FAR struct file *filep;
FAR struct epoll_head_s *eph; FAR struct epoll_head_s *eph;
}; };
@@ -198,7 +199,8 @@ static int epoll_do_close(FAR struct file *filep)
nxmutex_destroy(&eph->lock); nxmutex_destroy(&eph->lock);
list_for_every_entry(&eph->setup, epn, epoll_node_t, node) list_for_every_entry(&eph->setup, epn, epoll_node_t, node)
{ {
poll_fdsetup(epn->pfd.fd, &epn->pfd, false); file_poll(epn->filep, &epn->pfd, false);
fs_putfilep(epn->filep);
} }
list_for_every_entry_safe(&eph->extend, epn, tmp, epoll_node_t, node) list_for_every_entry_safe(&eph->extend, epn, tmp, epoll_node_t, node)
@@ -302,11 +304,11 @@ static int epoll_setup(FAR epoll_head_t *eph)
epn->notified = false; epn->notified = false;
epn->pfd.revents = 0; epn->pfd.revents = 0;
ret = poll_fdsetup(epn->pfd.fd, &epn->pfd, true); ret = file_poll(epn->filep, &epn->pfd, true);
if (ret < 0) if (ret < 0)
{ {
ferr("epoll setup failed, fd=%d, events=%08" PRIx32 ", ret=%d\n", ferr("epoll setup failed, filep=%p, events=%08" PRIx32 ", "
epn->pfd.fd, epn->pfd.events, ret); "ret=%d\n", epn->filep, epn->pfd.events, ret);
break; break;
} }
@@ -356,7 +358,7 @@ static int epoll_teardown(FAR epoll_head_t *eph, FAR struct epoll_event *evs,
/* Teradown all the notified fd */ /* Teradown all the notified fd */
poll_fdsetup(epn->pfd.fd, &epn->pfd, false); file_poll(epn->filep, &epn->pfd, false);
list_delete(&epn->node); list_delete(&epn->node);
if (epn->pfd.revents != 0 && i < maxevents) if (epn->pfd.revents != 0 && i < maxevents)
@@ -488,6 +490,7 @@ int epoll_ctl(int epfd, int op, int fd, FAR struct epoll_event *ev)
eph = epoll_head_from_fd(epfd, &filep); eph = epoll_head_from_fd(epfd, &filep);
if (eph == NULL) if (eph == NULL)
{ {
set_errno(EBADF);
return ERROR; return ERROR;
} }
@@ -565,13 +568,21 @@ int epoll_ctl(int epfd, int op, int fd, FAR struct epoll_event *ev)
epn->pfd.cb = epoll_default_cb; epn->pfd.cb = epoll_default_cb;
epn->pfd.revents = 0; epn->pfd.revents = 0;
ret = poll_fdsetup(fd, &epn->pfd, true); ret = fs_getfilep(fd, &epn->filep);
if (ret < 0) if (ret < 0)
{ {
list_add_tail(&eph->free, &epn->node); list_add_tail(&eph->free, &epn->node);
goto err; goto err;
} }
ret = file_poll(epn->filep, &epn->pfd, true);
if (ret < 0)
{
fs_putfilep(epn->filep);
list_add_tail(&eph->free, &epn->node);
goto err;
}
list_add_tail(&eph->setup, &epn->node); list_add_tail(&eph->setup, &epn->node);
break; break;
@@ -581,7 +592,8 @@ int epoll_ctl(int epfd, int op, int fd, FAR struct epoll_event *ev)
{ {
if (epn->pfd.fd == fd) if (epn->pfd.fd == fd)
{ {
poll_fdsetup(fd, &epn->pfd, false); file_poll(epn->filep, &epn->pfd, false);
fs_putfilep(epn->filep);
list_delete(&epn->node); list_delete(&epn->node);
list_add_tail(&eph->free, &epn->node); list_add_tail(&eph->free, &epn->node);
goto out; goto out;
@@ -592,6 +604,7 @@ int epoll_ctl(int epfd, int op, int fd, FAR struct epoll_event *ev)
{ {
if (epn->pfd.fd == fd) if (epn->pfd.fd == fd)
{ {
fs_putfilep(epn->filep);
list_delete(&epn->node); list_delete(&epn->node);
list_add_tail(&eph->free, &epn->node); list_add_tail(&eph->free, &epn->node);
goto out; goto out;
@@ -602,6 +615,7 @@ int epoll_ctl(int epfd, int op, int fd, FAR struct epoll_event *ev)
{ {
if (epn->pfd.fd == fd) if (epn->pfd.fd == fd)
{ {
fs_putfilep(epn->filep);
list_delete(&epn->node); list_delete(&epn->node);
list_add_tail(&eph->free, &epn->node); list_add_tail(&eph->free, &epn->node);
goto out; goto out;
@@ -618,15 +632,14 @@ int epoll_ctl(int epfd, int op, int fd, FAR struct epoll_event *ev)
{ {
if (epn->pfd.events != (ev->events | POLLALWAYS)) if (epn->pfd.events != (ev->events | POLLALWAYS))
{ {
poll_fdsetup(fd, &epn->pfd, false); file_poll(epn->filep, &epn->pfd, false);
epn->notified = false; epn->notified = false;
epn->data = ev->data; epn->data = ev->data;
epn->pfd.events = ev->events | POLLALWAYS; epn->pfd.events = ev->events | POLLALWAYS;
epn->pfd.fd = fd;
epn->pfd.revents = 0; epn->pfd.revents = 0;
ret = poll_fdsetup(fd, &epn->pfd, true); ret = file_poll(epn->filep, &epn->pfd, true);
if (ret < 0) if (ret < 0)
{ {
goto err; goto err;
@@ -646,10 +659,9 @@ int epoll_ctl(int epfd, int op, int fd, FAR struct epoll_event *ev)
epn->notified = false; epn->notified = false;
epn->data = ev->data; epn->data = ev->data;
epn->pfd.events = ev->events | POLLALWAYS; epn->pfd.events = ev->events | POLLALWAYS;
epn->pfd.fd = fd;
epn->pfd.revents = 0; epn->pfd.revents = 0;
ret = poll_fdsetup(fd, &epn->pfd, true); ret = file_poll(epn->filep, &epn->pfd, true);
if (ret < 0) if (ret < 0)
{ {
goto err; goto err;
@@ -670,10 +682,9 @@ int epoll_ctl(int epfd, int op, int fd, FAR struct epoll_event *ev)
epn->notified = false; epn->notified = false;
epn->data = ev->data; epn->data = ev->data;
epn->pfd.events = ev->events | POLLALWAYS; epn->pfd.events = ev->events | POLLALWAYS;
epn->pfd.fd = fd;
epn->pfd.revents = 0; epn->pfd.revents = 0;
ret = poll_fdsetup(fd, &epn->pfd, true); ret = file_poll(epn->filep, &epn->pfd, true);
if (ret < 0) if (ret < 0)
{ {
goto err; goto err;