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

Comparing libev/ev.c (file contents):
Revision 1.104 by root, Mon Nov 12 00:39:45 2007 UTC vs.
Revision 1.124 by root, Sat Nov 17 02:26:24 2007 UTC

… …
59 59
60# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE) 60# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE)
61# define EV_USE_KQUEUE 1 61# define EV_USE_KQUEUE 1
62# endif 62# endif
63 63
64# if HAVE_PORT_H && HAVE_PORT_CREATE && !defined (EV_USE_PORT)
65# define EV_USE_PORT 1
66# endif
67
64#endif 68#endif
65 69
66#include <math.h> 70#include <math.h>
67#include <stdlib.h> 71#include <stdlib.h>
68#include <fcntl.h> 72#include <fcntl.h>
… …
90#endif 94#endif
91 95
92/**/ 96/**/
93 97
94#ifndef EV_USE_MONOTONIC 98#ifndef EV_USE_MONOTONIC
95# define EV_USE_MONOTONIC 1 99# define EV_USE_MONOTONIC 0
100#endif
101
102#ifndef EV_USE_REALTIME
103# define EV_USE_REALTIME 0
96#endif 104#endif
97 105
98#ifndef EV_USE_SELECT 106#ifndef EV_USE_SELECT
99# define EV_USE_SELECT 1 107# define EV_USE_SELECT 1
100# define EV_SELECT_USE_FD_SET 1
101#endif 108#endif
102 109
103#ifndef EV_USE_POLL 110#ifndef EV_USE_POLL
104# ifdef _WIN32 111# ifdef _WIN32
105# define EV_USE_POLL 0 112# define EV_USE_POLL 0
… …
114 121
115#ifndef EV_USE_KQUEUE 122#ifndef EV_USE_KQUEUE
116# define EV_USE_KQUEUE 0 123# define EV_USE_KQUEUE 0
117#endif 124#endif
118 125
119#ifndef EV_USE_REALTIME 126#ifndef EV_USE_PORT
120# define EV_USE_REALTIME 1 127# define EV_USE_PORT 0
121#endif 128#endif
122 129
123/**/ 130/**/
131
132/* darwin simply cannot be helped */
133#ifdef __APPLE__
134# undef EV_USE_POLL
135# undef EV_USE_KQUEUE
136#endif
124 137
125#ifndef CLOCK_MONOTONIC 138#ifndef CLOCK_MONOTONIC
126# undef EV_USE_MONOTONIC 139# undef EV_USE_MONOTONIC
127# define EV_USE_MONOTONIC 0 140# define EV_USE_MONOTONIC 0
128#endif 141#endif
… …
137#endif 150#endif
138 151
139/**/ 152/**/
140 153
141#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 154#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
142#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */ 155#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
143#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */ 156#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
144/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */ 157/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
145 158
146#ifdef EV_H 159#ifdef EV_H
147# include EV_H 160# include EV_H
148#else 161#else
149# include "ev.h" 162# include "ev.h"
150#endif 163#endif
151 164
152#if __GNUC__ >= 3 165#if __GNUC__ >= 3
153# define expect(expr,value) __builtin_expect ((expr),(value)) 166# define expect(expr,value) __builtin_expect ((expr),(value))
154# define inline inline 167# define inline static inline
155#else 168#else
156# define expect(expr,value) (expr) 169# define expect(expr,value) (expr)
157# define inline static 170# define inline static
158#endif 171#endif
159 172
… …
161#define expect_true(expr) expect ((expr) != 0, 1) 174#define expect_true(expr) expect ((expr) != 0, 1)
162 175
163#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 176#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
164#define ABSPRI(w) ((w)->priority - EV_MINPRI) 177#define ABSPRI(w) ((w)->priority - EV_MINPRI)
165 178
166#define EMPTY /* required for microsofts broken pseudo-c compiler */ 179#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
180#define EMPTY2(a,b) /* used to suppress some warnings */
167 181
168typedef struct ev_watcher *W; 182typedef struct ev_watcher *W;
169typedef struct ev_watcher_list *WL; 183typedef struct ev_watcher_list *WL;
170typedef struct ev_watcher_time *WT; 184typedef struct ev_watcher_time *WT;
171 185
… …
251 #include "ev_vars.h" 265 #include "ev_vars.h"
252 #undef VAR 266 #undef VAR
253 }; 267 };
254 #include "ev_wrap.h" 268 #include "ev_wrap.h"
255 269
256 struct ev_loop default_loop_struct; 270 static struct ev_loop default_loop_struct;
257 static struct ev_loop *default_loop; 271 struct ev_loop *ev_default_loop_ptr;
258 272
259#else 273#else
260 274
261 ev_tstamp ev_rt_now; 275 ev_tstamp ev_rt_now;
262 #define VAR(name,decl) static decl; 276 #define VAR(name,decl) static decl;
263 #include "ev_vars.h" 277 #include "ev_vars.h"
264 #undef VAR 278 #undef VAR
265 279
266 static int default_loop; 280 static int ev_default_loop_ptr;
267 281
268#endif 282#endif
269 283
270/*****************************************************************************/ 284/*****************************************************************************/
271 285
… …
304{ 318{
305 return ev_rt_now; 319 return ev_rt_now;
306} 320}
307#endif 321#endif
308 322
309#define array_roundsize(type,n) ((n) | 4 & ~3) 323#define array_roundsize(type,n) (((n) | 4) & ~3)
310 324
311#define array_needsize(type,base,cur,cnt,init) \ 325#define array_needsize(type,base,cur,cnt,init) \
312 if (expect_false ((cnt) > cur)) \ 326 if (expect_false ((cnt) > cur)) \
313 { \ 327 { \
314 int newcnt = cur; \ 328 int newcnt = cur; \
… …
352void 366void
353ev_feed_event (EV_P_ void *w, int revents) 367ev_feed_event (EV_P_ void *w, int revents)
354{ 368{
355 W w_ = (W)w; 369 W w_ = (W)w;
356 370
357 if (w_->pending) 371 if (expect_false (w_->pending))
358 { 372 {
359 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 373 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
360 return; 374 return;
361 } 375 }
362 376
363 w_->pending = ++pendingcnt [ABSPRI (w_)]; 377 w_->pending = ++pendingcnt [ABSPRI (w_)];
364 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void)); 378 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
365 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 379 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
366 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 380 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
367} 381}
368 382
369static void 383static void
… …
396 fd_event (EV_A_ fd, revents); 410 fd_event (EV_A_ fd, revents);
397} 411}
398 412
399/*****************************************************************************/ 413/*****************************************************************************/
400 414
401static void 415inline void
402fd_reify (EV_P) 416fd_reify (EV_P)
403{ 417{
404 int i; 418 int i;
405 419
406 for (i = 0; i < fdchangecnt; ++i) 420 for (i = 0; i < fdchangecnt; ++i)
… …
433} 447}
434 448
435static void 449static void
436fd_change (EV_P_ int fd) 450fd_change (EV_P_ int fd)
437{ 451{
438 if (anfds [fd].reify) 452 if (expect_false (anfds [fd].reify))
439 return; 453 return;
440 454
441 anfds [fd].reify = 1; 455 anfds [fd].reify = 1;
442 456
443 ++fdchangecnt; 457 ++fdchangecnt;
444 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 458 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
445 fdchanges [fdchangecnt - 1] = fd; 459 fdchanges [fdchangecnt - 1] = fd;
446} 460}
447 461
448static void 462static void
449fd_kill (EV_P_ int fd) 463fd_kill (EV_P_ int fd)
… …
455 ev_io_stop (EV_A_ w); 469 ev_io_stop (EV_A_ w);
456 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 470 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
457 } 471 }
458} 472}
459 473
460static int 474inline int
461fd_valid (int fd) 475fd_valid (int fd)
462{ 476{
463#ifdef _WIN32 477#ifdef _WIN32
464 return _get_osfhandle (fd) != -1; 478 return _get_osfhandle (fd) != -1;
465#else 479#else
… …
607ev_feed_signal_event (EV_P_ int signum) 621ev_feed_signal_event (EV_P_ int signum)
608{ 622{
609 WL w; 623 WL w;
610 624
611#if EV_MULTIPLICITY 625#if EV_MULTIPLICITY
612 assert (("feeding signal events is only supported in the default loop", loop == default_loop)); 626 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
613#endif 627#endif
614 628
615 --signum; 629 --signum;
616 630
617 if (signum < 0 || signum >= signalmax) 631 if (signum < 0 || signum >= signalmax)
… …
634 for (signum = signalmax; signum--; ) 648 for (signum = signalmax; signum--; )
635 if (signals [signum].gotsig) 649 if (signals [signum].gotsig)
636 ev_feed_signal_event (EV_A_ signum + 1); 650 ev_feed_signal_event (EV_A_ signum + 1);
637} 651}
638 652
639inline void 653static void
640fd_intern (int fd) 654fd_intern (int fd)
641{ 655{
642#ifdef _WIN32 656#ifdef _WIN32
643 int arg = 1; 657 int arg = 1;
644 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 658 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
703 717
704#endif 718#endif
705 719
706/*****************************************************************************/ 720/*****************************************************************************/
707 721
722#if EV_USE_PORT
723# include "ev_port.c"
724#endif
708#if EV_USE_KQUEUE 725#if EV_USE_KQUEUE
709# include "ev_kqueue.c" 726# include "ev_kqueue.c"
710#endif 727#endif
711#if EV_USE_EPOLL 728#if EV_USE_EPOLL
712# include "ev_epoll.c" 729# include "ev_epoll.c"
… …
740 return getuid () != geteuid () 757 return getuid () != geteuid ()
741 || getgid () != getegid (); 758 || getgid () != getegid ();
742#endif 759#endif
743} 760}
744 761
745int 762unsigned int
746ev_method (EV_P) 763ev_method (EV_P)
747{ 764{
748 return method; 765 return method;
749} 766}
750 767
751static void 768static void
752loop_init (EV_P_ int methods) 769loop_init (EV_P_ unsigned int flags)
753{ 770{
754 if (!method) 771 if (!method)
755 { 772 {
756#if EV_USE_MONOTONIC 773#if EV_USE_MONOTONIC
757 { 774 {
… …
764 ev_rt_now = ev_time (); 781 ev_rt_now = ev_time ();
765 mn_now = get_clock (); 782 mn_now = get_clock ();
766 now_floor = mn_now; 783 now_floor = mn_now;
767 rtmn_diff = ev_rt_now - mn_now; 784 rtmn_diff = ev_rt_now - mn_now;
768 785
769 if (methods == EVMETHOD_AUTO) 786 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS"))
770 if (!enable_secure () && getenv ("LIBEV_METHODS"))
771 methods = atoi (getenv ("LIBEV_METHODS")); 787 flags = atoi (getenv ("LIBEV_FLAGS"));
772 else 788
773 methods = EVMETHOD_ANY; 789 if (!(flags & 0x0000ffff))
790 flags |= 0x0000ffff;
774 791
775 method = 0; 792 method = 0;
793#if EV_USE_PORT
794 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags);
795#endif
776#if EV_USE_KQUEUE 796#if EV_USE_KQUEUE
777 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 797 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
778#endif 798#endif
779#if EV_USE_EPOLL 799#if EV_USE_EPOLL
780 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 800 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
781#endif 801#endif
782#if EV_USE_POLL 802#if EV_USE_POLL
783 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 803 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags);
784#endif 804#endif
785#if EV_USE_SELECT 805#if EV_USE_SELECT
786 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 806 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
787#endif 807#endif
788 808
789 ev_init (&sigev, sigcb); 809 ev_init (&sigev, sigcb);
790 ev_set_priority (&sigev, EV_MAXPRI); 810 ev_set_priority (&sigev, EV_MAXPRI);
791 } 811 }
792} 812}
793 813
794void 814static void
795loop_destroy (EV_P) 815loop_destroy (EV_P)
796{ 816{
797 int i; 817 int i;
798 818
819#if EV_USE_PORT
820 if (method == EVMETHOD_PORT ) port_destroy (EV_A);
821#endif
799#if EV_USE_KQUEUE 822#if EV_USE_KQUEUE
800 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 823 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
801#endif 824#endif
802#if EV_USE_EPOLL 825#if EV_USE_EPOLL
803 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 826 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
… …
811 834
812 for (i = NUMPRI; i--; ) 835 for (i = NUMPRI; i--; )
813 array_free (pending, [i]); 836 array_free (pending, [i]);
814 837
815 /* have to use the microsoft-never-gets-it-right macro */ 838 /* have to use the microsoft-never-gets-it-right macro */
816 array_free (fdchange, EMPTY); 839 array_free (fdchange, EMPTY0);
817 array_free (timer, EMPTY); 840 array_free (timer, EMPTY0);
818#if EV_PERIODICS 841#if EV_PERIODICS
819 array_free (periodic, EMPTY); 842 array_free (periodic, EMPTY0);
820#endif 843#endif
821 array_free (idle, EMPTY); 844 array_free (idle, EMPTY0);
822 array_free (prepare, EMPTY); 845 array_free (prepare, EMPTY0);
823 array_free (check, EMPTY); 846 array_free (check, EMPTY0);
824 847
825 method = 0; 848 method = 0;
826} 849}
827 850
828static void 851static void
829loop_fork (EV_P) 852loop_fork (EV_P)
830{ 853{
854#if EV_USE_PORT
855 if (method == EVMETHOD_PORT ) port_fork (EV_A);
856#endif
857#if EV_USE_KQUEUE
858 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
859#endif
831#if EV_USE_EPOLL 860#if EV_USE_EPOLL
832 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 861 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
833#endif
834#if EV_USE_KQUEUE
835 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
836#endif 862#endif
837 863
838 if (ev_is_active (&sigev)) 864 if (ev_is_active (&sigev))
839 { 865 {
840 /* default loop */ 866 /* default loop */
… …
853 postfork = 0; 879 postfork = 0;
854} 880}
855 881
856#if EV_MULTIPLICITY 882#if EV_MULTIPLICITY
857struct ev_loop * 883struct ev_loop *
858ev_loop_new (int methods) 884ev_loop_new (unsigned int flags)
859{ 885{
860 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 886 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
861 887
862 memset (loop, 0, sizeof (struct ev_loop)); 888 memset (loop, 0, sizeof (struct ev_loop));
863 889
864 loop_init (EV_A_ methods); 890 loop_init (EV_A_ flags);
865 891
866 if (ev_method (EV_A)) 892 if (ev_method (EV_A))
867 return loop; 893 return loop;
868 894
869 return 0; 895 return 0;
… …
884 910
885#endif 911#endif
886 912
887#if EV_MULTIPLICITY 913#if EV_MULTIPLICITY
888struct ev_loop * 914struct ev_loop *
915ev_default_loop_ (unsigned int flags)
889#else 916#else
890int 917int
918ev_default_loop (unsigned int flags)
891#endif 919#endif
892ev_default_loop (int methods)
893{ 920{
894 if (sigpipe [0] == sigpipe [1]) 921 if (sigpipe [0] == sigpipe [1])
895 if (pipe (sigpipe)) 922 if (pipe (sigpipe))
896 return 0; 923 return 0;
897 924
898 if (!default_loop) 925 if (!ev_default_loop_ptr)
899 { 926 {
900#if EV_MULTIPLICITY 927#if EV_MULTIPLICITY
901 struct ev_loop *loop = default_loop = &default_loop_struct; 928 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
902#else 929#else
903 default_loop = 1; 930 ev_default_loop_ptr = 1;
904#endif 931#endif
905 932
906 loop_init (EV_A_ methods); 933 loop_init (EV_A_ flags);
907 934
908 if (ev_method (EV_A)) 935 if (ev_method (EV_A))
909 { 936 {
910 siginit (EV_A); 937 siginit (EV_A);
911 938
… …
915 ev_signal_start (EV_A_ &childev); 942 ev_signal_start (EV_A_ &childev);
916 ev_unref (EV_A); /* child watcher should not keep loop alive */ 943 ev_unref (EV_A); /* child watcher should not keep loop alive */
917#endif 944#endif
918 } 945 }
919 else 946 else
920 default_loop = 0; 947 ev_default_loop_ptr = 0;
921 } 948 }
922 949
923 return default_loop; 950 return ev_default_loop_ptr;
924} 951}
925 952
926void 953void
927ev_default_destroy (void) 954ev_default_destroy (void)
928{ 955{
929#if EV_MULTIPLICITY 956#if EV_MULTIPLICITY
930 struct ev_loop *loop = default_loop; 957 struct ev_loop *loop = ev_default_loop_ptr;
931#endif 958#endif
932 959
933#ifndef _WIN32 960#ifndef _WIN32
934 ev_ref (EV_A); /* child watcher */ 961 ev_ref (EV_A); /* child watcher */
935 ev_signal_stop (EV_A_ &childev); 962 ev_signal_stop (EV_A_ &childev);
… …
946 973
947void 974void
948ev_default_fork (void) 975ev_default_fork (void)
949{ 976{
950#if EV_MULTIPLICITY 977#if EV_MULTIPLICITY
951 struct ev_loop *loop = default_loop; 978 struct ev_loop *loop = ev_default_loop_ptr;
952#endif 979#endif
953 980
954 if (method) 981 if (method)
955 postfork = 1; 982 postfork = 1;
956} 983}
… …
967 return 1; 994 return 1;
968 995
969 return 0; 996 return 0;
970} 997}
971 998
972static void 999inline void
973call_pending (EV_P) 1000call_pending (EV_P)
974{ 1001{
975 int pri; 1002 int pri;
976 1003
977 for (pri = NUMPRI; pri--; ) 1004 for (pri = NUMPRI; pri--; )
978 while (pendingcnt [pri]) 1005 while (pendingcnt [pri])
979 { 1006 {
980 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1007 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
981 1008
982 if (p->w) 1009 if (expect_true (p->w))
983 { 1010 {
984 p->w->pending = 0; 1011 p->w->pending = 0;
985 EV_CB_INVOKE (p->w, p->events); 1012 EV_CB_INVOKE (p->w, p->events);
986 } 1013 }
987 } 1014 }
988} 1015}
989 1016
990static void 1017inline void
991timers_reify (EV_P) 1018timers_reify (EV_P)
992{ 1019{
993 while (timercnt && ((WT)timers [0])->at <= mn_now) 1020 while (timercnt && ((WT)timers [0])->at <= mn_now)
994 { 1021 {
995 struct ev_timer *w = timers [0]; 1022 struct ev_timer *w = timers [0];
… …
1013 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1040 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1014 } 1041 }
1015} 1042}
1016 1043
1017#if EV_PERIODICS 1044#if EV_PERIODICS
1018static void 1045inline void
1019periodics_reify (EV_P) 1046periodics_reify (EV_P)
1020{ 1047{
1021 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1048 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1022 { 1049 {
1023 struct ev_periodic *w = periodics [0]; 1050 struct ev_periodic *w = periodics [0];
… …
1025 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1052 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
1026 1053
1027 /* first reschedule or stop timer */ 1054 /* first reschedule or stop timer */
1028 if (w->reschedule_cb) 1055 if (w->reschedule_cb)
1029 { 1056 {
1030 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1057 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1031
1032 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1058 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1033 downheap ((WT *)periodics, periodiccnt, 0); 1059 downheap ((WT *)periodics, periodiccnt, 0);
1034 } 1060 }
1035 else if (w->interval) 1061 else if (w->interval)
1036 { 1062 {
… …
1083 ev_rt_now = ev_time (); 1109 ev_rt_now = ev_time ();
1084 return 1; 1110 return 1;
1085 } 1111 }
1086} 1112}
1087 1113
1088static void 1114inline void
1089time_update (EV_P) 1115time_update (EV_P)
1090{ 1116{
1091 int i; 1117 int i;
1092 1118
1093#if EV_USE_MONOTONIC 1119#if EV_USE_MONOTONIC
… …
1154ev_loop (EV_P_ int flags) 1180ev_loop (EV_P_ int flags)
1155{ 1181{
1156 double block; 1182 double block;
1157 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1183 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1158 1184
1159 do 1185 while (activecnt)
1160 { 1186 {
1161 /* queue check watchers (and execute them) */ 1187 /* queue check watchers (and execute them) */
1162 if (expect_false (preparecnt)) 1188 if (expect_false (preparecnt))
1163 { 1189 {
1164 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1190 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
… …
1204 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1230 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1205 if (block > to) block = to; 1231 if (block > to) block = to;
1206 } 1232 }
1207#endif 1233#endif
1208 1234
1209 if (block < 0.) block = 0.; 1235 if (expect_false (block < 0.)) block = 0.;
1210 } 1236 }
1211 1237
1212 method_poll (EV_A_ block); 1238 method_poll (EV_A_ block);
1213 1239
1214 /* update ev_rt_now, do magic */ 1240 /* update ev_rt_now, do magic */
… …
1223 /* queue idle watchers unless io or timers are pending */ 1249 /* queue idle watchers unless io or timers are pending */
1224 if (idlecnt && !any_pending (EV_A)) 1250 if (idlecnt && !any_pending (EV_A))
1225 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1251 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1226 1252
1227 /* queue check watchers, to be executed first */ 1253 /* queue check watchers, to be executed first */
1228 if (checkcnt) 1254 if (expect_false (checkcnt))
1229 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1255 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1230 1256
1231 call_pending (EV_A); 1257 call_pending (EV_A);
1258
1259 if (expect_false (loop_done))
1260 break;
1232 } 1261 }
1233 while (activecnt && !loop_done);
1234 1262
1235 if (loop_done != 2) 1263 if (loop_done != 2)
1236 loop_done = 0; 1264 loop_done = 0;
1237} 1265}
1238 1266
… …
1298void 1326void
1299ev_io_start (EV_P_ struct ev_io *w) 1327ev_io_start (EV_P_ struct ev_io *w)
1300{ 1328{
1301 int fd = w->fd; 1329 int fd = w->fd;
1302 1330
1303 if (ev_is_active (w)) 1331 if (expect_false (ev_is_active (w)))
1304 return; 1332 return;
1305 1333
1306 assert (("ev_io_start called with negative fd", fd >= 0)); 1334 assert (("ev_io_start called with negative fd", fd >= 0));
1307 1335
1308 ev_start (EV_A_ (W)w, 1); 1336 ev_start (EV_A_ (W)w, 1);
… …
1314 1342
1315void 1343void
1316ev_io_stop (EV_P_ struct ev_io *w) 1344ev_io_stop (EV_P_ struct ev_io *w)
1317{ 1345{
1318 ev_clear_pending (EV_A_ (W)w); 1346 ev_clear_pending (EV_A_ (W)w);
1319 if (!ev_is_active (w)) 1347 if (expect_false (!ev_is_active (w)))
1320 return; 1348 return;
1321 1349
1322 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1350 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1323 1351
1324 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1352 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
… …
1328} 1356}
1329 1357
1330void 1358void
1331ev_timer_start (EV_P_ struct ev_timer *w) 1359ev_timer_start (EV_P_ struct ev_timer *w)
1332{ 1360{
1333 if (ev_is_active (w)) 1361 if (expect_false (ev_is_active (w)))
1334 return; 1362 return;
1335 1363
1336 ((WT)w)->at += mn_now; 1364 ((WT)w)->at += mn_now;
1337 1365
1338 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1366 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1339 1367
1340 ev_start (EV_A_ (W)w, ++timercnt); 1368 ev_start (EV_A_ (W)w, ++timercnt);
1341 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1369 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1342 timers [timercnt - 1] = w; 1370 timers [timercnt - 1] = w;
1343 upheap ((WT *)timers, timercnt - 1); 1371 upheap ((WT *)timers, timercnt - 1);
1344 1372
1345 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1373 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1346} 1374}
1347 1375
1348void 1376void
1349ev_timer_stop (EV_P_ struct ev_timer *w) 1377ev_timer_stop (EV_P_ struct ev_timer *w)
1350{ 1378{
1351 ev_clear_pending (EV_A_ (W)w); 1379 ev_clear_pending (EV_A_ (W)w);
1352 if (!ev_is_active (w)) 1380 if (expect_false (!ev_is_active (w)))
1353 return; 1381 return;
1354 1382
1355 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1383 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1356 1384
1357 if (((W)w)->active < timercnt--) 1385 if (expect_true (((W)w)->active < timercnt--))
1358 { 1386 {
1359 timers [((W)w)->active - 1] = timers [timercnt]; 1387 timers [((W)w)->active - 1] = timers [timercnt];
1360 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1388 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1361 } 1389 }
1362 1390
… …
1377 } 1405 }
1378 else 1406 else
1379 ev_timer_stop (EV_A_ w); 1407 ev_timer_stop (EV_A_ w);
1380 } 1408 }
1381 else if (w->repeat) 1409 else if (w->repeat)
1410 {
1411 w->at = w->repeat;
1382 ev_timer_start (EV_A_ w); 1412 ev_timer_start (EV_A_ w);
1413 }
1383} 1414}
1384 1415
1385#if EV_PERIODICS 1416#if EV_PERIODICS
1386void 1417void
1387ev_periodic_start (EV_P_ struct ev_periodic *w) 1418ev_periodic_start (EV_P_ struct ev_periodic *w)
1388{ 1419{
1389 if (ev_is_active (w)) 1420 if (expect_false (ev_is_active (w)))
1390 return; 1421 return;
1391 1422
1392 if (w->reschedule_cb) 1423 if (w->reschedule_cb)
1393 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1424 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1394 else if (w->interval) 1425 else if (w->interval)
… …
1397 /* this formula differs from the one in periodic_reify because we do not always round up */ 1428 /* this formula differs from the one in periodic_reify because we do not always round up */
1398 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1429 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1399 } 1430 }
1400 1431
1401 ev_start (EV_A_ (W)w, ++periodiccnt); 1432 ev_start (EV_A_ (W)w, ++periodiccnt);
1402 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1433 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1403 periodics [periodiccnt - 1] = w; 1434 periodics [periodiccnt - 1] = w;
1404 upheap ((WT *)periodics, periodiccnt - 1); 1435 upheap ((WT *)periodics, periodiccnt - 1);
1405 1436
1406 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1437 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1407} 1438}
1408 1439
1409void 1440void
1410ev_periodic_stop (EV_P_ struct ev_periodic *w) 1441ev_periodic_stop (EV_P_ struct ev_periodic *w)
1411{ 1442{
1412 ev_clear_pending (EV_A_ (W)w); 1443 ev_clear_pending (EV_A_ (W)w);
1413 if (!ev_is_active (w)) 1444 if (expect_false (!ev_is_active (w)))
1414 return; 1445 return;
1415 1446
1416 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1447 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1417 1448
1418 if (((W)w)->active < periodiccnt--) 1449 if (expect_true (((W)w)->active < periodiccnt--))
1419 { 1450 {
1420 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1451 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1421 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1452 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1422 } 1453 }
1423 1454
… …
1434#endif 1465#endif
1435 1466
1436void 1467void
1437ev_idle_start (EV_P_ struct ev_idle *w) 1468ev_idle_start (EV_P_ struct ev_idle *w)
1438{ 1469{
1439 if (ev_is_active (w)) 1470 if (expect_false (ev_is_active (w)))
1440 return; 1471 return;
1441 1472
1442 ev_start (EV_A_ (W)w, ++idlecnt); 1473 ev_start (EV_A_ (W)w, ++idlecnt);
1443 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1474 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1444 idles [idlecnt - 1] = w; 1475 idles [idlecnt - 1] = w;
1445} 1476}
1446 1477
1447void 1478void
1448ev_idle_stop (EV_P_ struct ev_idle *w) 1479ev_idle_stop (EV_P_ struct ev_idle *w)
1449{ 1480{
1450 ev_clear_pending (EV_A_ (W)w); 1481 ev_clear_pending (EV_A_ (W)w);
1451 if (!ev_is_active (w)) 1482 if (expect_false (!ev_is_active (w)))
1452 return; 1483 return;
1453 1484
1454 idles [((W)w)->active - 1] = idles [--idlecnt]; 1485 idles [((W)w)->active - 1] = idles [--idlecnt];
1455 ev_stop (EV_A_ (W)w); 1486 ev_stop (EV_A_ (W)w);
1456} 1487}
1457 1488
1458void 1489void
1459ev_prepare_start (EV_P_ struct ev_prepare *w) 1490ev_prepare_start (EV_P_ struct ev_prepare *w)
1460{ 1491{
1461 if (ev_is_active (w)) 1492 if (expect_false (ev_is_active (w)))
1462 return; 1493 return;
1463 1494
1464 ev_start (EV_A_ (W)w, ++preparecnt); 1495 ev_start (EV_A_ (W)w, ++preparecnt);
1465 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1496 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1466 prepares [preparecnt - 1] = w; 1497 prepares [preparecnt - 1] = w;
1467} 1498}
1468 1499
1469void 1500void
1470ev_prepare_stop (EV_P_ struct ev_prepare *w) 1501ev_prepare_stop (EV_P_ struct ev_prepare *w)
1471{ 1502{
1472 ev_clear_pending (EV_A_ (W)w); 1503 ev_clear_pending (EV_A_ (W)w);
1473 if (!ev_is_active (w)) 1504 if (expect_false (!ev_is_active (w)))
1474 return; 1505 return;
1475 1506
1476 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1507 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1477 ev_stop (EV_A_ (W)w); 1508 ev_stop (EV_A_ (W)w);
1478} 1509}
1479 1510
1480void 1511void
1481ev_check_start (EV_P_ struct ev_check *w) 1512ev_check_start (EV_P_ struct ev_check *w)
1482{ 1513{
1483 if (ev_is_active (w)) 1514 if (expect_false (ev_is_active (w)))
1484 return; 1515 return;
1485 1516
1486 ev_start (EV_A_ (W)w, ++checkcnt); 1517 ev_start (EV_A_ (W)w, ++checkcnt);
1487 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1518 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1488 checks [checkcnt - 1] = w; 1519 checks [checkcnt - 1] = w;
1489} 1520}
1490 1521
1491void 1522void
1492ev_check_stop (EV_P_ struct ev_check *w) 1523ev_check_stop (EV_P_ struct ev_check *w)
1493{ 1524{
1494 ev_clear_pending (EV_A_ (W)w); 1525 ev_clear_pending (EV_A_ (W)w);
1495 if (!ev_is_active (w)) 1526 if (expect_false (!ev_is_active (w)))
1496 return; 1527 return;
1497 1528
1498 checks [((W)w)->active - 1] = checks [--checkcnt]; 1529 checks [((W)w)->active - 1] = checks [--checkcnt];
1499 ev_stop (EV_A_ (W)w); 1530 ev_stop (EV_A_ (W)w);
1500} 1531}
… …
1505 1536
1506void 1537void
1507ev_signal_start (EV_P_ struct ev_signal *w) 1538ev_signal_start (EV_P_ struct ev_signal *w)
1508{ 1539{
1509#if EV_MULTIPLICITY 1540#if EV_MULTIPLICITY
1510 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1541 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1511#endif 1542#endif
1512 if (ev_is_active (w)) 1543 if (expect_false (ev_is_active (w)))
1513 return; 1544 return;
1514 1545
1515 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1546 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1516 1547
1517 ev_start (EV_A_ (W)w, 1); 1548 ev_start (EV_A_ (W)w, 1);
… …
1534 1565
1535void 1566void
1536ev_signal_stop (EV_P_ struct ev_signal *w) 1567ev_signal_stop (EV_P_ struct ev_signal *w)
1537{ 1568{
1538 ev_clear_pending (EV_A_ (W)w); 1569 ev_clear_pending (EV_A_ (W)w);
1539 if (!ev_is_active (w)) 1570 if (expect_false (!ev_is_active (w)))
1540 return; 1571 return;
1541 1572
1542 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1573 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1543 ev_stop (EV_A_ (W)w); 1574 ev_stop (EV_A_ (W)w);
1544 1575
… …
1548 1579
1549void 1580void
1550ev_child_start (EV_P_ struct ev_child *w) 1581ev_child_start (EV_P_ struct ev_child *w)
1551{ 1582{
1552#if EV_MULTIPLICITY 1583#if EV_MULTIPLICITY
1553 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1584 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1554#endif 1585#endif
1555 if (ev_is_active (w)) 1586 if (expect_false (ev_is_active (w)))
1556 return; 1587 return;
1557 1588
1558 ev_start (EV_A_ (W)w, 1); 1589 ev_start (EV_A_ (W)w, 1);
1559 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1590 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1560} 1591}
1561 1592
1562void 1593void
1563ev_child_stop (EV_P_ struct ev_child *w) 1594ev_child_stop (EV_P_ struct ev_child *w)
1564{ 1595{
1565 ev_clear_pending (EV_A_ (W)w); 1596 ev_clear_pending (EV_A_ (W)w);
1566 if (!ev_is_active (w)) 1597 if (expect_false (!ev_is_active (w)))
1567 return; 1598 return;
1568 1599
1569 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1600 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1570 ev_stop (EV_A_ (W)w); 1601 ev_stop (EV_A_ (W)w);
1571} 1602}
… …
1608void 1639void
1609ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1640ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1610{ 1641{
1611 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 1642 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1612 1643
1613 if (!once) 1644 if (expect_false (!once))
1645 {
1614 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1646 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1615 else 1647 return;
1616 { 1648 }
1649
1617 once->cb = cb; 1650 once->cb = cb;
1618 once->arg = arg; 1651 once->arg = arg;
1619 1652
1620 ev_init (&once->io, once_cb_io); 1653 ev_init (&once->io, once_cb_io);
1621 if (fd >= 0) 1654 if (fd >= 0)
1622 { 1655 {
1623 ev_io_set (&once->io, fd, events); 1656 ev_io_set (&once->io, fd, events);
1624 ev_io_start (EV_A_ &once->io); 1657 ev_io_start (EV_A_ &once->io);
1625 } 1658 }
1626 1659
1627 ev_init (&once->to, once_cb_to); 1660 ev_init (&once->to, once_cb_to);
1628 if (timeout >= 0.) 1661 if (timeout >= 0.)
1629 { 1662 {
1630 ev_timer_set (&once->to, timeout, 0.); 1663 ev_timer_set (&once->to, timeout, 0.);
1631 ev_timer_start (EV_A_ &once->to); 1664 ev_timer_start (EV_A_ &once->to);
1632 }
1633 } 1665 }
1634} 1666}
1635 1667
1636#ifdef __cplusplus 1668#ifdef __cplusplus
1637} 1669}

Diff Legend

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