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

Comparing libev/ev.c (file contents):
Revision 1.11 by root, Wed Oct 31 07:40:49 2007 UTC vs.
Revision 1.22 by root, Wed Oct 31 19:07:43 2007 UTC

1/*
2 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are
7 * met:
8 *
9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer.
11 *
12 * * Redistributions in binary form must reproduce the above
13 * copyright notice, this list of conditions and the following
14 * disclaimer in the documentation and/or other materials provided
15 * with the distribution.
16 *
17 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
18 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
19 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
20 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
21 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
22 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
23 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
24 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
25 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26 * (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.
28 */
29
1#include <math.h> 30#include <math.h>
2#include <stdlib.h> 31#include <stdlib.h>
3#include <unistd.h> 32#include <unistd.h>
4#include <fcntl.h> 33#include <fcntl.h>
5#include <signal.h> 34#include <signal.h>
35#include <stddef.h>
6 36
7#include <stdio.h> 37#include <stdio.h>
8 38
9#include <assert.h> 39#include <assert.h>
10#include <errno.h> 40#include <errno.h>
41#include <sys/types.h>
42#include <sys/wait.h>
11#include <sys/time.h> 43#include <sys/time.h>
12#include <time.h> 44#include <time.h>
13 45
14#ifndef HAVE_MONOTONIC 46#ifndef HAVE_MONOTONIC
15# ifdef CLOCK_MONOTONIC 47# ifdef CLOCK_MONOTONIC
… …
29# define HAVE_REALTIME 1 /* posix requirement, but might be slower */ 61# define HAVE_REALTIME 1 /* posix requirement, but might be slower */
30#endif 62#endif
31 63
32#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) */
33#define MAX_BLOCKTIME 60. 65#define MAX_BLOCKTIME 60.
66#define PID_HASHSIZE 16 /* size of pid hahs table, must be power of two */
34 67
35#include "ev.h" 68#include "ev.h"
36
37struct ev_watcher {
38 EV_WATCHER (ev_watcher);
39};
40
41struct ev_watcher_list {
42 EV_WATCHER_LIST (ev_watcher_list);
43};
44 69
45typedef struct ev_watcher *W; 70typedef struct ev_watcher *W;
46typedef struct ev_watcher_list *WL; 71typedef struct ev_watcher_list *WL;
72typedef struct ev_watcher_time *WT;
47 73
48static ev_tstamp now, diff; /* monotonic clock */ 74static ev_tstamp now, diff; /* monotonic clock */
49ev_tstamp ev_now; 75ev_tstamp ev_now;
50int ev_method; 76int ev_method;
51 77
… …
88 114
89#define array_needsize(base,cur,cnt,init) \ 115#define array_needsize(base,cur,cnt,init) \
90 if ((cnt) > cur) \ 116 if ((cnt) > cur) \
91 { \ 117 { \
92 int newcnt = cur ? cur << 1 : 16; \ 118 int newcnt = cur ? cur << 1 : 16; \
93 fprintf (stderr, "resize(" # base ") from %d to %d\n", cur, newcnt);\
94 base = realloc (base, sizeof (*base) * (newcnt)); \ 119 base = realloc (base, sizeof (*base) * (newcnt)); \
95 init (base + cur, newcnt - cur); \ 120 init (base + cur, newcnt - cur); \
96 cur = newcnt; \ 121 cur = newcnt; \
97 } 122 }
98 123
… …
131static int pendingmax, pendingcnt; 156static int pendingmax, pendingcnt;
132 157
133static void 158static void
134event (W w, int events) 159event (W w, int events)
135{ 160{
161 if (w->active)
162 {
136 w->pending = ++pendingcnt; 163 w->pending = ++pendingcnt;
137 array_needsize (pendings, pendingmax, pendingcnt, ); 164 array_needsize (pendings, pendingmax, pendingcnt, );
138 pendings [pendingcnt - 1].w = w; 165 pendings [pendingcnt - 1].w = w;
139 pendings [pendingcnt - 1].events = events; 166 pendings [pendingcnt - 1].events = events;
167 }
140} 168}
141 169
142static void 170static void
143fd_event (int fd, int events) 171fd_event (int fd, int events)
144{ 172{
… …
161 189
162 for (i = 0; i < eventcnt; ++i) 190 for (i = 0; i < eventcnt; ++i)
163 event (events [i], type); 191 event (events [i], type);
164} 192}
165 193
166/*****************************************************************************/ 194/* called on EBADF to verify fds */
195static void
196fd_recheck ()
197{
198 int fd;
167 199
200 for (fd = 0; fd < anfdmax; ++fd)
201 if (anfds [fd].wev)
202 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF)
203 while (anfds [fd].head)
204 evio_stop (anfds [fd].head);
205}
206
207/*****************************************************************************/
208
168static struct ev_timer **atimers; 209static struct ev_timer **timers;
169static int atimermax, atimercnt; 210static int timermax, timercnt;
170 211
171static struct ev_timer **rtimers; 212static struct ev_periodic **periodics;
172static int rtimermax, rtimercnt; 213static int periodicmax, periodiccnt;
173 214
174static void 215static void
175upheap (struct ev_timer **timers, int k) 216upheap (WT *timers, int k)
176{ 217{
177 struct ev_timer *w = timers [k]; 218 WT w = timers [k];
178 219
179 while (k && timers [k >> 1]->at > w->at) 220 while (k && timers [k >> 1]->at > w->at)
180 { 221 {
181 timers [k] = timers [k >> 1]; 222 timers [k] = timers [k >> 1];
182 timers [k]->active = k + 1; 223 timers [k]->active = k + 1;
… …
187 timers [k]->active = k + 1; 228 timers [k]->active = k + 1;
188 229
189} 230}
190 231
191static void 232static void
192downheap (struct ev_timer **timers, int N, int k) 233downheap (WT *timers, int N, int k)
193{ 234{
194 struct ev_timer *w = timers [k]; 235 WT w = timers [k];
195 236
196 while (k < (N >> 1)) 237 while (k < (N >> 1))
197 { 238 {
198 int j = k << 1; 239 int j = k << 1;
199 240
… …
286/*****************************************************************************/ 327/*****************************************************************************/
287 328
288static struct ev_idle **idles; 329static struct ev_idle **idles;
289static int idlemax, idlecnt; 330static int idlemax, idlecnt;
290 331
332static struct ev_prepare **prepares;
333static int preparemax, preparecnt;
334
291static struct ev_check **checks; 335static struct ev_check **checks;
292static int checkmax, checkcnt; 336static int checkmax, checkcnt;
337
338/*****************************************************************************/
339
340static struct ev_child *childs [PID_HASHSIZE];
341static struct ev_signal childev;
342
343#ifndef WCONTINUED
344# define WCONTINUED 0
345#endif
346
347static void
348childcb (struct ev_signal *sw, int revents)
349{
350 struct ev_child *w;
351 int pid, status;
352
353 while ((pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)) != -1)
354 for (w = childs [pid & (PID_HASHSIZE - 1)]; w; w = w->next)
355 if (w->pid == pid || w->pid == -1)
356 {
357 w->status = status;
358 event ((W)w, EV_CHILD);
359 }
360}
293 361
294/*****************************************************************************/ 362/*****************************************************************************/
295 363
296#if HAVE_EPOLL 364#if HAVE_EPOLL
297# include "ev_epoll.c" 365# include "ev_epoll.c"
… …
325 if (ev_method == EVMETHOD_NONE) select_init (flags); 393 if (ev_method == EVMETHOD_NONE) select_init (flags);
326#endif 394#endif
327 395
328 if (ev_method) 396 if (ev_method)
329 { 397 {
330 evw_init (&sigev, sigcb, 0); 398 evw_init (&sigev, sigcb);
331 siginit (); 399 siginit ();
400
401 evsignal_init (&childev, childcb, SIGCHLD);
402 evsignal_start (&childev);
332 } 403 }
333 404
334 return ev_method; 405 return ev_method;
335} 406}
336 407
… …
389} 460}
390 461
391static void 462static void
392call_pending () 463call_pending ()
393{ 464{
394 int i; 465 while (pendingcnt)
395
396 for (i = 0; i < pendingcnt; ++i)
397 { 466 {
398 ANPENDING *p = pendings + i; 467 ANPENDING *p = pendings + --pendingcnt;
399 468
400 if (p->w) 469 if (p->w)
401 { 470 {
402 p->w->pending = 0; 471 p->w->pending = 0;
403 p->w->cb (p->w, p->events); 472 p->w->cb (p->w, p->events);
404 } 473 }
405 } 474 }
406
407 pendingcnt = 0;
408} 475}
409 476
410static void 477static void
411timers_reify (struct ev_timer **timers, int timercnt, ev_tstamp now) 478timers_reify ()
412{ 479{
413 while (timercnt && timers [0]->at <= now) 480 while (timercnt && timers [0]->at <= now)
414 { 481 {
415 struct ev_timer *w = timers [0]; 482 struct ev_timer *w = timers [0];
483
484 event ((W)w, EV_TIMEOUT);
416 485
417 /* first reschedule or stop timer */ 486 /* first reschedule or stop timer */
418 if (w->repeat) 487 if (w->repeat)
419 { 488 {
420 if (w->is_abs)
421 w->at += floor ((now - w->at) / w->repeat + 1.) * w->repeat;
422 else
423 w->at = now + w->repeat; 489 w->at = now + w->repeat;
424 490 assert (("timer timeout in the past, negative repeat?", w->at > now));
425 assert (w->at > now);
426
427 downheap (timers, timercnt, 0); 491 downheap ((WT *)timers, timercnt, 0);
428 } 492 }
429 else 493 else
430 {
431 evtimer_stop (w); /* nonrepeating: stop timer */ 494 evtimer_stop (w); /* nonrepeating: stop timer */
432 --timercnt; /* maybe pass by reference instead? */ 495 }
496}
497
498static void
499periodics_reify ()
500{
501 while (periodiccnt && periodics [0]->at <= ev_now)
502 {
503 struct ev_periodic *w = periodics [0];
504
505 /* first reschedule or stop timer */
506 if (w->interval)
433 } 507 {
508 w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval;
509 assert (("periodic timeout in the past, negative interval?", w->at > ev_now));
510 downheap ((WT *)periodics, periodiccnt, 0);
511 }
512 else
513 evperiodic_stop (w); /* nonrepeating: stop timer */
434 514
435 event ((W)w, EV_TIMEOUT); 515 event ((W)w, EV_TIMEOUT);
436 } 516 }
437} 517}
438 518
439static void 519static void
520periodics_reschedule (ev_tstamp diff)
521{
522 int i;
523
524 /* adjust periodics after time jump */
525 for (i = 0; i < periodiccnt; ++i)
526 {
527 struct ev_periodic *w = periodics [i];
528
529 if (w->interval)
530 {
531 ev_tstamp diff = ceil ((ev_now - w->at) / w->interval) * w->interval;
532
533 if (fabs (diff) >= 1e-4)
534 {
535 evperiodic_stop (w);
536 evperiodic_start (w);
537
538 i = 0; /* restart loop, inefficient, but time jumps should be rare */
539 }
540 }
541 }
542}
543
544static void
440time_update () 545time_update ()
441{ 546{
442 int i; 547 int i;
548
443 ev_now = ev_time (); 549 ev_now = ev_time ();
444 550
445 if (have_monotonic) 551 if (have_monotonic)
446 { 552 {
447 ev_tstamp odiff = diff; 553 ev_tstamp odiff = diff;
448 554
449 /* detecting time jumps is much more difficult */
450 for (i = 2; --i; ) /* loop a few times, before making important decisions */ 555 for (i = 4; --i; ) /* loop a few times, before making important decisions */
451 { 556 {
452 now = get_clock (); 557 now = get_clock ();
453 diff = ev_now - now; 558 diff = ev_now - now;
454 559
455 if (fabs (odiff - diff) < MIN_TIMEJUMP) 560 if (fabs (odiff - diff) < MIN_TIMEJUMP)
456 return; /* all is well */ 561 return; /* all is well */
457 562
458 ev_now = ev_time (); 563 ev_now = ev_time ();
459 } 564 }
460 565
461 /* time jump detected, reschedule atimers */ 566 periodics_reschedule (diff - odiff);
462 for (i = 0; i < atimercnt; ++i) 567 /* no timer adjustment, as the monotonic clock doesn't jump */
463 {
464 struct ev_timer *w = atimers [i];
465 w->at += ceil ((ev_now - w->at) / w->repeat + 1.) * w->repeat;
466 }
467 } 568 }
468 else 569 else
469 { 570 {
470 if (now > ev_now || now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP) 571 if (now > ev_now || now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP)
471 /* time jump detected, adjust rtimers */ 572 {
573 periodics_reschedule (ev_now - now);
574
575 /* adjust timers. this is easy, as the offset is the same for all */
472 for (i = 0; i < rtimercnt; ++i) 576 for (i = 0; i < timercnt; ++i)
473 rtimers [i]->at += ev_now - now; 577 timers [i]->at += diff;
578 }
474 579
475 now = ev_now; 580 now = ev_now;
476 } 581 }
477} 582}
478 583
479int ev_loop_done; 584int ev_loop_done;
480 585
481void ev_loop (int flags) 586void ev_loop (int flags)
482{ 587{
483 double block; 588 double block;
484 ev_loop_done = flags & EVLOOP_ONESHOT; 589 ev_loop_done = flags & EVLOOP_ONESHOT ? 1 : 0;
485
486 if (checkcnt)
487 {
488 queue_events ((W *)checks, checkcnt, EV_CHECK);
489 call_pending ();
490 }
491 590
492 do 591 do
493 { 592 {
593 /* queue check watchers (and execute them) */
594 if (preparecnt)
595 {
596 queue_events ((W *)prepares, preparecnt, EV_PREPARE);
597 call_pending ();
598 }
599
494 /* update fd-related kernel structures */ 600 /* update fd-related kernel structures */
495 fd_reify (); 601 fd_reify ();
496 602
497 /* calculate blocking time */ 603 /* calculate blocking time */
604
605 /* we only need this for !monotonic clockor timers, but as we basically
606 always have timers, we just calculate it always */
607 ev_now = ev_time ();
608
498 if (flags & EVLOOP_NONBLOCK || idlecnt) 609 if (flags & EVLOOP_NONBLOCK || idlecnt)
499 block = 0.; 610 block = 0.;
500 else 611 else
501 { 612 {
502 block = MAX_BLOCKTIME; 613 block = MAX_BLOCKTIME;
503 614
504 if (rtimercnt) 615 if (timercnt)
505 { 616 {
506 ev_tstamp to = rtimers [0]->at - get_clock () + method_fudge; 617 ev_tstamp to = timers [0]->at - (have_monotonic ? get_clock () : ev_now) + method_fudge;
507 if (block > to) block = to; 618 if (block > to) block = to;
508 } 619 }
509 620
510 if (atimercnt) 621 if (periodiccnt)
511 { 622 {
512 ev_tstamp to = atimers [0]->at - ev_time () + method_fudge; 623 ev_tstamp to = periodics [0]->at - ev_now + method_fudge;
513 if (block > to) block = to; 624 if (block > to) block = to;
514 } 625 }
515 626
516 if (block < 0.) block = 0.; 627 if (block < 0.) block = 0.;
517 } 628 }
… …
520 631
521 /* update ev_now, do magic */ 632 /* update ev_now, do magic */
522 time_update (); 633 time_update ();
523 634
524 /* queue pending timers and reschedule them */ 635 /* queue pending timers and reschedule them */
525 /* absolute timers first */ 636 timers_reify (); /* relative timers called last */
526 timers_reify (atimers, atimercnt, ev_now); 637 periodics_reify (); /* absolute timers called first */
527 /* relative timers second */
528 timers_reify (rtimers, rtimercnt, now);
529 638
530 /* queue idle watchers unless io or timers are pending */ 639 /* queue idle watchers unless io or timers are pending */
531 if (!pendingcnt) 640 if (!pendingcnt)
532 queue_events ((W *)idles, idlecnt, EV_IDLE); 641 queue_events ((W *)idles, idlecnt, EV_IDLE);
533 642
534 /* queue check and possibly idle watchers */ 643 /* queue check watchers, to be executed first */
644 if (checkcnt)
535 queue_events ((W *)checks, checkcnt, EV_CHECK); 645 queue_events ((W *)checks, checkcnt, EV_CHECK);
536 646
537 call_pending (); 647 call_pending ();
538 } 648 }
539 while (!ev_loop_done); 649 while (!ev_loop_done);
650
651 if (ev_loop_done != 2)
652 ev_loop_done = 0;
540} 653}
541 654
542/*****************************************************************************/ 655/*****************************************************************************/
543 656
544static void 657static void
… …
562 head = &(*head)->next; 675 head = &(*head)->next;
563 } 676 }
564} 677}
565 678
566static void 679static void
680ev_clear (W w)
681{
682 if (w->pending)
683 {
684 pendings [w->pending - 1].w = 0;
685 w->pending = 0;
686 }
687}
688
689static void
567ev_start (W w, int active) 690ev_start (W w, int active)
568{ 691{
569 w->pending = 0;
570 w->active = active; 692 w->active = active;
571} 693}
572 694
573static void 695static void
574ev_stop (W w) 696ev_stop (W w)
575{ 697{
576 if (w->pending)
577 pendings [w->pending - 1].w = 0;
578
579 w->active = 0; 698 w->active = 0;
580} 699}
581 700
582/*****************************************************************************/ 701/*****************************************************************************/
583 702
… …
599} 718}
600 719
601void 720void
602evio_stop (struct ev_io *w) 721evio_stop (struct ev_io *w)
603{ 722{
723 ev_clear ((W)w);
604 if (!ev_is_active (w)) 724 if (!ev_is_active (w))
605 return; 725 return;
606 726
607 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 727 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
608 ev_stop ((W)w); 728 ev_stop ((W)w);
… …
616evtimer_start (struct ev_timer *w) 736evtimer_start (struct ev_timer *w)
617{ 737{
618 if (ev_is_active (w)) 738 if (ev_is_active (w))
619 return; 739 return;
620 740
621 if (w->is_abs) 741 w->at += now;
622 {
623 /* this formula differs from the one in timer_reify becuse we do not round up */
624 if (w->repeat)
625 w->at += ceil ((ev_now - w->at) / w->repeat) * w->repeat;
626 742
743 assert (("timer repeat value less than zero not allowed", w->repeat >= 0.));
744
627 ev_start ((W)w, ++atimercnt); 745 ev_start ((W)w, ++timercnt);
628 array_needsize (atimers, atimermax, atimercnt, ); 746 array_needsize (timers, timermax, timercnt, );
629 atimers [atimercnt - 1] = w; 747 timers [timercnt - 1] = w;
630 upheap (atimers, atimercnt - 1); 748 upheap ((WT *)timers, timercnt - 1);
631 }
632 else
633 {
634 w->at += now;
635
636 ev_start ((W)w, ++rtimercnt);
637 array_needsize (rtimers, rtimermax, rtimercnt, );
638 rtimers [rtimercnt - 1] = w;
639 upheap (rtimers, rtimercnt - 1);
640 }
641
642} 749}
643 750
644void 751void
645evtimer_stop (struct ev_timer *w) 752evtimer_stop (struct ev_timer *w)
646{ 753{
754 ev_clear ((W)w);
647 if (!ev_is_active (w)) 755 if (!ev_is_active (w))
648 return; 756 return;
649 757
650 if (w->is_abs)
651 {
652 if (w->active < atimercnt--) 758 if (w->active < timercnt--)
653 { 759 {
654 atimers [w->active - 1] = atimers [atimercnt]; 760 timers [w->active - 1] = timers [timercnt];
761 downheap ((WT *)timers, timercnt, w->active - 1);
762 }
763
764 w->at = w->repeat;
765
766 ev_stop ((W)w);
767}
768
769void
770evtimer_again (struct ev_timer *w)
771{
772 if (ev_is_active (w))
773 {
774 if (w->repeat)
775 {
776 w->at = now + w->repeat;
655 downheap (atimers, atimercnt, w->active - 1); 777 downheap ((WT *)timers, timercnt, w->active - 1);
656 }
657 }
658 else
659 {
660 if (w->active < rtimercnt--)
661 { 778 }
662 rtimers [w->active - 1] = rtimers [rtimercnt]; 779 else
663 downheap (rtimers, rtimercnt, w->active - 1); 780 evtimer_stop (w);
664 } 781 }
782 else if (w->repeat)
783 evtimer_start (w);
784}
785
786void
787evperiodic_start (struct ev_periodic *w)
788{
789 if (ev_is_active (w))
790 return;
791
792 assert (("periodic interval value less than zero not allowed", w->interval >= 0.));
793
794 /* this formula differs from the one in periodic_reify because we do not always round up */
795 if (w->interval)
796 w->at += ceil ((ev_now - w->at) / w->interval) * w->interval;
797
798 ev_start ((W)w, ++periodiccnt);
799 array_needsize (periodics, periodicmax, periodiccnt, );
800 periodics [periodiccnt - 1] = w;
801 upheap ((WT *)periodics, periodiccnt - 1);
802}
803
804void
805evperiodic_stop (struct ev_periodic *w)
806{
807 ev_clear ((W)w);
808 if (!ev_is_active (w))
809 return;
810
811 if (w->active < periodiccnt--)
812 {
813 periodics [w->active - 1] = periodics [periodiccnt];
814 downheap ((WT *)periodics, periodiccnt, w->active - 1);
665 } 815 }
666 816
667 ev_stop ((W)w); 817 ev_stop ((W)w);
668} 818}
669 819
… …
688} 838}
689 839
690void 840void
691evsignal_stop (struct ev_signal *w) 841evsignal_stop (struct ev_signal *w)
692{ 842{
843 ev_clear ((W)w);
693 if (!ev_is_active (w)) 844 if (!ev_is_active (w))
694 return; 845 return;
695 846
696 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 847 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
697 ev_stop ((W)w); 848 ev_stop ((W)w);
… …
710 idles [idlecnt - 1] = w; 861 idles [idlecnt - 1] = w;
711} 862}
712 863
713void evidle_stop (struct ev_idle *w) 864void evidle_stop (struct ev_idle *w)
714{ 865{
866 ev_clear ((W)w);
867 if (ev_is_active (w))
868 return;
869
715 idles [w->active - 1] = idles [--idlecnt]; 870 idles [w->active - 1] = idles [--idlecnt];
871 ev_stop ((W)w);
872}
873
874void evprepare_start (struct ev_prepare *w)
875{
876 if (ev_is_active (w))
877 return;
878
879 ev_start ((W)w, ++preparecnt);
880 array_needsize (prepares, preparemax, preparecnt, );
881 prepares [preparecnt - 1] = w;
882}
883
884void evprepare_stop (struct ev_prepare *w)
885{
886 ev_clear ((W)w);
887 if (ev_is_active (w))
888 return;
889
890 prepares [w->active - 1] = prepares [--preparecnt];
716 ev_stop ((W)w); 891 ev_stop ((W)w);
717} 892}
718 893
719void evcheck_start (struct ev_check *w) 894void evcheck_start (struct ev_check *w)
720{ 895{
… …
726 checks [checkcnt - 1] = w; 901 checks [checkcnt - 1] = w;
727} 902}
728 903
729void evcheck_stop (struct ev_check *w) 904void evcheck_stop (struct ev_check *w)
730{ 905{
906 ev_clear ((W)w);
907 if (ev_is_active (w))
908 return;
909
731 checks [w->active - 1] = checks [--checkcnt]; 910 checks [w->active - 1] = checks [--checkcnt];
732 ev_stop ((W)w); 911 ev_stop ((W)w);
733} 912}
734 913
914void evchild_start (struct ev_child *w)
915{
916 if (ev_is_active (w))
917 return;
918
919 ev_start ((W)w, 1);
920 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
921}
922
923void evchild_stop (struct ev_child *w)
924{
925 ev_clear ((W)w);
926 if (ev_is_active (w))
927 return;
928
929 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
930 ev_stop ((W)w);
931}
932
933/*****************************************************************************/
934
935struct ev_once
936{
937 struct ev_io io;
938 struct ev_timer to;
939 void (*cb)(int revents, void *arg);
940 void *arg;
941};
942
943static void
944once_cb (struct ev_once *once, int revents)
945{
946 void (*cb)(int revents, void *arg) = once->cb;
947 void *arg = once->arg;
948
949 evio_stop (&once->io);
950 evtimer_stop (&once->to);
951 free (once);
952
953 cb (revents, arg);
954}
955
956static void
957once_cb_io (struct ev_io *w, int revents)
958{
959 once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents);
960}
961
962static void
963once_cb_to (struct ev_timer *w, int revents)
964{
965 once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents);
966}
967
968void
969ev_once (int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
970{
971 struct ev_once *once = malloc (sizeof (struct ev_once));
972
973 if (!once)
974 cb (EV_ERROR, arg);
975 else
976 {
977 once->cb = cb;
978 once->arg = arg;
979
980 evw_init (&once->io, once_cb_io);
981
982 if (fd >= 0)
983 {
984 evio_set (&once->io, fd, events);
985 evio_start (&once->io);
986 }
987
988 evw_init (&once->to, once_cb_to);
989
990 if (timeout >= 0.)
991 {
992 evtimer_set (&once->to, timeout, 0.);
993 evtimer_start (&once->to);
994 }
995 }
996}
997
735/*****************************************************************************/ 998/*****************************************************************************/
736 999
737#if 0 1000#if 0
1001
1002struct ev_io wio;
738 1003
739static void 1004static void
740sin_cb (struct ev_io *w, int revents) 1005sin_cb (struct ev_io *w, int revents)
741{ 1006{
742 fprintf (stderr, "sin %d, revents %d\n", w->fd, revents); 1007 fprintf (stderr, "sin %d, revents %d\n", w->fd, revents);
… …
752 1017
753static void 1018static void
754scb (struct ev_signal *w, int revents) 1019scb (struct ev_signal *w, int revents)
755{ 1020{
756 fprintf (stderr, "signal %x,%d\n", revents, w->signum); 1021 fprintf (stderr, "signal %x,%d\n", revents, w->signum);
1022 evio_stop (&wio);
1023 evio_start (&wio);
757} 1024}
758 1025
759static void 1026static void
760gcb (struct ev_signal *w, int revents) 1027gcb (struct ev_signal *w, int revents)
761{ 1028{
762 fprintf (stderr, "generic %x\n", revents); 1029 fprintf (stderr, "generic %x\n", revents);
1030
763} 1031}
764 1032
765int main (void) 1033int main (void)
766{ 1034{
767 struct ev_io sin;
768
769 ev_init (0); 1035 ev_init (0);
770 1036
771 evw_init (&sin, sin_cb, 55);
772 evio_set (&sin, 0, EV_READ); 1037 evio_init (&wio, sin_cb, 0, EV_READ);
773 evio_start (&sin); 1038 evio_start (&wio);
774 1039
775 struct ev_timer t[10000]; 1040 struct ev_timer t[10000];
776 1041
777#if 0 1042#if 0
778 int i; 1043 int i;
779 for (i = 0; i < 10000; ++i) 1044 for (i = 0; i < 10000; ++i)
780 { 1045 {
781 struct ev_timer *w = t + i; 1046 struct ev_timer *w = t + i;
782 evw_init (w, ocb, i); 1047 evw_init (w, ocb, i);
783 evtimer_set_abs (w, drand48 (), 0.99775533); 1048 evtimer_init_abs (w, ocb, drand48 (), 0.99775533);
784 evtimer_start (w); 1049 evtimer_start (w);
785 if (drand48 () < 0.5) 1050 if (drand48 () < 0.5)
786 evtimer_stop (w); 1051 evtimer_stop (w);
787 } 1052 }
788#endif 1053#endif
789 1054
790 struct ev_timer t1; 1055 struct ev_timer t1;
791 evw_init (&t1, ocb, 0); 1056 evtimer_init (&t1, ocb, 5, 10);
792 evtimer_set_abs (&t1, 5, 10);
793 evtimer_start (&t1); 1057 evtimer_start (&t1);
794 1058
795 struct ev_signal sig; 1059 struct ev_signal sig;
796 evw_init (&sig, scb, 65535);
797 evsignal_set (&sig, SIGQUIT); 1060 evsignal_init (&sig, scb, SIGQUIT);
798 evsignal_start (&sig); 1061 evsignal_start (&sig);
799 1062
800 struct ev_check cw; 1063 struct ev_check cw;
801 evw_init (&cw, gcb, 0); 1064 evcheck_init (&cw, gcb);
802 evcheck_start (&cw); 1065 evcheck_start (&cw);
803 1066
804 struct ev_idle iw; 1067 struct ev_idle iw;
805 evw_init (&iw, gcb, 0); 1068 evidle_init (&iw, gcb);
806 evidle_start (&iw); 1069 evidle_start (&iw);
807 1070
808 ev_loop (0); 1071 ev_loop (0);
809 1072
810 return 0; 1073 return 0;

Diff Legend

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