ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libev/ev_epoll.c
(Generate patch)

Comparing libev/ev_epoll.c (file contents):
Revision 1.1 by root, Tue Oct 30 20:59:31 2007 UTC vs.
Revision 1.8 by root, Thu Nov 1 11:11:22 2007 UTC

1/*
2 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are
7 * met:
8 *
9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer.
11 *
12 * * Redistributions in binary form must reproduce the above
13 * copyright notice, this list of conditions and the following
14 * disclaimer in the documentation and/or other materials provided
15 * with the distribution.
16 *
17 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
18 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
19 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
20 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
21 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
22 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
23 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
24 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
25 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
27 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 */
29
1#include <sys/epoll.h> 30#include <sys/epoll.h>
2 31
3static int epoll_fd = -1; 32static int epoll_fd = -1;
4 33
5static void 34static void
6epoll_reify_fd (int fd) 35epoll_modify (int fd, int oev, int nev)
7{ 36{
8 ANFD *anfd = anfds + fd; 37 int mode = nev ? oev ? EPOLL_CTL_MOD : EPOLL_CTL_ADD : EPOLL_CTL_DEL;
9 struct ev_io *w;
10 38
11 int wev = 0; 39 struct epoll_event ev;
40 ev.data.fd = fd;
41 ev.events =
42 (nev & EV_READ ? EPOLLIN : 0)
43 | (nev & EV_WRITE ? EPOLLOUT : 0);
12 44
13 for (w = anfd->head; w; w = w->next)
14 wev |= w->events;
15
16 if (anfd->wev != wev)
17 {
18 int mode = wev ? anfd->wev ? EPOLL_CTL_MOD : EPOLL_CTL_ADD : EPOLL_CTL_DEL;
19 struct epoll_event ev;
20 ev.events = wev;
21 ev.data.fd = fd;
22 fprintf (stderr, "reify %d,%d,%d m%d (r=%d)\n", fd, anfd->wev, wev, mode,//D
23 epoll_ctl (epoll_fd, mode, fd, &ev) 45 epoll_ctl (epoll_fd, mode, fd, &ev);
24 );//D
25 anfd->wev = wev;
26 }
27} 46}
28 47
48static void
29void epoll_postfork_child (void) 49epoll_postfork_child (void)
30{ 50{
31 int i; 51 int fd;
32 52
33 epoll_fd = epoll_create (256); 53 epoll_fd = epoll_create (256);
54 fcntl (epoll_fd, F_SETFD, FD_CLOEXEC);
34 55
56 /* re-register interest in fds */
35 for (i = 0; i < anfdmax; ++i) 57 for (fd = 0; fd < anfdmax; ++fd)
36 epoll_reify_fd (i); 58 if (anfds [fd].events)//D
37} 59 epoll_modify (fd, EV_NONE, anfds [fd].events);
38
39static void epoll_reify (void)
40{
41 int i;
42 for (i = 0; i < fdchangecnt; ++i)
43 epoll_reify_fd (fdchanges [i]);
44} 60}
45 61
46static struct epoll_event *events; 62static struct epoll_event *events;
47static int eventmax; 63static int eventmax;
48 64
65static void
49static void epoll_poll (ev_tstamp timeout) 66epoll_poll (ev_tstamp timeout)
50{ 67{
51 int eventcnt = epoll_wait (epoll_fd, events, eventmax, ceil (timeout * 1000.)); 68 int eventcnt = epoll_wait (epoll_fd, events, eventmax, ceil (timeout * 1000.));
52 int i; 69 int i;
53 70
54 if (eventcnt < 0) 71 if (eventcnt < 0)
55 return; 72 return;
56 73
57 for (i = 0; i < eventcnt; ++i) 74 for (i = 0; i < eventcnt; ++i)
58 fd_event ( 75 fd_event (
59 events [i].data.fd, 76 events [i].data.fd,
60 (events [i].events & (EPOLLOUT | EPOLLERR | EPOLLHUP | EPOLLPRI) ? EV_WRITE : 0) 77 (events [i].events & (EPOLLOUT | EPOLLERR | EPOLLHUP) ? EV_WRITE : 0)
61 | (events [i].events & (EPOLLIN | EPOLLERR | EPOLLHUP) ? EV_READ : 0) 78 | (events [i].events & (EPOLLIN | EPOLLERR | EPOLLHUP) ? EV_READ : 0)
62 ); 79 );
63 80
64 /* if the receive array was full, increase its size */ 81 /* if the receive array was full, increase its size */
65 if (eventcnt == eventmax) 82 if (eventcnt == eventmax)
66 { 83 {
… …
68 eventmax += eventmax >> 1; 85 eventmax += eventmax >> 1;
69 events = malloc (sizeof (struct epoll_event) * eventmax); 86 events = malloc (sizeof (struct epoll_event) * eventmax);
70 } 87 }
71} 88}
72 89
90static void
73int epoll_init (int flags) 91epoll_init (int flags)
74{ 92{
75 epoll_fd = epoll_create (256); 93 epoll_fd = epoll_create (256);
76 94
77 if (epoll_fd < 0) 95 if (epoll_fd < 0)
78 return 0; 96 return;
79 97
98 fcntl (epoll_fd, F_SETFD, FD_CLOEXEC);
99
80 ev_method = EVMETHOD_EPOLL; 100 ev_method = EVMETHOD_EPOLL;
81 method_fudge = 1e-3; /* needed to compensate fro epoll returning early */ 101 method_fudge = 1e-3; /* needed to compensate for epoll returning early */
82 method_reify = epoll_reify; 102 method_modify = epoll_modify;
83 method_poll = epoll_poll; 103 method_poll = epoll_poll;
84 104
85 eventmax = 64; /* intiial number of events receivable per poll */ 105 eventmax = 64; /* intiial number of events receivable per poll */
86 events = malloc (sizeof (struct epoll_event) * eventmax); 106 events = malloc (sizeof (struct epoll_event) * eventmax);
107}
87 108
88 return 1;
89}

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines