Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-02 01:21:26 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fs/vfs/fs_epoll: fix epoll_wait function

Browse Source
This commit is contained in:
spiriou
2020-08-15 22:05:24 +02:00
committed by Xiang Xiao
parent b90c8914f3
commit 0ddefd7c69
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fs/vfs/fs_epoll.c
+6 -1
View File
@@ -245,7 +245,12 @@ int epoll_wait(int epfd, FAR struct epoll_event *evs, int maxevents,
/* Iterate over non NULL event fds */ /* Iterate over non NULL event fds */
for (i = 0, counter = 0; i < rc && counter < eph->size; counter++) if (rc > maxevents)
{
rc = maxevents;
}
for (i = 0, counter = 0; i < rc && counter < eph->occupied; counter++)
{ {
if (eph->evs[counter].revents != 0) if (eph->evs[counter].revents != 0)
{ {
include/sys/epoll.h
+2 -2
View File
@@ -95,11 +95,11 @@ struct epoll_event
{ {
epoll_data_t data; epoll_data_t data;
pollevent_t events; /* The input event flags */ pollevent_t events; /* The input event flags */
pollevent_t revents; /* The output event flags */
/* Non-standard fields used internally by NuttX. */ /* Non-standard fields used internally by NuttX. */
void *reserved; /* reserved feild sync with struct pollfd */ pollevent_t revents; /* The output event flags */
void *reserved; /* reserved field sync with struct pollfd */
FAR sem_t *sem; /* Pointer to semaphore used to post output event */ FAR sem_t *sem; /* Pointer to semaphore used to post output event */
FAR void *priv; /* For use by drivers */ FAR void *priv; /* For use by drivers */
}; };