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

Comparing libev/event.c (file contents):
Revision 1.11 by root, Sun Nov 4 16:52:52 2007 UTC vs.
Revision 1.25 by root, Fri Nov 9 21:48:23 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 <sys/time.h>
35#include <assert.h> 34#include <assert.h>
36 35
37#ifndef EV_EMBED 36#ifndef WIN32
37# include <sys/time.h>
38#endif
39
40#ifdef EV_EVENT_H
41# include EV_EVENT_H
42#else
38# include "event.h" 43# include "event.h"
39#endif 44#endif
40 45
41#if EV_MULTIPLICITY 46#if EV_MULTIPLICITY
42# 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
… …
86{ 91{
87#if EV_MULTIPLICITY 92#if EV_MULTIPLICITY
88 if (x_cur) 93 if (x_cur)
89 x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO); 94 x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO);
90 else 95 else
91 x_cur = ev_default_loop (EVMETHOD_AUTO); 96 x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO);
92#else 97#else
93 assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur)); 98 assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur));
94 99
95 x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO); 100 x_cur = (struct event_base *)(long)ev_default_loop (EVMETHOD_AUTO);
96#endif 101#endif
97 102
98 return x_cur; 103 return x_cur;
99} 104}
100 105
101void event_base_free (struct event_base *base) 106void event_base_free (struct event_base *base)
102{ 107{
103 dLOOPbase; 108 dLOOPbase;
104 109
105#if EV_MULTIPLICITY 110#if EV_MULTIPLICITY
111 if (ev_default_loop (EVMETHOD_AUTO) != loop)
106 ev_loop_delete (loop); 112 ev_loop_destroy (loop);
107#endif 113#endif
108} 114}
109 115
110int event_dispatch (void) 116int event_dispatch (void)
111{ 117{
112 return event_base_dispatch (x_cur); 118 return event_base_dispatch (x_cur);
113} 119}
114 120
115#ifdef EV_EMBED 121#ifdef EV_STANDALONE
116void event_set_log_callback (event_log_cb cb) 122void event_set_log_callback (event_log_cb cb)
117{ 123{
118 /* nop */ 124 /* nop */
119} 125}
120#endif 126#endif
… …
139} 145}
140 146
141static void 147static void
142x_cb_sig (EV_P_ struct ev_signal *w, int revents) 148x_cb_sig (EV_P_ struct ev_signal *w, int revents)
143{ 149{
144 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);
145} 156}
146 157
147static void 158static void
148x_cb_io (EV_P_ struct ev_io *w, int revents) 159x_cb_io (EV_P_ struct ev_io *w, int revents)
149{ 160{
150 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));
151 162
163 if (revents & EV_ERROR)
164 event_del (ev);
152 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w)) 165 else if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w))
153 ev_io_stop (EV_A_ w); 166 ev_io_stop (EV_A_ w);
154 167
155 x_cb (ev, revents); 168 x_cb (ev, revents);
156} 169}
157 170
158static void 171static void
159x_cb_to (EV_P_ struct ev_timer *w, int revents) 172x_cb_to (EV_P_ struct ev_timer *w, int revents)
160{ 173{
161 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);
162} 179}
163 180
164void 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)
165{ 182{
166 if (!ev->initialised)
167 {
168 ev->initialised = 1;
169
170 if (events & EV_SIGNAL) 183 if (events & EV_SIGNAL)
171 ev_watcher_init (&ev->iosig.sig, x_cb_sig); 184 ev_init (&ev->iosig.sig, x_cb_sig);
172 else 185 else
173 ev_watcher_init (&ev->iosig.io, x_cb_io); 186 ev_init (&ev->iosig.io, x_cb_io);
174 187
175 ev_watcher_init (&ev->to, x_cb_to); 188 ev_init (&ev->to, x_cb_to);
176 }
177 189
178 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 */
179 ev->ev_fd = fd; 191 ev->ev_fd = fd;
180 ev->ev_events = events; 192 ev->ev_events = events;
181 ev->ev_pri = 0; 193 ev->ev_pri = 0;
… …
224 { 236 {
225 /* sig */ 237 /* sig */
226 if (ev_is_active (&ev->iosig.sig)) 238 if (ev_is_active (&ev->iosig.sig))
227 ev_signal_stop (EV_A_ &ev->iosig.sig); 239 ev_signal_stop (EV_A_ &ev->iosig.sig);
228 } 240 }
229 else 241 else if (ev->ev_events & (EV_READ | EV_WRITE))
230 { 242 {
231 /* io */ 243 /* io */
232 if (ev_is_active (&ev->iosig.io)) 244 if (ev_is_active (&ev->iosig.io))
233 ev_io_stop (EV_A_ &ev->iosig.io); 245 ev_io_stop (EV_A_ &ev->iosig.io);
234 } 246 }
… …
237 ev_timer_stop (EV_A_ &ev->to); 249 ev_timer_stop (EV_A_ &ev->to);
238 250
239 return 0; 251 return 0;
240} 252}
241 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
242int event_pending (struct event *ev, short events, struct timeval *tv) 268int event_pending (struct event *ev, short events, struct timeval *tv)
243{ 269{
270 short revents = 0;
244 dLOOPev; 271 dLOOPev;
245 272
246 short revents = 0;
247 273
248 if (ev->ev_events & EV_SIGNAL) 274 if (ev->ev_events & EV_SIGNAL)
249 { 275 {
250 /* sig */ 276 /* sig */
251 if (ev->iosig.sig.pending) 277 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
252 revents |= EV_SIGNAL; 278 revents |= EV_SIGNAL;
253 } 279 }
254 else 280 else if (ev->ev_events & (EV_READ | EV_WRITE))
255 { 281 {
256 /* io */ 282 /* io */
257 if (ev->iosig.io.pending) 283 if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))
258 revents |= ev->ev_events & (EV_READ | EV_WRITE); 284 revents |= ev->ev_events & (EV_READ | EV_WRITE);
259 } 285 }
260 286
261 if (ev->to.pending) 287 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to))
262 { 288 {
263 revents |= EV_TIMEOUT; 289 revents |= EV_TIMEOUT;
264 290
265 if (tv) 291 if (tv)
266 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 :) */
… …
310 ev_unloop (EV_A_ EVUNLOOP_ONCE); 336 ev_unloop (EV_A_ EVUNLOOP_ONCE);
311} 337}
312 338
313int event_base_loopexit (struct event_base *base, struct timeval *tv) 339int event_base_loopexit (struct event_base *base, struct timeval *tv)
314{ 340{
315 dLOOPbase;
316 ev_tstamp after = tv_get (tv); 341 ev_tstamp after = tv_get (tv);
342 dLOOPbase;
317 343
318 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);
319 345
320 return -1; 346 return -1;
321} 347}
… …
328}; 354};
329 355
330static void 356static void
331x_once_cb (int revents, void *arg) 357x_once_cb (int revents, void *arg)
332{ 358{
333 struct x_once *once = arg; 359 struct x_once *once = (struct x_once *)arg;
334 360
335 once->cb (once->fd, revents, once->arg); 361 once->cb (once->fd, revents, once->arg);
336 free (once); 362 free (once);
337} 363}
338 364
339int 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)
340{ 366{
341 dLOOPbase;
342 struct x_once *once = malloc (sizeof (struct x_once)); 367 struct x_once *once = (struct x_once *)malloc (sizeof (struct x_once));
368 dLOOPbase;
343 369
344 if (!once) 370 if (!once)
345 return -1; 371 return -1;
346 372
347 once->fd = fd; 373 once->fd = fd;
… …
353 return 0; 379 return 0;
354} 380}
355 381
356int event_base_priority_init (struct event_base *base, int npri) 382int event_base_priority_init (struct event_base *base, int npri)
357{ 383{
358 dLOOPbase; 384 /*dLOOPbase;*/
359 385
360 return 0; 386 return 0;
361} 387}
362 388

Diff Legend

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