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

Comparing libev/ev.c (file contents):
Revision 1.17 by root, Wed Oct 31 14:44:15 2007 UTC vs.
Revision 1.38 by root, Thu Nov 1 15:21:13 2007 UTC

1/* 1/*
2 * libev event processing core, watcher management
3 *
2 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
3 * All rights reserved. 5 * All rights reserved.
4 * 6 *
5 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 8 * modification, are permitted provided that the following conditions are
… …
24 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
25 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
27 * 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.
28 */ 30 */
31#if EV_USE_CONFIG_H
32# include "config.h"
33#endif
29 34
30#include <math.h> 35#include <math.h>
31#include <stdlib.h> 36#include <stdlib.h>
32#include <unistd.h> 37#include <unistd.h>
33#include <fcntl.h> 38#include <fcntl.h>
… …
36 41
37#include <stdio.h> 42#include <stdio.h>
38 43
39#include <assert.h> 44#include <assert.h>
40#include <errno.h> 45#include <errno.h>
46#include <sys/types.h>
47#include <sys/wait.h>
41#include <sys/time.h> 48#include <sys/time.h>
42#include <time.h> 49#include <time.h>
43 50
44#define HAVE_EPOLL 1
45
46#ifndef HAVE_MONOTONIC 51#ifndef EV_USE_MONOTONIC
52# define EV_USE_MONOTONIC 1
53#endif
54
47# ifdef CLOCK_MONOTONIC 55#ifndef CLOCK_MONOTONIC
56# undef EV_USE_MONOTONIC
48# define HAVE_MONOTONIC 1 57# define EV_USE_MONOTONIC 0
49# endif 58#endif
50#endif
51 59
52#ifndef HAVE_SELECT 60#ifndef EV_USE_SELECT
53# define HAVE_SELECT 1 61# define EV_USE_SELECT 1
54#endif 62#endif
55 63
56#ifndef HAVE_EPOLL 64#ifndef EV_USE_EPOLL
57# define HAVE_EPOLL 0 65# define EV_USE_EPOLL 0
58#endif 66#endif
59 67
68#ifndef CLOCK_REALTIME
69# define EV_USE_REALTIME 0
70#endif
60#ifndef HAVE_REALTIME 71#ifndef EV_USE_REALTIME
61# define HAVE_REALTIME 1 /* posix requirement, but might be slower */ 72# define EV_USE_REALTIME 1 /* posix requirement, but might be slower */
62#endif 73#endif
63 74
64#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 75#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
65#define MAX_BLOCKTIME 60. 76#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detetc time jumps) */
77#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
78#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
66 79
67#include "ev.h" 80#include "ev.h"
68 81
69typedef struct ev_watcher *W; 82typedef struct ev_watcher *W;
70typedef struct ev_watcher_list *WL; 83typedef struct ev_watcher_list *WL;
… …
83/*****************************************************************************/ 96/*****************************************************************************/
84 97
85ev_tstamp 98ev_tstamp
86ev_time (void) 99ev_time (void)
87{ 100{
88#if HAVE_REALTIME 101#if EV_USE_REALTIME
89 struct timespec ts; 102 struct timespec ts;
90 clock_gettime (CLOCK_REALTIME, &ts); 103 clock_gettime (CLOCK_REALTIME, &ts);
91 return ts.tv_sec + ts.tv_nsec * 1e-9; 104 return ts.tv_sec + ts.tv_nsec * 1e-9;
92#else 105#else
93 struct timeval tv; 106 struct timeval tv;
… …
97} 110}
98 111
99static ev_tstamp 112static ev_tstamp
100get_clock (void) 113get_clock (void)
101{ 114{
102#if HAVE_MONOTONIC 115#if EV_USE_MONOTONIC
103 if (have_monotonic) 116 if (have_monotonic)
104 { 117 {
105 struct timespec ts; 118 struct timespec ts;
106 clock_gettime (CLOCK_MONOTONIC, &ts); 119 clock_gettime (CLOCK_MONOTONIC, &ts);
107 return ts.tv_sec + ts.tv_nsec * 1e-9; 120 return ts.tv_sec + ts.tv_nsec * 1e-9;
… …
109#endif 122#endif
110 123
111 return ev_time (); 124 return ev_time ();
112} 125}
113 126
127#define array_roundsize(base,n) ((n) | 4 & ~3)
128
114#define array_needsize(base,cur,cnt,init) \ 129#define array_needsize(base,cur,cnt,init) \
115 if ((cnt) > cur) \ 130 if ((cnt) > cur) \
116 { \ 131 { \
117 int newcnt = cur ? cur << 1 : 16; \ 132 int newcnt = cur; \
133 do \
134 { \
135 newcnt = array_roundsize (base, newcnt << 1); \
136 } \
137 while ((cnt) > newcnt); \
138 \
118 base = realloc (base, sizeof (*base) * (newcnt)); \ 139 base = realloc (base, sizeof (*base) * (newcnt)); \
119 init (base + cur, newcnt - cur); \ 140 init (base + cur, newcnt - cur); \
120 cur = newcnt; \ 141 cur = newcnt; \
121 } 142 }
122 143
123/*****************************************************************************/ 144/*****************************************************************************/
124 145
125typedef struct 146typedef struct
126{ 147{
127 struct ev_io *head; 148 struct ev_io *head;
128 unsigned char wev, rev; /* want, received event set */ 149 unsigned char events;
150 unsigned char reify;
129} ANFD; 151} ANFD;
130 152
131static ANFD *anfds; 153static ANFD *anfds;
132static int anfdmax; 154static int anfdmax;
133 155
134static int *fdchanges;
135static int fdchangemax, fdchangecnt;
136
137static void 156static void
138anfds_init (ANFD *base, int count) 157anfds_init (ANFD *base, int count)
139{ 158{
140 while (count--) 159 while (count--)
141 { 160 {
142 base->head = 0; 161 base->head = 0;
143 base->wev = base->rev = EV_NONE; 162 base->events = EV_NONE;
163 base->reify = 0;
164
144 ++base; 165 ++base;
145 } 166 }
146} 167}
147 168
148typedef struct 169typedef struct
… …
155static int pendingmax, pendingcnt; 176static int pendingmax, pendingcnt;
156 177
157static void 178static void
158event (W w, int events) 179event (W w, int events)
159{ 180{
160 if (w->active) 181 if (w->pending)
182 {
183 pendings [w->pending - 1].events |= events;
184 return;
161 { 185 }
186
162 w->pending = ++pendingcnt; 187 w->pending = ++pendingcnt;
163 array_needsize (pendings, pendingmax, pendingcnt, ); 188 array_needsize (pendings, pendingmax, pendingcnt, );
164 pendings [pendingcnt - 1].w = w; 189 pendings [pendingcnt - 1].w = w;
165 pendings [pendingcnt - 1].events = events; 190 pendings [pendingcnt - 1].events = events;
166 } 191}
192
193static void
194queue_events (W *events, int eventcnt, int type)
195{
196 int i;
197
198 for (i = 0; i < eventcnt; ++i)
199 event (events [i], type);
167} 200}
168 201
169static void 202static void
170fd_event (int fd, int events) 203fd_event (int fd, int events)
171{ 204{
… …
179 if (ev) 212 if (ev)
180 event ((W)w, ev); 213 event ((W)w, ev);
181 } 214 }
182} 215}
183 216
217/*****************************************************************************/
218
219static int *fdchanges;
220static int fdchangemax, fdchangecnt;
221
184static void 222static void
185queue_events (W *events, int eventcnt, int type) 223fd_reify (void)
186{ 224{
187 int i; 225 int i;
188 226
189 for (i = 0; i < eventcnt; ++i) 227 for (i = 0; i < fdchangecnt; ++i)
190 event (events [i], type); 228 {
229 int fd = fdchanges [i];
230 ANFD *anfd = anfds + fd;
231 struct ev_io *w;
232
233 int events = 0;
234
235 for (w = anfd->head; w; w = w->next)
236 events |= w->events;
237
238 anfd->reify = 0;
239
240 if (anfd->events != events)
241 {
242 method_modify (fd, anfd->events, events);
243 anfd->events = events;
244 }
245 }
246
247 fdchangecnt = 0;
248}
249
250static void
251fd_change (int fd)
252{
253 if (anfds [fd].reify || fdchangecnt < 0)
254 return;
255
256 anfds [fd].reify = 1;
257
258 ++fdchangecnt;
259 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
260 fdchanges [fdchangecnt - 1] = fd;
261}
262
263/* called on EBADF to verify fds */
264static void
265fd_recheck (void)
266{
267 int fd;
268
269 for (fd = 0; fd < anfdmax; ++fd)
270 if (anfds [fd].events)
271 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF)
272 while (anfds [fd].head)
273 {
274 ev_io_stop (anfds [fd].head);
275 event ((W)anfds [fd].head, EV_ERROR | EV_READ | EV_WRITE);
276 }
191} 277}
192 278
193/*****************************************************************************/ 279/*****************************************************************************/
194 280
195static struct ev_timer **timers; 281static struct ev_timer **timers;
… …
242/*****************************************************************************/ 328/*****************************************************************************/
243 329
244typedef struct 330typedef struct
245{ 331{
246 struct ev_signal *head; 332 struct ev_signal *head;
247 sig_atomic_t gotsig; 333 sig_atomic_t volatile gotsig;
248} ANSIG; 334} ANSIG;
249 335
250static ANSIG *signals; 336static ANSIG *signals;
251static int signalmax; 337static int signalmax;
252 338
253static int sigpipe [2]; 339static int sigpipe [2];
254static sig_atomic_t gotsig; 340static sig_atomic_t volatile gotsig;
255static struct ev_io sigev; 341static struct ev_io sigev;
256 342
257static void 343static void
258signals_init (ANSIG *base, int count) 344signals_init (ANSIG *base, int count)
259{ 345{
260 while (count--) 346 while (count--)
261 { 347 {
262 base->head = 0; 348 base->head = 0;
263 base->gotsig = 0; 349 base->gotsig = 0;
350
264 ++base; 351 ++base;
265 } 352 }
266} 353}
267 354
268static void 355static void
… …
271 signals [signum - 1].gotsig = 1; 358 signals [signum - 1].gotsig = 1;
272 359
273 if (!gotsig) 360 if (!gotsig)
274 { 361 {
275 gotsig = 1; 362 gotsig = 1;
276 write (sigpipe [1], &gotsig, 1); 363 write (sigpipe [1], &signum, 1);
277 } 364 }
278} 365}
279 366
280static void 367static void
281sigcb (struct ev_io *iow, int revents) 368sigcb (struct ev_io *iow, int revents)
282{ 369{
283 struct ev_signal *w; 370 struct ev_signal *w;
284 int sig; 371 int signum;
285 372
373 read (sigpipe [0], &revents, 1);
286 gotsig = 0; 374 gotsig = 0;
287 read (sigpipe [0], &revents, 1);
288 375
289 for (sig = signalmax; sig--; ) 376 for (signum = signalmax; signum--; )
290 if (signals [sig].gotsig) 377 if (signals [signum].gotsig)
291 { 378 {
292 signals [sig].gotsig = 0; 379 signals [signum].gotsig = 0;
293 380
294 for (w = signals [sig].head; w; w = w->next) 381 for (w = signals [signum].head; w; w = w->next)
295 event ((W)w, EV_SIGNAL); 382 event ((W)w, EV_SIGNAL);
296 } 383 }
297} 384}
298 385
299static void 386static void
… …
304 391
305 /* rather than sort out wether we really need nb, set it */ 392 /* rather than sort out wether we really need nb, set it */
306 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK); 393 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
307 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK); 394 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
308 395
309 evio_set (&sigev, sigpipe [0], EV_READ); 396 ev_io_set (&sigev, sigpipe [0], EV_READ);
310 evio_start (&sigev); 397 ev_io_start (&sigev);
311} 398}
312 399
313/*****************************************************************************/ 400/*****************************************************************************/
314 401
315static struct ev_idle **idles; 402static struct ev_idle **idles;
316static int idlemax, idlecnt; 403static int idlemax, idlecnt;
317 404
405static struct ev_prepare **prepares;
406static int preparemax, preparecnt;
407
318static struct ev_check **checks; 408static struct ev_check **checks;
319static int checkmax, checkcnt; 409static int checkmax, checkcnt;
320 410
321/*****************************************************************************/ 411/*****************************************************************************/
322 412
413static struct ev_child *childs [PID_HASHSIZE];
414static struct ev_signal childev;
415
416#ifndef WCONTINUED
417# define WCONTINUED 0
418#endif
419
420static void
421childcb (struct ev_signal *sw, int revents)
422{
423 struct ev_child *w;
424 int pid, status;
425
426 while ((pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)) != -1)
427 for (w = childs [pid & (PID_HASHSIZE - 1)]; w; w = w->next)
428 if (w->pid == pid || w->pid == -1)
429 {
430 w->status = status;
431 event ((W)w, EV_CHILD);
432 }
433}
434
435/*****************************************************************************/
436
323#if HAVE_EPOLL 437#if EV_USE_EPOLL
324# include "ev_epoll.c" 438# include "ev_epoll.c"
325#endif 439#endif
326#if HAVE_SELECT 440#if EV_USE_SELECT
327# include "ev_select.c" 441# include "ev_select.c"
328#endif 442#endif
329 443
444int
445ev_version_major (void)
446{
447 return EV_VERSION_MAJOR;
448}
449
450int
451ev_version_minor (void)
452{
453 return EV_VERSION_MINOR;
454}
455
330int ev_init (int flags) 456int ev_init (int flags)
331{ 457{
332#if HAVE_MONOTONIC
333 {
334 struct timespec ts;
335 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
336 have_monotonic = 1;
337 }
338#endif
339
340 ev_now = ev_time ();
341 now = get_clock ();
342 diff = ev_now - now;
343
344 if (pipe (sigpipe))
345 return 0;
346
347 ev_method = EVMETHOD_NONE;
348#if HAVE_EPOLL
349 if (ev_method == EVMETHOD_NONE) epoll_init (flags);
350#endif
351#if HAVE_SELECT
352 if (ev_method == EVMETHOD_NONE) select_init (flags);
353#endif
354
355 if (ev_method) 458 if (!ev_method)
459 {
460#if EV_USE_MONOTONIC
356 { 461 {
462 struct timespec ts;
463 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
464 have_monotonic = 1;
465 }
466#endif
467
468 ev_now = ev_time ();
469 now = get_clock ();
470 diff = ev_now - now;
471
472 if (pipe (sigpipe))
473 return 0;
474
475 ev_method = EVMETHOD_NONE;
476#if EV_USE_EPOLL
477 if (ev_method == EVMETHOD_NONE) epoll_init (flags);
478#endif
479#if EV_USE_SELECT
480 if (ev_method == EVMETHOD_NONE) select_init (flags);
481#endif
482
483 if (ev_method)
484 {
357 evw_init (&sigev, sigcb); 485 ev_watcher_init (&sigev, sigcb);
358 siginit (); 486 siginit ();
487
488 ev_signal_init (&childev, childcb, SIGCHLD);
489 ev_signal_start (&childev);
490 }
359 } 491 }
360 492
361 return ev_method; 493 return ev_method;
362} 494}
363 495
364/*****************************************************************************/ 496/*****************************************************************************/
365 497
366void ev_prefork (void) 498void
499ev_fork_prepare (void)
367{ 500{
368 /* nop */ 501 /* nop */
369} 502}
370 503
504void
371void ev_postfork_parent (void) 505ev_fork_parent (void)
372{ 506{
373 /* nop */ 507 /* nop */
374} 508}
375 509
510void
376void ev_postfork_child (void) 511ev_fork_child (void)
377{ 512{
378#if HAVE_EPOLL 513#if EV_USE_EPOLL
379 if (ev_method == EVMETHOD_EPOLL) 514 if (ev_method == EVMETHOD_EPOLL)
380 epoll_postfork_child (); 515 epoll_postfork_child ();
381#endif 516#endif
382 517
383 evio_stop (&sigev); 518 ev_io_stop (&sigev);
384 close (sigpipe [0]); 519 close (sigpipe [0]);
385 close (sigpipe [1]); 520 close (sigpipe [1]);
386 pipe (sigpipe); 521 pipe (sigpipe);
387 siginit (); 522 siginit ();
388} 523}
389 524
390/*****************************************************************************/ 525/*****************************************************************************/
391 526
392static void 527static void
393fd_reify (void)
394{
395 int i;
396
397 for (i = 0; i < fdchangecnt; ++i)
398 {
399 int fd = fdchanges [i];
400 ANFD *anfd = anfds + fd;
401 struct ev_io *w;
402
403 int wev = 0;
404
405 for (w = anfd->head; w; w = w->next)
406 wev |= w->events;
407
408 if (anfd->wev != wev)
409 {
410 method_modify (fd, anfd->wev, wev);
411 anfd->wev = wev;
412 }
413 }
414
415 fdchangecnt = 0;
416}
417
418static void
419call_pending () 528call_pending (void)
420{ 529{
421 int i; 530 while (pendingcnt)
422
423 for (i = 0; i < pendingcnt; ++i)
424 { 531 {
425 ANPENDING *p = pendings + i; 532 ANPENDING *p = pendings + --pendingcnt;
426 533
427 if (p->w) 534 if (p->w)
428 { 535 {
429 p->w->pending = 0; 536 p->w->pending = 0;
430 p->w->cb (p->w, p->events); 537 p->w->cb (p->w, p->events);
431 } 538 }
432 } 539 }
433
434 pendingcnt = 0;
435} 540}
436 541
437static void 542static void
438timers_reify () 543timers_reify (void)
439{ 544{
440 while (timercnt && timers [0]->at <= now) 545 while (timercnt && timers [0]->at <= now)
441 { 546 {
442 struct ev_timer *w = timers [0]; 547 struct ev_timer *w = timers [0];
443
444 event ((W)w, EV_TIMEOUT);
445 548
446 /* first reschedule or stop timer */ 549 /* first reschedule or stop timer */
447 if (w->repeat) 550 if (w->repeat)
448 { 551 {
552 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
449 w->at = now + w->repeat; 553 w->at = now + w->repeat;
450 assert (("timer timeout in the past, negative repeat?", w->at > now));
451 downheap ((WT *)timers, timercnt, 0); 554 downheap ((WT *)timers, timercnt, 0);
452 } 555 }
453 else 556 else
454 evtimer_stop (w); /* nonrepeating: stop timer */ 557 ev_timer_stop (w); /* nonrepeating: stop timer */
455 }
456}
457 558
559 event ((W)w, EV_TIMEOUT);
560 }
561}
562
458static void 563static void
459periodics_reify () 564periodics_reify (void)
460{ 565{
461 while (periodiccnt && periodics [0]->at <= ev_now) 566 while (periodiccnt && periodics [0]->at <= ev_now)
462 { 567 {
463 struct ev_periodic *w = periodics [0]; 568 struct ev_periodic *w = periodics [0];
464 569
465 /* first reschedule or stop timer */ 570 /* first reschedule or stop timer */
466 if (w->interval) 571 if (w->interval)
467 { 572 {
468 w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval; 573 w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval;
469 assert (("periodic timeout in the past, negative interval?", w->at > ev_now)); 574 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > ev_now));
470 downheap ((WT *)periodics, periodiccnt, 0); 575 downheap ((WT *)periodics, periodiccnt, 0);
471 } 576 }
472 else 577 else
473 evperiodic_stop (w); /* nonrepeating: stop timer */ 578 ev_periodic_stop (w); /* nonrepeating: stop timer */
474 579
475 event ((W)w, EV_TIMEOUT); 580 event ((W)w, EV_PERIODIC);
476 } 581 }
477} 582}
478 583
479static void 584static void
480periodics_reschedule (ev_tstamp diff) 585periodics_reschedule (ev_tstamp diff)
… …
490 { 595 {
491 ev_tstamp diff = ceil ((ev_now - w->at) / w->interval) * w->interval; 596 ev_tstamp diff = ceil ((ev_now - w->at) / w->interval) * w->interval;
492 597
493 if (fabs (diff) >= 1e-4) 598 if (fabs (diff) >= 1e-4)
494 { 599 {
495 evperiodic_stop (w); 600 ev_periodic_stop (w);
496 evperiodic_start (w); 601 ev_periodic_start (w);
497 602
498 i = 0; /* restart loop, inefficient, but time jumps should be rare */ 603 i = 0; /* restart loop, inefficient, but time jumps should be rare */
499 } 604 }
500 } 605 }
501 } 606 }
502} 607}
503 608
504static void 609static void
505time_update () 610time_update (void)
506{ 611{
507 int i; 612 int i;
508 613
509 ev_now = ev_time (); 614 ev_now = ev_time ();
510 615
… …
544int ev_loop_done; 649int ev_loop_done;
545 650
546void ev_loop (int flags) 651void ev_loop (int flags)
547{ 652{
548 double block; 653 double block;
549 ev_loop_done = flags & EVLOOP_ONESHOT ? 1 : 0; 654 ev_loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
550
551 if (checkcnt)
552 {
553 queue_events ((W *)checks, checkcnt, EV_CHECK);
554 call_pending ();
555 }
556 655
557 do 656 do
558 { 657 {
658 /* queue check watchers (and execute them) */
659 if (preparecnt)
660 {
661 queue_events ((W *)prepares, preparecnt, EV_PREPARE);
662 call_pending ();
663 }
664
559 /* update fd-related kernel structures */ 665 /* update fd-related kernel structures */
560 fd_reify (); 666 fd_reify ();
561 667
562 /* calculate blocking time */ 668 /* calculate blocking time */
563 669
564 /* we only need this for !monotonic clock, but as we always have timers, we just calculate it every time */ 670 /* we only need this for !monotonic clockor timers, but as we basically
671 always have timers, we just calculate it always */
565 ev_now = ev_time (); 672 ev_now = ev_time ();
566 673
567 if (flags & EVLOOP_NONBLOCK || idlecnt) 674 if (flags & EVLOOP_NONBLOCK || idlecnt)
568 block = 0.; 675 block = 0.;
569 else 676 else
… …
589 696
590 /* update ev_now, do magic */ 697 /* update ev_now, do magic */
591 time_update (); 698 time_update ();
592 699
593 /* queue pending timers and reschedule them */ 700 /* queue pending timers and reschedule them */
701 timers_reify (); /* relative timers called last */
594 periodics_reify (); /* absolute timers first */ 702 periodics_reify (); /* absolute timers called first */
595 timers_reify (); /* relative timers second */
596 703
597 /* queue idle watchers unless io or timers are pending */ 704 /* queue idle watchers unless io or timers are pending */
598 if (!pendingcnt) 705 if (!pendingcnt)
599 queue_events ((W *)idles, idlecnt, EV_IDLE); 706 queue_events ((W *)idles, idlecnt, EV_IDLE);
600 707
601 /* queue check and possibly idle watchers */ 708 /* queue check watchers, to be executed first */
709 if (checkcnt)
602 queue_events ((W *)checks, checkcnt, EV_CHECK); 710 queue_events ((W *)checks, checkcnt, EV_CHECK);
603 711
604 call_pending (); 712 call_pending ();
605 } 713 }
606 while (!ev_loop_done); 714 while (!ev_loop_done);
607 715
… …
632 head = &(*head)->next; 740 head = &(*head)->next;
633 } 741 }
634} 742}
635 743
636static void 744static void
637ev_clear (W w) 745ev_clear_pending (W w)
638{ 746{
639 if (w->pending) 747 if (w->pending)
640 { 748 {
641 pendings [w->pending - 1].w = 0; 749 pendings [w->pending - 1].w = 0;
642 w->pending = 0; 750 w->pending = 0;
… …
656} 764}
657 765
658/*****************************************************************************/ 766/*****************************************************************************/
659 767
660void 768void
661evio_start (struct ev_io *w) 769ev_io_start (struct ev_io *w)
662{ 770{
663 if (ev_is_active (w))
664 return;
665
666 int fd = w->fd; 771 int fd = w->fd;
772
773 if (ev_is_active (w))
774 return;
775
776 assert (("ev_io_start called with negative fd", fd >= 0));
667 777
668 ev_start ((W)w, 1); 778 ev_start ((W)w, 1);
669 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 779 array_needsize (anfds, anfdmax, fd + 1, anfds_init);
670 wlist_add ((WL *)&anfds[fd].head, (WL)w); 780 wlist_add ((WL *)&anfds[fd].head, (WL)w);
671 781
672 ++fdchangecnt; 782 fd_change (fd);
673 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
674 fdchanges [fdchangecnt - 1] = fd;
675} 783}
676 784
677void 785void
678evio_stop (struct ev_io *w) 786ev_io_stop (struct ev_io *w)
679{ 787{
680 ev_clear ((W)w); 788 ev_clear_pending ((W)w);
681 if (!ev_is_active (w)) 789 if (!ev_is_active (w))
682 return; 790 return;
683 791
684 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 792 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
685 ev_stop ((W)w); 793 ev_stop ((W)w);
686 794
687 ++fdchangecnt; 795 fd_change (w->fd);
688 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
689 fdchanges [fdchangecnt - 1] = w->fd;
690} 796}
691 797
692void 798void
693evtimer_start (struct ev_timer *w) 799ev_timer_start (struct ev_timer *w)
694{ 800{
695 if (ev_is_active (w)) 801 if (ev_is_active (w))
696 return; 802 return;
697 803
698 w->at += now; 804 w->at += now;
699 805
700 assert (("timer repeat value less than zero not allowed", w->repeat >= 0.)); 806 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
701 807
702 ev_start ((W)w, ++timercnt); 808 ev_start ((W)w, ++timercnt);
703 array_needsize (timers, timermax, timercnt, ); 809 array_needsize (timers, timermax, timercnt, );
704 timers [timercnt - 1] = w; 810 timers [timercnt - 1] = w;
705 upheap ((WT *)timers, timercnt - 1); 811 upheap ((WT *)timers, timercnt - 1);
706} 812}
707 813
708void 814void
709evtimer_stop (struct ev_timer *w) 815ev_timer_stop (struct ev_timer *w)
710{ 816{
711 ev_clear ((W)w); 817 ev_clear_pending ((W)w);
712 if (!ev_is_active (w)) 818 if (!ev_is_active (w))
713 return; 819 return;
714 820
715 if (w->active < timercnt--) 821 if (w->active < timercnt--)
716 { 822 {
… …
722 828
723 ev_stop ((W)w); 829 ev_stop ((W)w);
724} 830}
725 831
726void 832void
727evtimer_again (struct ev_timer *w) 833ev_timer_again (struct ev_timer *w)
728{ 834{
729 if (ev_is_active (w)) 835 if (ev_is_active (w))
730 { 836 {
731 if (w->repeat) 837 if (w->repeat)
732 { 838 {
733 w->at = now + w->repeat; 839 w->at = now + w->repeat;
734 downheap ((WT *)timers, timercnt, w->active - 1); 840 downheap ((WT *)timers, timercnt, w->active - 1);
735 } 841 }
736 else 842 else
737 evtimer_stop (w); 843 ev_timer_stop (w);
738 } 844 }
739 else if (w->repeat) 845 else if (w->repeat)
740 evtimer_start (w); 846 ev_timer_start (w);
741} 847}
742 848
743void 849void
744evperiodic_start (struct ev_periodic *w) 850ev_periodic_start (struct ev_periodic *w)
745{ 851{
746 if (ev_is_active (w)) 852 if (ev_is_active (w))
747 return; 853 return;
748 854
749 assert (("periodic interval value less than zero not allowed", w->interval >= 0.)); 855 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
750 856
751 /* this formula differs from the one in periodic_reify because we do not always round up */ 857 /* this formula differs from the one in periodic_reify because we do not always round up */
752 if (w->interval) 858 if (w->interval)
753 w->at += ceil ((ev_now - w->at) / w->interval) * w->interval; 859 w->at += ceil ((ev_now - w->at) / w->interval) * w->interval;
754 860
… …
757 periodics [periodiccnt - 1] = w; 863 periodics [periodiccnt - 1] = w;
758 upheap ((WT *)periodics, periodiccnt - 1); 864 upheap ((WT *)periodics, periodiccnt - 1);
759} 865}
760 866
761void 867void
762evperiodic_stop (struct ev_periodic *w) 868ev_periodic_stop (struct ev_periodic *w)
763{ 869{
764 ev_clear ((W)w); 870 ev_clear_pending ((W)w);
765 if (!ev_is_active (w)) 871 if (!ev_is_active (w))
766 return; 872 return;
767 873
768 if (w->active < periodiccnt--) 874 if (w->active < periodiccnt--)
769 { 875 {
… …
773 879
774 ev_stop ((W)w); 880 ev_stop ((W)w);
775} 881}
776 882
777void 883void
778evsignal_start (struct ev_signal *w) 884ev_signal_start (struct ev_signal *w)
779{ 885{
780 if (ev_is_active (w)) 886 if (ev_is_active (w))
781 return; 887 return;
888
889 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
782 890
783 ev_start ((W)w, 1); 891 ev_start ((W)w, 1);
784 array_needsize (signals, signalmax, w->signum, signals_init); 892 array_needsize (signals, signalmax, w->signum, signals_init);
785 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 893 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
786 894
… …
793 sigaction (w->signum, &sa, 0); 901 sigaction (w->signum, &sa, 0);
794 } 902 }
795} 903}
796 904
797void 905void
798evsignal_stop (struct ev_signal *w) 906ev_signal_stop (struct ev_signal *w)
799{ 907{
800 ev_clear ((W)w); 908 ev_clear_pending ((W)w);
801 if (!ev_is_active (w)) 909 if (!ev_is_active (w))
802 return; 910 return;
803 911
804 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 912 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
805 ev_stop ((W)w); 913 ev_stop ((W)w);
806 914
807 if (!signals [w->signum - 1].head) 915 if (!signals [w->signum - 1].head)
808 signal (w->signum, SIG_DFL); 916 signal (w->signum, SIG_DFL);
809} 917}
810 918
919void
811void evidle_start (struct ev_idle *w) 920ev_idle_start (struct ev_idle *w)
812{ 921{
813 if (ev_is_active (w)) 922 if (ev_is_active (w))
814 return; 923 return;
815 924
816 ev_start ((W)w, ++idlecnt); 925 ev_start ((W)w, ++idlecnt);
817 array_needsize (idles, idlemax, idlecnt, ); 926 array_needsize (idles, idlemax, idlecnt, );
818 idles [idlecnt - 1] = w; 927 idles [idlecnt - 1] = w;
819} 928}
820 929
930void
821void evidle_stop (struct ev_idle *w) 931ev_idle_stop (struct ev_idle *w)
822{ 932{
823 ev_clear ((W)w); 933 ev_clear_pending ((W)w);
824 if (ev_is_active (w)) 934 if (ev_is_active (w))
825 return; 935 return;
826 936
827 idles [w->active - 1] = idles [--idlecnt]; 937 idles [w->active - 1] = idles [--idlecnt];
828 ev_stop ((W)w); 938 ev_stop ((W)w);
829} 939}
830 940
941void
942ev_prepare_start (struct ev_prepare *w)
943{
944 if (ev_is_active (w))
945 return;
946
947 ev_start ((W)w, ++preparecnt);
948 array_needsize (prepares, preparemax, preparecnt, );
949 prepares [preparecnt - 1] = w;
950}
951
952void
953ev_prepare_stop (struct ev_prepare *w)
954{
955 ev_clear_pending ((W)w);
956 if (ev_is_active (w))
957 return;
958
959 prepares [w->active - 1] = prepares [--preparecnt];
960 ev_stop ((W)w);
961}
962
963void
831void evcheck_start (struct ev_check *w) 964ev_check_start (struct ev_check *w)
832{ 965{
833 if (ev_is_active (w)) 966 if (ev_is_active (w))
834 return; 967 return;
835 968
836 ev_start ((W)w, ++checkcnt); 969 ev_start ((W)w, ++checkcnt);
837 array_needsize (checks, checkmax, checkcnt, ); 970 array_needsize (checks, checkmax, checkcnt, );
838 checks [checkcnt - 1] = w; 971 checks [checkcnt - 1] = w;
839} 972}
840 973
974void
841void evcheck_stop (struct ev_check *w) 975ev_check_stop (struct ev_check *w)
842{ 976{
843 ev_clear ((W)w); 977 ev_clear_pending ((W)w);
844 if (ev_is_active (w)) 978 if (ev_is_active (w))
845 return; 979 return;
846 980
847 checks [w->active - 1] = checks [--checkcnt]; 981 checks [w->active - 1] = checks [--checkcnt];
982 ev_stop ((W)w);
983}
984
985void
986ev_child_start (struct ev_child *w)
987{
988 if (ev_is_active (w))
989 return;
990
991 ev_start ((W)w, 1);
992 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
993}
994
995void
996ev_child_stop (struct ev_child *w)
997{
998 ev_clear_pending ((W)w);
999 if (ev_is_active (w))
1000 return;
1001
1002 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
848 ev_stop ((W)w); 1003 ev_stop ((W)w);
849} 1004}
850 1005
851/*****************************************************************************/ 1006/*****************************************************************************/
852 1007
… …
862once_cb (struct ev_once *once, int revents) 1017once_cb (struct ev_once *once, int revents)
863{ 1018{
864 void (*cb)(int revents, void *arg) = once->cb; 1019 void (*cb)(int revents, void *arg) = once->cb;
865 void *arg = once->arg; 1020 void *arg = once->arg;
866 1021
867 evio_stop (&once->io); 1022 ev_io_stop (&once->io);
868 evtimer_stop (&once->to); 1023 ev_timer_stop (&once->to);
869 free (once); 1024 free (once);
870 1025
871 cb (revents, arg); 1026 cb (revents, arg);
872} 1027}
873 1028
… …
887ev_once (int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1042ev_once (int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
888{ 1043{
889 struct ev_once *once = malloc (sizeof (struct ev_once)); 1044 struct ev_once *once = malloc (sizeof (struct ev_once));
890 1045
891 if (!once) 1046 if (!once)
892 cb (EV_ERROR, arg); 1047 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
893 else 1048 else
894 { 1049 {
895 once->cb = cb; 1050 once->cb = cb;
896 once->arg = arg; 1051 once->arg = arg;
897 1052
898 evw_init (&once->io, once_cb_io); 1053 ev_watcher_init (&once->io, once_cb_io);
899
900 if (fd >= 0) 1054 if (fd >= 0)
901 { 1055 {
902 evio_set (&once->io, fd, events); 1056 ev_io_set (&once->io, fd, events);
903 evio_start (&once->io); 1057 ev_io_start (&once->io);
904 } 1058 }
905 1059
906 evw_init (&once->to, once_cb_to); 1060 ev_watcher_init (&once->to, once_cb_to);
907
908 if (timeout >= 0.) 1061 if (timeout >= 0.)
909 { 1062 {
910 evtimer_set (&once->to, timeout, 0.); 1063 ev_timer_set (&once->to, timeout, 0.);
911 evtimer_start (&once->to); 1064 ev_timer_start (&once->to);
912 } 1065 }
913 } 1066 }
914} 1067}
915 1068
916/*****************************************************************************/ 1069/*****************************************************************************/
… …
927 1080
928static void 1081static void
929ocb (struct ev_timer *w, int revents) 1082ocb (struct ev_timer *w, int revents)
930{ 1083{
931 //fprintf (stderr, "timer %f,%f (%x) (%f) d%p\n", w->at, w->repeat, revents, w->at - ev_time (), w->data); 1084 //fprintf (stderr, "timer %f,%f (%x) (%f) d%p\n", w->at, w->repeat, revents, w->at - ev_time (), w->data);
932 evtimer_stop (w); 1085 ev_timer_stop (w);
933 evtimer_start (w); 1086 ev_timer_start (w);
934} 1087}
935 1088
936static void 1089static void
937scb (struct ev_signal *w, int revents) 1090scb (struct ev_signal *w, int revents)
938{ 1091{
939 fprintf (stderr, "signal %x,%d\n", revents, w->signum); 1092 fprintf (stderr, "signal %x,%d\n", revents, w->signum);
940 evio_stop (&wio); 1093 ev_io_stop (&wio);
941 evio_start (&wio); 1094 ev_io_start (&wio);
942} 1095}
943 1096
944static void 1097static void
945gcb (struct ev_signal *w, int revents) 1098gcb (struct ev_signal *w, int revents)
946{ 1099{
… …
950 1103
951int main (void) 1104int main (void)
952{ 1105{
953 ev_init (0); 1106 ev_init (0);
954 1107
955 evio_init (&wio, sin_cb, 0, EV_READ); 1108 ev_io_init (&wio, sin_cb, 0, EV_READ);
956 evio_start (&wio); 1109 ev_io_start (&wio);
957 1110
958 struct ev_timer t[10000]; 1111 struct ev_timer t[10000];
959 1112
960#if 0 1113#if 0
961 int i; 1114 int i;
962 for (i = 0; i < 10000; ++i) 1115 for (i = 0; i < 10000; ++i)
963 { 1116 {
964 struct ev_timer *w = t + i; 1117 struct ev_timer *w = t + i;
965 evw_init (w, ocb, i); 1118 ev_watcher_init (w, ocb, i);
966 evtimer_init_abs (w, ocb, drand48 (), 0.99775533); 1119 ev_timer_init_abs (w, ocb, drand48 (), 0.99775533);
967 evtimer_start (w); 1120 ev_timer_start (w);
968 if (drand48 () < 0.5) 1121 if (drand48 () < 0.5)
969 evtimer_stop (w); 1122 ev_timer_stop (w);
970 } 1123 }
971#endif 1124#endif
972 1125
973 struct ev_timer t1; 1126 struct ev_timer t1;
974 evtimer_init (&t1, ocb, 5, 10); 1127 ev_timer_init (&t1, ocb, 5, 10);
975 evtimer_start (&t1); 1128 ev_timer_start (&t1);
976 1129
977 struct ev_signal sig; 1130 struct ev_signal sig;
978 evsignal_init (&sig, scb, SIGQUIT); 1131 ev_signal_init (&sig, scb, SIGQUIT);
979 evsignal_start (&sig); 1132 ev_signal_start (&sig);
980 1133
981 struct ev_check cw; 1134 struct ev_check cw;
982 evcheck_init (&cw, gcb); 1135 ev_check_init (&cw, gcb);
983 evcheck_start (&cw); 1136 ev_check_start (&cw);
984 1137
985 struct ev_idle iw; 1138 struct ev_idle iw;
986 evidle_init (&iw, gcb); 1139 ev_idle_init (&iw, gcb);
987 evidle_start (&iw); 1140 ev_idle_start (&iw);
988 1141
989 ev_loop (0); 1142 ev_loop (0);
990 1143
991 return 0; 1144 return 0;
992} 1145}

Diff Legend

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