ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libev/ev_kqueue.c
(Generate patch)

Comparing libev/ev_kqueue.c (file contents):
Revision 1.58 by root, Sat Jun 22 22:18:39 2019 UTC vs.
Revision 1.60 by root, Mon Jul 1 20:47:38 2019 UTC

101 EV_TS_SET (ts, timeout); 101 EV_TS_SET (ts, timeout);
102 res = kevent (backend_fd, kqueue_changes, kqueue_changecnt, kqueue_events, kqueue_eventmax, &ts); 102 res = kevent (backend_fd, kqueue_changes, kqueue_changecnt, kqueue_events, kqueue_eventmax, &ts);
103 EV_ACQUIRE_CB; 103 EV_ACQUIRE_CB;
104 kqueue_changecnt = 0; 104 kqueue_changecnt = 0;
105 105
106 if (expect_false (res < 0)) 106 if (ecb_expect_false (res < 0))
107 { 107 {
108 if (errno != EINTR) 108 if (errno != EINTR)
109 ev_syserr ("(libev) kqueue kevent"); 109 ev_syserr ("(libev) kqueue kevent");
110 110
111 return; 111 return;
113 113
114 for (i = 0; i < res; ++i) 114 for (i = 0; i < res; ++i)
115 { 115 {
116 int fd = kqueue_events [i].ident; 116 int fd = kqueue_events [i].ident;
117 117
118 if (expect_false (kqueue_events [i].flags & EV_ERROR)) 118 if (ecb_expect_false (kqueue_events [i].flags & EV_ERROR))
119 { 119 {
120 int err = kqueue_events [i].data; 120 int err = kqueue_events [i].data;
121 121
122 /* we are only interested in errors for fds that we are interested in :) */ 122 /* we are only interested in errors for fds that we are interested in :) */
123 if (anfds [fd].events) 123 if (anfds [fd].events)
127 else if (err == EBADF) /* on EBADF, we re-check the fd */ 127 else if (err == EBADF) /* on EBADF, we re-check the fd */
128 { 128 {
129 if (fd_valid (fd)) 129 if (fd_valid (fd))
130 kqueue_modify (EV_A_ fd, 0, anfds [fd].events); 130 kqueue_modify (EV_A_ fd, 0, anfds [fd].events);
131 else 131 else
132 {
133 assert (("libev: kqueue found invalid fd", 0));
132 fd_kill (EV_A_ fd); 134 fd_kill (EV_A_ fd);
135 }
133 } 136 }
134 else /* on all other errors, we error out on the fd */ 137 else /* on all other errors, we error out on the fd */
138 {
139 assert (("libev: kqueue found invalid fd", 0));
135 fd_kill (EV_A_ fd); 140 fd_kill (EV_A_ fd);
141 }
136 } 142 }
137 } 143 }
138 else 144 else
139 fd_event ( 145 fd_event (
140 EV_A_ 146 EV_A_
143 : kqueue_events [i].filter == EVFILT_WRITE ? EV_WRITE 149 : kqueue_events [i].filter == EVFILT_WRITE ? EV_WRITE
144 : 0 150 : 0
145 ); 151 );
146 } 152 }
147 153
148 if (expect_false (res == kqueue_eventmax)) 154 if (ecb_expect_false (res == kqueue_eventmax))
149 { 155 {
150 ev_free (kqueue_events); 156 ev_free (kqueue_events);
151 kqueue_eventmax = array_nextsize (sizeof (struct kevent), kqueue_eventmax, kqueue_eventmax + 1); 157 kqueue_eventmax = array_nextsize (sizeof (struct kevent), kqueue_eventmax, kqueue_eventmax + 1);
152 kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax); 158 kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax);
153 } 159 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines