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

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

Diff Legend

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