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

Comparing libev/event.c (file contents):
Revision 1.12 by root, Sun Nov 4 18:15:16 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>
35
36#ifndef WIN32
37# include <sys/time.h>
38#endif
36 39
37#include "ev.h" 40#include "ev.h"
38#include "event.h" 41#include "event.h"
39 42
40#if EV_MULTIPLICITY 43#if EV_MULTIPLICITY
… …
85{ 88{
86#if EV_MULTIPLICITY 89#if EV_MULTIPLICITY
87 if (x_cur) 90 if (x_cur)
88 x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO); 91 x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO);
89 else 92 else
90 x_cur = ev_default_loop (EVMETHOD_AUTO); 93 x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO);
91#else 94#else
92 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));
93 96
94 x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO); 97 x_cur = (struct event_base *)(long)ev_default_loop (EVMETHOD_AUTO);
95#endif 98#endif
96 99
97 return x_cur; 100 return x_cur;
98} 101}
99 102
100void event_base_free (struct event_base *base) 103void event_base_free (struct event_base *base)
101{ 104{
102 dLOOPbase; 105 dLOOPbase;
103 106
104#if EV_MULTIPLICITY 107#if EV_MULTIPLICITY
108 if (ev_default_loop (EVMETHOD_AUTO) != loop)
105 ev_loop_delete (loop); 109 ev_loop_destroy (loop);
106#endif 110#endif
107} 111}
108 112
109int event_dispatch (void) 113int event_dispatch (void)
110{ 114{
… …
138} 142}
139 143
140static void 144static void
141x_cb_sig (EV_P_ struct ev_signal *w, int revents) 145x_cb_sig (EV_P_ struct ev_signal *w, int revents)
142{ 146{
143 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);
144} 153}
145 154
146static void 155static void
147x_cb_io (EV_P_ struct ev_io *w, int revents) 156x_cb_io (EV_P_ struct ev_io *w, int revents)
148{ 157{
149 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));
150 159
160 if (revents & EV_ERROR)
161 event_del (ev);
151 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w)) 162 else if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w))
152 ev_io_stop (EV_A_ w); 163 ev_io_stop (EV_A_ w);
153 164
154 x_cb (ev, revents); 165 x_cb (ev, revents);
155} 166}
156 167
157static void 168static void
158x_cb_to (EV_P_ struct ev_timer *w, int revents) 169x_cb_to (EV_P_ struct ev_timer *w, int revents)
159{ 170{
160 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);
161} 176}
162 177
163void 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)
164{ 179{
165 if (!ev->initialised)
166 {
167 ev->initialised = 1;
168
169 if (events & EV_SIGNAL) 180 if (events & EV_SIGNAL)
170 ev_watcher_init (&ev->iosig.sig, x_cb_sig); 181 ev_watcher_init (&ev->iosig.sig, x_cb_sig);
171 else 182 else
172 ev_watcher_init (&ev->iosig.io, x_cb_io); 183 ev_watcher_init (&ev->iosig.io, x_cb_io);
173 184
174 ev_watcher_init (&ev->to, x_cb_to); 185 ev_watcher_init (&ev->to, x_cb_to);
175 }
176 186
177 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 */
178 ev->ev_fd = fd; 188 ev->ev_fd = fd;
179 ev->ev_events = events; 189 ev->ev_events = events;
180 ev->ev_pri = 0; 190 ev->ev_pri = 0;
… …
223 { 233 {
224 /* sig */ 234 /* sig */
225 if (ev_is_active (&ev->iosig.sig)) 235 if (ev_is_active (&ev->iosig.sig))
226 ev_signal_stop (EV_A_ &ev->iosig.sig); 236 ev_signal_stop (EV_A_ &ev->iosig.sig);
227 } 237 }
228 else 238 else if (ev->ev_events & (EV_READ | EV_WRITE))
229 { 239 {
230 /* io */ 240 /* io */
231 if (ev_is_active (&ev->iosig.io)) 241 if (ev_is_active (&ev->iosig.io))
232 ev_io_stop (EV_A_ &ev->iosig.io); 242 ev_io_stop (EV_A_ &ev->iosig.io);
233 } 243 }
… …
238 return 0; 248 return 0;
239} 249}
240 250
241int event_pending (struct event *ev, short events, struct timeval *tv) 251int event_pending (struct event *ev, short events, struct timeval *tv)
242{ 252{
253 short revents = 0;
243 dLOOPev; 254 dLOOPev;
244 255
245 short revents = 0;
246 256
247 if (ev->ev_events & EV_SIGNAL) 257 if (ev->ev_events & EV_SIGNAL)
248 { 258 {
249 /* sig */ 259 /* sig */
250 if (ev->iosig.sig.pending) 260 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
251 revents |= EV_SIGNAL; 261 revents |= EV_SIGNAL;
252 } 262 }
253 else 263 else if (ev->ev_events & (EV_READ | EV_WRITE))
254 { 264 {
255 /* io */ 265 /* io */
256 if (ev->iosig.io.pending) 266 if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))
257 revents |= ev->ev_events & (EV_READ | EV_WRITE); 267 revents |= ev->ev_events & (EV_READ | EV_WRITE);
258 } 268 }
259 269
260 if (ev->to.pending) 270 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to))
261 { 271 {
262 revents |= EV_TIMEOUT; 272 revents |= EV_TIMEOUT;
263 273
264 if (tv) 274 if (tv)
265 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 :) */
… …
309 ev_unloop (EV_A_ EVUNLOOP_ONCE); 319 ev_unloop (EV_A_ EVUNLOOP_ONCE);
310} 320}
311 321
312int event_base_loopexit (struct event_base *base, struct timeval *tv) 322int event_base_loopexit (struct event_base *base, struct timeval *tv)
313{ 323{
314 dLOOPbase;
315 ev_tstamp after = tv_get (tv); 324 ev_tstamp after = tv_get (tv);
325 dLOOPbase;
316 326
317 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);
318 328
319 return -1; 329 return -1;
320} 330}
… …
327}; 337};
328 338
329static void 339static void
330x_once_cb (int revents, void *arg) 340x_once_cb (int revents, void *arg)
331{ 341{
332 struct x_once *once = arg; 342 struct x_once *once = (struct x_once *)arg;
333 343
334 once->cb (once->fd, revents, once->arg); 344 once->cb (once->fd, revents, once->arg);
335 free (once); 345 free (once);
336} 346}
337 347
338int 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)
339{ 349{
340 dLOOPbase;
341 struct x_once *once = malloc (sizeof (struct x_once)); 350 struct x_once *once = (struct x_once *)malloc (sizeof (struct x_once));
351 dLOOPbase;
342 352
343 if (!once) 353 if (!once)
344 return -1; 354 return -1;
345 355
346 once->fd = fd; 356 once->fd = fd;
… …
352 return 0; 362 return 0;
353} 363}
354 364
355int event_base_priority_init (struct event_base *base, int npri) 365int event_base_priority_init (struct event_base *base, int npri)
356{ 366{
357 dLOOPbase; 367 /*dLOOPbase;*/
358 368
359 return 0; 369 return 0;
360} 370}
361 371

Diff Legend

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