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

net_local: fix error when work with epoll

Browse Source 
epoll_wait collects revent by checking fds->revent,
but local_socket will copy fds to the other two private pollfd shandow struct,
then the pipe_poll will not be able to update fds->revent directly,
so need local_socket save fds and implement a private poll_notify function
to passing revent to original fds->revent.

Signed-off-by: zhanghongyu <zhanghongyu@xiaomi.com>
This commit is contained in:
zhanghongyu 2022-12-29 15:21:13 +08:00 committed by Xiang Xiao
parent 6e0d76f528
commit 43cc4bd7bf
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
net/local/local_netpoll.c
View File

@ -109,6 +109,18 @@ errout:
net_unlock(); net_unlock();
return ret; return ret;
} }
/****************************************************************************
* Name: local_inout_poll_cb
****************************************************************************/
static void local_inout_poll_cb(FAR struct pollfd *fds)
{
FAR struct pollfd *originfds = fds->arg;
poll_notify(&originfds, 1, fds->revents);
}
#endif #endif
/**************************************************************************** /****************************************************************************
@ -201,10 +213,14 @@ int local_pollsetup(FAR struct socket *psock, FAR struct pollfd *fds)
shadowfds[0] = *fds; shadowfds[0] = *fds;
shadowfds[0].fd = 1; /* Does not matter */ shadowfds[0].fd = 1; /* Does not matter */
shadowfds[0].cb = local_inout_poll_cb;
shadowfds[0].arg = fds;
shadowfds[0].events &= ~POLLOUT; shadowfds[0].events &= ~POLLOUT;
shadowfds[1] = *fds; shadowfds[1] = *fds;
shadowfds[1].fd = 0; /* Does not matter */ shadowfds[1].fd = 0; /* Does not matter */
shadowfds[1].cb = local_inout_poll_cb;
shadowfds[1].arg = fds;
shadowfds[1].events &= ~POLLIN; shadowfds[1].events &= ~POLLIN;
net_unlock(); net_unlock();