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

Comparing libev/event.c (file contents):
Revision 1.36 by root, Fri May 23 16:37:38 2008 UTC vs.
Revision 1.40 by root, Tue Jan 6 19:57:32 2009 UTC

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

Diff Legend

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