You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by GitBox <gi...@apache.org> on 2022/09/28 03:58:39 UTC
[GitHub] [incubator-nuttx] CV-Bowen opened a new pull request, #7207: fs/poll: using callback mechanism to implement poll notification
CV-Bowen opened a new pull request, #7207:
URL: https://github.com/apache/incubator-nuttx/pull/7207
## Summary
Using callback mechanism to implement poll notification.
Rpmsg device (#6869) need this mechanism to implement the poll operation.
## Impact
All poll operation.
## Testing
ostest, pipe, usrsocktest pass.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] CV-Bowen closed pull request #7207: fs/poll: using callback mechanism to implement poll notification
Posted by GitBox <gi...@apache.org>.
CV-Bowen closed pull request #7207: fs/poll: using callback mechanism to implement poll notification
URL: https://github.com/apache/incubator-nuttx/pull/7207
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] xiaoxiang781216 commented on a diff in pull request #7207: fs/poll: using callback mechanism to implement poll notification
Posted by GitBox <gi...@apache.org>.
xiaoxiang781216 commented on code in PR #7207:
URL: https://github.com/apache/incubator-nuttx/pull/7207#discussion_r983295994
##########
include/sys/poll.h:
##########
@@ -144,6 +150,8 @@ int ppoll(FAR struct pollfd *fds, nfds_t nfds,
FAR const struct timespec *timeout_ts,
FAR const sigset_t *sigmask);
+void poll_default_cb(FAR struct pollfd *fds);
Review Comment:
let me remove the poll from telnet driver, so you don't need expose it out side poll.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] CV-Bowen commented on a diff in pull request #7207: fs/poll: using callback mechanism to implement poll notification
Posted by GitBox <gi...@apache.org>.
CV-Bowen commented on code in PR #7207:
URL: https://github.com/apache/incubator-nuttx/pull/7207#discussion_r983197698
##########
include/sys/poll.h:
##########
@@ -144,6 +150,8 @@ int ppoll(FAR struct pollfd *fds, nfds_t nfds,
FAR const struct timespec *timeout_ts,
FAR const sigset_t *sigmask);
+void poll_default_cb(FAR struct pollfd *fds);
Review Comment:
This default callback function is useful when using the file_poll()/psock_poll() and want to keep the default function of poll.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] CV-Bowen commented on a diff in pull request #7207: fs/poll: using callback mechanism to implement poll notification
Posted by GitBox <gi...@apache.org>.
CV-Bowen commented on code in PR #7207:
URL: https://github.com/apache/incubator-nuttx/pull/7207#discussion_r983171932
##########
drivers/net/telnet.c:
##########
@@ -1281,7 +1281,8 @@ static int telnet_io_main(int argc, FAR char** argv)
(CONFIG_TELNET_RXBUFFER_SIZE -
priv->td_pending - priv->td_offset) > 0)
{
- priv->td_fds.sem = &g_iosem;
+ priv->td_fds.cbargs = &g_iosem;
Review Comment:
So i need add a net_dup() api to get the fd based on the psock and use this fd in telnet_io_main() ?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] xiaoxiang781216 commented on a diff in pull request #7207: fs/poll: using callback mechanism to implement poll notification
Posted by GitBox <gi...@apache.org>.
xiaoxiang781216 commented on code in PR #7207:
URL: https://github.com/apache/incubator-nuttx/pull/7207#discussion_r983424953
##########
drivers/net/telnet.c:
##########
@@ -1281,7 +1281,8 @@ static int telnet_io_main(int argc, FAR char** argv)
(CONFIG_TELNET_RXBUFFER_SIZE -
priv->td_pending - priv->td_offset) > 0)
{
- priv->td_fds.sem = &g_iosem;
+ priv->td_fds.cbargs = &g_iosem;
Review Comment:
here is the patch: https://github.com/apache/incubator-nuttx/pull/7210
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] xiaoxiang781216 commented on a diff in pull request #7207: fs/poll: using callback mechanism to implement poll notification
Posted by GitBox <gi...@apache.org>.
xiaoxiang781216 commented on code in PR #7207:
URL: https://github.com/apache/incubator-nuttx/pull/7207#discussion_r983491874
##########
include/sys/poll.h:
##########
@@ -117,7 +122,8 @@ struct pollfd
/* Non-standard fields used internally by NuttX. */
FAR void *ptr; /* The psock or file being polled */
- FAR sem_t *sem; /* Pointer to semaphore used to post output event */
+ FAR void *cbargs; /* The poll callback function arguments */
Review Comment:
```suggestion
FAR void *args; /* The poll callback function arguments */
```
##########
fs/vfs/fs_epoll.c:
##########
@@ -365,7 +365,7 @@ int epoll_ctl(int epfd, int op, int fd, struct epoll_event *ev)
return -1;
}
- if (eph->poll[0].sem)
+ if (eph->poll[0].cbargs)
Review Comment:
remove the check because it's already checked by poll_notify
##########
fs/vfs/fs_poll.c:
##########
@@ -277,6 +279,36 @@ static inline int poll_teardown(FAR struct pollfd *fds, nfds_t nfds,
* Public Functions
****************************************************************************/
+/****************************************************************************
+ * Name: poll_default_cb
+ *
+ * Description:
+ * The default poll callback function, this function do the final step of
+ * poll notification.
+ *
+ * Input Parameters:
+ * fds - The fds
+ *
+ * Returned Value:
+ * None
+ *
+ ****************************************************************************/
+
+void poll_default_cb(FAR struct pollfd *fds)
+{
+ int semcount;
Review Comment:
```suggestion
int semcount = 0;
```
##########
fs/vfs/fs_poll.c:
##########
@@ -317,15 +348,9 @@ void poll_notify(FAR struct pollfd **afds, int nfds, pollevent_t eventset)
fds->revents &= ~POLLOUT;
}
- if (fds->revents != 0)
+ if (fds->revents != 0 && fds->cb)
{
- finfo("Report events: %08" PRIx32 "\n", fds->revents);
Review Comment:
keep this line and remove line 302
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] CV-Bowen commented on a diff in pull request #7207: fs/poll: using callback mechanism to implement poll notification
Posted by GitBox <gi...@apache.org>.
CV-Bowen commented on code in PR #7207:
URL: https://github.com/apache/incubator-nuttx/pull/7207#discussion_r983570381
##########
include/sys/poll.h:
##########
@@ -117,7 +122,8 @@ struct pollfd
/* Non-standard fields used internally by NuttX. */
FAR void *ptr; /* The psock or file being polled */
- FAR sem_t *sem; /* Pointer to semaphore used to post output event */
+ FAR void *cbargs; /* The poll callback function arguments */
Review Comment:
Done
##########
fs/vfs/fs_poll.c:
##########
@@ -277,6 +279,36 @@ static inline int poll_teardown(FAR struct pollfd *fds, nfds_t nfds,
* Public Functions
****************************************************************************/
+/****************************************************************************
+ * Name: poll_default_cb
+ *
+ * Description:
+ * The default poll callback function, this function do the final step of
+ * poll notification.
+ *
+ * Input Parameters:
+ * fds - The fds
+ *
+ * Returned Value:
+ * None
+ *
+ ****************************************************************************/
+
+void poll_default_cb(FAR struct pollfd *fds)
+{
+ int semcount;
Review Comment:
Done
##########
fs/vfs/fs_epoll.c:
##########
@@ -365,7 +365,7 @@ int epoll_ctl(int epfd, int op, int fd, struct epoll_event *ev)
return -1;
}
- if (eph->poll[0].sem)
+ if (eph->poll[0].cbargs)
Review Comment:
Done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] CV-Bowen commented on a diff in pull request #7207: fs/poll: using callback mechanism to implement poll notification
Posted by GitBox <gi...@apache.org>.
CV-Bowen commented on code in PR #7207:
URL: https://github.com/apache/incubator-nuttx/pull/7207#discussion_r983298241
##########
drivers/net/telnet.c:
##########
@@ -1281,7 +1281,8 @@ static int telnet_io_main(int argc, FAR char** argv)
(CONFIG_TELNET_RXBUFFER_SIZE -
priv->td_pending - priv->td_offset) > 0)
{
- priv->td_fds.sem = &g_iosem;
+ priv->td_fds.cbargs = &g_iosem;
Review Comment:
OK
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] CV-Bowen commented on a diff in pull request #7207: fs/poll: using callback mechanism to implement poll notification
Posted by GitBox <gi...@apache.org>.
CV-Bowen commented on code in PR #7207:
URL: https://github.com/apache/incubator-nuttx/pull/7207#discussion_r985246238
##########
fs/vfs/fs_poll.c:
##########
@@ -317,15 +349,10 @@ void poll_notify(FAR struct pollfd **afds, int nfds, pollevent_t eventset)
fds->revents &= ~POLLOUT;
}
- if (fds->revents != 0)
+ if (fds->revents != 0 && fds->cb)
Review Comment:
Done
##########
fs/vfs/fs_poll.c:
##########
@@ -277,6 +279,37 @@ static inline int poll_teardown(FAR struct pollfd *fds, nfds_t nfds,
* Public Functions
****************************************************************************/
+/****************************************************************************
+ * Name: poll_default_cb
+ *
+ * Description:
+ * The default poll callback function, this function do the final step of
+ * poll notification.
+ *
+ * Input Parameters:
+ * fds - The fds
+ *
+ * Returned Value:
+ * None
+ *
+ ****************************************************************************/
+
+void poll_default_cb(FAR struct pollfd *fds)
+{
+ int semcount = 0;
+ FAR sem_t *pollsem;
Review Comment:
Let's keep this, declare local variable in the beginning of the function is better for me.
##########
fs/vfs/fs_poll.c:
##########
@@ -277,6 +279,37 @@ static inline int poll_teardown(FAR struct pollfd *fds, nfds_t nfds,
* Public Functions
****************************************************************************/
+/****************************************************************************
+ * Name: poll_default_cb
+ *
+ * Description:
+ * The default poll callback function, this function do the final step of
+ * poll notification.
+ *
+ * Input Parameters:
+ * fds - The fds
+ *
+ * Returned Value:
+ * None
+ *
+ ****************************************************************************/
+
+void poll_default_cb(FAR struct pollfd *fds)
+{
+ int semcount = 0;
+ FAR sem_t *pollsem;
+
+ if (fds->args != NULL)
+ {
+ pollsem = (FAR sem_t *)fds->args;
Review Comment:
Why not need?
##########
include/sys/poll.h:
##########
@@ -117,7 +122,8 @@ struct pollfd
/* Non-standard fields used internally by NuttX. */
FAR void *ptr; /* The psock or file being polled */
- FAR sem_t *sem; /* Pointer to semaphore used to post output event */
+ FAR void *args; /* The poll callback function arguments */
+ FAR pollcb_t cb; /* The poll callback function */
Review Comment:
Done
##########
include/sys/poll.h:
##########
@@ -117,7 +122,8 @@ struct pollfd
/* Non-standard fields used internally by NuttX. */
FAR void *ptr; /* The psock or file being polled */
- FAR sem_t *sem; /* Pointer to semaphore used to post output event */
+ FAR void *args; /* The poll callback function arguments */
Review Comment:
Done
##########
include/sys/poll.h:
##########
@@ -144,6 +150,8 @@ int ppoll(FAR struct pollfd *fds, nfds_t nfds,
FAR const struct timespec *timeout_ts,
FAR const sigset_t *sigmask);
+void poll_default_cb(FAR struct pollfd *fds);
Review Comment:
Done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] xiaoxiang781216 commented on a diff in pull request #7207: fs/poll: using callback mechanism to implement poll notification
Posted by GitBox <gi...@apache.org>.
xiaoxiang781216 commented on code in PR #7207:
URL: https://github.com/apache/incubator-nuttx/pull/7207#discussion_r983296476
##########
drivers/net/telnet.c:
##########
@@ -1281,7 +1281,8 @@ static int telnet_io_main(int argc, FAR char** argv)
(CONFIG_TELNET_RXBUFFER_SIZE -
priv->td_pending - priv->td_offset) > 0)
{
- priv->td_fds.sem = &g_iosem;
+ priv->td_fds.cbargs = &g_iosem;
Review Comment:
let me remove the poll from telnet driver, so you don't need expose it out side poll.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] CV-Bowen commented on a diff in pull request #7207: fs/poll: using callback mechanism to implement poll notification
Posted by GitBox <gi...@apache.org>.
CV-Bowen commented on code in PR #7207:
URL: https://github.com/apache/incubator-nuttx/pull/7207#discussion_r983572255
##########
include/sys/poll.h:
##########
@@ -144,6 +150,8 @@ int ppoll(FAR struct pollfd *fds, nfds_t nfds,
FAR const struct timespec *timeout_ts,
FAR const sigset_t *sigmask);
+void poll_default_cb(FAR struct pollfd *fds);
Review Comment:
Let's keep this until #7211 merged.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] xiaoxiang781216 merged pull request #7207: fs/poll: using callback mechanism to implement poll notification
Posted by GitBox <gi...@apache.org>.
xiaoxiang781216 merged PR #7207:
URL: https://github.com/apache/incubator-nuttx/pull/7207
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] xiaoxiang781216 commented on a diff in pull request #7207: fs/poll: using callback mechanism to implement poll notification
Posted by GitBox <gi...@apache.org>.
xiaoxiang781216 commented on code in PR #7207:
URL: https://github.com/apache/incubator-nuttx/pull/7207#discussion_r981975042
##########
include/sys/poll.h:
##########
@@ -144,6 +150,8 @@ int ppoll(FAR struct pollfd *fds, nfds_t nfds,
FAR const struct timespec *timeout_ts,
FAR const sigset_t *sigmask);
+void poll_default_cb(FAR struct pollfd *fds);
Review Comment:
change to static
##########
drivers/net/telnet.c:
##########
@@ -1281,7 +1281,8 @@ static int telnet_io_main(int argc, FAR char** argv)
(CONFIG_TELNET_RXBUFFER_SIZE -
priv->td_pending - priv->td_offset) > 0)
{
- priv->td_fds.sem = &g_iosem;
+ priv->td_fds.cbargs = &g_iosem;
Review Comment:
could we let telnet call nx_poll api instead psock_poll
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] CV-Bowen commented on a diff in pull request #7207: fs/poll: using callback mechanism to implement poll notification
Posted by GitBox <gi...@apache.org>.
CV-Bowen commented on code in PR #7207:
URL: https://github.com/apache/incubator-nuttx/pull/7207#discussion_r983569722
##########
fs/vfs/fs_poll.c:
##########
@@ -317,15 +348,9 @@ void poll_notify(FAR struct pollfd **afds, int nfds, pollevent_t eventset)
fds->revents &= ~POLLOUT;
}
- if (fds->revents != 0)
+ if (fds->revents != 0 && fds->cb)
{
- finfo("Report events: %08" PRIx32 "\n", fds->revents);
Review Comment:
Done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] xiaoxiang781216 commented on pull request #7207: fs/poll: using callback mechanism to implement poll notification
Posted by GitBox <gi...@apache.org>.
xiaoxiang781216 commented on PR #7207:
URL: https://github.com/apache/incubator-nuttx/pull/7207#issuecomment-1263117862
@CV-Bowen https://github.com/apache/incubator-nuttx/pull/7211 is merged, please rebase and adjust the patch.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] xiaoxiang781216 commented on a diff in pull request #7207: fs/poll: using callback mechanism to implement poll notification
Posted by GitBox <gi...@apache.org>.
xiaoxiang781216 commented on code in PR #7207:
URL: https://github.com/apache/incubator-nuttx/pull/7207#discussion_r983739611
##########
include/sys/poll.h:
##########
@@ -117,7 +122,8 @@ struct pollfd
/* Non-standard fields used internally by NuttX. */
FAR void *ptr; /* The psock or file being polled */
- FAR sem_t *sem; /* Pointer to semaphore used to post output event */
+ FAR void *args; /* The poll callback function arguments */
Review Comment:
args->arg
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] pkarashchenko commented on a diff in pull request #7207: fs/poll: using callback mechanism to implement poll notification
Posted by GitBox <gi...@apache.org>.
pkarashchenko commented on code in PR #7207:
URL: https://github.com/apache/incubator-nuttx/pull/7207#discussion_r985109444
##########
include/sys/poll.h:
##########
@@ -117,7 +122,8 @@ struct pollfd
/* Non-standard fields used internally by NuttX. */
FAR void *ptr; /* The psock or file being polled */
- FAR sem_t *sem; /* Pointer to semaphore used to post output event */
+ FAR void *args; /* The poll callback function arguments */
+ FAR pollcb_t cb; /* The poll callback function */
Review Comment:
```suggestion
pollcb_t cb; /* The poll callback function */
```
##########
fs/vfs/fs_poll.c:
##########
@@ -277,6 +279,37 @@ static inline int poll_teardown(FAR struct pollfd *fds, nfds_t nfds,
* Public Functions
****************************************************************************/
+/****************************************************************************
+ * Name: poll_default_cb
+ *
+ * Description:
+ * The default poll callback function, this function do the final step of
+ * poll notification.
+ *
+ * Input Parameters:
+ * fds - The fds
+ *
+ * Returned Value:
+ * None
+ *
+ ****************************************************************************/
+
+void poll_default_cb(FAR struct pollfd *fds)
+{
+ int semcount = 0;
+ FAR sem_t *pollsem;
Review Comment:
Optionally. This can be moved inside `if (fds->args != NULL)`
##########
fs/vfs/fs_poll.c:
##########
@@ -317,15 +349,10 @@ void poll_notify(FAR struct pollfd **afds, int nfds, pollevent_t eventset)
fds->revents &= ~POLLOUT;
}
- if (fds->revents != 0)
+ if (fds->revents != 0 && fds->cb)
Review Comment:
Optional
```suggestion
if (fds->revents != 0 && fds->cb != NULL)
```
##########
fs/vfs/fs_poll.c:
##########
@@ -277,6 +279,37 @@ static inline int poll_teardown(FAR struct pollfd *fds, nfds_t nfds,
* Public Functions
****************************************************************************/
+/****************************************************************************
+ * Name: poll_default_cb
+ *
+ * Description:
+ * The default poll callback function, this function do the final step of
+ * poll notification.
+ *
+ * Input Parameters:
+ * fds - The fds
+ *
+ * Returned Value:
+ * None
+ *
+ ****************************************************************************/
+
+void poll_default_cb(FAR struct pollfd *fds)
+{
+ int semcount = 0;
+ FAR sem_t *pollsem;
+
+ if (fds->args != NULL)
+ {
+ pollsem = (FAR sem_t *)fds->args;
Review Comment:
```suggestion
pollsem = fds->args;
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org