… | |
… | |
108 | void event_base_free (struct event_base *base) |
108 | void event_base_free (struct event_base *base) |
109 | { |
109 | { |
110 | dLOOPbase; |
110 | dLOOPbase; |
111 | |
111 | |
112 | #if EV_MULTIPLICITY |
112 | #if EV_MULTIPLICITY |
113 | if (ev_default_loop (EVFLAG_AUTO) != loop) |
113 | if (!ev_is_default_loop (loop)) |
114 | ev_loop_destroy (loop); |
114 | ev_loop_destroy (loop); |
115 | #endif |
115 | #endif |
116 | } |
116 | } |
117 | |
117 | |
118 | int event_dispatch (void) |
118 | int event_dispatch (void) |
… | |
… | |
138 | } |
138 | } |
139 | |
139 | |
140 | static void |
140 | static void |
141 | ev_x_cb (struct event *ev, int revents) |
141 | ev_x_cb (struct event *ev, int revents) |
142 | { |
142 | { |
143 | revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL; |
143 | revents &= EV_READ | EV_WRITE | EV_TIMER | EV_SIGNAL; |
144 | |
144 | |
145 | ev->ev_res = revents; |
145 | ev->ev_res = revents; |
146 | ev->ev_callback (ev->ev_fd, (short)revents, ev->ev_arg); |
146 | ev->ev_callback (ev->ev_fd, (short)revents, ev->ev_arg); |
147 | } |
147 | } |
148 | |
148 | |
… | |
… | |
296 | if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to)) |
296 | if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to)) |
297 | { |
297 | { |
298 | revents |= EV_TIMEOUT; |
298 | revents |= EV_TIMEOUT; |
299 | |
299 | |
300 | if (tv) |
300 | if (tv) |
301 | EV_TV_SET (tv, ev_now (EV_A)); /* not sure if this is right :) */ |
301 | { |
|
|
302 | ev_tstamp at = ev_now (EV_A); |
|
|
303 | |
|
|
304 | tv->tv_sec = (long)at; |
|
|
305 | tv->tv_usec = (long)((at - (ev_tstamp)tv->tv_sec) * 1e6); |
|
|
306 | } |
302 | } |
307 | } |
303 | |
308 | |
304 | return events & revents; |
309 | return events & revents; |
305 | } |
310 | } |
306 | |
311 | |
… | |
… | |
325 | |
330 | |
326 | int event_base_loop (struct event_base *base, int flags) |
331 | int event_base_loop (struct event_base *base, int flags) |
327 | { |
332 | { |
328 | dLOOPbase; |
333 | dLOOPbase; |
329 | |
334 | |
330 | ev_loop (EV_A_ flags); |
335 | ev_run (EV_A_ flags); |
331 | |
336 | |
332 | return 0; |
337 | return 0; |
333 | } |
338 | } |
334 | |
339 | |
335 | int event_base_dispatch (struct event_base *base) |
340 | int event_base_dispatch (struct event_base *base) |
… | |
… | |
340 | static void |
345 | static void |
341 | ev_x_loopexit_cb (int revents, void *base) |
346 | ev_x_loopexit_cb (int revents, void *base) |
342 | { |
347 | { |
343 | dLOOPbase; |
348 | dLOOPbase; |
344 | |
349 | |
345 | ev_unloop (EV_A_ EVUNLOOP_ONE); |
350 | ev_break (EV_A_ EVBREAK_ONE); |
346 | } |
351 | } |
347 | |
352 | |
348 | int event_base_loopexit (struct event_base *base, struct timeval *tv) |
353 | int event_base_loopexit (struct event_base *base, struct timeval *tv) |
349 | { |
354 | { |
350 | ev_tstamp after = ev_tv_get (tv); |
355 | ev_tstamp after = ev_tv_get (tv); |