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

Comparing libev/event.c (file contents):
Revision 1.4 by root, Fri Nov 2 13:08:51 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{
141 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL;
142
143 ev->ev_res = revents;
144 ev->ev_callback (ev->ev_fd, (short)revents, ev->ev_arg);
145}
146
147static void
148x_cb_sig (EV_P_ struct ev_signal *w, int revents)
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{
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);
177}
178
179void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg)
180{
111 if (ev->ev_events & EV_SIGNAL) 181 if (events & EV_SIGNAL)
112 { 182 ev_init (&ev->iosig.sig, x_cb_sig);
113 /* sig */
114 if (ev_is_active (&ev->iosig.sig))
115 {
116 ev_signal_stop (&ev->iosig.sig);
117 --x_actives;
118 }
119 }
120 else 183 else
121 {
122 /* io */
123 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (&ev->iosig.io))
124 {
125 ev_io_stop (&ev->iosig.io);
126 --x_actives;
127 }
128 }
129
130 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL;
131
132 if (revents & EV_TIMEOUT)
133 --x_actives;
134
135 ev->ev_res = revents;
136 ev->ev_callback (ev->ev_fd, revents, ev->ev_arg);
137}
138
139static void
140x_cb_io (struct ev_io *w, int revents)
141{
142 x_cb ((struct event *)(((char *)w) - offsetof (struct event, iosig.io)), revents);
143}
144
145static void
146x_cb_to (struct ev_timer *w, int revents)
147{
148 x_cb ((struct event *)(((char *)w) - offsetof (struct event, to)), revents);
149}
150
151static void
152x_cb_sig (struct ev_signal *w, int revents)
153{
154 x_cb ((struct event *)(((char *)w) - offsetof (struct event, iosig.sig)), revents);
155}
156
157void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg)
158{
159 if (events & EV_SIGNAL)
160 ev_watcher_init (&ev->iosig.sig, x_cb_sig);
161 else
162 ev_watcher_init (&ev->iosig.io, x_cb_io); 184 ev_init (&ev->iosig.io, x_cb_io);
163 185
164 ev_watcher_init (&ev->to, x_cb_to); 186 ev_init (&ev->to, x_cb_to);
165 187
166 ev->ev_base = x_cur; 188 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */
167 ev->ev_fd = fd; 189 ev->ev_fd = fd;
168 ev->ev_events = events; 190 ev->ev_events = events;
169 ev->ev_pri = 0; 191 ev->ev_pri = 0;
170 ev->ev_callback = cb; 192 ev->ev_callback = cb;
171 ev->ev_arg = arg; 193 ev->ev_arg = arg;
172 ev->ev_res = 0; 194 ev->ev_res = 0;
195 ev->ev_flags = EVLIST_INIT;
173} 196}
174 197
175int 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)
176{ 199{
177 event_base_once (x_cur, fd, events, cb, arg, tv); 200 return event_base_once (x_cur, fd, events, cb, arg, tv);
178} 201}
179 202
180int event_add (struct event *ev, struct timeval *tv) 203int event_add (struct event *ev, struct timeval *tv)
181{ 204{
182 /* disable all watchers */ 205 dLOOPev;
183 event_del (ev);
184 206
185 if (ev->ev_events & EV_SIGNAL) 207 if (ev->ev_events & EV_SIGNAL)
186 { 208 {
209 if (!ev_is_active (&ev->iosig.sig))
210 {
187 ev_signal_set (&ev->iosig.sig, ev->ev_fd); 211 ev_signal_set (&ev->iosig.sig, ev->ev_fd);
188 ev_signal_start (&ev->iosig.sig); 212 ev_signal_start (EV_A_ &ev->iosig.sig);
189 ++x_actives; 213
214 ev->ev_flags |= EVLIST_SIGNAL;
215 }
190 } 216 }
191 else if (ev->ev_events & (EV_READ | EV_WRITE)) 217 else if (ev->ev_events & (EV_READ | EV_WRITE))
192 { 218 {
219 if (!ev_is_active (&ev->iosig.io))
220 {
193 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE)); 221 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE));
194 ev_io_start (&ev->iosig.io); 222 ev_io_start (EV_A_ &ev->iosig.io);
195 ++x_actives; 223
224 ev->ev_flags |= EVLIST_INSERTED;
225 }
196 } 226 }
197 227
198 if (tv) 228 if (tv)
199 { 229 {
200 ev_timer_set (&ev->to, tv_get (tv), 0.); 230 ev->to.repeat = tv_get (tv);
231 ev_timer_again (EV_A_ &ev->to);
232 ev->ev_flags |= EVLIST_TIMEOUT;
233 }
234 else
235 {
201 ev_timer_start (&ev->to); 236 ev_timer_stop (EV_A_ &ev->to);
202 ++x_actives; 237 ev->ev_flags &= ~EVLIST_TIMEOUT;
203 } 238 }
239
240 ev->ev_flags |= EVLIST_ACTIVE;
204 241
205 return 0; 242 return 0;
206} 243}
207 244
208int event_del (struct event *ev) 245int event_del (struct event *ev)
209{ 246{
247 dLOOPev;
248
210 if (ev->ev_events & EV_SIGNAL) 249 if (ev->ev_events & EV_SIGNAL)
250 ev_signal_stop (EV_A_ &ev->iosig.sig);
251 else if (ev->ev_events & (EV_READ | EV_WRITE))
252 ev_io_stop (EV_A_ &ev->iosig.io);
253
254 if (ev_is_active (&ev->to))
255 ev_timer_stop (EV_A_ &ev->to);
256
257 ev->ev_flags = EVLIST_INIT;
258
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));
274}
275
276int event_pending (struct event *ev, short events, struct timeval *tv)
277{
278 short revents = 0;
279 dLOOPev;
280
281
282 if (ev->ev_events & EV_SIGNAL)
211 { 283 {
212 /* sig */ 284 /* sig */
213 if (ev_is_active (&ev->iosig.sig)) 285 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
214 { 286 revents |= EV_SIGNAL;
215 ev_signal_stop (&ev->iosig.sig);
216 --x_actives;
217 }
218 } 287 }
219 else 288 else if (ev->ev_events & (EV_READ | EV_WRITE))
220 { 289 {
221 /* io */ 290 /* io */
222 if (ev_is_active (&ev->iosig.io)) 291 if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))
223 {
224 ev_io_stop (&ev->iosig.io);
225 --x_actives;
226 }
227 }
228
229 if (ev_is_active (&ev->to))
230 {
231 ev_timer_stop (&ev->to);
232 --x_actives;
233 }
234
235 return 0;
236}
237
238int event_pending (struct event *ev, short events, struct timeval *tv)
239{
240 short revents;
241
242 if (ev->ev_events & EV_SIGNAL)
243 {
244 /* sig */
245 if (ev->iosig.sig.pending)
246 revents |= EV_SIGNAL;
247 }
248 else
249 {
250 /* io */
251 if (ev->iosig.io.pending)
252 revents |= ev->ev_events & (EV_READ | EV_WRITE); 292 revents |= ev->ev_events & (EV_READ | EV_WRITE);
253 } 293 }
254 294
255 if (ev->to.pending) 295 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to))
256 { 296 {
257 revents |= EV_TIMEOUT; 297 revents |= EV_TIMEOUT;
258 298
259 if (tv) 299 if (tv)
260 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 :) */
261 } 301 }
262 302
263 return events & revents; 303 return events & revents;
264} 304}
265 305
… …
282 return 0; 322 return 0;
283} 323}
284 324
285int event_base_loop (struct event_base *base, int flags) 325int event_base_loop (struct event_base *base, int flags)
286{ 326{
287 do 327 dLOOPbase;
288 { 328
289 ev_loop (flags | EVLOOP_ONESHOT); 329 ev_loop (EV_A_ flags);
290 }
291 while (!(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) && x_actives && !ev_loop_done);
292 330
293 return 0; 331 return 0;
294} 332}
295 333
296int event_base_dispatch (struct event_base *base) 334int event_base_dispatch (struct event_base *base)
297{ 335{
298 return event_base_loop (base, 0); 336 return event_base_loop (base, 0);
299} 337}
300 338
301static void 339static void
302x_loopexit_cb (int revents, void *arg) 340x_loopexit_cb (int revents, void *base)
303{ 341{
304 ev_loop_done = 2; 342 dLOOPbase;
343
344 ev_unloop (EV_A_ EVUNLOOP_ONE);
305} 345}
306 346
307int event_base_loopexit (struct event_base *base, struct timeval *tv) 347int event_base_loopexit (struct event_base *base, struct timeval *tv)
308{ 348{
309 ev_tstamp after = tv_get (tv); 349 ev_tstamp after = tv_get (tv);
350 dLOOPbase;
310 351
311 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;
312} 355}
313 356
314struct x_once 357struct x_once
315{ 358{
316 int fd; 359 int fd;
… …
319}; 362};
320 363
321static void 364static void
322x_once_cb (int revents, void *arg) 365x_once_cb (int revents, void *arg)
323{ 366{
324 struct x_once *once = arg; 367 struct x_once *once = (struct x_once *)arg;
325 368
326 once->cb (once->fd, revents, once->arg); 369 once->cb (once->fd, (short)revents, once->arg);
327 free (once); 370 free (once);
328} 371}
329 372
330int 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)
331{ 374{
332 struct x_once *once = malloc (sizeof (struct x_once)); 375 struct x_once *once = (struct x_once *)malloc (sizeof (struct x_once));
376 dLOOPbase;
333 377
334 if (!once) 378 if (!once)
335 return -1; 379 return -1;
336 380
337 once->fd = fd; 381 once->fd = fd;
338 once->cb = cb; 382 once->cb = cb;
339 once->arg = arg; 383 once->arg = arg;
340 384
341 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);
342 386
343 return 0; 387 return 0;
344} 388}
345 389
346int event_base_priority_init (struct event_base *base, int npri) 390int event_base_priority_init (struct event_base *base, int npri)
347{ 391{
348 return 0; 392 /*dLOOPbase;*/
349}
350 393
394 return 0;
395}
396

Diff Legend

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