… | |
… | |
89 | |
89 | |
90 | void *event_init (void) |
90 | void *event_init (void) |
91 | { |
91 | { |
92 | #if EV_MULTIPLICITY |
92 | #if EV_MULTIPLICITY |
93 | if (x_cur) |
93 | if (x_cur) |
94 | x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO); |
94 | x_cur = (struct event_base *)ev_loop_new (EVFLAG_AUTO); |
95 | else |
95 | else |
96 | x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO); |
96 | x_cur = (struct event_base *)ev_default_loop (EVFLAG_AUTO); |
97 | #else |
97 | #else |
98 | assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur)); |
98 | assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur)); |
99 | |
99 | |
100 | x_cur = (struct event_base *)(long)ev_default_loop (EVMETHOD_AUTO); |
100 | x_cur = (struct event_base *)(long)ev_default_loop (EVFLAG_AUTO); |
101 | #endif |
101 | #endif |
102 | |
102 | |
103 | return x_cur; |
103 | return x_cur; |
104 | } |
104 | } |
105 | |
105 | |
… | |
… | |
139 | x_cb (struct event *ev, int revents) |
139 | x_cb (struct event *ev, int revents) |
140 | { |
140 | { |
141 | revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL; |
141 | revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL; |
142 | |
142 | |
143 | ev->ev_res = revents; |
143 | ev->ev_res = revents; |
144 | ev->ev_callback (ev->ev_fd, revents, ev->ev_arg); |
144 | ev->ev_callback (ev->ev_fd, (short)revents, ev->ev_arg); |
145 | } |
145 | } |
146 | |
146 | |
147 | static void |
147 | static void |
148 | x_cb_sig (EV_P_ struct ev_signal *w, int revents) |
148 | x_cb_sig (EV_P_ struct ev_signal *w, int revents) |
149 | { |
149 | { |
… | |
… | |
161 | struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io)); |
161 | struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io)); |
162 | |
162 | |
163 | if (revents & EV_ERROR) |
163 | if (revents & EV_ERROR) |
164 | event_del (ev); |
164 | event_del (ev); |
165 | else if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w)) |
165 | else if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w)) |
|
|
166 | { |
166 | ev_io_stop (EV_A_ w); |
167 | ev_io_stop (EV_A_ w); |
|
|
168 | ev->ev_flags &= ~EVLIST_INSERTED; |
|
|
169 | } |
167 | |
170 | |
168 | x_cb (ev, revents); |
171 | x_cb (ev, revents); |
169 | } |
172 | } |
170 | |
173 | |
171 | static void |
174 | static void |
… | |
… | |
179 | } |
182 | } |
180 | |
183 | |
181 | void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg) |
184 | void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg) |
182 | { |
185 | { |
183 | if (events & EV_SIGNAL) |
186 | if (events & EV_SIGNAL) |
184 | ev_watcher_init (&ev->iosig.sig, x_cb_sig); |
187 | ev_init (&ev->iosig.sig, x_cb_sig); |
185 | else |
188 | else |
186 | ev_watcher_init (&ev->iosig.io, x_cb_io); |
189 | ev_init (&ev->iosig.io, x_cb_io); |
187 | |
190 | |
188 | ev_watcher_init (&ev->to, x_cb_to); |
191 | ev_init (&ev->to, x_cb_to); |
189 | |
192 | |
190 | ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */ |
193 | ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */ |
191 | ev->ev_fd = fd; |
194 | ev->ev_fd = fd; |
192 | ev->ev_events = events; |
195 | ev->ev_events = events; |
193 | ev->ev_pri = 0; |
196 | ev->ev_pri = 0; |
194 | ev->ev_callback = cb; |
197 | ev->ev_callback = cb; |
195 | ev->ev_arg = arg; |
198 | ev->ev_arg = arg; |
196 | ev->ev_res = 0; |
199 | ev->ev_res = 0; |
|
|
200 | ev->ev_flags = EVLIST_INIT; |
197 | } |
201 | } |
198 | |
202 | |
199 | int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) |
203 | int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) |
200 | { |
204 | { |
201 | return event_base_once (x_cur, fd, events, cb, arg, tv); |
205 | return event_base_once (x_cur, fd, events, cb, arg, tv); |
… | |
… | |
210 | |
214 | |
211 | if (ev->ev_events & EV_SIGNAL) |
215 | if (ev->ev_events & EV_SIGNAL) |
212 | { |
216 | { |
213 | ev_signal_set (&ev->iosig.sig, ev->ev_fd); |
217 | ev_signal_set (&ev->iosig.sig, ev->ev_fd); |
214 | ev_signal_start (EV_A_ &ev->iosig.sig); |
218 | ev_signal_start (EV_A_ &ev->iosig.sig); |
|
|
219 | |
|
|
220 | ev->ev_flags |= EVLIST_SIGNAL; |
215 | } |
221 | } |
216 | else if (ev->ev_events & (EV_READ | EV_WRITE)) |
222 | else if (ev->ev_events & (EV_READ | EV_WRITE)) |
217 | { |
223 | { |
218 | ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE)); |
224 | ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE)); |
219 | ev_io_start (EV_A_ &ev->iosig.io); |
225 | ev_io_start (EV_A_ &ev->iosig.io); |
|
|
226 | |
|
|
227 | ev->ev_flags |= EVLIST_INSERTED; |
220 | } |
228 | } |
221 | |
229 | |
222 | if (tv) |
230 | if (tv) |
223 | { |
231 | { |
224 | ev_timer_set (&ev->to, tv_get (tv), 0.); |
232 | ev_timer_set (&ev->to, tv_get (tv), 0.); |
225 | ev_timer_start (EV_A_ &ev->to); |
233 | ev_timer_start (EV_A_ &ev->to); |
|
|
234 | |
|
|
235 | ev->ev_flags |= EVLIST_TIMEOUT; |
226 | } |
236 | } |
|
|
237 | |
|
|
238 | ev->ev_flags |= EVLIST_ACTIVE; |
227 | |
239 | |
228 | return 0; |
240 | return 0; |
229 | } |
241 | } |
230 | |
242 | |
231 | int event_del (struct event *ev) |
243 | int event_del (struct event *ev) |
… | |
… | |
245 | ev_io_stop (EV_A_ &ev->iosig.io); |
257 | ev_io_stop (EV_A_ &ev->iosig.io); |
246 | } |
258 | } |
247 | |
259 | |
248 | if (ev_is_active (&ev->to)) |
260 | if (ev_is_active (&ev->to)) |
249 | ev_timer_stop (EV_A_ &ev->to); |
261 | ev_timer_stop (EV_A_ &ev->to); |
|
|
262 | |
|
|
263 | ev->ev_flags = EVLIST_INIT; |
250 | |
264 | |
251 | return 0; |
265 | return 0; |
252 | } |
266 | } |
253 | |
267 | |
254 | void event_active (struct event *ev, int res, short ncalls) |
268 | void event_active (struct event *ev, int res, short ncalls) |
… | |
… | |
356 | static void |
370 | static void |
357 | x_once_cb (int revents, void *arg) |
371 | x_once_cb (int revents, void *arg) |
358 | { |
372 | { |
359 | struct x_once *once = (struct x_once *)arg; |
373 | struct x_once *once = (struct x_once *)arg; |
360 | |
374 | |
361 | once->cb (once->fd, revents, once->arg); |
375 | once->cb (once->fd, (short)revents, once->arg); |
362 | free (once); |
376 | free (once); |
363 | } |
377 | } |
364 | |
378 | |
365 | int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) |
379 | int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) |
366 | { |
380 | { |