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

Comparing libev/event.c (file contents):
Revision 1.35 by root, Fri May 2 07:35:47 2008 UTC vs.
Revision 1.38 by root, Mon Nov 17 03:37:08 2008 UTC

1/* 1/*
2 * libevent compatibility layer 2 * libevent compatibility layer
3 * 3 *
4 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
39 39
40#include <stddef.h> 40#include <stddef.h>
41#include <stdlib.h> 41#include <stdlib.h>
42#include <assert.h> 42#include <assert.h>
43 43
44#ifndef WIN32
45# include <sys/time.h>
46#endif
47
48#ifdef EV_EVENT_H 44#ifdef EV_EVENT_H
49# include EV_EVENT_H 45# include EV_EVENT_H
50#else 46#else
51# include "event.h" 47# include "event.h"
52#endif 48#endif
… …
63struct event_base 59struct event_base
64{ 60{
65 int dummy; 61 int dummy;
66}; 62};
67 63
68static struct event_base *x_cur; 64static struct event_base *ev_x_cur;
69 65
70static void 66static void
71tv_set (struct timeval *tv, ev_tstamp at) 67ev_tv_set (struct timeval *tv, ev_tstamp at)
72{ 68{
73 tv->tv_sec = (long)at; 69 tv->tv_sec = (long)at;
74 tv->tv_usec = (long)((at - (ev_tstamp)tv->tv_sec) * 1e6); 70 tv->tv_usec = (long)((at - (ev_tstamp)tv->tv_sec) * 1e6);
75} 71}
76 72
77static ev_tstamp 73static ev_tstamp
78tv_get (struct timeval *tv) 74ev_tv_get (struct timeval *tv)
79{ 75{
80 if (tv) 76 if (tv)
81 return tv->tv_sec + tv->tv_usec * 1e-6; 77 return tv->tv_sec + tv->tv_usec * 1e-6;
82 else 78 else
83 return -1.; 79 return -1.;
… …
96} 92}
97 93
98void *event_init (void) 94void *event_init (void)
99{ 95{
100#if EV_MULTIPLICITY 96#if EV_MULTIPLICITY
101 if (x_cur) 97 if (ev_x_cur)
102 x_cur = (struct event_base *)ev_loop_new (EVFLAG_AUTO); 98 ev_x_cur = (struct event_base *)ev_loop_new (EVFLAG_AUTO);
103 else 99 else
104 x_cur = (struct event_base *)ev_default_loop (EVFLAG_AUTO); 100 ev_x_cur = (struct event_base *)ev_default_loop (EVFLAG_AUTO);
105#else 101#else
106 assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur)); 102 assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !ev_x_cur));
107 103
108 x_cur = (struct event_base *)(long)ev_default_loop (EVFLAG_AUTO); 104 ev_x_cur = (struct event_base *)(long)ev_default_loop (EVFLAG_AUTO);
109#endif 105#endif
110 106
111 return x_cur; 107 return ev_x_cur;
112} 108}
113 109
114void event_base_free (struct event_base *base) 110void event_base_free (struct event_base *base)
115{ 111{
116 dLOOPbase; 112 dLOOPbase;
… …
121#endif 117#endif
122} 118}
123 119
124int event_dispatch (void) 120int event_dispatch (void)
125{ 121{
126 return event_base_dispatch (x_cur); 122 return event_base_dispatch (ev_x_cur);
127} 123}
128 124
129#ifdef EV_STANDALONE 125#ifdef EV_STANDALONE
130void event_set_log_callback (event_log_cb cb) 126void event_set_log_callback (event_log_cb cb)
131{ 127{
… …
133} 129}
134#endif 130#endif
135 131
136int event_loop (int flags) 132int event_loop (int flags)
137{ 133{
138 return event_base_loop (x_cur, flags); 134 return event_base_loop (ev_x_cur, flags);
139} 135}
140 136
141int event_loopexit (struct timeval *tv) 137int event_loopexit (struct timeval *tv)
142{ 138{
143 return event_base_loopexit (x_cur, tv); 139 return event_base_loopexit (ev_x_cur, tv);
144} 140}
145 141
146static void 142static void
147x_cb (struct event *ev, int revents) 143ev_x_cb (struct event *ev, int revents)
148{ 144{
149 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL; 145 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL;
150 146
151 ev->ev_res = revents; 147 ev->ev_res = revents;
152 ev->ev_callback (ev->ev_fd, (short)revents, ev->ev_arg); 148 ev->ev_callback (ev->ev_fd, (short)revents, ev->ev_arg);
153} 149}
154 150
155static void 151static void
156x_cb_sig (EV_P_ struct ev_signal *w, int revents) 152ev_x_cb_sig (EV_P_ struct ev_signal *w, int revents)
157{ 153{
158 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.sig)); 154 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.sig));
159 155
160 if (revents & EV_ERROR) 156 if (revents & EV_ERROR)
161 event_del (ev); 157 event_del (ev);
162 158
163 x_cb (ev, revents); 159 ev_x_cb (ev, revents);
164} 160}
165 161
166static void 162static void
167x_cb_io (EV_P_ struct ev_io *w, int revents) 163ev_x_cb_io (EV_P_ struct ev_io *w, int revents)
168{ 164{
169 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io)); 165 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io));
170 166
171 if ((revents & EV_ERROR) || !(ev->ev_events & EV_PERSIST)) 167 if ((revents & EV_ERROR) || !(ev->ev_events & EV_PERSIST))
172 event_del (ev); 168 event_del (ev);
173 169
174 x_cb (ev, revents); 170 ev_x_cb (ev, revents);
175} 171}
176 172
177static void 173static void
178x_cb_to (EV_P_ struct ev_timer *w, int revents) 174ev_x_cb_to (EV_P_ struct ev_timer *w, int revents)
179{ 175{
180 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, to)); 176 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, to));
181 177
182 event_del (ev); 178 event_del (ev);
183 179
184 x_cb (ev, revents); 180 ev_x_cb (ev, revents);
185} 181}
186 182
187void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg) 183void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg)
188{ 184{
189 if (events & EV_SIGNAL) 185 if (events & EV_SIGNAL)
190 ev_init (&ev->iosig.sig, x_cb_sig); 186 ev_init (&ev->iosig.sig, ev_x_cb_sig);
191 else 187 else
192 ev_init (&ev->iosig.io, x_cb_io); 188 ev_init (&ev->iosig.io, ev_x_cb_io);
193 189
194 ev_init (&ev->to, x_cb_to); 190 ev_init (&ev->to, ev_x_cb_to);
195 191
196 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */ 192 ev->ev_base = ev_x_cur; /* not threadsafe, but it's how libevent works */
197 ev->ev_fd = fd; 193 ev->ev_fd = fd;
198 ev->ev_events = events; 194 ev->ev_events = events;
199 ev->ev_pri = 0; 195 ev->ev_pri = 0;
200 ev->ev_callback = cb; 196 ev->ev_callback = cb;
201 ev->ev_arg = arg; 197 ev->ev_arg = arg;
… …
203 ev->ev_flags = EVLIST_INIT; 199 ev->ev_flags = EVLIST_INIT;
204} 200}
205 201
206int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 202int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
207{ 203{
208 return event_base_once (x_cur, fd, events, cb, arg, tv); 204 return event_base_once (ev_x_cur, fd, events, cb, arg, tv);
209} 205}
210 206
211int event_add (struct event *ev, struct timeval *tv) 207int event_add (struct event *ev, struct timeval *tv)
212{ 208{
213 dLOOPev; 209 dLOOPev;
… …
233 } 229 }
234 } 230 }
235 231
236 if (tv) 232 if (tv)
237 { 233 {
238 ev->to.repeat = tv_get (tv); 234 ev->to.repeat = ev_tv_get (tv);
239 ev_timer_again (EV_A_ &ev->to); 235 ev_timer_again (EV_A_ &ev->to);
240 ev->ev_flags |= EVLIST_TIMEOUT; 236 ev->ev_flags |= EVLIST_TIMEOUT;
241 } 237 }
242 else 238 else
243 { 239 {
… …
302 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to)) 298 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to))
303 { 299 {
304 revents |= EV_TIMEOUT; 300 revents |= EV_TIMEOUT;
305 301
306 if (tv) 302 if (tv)
307 tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */ 303 ev_tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */
308 } 304 }
309 305
310 return events & revents; 306 return events & revents;
311} 307}
312 308
313int event_priority_init (int npri) 309int event_priority_init (int npri)
314{ 310{
315 return event_base_priority_init (x_cur, npri); 311 return event_base_priority_init (ev_x_cur, npri);
316} 312}
317 313
318int event_priority_set (struct event *ev, int pri) 314int event_priority_set (struct event *ev, int pri)
319{ 315{
320 ev->ev_pri = pri; 316 ev->ev_pri = pri;
… …
342{ 338{
343 return event_base_loop (base, 0); 339 return event_base_loop (base, 0);
344} 340}
345 341
346static void 342static void
347x_loopexit_cb (int revents, void *base) 343ev_x_loopexit_cb (int revents, void *base)
348{ 344{
349 dLOOPbase; 345 dLOOPbase;
350 346
351 ev_unloop (EV_A_ EVUNLOOP_ONE); 347 ev_unloop (EV_A_ EVUNLOOP_ONE);
352} 348}
353 349
354int event_base_loopexit (struct event_base *base, struct timeval *tv) 350int event_base_loopexit (struct event_base *base, struct timeval *tv)
355{ 351{
356 ev_tstamp after = tv_get (tv); 352 ev_tstamp after = ev_tv_get (tv);
357 dLOOPbase; 353 dLOOPbase;
358 354
359 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base); 355 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., ev_x_loopexit_cb, (void *)base);
360 356
361 return 0; 357 return 0;
362} 358}
363 359
364struct x_once 360struct ev_x_once
365{ 361{
366 int fd; 362 int fd;
367 void (*cb)(int, short, void *); 363 void (*cb)(int, short, void *);
368 void *arg; 364 void *arg;
369}; 365};
370 366
371static void 367static void
372x_once_cb (int revents, void *arg) 368ev_x_once_cb (int revents, void *arg)
373{ 369{
374 struct x_once *once = (struct x_once *)arg; 370 struct ev_x_once *once = (struct ev_x_once *)arg;
375 371
376 once->cb (once->fd, (short)revents, once->arg); 372 once->cb (once->fd, (short)revents, once->arg);
377 free (once); 373 free (once);
378} 374}
379 375
380int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 376int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
381{ 377{
382 struct x_once *once = (struct x_once *)malloc (sizeof (struct x_once)); 378 struct ev_x_once *once = (struct ev_x_once *)malloc (sizeof (struct ev_x_once));
383 dLOOPbase; 379 dLOOPbase;
384 380
385 if (!once) 381 if (!once)
386 return -1; 382 return -1;
387 383
388 once->fd = fd; 384 once->fd = fd;
389 once->cb = cb; 385 once->cb = cb;
390 once->arg = arg; 386 once->arg = arg;
391 387
392 ev_once (EV_A_ fd, events & (EV_READ | EV_WRITE), tv_get (tv), x_once_cb, (void *)once); 388 ev_once (EV_A_ fd, events & (EV_READ | EV_WRITE), ev_tv_get (tv), ev_x_once_cb, (void *)once);
393 389
394 return 0; 390 return 0;
395} 391}
396 392
397int event_base_priority_init (struct event_base *base, int npri) 393int event_base_priority_init (struct event_base *base, int npri)

Diff Legend

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