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

Comparing libev/event.c (file contents):
Revision 1.15 by root, Sun Nov 4 20:38:07 2007 UTC vs.
Revision 1.21 by root, Thu Nov 8 21:14:15 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
… …
89 else 92 else
90 x_cur = (struct event_base *)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
… …
139} 142}
140 143
141static void 144static void
142x_cb_sig (EV_P_ struct ev_signal *w, int revents) 145x_cb_sig (EV_P_ struct ev_signal *w, int revents)
143{ 146{
144 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);
145} 153}
146 154
147static void 155static void
148x_cb_io (EV_P_ struct ev_io *w, int revents) 156x_cb_io (EV_P_ struct ev_io *w, int revents)
149{ 157{
150 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));
151 159
160 if (revents & EV_ERROR)
161 event_del (ev);
152 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w)) 162 else if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w))
153 ev_io_stop (EV_A_ w); 163 ev_io_stop (EV_A_ w);
154 164
155 x_cb (ev, revents); 165 x_cb (ev, revents);
156} 166}
157 167
… …
165 x_cb (ev, revents); 175 x_cb (ev, revents);
166} 176}
167 177
168void 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)
169{ 179{
170 printf ("event set %p\n", ev);//D
171 if (events & EV_SIGNAL) 180 if (events & EV_SIGNAL)
172 ev_watcher_init (&ev->iosig.sig, x_cb_sig); 181 ev_watcher_init (&ev->iosig.sig, x_cb_sig);
173 else 182 else
174 ev_watcher_init (&ev->iosig.io, x_cb_io); 183 ev_watcher_init (&ev->iosig.io, x_cb_io);
175 184
… …
189 return event_base_once (x_cur, fd, events, cb, arg, tv); 198 return event_base_once (x_cur, fd, events, cb, arg, tv);
190} 199}
191 200
192int event_add (struct event *ev, struct timeval *tv) 201int event_add (struct event *ev, struct timeval *tv)
193{ 202{
194 printf ("event add %p %p\n", ev, &ev->to);//D
195 dLOOPev; 203 dLOOPev;
196 204
197 /* disable all watchers */ 205 /* disable all watchers */
198 event_del (ev); 206 event_del (ev);
199 207
… …
217 return 0; 225 return 0;
218} 226}
219 227
220int event_del (struct event *ev) 228int event_del (struct event *ev)
221{ 229{
222 printf ("event del %p\n", ev);//D
223 dLOOPev; 230 dLOOPev;
224 231
225 if (ev->ev_events & EV_SIGNAL) 232 if (ev->ev_events & EV_SIGNAL)
226 { 233 {
227 /* sig */ 234 /* sig */
228 if (ev_is_active (&ev->iosig.sig)) 235 if (ev_is_active (&ev->iosig.sig))
229 ev_signal_stop (EV_A_ &ev->iosig.sig); 236 ev_signal_stop (EV_A_ &ev->iosig.sig);
230 } 237 }
231 else 238 else if (ev->ev_events & (EV_READ | EV_WRITE))
232 { 239 {
233 /* io */ 240 /* io */
234 if (ev_is_active (&ev->iosig.io)) 241 if (ev_is_active (&ev->iosig.io))
235 ev_io_stop (EV_A_ &ev->iosig.io); 242 ev_io_stop (EV_A_ &ev->iosig.io);
236 } 243 }
237 244
238 printf ("to %p %d\n", &ev->to, ev->to.active);//D
239 if (ev_is_active (&ev->to)) 245 if (ev_is_active (&ev->to))
240 ev_timer_stop (EV_A_ &ev->to); 246 ev_timer_stop (EV_A_ &ev->to);
241 247
242 return 0; 248 return 0;
243} 249}
244 250
251void event_active (struct event *ev, int res, short ncalls)
252{
253 if (res & EV_TIMEOUT)
254 ev_feed_event (&iosig.to, res & EV_TIMEOUT);
255
256 if (res & EV_SIGNAL)
257 ev_feed_event (&iosig.sig, res & EV_SIGNAL);
258
259 if (res & (EV_READ | EV_WRITE))
260 ev_feed_event (&iosig.io, res & (EV_READ | EV_WRITE));
261}
262
245int event_pending (struct event *ev, short events, struct timeval *tv) 263int event_pending (struct event *ev, short events, struct timeval *tv)
246{ 264{
265 short revents = 0;
247 dLOOPev; 266 dLOOPev;
248 267
249 short revents = 0;
250 268
251 if (ev->ev_events & EV_SIGNAL) 269 if (ev->ev_events & EV_SIGNAL)
252 { 270 {
253 /* sig */ 271 /* sig */
254 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig)) 272 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
255 revents |= EV_SIGNAL; 273 revents |= EV_SIGNAL;
256 } 274 }
257 else 275 else if (ev->ev_events & (EV_READ | EV_WRITE))
258 { 276 {
259 /* io */ 277 /* io */
260 if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io)) 278 if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))
261 revents |= ev->ev_events & (EV_READ | EV_WRITE); 279 revents |= ev->ev_events & (EV_READ | EV_WRITE);
262 } 280 }
… …
313 ev_unloop (EV_A_ EVUNLOOP_ONCE); 331 ev_unloop (EV_A_ EVUNLOOP_ONCE);
314} 332}
315 333
316int event_base_loopexit (struct event_base *base, struct timeval *tv) 334int event_base_loopexit (struct event_base *base, struct timeval *tv)
317{ 335{
318 dLOOPbase;
319 ev_tstamp after = tv_get (tv); 336 ev_tstamp after = tv_get (tv);
337 dLOOPbase;
320 338
321 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base); 339 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base);
322 340
323 return -1; 341 return -1;
324} 342}
… …
331}; 349};
332 350
333static void 351static void
334x_once_cb (int revents, void *arg) 352x_once_cb (int revents, void *arg)
335{ 353{
336 struct x_once *once = arg; 354 struct x_once *once = (struct x_once *)arg;
337 355
338 once->cb (once->fd, revents, once->arg); 356 once->cb (once->fd, revents, once->arg);
339 free (once); 357 free (once);
340} 358}
341 359
342int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 360int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
343{ 361{
344 dLOOPbase;
345 struct x_once *once = malloc (sizeof (struct x_once)); 362 struct x_once *once = (struct x_once *)malloc (sizeof (struct x_once));
363 dLOOPbase;
346 364
347 if (!once) 365 if (!once)
348 return -1; 366 return -1;
349 367
350 once->fd = fd; 368 once->fd = fd;

Diff Legend

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