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.15 by root, Sun Nov 4 20:38:07 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 = (struct event_base *)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 if (ev_default_loop (EVMETHOD_AUTO) != loop)
106 ev_loop_destroy (loop);
107#endif
87} 108}
88 109
89int event_dispatch (void) 110int event_dispatch (void)
90{ 111{
91 return event_base_dispatch (x_cur); 112 return event_base_dispatch (x_cur);
… …
127x_cb_io (EV_P_ struct ev_io *w, int revents) 148x_cb_io (EV_P_ struct ev_io *w, int revents)
128{ 149{
129 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io)); 150 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io));
130 151
131 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w)) 152 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w))
132 ev_io_stop (w); 153 ev_io_stop (EV_A_ w);
133 154
134 x_cb (ev, revents); 155 x_cb (ev, revents);
135} 156}
136 157
137static void 158static void
138x_cb_to (EV_P_ struct ev_timer *w, int revents) 159x_cb_to (EV_P_ struct ev_timer *w, int revents)
139{ 160{
140 x_cb ((struct event *)(((char *)w) - offsetof (struct event, to)), revents); 161 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, to));
162
163 event_del (ev);
164
165 x_cb (ev, revents);
141} 166}
142 167
143void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg) 168void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg)
144{ 169{
170 printf ("event set %p\n", ev);//D
145 if (events & EV_SIGNAL) 171 if (events & EV_SIGNAL)
146 ev_watcher_init (&ev->iosig.sig, x_cb_sig); 172 ev_watcher_init (&ev->iosig.sig, x_cb_sig);
147 else 173 else
148 ev_watcher_init (&ev->iosig.io, x_cb_io); 174 ev_watcher_init (&ev->iosig.io, x_cb_io);
149 175
150 ev_watcher_init (&ev->to, x_cb_to); 176 ev_watcher_init (&ev->to, x_cb_to);
151 177
152 ev->ev_base = x_cur; 178 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */
153 ev->ev_fd = fd; 179 ev->ev_fd = fd;
154 ev->ev_events = events; 180 ev->ev_events = events;
155 ev->ev_pri = 0; 181 ev->ev_pri = 0;
156 ev->ev_callback = cb; 182 ev->ev_callback = cb;
157 ev->ev_arg = arg; 183 ev->ev_arg = arg;
… …
163 return event_base_once (x_cur, fd, events, cb, arg, tv); 189 return event_base_once (x_cur, fd, events, cb, arg, tv);
164} 190}
165 191
166int event_add (struct event *ev, struct timeval *tv) 192int event_add (struct event *ev, struct timeval *tv)
167{ 193{
194 printf ("event add %p %p\n", ev, &ev->to);//D
168 dLOOPev; 195 dLOOPev;
169 196
170 /* disable all watchers */ 197 /* disable all watchers */
171 event_del (ev); 198 event_del (ev);
172 199
… …
190 return 0; 217 return 0;
191} 218}
192 219
193int event_del (struct event *ev) 220int event_del (struct event *ev)
194{ 221{
222 printf ("event del %p\n", ev);//D
195 dLOOPev; 223 dLOOPev;
196 224
197 if (ev->ev_events & EV_SIGNAL) 225 if (ev->ev_events & EV_SIGNAL)
198 { 226 {
199 /* sig */ 227 /* sig */
… …
205 /* io */ 233 /* io */
206 if (ev_is_active (&ev->iosig.io)) 234 if (ev_is_active (&ev->iosig.io))
207 ev_io_stop (EV_A_ &ev->iosig.io); 235 ev_io_stop (EV_A_ &ev->iosig.io);
208 } 236 }
209 237
238 printf ("to %p %d\n", &ev->to, ev->to.active);//D
210 if (ev_is_active (&ev->to)) 239 if (ev_is_active (&ev->to))
211 ev_timer_stop (EV_A_ &ev->to); 240 ev_timer_stop (EV_A_ &ev->to);
212 241
213 return 0; 242 return 0;
214} 243}
… …
220 short revents = 0; 249 short revents = 0;
221 250
222 if (ev->ev_events & EV_SIGNAL) 251 if (ev->ev_events & EV_SIGNAL)
223 { 252 {
224 /* sig */ 253 /* sig */
225 if (ev->iosig.sig.pending) 254 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
226 revents |= EV_SIGNAL; 255 revents |= EV_SIGNAL;
227 } 256 }
228 else 257 else
229 { 258 {
230 /* io */ 259 /* io */
231 if (ev->iosig.io.pending) 260 if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))
232 revents |= ev->ev_events & (EV_READ | EV_WRITE); 261 revents |= ev->ev_events & (EV_READ | EV_WRITE);
233 } 262 }
234 263
235 if (ev->to.pending) 264 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to))
236 { 265 {
237 revents |= EV_TIMEOUT; 266 revents |= EV_TIMEOUT;
238 267
239 if (tv) 268 if (tv)
240 tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */ 269 tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */
… …
263} 292}
264 293
265int event_base_loop (struct event_base *base, int flags) 294int event_base_loop (struct event_base *base, int flags)
266{ 295{
267 dLOOPbase; 296 dLOOPbase;
268 ev_loop (EV_A_ flags | EVLOOP_ONESHOT); 297
298 ev_loop (EV_A_ flags);
269 299
270 return 0; 300 return 0;
271} 301}
272 302
273int event_base_dispatch (struct event_base *base) 303int event_base_dispatch (struct event_base *base)
274{ 304{
275 return event_base_loop (base, 0); 305 return event_base_loop (base, 0);
276} 306}
277 307
278static void 308static void
279x_loopexit_cb (EV_P_ int revents, void *arg) 309x_loopexit_cb (int revents, void *base)
280{ 310{
311 dLOOPbase;
312
281 ev_unloop (EV_A_ 2); 313 ev_unloop (EV_A_ EVUNLOOP_ONCE);
282} 314}
283 315
284int event_base_loopexit (struct event_base *base, struct timeval *tv) 316int event_base_loopexit (struct event_base *base, struct timeval *tv)
285{ 317{
286 dLOOPbase; 318 dLOOPbase;
… …
324 return 0; 356 return 0;
325} 357}
326 358
327int event_base_priority_init (struct event_base *base, int npri) 359int event_base_priority_init (struct event_base *base, int npri)
328{ 360{
329 dLOOPbase; 361 /*dLOOPbase;*/
330 362
331 return 0; 363 return 0;
332} 364}
333 365

Diff Legend

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