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.8 by root, Thu Nov 1 11:11:22 2007 UTC vs.
Revision 1.14 by root, Sun Nov 4 00:39:24 2007 UTC

1/* 1/*
2 * libev epoll fd activity backend
3 *
2 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
3 * All rights reserved. 5 * All rights reserved.
4 * 6 *
5 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 8 * modification, are permitted provided that the following conditions are
… …
27 * 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.
28 */ 30 */
29 31
30#include <sys/epoll.h> 32#include <sys/epoll.h>
31 33
32static int epoll_fd = -1;
33
34static void 34static void
35epoll_modify (int fd, int oev, int nev) 35epoll_modify (EV_P_ int fd, int oev, int nev)
36{ 36{
37 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;
38 38
39 struct epoll_event ev; 39 struct epoll_event ev;
40 ev.data.fd = fd; 40 ev.data.u64 = fd; /* use u64 to fully initialise the struct, for nicer strace etc. */
41 ev.events = 41 ev.events =
42 (nev & EV_READ ? EPOLLIN : 0) 42 (nev & EV_READ ? EPOLLIN : 0)
43 | (nev & EV_WRITE ? EPOLLOUT : 0); 43 | (nev & EV_WRITE ? EPOLLOUT : 0);
44 44
45 epoll_ctl (epoll_fd, mode, fd, &ev); 45 epoll_ctl (epoll_fd, mode, fd, &ev);
46} 46}
47 47
48static void 48static void
49epoll_postfork_child (void) 49epoll_postfork_child (EV_P)
50{ 50{
51 int fd; 51 int fd;
52 52
53 epoll_fd = epoll_create (256); 53 epoll_fd = epoll_create (256);
54 fcntl (epoll_fd, F_SETFD, FD_CLOEXEC); 54 fcntl (epoll_fd, F_SETFD, FD_CLOEXEC);
55 55
56 /* re-register interest in fds */ 56 /* re-register interest in fds */
57 for (fd = 0; fd < anfdmax; ++fd) 57 for (fd = 0; fd < anfdmax; ++fd)
58 if (anfds [fd].events)//D 58 if (anfds [fd].events)//D
59 epoll_modify (fd, EV_NONE, anfds [fd].events); 59 epoll_modify (EV_A_ fd, EV_NONE, anfds [fd].events);
60} 60}
61 61
62static struct epoll_event *events;
63static int eventmax;
64
65static void 62static void
66epoll_poll (ev_tstamp timeout) 63epoll_poll (EV_P_ ev_tstamp timeout)
67{ 64{
68 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.));
69 int i; 66 int i;
70 67
71 if (eventcnt < 0) 68 if (eventcnt < 0)
72 return; 69 return;
73 70
74 for (i = 0; i < eventcnt; ++i) 71 for (i = 0; i < eventcnt; ++i)
75 fd_event ( 72 fd_event (
73 EV_A_
76 events [i].data.fd, 74 epoll_events [i].data.u64,
77 (events [i].events & (EPOLLOUT | EPOLLERR | EPOLLHUP) ? EV_WRITE : 0) 75 (epoll_events [i].events & (EPOLLOUT | EPOLLERR | EPOLLHUP) ? EV_WRITE : 0)
78 | (events [i].events & (EPOLLIN | EPOLLERR | EPOLLHUP) ? EV_READ : 0) 76 | (epoll_events [i].events & (EPOLLIN | EPOLLERR | EPOLLHUP) ? EV_READ : 0)
79 ); 77 );
80 78
81 /* if the receive array was full, increase its size */ 79 /* if the receive array was full, increase its size */
82 if (eventcnt == eventmax) 80 if (expect_false (eventcnt == epoll_eventmax))
83 { 81 {
84 free (events); 82 free (epoll_events);
85 eventmax += eventmax >> 1; 83 epoll_eventmax = array_roundsize (epoll_events, epoll_eventmax << 1);
86 events = malloc (sizeof (struct epoll_event) * eventmax); 84 epoll_events = malloc (sizeof (struct epoll_event) * epoll_eventmax);
87 } 85 }
88} 86}
89 87
90static void 88static int
91epoll_init (int flags) 89epoll_init (EV_P_ int flags)
92{ 90{
93 epoll_fd = epoll_create (256); 91 epoll_fd = epoll_create (256);
94 92
95 if (epoll_fd < 0) 93 if (epoll_fd < 0)
96 return; 94 return 0;
97 95
98 fcntl (epoll_fd, F_SETFD, FD_CLOEXEC); 96 fcntl (epoll_fd, F_SETFD, FD_CLOEXEC);
99 97
100 ev_method = EVMETHOD_EPOLL;
101 method_fudge = 1e-3; /* needed to compensate for epoll returning early */ 98 method_fudge = 1e-3; /* needed to compensate for epoll returning early */
102 method_modify = epoll_modify; 99 method_modify = epoll_modify;
103 method_poll = epoll_poll; 100 method_poll = epoll_poll;
104 101
105 eventmax = 64; /* intiial number of events receivable per poll */ 102 epoll_eventmax = 64; /* intiial number of events receivable per poll */
106 events = malloc (sizeof (struct epoll_event) * eventmax); 103 epoll_events = malloc (sizeof (struct epoll_event) * epoll_eventmax);
104
105 return EVMETHOD_EPOLL;
107} 106}
108 107

Diff Legend

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