sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

epoll: fix epoll_wait function

Browse Source
This commit is contained in:
Simon Piriou 2017-07-22 08:52:14 -06:00 committed by Gregory Nutt
parent 795ee47660
commit 643f5782aa
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fs/vfs/fs_epoll.c
View File

@ -198,6 +198,7 @@ int epoll_wait(int epfd, FAR struct epoll_event *evs, int maxevents,
*/ */
FAR struct epoll_head *eph = (FAR struct epoll_head *)((intptr_t)epfd); FAR struct epoll_head *eph = (FAR struct epoll_head *)((intptr_t)epfd);
int counter;
int rc; int rc;
int i; int i;
@ -219,13 +220,19 @@ int epoll_wait(int epfd, FAR struct epoll_event *evs, int maxevents,
return rc; return rc;
} }
for (i = 0; i < rc; i++) /* Iterate over non NULL event fds */
for (i = 0, counter = 0; i < rc && counter < eph->size; counter++)
{ {
evs[i].data.fd = (pollevent_t)eph->evs[i].data.fd; if (eph->evs[counter].revents != 0)
evs[i].events = (pollevent_t)eph->evs[i].revents; {
evs[i].data.fd = eph->evs[counter].data.fd;
evs[i].events = eph->evs[counter].revents;
i += 1;
}
} }
return rc; return i;
} }
#endif /* CONFIG_DISABLE_POLL */ #endif /* CONFIG_DISABLE_POLL */