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.10 by root, Fri Nov 2 11:02:23 2007 UTC vs.
Revision 1.12 by root, Sat Nov 3 11:44:44 2007 UTC

37epoll_modify (int fd, int oev, int nev) 37epoll_modify (int fd, int oev, int nev)
38{ 38{
39 int mode = nev ? oev ? EPOLL_CTL_MOD : EPOLL_CTL_ADD : EPOLL_CTL_DEL; 39 int mode = nev ? oev ? EPOLL_CTL_MOD : EPOLL_CTL_ADD : EPOLL_CTL_DEL;
40 40
41 struct epoll_event ev; 41 struct epoll_event ev;
42 ev.data.fd = fd; 42 ev.data.u64 = fd; /* use u64 to fully initialise the struct, for nicer strace etc. */
43 ev.events = 43 ev.events =
44 (nev & EV_READ ? EPOLLIN : 0) 44 (nev & EV_READ ? EPOLLIN : 0)
45 | (nev & EV_WRITE ? EPOLLOUT : 0); 45 | (nev & EV_WRITE ? EPOLLOUT : 0);
46 46
47 epoll_ctl (epoll_fd, mode, fd, &ev); 47 epoll_ctl (epoll_fd, mode, fd, &ev);
73 if (eventcnt < 0) 73 if (eventcnt < 0)
74 return; 74 return;
75 75
76 for (i = 0; i < eventcnt; ++i) 76 for (i = 0; i < eventcnt; ++i)
77 fd_event ( 77 fd_event (
78 events [i].data.fd, 78 events [i].data.u64,
79 (events [i].events & (EPOLLOUT | EPOLLERR | EPOLLHUP) ? EV_WRITE : 0) 79 (events [i].events & (EPOLLOUT | EPOLLERR | EPOLLHUP) ? EV_WRITE : 0)
80 | (events [i].events & (EPOLLIN | EPOLLERR | EPOLLHUP) ? EV_READ : 0) 80 | (events [i].events & (EPOLLIN | EPOLLERR | EPOLLHUP) ? EV_READ : 0)
81 ); 81 );
82 82
83 /* if the receive array was full, increase its size */ 83 /* if the receive array was full, increase its size */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines