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.46 by root, Sun Oct 24 17:19:47 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 *
… …
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
50#if EV_MULTIPLICITY 53#if EV_MULTIPLICITY
51# define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base 54# define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base
52# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base 55# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base
53#else 56#else
54# define dLOOPev 57# define dLOOPev
… …
61 int dummy; 64 int dummy;
62}; 65};
63 66
64static struct event_base *ev_x_cur; 67static struct event_base *ev_x_cur;
65 68
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 69static ev_tstamp
74ev_tv_get (struct timeval *tv) 70ev_tv_get (struct timeval *tv)
75{ 71{
76 if (tv) 72 if (tv)
73 {
77 return tv->tv_sec + tv->tv_usec * 1e-6; 74 ev_tstamp after = tv->tv_sec + tv->tv_usec * 1e-6;
75 return after ? after : 1e-6;
76 }
78 else 77 else
79 return -1.; 78 return -1.;
80} 79}
81 80
82#define EVENT_VERSION(a,b) # a "." # b 81#define EVENT_STRINGIFY(s) # s
82#define EVENT_VERSION(a,b) EVENT_STRINGIFY (a) "." EVENT_STRINGIFY (b)
83 83
84const char *event_get_version (void) 84const char *event_get_version (void)
85{ 85{
86 /* returns ABI, not API or library, version */
86 return EVENT_VERSION (EV_VERSION_MAJOR, EV_VERSION_MINOR); 87 return EVENT_VERSION (EV_VERSION_MAJOR, EV_VERSION_MINOR);
87} 88}
88 89
89const char *event_get_method (void) 90const char *event_get_method (void)
90{ 91{
… …
97 if (ev_x_cur) 98 if (ev_x_cur)
98 ev_x_cur = (struct event_base *)ev_loop_new (EVFLAG_AUTO); 99 ev_x_cur = (struct event_base *)ev_loop_new (EVFLAG_AUTO);
99 else 100 else
100 ev_x_cur = (struct event_base *)ev_default_loop (EVFLAG_AUTO); 101 ev_x_cur = (struct event_base *)ev_default_loop (EVFLAG_AUTO);
101#else 102#else
102 assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !ev_x_cur)); 103 assert (("libev: multiple event bases not supported when not compiled with EV_MULTIPLICITY", !ev_x_cur));
103 104
104 ev_x_cur = (struct event_base *)(long)ev_default_loop (EVFLAG_AUTO); 105 ev_x_cur = (struct event_base *)(long)ev_default_loop (EVFLAG_AUTO);
105#endif 106#endif
106 107
107 return ev_x_cur; 108 return ev_x_cur;
… …
140} 141}
141 142
142static void 143static void
143ev_x_cb (struct event *ev, int revents) 144ev_x_cb (struct event *ev, int revents)
144{ 145{
145 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL; 146 revents &= EV_READ | EV_WRITE | EV_TIMER | EV_SIGNAL;
146 147
147 ev->ev_res = revents; 148 ev->ev_res = revents;
148 ev->ev_callback (ev->ev_fd, (short)revents, ev->ev_arg); 149 ev->ev_callback (ev->ev_fd, (short)revents, ev->ev_arg);
149} 150}
150 151
… …
298 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to)) 299 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to))
299 { 300 {
300 revents |= EV_TIMEOUT; 301 revents |= EV_TIMEOUT;
301 302
302 if (tv) 303 if (tv)
303 ev_tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */ 304 EV_TV_SET (tv, ev_now (EV_A)); /* not sure if this is right :) */
304 } 305 }
305 306
306 return events & revents; 307 return events & revents;
307} 308}
308 309
… …
327 328
328int event_base_loop (struct event_base *base, int flags) 329int event_base_loop (struct event_base *base, int flags)
329{ 330{
330 dLOOPbase; 331 dLOOPbase;
331 332
332 ev_loop (EV_A_ flags); 333 ev_run (EV_A_ flags);
333 334
334 return 0; 335 return 0;
335} 336}
336 337
337int event_base_dispatch (struct event_base *base) 338int event_base_dispatch (struct event_base *base)
… …
342static void 343static void
343ev_x_loopexit_cb (int revents, void *base) 344ev_x_loopexit_cb (int revents, void *base)
344{ 345{
345 dLOOPbase; 346 dLOOPbase;
346 347
347 ev_unloop (EV_A_ EVUNLOOP_ONE); 348 ev_break (EV_A_ EVBREAK_ONE);
348} 349}
349 350
350int event_base_loopexit (struct event_base *base, struct timeval *tv) 351int event_base_loopexit (struct event_base *base, struct timeval *tv)
351{ 352{
352 ev_tstamp after = ev_tv_get (tv); 353 ev_tstamp after = ev_tv_get (tv);

Diff Legend

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