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

Diff Legend

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