OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

poll: Don't need monitor POLLERR or POLLHUP explicitly 

since spec require the implementation always report POLLERR/POLLHUP:
https://pubs.opengroup.org/onlinepubs/9699919799/functions/poll.html

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2022-10-02 05:45:06 +08:00 committed by Petro Karashchenko
parent f813fea555
commit e99c76a313
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/vfs/fs_epoll.c
View File

@ -308,7 +308,7 @@ int epoll_ctl(int epfd, int op, int fd, struct epoll_event *ev)
}
eph->data[++eph->occupied] = ev->data;
eph->poll[eph->occupied].events = ev->events | POLLERR | POLLHUP;
eph->poll[eph->occupied].events = ev->events;
eph->poll[eph->occupied].fd = fd;
break;
@ -347,7 +347,7 @@ int epoll_ctl(int epfd, int op, int fd, struct epoll_event *ev)
if (eph->poll[i].fd == fd)
{
eph->data[i] = ev->data;
eph->poll[i].events = ev->events | POLLERR | POLLHUP;
eph->poll[i].events = ev->events;
break;
}
}
@ -366,7 +366,6 @@ int epoll_ctl(int epfd, int op, int fd, struct epoll_event *ev)
}
poll_notify(&eph->poll, 1, eph->poll[0].events);
return 0;
}

2
fs/vfs/fs_poll.c
View File

@ -153,7 +153,6 @@ static inline int poll_setup(FAR struct pollfd *fds, nfds_t nfds,
fds[i].cb = poll_default_cb;
fds[i].revents = 0;
fds[i].priv = NULL;
fds[i].events |= POLLERR | POLLHUP;
/* Check for invalid descriptors. "If the value of fd is less than 0,
* events shall be ignored, and revents shall be set to 0 in that entry
@ -419,7 +418,6 @@ int file_poll(FAR struct file *filep, FAR struct pollfd *fds, bool setup)
else
{
poll_notify(&fds, 1, POLLERR | POLLHUP);
ret = OK;
}