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

Comparing libev/event.c (file contents):
Revision 1.38 by root, Mon Nov 17 03:37:08 2008 UTC vs.
Revision 1.48 by root, Wed Nov 10 12:44:22 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{
… …
97 if (ev_x_cur) 95 if (ev_x_cur)
98 ev_x_cur = (struct event_base *)ev_loop_new (EVFLAG_AUTO); 96 ev_x_cur = (struct event_base *)ev_loop_new (EVFLAG_AUTO);
99 else 97 else
100 ev_x_cur = (struct event_base *)ev_default_loop (EVFLAG_AUTO); 98 ev_x_cur = (struct event_base *)ev_default_loop (EVFLAG_AUTO);
101#else 99#else
102 assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !ev_x_cur)); 100 assert (("libev: multiple event bases not supported when not compiled with EV_MULTIPLICITY", !ev_x_cur));
103 101
104 ev_x_cur = (struct event_base *)(long)ev_default_loop (EVFLAG_AUTO); 102 ev_x_cur = (struct event_base *)(long)ev_default_loop (EVFLAG_AUTO);
105#endif 103#endif
106 104
107 return ev_x_cur; 105 return ev_x_cur;
… …
110void event_base_free (struct event_base *base) 108void event_base_free (struct event_base *base)
111{ 109{
112 dLOOPbase; 110 dLOOPbase;
113 111
114#if EV_MULTIPLICITY 112#if EV_MULTIPLICITY
115 if (ev_default_loop (EVFLAG_AUTO) != loop) 113 if (!is_default_loop (loop))
116 ev_loop_destroy (loop); 114 ev_loop_destroy (loop);
117#endif 115#endif
118} 116}
119 117
120int event_dispatch (void) 118int event_dispatch (void)
… …
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 {
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 }
304 } 307 }
305 308
306 return events & revents; 309 return events & revents;
307} 310}
308 311
… …
327 330
328int event_base_loop (struct event_base *base, int flags) 331int event_base_loop (struct event_base *base, int flags)
329{ 332{
330 dLOOPbase; 333 dLOOPbase;
331 334
332 ev_loop (EV_A_ flags); 335 ev_run (EV_A_ flags);
333 336
334 return 0; 337 return 0;
335} 338}
336 339
337int event_base_dispatch (struct event_base *base) 340int event_base_dispatch (struct event_base *base)
… …
342static void 345static void
343ev_x_loopexit_cb (int revents, void *base) 346ev_x_loopexit_cb (int revents, void *base)
344{ 347{
345 dLOOPbase; 348 dLOOPbase;
346 349
347 ev_unloop (EV_A_ EVUNLOOP_ONE); 350 ev_break (EV_A_ EVBREAK_ONE);
348} 351}
349 352
350int event_base_loopexit (struct event_base *base, struct timeval *tv) 353int event_base_loopexit (struct event_base *base, struct timeval *tv)
351{ 354{
352 ev_tstamp after = ev_tv_get (tv); 355 ev_tstamp after = ev_tv_get (tv);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines