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

Comparing libev/event.c (file contents):
Revision 1.3 by root, Fri Nov 2 11:02:23 2007 UTC vs.
Revision 1.32 by root, Thu Nov 29 12:21:06 2007 UTC

… …
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#include <stddef.h> 32#include <stddef.h>
33#include <stdlib.h> 33#include <stdlib.h>
34#include <assert.h>
35
36#ifndef WIN32
34#include <sys/time.h> 37# include <sys/time.h>
38#endif
35 39
40#ifdef EV_EVENT_H
41# include EV_EVENT_H
42#else
36#include "event.h" 43# include "event.h"
44#endif
37 45
46#if EV_MULTIPLICITY
47# define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base
48# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base
49#else
50# define dLOOPev
51# define dLOOPbase
52#endif
53
54/* never accessed, will always be cast from/to ev_loop */
38struct event_base 55struct event_base
39{ 56{
40 int dummy; 57 int dummy;
41}; 58};
42 59
43static int x_actives;
44
45static struct event_base x_base, *x_cur; 60static struct event_base *x_cur;
46 61
47static void 62static void
48tv_set (struct timeval *tv, ev_tstamp at) 63tv_set (struct timeval *tv, ev_tstamp at)
49{ 64{
50 tv->tv_sec = (long)at; 65 tv->tv_sec = (long)at;
… …
72 return "libev"; 87 return "libev";
73} 88}
74 89
75void *event_init (void) 90void *event_init (void)
76{ 91{
77 if (ev_init (0)) 92#if EV_MULTIPLICITY
78 return x_cur = &x_base; 93 if (x_cur)
94 x_cur = (struct event_base *)ev_loop_new (EVFLAG_AUTO);
95 else
96 x_cur = (struct event_base *)ev_default_loop (EVFLAG_AUTO);
97#else
98 assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur));
79 99
100 x_cur = (struct event_base *)(long)ev_default_loop (EVFLAG_AUTO);
101#endif
102
80 return 0; 103 return x_cur;
81} 104}
82 105
83void event_base_free (struct event_base *base) 106void event_base_free (struct event_base *base)
84{ 107{
108 dLOOPbase;
109
110#if EV_MULTIPLICITY
111 if (ev_default_loop (EVFLAG_AUTO) != loop)
112 ev_loop_destroy (loop);
113#endif
114}
115
116int event_dispatch (void)
117{
118 return event_base_dispatch (x_cur);
119}
120
121#ifdef EV_STANDALONE
122void event_set_log_callback (event_log_cb cb)
123{
85 /* nop */ 124 /* nop */
86} 125}
87 126#endif
88int event_dispatch (void)
89{
90 return event_base_dispatch (x_cur);
91}
92
93void event_set_log_callback (event_log_cb cb)
94{
95 /* nop */
96}
97 127
98int event_loop (int flags) 128int event_loop (int flags)
99{ 129{
100 return event_base_loop (x_cur, flags); 130 return event_base_loop (x_cur, flags);
101} 131}
102 132
103int event_loopexit (struct timeval *tv) 133int event_loopexit (struct timeval *tv)
104{ 134{
105 event_base_loopexit (x_cur, tv); 135 return event_base_loopexit (x_cur, tv);
106} 136}
107 137
108static void 138static void
109x_cb (struct event *ev, int revents) 139x_cb (struct event *ev, int revents)
110{ 140{
111 if (ev_is_active (&ev->sig))
112 {
113 ev_signal_stop (&ev->sig);
114 --x_actives;
115 }
116
117 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (&ev->io))
118 {
119 ev_io_stop (&ev->io);
120 --x_actives;
121 }
122
123 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL; 141 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL;
124 142
125 if (revents & EV_TIMEOUT)
126 --x_actives;
127
128 ev->ev_res = revents; 143 ev->ev_res = revents;
129 ev->ev_callback (ev->ev_fd, revents, ev->ev_arg); 144 ev->ev_callback (ev->ev_fd, (short)revents, ev->ev_arg);
130} 145}
131 146
132static void 147static void
133x_cb_io (struct ev_io *w, int revents)
134{
135 x_cb ((struct event *)(((char *)w) - offsetof (struct event, io)), revents);
136}
137
138static void
139x_cb_to (struct ev_timer *w, int revents)
140{
141 x_cb ((struct event *)(((char *)w) - offsetof (struct event, to)), revents);
142}
143
144static void
145x_cb_sig (struct ev_signal *w, int revents) 148x_cb_sig (EV_P_ struct ev_signal *w, int revents)
146{ 149{
150 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.sig));
151
152 if (revents & EV_ERROR)
153 event_del (ev);
154
155 x_cb (ev, revents);
156}
157
158static void
159x_cb_io (EV_P_ struct ev_io *w, int revents)
160{
147 x_cb ((struct event *)(((char *)w) - offsetof (struct event, sig)), revents); 161 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io));
162
163 if ((revents & EV_ERROR) || !(ev->ev_events & EV_PERSIST))
164 event_del (ev);
165
166 x_cb (ev, revents);
167}
168
169static void
170x_cb_to (EV_P_ struct ev_timer *w, int revents)
171{
172 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, to));
173
174 event_del (ev);
175
176 x_cb (ev, revents);
148} 177}
149 178
150void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg) 179void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg)
151{ 180{
181 if (events & EV_SIGNAL)
182 ev_init (&ev->iosig.sig, x_cb_sig);
183 else
152 ev_watcher_init (&ev->io, x_cb_io); 184 ev_init (&ev->iosig.io, x_cb_io);
185
153 ev_watcher_init (&ev->to, x_cb_to); 186 ev_init (&ev->to, x_cb_to);
154 ev_watcher_init (&ev->sig, x_cb_sig);
155 187
156 ev->ev_base = x_cur; 188 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */
157 ev->ev_fd = fd; 189 ev->ev_fd = fd;
158 ev->ev_events = events; 190 ev->ev_events = events;
159 ev->ev_pri = 0; 191 ev->ev_pri = 0;
160 ev->ev_callback = cb; 192 ev->ev_callback = cb;
161 ev->ev_arg = arg; 193 ev->ev_arg = arg;
162 ev->ev_res = 0; 194 ev->ev_res = 0;
195 ev->ev_flags = EVLIST_INIT;
163} 196}
164 197
165int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 198int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
166{ 199{
167 event_base_once (x_cur, fd, events, cb, arg, tv); 200 return event_base_once (x_cur, fd, events, cb, arg, tv);
168} 201}
169 202
170int event_add (struct event *ev, struct timeval *tv) 203int event_add (struct event *ev, struct timeval *tv)
171{ 204{
205 dLOOPev;
206
207 if (ev->ev_events & EV_SIGNAL)
208 {
209 if (!ev_is_active (&ev->iosig.sig))
210 {
211 ev_signal_set (&ev->iosig.sig, ev->ev_fd);
212 ev_signal_start (EV_A_ &ev->iosig.sig);
213
214 ev->ev_flags |= EVLIST_SIGNAL;
215 }
216 }
217 else if (ev->ev_events & (EV_READ | EV_WRITE))
218 {
219 if (!ev_is_active (&ev->iosig.io))
220 {
221 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE));
222 ev_io_start (EV_A_ &ev->iosig.io);
223
224 ev->ev_flags |= EVLIST_INSERTED;
225 }
226 }
227
172 if (tv) 228 if (tv)
173 { 229 {
174 if (ev_is_active (&ev->to)) 230 ev->to.repeat = tv_get (tv);
175 { 231 ev_timer_again (EV_A_ &ev->to);
232 ev->ev_flags |= EVLIST_TIMEOUT;
233 }
234 else
235 {
176 ev_timer_stop (&ev->to); 236 ev_timer_stop (EV_A_ &ev->to);
177 --x_actives; 237 ev->ev_flags &= ~EVLIST_TIMEOUT;
178 }
179
180 ev_timer_set (&ev->to, tv_get (tv), 0.);
181 ev_timer_start (&ev->to);
182 ++x_actives;
183 }
184
185 if (ev->ev_events & (EV_READ | EV_WRITE))
186 { 238 }
187 if (ev_is_active (&ev->io))
188 {
189 ev_io_stop (&ev->io);
190 --x_actives;
191 }
192 239
193 ev_io_set (&ev->io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE)); 240 ev->ev_flags |= EVLIST_ACTIVE;
194 ev_io_start (&ev->io); 241
195 ++x_actives; 242 return 0;
196 } 243}
244
245int event_del (struct event *ev)
246{
247 dLOOPev;
197 248
198 if (ev->ev_events & EV_SIGNAL) 249 if (ev->ev_events & EV_SIGNAL)
199 {
200 if (ev_is_active (&ev->sig))
201 {
202 ev_signal_stop (&ev->sig); 250 ev_signal_stop (EV_A_ &ev->iosig.sig);
203 --x_actives; 251 else if (ev->ev_events & (EV_READ | EV_WRITE))
204 }
205
206 ev_signal_set (&ev->sig, ev->ev_fd);
207 ev_signal_start (&ev->sig);
208 ++x_actives;
209 }
210
211 return 0;
212}
213
214int event_del (struct event *ev)
215{
216 if (ev_is_active (&ev->io))
217 {
218 ev_io_stop (&ev->io); 252 ev_io_stop (EV_A_ &ev->iosig.io);
219 --x_actives;
220 }
221 253
222 if (ev_is_active (&ev->to)) 254 if (ev_is_active (&ev->to))
223 {
224 ev_timer_stop (&ev->to); 255 ev_timer_stop (EV_A_ &ev->to);
225 --x_actives;
226 }
227 256
228 if (ev_is_active (&ev->sig)) 257 ev->ev_flags = EVLIST_INIT;
229 {
230 ev_signal_stop (&ev->sig);
231 --x_actives;
232 }
233 258
234 return 0; 259 return 0;
260}
261
262void event_active (struct event *ev, int res, short ncalls)
263{
264 dLOOPev;
265
266 if (res & EV_TIMEOUT)
267 ev_feed_event (EV_A_ &ev->to, res & EV_TIMEOUT);
268
269 if (res & EV_SIGNAL)
270 ev_feed_event (EV_A_ &ev->iosig.sig, res & EV_SIGNAL);
271
272 if (res & (EV_READ | EV_WRITE))
273 ev_feed_event (EV_A_ &ev->iosig.io, res & (EV_READ | EV_WRITE));
235} 274}
236 275
237int event_pending (struct event *ev, short events, struct timeval *tv) 276int event_pending (struct event *ev, short events, struct timeval *tv)
238{ 277{
239 short revents; 278 short revents = 0;
279 dLOOPev;
240 280
241 if (ev->io.pending) 281
282 if (ev->ev_events & EV_SIGNAL)
283 {
284 /* sig */
285 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
286 revents |= EV_SIGNAL;
287 }
288 else if (ev->ev_events & (EV_READ | EV_WRITE))
289 {
290 /* io */
291 if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))
242 revents |= ev->ev_events & (EV_READ | EV_WRITE); 292 revents |= ev->ev_events & (EV_READ | EV_WRITE);
293 }
243 294
244 if (ev->to.pending) 295 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to))
245 { 296 {
246 revents |= EV_TIMEOUT; 297 revents |= EV_TIMEOUT;
247 298
248 if (tv) 299 if (tv)
249 tv_set (tv, ev_now); /* not sure if this is right :) */ 300 tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */
250 } 301 }
251
252 if (ev->sig.pending)
253 revents |= EV_SIGNAL;
254 302
255 return events & revents; 303 return events & revents;
256} 304}
257 305
258int event_priority_init (int npri) 306int event_priority_init (int npri)
… …
274 return 0; 322 return 0;
275} 323}
276 324
277int event_base_loop (struct event_base *base, int flags) 325int event_base_loop (struct event_base *base, int flags)
278{ 326{
279 do 327 dLOOPbase;
280 { 328
281 ev_loop (flags | EVLOOP_ONESHOT); 329 ev_loop (EV_A_ flags);
282 }
283 while (!(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) && x_actives && !ev_loop_done);
284 330
285 return 0; 331 return 0;
286} 332}
287 333
288int event_base_dispatch (struct event_base *base) 334int event_base_dispatch (struct event_base *base)
289{ 335{
290 return event_base_loop (base, 0); 336 return event_base_loop (base, 0);
291} 337}
292 338
293static void 339static void
294x_loopexit_cb (int revents, void *arg) 340x_loopexit_cb (int revents, void *base)
295{ 341{
296 ev_loop_done = 2; 342 dLOOPbase;
343
344 ev_unloop (EV_A_ EVUNLOOP_ONE);
297} 345}
298 346
299int event_base_loopexit (struct event_base *base, struct timeval *tv) 347int event_base_loopexit (struct event_base *base, struct timeval *tv)
300{ 348{
301 ev_tstamp after = tv_get (tv); 349 ev_tstamp after = tv_get (tv);
350 dLOOPbase;
302 351
303 ev_once (-1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base); 352 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base);
353
354 return -1;
304} 355}
305 356
306struct x_once 357struct x_once
307{ 358{
308 int fd; 359 int fd;
… …
311}; 362};
312 363
313static void 364static void
314x_once_cb (int revents, void *arg) 365x_once_cb (int revents, void *arg)
315{ 366{
316 struct x_once *once = arg; 367 struct x_once *once = (struct x_once *)arg;
317 368
318 once->cb (once->fd, revents, once->arg); 369 once->cb (once->fd, (short)revents, once->arg);
319 free (once); 370 free (once);
320} 371}
321 372
322int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 373int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
323{ 374{
324 struct x_once *once = malloc (sizeof (struct x_once)); 375 struct x_once *once = (struct x_once *)malloc (sizeof (struct x_once));
376 dLOOPbase;
325 377
326 if (!once) 378 if (!once)
327 return -1; 379 return -1;
328 380
329 once->fd = fd; 381 once->fd = fd;
330 once->cb = cb; 382 once->cb = cb;
331 once->arg = arg; 383 once->arg = arg;
332 384
333 ev_once (fd, events & (EV_READ | EV_WRITE), tv_get (tv), x_once_cb, (void *)once); 385 ev_once (EV_A_ fd, events & (EV_READ | EV_WRITE), tv_get (tv), x_once_cb, (void *)once);
334 386
335 return 0; 387 return 0;
336} 388}
337 389
338int event_base_priority_init (struct event_base *base, int npri) 390int event_base_priority_init (struct event_base *base, int npri)
339{ 391{
340 return 0; 392 /*dLOOPbase;*/
341}
342 393
394 return 0;
395}
396

Diff Legend

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