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

Comparing libev/event.c (file contents):
Revision 1.33 by root, Tue Dec 25 07:05:46 2007 UTC vs.
Revision 1.42 by root, Mon May 10 20:01:45 2010 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,2009 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)
77 {
81 return tv->tv_sec + tv->tv_usec * 1e-6; 78 ev_tstamp after = tv->tv_sec + tv->tv_usec * 1e-6;
79 return after ? after : 1e-6;
80 }
82 else 81 else
83 return -1.; 82 return -1.;
84} 83}
85 84
86#define EVENT_VERSION(a,b) # a "." # b 85#define EVENT_STRINGIFY(s) # s
86#define EVENT_VERSION(a,b) EVENT_STRINGIFY (a) "." EVENT_STRINGIFY (b)
87 87
88const char *event_get_version (void) 88const char *event_get_version (void)
89{ 89{
90 /* returns ABI, not API or library, version */
90 return EVENT_VERSION (EV_VERSION_MAJOR, EV_VERSION_MINOR); 91 return EVENT_VERSION (EV_VERSION_MAJOR, EV_VERSION_MINOR);
91} 92}
92 93
93const char *event_get_method (void) 94const char *event_get_method (void)
94{ 95{
… …
96} 97}
97 98
98void *event_init (void) 99void *event_init (void)
99{ 100{
100#if EV_MULTIPLICITY 101#if EV_MULTIPLICITY
101 if (x_cur) 102 if (ev_x_cur)
102 x_cur = (struct event_base *)ev_loop_new (EVFLAG_AUTO); 103 ev_x_cur = (struct event_base *)ev_loop_new (EVFLAG_AUTO);
103 else 104 else
104 x_cur = (struct event_base *)ev_default_loop (EVFLAG_AUTO); 105 ev_x_cur = (struct event_base *)ev_default_loop (EVFLAG_AUTO);
105#else 106#else
106 assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur)); 107 assert (("libev: multiple event bases not supported when not compiled with EV_MULTIPLICITY", !ev_x_cur));
107 108
108 x_cur = (struct event_base *)(long)ev_default_loop (EVFLAG_AUTO); 109 ev_x_cur = (struct event_base *)(long)ev_default_loop (EVFLAG_AUTO);
109#endif 110#endif
110 111
111 return x_cur; 112 return ev_x_cur;
112} 113}
113 114
114void event_base_free (struct event_base *base) 115void event_base_free (struct event_base *base)
115{ 116{
116 dLOOPbase; 117 dLOOPbase;
… …
121#endif 122#endif
122} 123}
123 124
124int event_dispatch (void) 125int event_dispatch (void)
125{ 126{
126 return event_base_dispatch (x_cur); 127 return event_base_dispatch (ev_x_cur);
127} 128}
128 129
129#ifdef EV_STANDALONE 130#ifdef EV_STANDALONE
130void event_set_log_callback (event_log_cb cb) 131void event_set_log_callback (event_log_cb cb)
131{ 132{
… …
133} 134}
134#endif 135#endif
135 136
136int event_loop (int flags) 137int event_loop (int flags)
137{ 138{
138 return event_base_loop (x_cur, flags); 139 return event_base_loop (ev_x_cur, flags);
139} 140}
140 141
141int event_loopexit (struct timeval *tv) 142int event_loopexit (struct timeval *tv)
142{ 143{
143 return event_base_loopexit (x_cur, tv); 144 return event_base_loopexit (ev_x_cur, tv);
144} 145}
145 146
146static void 147static void
147x_cb (struct event *ev, int revents) 148ev_x_cb (struct event *ev, int revents)
148{ 149{
149 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL; 150 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL;
150 151
151 ev->ev_res = revents; 152 ev->ev_res = revents;
152 ev->ev_callback (ev->ev_fd, (short)revents, ev->ev_arg); 153 ev->ev_callback (ev->ev_fd, (short)revents, ev->ev_arg);
153} 154}
154 155
155static void 156static void
156x_cb_sig (EV_P_ struct ev_signal *w, int revents) 157ev_x_cb_sig (EV_P_ struct ev_signal *w, int revents)
157{ 158{
158 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.sig)); 159 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.sig));
159 160
160 if (revents & EV_ERROR) 161 if (revents & EV_ERROR)
161 event_del (ev); 162 event_del (ev);
162 163
163 x_cb (ev, revents); 164 ev_x_cb (ev, revents);
164} 165}
165 166
166static void 167static void
167x_cb_io (EV_P_ struct ev_io *w, int revents) 168ev_x_cb_io (EV_P_ struct ev_io *w, int revents)
168{ 169{
169 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io)); 170 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io));
170 171
171 if ((revents & EV_ERROR) || !(ev->ev_events & EV_PERSIST)) 172 if ((revents & EV_ERROR) || !(ev->ev_events & EV_PERSIST))
172 event_del (ev); 173 event_del (ev);
173 174
174 x_cb (ev, revents); 175 ev_x_cb (ev, revents);
175} 176}
176 177
177static void 178static void
178x_cb_to (EV_P_ struct ev_timer *w, int revents) 179ev_x_cb_to (EV_P_ struct ev_timer *w, int revents)
179{ 180{
180 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, to)); 181 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, to));
181 182
182 event_del (ev); 183 event_del (ev);
183 184
184 x_cb (ev, revents); 185 ev_x_cb (ev, revents);
185} 186}
186 187
187void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg) 188void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg)
188{ 189{
189 if (events & EV_SIGNAL) 190 if (events & EV_SIGNAL)
190 ev_init (&ev->iosig.sig, x_cb_sig); 191 ev_init (&ev->iosig.sig, ev_x_cb_sig);
191 else 192 else
192 ev_init (&ev->iosig.io, x_cb_io); 193 ev_init (&ev->iosig.io, ev_x_cb_io);
193 194
194 ev_init (&ev->to, x_cb_to); 195 ev_init (&ev->to, ev_x_cb_to);
195 196
196 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */ 197 ev->ev_base = ev_x_cur; /* not threadsafe, but it's how libevent works */
197 ev->ev_fd = fd; 198 ev->ev_fd = fd;
198 ev->ev_events = events; 199 ev->ev_events = events;
199 ev->ev_pri = 0; 200 ev->ev_pri = 0;
200 ev->ev_callback = cb; 201 ev->ev_callback = cb;
201 ev->ev_arg = arg; 202 ev->ev_arg = arg;
… …
203 ev->ev_flags = EVLIST_INIT; 204 ev->ev_flags = EVLIST_INIT;
204} 205}
205 206
206int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 207int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
207{ 208{
208 return event_base_once (x_cur, fd, events, cb, arg, tv); 209 return event_base_once (ev_x_cur, fd, events, cb, arg, tv);
209} 210}
210 211
211int event_add (struct event *ev, struct timeval *tv) 212int event_add (struct event *ev, struct timeval *tv)
212{ 213{
213 dLOOPev; 214 dLOOPev;
… …
233 } 234 }
234 } 235 }
235 236
236 if (tv) 237 if (tv)
237 { 238 {
238 ev->to.repeat = tv_get (tv); 239 ev->to.repeat = ev_tv_get (tv);
239 ev_timer_again (EV_A_ &ev->to); 240 ev_timer_again (EV_A_ &ev->to);
240 ev->ev_flags |= EVLIST_TIMEOUT; 241 ev->ev_flags |= EVLIST_TIMEOUT;
241 } 242 }
242 else 243 else
243 { 244 {
… …
284int event_pending (struct event *ev, short events, struct timeval *tv) 285int event_pending (struct event *ev, short events, struct timeval *tv)
285{ 286{
286 short revents = 0; 287 short revents = 0;
287 dLOOPev; 288 dLOOPev;
288 289
289
290 if (ev->ev_events & EV_SIGNAL) 290 if (ev->ev_events & EV_SIGNAL)
291 { 291 {
292 /* sig */ 292 /* sig */
293 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig)) 293 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
294 revents |= EV_SIGNAL; 294 revents |= EV_SIGNAL;
… …
303 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to)) 303 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to))
304 { 304 {
305 revents |= EV_TIMEOUT; 305 revents |= EV_TIMEOUT;
306 306
307 if (tv) 307 if (tv)
308 tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */ 308 ev_tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */
309 } 309 }
310 310
311 return events & revents; 311 return events & revents;
312} 312}
313 313
314int event_priority_init (int npri) 314int event_priority_init (int npri)
315{ 315{
316 return event_base_priority_init (x_cur, npri); 316 return event_base_priority_init (ev_x_cur, npri);
317} 317}
318 318
319int event_priority_set (struct event *ev, int pri) 319int event_priority_set (struct event *ev, int pri)
320{ 320{
321 ev->ev_pri = pri; 321 ev->ev_pri = pri;
… …
343{ 343{
344 return event_base_loop (base, 0); 344 return event_base_loop (base, 0);
345} 345}
346 346
347static void 347static void
348x_loopexit_cb (int revents, void *base) 348ev_x_loopexit_cb (int revents, void *base)
349{ 349{
350 dLOOPbase; 350 dLOOPbase;
351 351
352 ev_unloop (EV_A_ EVUNLOOP_ONE); 352 ev_unloop (EV_A_ EVUNLOOP_ONE);
353} 353}
354 354
355int event_base_loopexit (struct event_base *base, struct timeval *tv) 355int event_base_loopexit (struct event_base *base, struct timeval *tv)
356{ 356{
357 ev_tstamp after = tv_get (tv); 357 ev_tstamp after = ev_tv_get (tv);
358 dLOOPbase; 358 dLOOPbase;
359 359
360 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base); 360 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., ev_x_loopexit_cb, (void *)base);
361 361
362 return -1; 362 return 0;
363} 363}
364 364
365struct x_once 365struct ev_x_once
366{ 366{
367 int fd; 367 int fd;
368 void (*cb)(int, short, void *); 368 void (*cb)(int, short, void *);
369 void *arg; 369 void *arg;
370}; 370};
371 371
372static void 372static void
373x_once_cb (int revents, void *arg) 373ev_x_once_cb (int revents, void *arg)
374{ 374{
375 struct x_once *once = (struct x_once *)arg; 375 struct ev_x_once *once = (struct ev_x_once *)arg;
376 376
377 once->cb (once->fd, (short)revents, once->arg); 377 once->cb (once->fd, (short)revents, once->arg);
378 free (once); 378 free (once);
379} 379}
380 380
381int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 381int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
382{ 382{
383 struct x_once *once = (struct x_once *)malloc (sizeof (struct x_once)); 383 struct ev_x_once *once = (struct ev_x_once *)malloc (sizeof (struct ev_x_once));
384 dLOOPbase; 384 dLOOPbase;
385 385
386 if (!once) 386 if (!once)
387 return -1; 387 return -1;
388 388
389 once->fd = fd; 389 once->fd = fd;
390 once->cb = cb; 390 once->cb = cb;
391 once->arg = arg; 391 once->arg = arg;
392 392
393 ev_once (EV_A_ fd, events & (EV_READ | EV_WRITE), tv_get (tv), x_once_cb, (void *)once); 393 ev_once (EV_A_ fd, events & (EV_READ | EV_WRITE), ev_tv_get (tv), ev_x_once_cb, (void *)once);
394 394
395 return 0; 395 return 0;
396} 396}
397 397
398int event_base_priority_init (struct event_base *base, int npri) 398int event_base_priority_init (struct event_base *base, int npri)

Diff Legend

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