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

Comparing libev/event.c (file contents):
Revision 1.44 by root, Sat Oct 16 06:46:55 2010 UTC vs.
Revision 1.45 by root, Thu Oct 21 12:32:48 2010 UTC

138} 138}
139 139
140static void 140static void
141ev_x_cb (struct event *ev, int revents) 141ev_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
325 325
326int event_base_loop (struct event_base *base, int flags) 326int event_base_loop (struct event_base *base, int flags)
327{ 327{
328 dLOOPbase; 328 dLOOPbase;
329 329
330 ev_loop (EV_A_ flags); 330 ev_run (EV_A_ flags);
331 331
332 return 0; 332 return 0;
333} 333}
334 334
335int event_base_dispatch (struct event_base *base) 335int event_base_dispatch (struct event_base *base)
340static void 340static void
341ev_x_loopexit_cb (int revents, void *base) 341ev_x_loopexit_cb (int revents, void *base)
342{ 342{
343 dLOOPbase; 343 dLOOPbase;
344 344
345 ev_unloop (EV_A_ EVUNLOOP_ONE); 345 ev_break (EV_A_ EVBREAK_ONE);
346} 346}
347 347
348int event_base_loopexit (struct event_base *base, struct timeval *tv) 348int event_base_loopexit (struct event_base *base, struct timeval *tv)
349{ 349{
350 ev_tstamp after = ev_tv_get (tv); 350 ev_tstamp after = ev_tv_get (tv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines