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

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

Diff Legend

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