diff --git a/ChangeLog b/ChangeLog index 5696dd3a90..7e92de8a31 100755 --- a/ChangeLog +++ b/ChangeLog @@ -10798,4 +10798,6 @@ driver has a lot of missing logic on initial commit (2015-08-09). * arch/arm/src/samv7: Basic, no-DMA SPI slave driver is in place (2015-080=-10). - + * fs/vfs/epoll.c and include/sys/epoll.h: Add a very simple epoll layer + just around poll calls. To satisfy build app requirements. From Anton + D. Kachalov. diff --git a/arch b/arch index 3f84c8507a..43d20de693 160000 --- a/arch +++ b/arch @@ -1 +1 @@ -Subproject commit 3f84c8507a657e0066b388b21a02537a9a3abab6 +Subproject commit 43d20de693c2be5f98ca0dc23bc5d91b22845f1f diff --git a/fs/vfs/Make.defs b/fs/vfs/Make.defs index 6769e8b12c..4c3fca0258 100644 --- a/fs/vfs/Make.defs +++ b/fs/vfs/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # fs/vfs/Make.defs # -# Copyright (C) 2014 Gregory Nutt. All rights reserved. +# Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -66,9 +66,9 @@ else # Common file/socket descriptor support CSRCS += fs_close.c fs_dup.c fs_dup2.c fs_fcntl.c fs_dupfd.c fs_dupfd2.c -CSRCS += fs_getfilep.c fs_ioctl.c fs_lseek.c fs_mkdir.c fs_open.c fs_poll.c -CSRCS += fs_read.c fs_rename.c fs_rmdir.c fs_stat.c fs_statfs.c fs_select.c -CSRCS += fs_unlink.c fs_write.c epoll.c +CSRCS += fs_epoll.c fs_getfilep.c fs_ioctl.c fs_lseek.c fs_mkdir.c fs_open.c +CSRCS += fs_poll.c fs_read.c fs_rename.c fs_rmdir.c fs_stat.c fs_statfs.c +CSRCS += fs_select.c fs_unlink.c fs_write.c # Certain interfaces are not available if there is no mountpoint support diff --git a/fs/vfs/epoll.c b/fs/vfs/epoll.c deleted file mode 100644 index 9b7bdf2d7e..0000000000 --- a/fs/vfs/epoll.c +++ /dev/null @@ -1,102 +0,0 @@ -#include -#include -#include -#include -#include - -#include - -int epoll_create(int size) -{ - struct epoll_head *eph = malloc(sizeof(struct epoll_head)); - - eph->size = size; - eph->occupied = 0; - eph->evs = malloc(sizeof(struct epoll_event) * eph->size); - - return (int)eph; -} - -void epoll_close(int epfd) -{ - struct epoll_head *eph = (struct epoll_head *)epfd; - - free(eph->evs); - free(eph); -} - -int epoll_ctl(int epfd, int op, int fd, struct epoll_event *ev) -{ - struct epoll_head *eph = (struct epoll_head *)epfd; - - switch (op) - { - case EPOLL_CTL_ADD: - printf("%08x CTL ADD(%d): fd=%d ev=%08x\n", epfd, eph->occupied, fd, ev->events); - eph->evs[eph->occupied].events = ev->events | POLLERR | POLLHUP; - eph->evs[eph->occupied++].data.fd = fd; - return 0; - - case EPOLL_CTL_DEL: - { - int i; - for (i=0; i < eph->occupied; i++) - { - if (eph->evs[i].data.fd == fd) - { - if (i != eph->occupied-1) - memmove(&eph->evs[i], &eph->evs[i + 1], eph->occupied - i); - eph->occupied--; - return 0; - } - } - return -ENOENT; - } - - case EPOLL_CTL_MOD: - { - int i; - printf("%08x CTL MOD(%d): fd=%d ev=%08x\n", epfd, eph->occupied, fd, ev->events); - for (i=0; i < eph->occupied; i++) - { - if (eph->evs[i].data.fd == fd) - { - eph->evs[i].events = ev->events | POLLERR | POLLHUP; - return 0; - } - } - return -ENOENT; - } - } - - return -EINVAL; -} - -int epoll_wait(int epfd, struct epoll_event *evs, int maxevents, int timeout) -{ - int i; - int rc; - struct epoll_head *eph = (struct epoll_head *)epfd; - - rc = poll((struct pollfd *)eph->evs, eph->occupied, timeout); - - if (rc <= 0) - { - if (rc < 0) { - printf("%08x poll fail: %d for %d, %d msecs\n", epfd, rc, eph->occupied, timeout); - for (i=0; i < eph->occupied; i++) - { - printf("%02d: fd=%d\n", i, eph->evs[i].data.fd); - } - } - return rc; - } - - for (i=0; i < rc; i++) - { - evs[i].data.fd = (pollevent_t)eph->evs[i].data.fd; - evs[i].events = (pollevent_t)eph->evs[i].revents; - } - - return rc; -} diff --git a/fs/vfs/fs_epoll.c b/fs/vfs/fs_epoll.c new file mode 100644 index 0000000000..420e066d4c --- /dev/null +++ b/fs/vfs/fs_epoll.c @@ -0,0 +1,211 @@ +/**************************************************************************** + * fs/vfs/fs_epoll.c + * + * Copyright (C) 2015 Anton D. Kachalov. All rights reserved. + * Author: Anton D. Kachalov + * + * 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. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 + * COPYRIGHT OWNER 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. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include +#include +#include +#include +#include + +#include + +#ifndef CONFIG_DISABLE_POLL + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: epoll_create + * + * Description: + * + * Input Parameters: + * + * Returned Value: + * + ****************************************************************************/ + +int epoll_create(int size) +{ + FAR struct epoll_head *eph = + (FAR struct epoll_head *)malloc(sizeof(struct epoll_head)); + + eph->size = size; + eph->occupied = 0; + eph->evs = malloc(sizeof(struct epoll_event) * eph->size); + + return (int)eph; +} + +/**************************************************************************** + * Name: epoll_close + * + * Description: + * + * Input Parameters: + * + * Returned Value: + * + ****************************************************************************/ + +void epoll_close(int epfd) +{ + struct epoll_head *eph = (struct epoll_head *)epfd; + + free(eph->evs); + free(eph); +} + +/**************************************************************************** + * Name: epoll_ctl + * + * Description: + * + * Input Parameters: + * + * Returned Value: + * + ****************************************************************************/ + +int epoll_ctl(int epfd, int op, int fd, struct epoll_event *ev) +{ + FAR struct epoll_head *eph = (FAR struct epoll_head *)epfd; + + switch (op) + { + case EPOLL_CTL_ADD: + printf("%08x CTL ADD(%d): fd=%d ev=%08x\n", + epfd, eph->occupied, fd, ev->events); + + eph->evs[eph->occupied].events = ev->events | POLLERR | POLLHUP; + eph->evs[eph->occupied++].data.fd = fd; + return 0; + + case EPOLL_CTL_DEL: + { + int i; + + for (i = 0; i < eph->occupied; i++) + { + if (eph->evs[i].data.fd == fd) + { + if (i != eph->occupied-1) + { + memmove(&eph->evs[i], &eph->evs[i + 1], + eph->occupied - i); + } + + eph->occupied--; + return 0; + } + } + + return -ENOENT; + } + + case EPOLL_CTL_MOD: + { + int i; + + printf("%08x CTL MOD(%d): fd=%d ev=%08x\n", + epfd, eph->occupied, fd, ev->events); + + for (i = 0; i < eph->occupied; i++) + { + if (eph->evs[i].data.fd == fd) + { + eph->evs[i].events = ev->events | POLLERR | POLLHUP; + return 0; + } + } + + return -ENOENT; + } + } + + return -EINVAL; +} + +/**************************************************************************** + * Name: epoll_wait + * + * Description: + * + * Input Parameters: + * + * Returned Value: + * + ****************************************************************************/ + +int epoll_wait(int epfd, FAR struct epoll_event *evs, int maxevents, + int timeout) +{ + int i; + int rc; + FAR struct epoll_head *eph = (FAR struct epoll_head *)epfd; + + rc = poll((FAR struct pollfd *)eph->evs, eph->occupied, timeout); + + if (rc <= 0) + { + if (rc < 0) + { + printf("%08x poll fail: %d for %d, %d msecs\n", + epfd, rc, eph->occupied, timeout); + + for (i = 0; i < eph->occupied; i++) + { + printf("%02d: fd=%d\n", i, eph->evs[i].data.fd); + } + } + + return rc; + } + + for (i = 0; i < rc; i++) + { + evs[i].data.fd = (pollevent_t)eph->evs[i].data.fd; + evs[i].events = (pollevent_t)eph->evs[i].revents; + } + + return rc; +} + +#endif /* CONFIG_DISABLE_POLL */ diff --git a/include/sys/epoll.h b/include/sys/epoll.h index 96fe2efe17..01aecdd69e 100644 --- a/include/sys/epoll.h +++ b/include/sys/epoll.h @@ -1,8 +1,59 @@ -#ifndef _EPOLL__H -#define _EPOLL__H +/**************************************************************************** + * fs/vfs/fs_epoll.c + * + * Copyright (C) 2015 Anton D. Kachalov. All rights reserved. + * Author: Anton D. Kachalov + * + * 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. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 + * COPYRIGHT OWNER 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. + * + ****************************************************************************/ + +#ifndef __INCLUDE_NUTTX_SYS_EPOLL_H +#define __INCLUDE_NUTTX_SYS_EPOLL_H + +/**************************************************************************** + * Included Files + ****************************************************************************/ #include +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +#define EPOLL_CTL_ADD 1 /* Add a file descriptor to the interface. */ +#define EPOLL_CTL_DEL 2 /* Remove a file descriptor from the interface. */ +#define EPOLL_CTL_MOD 3 /* Change file descriptor epoll_event structure. */ + +/**************************************************************************** + * Public Types + ****************************************************************************/ + enum EPOLL_EVENTS { EPOLLIN = POLLIN, @@ -25,19 +76,15 @@ enum EPOLL_EVENTS #define EPOLLHUP EPOLLHUP }; -#define EPOLL_CTL_ADD 1 /* Add a file descriptor to the interface. */ -#define EPOLL_CTL_DEL 2 /* Remove a file descriptor from the interface. */ -#define EPOLL_CTL_MOD 3 /* Change file descriptor epoll_event structure. */ - typedef union poll_data { - int fd; /* The descriptor being polled */ + int fd; /* The descriptor being polled */ } epoll_data_t; struct epoll_event { epoll_data_t data; - sem_t *sem; /* Pointer to semaphore used to post output event */ + FAR sem_t *sem; /* Pointer to semaphore used to post output event */ pollevent_t events; /* The input event flags */ pollevent_t revents; /* The output event flags */ FAR void *priv; /* For use by drivers */ @@ -47,13 +94,17 @@ struct epoll_head { int size; int occupied; - struct epoll_event *evs; + FAR struct epoll_event *evs; }; +/**************************************************************************** + * Public Function Prototypes + ****************************************************************************/ + int epoll_create(int size); int epoll_ctl(int epfd, int op, int fd, struct epoll_event *ev); int epoll_wait(int epfd, struct epoll_event *evs, int maxevents, int timeout); void epoll_close(int epfd); -#endif +#endif /* __INCLUDE_NUTTX_SYS_EPOLL_H */