| … | |
… | |
| 37 | epoll_modify (int fd, int oev, int nev) |
37 | epoll_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 */ |
| 84 | if (eventcnt == eventmax) |
84 | if (expect_false (eventcnt == eventmax)) |
| 85 | { |
85 | { |
| 86 | free (events); |
86 | free (events); |
| 87 | eventmax += eventmax >> 1; |
87 | eventmax = array_roundsize (events, eventmax << 1); |
| 88 | events = malloc (sizeof (struct epoll_event) * eventmax); |
88 | events = malloc (sizeof (struct epoll_event) * eventmax); |
| 89 | } |
89 | } |
| 90 | } |
90 | } |
| 91 | |
91 | |
| 92 | static void |
92 | static void |
