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

Comparing libev/event.c (file contents):
Revision 1.9 by root, Sun Nov 4 00:24:17 2007 UTC vs.
Revision 1.24 by root, Fri Nov 9 17:07:59 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#ifdef EV_EVENT_H
41# include EV_EVENT_H
42#else
36#include "event.h" 43# include "event.h"
44#endif
37 45
38#if EV_MULTIPLICITY 46#if EV_MULTIPLICITY
39# define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base 47# define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base
40# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base 48# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base
41#else 49#else
… …
47struct event_base 55struct event_base
48{ 56{
49 int dummy; 57 int dummy;
50}; 58};
51 59
52static struct event_base x_base, *x_cur; 60static struct event_base *x_cur;
53 61
54static void 62static void
55tv_set (struct timeval *tv, ev_tstamp at) 63tv_set (struct timeval *tv, ev_tstamp at)
56{ 64{
57 tv->tv_sec = (long)at; 65 tv->tv_sec = (long)at;
… …
80} 88}
81 89
82void *event_init (void) 90void *event_init (void)
83{ 91{
84#if EV_MULTIPLICITY 92#if EV_MULTIPLICITY
93 if (x_cur)
85 x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO); 94 x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO);
95 else
96 x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO);
86#else 97#else
87 x_cur = &x_base; 98 assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur));
99
100 x_cur = (struct event_base *)(long)ev_default_loop (EVMETHOD_AUTO);
88#endif 101#endif
89 102
90 return x_cur; 103 return x_cur;
91} 104}
92 105
93void event_base_free (struct event_base *base) 106void event_base_free (struct event_base *base)
94{ 107{
95 dLOOPbase; 108 dLOOPbase;
96 109
97#if EV_MULTIPLICITY 110#if EV_MULTIPLICITY
111 if (ev_default_loop (EVMETHOD_AUTO) != loop)
98 ev_loop_delete (loop); 112 ev_loop_destroy (loop);
99#endif 113#endif
100} 114}
101 115
102int event_dispatch (void) 116int event_dispatch (void)
103{ 117{
… …
131} 145}
132 146
133static void 147static void
134x_cb_sig (EV_P_ struct ev_signal *w, int revents) 148x_cb_sig (EV_P_ struct ev_signal *w, int revents)
135{ 149{
136 x_cb ((struct event *)(((char *)w) - offsetof (struct event, iosig.sig)), revents); 150 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.sig));
151
152 if (revents & EV_ERROR)
153 event_del (ev);
154
155 x_cb (ev, revents);
137} 156}
138 157
139static void 158static void
140x_cb_io (EV_P_ struct ev_io *w, int revents) 159x_cb_io (EV_P_ struct ev_io *w, int revents)
141{ 160{
142 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io)); 161 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io));
143 162
163 if (revents & EV_ERROR)
164 event_del (ev);
144 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w)) 165 else if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w))
145 ev_io_stop (EV_A_ w); 166 ev_io_stop (EV_A_ w);
146 167
147 x_cb (ev, revents); 168 x_cb (ev, revents);
148} 169}
149 170
150static void 171static void
151x_cb_to (EV_P_ struct ev_timer *w, int revents) 172x_cb_to (EV_P_ struct ev_timer *w, int revents)
152{ 173{
153 x_cb ((struct event *)(((char *)w) - offsetof (struct event, to)), revents); 174 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, to));
175
176 event_del (ev);
177
178 x_cb (ev, revents);
154} 179}
155 180
156void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg) 181void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg)
157{ 182{
158 if (!ev->initialised)
159 {
160 ev->initialised = 1;
161
162 if (events & EV_SIGNAL) 183 if (events & EV_SIGNAL)
163 ev_watcher_init (&ev->iosig.sig, x_cb_sig); 184 ev_watcher_init (&ev->iosig.sig, x_cb_sig);
164 else 185 else
165 ev_watcher_init (&ev->iosig.io, x_cb_io); 186 ev_watcher_init (&ev->iosig.io, x_cb_io);
166 187
167 ev_watcher_init (&ev->to, x_cb_to); 188 ev_watcher_init (&ev->to, x_cb_to);
168 }
169 189
170 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */ 190 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */
171 ev->ev_fd = fd; 191 ev->ev_fd = fd;
172 ev->ev_events = events; 192 ev->ev_events = events;
173 ev->ev_pri = 0; 193 ev->ev_pri = 0;
… …
216 { 236 {
217 /* sig */ 237 /* sig */
218 if (ev_is_active (&ev->iosig.sig)) 238 if (ev_is_active (&ev->iosig.sig))
219 ev_signal_stop (EV_A_ &ev->iosig.sig); 239 ev_signal_stop (EV_A_ &ev->iosig.sig);
220 } 240 }
221 else 241 else if (ev->ev_events & (EV_READ | EV_WRITE))
222 { 242 {
223 /* io */ 243 /* io */
224 if (ev_is_active (&ev->iosig.io)) 244 if (ev_is_active (&ev->iosig.io))
225 ev_io_stop (EV_A_ &ev->iosig.io); 245 ev_io_stop (EV_A_ &ev->iosig.io);
226 } 246 }
… …
229 ev_timer_stop (EV_A_ &ev->to); 249 ev_timer_stop (EV_A_ &ev->to);
230 250
231 return 0; 251 return 0;
232} 252}
233 253
254void event_active (struct event *ev, int res, short ncalls)
255{
256 dLOOPev;
257
258 if (res & EV_TIMEOUT)
259 ev_feed_event (EV_A_ &ev->to, res & EV_TIMEOUT);
260
261 if (res & EV_SIGNAL)
262 ev_feed_event (EV_A_ &ev->iosig.sig, res & EV_SIGNAL);
263
264 if (res & (EV_READ | EV_WRITE))
265 ev_feed_event (EV_A_ &ev->iosig.io, res & (EV_READ | EV_WRITE));
266}
267
234int event_pending (struct event *ev, short events, struct timeval *tv) 268int event_pending (struct event *ev, short events, struct timeval *tv)
235{ 269{
270 short revents = 0;
236 dLOOPev; 271 dLOOPev;
237 272
238 short revents = 0;
239 273
240 if (ev->ev_events & EV_SIGNAL) 274 if (ev->ev_events & EV_SIGNAL)
241 { 275 {
242 /* sig */ 276 /* sig */
243 if (ev->iosig.sig.pending) 277 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
244 revents |= EV_SIGNAL; 278 revents |= EV_SIGNAL;
245 } 279 }
246 else 280 else if (ev->ev_events & (EV_READ | EV_WRITE))
247 { 281 {
248 /* io */ 282 /* io */
249 if (ev->iosig.io.pending) 283 if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))
250 revents |= ev->ev_events & (EV_READ | EV_WRITE); 284 revents |= ev->ev_events & (EV_READ | EV_WRITE);
251 } 285 }
252 286
253 if (ev->to.pending) 287 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to))
254 { 288 {
255 revents |= EV_TIMEOUT; 289 revents |= EV_TIMEOUT;
256 290
257 if (tv) 291 if (tv)
258 tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */ 292 tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */
… …
302 ev_unloop (EV_A_ EVUNLOOP_ONCE); 336 ev_unloop (EV_A_ EVUNLOOP_ONCE);
303} 337}
304 338
305int event_base_loopexit (struct event_base *base, struct timeval *tv) 339int event_base_loopexit (struct event_base *base, struct timeval *tv)
306{ 340{
307 dLOOPbase;
308 ev_tstamp after = tv_get (tv); 341 ev_tstamp after = tv_get (tv);
342 dLOOPbase;
309 343
310 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base); 344 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base);
311 345
312 return -1; 346 return -1;
313} 347}
… …
320}; 354};
321 355
322static void 356static void
323x_once_cb (int revents, void *arg) 357x_once_cb (int revents, void *arg)
324{ 358{
325 struct x_once *once = arg; 359 struct x_once *once = (struct x_once *)arg;
326 360
327 once->cb (once->fd, revents, once->arg); 361 once->cb (once->fd, revents, once->arg);
328 free (once); 362 free (once);
329} 363}
330 364
331int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 365int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
332{ 366{
333 dLOOPbase;
334 struct x_once *once = malloc (sizeof (struct x_once)); 367 struct x_once *once = (struct x_once *)malloc (sizeof (struct x_once));
368 dLOOPbase;
335 369
336 if (!once) 370 if (!once)
337 return -1; 371 return -1;
338 372
339 once->fd = fd; 373 once->fd = fd;
… …
345 return 0; 379 return 0;
346} 380}
347 381
348int event_base_priority_init (struct event_base *base, int npri) 382int event_base_priority_init (struct event_base *base, int npri)
349{ 383{
350 dLOOPbase; 384 /*dLOOPbase;*/
351 385
352 return 0; 386 return 0;
353} 387}
354 388

Diff Legend

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