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.20 by root, Tue Nov 6 18:49:32 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);
… …
118} 142}
119 143
120static void 144static void
121x_cb_sig (EV_P_ struct ev_signal *w, int revents) 145x_cb_sig (EV_P_ struct ev_signal *w, int revents)
122{ 146{
123 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);
124} 153}
125 154
126static void 155static void
127x_cb_io (EV_P_ struct ev_io *w, int revents) 156x_cb_io (EV_P_ struct ev_io *w, int revents)
128{ 157{
129 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));
130 159
160 if (revents & EV_ERROR)
161 event_del (ev);
131 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w)) 162 else if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w))
132 ev_io_stop (w); 163 ev_io_stop (EV_A_ w);
133 164
134 x_cb (ev, revents); 165 x_cb (ev, revents);
135} 166}
136 167
137static void 168static void
138x_cb_to (EV_P_ struct ev_timer *w, int revents) 169x_cb_to (EV_P_ struct ev_timer *w, int revents)
139{ 170{
140 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);
141} 176}
142 177
143void 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)
144{ 179{
145 if (events & EV_SIGNAL) 180 if (events & EV_SIGNAL)
… …
147 else 182 else
148 ev_watcher_init (&ev->iosig.io, x_cb_io); 183 ev_watcher_init (&ev->iosig.io, x_cb_io);
149 184
150 ev_watcher_init (&ev->to, x_cb_to); 185 ev_watcher_init (&ev->to, x_cb_to);
151 186
152 ev->ev_base = x_cur; 187 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */
153 ev->ev_fd = fd; 188 ev->ev_fd = fd;
154 ev->ev_events = events; 189 ev->ev_events = events;
155 ev->ev_pri = 0; 190 ev->ev_pri = 0;
156 ev->ev_callback = cb; 191 ev->ev_callback = cb;
157 ev->ev_arg = arg; 192 ev->ev_arg = arg;
… …
198 { 233 {
199 /* sig */ 234 /* sig */
200 if (ev_is_active (&ev->iosig.sig)) 235 if (ev_is_active (&ev->iosig.sig))
201 ev_signal_stop (EV_A_ &ev->iosig.sig); 236 ev_signal_stop (EV_A_ &ev->iosig.sig);
202 } 237 }
203 else 238 else if (ev->ev_events & (EV_READ | EV_WRITE))
204 { 239 {
205 /* io */ 240 /* io */
206 if (ev_is_active (&ev->iosig.io)) 241 if (ev_is_active (&ev->iosig.io))
207 ev_io_stop (EV_A_ &ev->iosig.io); 242 ev_io_stop (EV_A_ &ev->iosig.io);
208 } 243 }
… …
213 return 0; 248 return 0;
214} 249}
215 250
216int event_pending (struct event *ev, short events, struct timeval *tv) 251int event_pending (struct event *ev, short events, struct timeval *tv)
217{ 252{
253 short revents = 0;
218 dLOOPev; 254 dLOOPev;
219 255
220 short revents = 0;
221 256
222 if (ev->ev_events & EV_SIGNAL) 257 if (ev->ev_events & EV_SIGNAL)
223 { 258 {
224 /* sig */ 259 /* sig */
225 if (ev->iosig.sig.pending) 260 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
226 revents |= EV_SIGNAL; 261 revents |= EV_SIGNAL;
227 } 262 }
228 else 263 else if (ev->ev_events & (EV_READ | EV_WRITE))
229 { 264 {
230 /* io */ 265 /* io */
231 if (ev->iosig.io.pending) 266 if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))
232 revents |= ev->ev_events & (EV_READ | EV_WRITE); 267 revents |= ev->ev_events & (EV_READ | EV_WRITE);
233 } 268 }
234 269
235 if (ev->to.pending) 270 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to))
236 { 271 {
237 revents |= EV_TIMEOUT; 272 revents |= EV_TIMEOUT;
238 273
239 if (tv) 274 if (tv)
240 tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */ 275 tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */
… …
263} 298}
264 299
265int event_base_loop (struct event_base *base, int flags) 300int event_base_loop (struct event_base *base, int flags)
266{ 301{
267 dLOOPbase; 302 dLOOPbase;
268 ev_loop (EV_A_ flags | EVLOOP_ONESHOT); 303
304 ev_loop (EV_A_ flags);
269 305
270 return 0; 306 return 0;
271} 307}
272 308
273int event_base_dispatch (struct event_base *base) 309int event_base_dispatch (struct event_base *base)
274{ 310{
275 return event_base_loop (base, 0); 311 return event_base_loop (base, 0);
276} 312}
277 313
278static void 314static void
279x_loopexit_cb (EV_P_ int revents, void *arg) 315x_loopexit_cb (int revents, void *base)
280{ 316{
317 dLOOPbase;
318
281 ev_unloop (EV_A_ 2); 319 ev_unloop (EV_A_ EVUNLOOP_ONCE);
282} 320}
283 321
284int event_base_loopexit (struct event_base *base, struct timeval *tv) 322int event_base_loopexit (struct event_base *base, struct timeval *tv)
285{ 323{
286 dLOOPbase;
287 ev_tstamp after = tv_get (tv); 324 ev_tstamp after = tv_get (tv);
325 dLOOPbase;
288 326
289 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base); 327 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base);
290 328
291 return -1; 329 return -1;
292} 330}
… …
299}; 337};
300 338
301static void 339static void
302x_once_cb (int revents, void *arg) 340x_once_cb (int revents, void *arg)
303{ 341{
304 struct x_once *once = arg; 342 struct x_once *once = (struct x_once *)arg;
305 343
306 once->cb (once->fd, revents, once->arg); 344 once->cb (once->fd, revents, once->arg);
307 free (once); 345 free (once);
308} 346}
309 347
310int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 348int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
311{ 349{
312 dLOOPbase;
313 struct x_once *once = malloc (sizeof (struct x_once)); 350 struct x_once *once = (struct x_once *)malloc (sizeof (struct x_once));
351 dLOOPbase;
314 352
315 if (!once) 353 if (!once)
316 return -1; 354 return -1;
317 355
318 once->fd = fd; 356 once->fd = fd;
… …
324 return 0; 362 return 0;
325} 363}
326 364
327int event_base_priority_init (struct event_base *base, int npri) 365int event_base_priority_init (struct event_base *base, int npri)
328{ 366{
329 dLOOPbase; 367 /*dLOOPbase;*/
330 368
331 return 0; 369 return 0;
332} 370}
333 371

Diff Legend

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