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

Comparing libev/ev.c (file contents):
Revision 1.23 by root, Wed Oct 31 20:10:17 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>
… …
41#include <sys/types.h> 46#include <sys/types.h>
42#include <sys/wait.h> 47#include <sys/wait.h>
43#include <sys/time.h> 48#include <sys/time.h>
44#include <time.h> 49#include <time.h>
45 50
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) */
66#define PID_HASHSIZE 16 /* size of pid hahs table, must be power of two */ 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 */
67 79
68#include "ev.h" 80#include "ev.h"
69 81
70typedef struct ev_watcher *W; 82typedef struct ev_watcher *W;
71typedef struct ev_watcher_list *WL; 83typedef struct ev_watcher_list *WL;
… …
84/*****************************************************************************/ 96/*****************************************************************************/
85 97
86ev_tstamp 98ev_tstamp
87ev_time (void) 99ev_time (void)
88{ 100{
89#if HAVE_REALTIME 101#if EV_USE_REALTIME
90 struct timespec ts; 102 struct timespec ts;
91 clock_gettime (CLOCK_REALTIME, &ts); 103 clock_gettime (CLOCK_REALTIME, &ts);
92 return ts.tv_sec + ts.tv_nsec * 1e-9; 104 return ts.tv_sec + ts.tv_nsec * 1e-9;
93#else 105#else
94 struct timeval tv; 106 struct timeval tv;
… …
98} 110}
99 111
100static ev_tstamp 112static ev_tstamp
101get_clock (void) 113get_clock (void)
102{ 114{
103#if HAVE_MONOTONIC 115#if EV_USE_MONOTONIC
104 if (have_monotonic) 116 if (have_monotonic)
105 { 117 {
106 struct timespec ts; 118 struct timespec ts;
107 clock_gettime (CLOCK_MONOTONIC, &ts); 119 clock_gettime (CLOCK_MONOTONIC, &ts);
108 return ts.tv_sec + ts.tv_nsec * 1e-9; 120 return ts.tv_sec + ts.tv_nsec * 1e-9;
109 } 121 }
110#endif 122#endif
111 123
112 return ev_time (); 124 return ev_time ();
113} 125}
126
127#define array_roundsize(base,n) ((n) | 4 & ~3)
114 128
115#define array_needsize(base,cur,cnt,init) \ 129#define array_needsize(base,cur,cnt,init) \
116 if ((cnt) > cur) \ 130 if ((cnt) > cur) \
117 { \ 131 { \
118 int newcnt = cur; \ 132 int newcnt = cur; \
119 do \ 133 do \
120 { \ 134 { \
121 newcnt = (newcnt << 1) | 4 & ~3; \ 135 newcnt = array_roundsize (base, newcnt << 1); \
122 } \ 136 } \
123 while ((cnt) > newcnt); \ 137 while ((cnt) > newcnt); \
124 \ 138 \
125 base = realloc (base, sizeof (*base) * (newcnt)); \ 139 base = realloc (base, sizeof (*base) * (newcnt)); \
126 init (base + cur, newcnt - cur); \ 140 init (base + cur, newcnt - cur); \
… …
130/*****************************************************************************/ 144/*****************************************************************************/
131 145
132typedef struct 146typedef struct
133{ 147{
134 struct ev_io *head; 148 struct ev_io *head;
135 unsigned char wev, rev; /* want, received event set */ 149 unsigned char events;
150 unsigned char reify;
136} ANFD; 151} ANFD;
137 152
138static ANFD *anfds; 153static ANFD *anfds;
139static int anfdmax; 154static int anfdmax;
140 155
141static int *fdchanges;
142static int fdchangemax, fdchangecnt;
143
144static void 156static void
145anfds_init (ANFD *base, int count) 157anfds_init (ANFD *base, int count)
146{ 158{
147 while (count--) 159 while (count--)
148 { 160 {
149 base->head = 0; 161 base->head = 0;
150 base->wev = base->rev = EV_NONE; 162 base->events = EV_NONE;
163 base->reify = 0;
164
151 ++base; 165 ++base;
152 } 166 }
153} 167}
154 168
155typedef struct 169typedef struct
… …
162static int pendingmax, pendingcnt; 176static int pendingmax, pendingcnt;
163 177
164static void 178static void
165event (W w, int events) 179event (W w, int events)
166{ 180{
167 if (w->active) 181 if (w->pending)
182 {
183 pendings [w->pending - 1].events |= events;
184 return;
168 { 185 }
186
169 w->pending = ++pendingcnt; 187 w->pending = ++pendingcnt;
170 array_needsize (pendings, pendingmax, pendingcnt, ); 188 array_needsize (pendings, pendingmax, pendingcnt, );
171 pendings [pendingcnt - 1].w = w; 189 pendings [pendingcnt - 1].w = w;
172 pendings [pendingcnt - 1].events = events; 190 pendings [pendingcnt - 1].events = events;
173 } 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);
174} 200}
175 201
176static void 202static void
177fd_event (int fd, int events) 203fd_event (int fd, int events)
178{ 204{
… …
186 if (ev) 212 if (ev)
187 event ((W)w, ev); 213 event ((W)w, ev);
188 } 214 }
189} 215}
190 216
217/*****************************************************************************/
218
219static int *fdchanges;
220static int fdchangemax, fdchangecnt;
221
191static void 222static void
192queue_events (W *events, int eventcnt, int type) 223fd_reify (void)
193{ 224{
194 int i; 225 int i;
195 226
196 for (i = 0; i < eventcnt; ++i) 227 for (i = 0; i < fdchangecnt; ++i)
197 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;
198} 261}
199 262
200/* called on EBADF to verify fds */ 263/* called on EBADF to verify fds */
201static void 264static void
202fd_recheck () 265fd_recheck (void)
203{ 266{
204 int fd; 267 int fd;
205 268
206 for (fd = 0; fd < anfdmax; ++fd) 269 for (fd = 0; fd < anfdmax; ++fd)
207 if (anfds [fd].wev) 270 if (anfds [fd].events)
208 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 271 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF)
209 while (anfds [fd].head) 272 while (anfds [fd].head)
273 {
210 evio_stop (anfds [fd].head); 274 ev_io_stop (anfds [fd].head);
275 event ((W)anfds [fd].head, EV_ERROR | EV_READ | EV_WRITE);
276 }
211} 277}
212 278
213/*****************************************************************************/ 279/*****************************************************************************/
214 280
215static struct ev_timer **timers; 281static struct ev_timer **timers;
… …
262/*****************************************************************************/ 328/*****************************************************************************/
263 329
264typedef struct 330typedef struct
265{ 331{
266 struct ev_signal *head; 332 struct ev_signal *head;
267 sig_atomic_t gotsig; 333 sig_atomic_t volatile gotsig;
268} ANSIG; 334} ANSIG;
269 335
270static ANSIG *signals; 336static ANSIG *signals;
271static int signalmax; 337static int signalmax;
272 338
273static int sigpipe [2]; 339static int sigpipe [2];
274static sig_atomic_t gotsig; 340static sig_atomic_t volatile gotsig;
275static struct ev_io sigev; 341static struct ev_io sigev;
276 342
277static void 343static void
278signals_init (ANSIG *base, int count) 344signals_init (ANSIG *base, int count)
279{ 345{
280 while (count--) 346 while (count--)
281 { 347 {
282 base->head = 0; 348 base->head = 0;
283 base->gotsig = 0; 349 base->gotsig = 0;
350
284 ++base; 351 ++base;
285 } 352 }
286} 353}
287 354
288static void 355static void
… …
291 signals [signum - 1].gotsig = 1; 358 signals [signum - 1].gotsig = 1;
292 359
293 if (!gotsig) 360 if (!gotsig)
294 { 361 {
295 gotsig = 1; 362 gotsig = 1;
296 write (sigpipe [1], &gotsig, 1); 363 write (sigpipe [1], &signum, 1);
297 } 364 }
298} 365}
299 366
300static void 367static void
301sigcb (struct ev_io *iow, int revents) 368sigcb (struct ev_io *iow, int revents)
302{ 369{
303 struct ev_signal *w; 370 struct ev_signal *w;
304 int sig; 371 int signum;
305 372
373 read (sigpipe [0], &revents, 1);
306 gotsig = 0; 374 gotsig = 0;
307 read (sigpipe [0], &revents, 1);
308 375
309 for (sig = signalmax; sig--; ) 376 for (signum = signalmax; signum--; )
310 if (signals [sig].gotsig) 377 if (signals [signum].gotsig)
311 { 378 {
312 signals [sig].gotsig = 0; 379 signals [signum].gotsig = 0;
313 380
314 for (w = signals [sig].head; w; w = w->next) 381 for (w = signals [signum].head; w; w = w->next)
315 event ((W)w, EV_SIGNAL); 382 event ((W)w, EV_SIGNAL);
316 } 383 }
317} 384}
318 385
319static void 386static void
… …
324 391
325 /* rather than sort out wether we really need nb, set it */ 392 /* rather than sort out wether we really need nb, set it */
326 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK); 393 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
327 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK); 394 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
328 395
329 evio_set (&sigev, sigpipe [0], EV_READ); 396 ev_io_set (&sigev, sigpipe [0], EV_READ);
330 evio_start (&sigev); 397 ev_io_start (&sigev);
331} 398}
332 399
333/*****************************************************************************/ 400/*****************************************************************************/
334 401
335static struct ev_idle **idles; 402static struct ev_idle **idles;
… …
365 } 432 }
366} 433}
367 434
368/*****************************************************************************/ 435/*****************************************************************************/
369 436
370#if HAVE_EPOLL 437#if EV_USE_EPOLL
371# include "ev_epoll.c" 438# include "ev_epoll.c"
372#endif 439#endif
373#if HAVE_SELECT 440#if EV_USE_SELECT
374# include "ev_select.c" 441# include "ev_select.c"
375#endif 442#endif
376 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
377int ev_init (int flags) 456int ev_init (int flags)
378{ 457{
379 if (!ev_method) 458 if (!ev_method)
380 { 459 {
381#if HAVE_MONOTONIC 460#if EV_USE_MONOTONIC
382 { 461 {
383 struct timespec ts; 462 struct timespec ts;
384 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 463 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
385 have_monotonic = 1; 464 have_monotonic = 1;
386 } 465 }
… …
392 471
393 if (pipe (sigpipe)) 472 if (pipe (sigpipe))
394 return 0; 473 return 0;
395 474
396 ev_method = EVMETHOD_NONE; 475 ev_method = EVMETHOD_NONE;
397#if HAVE_EPOLL 476#if EV_USE_EPOLL
398 if (ev_method == EVMETHOD_NONE) epoll_init (flags); 477 if (ev_method == EVMETHOD_NONE) epoll_init (flags);
399#endif 478#endif
400#if HAVE_SELECT 479#if EV_USE_SELECT
401 if (ev_method == EVMETHOD_NONE) select_init (flags); 480 if (ev_method == EVMETHOD_NONE) select_init (flags);
402#endif 481#endif
403 482
404 if (ev_method) 483 if (ev_method)
405 { 484 {
406 evw_init (&sigev, sigcb); 485 ev_watcher_init (&sigev, sigcb);
407 siginit (); 486 siginit ();
408 487
409 evsignal_init (&childev, childcb, SIGCHLD); 488 ev_signal_init (&childev, childcb, SIGCHLD);
410 evsignal_start (&childev); 489 ev_signal_start (&childev);
411 } 490 }
412 } 491 }
413 492
414 return ev_method; 493 return ev_method;
415} 494}
416 495
417/*****************************************************************************/ 496/*****************************************************************************/
418 497
419void ev_prefork (void) 498void
499ev_fork_prepare (void)
420{ 500{
421 /* nop */ 501 /* nop */
422} 502}
423 503
504void
424void ev_postfork_parent (void) 505ev_fork_parent (void)
425{ 506{
426 /* nop */ 507 /* nop */
427} 508}
428 509
510void
429void ev_postfork_child (void) 511ev_fork_child (void)
430{ 512{
431#if HAVE_EPOLL 513#if EV_USE_EPOLL
432 if (ev_method == EVMETHOD_EPOLL) 514 if (ev_method == EVMETHOD_EPOLL)
433 epoll_postfork_child (); 515 epoll_postfork_child ();
434#endif 516#endif
435 517
436 evio_stop (&sigev); 518 ev_io_stop (&sigev);
437 close (sigpipe [0]); 519 close (sigpipe [0]);
438 close (sigpipe [1]); 520 close (sigpipe [1]);
439 pipe (sigpipe); 521 pipe (sigpipe);
440 siginit (); 522 siginit ();
441} 523}
442 524
443/*****************************************************************************/ 525/*****************************************************************************/
444 526
445static void 527static void
446fd_reify (void)
447{
448 int i;
449
450 for (i = 0; i < fdchangecnt; ++i)
451 {
452 int fd = fdchanges [i];
453 ANFD *anfd = anfds + fd;
454 struct ev_io *w;
455
456 int wev = 0;
457
458 for (w = anfd->head; w; w = w->next)
459 wev |= w->events;
460
461 if (anfd->wev != wev)
462 {
463 method_modify (fd, anfd->wev, wev);
464 anfd->wev = wev;
465 }
466 }
467
468 fdchangecnt = 0;
469}
470
471static void
472call_pending () 528call_pending (void)
473{ 529{
474 while (pendingcnt) 530 while (pendingcnt)
475 { 531 {
476 ANPENDING *p = pendings + --pendingcnt; 532 ANPENDING *p = pendings + --pendingcnt;
477 533
… …
482 } 538 }
483 } 539 }
484} 540}
485 541
486static void 542static void
487timers_reify () 543timers_reify (void)
488{ 544{
489 while (timercnt && timers [0]->at <= now) 545 while (timercnt && timers [0]->at <= now)
490 { 546 {
491 struct ev_timer *w = timers [0]; 547 struct ev_timer *w = timers [0];
492
493 event ((W)w, EV_TIMEOUT);
494 548
495 /* first reschedule or stop timer */ 549 /* first reschedule or stop timer */
496 if (w->repeat) 550 if (w->repeat)
497 { 551 {
552 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
498 w->at = now + w->repeat; 553 w->at = now + w->repeat;
499 assert (("timer timeout in the past, negative repeat?", w->at > now));
500 downheap ((WT *)timers, timercnt, 0); 554 downheap ((WT *)timers, timercnt, 0);
501 } 555 }
502 else 556 else
503 evtimer_stop (w); /* nonrepeating: stop timer */ 557 ev_timer_stop (w); /* nonrepeating: stop timer */
504 }
505}
506 558
559 event ((W)w, EV_TIMEOUT);
560 }
561}
562
507static void 563static void
508periodics_reify () 564periodics_reify (void)
509{ 565{
510 while (periodiccnt && periodics [0]->at <= ev_now) 566 while (periodiccnt && periodics [0]->at <= ev_now)
511 { 567 {
512 struct ev_periodic *w = periodics [0]; 568 struct ev_periodic *w = periodics [0];
513 569
514 /* first reschedule or stop timer */ 570 /* first reschedule or stop timer */
515 if (w->interval) 571 if (w->interval)
516 { 572 {
517 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;
518 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));
519 downheap ((WT *)periodics, periodiccnt, 0); 575 downheap ((WT *)periodics, periodiccnt, 0);
520 } 576 }
521 else 577 else
522 evperiodic_stop (w); /* nonrepeating: stop timer */ 578 ev_periodic_stop (w); /* nonrepeating: stop timer */
523 579
524 event ((W)w, EV_TIMEOUT); 580 event ((W)w, EV_PERIODIC);
525 } 581 }
526} 582}
527 583
528static void 584static void
529periodics_reschedule (ev_tstamp diff) 585periodics_reschedule (ev_tstamp diff)
… …
539 { 595 {
540 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;
541 597
542 if (fabs (diff) >= 1e-4) 598 if (fabs (diff) >= 1e-4)
543 { 599 {
544 evperiodic_stop (w); 600 ev_periodic_stop (w);
545 evperiodic_start (w); 601 ev_periodic_start (w);
546 602
547 i = 0; /* restart loop, inefficient, but time jumps should be rare */ 603 i = 0; /* restart loop, inefficient, but time jumps should be rare */
548 } 604 }
549 } 605 }
550 } 606 }
551} 607}
552 608
553static void 609static void
554time_update () 610time_update (void)
555{ 611{
556 int i; 612 int i;
557 613
558 ev_now = ev_time (); 614 ev_now = ev_time ();
559 615
… …
593int ev_loop_done; 649int ev_loop_done;
594 650
595void ev_loop (int flags) 651void ev_loop (int flags)
596{ 652{
597 double block; 653 double block;
598 ev_loop_done = flags & EVLOOP_ONESHOT ? 1 : 0; 654 ev_loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
599 655
600 do 656 do
601 { 657 {
602 /* queue check watchers (and execute them) */ 658 /* queue check watchers (and execute them) */
603 if (preparecnt) 659 if (preparecnt)
… …
684 head = &(*head)->next; 740 head = &(*head)->next;
685 } 741 }
686} 742}
687 743
688static void 744static void
689ev_clear (W w) 745ev_clear_pending (W w)
690{ 746{
691 if (w->pending) 747 if (w->pending)
692 { 748 {
693 pendings [w->pending - 1].w = 0; 749 pendings [w->pending - 1].w = 0;
694 w->pending = 0; 750 w->pending = 0;
… …
708} 764}
709 765
710/*****************************************************************************/ 766/*****************************************************************************/
711 767
712void 768void
713evio_start (struct ev_io *w) 769ev_io_start (struct ev_io *w)
714{ 770{
715 if (ev_is_active (w))
716 return;
717
718 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));
719 777
720 ev_start ((W)w, 1); 778 ev_start ((W)w, 1);
721 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 779 array_needsize (anfds, anfdmax, fd + 1, anfds_init);
722 wlist_add ((WL *)&anfds[fd].head, (WL)w); 780 wlist_add ((WL *)&anfds[fd].head, (WL)w);
723 781
724 ++fdchangecnt; 782 fd_change (fd);
725 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
726 fdchanges [fdchangecnt - 1] = fd;
727} 783}
728 784
729void 785void
730evio_stop (struct ev_io *w) 786ev_io_stop (struct ev_io *w)
731{ 787{
732 ev_clear ((W)w); 788 ev_clear_pending ((W)w);
733 if (!ev_is_active (w)) 789 if (!ev_is_active (w))
734 return; 790 return;
735 791
736 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 792 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
737 ev_stop ((W)w); 793 ev_stop ((W)w);
738 794
739 ++fdchangecnt; 795 fd_change (w->fd);
740 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
741 fdchanges [fdchangecnt - 1] = w->fd;
742} 796}
743 797
744void 798void
745evtimer_start (struct ev_timer *w) 799ev_timer_start (struct ev_timer *w)
746{ 800{
747 if (ev_is_active (w)) 801 if (ev_is_active (w))
748 return; 802 return;
749 803
750 w->at += now; 804 w->at += now;
751 805
752 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.));
753 807
754 ev_start ((W)w, ++timercnt); 808 ev_start ((W)w, ++timercnt);
755 array_needsize (timers, timermax, timercnt, ); 809 array_needsize (timers, timermax, timercnt, );
756 timers [timercnt - 1] = w; 810 timers [timercnt - 1] = w;
757 upheap ((WT *)timers, timercnt - 1); 811 upheap ((WT *)timers, timercnt - 1);
758} 812}
759 813
760void 814void
761evtimer_stop (struct ev_timer *w) 815ev_timer_stop (struct ev_timer *w)
762{ 816{
763 ev_clear ((W)w); 817 ev_clear_pending ((W)w);
764 if (!ev_is_active (w)) 818 if (!ev_is_active (w))
765 return; 819 return;
766 820
767 if (w->active < timercnt--) 821 if (w->active < timercnt--)
768 { 822 {
… …
774 828
775 ev_stop ((W)w); 829 ev_stop ((W)w);
776} 830}
777 831
778void 832void
779evtimer_again (struct ev_timer *w) 833ev_timer_again (struct ev_timer *w)
780{ 834{
781 if (ev_is_active (w)) 835 if (ev_is_active (w))
782 { 836 {
783 if (w->repeat) 837 if (w->repeat)
784 { 838 {
785 w->at = now + w->repeat; 839 w->at = now + w->repeat;
786 downheap ((WT *)timers, timercnt, w->active - 1); 840 downheap ((WT *)timers, timercnt, w->active - 1);
787 } 841 }
788 else 842 else
789 evtimer_stop (w); 843 ev_timer_stop (w);
790 } 844 }
791 else if (w->repeat) 845 else if (w->repeat)
792 evtimer_start (w); 846 ev_timer_start (w);
793} 847}
794 848
795void 849void
796evperiodic_start (struct ev_periodic *w) 850ev_periodic_start (struct ev_periodic *w)
797{ 851{
798 if (ev_is_active (w)) 852 if (ev_is_active (w))
799 return; 853 return;
800 854
801 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.));
802 856
803 /* 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 */
804 if (w->interval) 858 if (w->interval)
805 w->at += ceil ((ev_now - w->at) / w->interval) * w->interval; 859 w->at += ceil ((ev_now - w->at) / w->interval) * w->interval;
806 860
… …
809 periodics [periodiccnt - 1] = w; 863 periodics [periodiccnt - 1] = w;
810 upheap ((WT *)periodics, periodiccnt - 1); 864 upheap ((WT *)periodics, periodiccnt - 1);
811} 865}
812 866
813void 867void
814evperiodic_stop (struct ev_periodic *w) 868ev_periodic_stop (struct ev_periodic *w)
815{ 869{
816 ev_clear ((W)w); 870 ev_clear_pending ((W)w);
817 if (!ev_is_active (w)) 871 if (!ev_is_active (w))
818 return; 872 return;
819 873
820 if (w->active < periodiccnt--) 874 if (w->active < periodiccnt--)
821 { 875 {
… …
825 879
826 ev_stop ((W)w); 880 ev_stop ((W)w);
827} 881}
828 882
829void 883void
830evsignal_start (struct ev_signal *w) 884ev_signal_start (struct ev_signal *w)
831{ 885{
832 if (ev_is_active (w)) 886 if (ev_is_active (w))
833 return; 887 return;
888
889 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
834 890
835 ev_start ((W)w, 1); 891 ev_start ((W)w, 1);
836 array_needsize (signals, signalmax, w->signum, signals_init); 892 array_needsize (signals, signalmax, w->signum, signals_init);
837 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 893 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
838 894
… …
845 sigaction (w->signum, &sa, 0); 901 sigaction (w->signum, &sa, 0);
846 } 902 }
847} 903}
848 904
849void 905void
850evsignal_stop (struct ev_signal *w) 906ev_signal_stop (struct ev_signal *w)
851{ 907{
852 ev_clear ((W)w); 908 ev_clear_pending ((W)w);
853 if (!ev_is_active (w)) 909 if (!ev_is_active (w))
854 return; 910 return;
855 911
856 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 912 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
857 ev_stop ((W)w); 913 ev_stop ((W)w);
858 914
859 if (!signals [w->signum - 1].head) 915 if (!signals [w->signum - 1].head)
860 signal (w->signum, SIG_DFL); 916 signal (w->signum, SIG_DFL);
861} 917}
862 918
919void
863void evidle_start (struct ev_idle *w) 920ev_idle_start (struct ev_idle *w)
864{ 921{
865 if (ev_is_active (w)) 922 if (ev_is_active (w))
866 return; 923 return;
867 924
868 ev_start ((W)w, ++idlecnt); 925 ev_start ((W)w, ++idlecnt);
869 array_needsize (idles, idlemax, idlecnt, ); 926 array_needsize (idles, idlemax, idlecnt, );
870 idles [idlecnt - 1] = w; 927 idles [idlecnt - 1] = w;
871} 928}
872 929
930void
873void evidle_stop (struct ev_idle *w) 931ev_idle_stop (struct ev_idle *w)
874{ 932{
875 ev_clear ((W)w); 933 ev_clear_pending ((W)w);
876 if (ev_is_active (w)) 934 if (ev_is_active (w))
877 return; 935 return;
878 936
879 idles [w->active - 1] = idles [--idlecnt]; 937 idles [w->active - 1] = idles [--idlecnt];
880 ev_stop ((W)w); 938 ev_stop ((W)w);
881} 939}
882 940
941void
883void evprepare_start (struct ev_prepare *w) 942ev_prepare_start (struct ev_prepare *w)
884{ 943{
885 if (ev_is_active (w)) 944 if (ev_is_active (w))
886 return; 945 return;
887 946
888 ev_start ((W)w, ++preparecnt); 947 ev_start ((W)w, ++preparecnt);
889 array_needsize (prepares, preparemax, preparecnt, ); 948 array_needsize (prepares, preparemax, preparecnt, );
890 prepares [preparecnt - 1] = w; 949 prepares [preparecnt - 1] = w;
891} 950}
892 951
952void
893void evprepare_stop (struct ev_prepare *w) 953ev_prepare_stop (struct ev_prepare *w)
894{ 954{
895 ev_clear ((W)w); 955 ev_clear_pending ((W)w);
896 if (ev_is_active (w)) 956 if (ev_is_active (w))
897 return; 957 return;
898 958
899 prepares [w->active - 1] = prepares [--preparecnt]; 959 prepares [w->active - 1] = prepares [--preparecnt];
900 ev_stop ((W)w); 960 ev_stop ((W)w);
901} 961}
902 962
963void
903void evcheck_start (struct ev_check *w) 964ev_check_start (struct ev_check *w)
904{ 965{
905 if (ev_is_active (w)) 966 if (ev_is_active (w))
906 return; 967 return;
907 968
908 ev_start ((W)w, ++checkcnt); 969 ev_start ((W)w, ++checkcnt);
909 array_needsize (checks, checkmax, checkcnt, ); 970 array_needsize (checks, checkmax, checkcnt, );
910 checks [checkcnt - 1] = w; 971 checks [checkcnt - 1] = w;
911} 972}
912 973
974void
913void evcheck_stop (struct ev_check *w) 975ev_check_stop (struct ev_check *w)
914{ 976{
915 ev_clear ((W)w); 977 ev_clear_pending ((W)w);
916 if (ev_is_active (w)) 978 if (ev_is_active (w))
917 return; 979 return;
918 980
919 checks [w->active - 1] = checks [--checkcnt]; 981 checks [w->active - 1] = checks [--checkcnt];
920 ev_stop ((W)w); 982 ev_stop ((W)w);
921} 983}
922 984
985void
923void evchild_start (struct ev_child *w) 986ev_child_start (struct ev_child *w)
924{ 987{
925 if (ev_is_active (w)) 988 if (ev_is_active (w))
926 return; 989 return;
927 990
928 ev_start ((W)w, 1); 991 ev_start ((W)w, 1);
929 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 992 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
930} 993}
931 994
995void
932void evchild_stop (struct ev_child *w) 996ev_child_stop (struct ev_child *w)
933{ 997{
934 ev_clear ((W)w); 998 ev_clear_pending ((W)w);
935 if (ev_is_active (w)) 999 if (ev_is_active (w))
936 return; 1000 return;
937 1001
938 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1002 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
939 ev_stop ((W)w); 1003 ev_stop ((W)w);
… …
953once_cb (struct ev_once *once, int revents) 1017once_cb (struct ev_once *once, int revents)
954{ 1018{
955 void (*cb)(int revents, void *arg) = once->cb; 1019 void (*cb)(int revents, void *arg) = once->cb;
956 void *arg = once->arg; 1020 void *arg = once->arg;
957 1021
958 evio_stop (&once->io); 1022 ev_io_stop (&once->io);
959 evtimer_stop (&once->to); 1023 ev_timer_stop (&once->to);
960 free (once); 1024 free (once);
961 1025
962 cb (revents, arg); 1026 cb (revents, arg);
963} 1027}
964 1028
… …
978ev_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)
979{ 1043{
980 struct ev_once *once = malloc (sizeof (struct ev_once)); 1044 struct ev_once *once = malloc (sizeof (struct ev_once));
981 1045
982 if (!once) 1046 if (!once)
983 cb (EV_ERROR, arg); 1047 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
984 else 1048 else
985 { 1049 {
986 once->cb = cb; 1050 once->cb = cb;
987 once->arg = arg; 1051 once->arg = arg;
988 1052
989 evw_init (&once->io, once_cb_io); 1053 ev_watcher_init (&once->io, once_cb_io);
990
991 if (fd >= 0) 1054 if (fd >= 0)
992 { 1055 {
993 evio_set (&once->io, fd, events); 1056 ev_io_set (&once->io, fd, events);
994 evio_start (&once->io); 1057 ev_io_start (&once->io);
995 } 1058 }
996 1059
997 evw_init (&once->to, once_cb_to); 1060 ev_watcher_init (&once->to, once_cb_to);
998
999 if (timeout >= 0.) 1061 if (timeout >= 0.)
1000 { 1062 {
1001 evtimer_set (&once->to, timeout, 0.); 1063 ev_timer_set (&once->to, timeout, 0.);
1002 evtimer_start (&once->to); 1064 ev_timer_start (&once->to);
1003 } 1065 }
1004 } 1066 }
1005} 1067}
1006 1068
1007/*****************************************************************************/ 1069/*****************************************************************************/
… …
1018 1080
1019static void 1081static void
1020ocb (struct ev_timer *w, int revents) 1082ocb (struct ev_timer *w, int revents)
1021{ 1083{
1022 //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);
1023 evtimer_stop (w); 1085 ev_timer_stop (w);
1024 evtimer_start (w); 1086 ev_timer_start (w);
1025} 1087}
1026 1088
1027static void 1089static void
1028scb (struct ev_signal *w, int revents) 1090scb (struct ev_signal *w, int revents)
1029{ 1091{
1030 fprintf (stderr, "signal %x,%d\n", revents, w->signum); 1092 fprintf (stderr, "signal %x,%d\n", revents, w->signum);
1031 evio_stop (&wio); 1093 ev_io_stop (&wio);
1032 evio_start (&wio); 1094 ev_io_start (&wio);
1033} 1095}
1034 1096
1035static void 1097static void
1036gcb (struct ev_signal *w, int revents) 1098gcb (struct ev_signal *w, int revents)
1037{ 1099{
… …
1041 1103
1042int main (void) 1104int main (void)
1043{ 1105{
1044 ev_init (0); 1106 ev_init (0);
1045 1107
1046 evio_init (&wio, sin_cb, 0, EV_READ); 1108 ev_io_init (&wio, sin_cb, 0, EV_READ);
1047 evio_start (&wio); 1109 ev_io_start (&wio);
1048 1110
1049 struct ev_timer t[10000]; 1111 struct ev_timer t[10000];
1050 1112
1051#if 0 1113#if 0
1052 int i; 1114 int i;
1053 for (i = 0; i < 10000; ++i) 1115 for (i = 0; i < 10000; ++i)
1054 { 1116 {
1055 struct ev_timer *w = t + i; 1117 struct ev_timer *w = t + i;
1056 evw_init (w, ocb, i); 1118 ev_watcher_init (w, ocb, i);
1057 evtimer_init_abs (w, ocb, drand48 (), 0.99775533); 1119 ev_timer_init_abs (w, ocb, drand48 (), 0.99775533);
1058 evtimer_start (w); 1120 ev_timer_start (w);
1059 if (drand48 () < 0.5) 1121 if (drand48 () < 0.5)
1060 evtimer_stop (w); 1122 ev_timer_stop (w);
1061 } 1123 }
1062#endif 1124#endif
1063 1125
1064 struct ev_timer t1; 1126 struct ev_timer t1;
1065 evtimer_init (&t1, ocb, 5, 10); 1127 ev_timer_init (&t1, ocb, 5, 10);
1066 evtimer_start (&t1); 1128 ev_timer_start (&t1);
1067 1129
1068 struct ev_signal sig; 1130 struct ev_signal sig;
1069 evsignal_init (&sig, scb, SIGQUIT); 1131 ev_signal_init (&sig, scb, SIGQUIT);
1070 evsignal_start (&sig); 1132 ev_signal_start (&sig);
1071 1133
1072 struct ev_check cw; 1134 struct ev_check cw;
1073 evcheck_init (&cw, gcb); 1135 ev_check_init (&cw, gcb);
1074 evcheck_start (&cw); 1136 ev_check_start (&cw);
1075 1137
1076 struct ev_idle iw; 1138 struct ev_idle iw;
1077 evidle_init (&iw, gcb); 1139 ev_idle_init (&iw, gcb);
1078 evidle_start (&iw); 1140 ev_idle_start (&iw);
1079 1141
1080 ev_loop (0); 1142 ev_loop (0);
1081 1143
1082 return 0; 1144 return 0;
1083} 1145}

Diff Legend

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