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

Comparing libev/event.c (file contents):
Revision 1.10 by root, Sun Nov 4 15:58:50 2007 UTC vs.
Revision 1.18 by root, Tue Nov 6 13:17:55 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
36#ifndef WIN32
37# include <sys/time.h>
38#endif
39
40#include "ev.h"
37#include "event.h" 41#include "event.h"
38 42
39#if EV_MULTIPLICITY 43#if EV_MULTIPLICITY
40# define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base 44# define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base
41# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base 45# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base
… …
84{ 88{
85#if EV_MULTIPLICITY 89#if EV_MULTIPLICITY
86 if (x_cur) 90 if (x_cur)
87 x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO); 91 x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO);
88 else 92 else
89 x_cur = ev_default_loop (EVMETHOD_AUTO); 93 x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO);
90#else 94#else
91 assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur)); 95 assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur));
92 96
93 x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO); 97 x_cur = (struct event_base *)(long)ev_default_loop (EVMETHOD_AUTO);
94#endif 98#endif
95 99
96 return x_cur; 100 return x_cur;
97} 101}
98 102
99void event_base_free (struct event_base *base) 103void event_base_free (struct event_base *base)
100{ 104{
101 dLOOPbase; 105 dLOOPbase;
102 106
103#if EV_MULTIPLICITY 107#if EV_MULTIPLICITY
108 if (ev_default_loop (EVMETHOD_AUTO) != loop)
104 ev_loop_delete (loop); 109 ev_loop_destroy (loop);
105#endif 110#endif
106} 111}
107 112
108int event_dispatch (void) 113int event_dispatch (void)
109{ 114{
… …
154} 159}
155 160
156static void 161static void
157x_cb_to (EV_P_ struct ev_timer *w, int revents) 162x_cb_to (EV_P_ struct ev_timer *w, int revents)
158{ 163{
159 x_cb ((struct event *)(((char *)w) - offsetof (struct event, to)), revents); 164 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, to));
165
166 event_del (ev);
167
168 x_cb (ev, revents);
160} 169}
161 170
162void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg) 171void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg)
163{ 172{
164 if (!ev->initialised)
165 {
166 ev->initialised = 1;
167
168 if (events & EV_SIGNAL) 173 if (events & EV_SIGNAL)
169 ev_watcher_init (&ev->iosig.sig, x_cb_sig); 174 ev_watcher_init (&ev->iosig.sig, x_cb_sig);
170 else 175 else
171 ev_watcher_init (&ev->iosig.io, x_cb_io); 176 ev_watcher_init (&ev->iosig.io, x_cb_io);
172 177
173 ev_watcher_init (&ev->to, x_cb_to); 178 ev_watcher_init (&ev->to, x_cb_to);
174 }
175 179
176 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */ 180 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */
177 ev->ev_fd = fd; 181 ev->ev_fd = fd;
178 ev->ev_events = events; 182 ev->ev_events = events;
179 ev->ev_pri = 0; 183 ev->ev_pri = 0;
… …
222 { 226 {
223 /* sig */ 227 /* sig */
224 if (ev_is_active (&ev->iosig.sig)) 228 if (ev_is_active (&ev->iosig.sig))
225 ev_signal_stop (EV_A_ &ev->iosig.sig); 229 ev_signal_stop (EV_A_ &ev->iosig.sig);
226 } 230 }
227 else 231 else if (ev->ev_events & (EV_READ | EV_WRITE))
228 { 232 {
229 /* io */ 233 /* io */
230 if (ev_is_active (&ev->iosig.io)) 234 if (ev_is_active (&ev->iosig.io))
231 ev_io_stop (EV_A_ &ev->iosig.io); 235 ev_io_stop (EV_A_ &ev->iosig.io);
232 } 236 }
… …
237 return 0; 241 return 0;
238} 242}
239 243
240int event_pending (struct event *ev, short events, struct timeval *tv) 244int event_pending (struct event *ev, short events, struct timeval *tv)
241{ 245{
246 short revents = 0;
242 dLOOPev; 247 dLOOPev;
243 248
244 short revents = 0;
245 249
246 if (ev->ev_events & EV_SIGNAL) 250 if (ev->ev_events & EV_SIGNAL)
247 { 251 {
248 /* sig */ 252 /* sig */
249 if (ev->iosig.sig.pending) 253 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
250 revents |= EV_SIGNAL; 254 revents |= EV_SIGNAL;
251 } 255 }
252 else 256 else if (ev->ev_events & (EV_READ | EV_WRITE))
253 { 257 {
254 /* io */ 258 /* io */
255 if (ev->iosig.io.pending) 259 if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))
256 revents |= ev->ev_events & (EV_READ | EV_WRITE); 260 revents |= ev->ev_events & (EV_READ | EV_WRITE);
257 } 261 }
258 262
259 if (ev->to.pending) 263 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to))
260 { 264 {
261 revents |= EV_TIMEOUT; 265 revents |= EV_TIMEOUT;
262 266
263 if (tv) 267 if (tv)
264 tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */ 268 tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */
… …
308 ev_unloop (EV_A_ EVUNLOOP_ONCE); 312 ev_unloop (EV_A_ EVUNLOOP_ONCE);
309} 313}
310 314
311int event_base_loopexit (struct event_base *base, struct timeval *tv) 315int event_base_loopexit (struct event_base *base, struct timeval *tv)
312{ 316{
313 dLOOPbase;
314 ev_tstamp after = tv_get (tv); 317 ev_tstamp after = tv_get (tv);
318 dLOOPbase;
315 319
316 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base); 320 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base);
317 321
318 return -1; 322 return -1;
319} 323}
… …
334 free (once); 338 free (once);
335} 339}
336 340
337int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 341int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
338{ 342{
339 dLOOPbase;
340 struct x_once *once = malloc (sizeof (struct x_once)); 343 struct x_once *once = malloc (sizeof (struct x_once));
344 dLOOPbase;
341 345
342 if (!once) 346 if (!once)
343 return -1; 347 return -1;
344 348
345 once->fd = fd; 349 once->fd = fd;
… …
351 return 0; 355 return 0;
352} 356}
353 357
354int event_base_priority_init (struct event_base *base, int npri) 358int event_base_priority_init (struct event_base *base, int npri)
355{ 359{
356 dLOOPbase; 360 /*dLOOPbase;*/
357 361
358 return 0; 362 return 0;
359} 363}
360 364

Diff Legend

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