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

Diff Legend

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