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.13 by root, Sat Nov 3 21:58:51 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. */
… …
46 44
47 epoll_ctl (epoll_fd, mode, fd, &ev); 45 epoll_ctl (epoll_fd, mode, fd, &ev);
48} 46}
49 47
50static void 48static void
51epoll_postfork_child (void) 49epoll_postfork_child (EV_P)
52{ 50{
53 int fd; 51 int fd;
54 52
55 epoll_fd = epoll_create (256); 53 epoll_fd = epoll_create (256);
56 fcntl (epoll_fd, F_SETFD, FD_CLOEXEC); 54 fcntl (epoll_fd, F_SETFD, FD_CLOEXEC);
57 55
58 /* re-register interest in fds */ 56 /* re-register interest in fds */
59 for (fd = 0; fd < anfdmax; ++fd) 57 for (fd = 0; fd < anfdmax; ++fd)
60 if (anfds [fd].events)//D 58 if (anfds [fd].events)//D
61 epoll_modify (fd, EV_NONE, anfds [fd].events); 59 epoll_modify (EV_A_ fd, EV_NONE, anfds [fd].events);
62} 60}
63 61
64static struct epoll_event *events;
65static int eventmax;
66
67static void 62static void
68epoll_poll (ev_tstamp timeout) 63epoll_poll (EV_P_ ev_tstamp timeout)
69{ 64{
70 int eventcnt = epoll_wait (epoll_fd, events, eventmax, ceil (timeout * 1000.)); 65 int eventcnt = epoll_wait (epoll_fd, events, eventmax, ceil (timeout * 1000.));
71 int i; 66 int i;
72 67
73 if (eventcnt < 0) 68 if (eventcnt < 0)
74 return; 69 return;
75 70
76 for (i = 0; i < eventcnt; ++i) 71 for (i = 0; i < eventcnt; ++i)
77 fd_event ( 72 fd_event (
73 EV_A_
78 events [i].data.u64, 74 events [i].data.u64,
79 (events [i].events & (EPOLLOUT | EPOLLERR | EPOLLHUP) ? EV_WRITE : 0) 75 (events [i].events & (EPOLLOUT | EPOLLERR | EPOLLHUP) ? EV_WRITE : 0)
80 | (events [i].events & (EPOLLIN | EPOLLERR | EPOLLHUP) ? EV_READ : 0) 76 | (events [i].events & (EPOLLIN | EPOLLERR | EPOLLHUP) ? EV_READ : 0)
81 ); 77 );
82 78
… …
87 eventmax = array_roundsize (events, eventmax << 1); 83 eventmax = array_roundsize (events, eventmax << 1);
88 events = malloc (sizeof (struct epoll_event) * eventmax); 84 events = malloc (sizeof (struct epoll_event) * eventmax);
89 } 85 }
90} 86}
91 87
92static void 88static int
93epoll_init (int flags) 89epoll_init (EV_P_ int flags)
94{ 90{
95 epoll_fd = epoll_create (256); 91 epoll_fd = epoll_create (256);
96 92
97 if (epoll_fd < 0) 93 if (epoll_fd < 0)
98 return; 94 return 0;
99 95
100 fcntl (epoll_fd, F_SETFD, FD_CLOEXEC); 96 fcntl (epoll_fd, F_SETFD, FD_CLOEXEC);
101 97
102 ev_method = EVMETHOD_EPOLL;
103 method_fudge = 1e-3; /* needed to compensate for epoll returning early */ 98 method_fudge = 1e-3; /* needed to compensate for epoll returning early */
104 method_modify = epoll_modify; 99 method_modify = epoll_modify;
105 method_poll = epoll_poll; 100 method_poll = epoll_poll;
106 101
107 eventmax = 64; /* intiial number of events receivable per poll */ 102 eventmax = 64; /* intiial number of events receivable per poll */
108 events = malloc (sizeof (struct epoll_event) * eventmax); 103 events = malloc (sizeof (struct epoll_event) * eventmax);
104
105 return EVMETHOD_EPOLL;
109} 106}
110 107

Diff Legend

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