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.13 by root, Sat Nov 3 21:58:51 2007 UTC vs.
Revision 1.18 by root, Sun Nov 4 22:03:17 2007 UTC

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