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

Comparing libev/event.c (file contents):
Revision 1.46 by root, Sun Oct 24 17:19:47 2010 UTC vs.
Revision 1.47 by root, Sun Oct 24 17:25:33 2010 UTC

45# include EV_EVENT_H 45# include EV_EVENT_H
46#else 46#else
47# include "event.h" 47# include "event.h"
48#endif 48#endif
49 49
50/* same definition as in ev.c */
51#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
52
53#if EV_MULTIPLICITY 50#if EV_MULTIPLICITY
54# define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base 51# define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base
55# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base 52# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base
56#else 53#else
57# define dLOOPev 54# define dLOOPev
299 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))
300 { 297 {
301 revents |= EV_TIMEOUT; 298 revents |= EV_TIMEOUT;
302 299
303 if (tv) 300 if (tv)
304 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 }
305 } 307 }
306 308
307 return events & revents; 309 return events & revents;
308} 310}
309 311

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines