mini-os: implement poll(2)
PATCH 1/1 mini-os: implement poll(2)
It is just a wrapper around select(2).
--- extras/mini-os/include/posix/poll.h | 1 + extras/mini-os/lib/sys.c | 90 ++++++++++++++++++++++++++++++++++- 2 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 extras/mini-os/include/posix/poll.h
extras/mini-os/include/posix/poll.h new file +1 -0
@@ -0,0 +1 @@ +#include <sys/poll.h>
extras/mini-os/lib/sys.c +89 -1
114 lines not on this page · raw message
Signature · 1 line
1.7.10.4
Quoted 66 lines · Wei Liu
It is just a wrapper around select(2).
Signed-off-by Wei Liu <[email protected]>--- extras/mini-os/include/posix/poll.h | 1 + extras/mini-os/lib/sys.c | 90 ++++++++++++++++++++++++++++++++++- 2 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 extras/mini-os/include/posix/poll.hextras/mini-os/include/posix/poll.h new file +1
-0@@ -0,0 +1 @@ +#include <sys/poll.h> extras/mini-os/lib/sys.c +28
-0@@ -31,6 +31,7 @@#include <tpm_tis.h> #include <xenbus.h> #include <xenstore.h> +#include <poll.h> #include <sys/types.h> #include <sys/unistd.h> @@ -678,6 +679,29 @@ static void dump_set(int nfds, fd_set *readfds, fd_set *writefds, fd_set *except#define dump_set (nfds, readfds, writefds, exceptfds, timeout)#endif +#ifdef LIBC_DEBUG +static void dump_pollfds (struct pollfd *pfd,int nfds,int timeout) +{ +int i, comma, fd; + +printk ("[" ); + comma =0 ; +for (i =0 ; i < nfds; i++) { + fd = pfd[i].fd; +if (comma) +printk (", " ); +printk ("%d(%c)/%02x" , fd, file_types[files[fd].type], + pfd[i].events); + comma =1 ; + } +printk ("]" ); + +printk (", %d, %d" , nfds, timeout); +} +#else +#define dump_pollfds (pfds, nfds, timeout) +#endif +/* Just poll without blocking */ static int select_poll (int nfds,fd_set *readfds,fd_set *writefds,fd_set *exceptfds) {@@ -983,6 +1007,71 @@ out:return ret; } +/* Wrap around select */ +int poll (struct pollfd _pfd[],nfds_t _nfds,int _timeout) +{ +int ret;
extras/mini-os/lib/sys.c out: · line 1023
Quoted 10 lines
extras/mini-os/lib/sys.c +10
-0+int i, fd; +struct timeval _timeo, *timeo =NULL ; +fd_set rfds, wfds, efds; +int max_fd =-1 ; + +DEBUG ("poll(" ); +dump_pollfds (_pfd, _nfds, _timeout); +DEBUG (")\n" ); + +if (_timeout !=-1 ) {
should be _timeout >= 0, any negative value will cause an infinite wait.
extras/mini-os/lib/sys.c out: · line 1026
Quoted 3 lines
extras/mini-os/lib/sys.c +3
-0+/* Timeout in poll is in millisecond. */ + _timeo.tv_sec = _timeout /1000 ; + _timeo.tv_usec = (_timeout - _timeo.tv_sec *1000 ) *1000 ;
why not _timeout % 1000? gcc can also optimize and detect you have a division and a module and use only a single instruction in x86.
extras/mini-os/lib/sys.c out: · line 1035
Quoted 9 lines
extras/mini-os/lib/sys.c +9
-0+ timeo = &_timeo; + } + +FD_ZERO (&rfds); +FD_ZERO (&wfds); +FD_ZERO (&efds); + +for (i =0 ; i < _nfds; i++) { + fd = _pfd[i].fd;
I think you should check if fd is < 0 and return EINVAL (not sure about the error code). Well.. probably you should check fd in range 0..1023.
Quoted 26 lines
extras/mini-os/lib/sys.c +26
-0+/* map POLL* into readfds and writefds */ +/* POLLIN -> readfds +* POLLOUT -> writefds +* POLL* -> none +*/ +if (_pfd[i].events &POLLIN ) +FD_SET (fd, &rfds); +if (_pfd[i].events &POLLOUT ) +FD_SET (fd, &wfds); +/* always set exceptfds */ +FD_SET (fd, &efds); + _pfd[i].revents =0 ; +if (fd > max_fd) + max_fd = fd; + } + + ret =select (max_fd+1 , &rfds, &wfds, &efds, timeo); + +for (i =0 ; i < _nfds; i++) { + fd = _pfd[i].fd; +if (FD_ISSET (fd, &efds)) { +/* anything bad happens we set POLLERR, ignoring PULLHUP +* POLLNVAL */ + _pfd[i].revents |=POLLERR ; +continue ; + }
extras/mini-os/lib/sys.c out: · line 1071
Quoted 10 lines
extras/mini-os/lib/sys.c +10
-0+if (FD_ISSET (fd, &rfds)) + _pfd[i].revents |=POLLIN ; +if (FD_ISSET (fd, &wfds)) + _pfd[i].revents |=POLLOUT ; + } + +DEBUG ("poll(" ); +dump_pollfds (_pfd, _nfds, _timeout); +DEBUG (")\n" ); +
you probably want to save and restore errno or are we sure dump_pollfds cannot overwrite errno ?
Quoted 7 lines
extras/mini-os/lib/sys.c +3
-0+return ret; +} +#ifdef HAVE_LWIP int socket (int domain,int type,int protocol) {
extras/mini-os/lib/sys.c unsupported_function(int, tcgetattr, 0); · line 1454
Quoted 7 lines
extras/mini-os/lib/sys.c +0
-1@@ -1360,7 +1449,6 @@ unsupported_function(int, tcgetattr, 0);unsupported_function (int, grantpt,-1 );unsupported_function (int, unlockpt,-1 ); unsupported_function(char *, ptsname, NULL); -unsupported_function (int, poll,-1 );/* net/if.h */ unsupported_function_log(unsigned int, if_nametoindex, -1);
Frediano
Quoted 63 lines · Frediano Ziglio
Quoted 62 lines · Wei Liu
It is just a wrapper around select(2).
Signed-off-by Wei Liu <[email protected]>--- extras/mini-os/include/posix/poll.h | 1 + extras/mini-os/lib/sys.c | 90 ++++++++++++++++++++++++++++++++++- 2 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 extras/mini-os/include/posix/poll.hextras/mini-os/include/posix/poll.h new file +1
-0@@ -0,0 +1 @@ +#include <sys/poll.h> extras/mini-os/lib/sys.c +24
-0@@ -31,6 +31,7 @@#include <tpm_tis.h> #include <xenbus.h> #include <xenstore.h> +#include <poll.h> #include <sys/types.h> #include <sys/unistd.h> @@ -678,6 +679,29 @@ static void dump_set(int nfds, fd_set *readfds, fd_set *writefds, fd_set *except#define dump_set (nfds, readfds, writefds, exceptfds, timeout)#endif +#ifdef LIBC_DEBUG +static void dump_pollfds (struct pollfd *pfd,int nfds,int timeout) +{ +int i, comma, fd; + +printk ("[" ); + comma =0 ; +for (i =0 ; i < nfds; i++) { + fd = pfd[i].fd; +if (comma) +printk (", " ); +printk ("%d(%c)/%02x" , fd, file_types[files[fd].type], + pfd[i].events); + comma =1 ; + } +printk ("]" ); + +printk (", %d, %d" , nfds, timeout); +} +#else +#define dump_pollfds (pfds, nfds, timeout) +#endif +/* Just poll without blocking */ static int select_poll (int nfds,fd_set *readfds,fd_set *writefds,fd_set *exceptfds) {@@ -983,6 +1007,71 @@ out:return ret; }
Quoted 17 lines
Quoted 4 lines
extras/mini-os/lib/sys.c +4
-0+/* Wrap around select */ +int poll (struct pollfd _pfd[],nfds_t _nfds,int _timeout) +{ +int ret;extras/mini-os/lib/sys.c out: · line 1023
Quoted 10 lines
extras/mini-os/lib/sys.c +10
-0+int i, fd; +struct timeval _timeo, *timeo =NULL ; +fd_set rfds, wfds, efds; +int max_fd =-1 ; + +DEBUG ("poll(" ); +dump_pollfds (_pfd, _nfds, _timeout); +DEBUG (")\n" ); + +if (_timeout !=-1 ) {should be
_timeout>= 0, any negative value will cause an infinite wait.
Right, I was too obsessed with xenstore code which used -1 to represent infinity loop.
Quoted 7 lines
extras/mini-os/lib/sys.c out: · line 1026
Quoted 3 lines
extras/mini-os/lib/sys.c +3
-0+/* Timeout in poll is in millisecond. */ + _timeo.tv_sec = _timeout /1000 ; + _timeo.tv_usec = (_timeout - _timeo.tv_sec *1000 ) *1000 ;why not
_timeout% 1000? gcc can also optimize and detect you have a division and a module and use only a single instruction in x86.
Done.
Quoted 4 lines
Quoted 4 lines
extras/mini-os/lib/sys.c +4
-0+ timeo = &_timeo; + } + +FD_ZERO (&rfds);
Quoted 9 lines
extras/mini-os/lib/sys.c out: · line 1035
Quoted 5 lines
extras/mini-os/lib/sys.c +5
-0+FD_ZERO (&wfds); +FD_ZERO (&efds); + +for (i =0 ; i < _nfds; i++) { + fd = _pfd[i].fd;I think you should check if fd is < 0 and return EINVAL (not sure about the error code). Well.. probably you should check fd in range 0..1023.
Unfortunately this is not specified in the standard. I guess we can just ignore print a warning and ignore this fd?
http://pubs.opengroup.org/onlinepubs/9699919799/functions/poll.html#tag_16_423
Quoted 9 lines
extras/mini-os/lib/sys.c out: · line 1022
Quoted 5 lines
extras/mini-os/lib/sys.c +5
-0+ +DEBUG ("poll(" ); +dump_pollfds (_pfd, _nfds, _timeout); +DEBUG (")\n" ); +you probably want to save and restore errno or are we sure
dump_pollfdscannot overwrite errno ?
Done.
Wei.
New version of the patch. Address Frediano's comments, also correct the calculation of return value.
Wei.
----8<----
Quoted 1 line
From
4b7dffa7b61ff840a359f7124c76198b7aeed135Mon Sep 17 00:00:00 2001
From: Wei Liu <[email protected]>
Date: Tue, 19 Feb 2013 12:15:03 +0000
Subject: [PATCH] mini-os: implement poll(2)
It is just a wrapper around select(2).
--- extras/mini-os/include/posix/poll.h | 1 + extras/mini-os/lib/sys.c | 101 ++++++++++++++++++++++++++++++++++- 2 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 extras/mini-os/include/posix/poll.h
extras/mini-os/include/posix/poll.h new file +1 -0
@@ -0,0 +1 @@ +#include <sys/poll.h>
extras/mini-os/lib/sys.c +100 -1
125 lines not on this page · raw message
Signature · 1 line
1.7.10.4
Quoted 109 lines · Wei Liu
Quoted 63 lines · Frediano Ziglio
Quoted 62 lines · Wei Liu
It is just a wrapper around select(2).
Signed-off-by Wei Liu <[email protected]>--- extras/mini-os/include/posix/poll.h | 1 + extras/mini-os/lib/sys.c | 90 ++++++++++++++++++++++++++++++++++- 2 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 extras/mini-os/include/posix/poll.hextras/mini-os/include/posix/poll.h new file +1
-0@@ -0,0 +1 @@ +#include <sys/poll.h> extras/mini-os/lib/sys.c +24
-0@@ -31,6 +31,7 @@#include <tpm_tis.h> #include <xenbus.h> #include <xenstore.h> +#include <poll.h> #include <sys/types.h> #include <sys/unistd.h> @@ -678,6 +679,29 @@ static void dump_set(int nfds, fd_set *readfds, fd_set *writefds, fd_set *except#define dump_set (nfds, readfds, writefds, exceptfds, timeout)#endif +#ifdef LIBC_DEBUG +static void dump_pollfds (struct pollfd *pfd,int nfds,int timeout) +{ +int i, comma, fd; + +printk ("[" ); + comma =0 ; +for (i =0 ; i < nfds; i++) { + fd = pfd[i].fd; +if (comma) +printk (", " ); +printk ("%d(%c)/%02x" , fd, file_types[files[fd].type], + pfd[i].events); + comma =1 ; + } +printk ("]" ); + +printk (", %d, %d" , nfds, timeout); +} +#else +#define dump_pollfds (pfds, nfds, timeout) +#endif +/* Just poll without blocking */ static int select_poll (int nfds,fd_set *readfds,fd_set *writefds,fd_set *exceptfds) {@@ -983,6 +1007,71 @@ out:return ret; }Quoted 17 lines
Quoted 4 lines
extras/mini-os/lib/sys.c +4
-0+/* Wrap around select */ +int poll (struct pollfd _pfd[],nfds_t _nfds,int _timeout) +{ +int ret;extras/mini-os/lib/sys.c out: · line 1023
Quoted 10 lines
extras/mini-os/lib/sys.c +10
-0+int i, fd; +struct timeval _timeo, *timeo =NULL ; +fd_set rfds, wfds, efds; +int max_fd =-1 ; + +DEBUG ("poll(" ); +dump_pollfds (_pfd, _nfds, _timeout); +DEBUG (")\n" ); + +if (_timeout !=-1 ) {should be
_timeout>= 0, any negative value will cause an infinite wait.Right, I was too obsessed with xenstore code which used -1 to represent infinity loop.
Quoted 7 lines
extras/mini-os/lib/sys.c out: · line 1026
Quoted 3 lines
extras/mini-os/lib/sys.c +3
-0+/* Timeout in poll is in millisecond. */ + _timeo.tv_sec = _timeout /1000 ; + _timeo.tv_usec = (_timeout - _timeo.tv_sec *1000 ) *1000 ;why not
_timeout% 1000? gcc can also optimize and detect you have a division and a module and use only a single instruction in x86.Done.
Quoted 4 lines
Quoted 4 lines
extras/mini-os/lib/sys.c +4
-0+ timeo = &_timeo; + } + +FD_ZERO (&rfds);Quoted 9 lines
extras/mini-os/lib/sys.c out: · line 1035
Quoted 5 lines
extras/mini-os/lib/sys.c +5
-0+FD_ZERO (&wfds); +FD_ZERO (&efds); + +for (i =0 ; i < _nfds; i++) { + fd = _pfd[i].fd;I think you should check if fd is < 0 and return EINVAL (not sure about the error code). Well.. probably you should check fd in range 0..1023.
Quoted 5 lines
Unfortunately this is not specified in the standard. I guess we can just ignore print a warning and ignore this fd?
http://pubs.opengroup.org/onlinepubs/9699919799/functions/poll.html#tag_16_423
Yes, it speaks only of STREAM (I don't know what's in this context).
I tried what happen on Linux. For values < 0 if just ignore the record. Oh... from page you send
"If the value of fd is less than 0, events shall be ignored, and revents shall be set to 0 in that entry on return from poll()."
For values that are not open if return POLLNVAL in revents.
Perhaps should be something like
ret = 0;
for (i = 0; i < _nfds; i++) {
fd = _pfd[i].fd;
_pfd[i].revents = 0;
if (fd < 0) continue;
if (fd >= 1024) {
_pfd[i].revents = POLLNVAL;
++ret;
continue;
}
/* map POLL* into readfds and writefds */
/* POLLIN -> readfds
* POLLOUT -> writefds
* POLL* -> none
*/
if (_pfd[i].events & POLLIN)
FD_SET(fd, &rfds);
if (_pfd[i].events & POLLOUT)
FD_SET(fd, &wfds);
/* always set exceptfds */
FD_SET(fd, &efds);
if (fd > max_fd)
max_fd = fd;
}
if (ret) return ret;Quoted 16 lines
Quoted 9 lines
extras/mini-os/lib/sys.c out: · line 1022
Quoted 5 lines
extras/mini-os/lib/sys.c +5
-0+ +DEBUG ("poll(" ); +dump_pollfds (_pfd, _nfds, _timeout); +DEBUG (")\n" ); +you probably want to save and restore errno or are we sure
dump_pollfdscannot overwrite errno ?Done.
Wei.
Quoted 116 lines · Frediano Ziglio
Quoted 109 lines · Wei Liu
Quoted 63 lines · Frediano Ziglio
Quoted 62 lines · Wei Liu
It is just a wrapper around select(2).
Signed-off-by Wei Liu <[email protected]>--- extras/mini-os/include/posix/poll.h | 1 + extras/mini-os/lib/sys.c | 90 ++++++++++++++++++++++++++++++++++- 2 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 extras/mini-os/include/posix/poll.hextras/mini-os/include/posix/poll.h new file +1
-0@@ -0,0 +1 @@ +#include <sys/poll.h> extras/mini-os/lib/sys.c +24
-0@@ -31,6 +31,7 @@#include <tpm_tis.h> #include <xenbus.h> #include <xenstore.h> +#include <poll.h> #include <sys/types.h> #include <sys/unistd.h> @@ -678,6 +679,29 @@ static void dump_set(int nfds, fd_set *readfds, fd_set *writefds, fd_set *except#define dump_set (nfds, readfds, writefds, exceptfds, timeout)#endif +#ifdef LIBC_DEBUG +static void dump_pollfds (struct pollfd *pfd,int nfds,int timeout) +{ +int i, comma, fd; + +printk ("[" ); + comma =0 ; +for (i =0 ; i < nfds; i++) { + fd = pfd[i].fd; +if (comma) +printk (", " ); +printk ("%d(%c)/%02x" , fd, file_types[files[fd].type], + pfd[i].events); + comma =1 ; + } +printk ("]" ); + +printk (", %d, %d" , nfds, timeout); +} +#else +#define dump_pollfds (pfds, nfds, timeout) +#endif +/* Just poll without blocking */ static int select_poll (int nfds,fd_set *readfds,fd_set *writefds,fd_set *exceptfds) {@@ -983,6 +1007,71 @@ out:return ret; }Quoted 17 lines
Quoted 4 lines
extras/mini-os/lib/sys.c +4
-0+/* Wrap around select */ +int poll (struct pollfd _pfd[],nfds_t _nfds,int _timeout) +{ +int ret;extras/mini-os/lib/sys.c out: · line 1023
Quoted 10 lines
extras/mini-os/lib/sys.c +10
-0+int i, fd; +struct timeval _timeo, *timeo =NULL ; +fd_set rfds, wfds, efds; +int max_fd =-1 ; + +DEBUG ("poll(" ); +dump_pollfds (_pfd, _nfds, _timeout); +DEBUG (")\n" ); + +if (_timeout !=-1 ) {should be
_timeout>= 0, any negative value will cause an infinite wait.Right, I was too obsessed with xenstore code which used -1 to represent infinity loop.
Quoted 7 lines
extras/mini-os/lib/sys.c out: · line 1026
Quoted 3 lines
extras/mini-os/lib/sys.c +3
-0+/* Timeout in poll is in millisecond. */ + _timeo.tv_sec = _timeout /1000 ; + _timeo.tv_usec = (_timeout - _timeo.tv_sec *1000 ) *1000 ;why not
_timeout% 1000? gcc can also optimize and detect you have a division and a module and use only a single instruction in x86.Done.
Quoted 4 lines
Quoted 4 lines
extras/mini-os/lib/sys.c +4
-0+ timeo = &_timeo; + } + +FD_ZERO (&rfds);Quoted 9 lines
extras/mini-os/lib/sys.c out: · line 1035
Quoted 5 lines
extras/mini-os/lib/sys.c +5
-0+FD_ZERO (&wfds); +FD_ZERO (&efds); + +for (i =0 ; i < _nfds; i++) { + fd = _pfd[i].fd;I think you should check if fd is < 0 and return EINVAL (not sure about the error code). Well.. probably you should check fd in range 0..1023.
Quoted 5 lines
Unfortunately this is not specified in the standard. I guess we can just ignore print a warning and ignore this fd?
http://pubs.opengroup.org/onlinepubs/9699919799/functions/poll.html#tag_16_423
Quoted 8 lines
Yes, it speaks only of STREAM (I don't know what's in this context).
I tried what happen on Linux. For values < 0 if just ignore the record. Oh... from page you send
"If the value of fd is less than 0, events shall be ignored, and revents shall be set to 0 in that entry on return from
poll()."
Ah, so it is in the description, good.
Quoted 4 lines
For values that are not open if return POLLNVAL in revents.
Perhaps should be something like
Quoted 10 lines
ret = 0;
for (i = 0; i < _nfds; i++) {
fd = _pfd[i].fd;
_pfd[i].revents = 0;
if (fd < 0) continue;
if (fd >= 1024) {
_pfd[i].revents = POLLNVAL;
++ret;
continue;I would go for fd >= NOFILE here (NOFILE is the internal limit of Mini-OS file abstraction).
Wei.
V3 of the patch.
Validate fds before passing it to select. Deal with invalid fds according to spec.
If fd < 0, revents = 0; if fd >= NOFILE, revents = POLLNVAL.
Wei.
---8<---
Quoted 1 line
From
ad953f1e35ecee08b37215ebc9d6196edd744128Mon Sep 17 00:00:00 2001
From: Wei Liu <[email protected]>
Date: Tue, 19 Feb 2013 12:15:03 +0000
Subject: [PATCH] mini-os: implement poll(2)
It is just a wrapper around select(2).
--- extras/mini-os/include/posix/poll.h | 1 + extras/mini-os/lib/sys.c | 109 ++++++++++++++++++++++++++++++++++- 2 files changed, 109 insertions(+), 1 deletion(-) create mode 100644 extras/mini-os/include/posix/poll.h
extras/mini-os/include/posix/poll.h new file +1 -0
@@ -0,0 +1 @@ +#include <sys/poll.h>
extras/mini-os/lib/sys.c +108 -1
133 lines not on this page · raw message
Signature · 1 line
1.7.10.4
Quoted 1 line · Wei Liu, le Tue 19 Feb 2013 15:54:13 +0000, a écrit :
if fd >= NOFILE, revents = POLLNVAL.
"invalid" is also "not opened". You should additionally test that files[i].type != FTYPE_NONE.
Samuel
V4 of the patch
In this version I try to mimic Linux's do_poll behavior. The pollfd array is always scanned, even if some fds in the middle of the loops are invalid. In this case we need to do no-blocking select regardless of timeout, because we already receive events.
I tried to document the behavior as much as possible, please see comments in code.
Wei.
----8<---
Quoted 1 line
From
39789af96d9e5a6d4f3d8a9e86546b62918c30dfMon Sep 17 00:00:00 2001
From: Wei Liu <[email protected]>
Date: Tue, 19 Feb 2013 12:15:03 +0000
Subject: [PATCH] mini-os: implement poll(2)
It is just a wrapper around select(2).
--- extras/mini-os/include/posix/poll.h | 1 + extras/mini-os/lib/sys.c | 117 ++++++++++++++++++++++++++++++++++- 2 files changed, 117 insertions(+), 1 deletion(-) create mode 100644 extras/mini-os/include/posix/poll.h
extras/mini-os/include/posix/poll.h new file +1 -0
@@ -0,0 +1 @@ +#include <sys/poll.h>
extras/mini-os/lib/sys.c +116 -1
141 lines not on this page · raw message
Signature · 1 line
1.7.10.4
Samuel Thibault
Acked-byQuoted 19 lines · Wei Liu, le Tue 19 Feb 2013 18:36:16 +0000, a écrit :
V4 of the patch
In this version I try to mimic Linux's
do_pollbehavior. The pollfd array is always scanned, even if some fds in the middle of the loops are invalid. In this case we need to do no-blocking select regardless of timeout, because we already receive events.I tried to document the behavior as much as possible, please see comments in code.
Wei.
----8<---
From39789af96d9e5a6d4f3d8a9e86546b62918c30dfMon Sep 17 00:00:00 2001
From: Wei Liu <[email protected]>
Date: Tue, 19 Feb 2013 12:15:03 +0000
Subject: [PATCH] mini-os: implement poll(2)
Quoted 3 lines
It is just a wrapper around select(2).
Signed-off-by Wei Liu <[email protected]>
Quoted 173 lines
--- extras/mini-os/include/posix/poll.h | 1 + extras/mini-os/lib/sys.c | 117 ++++++++++++++++++++++++++++++++++- 2 files changed, 117 insertions(+), 1 deletion(-) create mode 100644 extras/mini-os/include/posix/poll.hextras/mini-os/include/posix/poll.h new file +1
-0@@ -0,0 +1 @@ +#include <sys/poll.h> extras/mini-os/lib/sys.c +116
-1@@ -31,6 +31,7 @@#include <tpm_tis.h> #include <xenbus.h> #include <xenstore.h> +#include <poll.h> #include <sys/types.h> #include <sys/unistd.h> @@ -678,6 +679,29 @@ static void dump_set(int nfds, fd_set *readfds, fd_set *writefds, fd_set *except#define dump_set (nfds, readfds, writefds, exceptfds, timeout)#endif +#ifdef LIBC_DEBUG +static void dump_pollfds (struct pollfd *pfd,int nfds,int timeout) +{ +int i, comma, fd; + +printk ("[" ); + comma =0 ; +for (i =0 ; i < nfds; i++) { + fd = pfd[i].fd; +if (comma) +printk (", " ); +printk ("%d(%c)/%02x" , fd, file_types[files[fd].type], + pfd[i].events); + comma =1 ; + } +printk ("]" ); + +printk (", %d, %d" , nfds, timeout); +} +#else +#define dump_pollfds (pfds, nfds, timeout) +#endif +/* Just poll without blocking */ static int select_poll (int nfds,fd_set *readfds,fd_set *writefds,fd_set *exceptfds) {@@ -983,6 +1007,98 @@ out:return ret; } +/* Wrap around select */ +int poll (struct pollfd _pfd[],nfds_t _nfds,int _timeout) +{ +int n, ret; +int i, fd; +struct timeval _timeo, *timeo =NULL ; +fd_set rfds, wfds, efds; +int max_fd =-1 ; + +DEBUG ("poll(" ); +dump_pollfds (_pfd, _nfds, _timeout); +DEBUG (")\n" ); + +FD_ZERO (&rfds); +FD_ZERO (&wfds); +FD_ZERO (&efds); + + n =0 ; + +for (i =0 ; i < _nfds; i++) { + fd = _pfd[i].fd; + _pfd[i].revents =0 ; + +/* fd < 0, revents = 0, which is already set */ +if (fd <0 )continue ; + +/* fd is invalid, revents = POLLNVAL, increment counter */ +if (fd >=NOFILE || files[fd].type ==FTYPE_NONE ) { + n++; + _pfd[i].revents |=POLLNVAL ; +continue ; + } + +/* normal case, map POLL* into readfds and writefds: +* POLLIN -> readfds +* POLLOUT -> writefds +* POLL* -> none +*/ +if (_pfd[i].events &POLLIN ) +FD_SET (fd, &rfds); +if (_pfd[i].events &POLLOUT ) +FD_SET (fd, &wfds); +/* always set exceptfds */ +FD_SET (fd, &efds); +if (fd > max_fd) + max_fd = fd; + } + +/* should never sleep when we already have events */ +if (n) { + _timeo.tv_sec =0 ; + _timeo.tv_usec =0 ; + timeo = &_timeo; + }else if (_timeout >=0 ) { +/* normal case, construct _timeout, might sleep */ + _timeo.tv_sec = _timeout /1000 ; + _timeo.tv_usec = (_timeout %1000 ) *1000 ; + timeo = &_timeo; + }else { +/* _timeout < 0, block forever */ + timeo =NULL ; + } + + + ret =select (max_fd+1 , &rfds, &wfds, &efds, timeo); +/* error in select, just return, errno is set by select() */ +if (ret <0 ) +return ret; + +for (i =0 ; i < _nfds; i++) { + fd = _pfd[i].fd; + +/* the revents has already been set for all error case */ +if (fd <0 || fd >=NOFILE || files[fd].type ==FTYPE_NONE ) +continue ; + +if (FD_ISSET (fd, &rfds) ||FD_ISSET (fd, &wfds) ||FD_ISSET (fd, &efds)) + n++; +if (FD_ISSET (fd, &efds)) { +/* anything bad happens we set POLLERR */ + _pfd[i].revents |=POLLERR ; +continue ; + } +if (FD_ISSET (fd, &rfds)) + _pfd[i].revents |=POLLIN ; +if (FD_ISSET (fd, &wfds)) + _pfd[i].revents |=POLLOUT ; + } + +return n; +} +#ifdef HAVE_LWIP int socket (int domain,int type,int protocol) {@@ -1360,7 +1476,6 @@ unsupported_function(int, tcgetattr, 0);unsupported_function (int, grantpt,-1 );unsupported_function (int, unlockpt,-1 ); unsupported_function(char *, ptsname, NULL); -unsupported_function (int, poll,-1 );/* net/if.h */ unsupported_function_log(unsigned int, if_nametoindex, -1);Signature · 9 lines
1.7.10.4 _______________________________________________ Xen-devel mailing list [email protected] http://lists.xen.org/xen-devel
Signature · 3 lines
Samuel <s> on se croirait en cool : Some browsers close comments on the first ">" character, so to hide script content from such browsers, you can transpose operands for relational and shift operators (e.g., use "y < x" rather than "x > y") or use scripting language-dependent escapes for ">". -+- #ens-mim -+-
Also, checking for files[i].type should be done on entry to the function, not after having waited for some time (and perhaps opened some file descriptor, etc.). I.e.:
extras/mini-os/lib/sys.c out: · line 1041
Quoted 3 lines · Wei Liu, le Tue 19 Feb 2013 15:54:13 +0000, a écrit :
extras/mini-os/lib/sys.c +3
-0+/* ignore invalid fds */ +if (fd <0 || fd >=NOFILE ) +continue ;
record POLLNVAL as soon as here, and ignore that fd later on.
extras/mini-os/lib/sys.c out: · line 1059
Quoted 2 lines
extras/mini-os/lib/sys.c +2
-0+/* don't care about the return value, but we do need errno */ +select (max_fd+1 , &rfds, &wfds, &efds, timeo);
Mmm. I don't think we don't care about the return value: if select returns -1 with EINTR, poll has to do the same. That's however probably the only case we have to take care of.
Samuel
Quoted 11 lines · Samuel Thibault
Also, checking for files[i].type should be done on entry to the function, not after having waited for some time (and perhaps opened some file descriptor, etc.). I.e.:
extras/mini-os/lib/sys.c out: · line 1041
Quoted 3 lines · Wei Liu, le Tue 19 Feb 2013 15:54:13 +0000, a écrit :
extras/mini-os/lib/sys.c +3
-0+/* ignore invalid fds */ +if (fd <0 || fd >=NOFILE ) +continue ;record POLLNVAL as soon as here, and ignore that fd later on.
If you detect the handle is invalid you should not wait in select or set the timeout to 0. poll should return as soon at it receive an event. In this case getting POLLNVAL is an event. I don't know if you have to test all handles in this case or just return the number of fds that got set to POLLNVAL.
Quoted 7 lines
extras/mini-os/lib/sys.c out: · line 1059
Quoted 2 lines
extras/mini-os/lib/sys.c +2
-0+/* don't care about the return value, but we do need errno */ +select (max_fd+1 , &rfds, &wfds, &efds, timeo);Mmm. I don't think we don't care about the return value: if select returns -1 with EINTR, poll has to do the same. That's however probably the only case we have to take care of.
if you get an error you can't consider valid the sets, from Linux man page (select(2)):
"On error, -1 is returned, and errno is set appropriately; the sets and timeout become undefined, so do not rely on their contents after an error."
Quoted 1 line
Samuel
Frediano
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel
Quoted 10 lines · Frediano Ziglio
Quoted 9 lines · Samuel Thibault
Also, checking for files[i].type should be done on entry to the function, not after having waited for some time (and perhaps opened some file descriptor, etc.). I.e.:
Quoted 3 lines · Wei Liu, le Tue 19 Feb 2013 15:54:13 +0000, a écrit :
extras/mini-os/lib/sys.c +3
-0+/* ignore invalid fds */ +if (fd <0 || fd >=NOFILE ) +continue ;
Quoted 9 lines
Quoted 2 lines
record POLLNVAL as soon as here, and ignore that fd later on.
If you detect the handle is invalid you should not wait in select or set the timeout to 0. poll should return as soon at it receive an event. In this case getting POLLNVAL is an event. I don't know if you have to test all handles in this case or just return the number of fds that got set to POLLNVAL.
In Linux's do_poll() implementation, the whole poll array is scanned, even if some fds in the middle of the loop are not valid.
Wei.
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel
Quoted 10 lines · Frediano Ziglio, le Tue 19 Feb 2013 17:22:23 +0000, a écrit :
Quoted 9 lines · Samuel Thibault
Also, checking for files[i].type should be done on entry to the function, not after having waited for some time (and perhaps opened some file descriptor, etc.). I.e.:
Quoted 3 lines · Wei Liu, le Tue 19 Feb 2013 15:54:13 +0000, a écrit :
extras/mini-os/lib/sys.c +3
-0+/* ignore invalid fds */ +if (fd <0 || fd >=NOFILE ) +continue ;
Quoted 8 lines
Quoted 2 lines
record POLLNVAL as soon as here, and ignore that fd later on.
If you detect the handle is invalid you should not wait in select or set the timeout to 0. poll should return as soon at it receive an event. In this case getting POLLNVAL is an event. I don't know if you have to test all handles in this case or just return the number of fds that got set to POLLNVAL.
I believe you have to test all handles.
Quoted 7 lines
Quoted 6 lines
extras/mini-os/lib/sys.c out: · line 1059
Quoted 2 lines
extras/mini-os/lib/sys.c +2
-0+/* don't care about the return value, but we do need errno */ +select (max_fd+1 , &rfds, &wfds, &efds, timeo);Mmm. I don't think we don't care about the return value: if select returns -1 with EINTR, poll has to do the same. That's however probably the only case we have to take care of.
Quoted 6 lines
if you get an error you can't consider valid the sets, from Linux man page (select(2)):
"On error, -1 is returned, and errno is set appropriately; the sets and timeout become undefined, so do not rely on their contents after an error."
Yes, sure, but we know what our select() does :)
Samuel