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.11 by root, Sat Nov 3 10:37:29 2007 UTC vs.
Revision 1.22 by root, Tue Nov 6 01:17:16 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 if (errno != ENOENT /* on ENOENT the fd went away, so try to do the right thing */
47 || (nev && epoll_ctl (epoll_fd, EPOLL_CTL_ADD, fd, &ev)))
48 fd_kill (EV_A_ fd);
48} 49}
49 50
50static void 51static void
51epoll_postfork_child (void) 52epoll_poll (EV_P_ ev_tstamp timeout)
52{ 53{
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.));
71 int i; 54 int i;
55 int eventcnt = epoll_wait (epoll_fd, epoll_events, epoll_eventmax, ceil (timeout * 1000.));
72 56
73 if (eventcnt < 0) 57 if (eventcnt < 0)
58 {
59 if (errno != EINTR)
60 syserr ("(libev) epoll_wait");
61
74 return; 62 return;
63 }
75 64
76 for (i = 0; i < eventcnt; ++i) 65 for (i = 0; i < eventcnt; ++i)
77 fd_event ( 66 fd_event (
67 EV_A_
78 events [i].data.fd, 68 epoll_events [i].data.u64,
79 (events [i].events & (EPOLLOUT | EPOLLERR | EPOLLHUP) ? EV_WRITE : 0) 69 (epoll_events [i].events & (EPOLLOUT | EPOLLERR | EPOLLHUP) ? EV_WRITE : 0)
80 | (events [i].events & (EPOLLIN | EPOLLERR | EPOLLHUP) ? EV_READ : 0) 70 | (epoll_events [i].events & (EPOLLIN | EPOLLERR | EPOLLHUP) ? EV_READ : 0)
81 ); 71 );
82 72
83 /* if the receive array was full, increase its size */ 73 /* if the receive array was full, increase its size */
84 if (expect_false (eventcnt == eventmax)) 74 if (expect_false (eventcnt == epoll_eventmax))
85 { 75 {
86 free (events); 76 ev_free (epoll_events);
87 eventmax = array_roundsize (events, eventmax << 1); 77 epoll_eventmax = array_roundsize (epoll_events, epoll_eventmax << 1);
88 events = malloc (sizeof (struct epoll_event) * eventmax); 78 epoll_events = ev_malloc (sizeof (struct epoll_event) * epoll_eventmax);
89 } 79 }
90} 80}
91 81
92static void 82static int
93epoll_init (int flags) 83epoll_init (EV_P_ int flags)
94{ 84{
95 epoll_fd = epoll_create (256); 85 epoll_fd = epoll_create (256);
96 86
97 if (epoll_fd < 0) 87 if (epoll_fd < 0)
98 return; 88 return 0;
99 89
100 fcntl (epoll_fd, F_SETFD, FD_CLOEXEC); 90 fcntl (epoll_fd, F_SETFD, FD_CLOEXEC);
101 91
102 ev_method = EVMETHOD_EPOLL;
103 method_fudge = 1e-3; /* needed to compensate for epoll returning early */ 92 method_fudge = 1e-3; /* needed to compensate for epoll returning early */
104 method_modify = epoll_modify; 93 method_modify = epoll_modify;
105 method_poll = epoll_poll; 94 method_poll = epoll_poll;
106 95
107 eventmax = 64; /* intiial number of events receivable per poll */ 96 epoll_eventmax = 64; /* intiial number of events receivable per poll */
108 events = malloc (sizeof (struct epoll_event) * eventmax); 97 epoll_events = ev_malloc (sizeof (struct epoll_event) * epoll_eventmax);
98
99 return EVMETHOD_EPOLL;
109} 100}
110 101
102static void
103epoll_destroy (EV_P)
104{
105 close (epoll_fd);
106
107 ev_free (epoll_events);
108}
109
110static void
111epoll_fork (EV_P)
112{
113 close (epoll_fd);
114
115 while ((epoll_fd = epoll_create (256)) < 0)
116 syserr ("(libev) epoll_create");
117
118 fcntl (epoll_fd, F_SETFD, FD_CLOEXEC);
119
120 fd_rearm_all (EV_A);
121}
122

Diff Legend

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