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

Comparing libev/ev.c (file contents):
Revision 1.18 by root, Wed Oct 31 16:29:52 2007 UTC vs.
Revision 1.28 by root, Thu Nov 1 06:48:49 2007 UTC

… …
36 36
37#include <stdio.h> 37#include <stdio.h>
38 38
39#include <assert.h> 39#include <assert.h>
40#include <errno.h> 40#include <errno.h>
41#include <sys/types.h>
42#include <sys/wait.h>
41#include <sys/time.h> 43#include <sys/time.h>
42#include <time.h> 44#include <time.h>
43
44#define HAVE_EPOLL 1
45 45
46#ifndef HAVE_MONOTONIC 46#ifndef HAVE_MONOTONIC
47# ifdef CLOCK_MONOTONIC 47# ifdef CLOCK_MONOTONIC
48# define HAVE_MONOTONIC 1 48# define HAVE_MONOTONIC 1
49# endif 49# endif
… …
61# define HAVE_REALTIME 1 /* posix requirement, but might be slower */ 61# define HAVE_REALTIME 1 /* posix requirement, but might be slower */
62#endif 62#endif
63 63
64#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 64#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
65#define MAX_BLOCKTIME 60. 65#define MAX_BLOCKTIME 60.
66#define PID_HASHSIZE 16 /* size of pid hahs table, must be power of two */
66 67
67#include "ev.h" 68#include "ev.h"
68 69
69typedef struct ev_watcher *W; 70typedef struct ev_watcher *W;
70typedef struct ev_watcher_list *WL; 71typedef struct ev_watcher_list *WL;
… …
112} 113}
113 114
114#define array_needsize(base,cur,cnt,init) \ 115#define array_needsize(base,cur,cnt,init) \
115 if ((cnt) > cur) \ 116 if ((cnt) > cur) \
116 { \ 117 { \
117 int newcnt = cur ? cur << 1 : 16; \ 118 int newcnt = cur; \
119 do \
120 { \
121 newcnt = (newcnt << 1) | 4 & ~3; \
122 } \
123 while ((cnt) > newcnt); \
124 \
118 base = realloc (base, sizeof (*base) * (newcnt)); \ 125 base = realloc (base, sizeof (*base) * (newcnt)); \
119 init (base + cur, newcnt - cur); \ 126 init (base + cur, newcnt - cur); \
120 cur = newcnt; \ 127 cur = newcnt; \
121 } 128 }
122 129
123/*****************************************************************************/ 130/*****************************************************************************/
124 131
125typedef struct 132typedef struct
126{ 133{
127 struct ev_io *head; 134 struct ev_io *head;
128 unsigned char wev, rev; /* want, received event set */ 135 int events;
129} ANFD; 136} ANFD;
130 137
131static ANFD *anfds; 138static ANFD *anfds;
132static int anfdmax; 139static int anfdmax;
133 140
134static int *fdchanges;
135static int fdchangemax, fdchangecnt;
136
137static void 141static void
138anfds_init (ANFD *base, int count) 142anfds_init (ANFD *base, int count)
139{ 143{
140 while (count--) 144 while (count--)
141 { 145 {
142 base->head = 0; 146 base->head = 0;
143 base->wev = base->rev = EV_NONE; 147 base->events = EV_NONE;
144 ++base; 148 ++base;
145 } 149 }
146} 150}
147 151
148typedef struct 152typedef struct
… …
165 pendings [pendingcnt - 1].events = events; 169 pendings [pendingcnt - 1].events = events;
166 } 170 }
167} 171}
168 172
169static void 173static void
174queue_events (W *events, int eventcnt, int type)
175{
176 int i;
177
178 for (i = 0; i < eventcnt; ++i)
179 event (events [i], type);
180}
181
182static void
170fd_event (int fd, int events) 183fd_event (int fd, int events)
171{ 184{
172 ANFD *anfd = anfds + fd; 185 ANFD *anfd = anfds + fd;
173 struct ev_io *w; 186 struct ev_io *w;
174 187
… …
179 if (ev) 192 if (ev)
180 event ((W)w, ev); 193 event ((W)w, ev);
181 } 194 }
182} 195}
183 196
197/*****************************************************************************/
198
199static int *fdchanges;
200static int fdchangemax, fdchangecnt;
201
184static void 202static void
185queue_events (W *events, int eventcnt, int type) 203fd_reify (void)
186{ 204{
187 int i; 205 int i;
188 206
189 for (i = 0; i < eventcnt; ++i) 207 for (i = 0; i < fdchangecnt; ++i)
190 event (events [i], type); 208 {
209 int fd = fdchanges [i];
210 ANFD *anfd = anfds + fd;
211 struct ev_io *w;
212
213 int events = 0;
214
215 for (w = anfd->head; w; w = w->next)
216 events |= w->events;
217
218 anfd->events &= ~EV_REIFY;
219
220 if (anfd->events != events)
221 {
222 method_modify (fd, anfd->events, events);
223 anfd->events = events;
224 }
225 }
226
227 fdchangecnt = 0;
228}
229
230static void
231fd_change (int fd)
232{
233 if (anfds [fd].events & EV_REIFY)
234 return;
235
236 anfds [fd].events |= EV_REIFY;
237
238 ++fdchangecnt;
239 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
240 fdchanges [fdchangecnt - 1] = fd;
241}
242
243/* called on EBADF to verify fds */
244static void
245fd_recheck (void)
246{
247 int fd;
248
249 for (fd = 0; fd < anfdmax; ++fd)
250 if (anfds [fd].events)
251 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF)
252 while (anfds [fd].head)
253 {
254 event ((W)anfds [fd].head, EV_ERROR);
255 ev_io_stop (anfds [fd].head);
256 }
191} 257}
192 258
193/*****************************************************************************/ 259/*****************************************************************************/
194 260
195static struct ev_timer **timers; 261static struct ev_timer **timers;
… …
304 370
305 /* rather than sort out wether we really need nb, set it */ 371 /* rather than sort out wether we really need nb, set it */
306 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK); 372 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
307 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK); 373 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
308 374
309 evio_set (&sigev, sigpipe [0], EV_READ); 375 ev_io_set (&sigev, sigpipe [0], EV_READ);
310 evio_start (&sigev); 376 ev_io_start (&sigev);
311} 377}
312 378
313/*****************************************************************************/ 379/*****************************************************************************/
314 380
315static struct ev_idle **idles; 381static struct ev_idle **idles;
316static int idlemax, idlecnt; 382static int idlemax, idlecnt;
317 383
384static struct ev_prepare **prepares;
385static int preparemax, preparecnt;
386
318static struct ev_check **checks; 387static struct ev_check **checks;
319static int checkmax, checkcnt; 388static int checkmax, checkcnt;
320 389
321/*****************************************************************************/ 390/*****************************************************************************/
322 391
392static struct ev_child *childs [PID_HASHSIZE];
393static struct ev_signal childev;
394
395#ifndef WCONTINUED
396# define WCONTINUED 0
397#endif
398
399static void
400childcb (struct ev_signal *sw, int revents)
401{
402 struct ev_child *w;
403 int pid, status;
404
405 while ((pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)) != -1)
406 for (w = childs [pid & (PID_HASHSIZE - 1)]; w; w = w->next)
407 if (w->pid == pid || w->pid == -1)
408 {
409 w->status = status;
410 event ((W)w, EV_CHILD);
411 }
412}
413
414/*****************************************************************************/
415
323#if HAVE_EPOLL 416#if HAVE_EPOLL
324# include "ev_epoll.c" 417# include "ev_epoll.c"
325#endif 418#endif
326#if HAVE_SELECT 419#if HAVE_SELECT
327# include "ev_select.c" 420# include "ev_select.c"
328#endif 421#endif
329 422
423int
424ev_version_major (void)
425{
426 return EV_VERSION_MAJOR;
427}
428
429int
430ev_version_minor (void)
431{
432 return EV_VERSION_MINOR;
433}
434
330int ev_init (int flags) 435int ev_init (int flags)
331{ 436{
437 if (!ev_method)
438 {
332#if HAVE_MONOTONIC 439#if HAVE_MONOTONIC
333 { 440 {
334 struct timespec ts; 441 struct timespec ts;
335 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 442 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
336 have_monotonic = 1; 443 have_monotonic = 1;
337 } 444 }
338#endif 445#endif
339 446
340 ev_now = ev_time (); 447 ev_now = ev_time ();
341 now = get_clock (); 448 now = get_clock ();
342 diff = ev_now - now; 449 diff = ev_now - now;
343 450
344 if (pipe (sigpipe)) 451 if (pipe (sigpipe))
345 return 0; 452 return 0;
346 453
347 ev_method = EVMETHOD_NONE; 454 ev_method = EVMETHOD_NONE;
348#if HAVE_EPOLL 455#if HAVE_EPOLL
349 if (ev_method == EVMETHOD_NONE) epoll_init (flags); 456 if (ev_method == EVMETHOD_NONE) epoll_init (flags);
350#endif 457#endif
351#if HAVE_SELECT 458#if HAVE_SELECT
352 if (ev_method == EVMETHOD_NONE) select_init (flags); 459 if (ev_method == EVMETHOD_NONE) select_init (flags);
353#endif 460#endif
354 461
355 if (ev_method) 462 if (ev_method)
356 { 463 {
357 evw_init (&sigev, sigcb); 464 ev_watcher_init (&sigev, sigcb);
358 siginit (); 465 siginit ();
466
467 ev_signal_init (&childev, childcb, SIGCHLD);
468 ev_signal_start (&childev);
469 }
359 } 470 }
360 471
361 return ev_method; 472 return ev_method;
362} 473}
363 474
364/*****************************************************************************/ 475/*****************************************************************************/
365 476
477void
366void ev_prefork (void) 478ev_prefork (void)
367{ 479{
368 /* nop */ 480 /* nop */
369} 481}
370 482
483void
371void ev_postfork_parent (void) 484ev_postfork_parent (void)
372{ 485{
373 /* nop */ 486 /* nop */
374} 487}
375 488
489void
376void ev_postfork_child (void) 490ev_postfork_child (void)
377{ 491{
378#if HAVE_EPOLL 492#if HAVE_EPOLL
379 if (ev_method == EVMETHOD_EPOLL) 493 if (ev_method == EVMETHOD_EPOLL)
380 epoll_postfork_child (); 494 epoll_postfork_child ();
381#endif 495#endif
382 496
383 evio_stop (&sigev); 497 ev_io_stop (&sigev);
384 close (sigpipe [0]); 498 close (sigpipe [0]);
385 close (sigpipe [1]); 499 close (sigpipe [1]);
386 pipe (sigpipe); 500 pipe (sigpipe);
387 siginit (); 501 siginit ();
388} 502}
389 503
390/*****************************************************************************/ 504/*****************************************************************************/
391 505
392static void 506static 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 () 507call_pending (void)
420{ 508{
421 while (pendingcnt) 509 while (pendingcnt)
422 { 510 {
423 ANPENDING *p = pendings + --pendingcnt; 511 ANPENDING *p = pendings + --pendingcnt;
424 512
… …
429 } 517 }
430 } 518 }
431} 519}
432 520
433static void 521static void
434timers_reify () 522timers_reify (void)
435{ 523{
436 while (timercnt && timers [0]->at <= now) 524 while (timercnt && timers [0]->at <= now)
437 { 525 {
438 struct ev_timer *w = timers [0]; 526 struct ev_timer *w = timers [0];
439 527
… …
445 w->at = now + w->repeat; 533 w->at = now + w->repeat;
446 assert (("timer timeout in the past, negative repeat?", w->at > now)); 534 assert (("timer timeout in the past, negative repeat?", w->at > now));
447 downheap ((WT *)timers, timercnt, 0); 535 downheap ((WT *)timers, timercnt, 0);
448 } 536 }
449 else 537 else
450 evtimer_stop (w); /* nonrepeating: stop timer */ 538 ev_timer_stop (w); /* nonrepeating: stop timer */
451 } 539 }
452} 540}
453 541
454static void 542static void
455periodics_reify () 543periodics_reify (void)
456{ 544{
457 while (periodiccnt && periodics [0]->at <= ev_now) 545 while (periodiccnt && periodics [0]->at <= ev_now)
458 { 546 {
459 struct ev_periodic *w = periodics [0]; 547 struct ev_periodic *w = periodics [0];
460 548
… …
464 w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval; 552 w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval;
465 assert (("periodic timeout in the past, negative interval?", w->at > ev_now)); 553 assert (("periodic timeout in the past, negative interval?", w->at > ev_now));
466 downheap ((WT *)periodics, periodiccnt, 0); 554 downheap ((WT *)periodics, periodiccnt, 0);
467 } 555 }
468 else 556 else
469 evperiodic_stop (w); /* nonrepeating: stop timer */ 557 ev_periodic_stop (w); /* nonrepeating: stop timer */
470 558
471 event ((W)w, EV_TIMEOUT); 559 event ((W)w, EV_TIMEOUT);
472 } 560 }
473} 561}
474 562
… …
486 { 574 {
487 ev_tstamp diff = ceil ((ev_now - w->at) / w->interval) * w->interval; 575 ev_tstamp diff = ceil ((ev_now - w->at) / w->interval) * w->interval;
488 576
489 if (fabs (diff) >= 1e-4) 577 if (fabs (diff) >= 1e-4)
490 { 578 {
491 evperiodic_stop (w); 579 ev_periodic_stop (w);
492 evperiodic_start (w); 580 ev_periodic_start (w);
493 581
494 i = 0; /* restart loop, inefficient, but time jumps should be rare */ 582 i = 0; /* restart loop, inefficient, but time jumps should be rare */
495 } 583 }
496 } 584 }
497 } 585 }
498} 586}
499 587
500static void 588static void
501time_update () 589time_update (void)
502{ 590{
503 int i; 591 int i;
504 592
505 ev_now = ev_time (); 593 ev_now = ev_time ();
506 594
… …
540int ev_loop_done; 628int ev_loop_done;
541 629
542void ev_loop (int flags) 630void ev_loop (int flags)
543{ 631{
544 double block; 632 double block;
545 ev_loop_done = flags & EVLOOP_ONESHOT ? 1 : 0; 633 ev_loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
546
547 if (checkcnt)
548 {
549 queue_events ((W *)checks, checkcnt, EV_CHECK);
550 call_pending ();
551 }
552 634
553 do 635 do
554 { 636 {
637 /* queue check watchers (and execute them) */
638 if (preparecnt)
639 {
640 queue_events ((W *)prepares, preparecnt, EV_PREPARE);
641 call_pending ();
642 }
643
555 /* update fd-related kernel structures */ 644 /* update fd-related kernel structures */
556 fd_reify (); 645 fd_reify ();
557 646
558 /* calculate blocking time */ 647 /* calculate blocking time */
559 648
560 /* we only need this for !monotonic clock, but as we always have timers, we just calculate it every time */ 649 /* we only need this for !monotonic clockor timers, but as we basically
650 always have timers, we just calculate it always */
561 ev_now = ev_time (); 651 ev_now = ev_time ();
562 652
563 if (flags & EVLOOP_NONBLOCK || idlecnt) 653 if (flags & EVLOOP_NONBLOCK || idlecnt)
564 block = 0.; 654 block = 0.;
565 else 655 else
… …
585 675
586 /* update ev_now, do magic */ 676 /* update ev_now, do magic */
587 time_update (); 677 time_update ();
588 678
589 /* queue pending timers and reschedule them */ 679 /* queue pending timers and reschedule them */
680 timers_reify (); /* relative timers called last */
590 periodics_reify (); /* absolute timers first */ 681 periodics_reify (); /* absolute timers called first */
591 timers_reify (); /* relative timers second */
592 682
593 /* queue idle watchers unless io or timers are pending */ 683 /* queue idle watchers unless io or timers are pending */
594 if (!pendingcnt) 684 if (!pendingcnt)
595 queue_events ((W *)idles, idlecnt, EV_IDLE); 685 queue_events ((W *)idles, idlecnt, EV_IDLE);
596 686
597 /* queue check and possibly idle watchers */ 687 /* queue check watchers, to be executed first */
688 if (checkcnt)
598 queue_events ((W *)checks, checkcnt, EV_CHECK); 689 queue_events ((W *)checks, checkcnt, EV_CHECK);
599 690
600 call_pending (); 691 call_pending ();
601 } 692 }
602 while (!ev_loop_done); 693 while (!ev_loop_done);
603 694
… …
652} 743}
653 744
654/*****************************************************************************/ 745/*****************************************************************************/
655 746
656void 747void
657evio_start (struct ev_io *w) 748ev_io_start (struct ev_io *w)
658{ 749{
659 if (ev_is_active (w)) 750 if (ev_is_active (w))
660 return; 751 return;
661 752
662 int fd = w->fd; 753 int fd = w->fd;
663 754
664 ev_start ((W)w, 1); 755 ev_start ((W)w, 1);
665 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 756 array_needsize (anfds, anfdmax, fd + 1, anfds_init);
666 wlist_add ((WL *)&anfds[fd].head, (WL)w); 757 wlist_add ((WL *)&anfds[fd].head, (WL)w);
667 758
668 ++fdchangecnt; 759 fd_change (fd);
669 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
670 fdchanges [fdchangecnt - 1] = fd;
671} 760}
672 761
673void 762void
674evio_stop (struct ev_io *w) 763ev_io_stop (struct ev_io *w)
675{ 764{
676 ev_clear ((W)w); 765 ev_clear ((W)w);
677 if (!ev_is_active (w)) 766 if (!ev_is_active (w))
678 return; 767 return;
679 768
680 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 769 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
681 ev_stop ((W)w); 770 ev_stop ((W)w);
682 771
683 ++fdchangecnt; 772 fd_change (w->fd);
684 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
685 fdchanges [fdchangecnt - 1] = w->fd;
686} 773}
687 774
688void 775void
689evtimer_start (struct ev_timer *w) 776ev_timer_start (struct ev_timer *w)
690{ 777{
691 if (ev_is_active (w)) 778 if (ev_is_active (w))
692 return; 779 return;
693 780
694 w->at += now; 781 w->at += now;
… …
700 timers [timercnt - 1] = w; 787 timers [timercnt - 1] = w;
701 upheap ((WT *)timers, timercnt - 1); 788 upheap ((WT *)timers, timercnt - 1);
702} 789}
703 790
704void 791void
705evtimer_stop (struct ev_timer *w) 792ev_timer_stop (struct ev_timer *w)
706{ 793{
707 ev_clear ((W)w); 794 ev_clear ((W)w);
708 if (!ev_is_active (w)) 795 if (!ev_is_active (w))
709 return; 796 return;
710 797
… …
718 805
719 ev_stop ((W)w); 806 ev_stop ((W)w);
720} 807}
721 808
722void 809void
723evtimer_again (struct ev_timer *w) 810ev_timer_again (struct ev_timer *w)
724{ 811{
725 if (ev_is_active (w)) 812 if (ev_is_active (w))
726 { 813 {
727 if (w->repeat) 814 if (w->repeat)
728 { 815 {
729 w->at = now + w->repeat; 816 w->at = now + w->repeat;
730 downheap ((WT *)timers, timercnt, w->active - 1); 817 downheap ((WT *)timers, timercnt, w->active - 1);
731 } 818 }
732 else 819 else
733 evtimer_stop (w); 820 ev_timer_stop (w);
734 } 821 }
735 else if (w->repeat) 822 else if (w->repeat)
736 evtimer_start (w); 823 ev_timer_start (w);
737} 824}
738 825
739void 826void
740evperiodic_start (struct ev_periodic *w) 827ev_periodic_start (struct ev_periodic *w)
741{ 828{
742 if (ev_is_active (w)) 829 if (ev_is_active (w))
743 return; 830 return;
744 831
745 assert (("periodic interval value less than zero not allowed", w->interval >= 0.)); 832 assert (("periodic interval value less than zero not allowed", w->interval >= 0.));
… …
753 periodics [periodiccnt - 1] = w; 840 periodics [periodiccnt - 1] = w;
754 upheap ((WT *)periodics, periodiccnt - 1); 841 upheap ((WT *)periodics, periodiccnt - 1);
755} 842}
756 843
757void 844void
758evperiodic_stop (struct ev_periodic *w) 845ev_periodic_stop (struct ev_periodic *w)
759{ 846{
760 ev_clear ((W)w); 847 ev_clear ((W)w);
761 if (!ev_is_active (w)) 848 if (!ev_is_active (w))
762 return; 849 return;
763 850
… …
769 856
770 ev_stop ((W)w); 857 ev_stop ((W)w);
771} 858}
772 859
773void 860void
774evsignal_start (struct ev_signal *w) 861ev_signal_start (struct ev_signal *w)
775{ 862{
776 if (ev_is_active (w)) 863 if (ev_is_active (w))
777 return; 864 return;
778 865
779 ev_start ((W)w, 1); 866 ev_start ((W)w, 1);
… …
789 sigaction (w->signum, &sa, 0); 876 sigaction (w->signum, &sa, 0);
790 } 877 }
791} 878}
792 879
793void 880void
794evsignal_stop (struct ev_signal *w) 881ev_signal_stop (struct ev_signal *w)
795{ 882{
796 ev_clear ((W)w); 883 ev_clear ((W)w);
797 if (!ev_is_active (w)) 884 if (!ev_is_active (w))
798 return; 885 return;
799 886
… …
802 889
803 if (!signals [w->signum - 1].head) 890 if (!signals [w->signum - 1].head)
804 signal (w->signum, SIG_DFL); 891 signal (w->signum, SIG_DFL);
805} 892}
806 893
894void
807void evidle_start (struct ev_idle *w) 895ev_idle_start (struct ev_idle *w)
808{ 896{
809 if (ev_is_active (w)) 897 if (ev_is_active (w))
810 return; 898 return;
811 899
812 ev_start ((W)w, ++idlecnt); 900 ev_start ((W)w, ++idlecnt);
813 array_needsize (idles, idlemax, idlecnt, ); 901 array_needsize (idles, idlemax, idlecnt, );
814 idles [idlecnt - 1] = w; 902 idles [idlecnt - 1] = w;
815} 903}
816 904
905void
817void evidle_stop (struct ev_idle *w) 906ev_idle_stop (struct ev_idle *w)
818{ 907{
819 ev_clear ((W)w); 908 ev_clear ((W)w);
820 if (ev_is_active (w)) 909 if (ev_is_active (w))
821 return; 910 return;
822 911
823 idles [w->active - 1] = idles [--idlecnt]; 912 idles [w->active - 1] = idles [--idlecnt];
824 ev_stop ((W)w); 913 ev_stop ((W)w);
825} 914}
826 915
916void
917ev_prepare_start (struct ev_prepare *w)
918{
919 if (ev_is_active (w))
920 return;
921
922 ev_start ((W)w, ++preparecnt);
923 array_needsize (prepares, preparemax, preparecnt, );
924 prepares [preparecnt - 1] = w;
925}
926
927void
928ev_prepare_stop (struct ev_prepare *w)
929{
930 ev_clear ((W)w);
931 if (ev_is_active (w))
932 return;
933
934 prepares [w->active - 1] = prepares [--preparecnt];
935 ev_stop ((W)w);
936}
937
938void
827void evcheck_start (struct ev_check *w) 939ev_check_start (struct ev_check *w)
828{ 940{
829 if (ev_is_active (w)) 941 if (ev_is_active (w))
830 return; 942 return;
831 943
832 ev_start ((W)w, ++checkcnt); 944 ev_start ((W)w, ++checkcnt);
833 array_needsize (checks, checkmax, checkcnt, ); 945 array_needsize (checks, checkmax, checkcnt, );
834 checks [checkcnt - 1] = w; 946 checks [checkcnt - 1] = w;
835} 947}
836 948
949void
837void evcheck_stop (struct ev_check *w) 950ev_check_stop (struct ev_check *w)
838{ 951{
839 ev_clear ((W)w); 952 ev_clear ((W)w);
840 if (ev_is_active (w)) 953 if (ev_is_active (w))
841 return; 954 return;
842 955
843 checks [w->active - 1] = checks [--checkcnt]; 956 checks [w->active - 1] = checks [--checkcnt];
957 ev_stop ((W)w);
958}
959
960void
961ev_child_start (struct ev_child *w)
962{
963 if (ev_is_active (w))
964 return;
965
966 ev_start ((W)w, 1);
967 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
968}
969
970void
971ev_child_stop (struct ev_child *w)
972{
973 ev_clear ((W)w);
974 if (ev_is_active (w))
975 return;
976
977 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
844 ev_stop ((W)w); 978 ev_stop ((W)w);
845} 979}
846 980
847/*****************************************************************************/ 981/*****************************************************************************/
848 982
… …
858once_cb (struct ev_once *once, int revents) 992once_cb (struct ev_once *once, int revents)
859{ 993{
860 void (*cb)(int revents, void *arg) = once->cb; 994 void (*cb)(int revents, void *arg) = once->cb;
861 void *arg = once->arg; 995 void *arg = once->arg;
862 996
863 evio_stop (&once->io); 997 ev_io_stop (&once->io);
864 evtimer_stop (&once->to); 998 ev_timer_stop (&once->to);
865 free (once); 999 free (once);
866 1000
867 cb (revents, arg); 1001 cb (revents, arg);
868} 1002}
869 1003
… …
889 else 1023 else
890 { 1024 {
891 once->cb = cb; 1025 once->cb = cb;
892 once->arg = arg; 1026 once->arg = arg;
893 1027
894 evw_init (&once->io, once_cb_io); 1028 ev_watcher_init (&once->io, once_cb_io);
895 1029
896 if (fd >= 0) 1030 if (fd >= 0)
897 { 1031 {
898 evio_set (&once->io, fd, events); 1032 ev_io_set (&once->io, fd, events);
899 evio_start (&once->io); 1033 ev_io_start (&once->io);
900 } 1034 }
901 1035
902 evw_init (&once->to, once_cb_to); 1036 ev_watcher_init (&once->to, once_cb_to);
903 1037
904 if (timeout >= 0.) 1038 if (timeout >= 0.)
905 { 1039 {
906 evtimer_set (&once->to, timeout, 0.); 1040 ev_timer_set (&once->to, timeout, 0.);
907 evtimer_start (&once->to); 1041 ev_timer_start (&once->to);
908 } 1042 }
909 } 1043 }
910} 1044}
911 1045
912/*****************************************************************************/ 1046/*****************************************************************************/
… …
923 1057
924static void 1058static void
925ocb (struct ev_timer *w, int revents) 1059ocb (struct ev_timer *w, int revents)
926{ 1060{
927 //fprintf (stderr, "timer %f,%f (%x) (%f) d%p\n", w->at, w->repeat, revents, w->at - ev_time (), w->data); 1061 //fprintf (stderr, "timer %f,%f (%x) (%f) d%p\n", w->at, w->repeat, revents, w->at - ev_time (), w->data);
928 evtimer_stop (w); 1062 ev_timer_stop (w);
929 evtimer_start (w); 1063 ev_timer_start (w);
930} 1064}
931 1065
932static void 1066static void
933scb (struct ev_signal *w, int revents) 1067scb (struct ev_signal *w, int revents)
934{ 1068{
935 fprintf (stderr, "signal %x,%d\n", revents, w->signum); 1069 fprintf (stderr, "signal %x,%d\n", revents, w->signum);
936 evio_stop (&wio); 1070 ev_io_stop (&wio);
937 evio_start (&wio); 1071 ev_io_start (&wio);
938} 1072}
939 1073
940static void 1074static void
941gcb (struct ev_signal *w, int revents) 1075gcb (struct ev_signal *w, int revents)
942{ 1076{
… …
946 1080
947int main (void) 1081int main (void)
948{ 1082{
949 ev_init (0); 1083 ev_init (0);
950 1084
951 evio_init (&wio, sin_cb, 0, EV_READ); 1085 ev_io_init (&wio, sin_cb, 0, EV_READ);
952 evio_start (&wio); 1086 ev_io_start (&wio);
953 1087
954 struct ev_timer t[10000]; 1088 struct ev_timer t[10000];
955 1089
956#if 0 1090#if 0
957 int i; 1091 int i;
958 for (i = 0; i < 10000; ++i) 1092 for (i = 0; i < 10000; ++i)
959 { 1093 {
960 struct ev_timer *w = t + i; 1094 struct ev_timer *w = t + i;
961 evw_init (w, ocb, i); 1095 ev_watcher_init (w, ocb, i);
962 evtimer_init_abs (w, ocb, drand48 (), 0.99775533); 1096 ev_timer_init_abs (w, ocb, drand48 (), 0.99775533);
963 evtimer_start (w); 1097 ev_timer_start (w);
964 if (drand48 () < 0.5) 1098 if (drand48 () < 0.5)
965 evtimer_stop (w); 1099 ev_timer_stop (w);
966 } 1100 }
967#endif 1101#endif
968 1102
969 struct ev_timer t1; 1103 struct ev_timer t1;
970 evtimer_init (&t1, ocb, 5, 10); 1104 ev_timer_init (&t1, ocb, 5, 10);
971 evtimer_start (&t1); 1105 ev_timer_start (&t1);
972 1106
973 struct ev_signal sig; 1107 struct ev_signal sig;
974 evsignal_init (&sig, scb, SIGQUIT); 1108 ev_signal_init (&sig, scb, SIGQUIT);
975 evsignal_start (&sig); 1109 ev_signal_start (&sig);
976 1110
977 struct ev_check cw; 1111 struct ev_check cw;
978 evcheck_init (&cw, gcb); 1112 ev_check_init (&cw, gcb);
979 evcheck_start (&cw); 1113 ev_check_start (&cw);
980 1114
981 struct ev_idle iw; 1115 struct ev_idle iw;
982 evidle_init (&iw, gcb); 1116 ev_idle_init (&iw, gcb);
983 evidle_start (&iw); 1117 ev_idle_start (&iw);
984 1118
985 ev_loop (0); 1119 ev_loop (0);
986 1120
987 return 0; 1121 return 0;
988} 1122}

Diff Legend

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