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.3 by root, Wed Oct 31 00:24:16 2007 UTC

1#include <sys/epoll.h> 1#include <sys/epoll.h>
2 2
3static int epoll_fd = -1; 3static int epoll_fd = -1;
4 4
5static void 5static void
6epoll_reify_fd (int fd) 6epoll_modify (int fd, int oev, int nev)
7{ 7{
8 ANFD *anfd = anfds + fd; 8 int mode = nev ? oev ? EPOLL_CTL_MOD : EPOLL_CTL_ADD : EPOLL_CTL_DEL;
9 struct ev_io *w;
10 9
11 int wev = 0; 10 struct epoll_event ev;
11 ev.data.fd = fd;
12 ev.events =
13 (nev & EV_READ ? EPOLLIN : 0)
14 | (nev & EV_WRITE ? EPOLLOUT : 0);
12 15
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 16 fprintf (stderr, "reify %d,%d,%d m%d (r=%d)\n", fd, oev, nev, mode,//D
23 epoll_ctl (epoll_fd, mode, fd, &ev) 17 epoll_ctl (epoll_fd, mode, fd, &ev)
24 );//D 18 );//D
25 anfd->wev = wev;
26 }
27} 19}
28 20
29void epoll_postfork_child (void) 21void epoll_postfork_child (void)
30{ 22{
31 int i; 23 int fd;
32 24
33 epoll_fd = epoll_create (256); 25 epoll_fd = epoll_create (256);
26 fcntl (epoll_fd, F_SETFD, FD_CLOEXEC);
34 27
28 /* re-register interest in fds */
35 for (i = 0; i < anfdmax; ++i) 29 for (fd = 0; fd < anfdmax; ++fd)
36 epoll_reify_fd (i); 30 if (anfds [fd].wev)
37} 31 epoll_modify (fd, EV_NONE, anfds [fd].wev);
38
39static void epoll_reify (void)
40{
41 int i;
42 for (i = 0; i < fdchangecnt; ++i)
43 epoll_reify_fd (fdchanges [i]);
44} 32}
45 33
46static struct epoll_event *events; 34static struct epoll_event *events;
47static int eventmax; 35static int eventmax;
48 36
… …
55 return; 43 return;
56 44
57 for (i = 0; i < eventcnt; ++i) 45 for (i = 0; i < eventcnt; ++i)
58 fd_event ( 46 fd_event (
59 events [i].data.fd, 47 events [i].data.fd,
60 (events [i].events & (EPOLLOUT | EPOLLERR | EPOLLHUP | EPOLLPRI) ? EV_WRITE : 0) 48 (events [i].events & (EPOLLOUT | EPOLLERR | EPOLLHUP) ? EV_WRITE : 0)
61 | (events [i].events & (EPOLLIN | EPOLLERR | EPOLLHUP) ? EV_READ : 0) 49 | (events [i].events & (EPOLLIN | EPOLLERR | EPOLLHUP) ? EV_READ : 0)
62 ); 50 );
63 51
64 /* if the receive array was full, increase its size */ 52 /* if the receive array was full, increase its size */
65 if (eventcnt == eventmax) 53 if (eventcnt == eventmax)
66 { 54 {
… …
68 eventmax += eventmax >> 1; 56 eventmax += eventmax >> 1;
69 events = malloc (sizeof (struct epoll_event) * eventmax); 57 events = malloc (sizeof (struct epoll_event) * eventmax);
70 } 58 }
71} 59}
72 60
73int epoll_init (int flags) 61void epoll_init (int flags)
74{ 62{
75 epoll_fd = epoll_create (256); 63 epoll_fd = epoll_create (256);
76 64
77 if (epoll_fd < 0) 65 if (epoll_fd < 0)
78 return 0; 66 return;
79 67
68 fcntl (epoll_fd, F_SETFD, FD_CLOEXEC);
69
80 ev_method = EVMETHOD_EPOLL; 70 ev_method = EVMETHOD_EPOLL;
81 method_fudge = 1e-3; /* needed to compensate fro epoll returning early */ 71 method_fudge = 1e-3; /* needed to compensate for epoll returning early */
82 method_reify = epoll_reify; 72 method_modify = epoll_modify;
83 method_poll = epoll_poll; 73 method_poll = epoll_poll;
84 74
85 eventmax = 64; /* intiial number of events receivable per poll */ 75 eventmax = 64; /* intiial number of events receivable per poll */
86 events = malloc (sizeof (struct epoll_event) * eventmax); 76 events = malloc (sizeof (struct epoll_event) * eventmax);
87
88 return 1;
89} 77}

Diff Legend

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