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

Comparing libev/event.c (file contents):
Revision 1.8 by root, Sat Nov 3 22:10:39 2007 UTC vs.
Revision 1.9 by root, Sun Nov 4 00:24:17 2007 UTC

… …
33#include <stdlib.h> 33#include <stdlib.h>
34#include <sys/time.h> 34#include <sys/time.h>
35 35
36#include "event.h" 36#include "event.h"
37 37
38#ifdef EV_MULTIPLICITY 38#if EV_MULTIPLICITY
39# define dLOOPev struct ev_loop *loop = ev->ev_base->loop 39# define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base
40# define dLOOPbase struct ev_loop *loop = base->loop 40# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base
41#else 41#else
42# define dLOOPev 42# define dLOOPev
43# define dLOOPbase 43# define dLOOPbase
44#endif 44#endif
45 45
46/* never accessed, will always be cast from/to ev_loop */
46struct event_base 47struct event_base
47{ 48{
48#ifdef EV_MULTIPLICITY
49 struct ev_loop *loop;
50#endif
51 int dummy; 49 int dummy;
52}; 50};
53 51
54static struct event_base x_base, *x_cur; 52static struct event_base x_base, *x_cur;
55 53
… …
81 return "libev"; 79 return "libev";
82} 80}
83 81
84void *event_init (void) 82void *event_init (void)
85{ 83{
86 if (!x_cur && ev_init (0)) 84#if EV_MULTIPLICITY
85 x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO);
86#else
87 return x_cur = &x_base; 87 x_cur = &x_base;
88#endif
88 89
89 return 0; 90 return x_cur;
90} 91}
91 92
92void event_base_free (struct event_base *base) 93void event_base_free (struct event_base *base)
93{ 94{
94 dLOOPbase; 95 dLOOPbase;
95 96
96 /* nop */ 97#if EV_MULTIPLICITY
98 ev_loop_delete (loop);
99#endif
97} 100}
98 101
99int event_dispatch (void) 102int event_dispatch (void)
100{ 103{
101 return event_base_dispatch (x_cur); 104 return event_base_dispatch (x_cur);
… …
137x_cb_io (EV_P_ struct ev_io *w, int revents) 140x_cb_io (EV_P_ struct ev_io *w, int revents)
138{ 141{
139 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io)); 142 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io));
140 143
141 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w)) 144 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w))
142 ev_io_stop (w); 145 ev_io_stop (EV_A_ w);
143 146
144 x_cb (ev, revents); 147 x_cb (ev, revents);
145} 148}
146 149
147static void 150static void
… …
150 x_cb ((struct event *)(((char *)w) - offsetof (struct event, to)), revents); 153 x_cb ((struct event *)(((char *)w) - offsetof (struct event, to)), revents);
151} 154}
152 155
153void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg) 156void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg)
154{ 157{
158 if (!ev->initialised)
159 {
160 ev->initialised = 1;
161
155 if (events & EV_SIGNAL) 162 if (events & EV_SIGNAL)
156 ev_watcher_init (&ev->iosig.sig, x_cb_sig); 163 ev_watcher_init (&ev->iosig.sig, x_cb_sig);
157 else 164 else
158 ev_watcher_init (&ev->iosig.io, x_cb_io); 165 ev_watcher_init (&ev->iosig.io, x_cb_io);
159 166
160 ev_watcher_init (&ev->to, x_cb_to); 167 ev_watcher_init (&ev->to, x_cb_to);
168 }
161 169
162 ev->ev_base = x_cur; 170 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */
163 ev->ev_fd = fd; 171 ev->ev_fd = fd;
164 ev->ev_events = events; 172 ev->ev_events = events;
165 ev->ev_pri = 0; 173 ev->ev_pri = 0;
166 ev->ev_callback = cb; 174 ev->ev_callback = cb;
167 ev->ev_arg = arg; 175 ev->ev_arg = arg;
… …
285{ 293{
286 return event_base_loop (base, 0); 294 return event_base_loop (base, 0);
287} 295}
288 296
289static void 297static void
290x_loopexit_cb (EV_P_ int revents, void *arg) 298x_loopexit_cb (int revents, void *base)
291{ 299{
300 dLOOPbase;
301
292 ev_unloop (EV_A_ 2); 302 ev_unloop (EV_A_ EVUNLOOP_ONCE);
293} 303}
294 304
295int event_base_loopexit (struct event_base *base, struct timeval *tv) 305int event_base_loopexit (struct event_base *base, struct timeval *tv)
296{ 306{
297 dLOOPbase; 307 dLOOPbase;

Diff Legend

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