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

Comparing libev/event.c (file contents):
Revision 1.6 by root, Sat Nov 3 20:24:42 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
44# define dLOOPev
45# define dLOOPbase
46#endif
47
48/* never accessed, will always be cast from/to ev_loop */
38struct event_base 49struct event_base
39{ 50{
40 int dummy; 51 int dummy;
41}; 52};
42 53
43static int x_actives;
44
45static struct event_base x_base, *x_cur; 54static struct event_base *x_cur;
46 55
47static void 56static void
48tv_set (struct timeval *tv, ev_tstamp at) 57tv_set (struct timeval *tv, ev_tstamp at)
49{ 58{
50 tv->tv_sec = (long)at; 59 tv->tv_sec = (long)at;
… …
72 return "libev"; 81 return "libev";
73} 82}
74 83
75void *event_init (void) 84void *event_init (void)
76{ 85{
77 if (!x_cur && ev_init (0)) 86#if EV_MULTIPLICITY
78 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));
79 93
94 x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO);
95#endif
96
80 return 0; 97 return x_cur;
81} 98}
82 99
83void event_base_free (struct event_base *base) 100void event_base_free (struct event_base *base)
84{ 101{
85 /* nop */ 102 dLOOPbase;
103
104#if EV_MULTIPLICITY
105 if (ev_default_loop (EVMETHOD_AUTO) != loop)
106 ev_loop_destroy (loop);
107#endif
86} 108}
87 109
88int event_dispatch (void) 110int event_dispatch (void)
89{ 111{
90 return event_base_dispatch (x_cur); 112 return event_base_dispatch (x_cur);
… …
108} 130}
109 131
110static void 132static void
111x_cb (struct event *ev, int revents) 133x_cb (struct event *ev, int revents)
112{ 134{
113 if (ev->ev_events & EV_SIGNAL)
114 {
115 /* sig */
116 if (ev_is_active (&ev->iosig.sig))
117 {
118 ev_signal_stop (&ev->iosig.sig);
119 --x_actives;
120 }
121 }
122 else
123 {
124 /* io */
125 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (&ev->iosig.io))
126 {
127 ev_io_stop (&ev->iosig.io);
128 --x_actives;
129 }
130 }
131
132 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL; 135 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL;
133
134 if (revents & EV_TIMEOUT)
135 --x_actives;
136 136
137 ev->ev_res = revents; 137 ev->ev_res = revents;
138 ev->ev_callback (ev->ev_fd, revents, ev->ev_arg); 138 ev->ev_callback (ev->ev_fd, revents, ev->ev_arg);
139} 139}
140 140
141static void 141static void
142x_cb_io (struct ev_io *w, int revents)
143{
144 x_cb ((struct event *)(((char *)w) - offsetof (struct event, iosig.io)), revents);
145}
146
147static void
148x_cb_to (struct ev_timer *w, int revents)
149{
150 x_cb ((struct event *)(((char *)w) - offsetof (struct event, to)), revents);
151}
152
153static void
154x_cb_sig (struct ev_signal *w, int revents) 142x_cb_sig (EV_P_ struct ev_signal *w, int revents)
155{ 143{
156 x_cb ((struct event *)(((char *)w) - offsetof (struct event, iosig.sig)), revents); 144 x_cb ((struct event *)(((char *)w) - offsetof (struct event, iosig.sig)), revents);
157} 145}
158 146
147static void
148x_cb_io (EV_P_ struct ev_io *w, int revents)
149{
150 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io));
151
152 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w))
153 ev_io_stop (EV_A_ w);
154
155 x_cb (ev, revents);
156}
157
158static void
159x_cb_to (EV_P_ struct ev_timer *w, int revents)
160{
161 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, to));
162
163 event_del (ev);
164
165 x_cb (ev, revents);
166}
167
159void 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)
160{ 169{
170 printf ("event set %p\n", ev);//D
161 if (events & EV_SIGNAL) 171 if (events & EV_SIGNAL)
162 ev_watcher_init (&ev->iosig.sig, x_cb_sig); 172 ev_watcher_init (&ev->iosig.sig, x_cb_sig);
163 else 173 else
164 ev_watcher_init (&ev->iosig.io, x_cb_io); 174 ev_watcher_init (&ev->iosig.io, x_cb_io);
165 175
166 ev_watcher_init (&ev->to, x_cb_to); 176 ev_watcher_init (&ev->to, x_cb_to);
167 177
168 ev->ev_base = x_cur; 178 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */
169 ev->ev_fd = fd; 179 ev->ev_fd = fd;
170 ev->ev_events = events; 180 ev->ev_events = events;
171 ev->ev_pri = 0; 181 ev->ev_pri = 0;
172 ev->ev_callback = cb; 182 ev->ev_callback = cb;
173 ev->ev_arg = arg; 183 ev->ev_arg = arg;
… …
179 return event_base_once (x_cur, fd, events, cb, arg, tv); 189 return event_base_once (x_cur, fd, events, cb, arg, tv);
180} 190}
181 191
182int event_add (struct event *ev, struct timeval *tv) 192int event_add (struct event *ev, struct timeval *tv)
183{ 193{
194 printf ("event add %p %p\n", ev, &ev->to);//D
195 dLOOPev;
196
184 /* disable all watchers */ 197 /* disable all watchers */
185 event_del (ev); 198 event_del (ev);
186 199
187 if (ev->ev_events & EV_SIGNAL) 200 if (ev->ev_events & EV_SIGNAL)
188 { 201 {
189 ev_signal_set (&ev->iosig.sig, ev->ev_fd); 202 ev_signal_set (&ev->iosig.sig, ev->ev_fd);
190 ev_signal_start (&ev->iosig.sig); 203 ev_signal_start (EV_A_ &ev->iosig.sig);
191 ++x_actives;
192 } 204 }
193 else if (ev->ev_events & (EV_READ | EV_WRITE)) 205 else if (ev->ev_events & (EV_READ | EV_WRITE))
194 { 206 {
195 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE)); 207 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE));
196 ev_io_start (&ev->iosig.io); 208 ev_io_start (EV_A_ &ev->iosig.io);
197 ++x_actives;
198 } 209 }
199 210
200 if (tv) 211 if (tv)
201 { 212 {
202 ev_timer_set (&ev->to, tv_get (tv), 0.); 213 ev_timer_set (&ev->to, tv_get (tv), 0.);
203 ev_timer_start (&ev->to); 214 ev_timer_start (EV_A_ &ev->to);
204 ++x_actives;
205 } 215 }
206 216
207 return 0; 217 return 0;
208} 218}
209 219
210int event_del (struct event *ev) 220int event_del (struct event *ev)
211{ 221{
222 printf ("event del %p\n", ev);//D
223 dLOOPev;
224
212 if (ev->ev_events & EV_SIGNAL) 225 if (ev->ev_events & EV_SIGNAL)
213 { 226 {
214 /* sig */ 227 /* sig */
215 if (ev_is_active (&ev->iosig.sig)) 228 if (ev_is_active (&ev->iosig.sig))
216 {
217 ev_signal_stop (&ev->iosig.sig); 229 ev_signal_stop (EV_A_ &ev->iosig.sig);
218 --x_actives;
219 }
220 } 230 }
221 else 231 else
222 { 232 {
223 /* io */ 233 /* io */
224 if (ev_is_active (&ev->iosig.io)) 234 if (ev_is_active (&ev->iosig.io))
225 {
226 ev_io_stop (&ev->iosig.io); 235 ev_io_stop (EV_A_ &ev->iosig.io);
227 --x_actives;
228 }
229 } 236 }
230 237
238 printf ("to %p %d\n", &ev->to, ev->to.active);//D
231 if (ev_is_active (&ev->to)) 239 if (ev_is_active (&ev->to))
232 {
233 ev_timer_stop (&ev->to); 240 ev_timer_stop (EV_A_ &ev->to);
234 --x_actives;
235 }
236 241
237 return 0; 242 return 0;
238} 243}
239 244
240int event_pending (struct event *ev, short events, struct timeval *tv) 245int event_pending (struct event *ev, short events, struct timeval *tv)
241{ 246{
247 dLOOPev;
248
242 short revents = 0; 249 short revents = 0;
243 250
244 if (ev->ev_events & EV_SIGNAL) 251 if (ev->ev_events & EV_SIGNAL)
245 { 252 {
246 /* sig */ 253 /* sig */
247 if (ev->iosig.sig.pending) 254 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
248 revents |= EV_SIGNAL; 255 revents |= EV_SIGNAL;
249 } 256 }
250 else 257 else
251 { 258 {
252 /* io */ 259 /* io */
253 if (ev->iosig.io.pending) 260 if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))
254 revents |= ev->ev_events & (EV_READ | EV_WRITE); 261 revents |= ev->ev_events & (EV_READ | EV_WRITE);
255 } 262 }
256 263
257 if (ev->to.pending) 264 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to))
258 { 265 {
259 revents |= EV_TIMEOUT; 266 revents |= EV_TIMEOUT;
260 267
261 if (tv) 268 if (tv)
262 tv_set (tv, ev_now); /* not sure if this is right :) */ 269 tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */
263 } 270 }
264 271
265 return events & revents; 272 return events & revents;
266} 273}
267 274
… …
284 return 0; 291 return 0;
285} 292}
286 293
287int event_base_loop (struct event_base *base, int flags) 294int event_base_loop (struct event_base *base, int flags)
288{ 295{
289 do 296 dLOOPbase;
290 { 297
291 ev_loop (flags | EVLOOP_ONESHOT); 298 ev_loop (EV_A_ flags);
292 }
293 while (!(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) && x_actives && !ev_loop_done);
294 299
295 return 0; 300 return 0;
296} 301}
297 302
298int event_base_dispatch (struct event_base *base) 303int event_base_dispatch (struct event_base *base)
299{ 304{
300 return event_base_loop (base, 0); 305 return event_base_loop (base, 0);
301} 306}
302 307
303static void 308static void
304x_loopexit_cb (int revents, void *arg) 309x_loopexit_cb (int revents, void *base)
305{ 310{
306 ev_loop_done = 2; 311 dLOOPbase;
312
313 ev_unloop (EV_A_ EVUNLOOP_ONCE);
307} 314}
308 315
309int event_base_loopexit (struct event_base *base, struct timeval *tv) 316int event_base_loopexit (struct event_base *base, struct timeval *tv)
310{ 317{
318 dLOOPbase;
311 ev_tstamp after = tv_get (tv); 319 ev_tstamp after = tv_get (tv);
312 320
313 ev_once (-1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base); 321 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base);
314 322
315 return -1; 323 return -1;
316} 324}
317 325
318struct x_once 326struct x_once
… …
331 free (once); 339 free (once);
332} 340}
333 341
334int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 342int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
335{ 343{
344 dLOOPbase;
336 struct x_once *once = malloc (sizeof (struct x_once)); 345 struct x_once *once = malloc (sizeof (struct x_once));
337 346
338 if (!once) 347 if (!once)
339 return -1; 348 return -1;
340 349
341 once->fd = fd; 350 once->fd = fd;
342 once->cb = cb; 351 once->cb = cb;
343 once->arg = arg; 352 once->arg = arg;
344 353
345 ev_once (fd, events & (EV_READ | EV_WRITE), tv_get (tv), x_once_cb, (void *)once); 354 ev_once (EV_A_ fd, events & (EV_READ | EV_WRITE), tv_get (tv), x_once_cb, (void *)once);
346 355
347 return 0; 356 return 0;
348} 357}
349 358
350int event_base_priority_init (struct event_base *base, int npri) 359int event_base_priority_init (struct event_base *base, int npri)
351{ 360{
352 return 0; 361 /*dLOOPbase;*/
353}
354 362
363 return 0;
364}
365

Diff Legend

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