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

Comparing libev/event.c (file contents):
Revision 1.41 by root, Wed Jan 7 20:45:52 2009 UTC vs.
Revision 1.43 by root, Fri Oct 15 22:44:42 2010 UTC

61 int dummy; 61 int dummy;
62}; 62};
63 63
64static struct event_base *ev_x_cur; 64static struct event_base *ev_x_cur;
65 65
66static void
67ev_tv_set (struct timeval *tv, ev_tstamp at)
68{
69 tv->tv_sec = (long)at;
70 tv->tv_usec = (long)((at - (ev_tstamp)tv->tv_sec) * 1e6);
71}
72
73static ev_tstamp 66static ev_tstamp
74ev_tv_get (struct timeval *tv) 67ev_tv_get (struct timeval *tv)
75{ 68{
76 if (tv) 69 if (tv)
70 {
77 return tv->tv_sec + tv->tv_usec * 1e-6; 71 ev_tstamp after = tv->tv_sec + tv->tv_usec * 1e-6;
72 return after ? after : 1e-6;
73 }
78 else 74 else
79 return -1.; 75 return -1.;
80} 76}
81 77
82#define EVENT_STRINGIFY(s) # s 78#define EVENT_STRINGIFY(s) # s
300 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))
301 { 297 {
302 revents |= EV_TIMEOUT; 298 revents |= EV_TIMEOUT;
303 299
304 if (tv) 300 if (tv)
305 ev_tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */ 301 EV_TV_SET (tv, ev_now (EV_A)); /* not sure if this is right :) */
306 } 302 }
307 303
308 return events & revents; 304 return events & revents;
309} 305}
310 306

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines