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

Comparing libev/event.c (file contents):
Revision 1.39 by root, Tue Jan 6 19:46:56 2009 UTC vs.
Revision 1.45 by root, Thu Oct 21 12:32:48 2010 UTC

1/* 1/*
2 * libevent compatibility layer 2 * libevent compatibility layer
3 * 3 *
4 * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
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_VERSION(a,b) # a "." # b 78#define EVENT_STRINGIFY(s) # s
79#define EVENT_VERSION(a,b) EVENT_STRINGIFY (a) "." EVENT_STRINGIFY (b)
83 80
84const char *event_get_version (void) 81const char *event_get_version (void)
85{ 82{
83 /* returns ABI, not API or library, version */
86 return EVENT_VERSION (EV_VERSION_MAJOR, EV_VERSION_MINOR); 84 return EVENT_VERSION (EV_VERSION_MAJOR, EV_VERSION_MINOR);
87} 85}
88 86
89const char *event_get_method (void) 87const char *event_get_method (void)
90{ 88{
… …
140} 138}
141 139
142static void 140static void
143ev_x_cb (struct event *ev, int revents) 141ev_x_cb (struct event *ev, int revents)
144{ 142{
145 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL; 143 revents &= EV_READ | EV_WRITE | EV_TIMER | EV_SIGNAL;
146 144
147 ev->ev_res = revents; 145 ev->ev_res = revents;
148 ev->ev_callback (ev->ev_fd, (short)revents, ev->ev_arg); 146 ev->ev_callback (ev->ev_fd, (short)revents, ev->ev_arg);
149} 147}
150 148
… …
298 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))
299 { 297 {
300 revents |= EV_TIMEOUT; 298 revents |= EV_TIMEOUT;
301 299
302 if (tv) 300 if (tv)
303 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 :) */
304 } 302 }
305 303
306 return events & revents; 304 return events & revents;
307} 305}
308 306
… …
327 325
328int event_base_loop (struct event_base *base, int flags) 326int event_base_loop (struct event_base *base, int flags)
329{ 327{
330 dLOOPbase; 328 dLOOPbase;
331 329
332 ev_loop (EV_A_ flags); 330 ev_run (EV_A_ flags);
333 331
334 return 0; 332 return 0;
335} 333}
336 334
337int event_base_dispatch (struct event_base *base) 335int event_base_dispatch (struct event_base *base)
… …
342static void 340static void
343ev_x_loopexit_cb (int revents, void *base) 341ev_x_loopexit_cb (int revents, void *base)
344{ 342{
345 dLOOPbase; 343 dLOOPbase;
346 344
347 ev_unloop (EV_A_ EVUNLOOP_ONE); 345 ev_break (EV_A_ EVBREAK_ONE);
348} 346}
349 347
350int event_base_loopexit (struct event_base *base, struct timeval *tv) 348int event_base_loopexit (struct event_base *base, struct timeval *tv)
351{ 349{
352 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