From 422ea4f6732edeece1a3de6fa350701daa5f61cb Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Mon, 10 Aug 2015 10:41:58 -0600 Subject: [PATCH] Another epoll() change: Should not call printf from inside the OS --- fs/vfs/fs_epoll.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/fs/vfs/fs_epoll.c b/fs/vfs/fs_epoll.c index 420e066d4c..8cd6e227ac 100644 --- a/fs/vfs/fs_epoll.c +++ b/fs/vfs/fs_epoll.c @@ -37,13 +37,16 @@ * Included Files ****************************************************************************/ +#include + +#include + #include #include #include #include #include - -#include +#include #ifndef CONFIG_DISABLE_POLL @@ -111,8 +114,8 @@ int epoll_ctl(int epfd, int op, int fd, struct epoll_event *ev) switch (op) { case EPOLL_CTL_ADD: - printf("%08x CTL ADD(%d): fd=%d ev=%08x\n", - epfd, eph->occupied, fd, ev->events); + fvdbg("%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; @@ -144,8 +147,8 @@ int epoll_ctl(int epfd, int op, int fd, struct epoll_event *ev) { int i; - printf("%08x CTL MOD(%d): fd=%d ev=%08x\n", - epfd, eph->occupied, fd, ev->events); + fvdbg("%08x CTL MOD(%d): fd=%d ev=%08x\n", + epfd, eph->occupied, fd, ev->events); for (i = 0; i < eph->occupied; i++) { @@ -187,12 +190,12 @@ int epoll_wait(int epfd, FAR struct epoll_event *evs, int maxevents, { if (rc < 0) { - printf("%08x poll fail: %d for %d, %d msecs\n", - epfd, rc, eph->occupied, timeout); + fdbg("%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); + fdbg("%02d: fd=%d\n", i, eph->evs[i].data.fd); } }