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.31 by root, Wed Nov 14 05:30:02 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)
164 event_del (ev);
165 else if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w))
166 {
167 ev_io_stop (EV_A_ w);
168 ev->ev_flags &= ~EVLIST_INSERTED;
169 }
170
171 x_cb (ev, revents);
172}
173
174static void
175x_cb_to (EV_P_ struct ev_timer *w, int revents)
176{
177 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, to));
178
179 event_del (ev);
180
181 x_cb (ev, revents);
148} 182}
149 183
150void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg) 184void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg)
151{ 185{
186 if (events & EV_SIGNAL)
187 ev_init (&ev->iosig.sig, x_cb_sig);
188 else
152 ev_watcher_init (&ev->io, x_cb_io); 189 ev_init (&ev->iosig.io, x_cb_io);
190
153 ev_watcher_init (&ev->to, x_cb_to); 191 ev_init (&ev->to, x_cb_to);
154 ev_watcher_init (&ev->sig, x_cb_sig);
155 192
156 ev->ev_base = x_cur; 193 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */
157 ev->ev_fd = fd; 194 ev->ev_fd = fd;
158 ev->ev_events = events; 195 ev->ev_events = events;
159 ev->ev_pri = 0; 196 ev->ev_pri = 0;
160 ev->ev_callback = cb; 197 ev->ev_callback = cb;
161 ev->ev_arg = arg; 198 ev->ev_arg = arg;
162 ev->ev_res = 0; 199 ev->ev_res = 0;
200 ev->ev_flags = EVLIST_INIT;
163} 201}
164 202
165int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 203int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
166{ 204{
167 event_base_once (x_cur, fd, events, cb, arg, tv); 205 return event_base_once (x_cur, fd, events, cb, arg, tv);
168} 206}
169 207
170int event_add (struct event *ev, struct timeval *tv) 208int event_add (struct event *ev, struct timeval *tv)
171{ 209{
210 dLOOPev;
211
212 if (ev->ev_events & EV_SIGNAL)
213 {
214 if (!ev_is_active (&ev->iosig.sig))
215 {
216 ev_signal_set (&ev->iosig.sig, ev->ev_fd);
217 ev_signal_start (EV_A_ &ev->iosig.sig);
218
219 ev->ev_flags |= EVLIST_SIGNAL;
220 }
221 }
222 else if (ev->ev_events & (EV_READ | EV_WRITE))
223 {
224 if (!ev_is_active (&ev->iosig.io))
225 {
226 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE));
227 ev_io_start (EV_A_ &ev->iosig.io);
228
229 ev->ev_flags |= EVLIST_INSERTED;
230 }
231 }
232
172 if (tv) 233 if (tv)
173 { 234 {
235 ev->to.repeat = tv_get (tv);
236 ev_timer_again (EV_A_ &ev->to);
237 ev->ev_flags |= EVLIST_TIMEOUT;
238 }
239 else
174 if (ev_is_active (&ev->to)) 240 if (ev_is_active (&ev->to))
175 {
176 ev_timer_stop (&ev->to); 241 ev_timer_stop (EV_A_ &ev->to);
177 --x_actives;
178 }
179 242
180 ev_timer_set (&ev->to, tv_get (tv), 0.); 243 ev->ev_flags |= EVLIST_ACTIVE;
181 ev_timer_start (&ev->to);
182 ++x_actives;
183 }
184 244
185 if (ev->ev_events & (EV_READ | EV_WRITE)) 245 return 0;
186 { 246}
187 if (ev_is_active (&ev->io))
188 {
189 ev_io_stop (&ev->io);
190 --x_actives;
191 }
192 247
193 ev_io_set (&ev->io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE)); 248int event_del (struct event *ev)
194 ev_io_start (&ev->io); 249{
195 ++x_actives; 250 dLOOPev;
196 }
197 251
198 if (ev->ev_events & EV_SIGNAL) 252 if (ev->ev_events & EV_SIGNAL)
199 { 253 {
254 /* sig */
255 if (ev_is_active (&ev->iosig.sig))
256 ev_signal_stop (EV_A_ &ev->iosig.sig);
257 }
258 else if (ev->ev_events & (EV_READ | EV_WRITE))
259 {
260 /* io */
200 if (ev_is_active (&ev->sig)) 261 if (ev_is_active (&ev->iosig.io))
201 {
202 ev_signal_stop (&ev->sig);
203 --x_actives;
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); 262 ev_io_stop (EV_A_ &ev->iosig.io);
219 --x_actives;
220 } 263 }
221 264
222 if (ev_is_active (&ev->to)) 265 if (ev_is_active (&ev->to))
223 {
224 ev_timer_stop (&ev->to); 266 ev_timer_stop (EV_A_ &ev->to);
225 --x_actives;
226 }
227 267
228 if (ev_is_active (&ev->sig)) 268 ev->ev_flags = EVLIST_INIT;
229 {
230 ev_signal_stop (&ev->sig);
231 --x_actives;
232 }
233 269
234 return 0; 270 return 0;
271}
272
273void event_active (struct event *ev, int res, short ncalls)
274{
275 dLOOPev;
276
277 if (res & EV_TIMEOUT)
278 ev_feed_event (EV_A_ &ev->to, res & EV_TIMEOUT);
279
280 if (res & EV_SIGNAL)
281 ev_feed_event (EV_A_ &ev->iosig.sig, res & EV_SIGNAL);
282
283 if (res & (EV_READ | EV_WRITE))
284 ev_feed_event (EV_A_ &ev->iosig.io, res & (EV_READ | EV_WRITE));
235} 285}
236 286
237int event_pending (struct event *ev, short events, struct timeval *tv) 287int event_pending (struct event *ev, short events, struct timeval *tv)
238{ 288{
239 short revents; 289 short revents = 0;
290 dLOOPev;
240 291
241 if (ev->io.pending) 292
293 if (ev->ev_events & EV_SIGNAL)
294 {
295 /* sig */
296 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
297 revents |= EV_SIGNAL;
298 }
299 else if (ev->ev_events & (EV_READ | EV_WRITE))
300 {
301 /* io */
302 if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))
242 revents |= ev->ev_events & (EV_READ | EV_WRITE); 303 revents |= ev->ev_events & (EV_READ | EV_WRITE);
304 }
243 305
244 if (ev->to.pending) 306 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to))
245 { 307 {
246 revents |= EV_TIMEOUT; 308 revents |= EV_TIMEOUT;
247 309
248 if (tv) 310 if (tv)
249 tv_set (tv, ev_now); /* not sure if this is right :) */ 311 tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */
250 } 312 }
251
252 if (ev->sig.pending)
253 revents |= EV_SIGNAL;
254 313
255 return events & revents; 314 return events & revents;
256} 315}
257 316
258int event_priority_init (int npri) 317int event_priority_init (int npri)
… …
274 return 0; 333 return 0;
275} 334}
276 335
277int event_base_loop (struct event_base *base, int flags) 336int event_base_loop (struct event_base *base, int flags)
278{ 337{
279 do 338 dLOOPbase;
280 { 339
281 ev_loop (flags | EVLOOP_ONESHOT); 340 ev_loop (EV_A_ flags);
282 }
283 while (!(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) && x_actives && !ev_loop_done);
284 341
285 return 0; 342 return 0;
286} 343}
287 344
288int event_base_dispatch (struct event_base *base) 345int event_base_dispatch (struct event_base *base)
289{ 346{
290 return event_base_loop (base, 0); 347 return event_base_loop (base, 0);
291} 348}
292 349
293static void 350static void
294x_loopexit_cb (int revents, void *arg) 351x_loopexit_cb (int revents, void *base)
295{ 352{
296 ev_loop_done = 2; 353 dLOOPbase;
354
355 ev_unloop (EV_A_ EVUNLOOP_ONE);
297} 356}
298 357
299int event_base_loopexit (struct event_base *base, struct timeval *tv) 358int event_base_loopexit (struct event_base *base, struct timeval *tv)
300{ 359{
301 ev_tstamp after = tv_get (tv); 360 ev_tstamp after = tv_get (tv);
361 dLOOPbase;
302 362
303 ev_once (-1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base); 363 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base);
364
365 return -1;
304} 366}
305 367
306struct x_once 368struct x_once
307{ 369{
308 int fd; 370 int fd;
… …
311}; 373};
312 374
313static void 375static void
314x_once_cb (int revents, void *arg) 376x_once_cb (int revents, void *arg)
315{ 377{
316 struct x_once *once = arg; 378 struct x_once *once = (struct x_once *)arg;
317 379
318 once->cb (once->fd, revents, once->arg); 380 once->cb (once->fd, (short)revents, once->arg);
319 free (once); 381 free (once);
320} 382}
321 383
322int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 384int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
323{ 385{
324 struct x_once *once = malloc (sizeof (struct x_once)); 386 struct x_once *once = (struct x_once *)malloc (sizeof (struct x_once));
387 dLOOPbase;
325 388
326 if (!once) 389 if (!once)
327 return -1; 390 return -1;
328 391
329 once->fd = fd; 392 once->fd = fd;
330 once->cb = cb; 393 once->cb = cb;
331 once->arg = arg; 394 once->arg = arg;
332 395
333 ev_once (fd, events & (EV_READ | EV_WRITE), tv_get (tv), x_once_cb, (void *)once); 396 ev_once (EV_A_ fd, events & (EV_READ | EV_WRITE), tv_get (tv), x_once_cb, (void *)once);
334 397
335 return 0; 398 return 0;
336} 399}
337 400
338int event_base_priority_init (struct event_base *base, int npri) 401int event_base_priority_init (struct event_base *base, int npri)
339{ 402{
340 return 0; 403 /*dLOOPbase;*/
341}
342 404
405 return 0;
406}
407

Diff Legend

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