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

Comparing libev/event.c (file contents):
Revision 1.37 by root, Wed Oct 29 17:50:57 2008 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 *
… …
39 39
40#include <stddef.h> 40#include <stddef.h>
41#include <stdlib.h> 41#include <stdlib.h>
42#include <assert.h> 42#include <assert.h>
43 43
44#ifndef WIN32
45# include <sys/time.h>
46#endif
47
48#ifdef EV_EVENT_H 44#ifdef EV_EVENT_H
49# include EV_EVENT_H 45# include EV_EVENT_H
50#else 46#else
51# include "event.h" 47# include "event.h"
52#endif 48#endif
… …
65 int dummy; 61 int dummy;
66}; 62};
67 63
68static struct event_base *ev_x_cur; 64static struct event_base *ev_x_cur;
69 65
70static void
71ev_tv_set (struct timeval *tv, ev_tstamp at)
72{
73 tv->tv_sec = (long)at;
74 tv->tv_usec = (long)((at - (ev_tstamp)tv->tv_sec) * 1e6);
75}
76
77static ev_tstamp 66static ev_tstamp
78ev_tv_get (struct timeval *tv) 67ev_tv_get (struct timeval *tv)
79{ 68{
80 if (tv) 69 if (tv)
70 {
81 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 }
82 else 74 else
83 return -1.; 75 return -1.;
84} 76}
85 77
86#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)
87 80
88const char *event_get_version (void) 81const char *event_get_version (void)
89{ 82{
83 /* returns ABI, not API or library, version */
90 return EVENT_VERSION (EV_VERSION_MAJOR, EV_VERSION_MINOR); 84 return EVENT_VERSION (EV_VERSION_MAJOR, EV_VERSION_MINOR);
91} 85}
92 86
93const char *event_get_method (void) 87const char *event_get_method (void)
94{ 88{
… …
101 if (ev_x_cur) 95 if (ev_x_cur)
102 ev_x_cur = (struct event_base *)ev_loop_new (EVFLAG_AUTO); 96 ev_x_cur = (struct event_base *)ev_loop_new (EVFLAG_AUTO);
103 else 97 else
104 ev_x_cur = (struct event_base *)ev_default_loop (EVFLAG_AUTO); 98 ev_x_cur = (struct event_base *)ev_default_loop (EVFLAG_AUTO);
105#else 99#else
106 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));
107 101
108 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);
109#endif 103#endif
110 104
111 return ev_x_cur; 105 return ev_x_cur;
… …
144} 138}
145 139
146static void 140static void
147ev_x_cb (struct event *ev, int revents) 141ev_x_cb (struct event *ev, int revents)
148{ 142{
149 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL; 143 revents &= EV_READ | EV_WRITE | EV_TIMER | EV_SIGNAL;
150 144
151 ev->ev_res = revents; 145 ev->ev_res = revents;
152 ev->ev_callback (ev->ev_fd, (short)revents, ev->ev_arg); 146 ev->ev_callback (ev->ev_fd, (short)revents, ev->ev_arg);
153} 147}
154 148
… …
302 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))
303 { 297 {
304 revents |= EV_TIMEOUT; 298 revents |= EV_TIMEOUT;
305 299
306 if (tv) 300 if (tv)
307 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 :) */
308 } 302 }
309 303
310 return events & revents; 304 return events & revents;
311} 305}
312 306
… …
331 325
332int event_base_loop (struct event_base *base, int flags) 326int event_base_loop (struct event_base *base, int flags)
333{ 327{
334 dLOOPbase; 328 dLOOPbase;
335 329
336 ev_loop (EV_A_ flags); 330 ev_run (EV_A_ flags);
337 331
338 return 0; 332 return 0;
339} 333}
340 334
341int event_base_dispatch (struct event_base *base) 335int event_base_dispatch (struct event_base *base)
… …
346static void 340static void
347ev_x_loopexit_cb (int revents, void *base) 341ev_x_loopexit_cb (int revents, void *base)
348{ 342{
349 dLOOPbase; 343 dLOOPbase;
350 344
351 ev_unloop (EV_A_ EVUNLOOP_ONE); 345 ev_break (EV_A_ EVBREAK_ONE);
352} 346}
353 347
354int event_base_loopexit (struct event_base *base, struct timeval *tv) 348int event_base_loopexit (struct event_base *base, struct timeval *tv)
355{ 349{
356 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