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.12 by root, Sat Nov 3 11:44:44 2007 UTC vs.
Revision 1.18 by root, Sun Nov 4 22:03:17 2007 UTC

… …
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#include <sys/epoll.h> 32#include <sys/epoll.h>
33 33
34static int epoll_fd = -1;
35
36static void 34static void
37epoll_modify (int fd, int oev, int nev) 35epoll_modify (EV_P_ int fd, int oev, int nev)
38{ 36{
39 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;
40 38
41 struct epoll_event ev; 39 struct epoll_event ev;
42 ev.data.u64 = fd; /* use u64 to fully initialise the struct, for nicer strace etc. */ 40 ev.data.u64 = fd; /* use u64 to fully initialise the struct, for nicer strace etc. */
43 ev.events = 41 ev.events =
44 (nev & EV_READ ? EPOLLIN : 0) 42 (nev & EV_READ ? EPOLLIN : 0)
45 | (nev & EV_WRITE ? EPOLLOUT : 0); 43 | (nev & EV_WRITE ? EPOLLOUT : 0);
46 44
47 epoll_ctl (epoll_fd, mode, fd, &ev); 45 if (epoll_ctl (epoll_fd, mode, fd, &ev))
46 fd_kill (EV_A_ fd);
48} 47}
49 48
50static void 49static void
51epoll_postfork_child (void) 50epoll_poll (EV_P_ ev_tstamp timeout)
52{ 51{
53 int fd;
54
55 epoll_fd = epoll_create (256);
56 fcntl (epoll_fd, F_SETFD, FD_CLOEXEC);
57
58 /* re-register interest in fds */
59 for (fd = 0; fd < anfdmax; ++fd)
60 if (anfds [fd].events)//D
61 epoll_modify (fd, EV_NONE, anfds [fd].events);
62}
63
64static struct epoll_event *events;
65static int eventmax;
66
67static void
68epoll_poll (ev_tstamp timeout)
69{
70 int eventcnt = epoll_wait (epoll_fd, events, eventmax, ceil (timeout * 1000.)); 52 int eventcnt = epoll_wait (epoll_fd, epoll_events, epoll_eventmax, ceil (timeout * 1000.));
71 int i; 53 int i;
72 54
73 if (eventcnt < 0) 55 if (eventcnt < 0)
74 return; 56 return;
75 57
76 for (i = 0; i < eventcnt; ++i) 58 for (i = 0; i < eventcnt; ++i)
77 fd_event ( 59 fd_event (
60 EV_A_
78 events [i].data.u64, 61 epoll_events [i].data.u64,
79 (events [i].events & (EPOLLOUT | EPOLLERR | EPOLLHUP) ? EV_WRITE : 0) 62 (epoll_events [i].events & (EPOLLOUT | EPOLLERR | EPOLLHUP) ? EV_WRITE : 0)
80 | (events [i].events & (EPOLLIN | EPOLLERR | EPOLLHUP) ? EV_READ : 0) 63 | (epoll_events [i].events & (EPOLLIN | EPOLLERR | EPOLLHUP) ? EV_READ : 0)
81 ); 64 );
82 65
83 /* if the receive array was full, increase its size */ 66 /* if the receive array was full, increase its size */
84 if (expect_false (eventcnt == eventmax)) 67 if (expect_false (eventcnt == epoll_eventmax))
85 { 68 {
86 free (events); 69 free (epoll_events);
87 eventmax = array_roundsize (events, eventmax << 1); 70 epoll_eventmax = array_roundsize (epoll_events, epoll_eventmax << 1);
88 events = malloc (sizeof (struct epoll_event) * eventmax); 71 epoll_events = malloc (sizeof (struct epoll_event) * epoll_eventmax);
89 } 72 }
90} 73}
91 74
92static void 75static int
93epoll_init (int flags) 76epoll_init (EV_P_ int flags)
94{ 77{
95 epoll_fd = epoll_create (256); 78 epoll_fd = epoll_create (256);
96 79
97 if (epoll_fd < 0) 80 if (epoll_fd < 0)
98 return; 81 return 0;
99 82
100 fcntl (epoll_fd, F_SETFD, FD_CLOEXEC); 83 fcntl (epoll_fd, F_SETFD, FD_CLOEXEC);
101 84
102 ev_method = EVMETHOD_EPOLL;
103 method_fudge = 1e-3; /* needed to compensate for epoll returning early */ 85 method_fudge = 1e-3; /* needed to compensate for epoll returning early */
104 method_modify = epoll_modify; 86 method_modify = epoll_modify;
105 method_poll = epoll_poll; 87 method_poll = epoll_poll;
106 88
107 eventmax = 64; /* intiial number of events receivable per poll */ 89 epoll_eventmax = 64; /* intiial number of events receivable per poll */
108 events = malloc (sizeof (struct epoll_event) * eventmax); 90 epoll_events = malloc (sizeof (struct epoll_event) * epoll_eventmax);
91
92 return EVMETHOD_EPOLL;
109} 93}
110 94
95static void
96epoll_destroy (EV_P)
97{
98 close (epoll_fd);
99
100 free (epoll_events);
101}
102
103static void
104epoll_fork (EV_P)
105{
106 epoll_fd = epoll_create (256);
107 fcntl (epoll_fd, F_SETFD, FD_CLOEXEC);
108
109 fd_rearm_all (EV_A);
110}
111

Diff Legend

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