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.4 by root, Wed Oct 31 11:56:34 2007 UTC vs.
Revision 1.14 by root, Sun Nov 4 00:39:24 2007 UTC

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

Diff Legend

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