On Thu, Oct 31, 2013 at 10:49 AM, Sebastian Huber <sebastian.hu...@embedded-brains.de> wrote: > This handler is necessary to implement the SELECT(2) and POLL(2) system > calls. > > Add <sys/poll.h> from FreeBSD 8.3. > --- > cpukit/Makefile.am | 1 + > cpukit/libcsupport/include/rtems/libio.h | 28 ++++++++ > cpukit/libcsupport/include/sys/poll.h | 104 > ++++++++++++++++++++++++++++++ > cpukit/libfs/Makefile.am | 1 + > cpukit/libfs/src/defaults/default_poll.c | 37 +++++++++++ > cpukit/preinstall.am | 4 + > 6 files changed, 175 insertions(+), 0 deletions(-) > create mode 100644 cpukit/libcsupport/include/sys/poll.h > create mode 100644 cpukit/libfs/src/defaults/default_poll.c > > diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am > index f22de41..443ed35 100644 > --- a/cpukit/Makefile.am > +++ b/cpukit/Makefile.am > @@ -52,6 +52,7 @@ include_HEADERS += libmd/md5.h > include_sys_HEADERS += libcsupport/include/sys/ioccom.h > include_sys_HEADERS += libcsupport/include/sys/filio.h > include_sys_HEADERS += libcsupport/include/sys/ioctl.h > +include_sys_HEADERS += libcsupport/include/sys/poll.h > include_sys_HEADERS += libcsupport/include/sys/statvfs.h > include_sys_HEADERS += libcsupport/include/sys/sockio.h > include_sys_HEADERS += libcsupport/include/sys/ttycom.h > diff --git a/cpukit/libcsupport/include/rtems/libio.h > b/cpukit/libcsupport/include/rtems/libio.h > index aa64ff3..a642062 100644 > --- a/cpukit/libcsupport/include/rtems/libio.h > +++ b/cpukit/libcsupport/include/rtems/libio.h > @@ -943,6 +943,21 @@ typedef int (*rtems_filesystem_fcntl_t)( > ); > > /** > + * @brief Poll and select support. > + * > + * @param[in, out] iop The IO pointer. > + * @param[in] events The poll events. > + * > + * @return The poll return events. > + * > + * @see rtems_filesystem_default_poll(). > + */ > +typedef int (*rtems_filesystem_poll_t)( > + rtems_libio_t *iop, > + int events > +); > + > +/** > * @brief File system node operations table. > */ > struct _rtems_filesystem_file_handlers_r { > @@ -957,6 +972,7 @@ struct _rtems_filesystem_file_handlers_r { > rtems_filesystem_fsync_t fsync_h; > rtems_filesystem_fdatasync_t fdatasync_h; > rtems_filesystem_fcntl_t fcntl_h; > + rtems_filesystem_poll_t poll_h; > }; > > /** > @@ -1130,6 +1146,18 @@ int rtems_filesystem_default_fcntl( > int cmd > ); > > +/** > + * @brief Default poll handler. > + * > + * @retval POLLERR Always. > + * > + * @see rtems_filesystem_poll_t. > + */ > +int rtems_filesystem_default_poll( > + rtems_libio_t *iop, > + int events > +); > + > /** @} */ > > /** > diff --git a/cpukit/libcsupport/include/sys/poll.h > b/cpukit/libcsupport/include/sys/poll.h > new file mode 100644 > index 0000000..c955f32 > --- /dev/null > +++ b/cpukit/libcsupport/include/sys/poll.h > @@ -0,0 +1,104 @@ > +/*- > + * Copyright (c) 1997 Peter Wemm <pe...@freebsd.org> > + * All rights reserved. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * 1. Redistributions of source code must retain the above copyright > + * notice, this list of conditions and the following disclaimer. > + * 2. Redistributions in binary form must reproduce the above copyright > + * notice, this list of conditions and the following disclaimer in the > + * documentation and/or other materials provided with the distribution. > + * 3. The name of the author may not be used to endorse or promote products > + * derived from this software without specific prior written permission. > + * > + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND > + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE > + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE > + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL > + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS > + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT > + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY > + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > + * SUCH DAMAGE. > + * > + * $FreeBSD$ Should we include the checkout version information for future reference? I don't know if we have taken any approach to this yet for other freebsd included files.
I assume this file is verbatim from the freebsd source? > + */ > + > +#ifndef _SYS_POLL_H_ > +#define _SYS_POLL_H_ > + > +#include <sys/cdefs.h> > + > +/* > + * This file is intended to be compatible with the traditional poll.h. > + */ > + > +typedef unsigned int nfds_t; > + > +/* > + * This structure is passed as an array to poll(2). > + */ > +struct pollfd { > + int fd; /* which file descriptor to poll */ > + short events; /* events we are interested in */ > + short revents; /* events found on return */ > +}; > + > +/* > + * Requestable events. If poll(2) finds any of these set, they are > + * copied to revents on return. > + * XXX Note that FreeBSD doesn't make much distinction between POLLPRI > + * and POLLRDBAND since none of the file types have distinct priority > + * bands - and only some have an urgent "mode". > + * XXX Note POLLIN isn't really supported in true SVSV terms. Under SYSV > + * POLLIN includes all of normal, band and urgent data. Most poll handlers > + * on FreeBSD only treat it as "normal" data. > + */ > +#define POLLIN 0x0001 /* any readable data > available */ > +#define POLLPRI 0x0002 /* OOB/Urgent readable data */ > +#define POLLOUT 0x0004 /* file descriptor is > writeable */ > +#define POLLRDNORM 0x0040 /* non-OOB/URG data available > */ > +#define POLLWRNORM POLLOUT /* no write type > differentiation */ > +#define POLLRDBAND 0x0080 /* OOB/Urgent readable data */ > +#define POLLWRBAND 0x0100 /* OOB/Urgent data can be > written */ > + > +#if __BSD_VISIBLE > +/* General FreeBSD extension (currently only supported for sockets): */ > +#define POLLINIGNEOF 0x2000 /* like POLLIN, except ignore > EOF */ > +#endif > + > +/* > + * These events are set if they occur regardless of whether they were > + * requested. > + */ > +#define POLLERR 0x0008 /* some poll error occurred */ > +#define POLLHUP 0x0010 /* file descriptor was "hung > up" */ > +#define POLLNVAL 0x0020 /* requested events "invalid" > */ > + > +#if __BSD_VISIBLE > + > +#define POLLSTANDARD > (POLLIN|POLLPRI|POLLOUT|POLLRDNORM|POLLRDBAND|\ > + POLLWRBAND|POLLERR|POLLHUP|POLLNVAL) > + > +/* > + * Request that poll() wait forever. > + * XXX in SYSV, this is defined in stropts.h, which is not included > + * by poll.h. > + */ > +#define INFTIM (-1) > + > +#endif > + > +#ifndef _KERNEL > + > +__BEGIN_DECLS > +int poll(struct pollfd _pfd[], nfds_t _nfds, int _timeout); > +__END_DECLS > + > +#endif /* !_KERNEL */ > + > +#endif /* !_SYS_POLL_H_ */ > diff --git a/cpukit/libfs/Makefile.am b/cpukit/libfs/Makefile.am > index c9f14b5..b8496d5 100644 > --- a/cpukit/libfs/Makefile.am > +++ b/cpukit/libfs/Makefile.am > @@ -33,6 +33,7 @@ libdefaultfs_a_SOURCES = \ > src/defaults/default_node_type.c \ > src/defaults/default_ftruncate_directory.c \ > src/defaults/default_handlers.c src/defaults/default_ops.c > +libdefaultfs_a_SOURCES += src/defaults/default_poll.c > > noinst_LIBRARIES += libimfs.a > libimfs_a_SOURCES = > diff --git a/cpukit/libfs/src/defaults/default_poll.c > b/cpukit/libfs/src/defaults/default_poll.c > new file mode 100644 > index 0000000..7540390 > --- /dev/null > +++ b/cpukit/libfs/src/defaults/default_poll.c > @@ -0,0 +1,37 @@ > +/** > + * @file > + * > + * @brief Default Poll Handler > + * > + * @ingroup LibIOFSHandler > + */ > + > +/* > + * Copyright (c) 2013 embedded brains GmbH. All rights reserved. > + * > + * embedded brains GmbH > + * Dornierstr. 4 > + * 82178 Puchheim > + * Germany > + * <rt...@embedded-brains.de> > + * > + * The license and distribution terms for this file may be > + * found in the file LICENSE in this distribution or at > + * http://www.rtems.com/license/LICENSE. > + */ > + > +#if HAVE_CONFIG_H > + #include "config.h" > +#endif > + > +#include <rtems/libio_.h> > + > +#include <sys/poll.h> > + > +int rtems_filesystem_default_poll( > + rtems_libio_t *iop, > + int events > +) > +{ > + return POLLERR; > +} > diff --git a/cpukit/preinstall.am b/cpukit/preinstall.am > index 315ab3e..bdcc359 100644 > --- a/cpukit/preinstall.am > +++ b/cpukit/preinstall.am > @@ -76,6 +76,10 @@ $(PROJECT_INCLUDE)/sys/ioctl.h: > libcsupport/include/sys/ioctl.h $(PROJECT_INCLUD > $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/ioctl.h > PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/ioctl.h > > +$(PROJECT_INCLUDE)/sys/poll.h: libcsupport/include/sys/poll.h > $(PROJECT_INCLUDE)/sys/$(dirstamp) > + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/poll.h > +PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/poll.h > + > $(PROJECT_INCLUDE)/sys/statvfs.h: libcsupport/include/sys/statvfs.h > $(PROJECT_INCLUDE)/sys/$(dirstamp) > $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/statvfs.h > PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/statvfs.h > -- > 1.7.7 > > _______________________________________________ > rtems-devel mailing list > rtems-devel@rtems.org > http://www.rtems.org/mailman/listinfo/rtems-devel _______________________________________________ rtems-devel mailing list rtems-devel@rtems.org http://www.rtems.org/mailman/listinfo/rtems-devel