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.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 <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{
… …
137} 142}
138 143
139static void 144static void
140x_cb_sig (EV_P_ struct ev_signal *w, int revents) 145x_cb_sig (EV_P_ struct ev_signal *w, int revents)
141{ 146{
142 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);
143} 153}
144 154
145static void 155static void
146x_cb_io (EV_P_ struct ev_io *w, int revents) 156x_cb_io (EV_P_ struct ev_io *w, int revents)
147{ 157{
148 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));
149 159
160 if (revents & EV_ERROR)
161 event_del (ev);
150 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w)) 162 else if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w))
151 ev_io_stop (EV_A_ w); 163 ev_io_stop (EV_A_ w);
152 164
153 x_cb (ev, revents); 165 x_cb (ev, revents);
154} 166}
155 167
156static void 168static void
157x_cb_to (EV_P_ struct ev_timer *w, int revents) 169x_cb_to (EV_P_ struct ev_timer *w, int revents)
158{ 170{
159 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);
160} 176}
161 177
162void 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)
163{ 179{
164 if (!ev->initialised)
165 {
166 ev->initialised = 1;
167
168 if (events & EV_SIGNAL) 180 if (events & EV_SIGNAL)
169 ev_watcher_init (&ev->iosig.sig, x_cb_sig); 181 ev_watcher_init (&ev->iosig.sig, x_cb_sig);
170 else 182 else
171 ev_watcher_init (&ev->iosig.io, x_cb_io); 183 ev_watcher_init (&ev->iosig.io, x_cb_io);
172 184
173 ev_watcher_init (&ev->to, x_cb_to); 185 ev_watcher_init (&ev->to, x_cb_to);
174 }
175 186
176 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */ 187 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */
177 ev->ev_fd = fd; 188 ev->ev_fd = fd;
178 ev->ev_events = events; 189 ev->ev_events = events;
179 ev->ev_pri = 0; 190 ev->ev_pri = 0;
… …
222 { 233 {
223 /* sig */ 234 /* sig */
224 if (ev_is_active (&ev->iosig.sig)) 235 if (ev_is_active (&ev->iosig.sig))
225 ev_signal_stop (EV_A_ &ev->iosig.sig); 236 ev_signal_stop (EV_A_ &ev->iosig.sig);
226 } 237 }
227 else 238 else if (ev->ev_events & (EV_READ | EV_WRITE))
228 { 239 {
229 /* io */ 240 /* io */
230 if (ev_is_active (&ev->iosig.io)) 241 if (ev_is_active (&ev->iosig.io))
231 ev_io_stop (EV_A_ &ev->iosig.io); 242 ev_io_stop (EV_A_ &ev->iosig.io);
232 } 243 }
… …
237 return 0; 248 return 0;
238} 249}
239 250
240int event_pending (struct event *ev, short events, struct timeval *tv) 251int event_pending (struct event *ev, short events, struct timeval *tv)
241{ 252{
253 short revents = 0;
242 dLOOPev; 254 dLOOPev;
243 255
244 short revents = 0;
245 256
246 if (ev->ev_events & EV_SIGNAL) 257 if (ev->ev_events & EV_SIGNAL)
247 { 258 {
248 /* sig */ 259 /* sig */
249 if (ev->iosig.sig.pending) 260 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
250 revents |= EV_SIGNAL; 261 revents |= EV_SIGNAL;
251 } 262 }
252 else 263 else if (ev->ev_events & (EV_READ | EV_WRITE))
253 { 264 {
254 /* io */ 265 /* io */
255 if (ev->iosig.io.pending) 266 if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))
256 revents |= ev->ev_events & (EV_READ | EV_WRITE); 267 revents |= ev->ev_events & (EV_READ | EV_WRITE);
257 } 268 }
258 269
259 if (ev->to.pending) 270 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to))
260 { 271 {
261 revents |= EV_TIMEOUT; 272 revents |= EV_TIMEOUT;
262 273
263 if (tv) 274 if (tv)
264 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 :) */
… …
308 ev_unloop (EV_A_ EVUNLOOP_ONCE); 319 ev_unloop (EV_A_ EVUNLOOP_ONCE);
309} 320}
310 321
311int event_base_loopexit (struct event_base *base, struct timeval *tv) 322int event_base_loopexit (struct event_base *base, struct timeval *tv)
312{ 323{
313 dLOOPbase;
314 ev_tstamp after = tv_get (tv); 324 ev_tstamp after = tv_get (tv);
325 dLOOPbase;
315 326
316 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);
317 328
318 return -1; 329 return -1;
319} 330}
… …
326}; 337};
327 338
328static void 339static void
329x_once_cb (int revents, void *arg) 340x_once_cb (int revents, void *arg)
330{ 341{
331 struct x_once *once = arg; 342 struct x_once *once = (struct x_once *)arg;
332 343
333 once->cb (once->fd, revents, once->arg); 344 once->cb (once->fd, revents, once->arg);
334 free (once); 345 free (once);
335} 346}
336 347
337int 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)
338{ 349{
339 dLOOPbase;
340 struct x_once *once = malloc (sizeof (struct x_once)); 350 struct x_once *once = (struct x_once *)malloc (sizeof (struct x_once));
351 dLOOPbase;
341 352
342 if (!once) 353 if (!once)
343 return -1; 354 return -1;
344 355
345 once->fd = fd; 356 once->fd = fd;
… …
351 return 0; 362 return 0;
352} 363}
353 364
354int event_base_priority_init (struct event_base *base, int npri) 365int event_base_priority_init (struct event_base *base, int npri)
355{ 366{
356 dLOOPbase; 367 /*dLOOPbase;*/
357 368
358 return 0; 369 return 0;
359} 370}
360 371

Diff Legend

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