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

Comparing libev/event.c (file contents):
Revision 1.45 by root, Thu Oct 21 12:32:48 2010 UTC vs.
Revision 1.49 by root, Tue Jan 4 01:28:56 2011 UTC

108void event_base_free (struct event_base *base) 108void 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
118int event_dispatch (void) 118int event_dispatch (void)
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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines