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

Comparing libev/ev.c (file contents):
Revision 1.21 by root, Wed Oct 31 18:37:38 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;
… …
332static struct ev_check **checks; 387static struct ev_check **checks;
333static int checkmax, checkcnt; 388static int checkmax, checkcnt;
334 389
335/*****************************************************************************/ 390/*****************************************************************************/
336 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
337#if HAVE_EPOLL 416#if HAVE_EPOLL
338# include "ev_epoll.c" 417# include "ev_epoll.c"
339#endif 418#endif
340#if HAVE_SELECT 419#if HAVE_SELECT
341# include "ev_select.c" 420# include "ev_select.c"
342#endif 421#endif
343 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
344int ev_init (int flags) 435int ev_init (int flags)
345{ 436{
437 if (!ev_method)
438 {
346#if HAVE_MONOTONIC 439#if HAVE_MONOTONIC
347 { 440 {
348 struct timespec ts; 441 struct timespec ts;
349 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 442 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
350 have_monotonic = 1; 443 have_monotonic = 1;
351 } 444 }
352#endif 445#endif
353 446
354 ev_now = ev_time (); 447 ev_now = ev_time ();
355 now = get_clock (); 448 now = get_clock ();
356 diff = ev_now - now; 449 diff = ev_now - now;
357 450
358 if (pipe (sigpipe)) 451 if (pipe (sigpipe))
359 return 0; 452 return 0;
360 453
361 ev_method = EVMETHOD_NONE; 454 ev_method = EVMETHOD_NONE;
362#if HAVE_EPOLL 455#if HAVE_EPOLL
363 if (ev_method == EVMETHOD_NONE) epoll_init (flags); 456 if (ev_method == EVMETHOD_NONE) epoll_init (flags);
364#endif 457#endif
365#if HAVE_SELECT 458#if HAVE_SELECT
366 if (ev_method == EVMETHOD_NONE) select_init (flags); 459 if (ev_method == EVMETHOD_NONE) select_init (flags);
367#endif 460#endif
368 461
369 if (ev_method) 462 if (ev_method)
370 { 463 {
371 evw_init (&sigev, sigcb); 464 ev_watcher_init (&sigev, sigcb);
372 siginit (); 465 siginit ();
466
467 ev_signal_init (&childev, childcb, SIGCHLD);
468 ev_signal_start (&childev);
469 }
373 } 470 }
374 471
375 return ev_method; 472 return ev_method;
376} 473}
377 474
378/*****************************************************************************/ 475/*****************************************************************************/
379 476
477void
380void ev_prefork (void) 478ev_prefork (void)
381{ 479{
382 /* nop */ 480 /* nop */
383} 481}
384 482
483void
385void ev_postfork_parent (void) 484ev_postfork_parent (void)
386{ 485{
387 /* nop */ 486 /* nop */
388} 487}
389 488
489void
390void ev_postfork_child (void) 490ev_postfork_child (void)
391{ 491{
392#if HAVE_EPOLL 492#if HAVE_EPOLL
393 if (ev_method == EVMETHOD_EPOLL) 493 if (ev_method == EVMETHOD_EPOLL)
394 epoll_postfork_child (); 494 epoll_postfork_child ();
395#endif 495#endif
396 496
397 evio_stop (&sigev); 497 ev_io_stop (&sigev);
398 close (sigpipe [0]); 498 close (sigpipe [0]);
399 close (sigpipe [1]); 499 close (sigpipe [1]);
400 pipe (sigpipe); 500 pipe (sigpipe);
401 siginit (); 501 siginit ();
402} 502}
403 503
404/*****************************************************************************/ 504/*****************************************************************************/
405 505
406static void 506static void
407fd_reify (void)
408{
409 int i;
410
411 for (i = 0; i < fdchangecnt; ++i)
412 {
413 int fd = fdchanges [i];
414 ANFD *anfd = anfds + fd;
415 struct ev_io *w;
416
417 int wev = 0;
418
419 for (w = anfd->head; w; w = w->next)
420 wev |= w->events;
421
422 if (anfd->wev != wev)
423 {
424 method_modify (fd, anfd->wev, wev);
425 anfd->wev = wev;
426 }
427 }
428
429 fdchangecnt = 0;
430}
431
432static void
433call_pending () 507call_pending (void)
434{ 508{
435 while (pendingcnt) 509 while (pendingcnt)
436 { 510 {
437 ANPENDING *p = pendings + --pendingcnt; 511 ANPENDING *p = pendings + --pendingcnt;
438 512
… …
443 } 517 }
444 } 518 }
445} 519}
446 520
447static void 521static void
448timers_reify () 522timers_reify (void)
449{ 523{
450 while (timercnt && timers [0]->at <= now) 524 while (timercnt && timers [0]->at <= now)
451 { 525 {
452 struct ev_timer *w = timers [0]; 526 struct ev_timer *w = timers [0];
453 527
… …
459 w->at = now + w->repeat; 533 w->at = now + w->repeat;
460 assert (("timer timeout in the past, negative repeat?", w->at > now)); 534 assert (("timer timeout in the past, negative repeat?", w->at > now));
461 downheap ((WT *)timers, timercnt, 0); 535 downheap ((WT *)timers, timercnt, 0);
462 } 536 }
463 else 537 else
464 evtimer_stop (w); /* nonrepeating: stop timer */ 538 ev_timer_stop (w); /* nonrepeating: stop timer */
465 } 539 }
466} 540}
467 541
468static void 542static void
469periodics_reify () 543periodics_reify (void)
470{ 544{
471 while (periodiccnt && periodics [0]->at <= ev_now) 545 while (periodiccnt && periodics [0]->at <= ev_now)
472 { 546 {
473 struct ev_periodic *w = periodics [0]; 547 struct ev_periodic *w = periodics [0];
474 548
… …
478 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;
479 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));
480 downheap ((WT *)periodics, periodiccnt, 0); 554 downheap ((WT *)periodics, periodiccnt, 0);
481 } 555 }
482 else 556 else
483 evperiodic_stop (w); /* nonrepeating: stop timer */ 557 ev_periodic_stop (w); /* nonrepeating: stop timer */
484 558
485 event ((W)w, EV_TIMEOUT); 559 event ((W)w, EV_TIMEOUT);
486 } 560 }
487} 561}
488 562
… …
500 { 574 {
501 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;
502 576
503 if (fabs (diff) >= 1e-4) 577 if (fabs (diff) >= 1e-4)
504 { 578 {
505 evperiodic_stop (w); 579 ev_periodic_stop (w);
506 evperiodic_start (w); 580 ev_periodic_start (w);
507 581
508 i = 0; /* restart loop, inefficient, but time jumps should be rare */ 582 i = 0; /* restart loop, inefficient, but time jumps should be rare */
509 } 583 }
510 } 584 }
511 } 585 }
512} 586}
513 587
514static void 588static void
515time_update () 589time_update (void)
516{ 590{
517 int i; 591 int i;
518 592
519 ev_now = ev_time (); 593 ev_now = ev_time ();
520 594
… …
554int ev_loop_done; 628int ev_loop_done;
555 629
556void ev_loop (int flags) 630void ev_loop (int flags)
557{ 631{
558 double block; 632 double block;
559 ev_loop_done = flags & EVLOOP_ONESHOT ? 1 : 0; 633 ev_loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
560 634
561 do 635 do
562 { 636 {
563 /* queue check watchers (and execute them) */ 637 /* queue check watchers (and execute them) */
564 if (preparecnt) 638 if (preparecnt)
… …
669} 743}
670 744
671/*****************************************************************************/ 745/*****************************************************************************/
672 746
673void 747void
674evio_start (struct ev_io *w) 748ev_io_start (struct ev_io *w)
675{ 749{
676 if (ev_is_active (w)) 750 if (ev_is_active (w))
677 return; 751 return;
678 752
679 int fd = w->fd; 753 int fd = w->fd;
680 754
681 ev_start ((W)w, 1); 755 ev_start ((W)w, 1);
682 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 756 array_needsize (anfds, anfdmax, fd + 1, anfds_init);
683 wlist_add ((WL *)&anfds[fd].head, (WL)w); 757 wlist_add ((WL *)&anfds[fd].head, (WL)w);
684 758
685 ++fdchangecnt; 759 fd_change (fd);
686 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
687 fdchanges [fdchangecnt - 1] = fd;
688} 760}
689 761
690void 762void
691evio_stop (struct ev_io *w) 763ev_io_stop (struct ev_io *w)
692{ 764{
693 ev_clear ((W)w); 765 ev_clear ((W)w);
694 if (!ev_is_active (w)) 766 if (!ev_is_active (w))
695 return; 767 return;
696 768
697 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 769 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
698 ev_stop ((W)w); 770 ev_stop ((W)w);
699 771
700 ++fdchangecnt; 772 fd_change (w->fd);
701 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
702 fdchanges [fdchangecnt - 1] = w->fd;
703} 773}
704 774
705void 775void
706evtimer_start (struct ev_timer *w) 776ev_timer_start (struct ev_timer *w)
707{ 777{
708 if (ev_is_active (w)) 778 if (ev_is_active (w))
709 return; 779 return;
710 780
711 w->at += now; 781 w->at += now;
… …
717 timers [timercnt - 1] = w; 787 timers [timercnt - 1] = w;
718 upheap ((WT *)timers, timercnt - 1); 788 upheap ((WT *)timers, timercnt - 1);
719} 789}
720 790
721void 791void
722evtimer_stop (struct ev_timer *w) 792ev_timer_stop (struct ev_timer *w)
723{ 793{
724 ev_clear ((W)w); 794 ev_clear ((W)w);
725 if (!ev_is_active (w)) 795 if (!ev_is_active (w))
726 return; 796 return;
727 797
… …
735 805
736 ev_stop ((W)w); 806 ev_stop ((W)w);
737} 807}
738 808
739void 809void
740evtimer_again (struct ev_timer *w) 810ev_timer_again (struct ev_timer *w)
741{ 811{
742 if (ev_is_active (w)) 812 if (ev_is_active (w))
743 { 813 {
744 if (w->repeat) 814 if (w->repeat)
745 { 815 {
746 w->at = now + w->repeat; 816 w->at = now + w->repeat;
747 downheap ((WT *)timers, timercnt, w->active - 1); 817 downheap ((WT *)timers, timercnt, w->active - 1);
748 } 818 }
749 else 819 else
750 evtimer_stop (w); 820 ev_timer_stop (w);
751 } 821 }
752 else if (w->repeat) 822 else if (w->repeat)
753 evtimer_start (w); 823 ev_timer_start (w);
754} 824}
755 825
756void 826void
757evperiodic_start (struct ev_periodic *w) 827ev_periodic_start (struct ev_periodic *w)
758{ 828{
759 if (ev_is_active (w)) 829 if (ev_is_active (w))
760 return; 830 return;
761 831
762 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.));
… …
770 periodics [periodiccnt - 1] = w; 840 periodics [periodiccnt - 1] = w;
771 upheap ((WT *)periodics, periodiccnt - 1); 841 upheap ((WT *)periodics, periodiccnt - 1);
772} 842}
773 843
774void 844void
775evperiodic_stop (struct ev_periodic *w) 845ev_periodic_stop (struct ev_periodic *w)
776{ 846{
777 ev_clear ((W)w); 847 ev_clear ((W)w);
778 if (!ev_is_active (w)) 848 if (!ev_is_active (w))
779 return; 849 return;
780 850
… …
786 856
787 ev_stop ((W)w); 857 ev_stop ((W)w);
788} 858}
789 859
790void 860void
791evsignal_start (struct ev_signal *w) 861ev_signal_start (struct ev_signal *w)
792{ 862{
793 if (ev_is_active (w)) 863 if (ev_is_active (w))
794 return; 864 return;
795 865
796 ev_start ((W)w, 1); 866 ev_start ((W)w, 1);
… …
806 sigaction (w->signum, &sa, 0); 876 sigaction (w->signum, &sa, 0);
807 } 877 }
808} 878}
809 879
810void 880void
811evsignal_stop (struct ev_signal *w) 881ev_signal_stop (struct ev_signal *w)
812{ 882{
813 ev_clear ((W)w); 883 ev_clear ((W)w);
814 if (!ev_is_active (w)) 884 if (!ev_is_active (w))
815 return; 885 return;
816 886
… …
819 889
820 if (!signals [w->signum - 1].head) 890 if (!signals [w->signum - 1].head)
821 signal (w->signum, SIG_DFL); 891 signal (w->signum, SIG_DFL);
822} 892}
823 893
894void
824void evidle_start (struct ev_idle *w) 895ev_idle_start (struct ev_idle *w)
825{ 896{
826 if (ev_is_active (w)) 897 if (ev_is_active (w))
827 return; 898 return;
828 899
829 ev_start ((W)w, ++idlecnt); 900 ev_start ((W)w, ++idlecnt);
830 array_needsize (idles, idlemax, idlecnt, ); 901 array_needsize (idles, idlemax, idlecnt, );
831 idles [idlecnt - 1] = w; 902 idles [idlecnt - 1] = w;
832} 903}
833 904
905void
834void evidle_stop (struct ev_idle *w) 906ev_idle_stop (struct ev_idle *w)
835{ 907{
836 ev_clear ((W)w); 908 ev_clear ((W)w);
837 if (ev_is_active (w)) 909 if (ev_is_active (w))
838 return; 910 return;
839 911
840 idles [w->active - 1] = idles [--idlecnt]; 912 idles [w->active - 1] = idles [--idlecnt];
841 ev_stop ((W)w); 913 ev_stop ((W)w);
842} 914}
843 915
916void
844void evprepare_start (struct ev_prepare *w) 917ev_prepare_start (struct ev_prepare *w)
845{ 918{
846 if (ev_is_active (w)) 919 if (ev_is_active (w))
847 return; 920 return;
848 921
849 ev_start ((W)w, ++preparecnt); 922 ev_start ((W)w, ++preparecnt);
850 array_needsize (prepares, preparemax, preparecnt, ); 923 array_needsize (prepares, preparemax, preparecnt, );
851 prepares [preparecnt - 1] = w; 924 prepares [preparecnt - 1] = w;
852} 925}
853 926
927void
854void evprepare_stop (struct ev_prepare *w) 928ev_prepare_stop (struct ev_prepare *w)
855{ 929{
856 ev_clear ((W)w); 930 ev_clear ((W)w);
857 if (ev_is_active (w)) 931 if (ev_is_active (w))
858 return; 932 return;
859 933
860 prepares [w->active - 1] = prepares [--preparecnt]; 934 prepares [w->active - 1] = prepares [--preparecnt];
861 ev_stop ((W)w); 935 ev_stop ((W)w);
862} 936}
863 937
938void
864void evcheck_start (struct ev_check *w) 939ev_check_start (struct ev_check *w)
865{ 940{
866 if (ev_is_active (w)) 941 if (ev_is_active (w))
867 return; 942 return;
868 943
869 ev_start ((W)w, ++checkcnt); 944 ev_start ((W)w, ++checkcnt);
870 array_needsize (checks, checkmax, checkcnt, ); 945 array_needsize (checks, checkmax, checkcnt, );
871 checks [checkcnt - 1] = w; 946 checks [checkcnt - 1] = w;
872} 947}
873 948
949void
874void evcheck_stop (struct ev_check *w) 950ev_check_stop (struct ev_check *w)
875{ 951{
876 ev_clear ((W)w); 952 ev_clear ((W)w);
877 if (ev_is_active (w)) 953 if (ev_is_active (w))
878 return; 954 return;
879 955
880 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);
881 ev_stop ((W)w); 978 ev_stop ((W)w);
882} 979}
883 980
884/*****************************************************************************/ 981/*****************************************************************************/
885 982
… …
895once_cb (struct ev_once *once, int revents) 992once_cb (struct ev_once *once, int revents)
896{ 993{
897 void (*cb)(int revents, void *arg) = once->cb; 994 void (*cb)(int revents, void *arg) = once->cb;
898 void *arg = once->arg; 995 void *arg = once->arg;
899 996
900 evio_stop (&once->io); 997 ev_io_stop (&once->io);
901 evtimer_stop (&once->to); 998 ev_timer_stop (&once->to);
902 free (once); 999 free (once);
903 1000
904 cb (revents, arg); 1001 cb (revents, arg);
905} 1002}
906 1003
… …
926 else 1023 else
927 { 1024 {
928 once->cb = cb; 1025 once->cb = cb;
929 once->arg = arg; 1026 once->arg = arg;
930 1027
931 evw_init (&once->io, once_cb_io); 1028 ev_watcher_init (&once->io, once_cb_io);
932 1029
933 if (fd >= 0) 1030 if (fd >= 0)
934 { 1031 {
935 evio_set (&once->io, fd, events); 1032 ev_io_set (&once->io, fd, events);
936 evio_start (&once->io); 1033 ev_io_start (&once->io);
937 } 1034 }
938 1035
939 evw_init (&once->to, once_cb_to); 1036 ev_watcher_init (&once->to, once_cb_to);
940 1037
941 if (timeout >= 0.) 1038 if (timeout >= 0.)
942 { 1039 {
943 evtimer_set (&once->to, timeout, 0.); 1040 ev_timer_set (&once->to, timeout, 0.);
944 evtimer_start (&once->to); 1041 ev_timer_start (&once->to);
945 } 1042 }
946 } 1043 }
947} 1044}
948 1045
949/*****************************************************************************/ 1046/*****************************************************************************/
… …
960 1057
961static void 1058static void
962ocb (struct ev_timer *w, int revents) 1059ocb (struct ev_timer *w, int revents)
963{ 1060{
964 //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);
965 evtimer_stop (w); 1062 ev_timer_stop (w);
966 evtimer_start (w); 1063 ev_timer_start (w);
967} 1064}
968 1065
969static void 1066static void
970scb (struct ev_signal *w, int revents) 1067scb (struct ev_signal *w, int revents)
971{ 1068{
972 fprintf (stderr, "signal %x,%d\n", revents, w->signum); 1069 fprintf (stderr, "signal %x,%d\n", revents, w->signum);
973 evio_stop (&wio); 1070 ev_io_stop (&wio);
974 evio_start (&wio); 1071 ev_io_start (&wio);
975} 1072}
976 1073
977static void 1074static void
978gcb (struct ev_signal *w, int revents) 1075gcb (struct ev_signal *w, int revents)
979{ 1076{
… …
983 1080
984int main (void) 1081int main (void)
985{ 1082{
986 ev_init (0); 1083 ev_init (0);
987 1084
988 evio_init (&wio, sin_cb, 0, EV_READ); 1085 ev_io_init (&wio, sin_cb, 0, EV_READ);
989 evio_start (&wio); 1086 ev_io_start (&wio);
990 1087
991 struct ev_timer t[10000]; 1088 struct ev_timer t[10000];
992 1089
993#if 0 1090#if 0
994 int i; 1091 int i;
995 for (i = 0; i < 10000; ++i) 1092 for (i = 0; i < 10000; ++i)
996 { 1093 {
997 struct ev_timer *w = t + i; 1094 struct ev_timer *w = t + i;
998 evw_init (w, ocb, i); 1095 ev_watcher_init (w, ocb, i);
999 evtimer_init_abs (w, ocb, drand48 (), 0.99775533); 1096 ev_timer_init_abs (w, ocb, drand48 (), 0.99775533);
1000 evtimer_start (w); 1097 ev_timer_start (w);
1001 if (drand48 () < 0.5) 1098 if (drand48 () < 0.5)
1002 evtimer_stop (w); 1099 ev_timer_stop (w);
1003 } 1100 }
1004#endif 1101#endif
1005 1102
1006 struct ev_timer t1; 1103 struct ev_timer t1;
1007 evtimer_init (&t1, ocb, 5, 10); 1104 ev_timer_init (&t1, ocb, 5, 10);
1008 evtimer_start (&t1); 1105 ev_timer_start (&t1);
1009 1106
1010 struct ev_signal sig; 1107 struct ev_signal sig;
1011 evsignal_init (&sig, scb, SIGQUIT); 1108 ev_signal_init (&sig, scb, SIGQUIT);
1012 evsignal_start (&sig); 1109 ev_signal_start (&sig);
1013 1110
1014 struct ev_check cw; 1111 struct ev_check cw;
1015 evcheck_init (&cw, gcb); 1112 ev_check_init (&cw, gcb);
1016 evcheck_start (&cw); 1113 ev_check_start (&cw);
1017 1114
1018 struct ev_idle iw; 1115 struct ev_idle iw;
1019 evidle_init (&iw, gcb); 1116 ev_idle_init (&iw, gcb);
1020 evidle_start (&iw); 1117 ev_idle_start (&iw);
1021 1118
1022 ev_loop (0); 1119 ev_loop (0);
1023 1120
1024 return 0; 1121 return 0;
1025} 1122}

Diff Legend

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