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

Comparing libev/event.c (file contents):
Revision 1.7 by root, Sat Nov 3 21:58:51 2007 UTC vs.
Revision 1.12 by root, Sun Nov 4 18:15:16 2007 UTC

30 */ 30 */
31 31
32#include <stddef.h> 32#include <stddef.h>
33#include <stdlib.h> 33#include <stdlib.h>
34#include <sys/time.h> 34#include <sys/time.h>
35#include <assert.h>
35 36
37#include "ev.h"
36#include "event.h" 38#include "event.h"
37 39
40#if EV_MULTIPLICITY
41# define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base
42# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base
43#else
38#define dLOOPev 44# define dLOOPev
39#define dLOOPbase 45# define dLOOPbase
46#endif
40 47
48/* never accessed, will always be cast from/to ev_loop */
41struct event_base 49struct event_base
42{ 50{
43 int dummy; 51 int dummy;
44}; 52};
45 53
46static struct event_base x_base, *x_cur; 54static struct event_base *x_cur;
47 55
48static void 56static void
49tv_set (struct timeval *tv, ev_tstamp at) 57tv_set (struct timeval *tv, ev_tstamp at)
50{ 58{
51 tv->tv_sec = (long)at; 59 tv->tv_sec = (long)at;
73 return "libev"; 81 return "libev";
74} 82}
75 83
76void *event_init (void) 84void *event_init (void)
77{ 85{
78 if (!x_cur && ev_init (0)) 86#if EV_MULTIPLICITY
79 return x_cur = &x_base; 87 if (x_cur)
88 x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO);
89 else
90 x_cur = ev_default_loop (EVMETHOD_AUTO);
91#else
92 assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur));
80 93
94 x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO);
95#endif
96
81 return 0; 97 return x_cur;
82} 98}
83 99
84void event_base_free (struct event_base *base) 100void event_base_free (struct event_base *base)
85{ 101{
86 /* nop */ 102 dLOOPbase;
103
104#if EV_MULTIPLICITY
105 ev_loop_delete (loop);
106#endif
87} 107}
88 108
89int event_dispatch (void) 109int event_dispatch (void)
90{ 110{
91 return event_base_dispatch (x_cur); 111 return event_base_dispatch (x_cur);
127x_cb_io (EV_P_ struct ev_io *w, int revents) 147x_cb_io (EV_P_ struct ev_io *w, int revents)
128{ 148{
129 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io)); 149 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io));
130 150
131 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w)) 151 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w))
132 ev_io_stop (w); 152 ev_io_stop (EV_A_ w);
133 153
134 x_cb (ev, revents); 154 x_cb (ev, revents);
135} 155}
136 156
137static void 157static void
140 x_cb ((struct event *)(((char *)w) - offsetof (struct event, to)), revents); 160 x_cb ((struct event *)(((char *)w) - offsetof (struct event, to)), revents);
141} 161}
142 162
143void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg) 163void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg)
144{ 164{
165 if (!ev->initialised)
166 {
167 ev->initialised = 1;
168
145 if (events & EV_SIGNAL) 169 if (events & EV_SIGNAL)
146 ev_watcher_init (&ev->iosig.sig, x_cb_sig); 170 ev_watcher_init (&ev->iosig.sig, x_cb_sig);
147 else 171 else
148 ev_watcher_init (&ev->iosig.io, x_cb_io); 172 ev_watcher_init (&ev->iosig.io, x_cb_io);
149 173
150 ev_watcher_init (&ev->to, x_cb_to); 174 ev_watcher_init (&ev->to, x_cb_to);
175 }
151 176
152 ev->ev_base = x_cur; 177 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */
153 ev->ev_fd = fd; 178 ev->ev_fd = fd;
154 ev->ev_events = events; 179 ev->ev_events = events;
155 ev->ev_pri = 0; 180 ev->ev_pri = 0;
156 ev->ev_callback = cb; 181 ev->ev_callback = cb;
157 ev->ev_arg = arg; 182 ev->ev_arg = arg;
263} 288}
264 289
265int event_base_loop (struct event_base *base, int flags) 290int event_base_loop (struct event_base *base, int flags)
266{ 291{
267 dLOOPbase; 292 dLOOPbase;
268 ev_loop (EV_A_ flags | EVLOOP_ONESHOT); 293
294 ev_loop (EV_A_ flags);
269 295
270 return 0; 296 return 0;
271} 297}
272 298
273int event_base_dispatch (struct event_base *base) 299int event_base_dispatch (struct event_base *base)
274{ 300{
275 return event_base_loop (base, 0); 301 return event_base_loop (base, 0);
276} 302}
277 303
278static void 304static void
279x_loopexit_cb (EV_P_ int revents, void *arg) 305x_loopexit_cb (int revents, void *base)
280{ 306{
307 dLOOPbase;
308
281 ev_unloop (EV_A_ 2); 309 ev_unloop (EV_A_ EVUNLOOP_ONCE);
282} 310}
283 311
284int event_base_loopexit (struct event_base *base, struct timeval *tv) 312int event_base_loopexit (struct event_base *base, struct timeval *tv)
285{ 313{
286 dLOOPbase; 314 dLOOPbase;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines