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

Comparing libev/ev.c (file contents):
Revision 1.122 by root, Sat Nov 17 02:00:48 2007 UTC vs.
Revision 1.134 by root, Fri Nov 23 19:13:33 2007 UTC

… …
32#ifdef __cplusplus 32#ifdef __cplusplus
33extern "C" { 33extern "C" {
34#endif 34#endif
35 35
36#ifndef EV_STANDALONE 36#ifndef EV_STANDALONE
37# ifdef EV_CONFIG_H
38# include EV_CONFIG_H
39# else
37# include "config.h" 40# include "config.h"
41# endif
38 42
39# if HAVE_CLOCK_GETTIME 43# if HAVE_CLOCK_GETTIME
40# ifndef EV_USE_MONOTONIC 44# ifndef EV_USE_MONOTONIC
41# define EV_USE_MONOTONIC 1 45# define EV_USE_MONOTONIC 1
42# endif 46# endif
43# ifndef EV_USE_REALTIME 47# ifndef EV_USE_REALTIME
44# define EV_USE_REALTIME 1 48# define EV_USE_REALTIME 1
45# endif 49# endif
50# else
51# ifndef EV_USE_MONOTONIC
52# define EV_USE_MONOTONIC 0
53# endif
54# ifndef EV_USE_REALTIME
55# define EV_USE_REALTIME 0
56# endif
46# endif 57# endif
47 58
48# if HAVE_SELECT && HAVE_SYS_SELECT_H && !defined (EV_USE_SELECT) 59# ifndef EV_USE_SELECT
60# if HAVE_SELECT && HAVE_SYS_SELECT_H
49# define EV_USE_SELECT 1 61# define EV_USE_SELECT 1
62# else
63# define EV_USE_SELECT 0
64# endif
50# endif 65# endif
51 66
52# if HAVE_POLL && HAVE_POLL_H && !defined (EV_USE_POLL) 67# ifndef EV_USE_POLL
68# if HAVE_POLL && HAVE_POLL_H
53# define EV_USE_POLL 1 69# define EV_USE_POLL 1
70# else
71# define EV_USE_POLL 0
72# endif
54# endif 73# endif
55 74
56# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H && !defined (EV_USE_EPOLL) 75# ifndef EV_USE_EPOLL
76# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
57# define EV_USE_EPOLL 1 77# define EV_USE_EPOLL 1
78# else
79# define EV_USE_EPOLL 0
80# endif
58# endif 81# endif
59 82
83# ifndef EV_USE_KQUEUE
60# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE) 84# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
61# define EV_USE_KQUEUE 1 85# define EV_USE_KQUEUE 1
86# else
87# define EV_USE_KQUEUE 0
88# endif
62# endif 89# endif
63 90
64# if HAVE_PORT_H && HAVE_PORT_CREATE && !defined (EV_USE_PORT) 91# ifndef EV_USE_PORT
92# if HAVE_PORT_H && HAVE_PORT_CREATE
65# define EV_USE_PORT 1 93# define EV_USE_PORT 1
94# else
95# define EV_USE_PORT 0
96# endif
66# endif 97# endif
67 98
68#endif 99#endif
69 100
70#include <math.h> 101#include <math.h>
… …
127# define EV_USE_PORT 0 158# define EV_USE_PORT 0
128#endif 159#endif
129 160
130/**/ 161/**/
131 162
132/* darwin simply cannot be helped */
133#ifdef __APPLE__
134# undef EV_USE_POLL
135# undef EV_USE_KQUEUE
136#endif
137
138#ifndef CLOCK_MONOTONIC 163#ifndef CLOCK_MONOTONIC
139# undef EV_USE_MONOTONIC 164# undef EV_USE_MONOTONIC
140# define EV_USE_MONOTONIC 0 165# define EV_USE_MONOTONIC 0
141#endif 166#endif
142 167
… …
162# include "ev.h" 187# include "ev.h"
163#endif 188#endif
164 189
165#if __GNUC__ >= 3 190#if __GNUC__ >= 3
166# define expect(expr,value) __builtin_expect ((expr),(value)) 191# define expect(expr,value) __builtin_expect ((expr),(value))
167# define inline inline 192# define inline static inline
168#else 193#else
169# define expect(expr,value) (expr) 194# define expect(expr,value) (expr)
170# define inline static 195# define inline static
171#endif 196#endif
172 197
… …
366void 391void
367ev_feed_event (EV_P_ void *w, int revents) 392ev_feed_event (EV_P_ void *w, int revents)
368{ 393{
369 W w_ = (W)w; 394 W w_ = (W)w;
370 395
371 if (w_->pending) 396 if (expect_false (w_->pending))
372 { 397 {
373 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 398 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
374 return; 399 return;
375 } 400 }
401
402 if (expect_false (!w_->cb))
403 return;
376 404
377 w_->pending = ++pendingcnt [ABSPRI (w_)]; 405 w_->pending = ++pendingcnt [ABSPRI (w_)];
378 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2); 406 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
379 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 407 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
380 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 408 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
… …
410 fd_event (EV_A_ fd, revents); 438 fd_event (EV_A_ fd, revents);
411} 439}
412 440
413/*****************************************************************************/ 441/*****************************************************************************/
414 442
415static void 443inline void
416fd_reify (EV_P) 444fd_reify (EV_P)
417{ 445{
418 int i; 446 int i;
419 447
420 for (i = 0; i < fdchangecnt; ++i) 448 for (i = 0; i < fdchangecnt; ++i)
… …
437 } 465 }
438#endif 466#endif
439 467
440 anfd->reify = 0; 468 anfd->reify = 0;
441 469
442 method_modify (EV_A_ fd, anfd->events, events); 470 backend_modify (EV_A_ fd, anfd->events, events);
443 anfd->events = events; 471 anfd->events = events;
444 } 472 }
445 473
446 fdchangecnt = 0; 474 fdchangecnt = 0;
447} 475}
448 476
449static void 477static void
450fd_change (EV_P_ int fd) 478fd_change (EV_P_ int fd)
451{ 479{
452 if (anfds [fd].reify) 480 if (expect_false (anfds [fd].reify))
453 return; 481 return;
454 482
455 anfds [fd].reify = 1; 483 anfds [fd].reify = 1;
456 484
457 ++fdchangecnt; 485 ++fdchangecnt;
… …
469 ev_io_stop (EV_A_ w); 497 ev_io_stop (EV_A_ w);
470 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 498 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
471 } 499 }
472} 500}
473 501
474static int 502inline int
475fd_valid (int fd) 503fd_valid (int fd)
476{ 504{
477#ifdef _WIN32 505#ifdef _WIN32
478 return _get_osfhandle (fd) != -1; 506 return _get_osfhandle (fd) != -1;
479#else 507#else
… …
505 fd_kill (EV_A_ fd); 533 fd_kill (EV_A_ fd);
506 return; 534 return;
507 } 535 }
508} 536}
509 537
510/* usually called after fork if method needs to re-arm all fds from scratch */ 538/* usually called after fork if backend needs to re-arm all fds from scratch */
511static void 539static void
512fd_rearm_all (EV_P) 540fd_rearm_all (EV_P)
513{ 541{
514 int fd; 542 int fd;
515 543
… …
648 for (signum = signalmax; signum--; ) 676 for (signum = signalmax; signum--; )
649 if (signals [signum].gotsig) 677 if (signals [signum].gotsig)
650 ev_feed_signal_event (EV_A_ signum + 1); 678 ev_feed_signal_event (EV_A_ signum + 1);
651} 679}
652 680
653inline void 681static void
654fd_intern (int fd) 682fd_intern (int fd)
655{ 683{
656#ifdef _WIN32 684#ifdef _WIN32
657 int arg = 1; 685 int arg = 1;
658 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 686 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
706 int pid, status; 734 int pid, status;
707 735
708 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 736 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
709 { 737 {
710 /* make sure we are called again until all childs have been reaped */ 738 /* make sure we are called again until all childs have been reaped */
739 /* we need to do it this way so that the callback gets called before we continue */
711 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 740 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
712 741
713 child_reap (EV_A_ sw, pid, pid, status); 742 child_reap (EV_A_ sw, pid, pid, status);
714 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */ 743 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
715 } 744 }
716} 745}
717 746
718#endif 747#endif
719 748
… …
758 || getgid () != getegid (); 787 || getgid () != getegid ();
759#endif 788#endif
760} 789}
761 790
762unsigned int 791unsigned int
763ev_method (EV_P) 792ev_supported_backends (void)
764{ 793{
765 return method; 794 unsigned int flags = 0;
795
796 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
797 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE;
798 if (EV_USE_EPOLL ) flags |= EVBACKEND_EPOLL;
799 if (EV_USE_POLL ) flags |= EVBACKEND_POLL;
800 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
801
802 return flags;
803}
804
805unsigned int
806ev_recommended_backends (void)
807{
808 unsigned int flags = ev_supported_backends ();
809
810#ifndef __NetBSD__
811 /* kqueue is borked on everything but netbsd apparently */
812 /* it usually doesn't work correctly on anything but sockets and pipes */
813 flags &= ~EVBACKEND_KQUEUE;
814#endif
815#ifdef __APPLE__
816 // flags &= ~EVBACKEND_KQUEUE; for documentation
817 flags &= ~EVBACKEND_POLL;
818#endif
819
820 return flags;
821}
822
823unsigned int
824ev_embeddable_backends (void)
825{
826 return EVBACKEND_EPOLL
827 | EVBACKEND_KQUEUE
828 | EVBACKEND_PORT;
829}
830
831unsigned int
832ev_backend (EV_P)
833{
834 return backend;
766} 835}
767 836
768static void 837static void
769loop_init (EV_P_ unsigned int flags) 838loop_init (EV_P_ unsigned int flags)
770{ 839{
771 if (!method) 840 if (!backend)
772 { 841 {
773#if EV_USE_MONOTONIC 842#if EV_USE_MONOTONIC
774 { 843 {
775 struct timespec ts; 844 struct timespec ts;
776 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 845 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
… …
781 ev_rt_now = ev_time (); 850 ev_rt_now = ev_time ();
782 mn_now = get_clock (); 851 mn_now = get_clock ();
783 now_floor = mn_now; 852 now_floor = mn_now;
784 rtmn_diff = ev_rt_now - mn_now; 853 rtmn_diff = ev_rt_now - mn_now;
785 854
786 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS")) 855 if (!(flags & EVFLAG_NOENV)
856 && !enable_secure ()
857 && getenv ("LIBEV_FLAGS"))
787 flags = atoi (getenv ("LIBEV_FLAGS")); 858 flags = atoi (getenv ("LIBEV_FLAGS"));
788 859
789 if (!(flags & 0x0000ffff)) 860 if (!(flags & 0x0000ffffUL))
790 flags |= 0x0000ffff; 861 flags |= ev_recommended_backends ();
791 862
792 method = 0; 863 backend = 0;
793#if EV_USE_PORT 864#if EV_USE_PORT
794 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags); 865 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
795#endif 866#endif
796#if EV_USE_KQUEUE 867#if EV_USE_KQUEUE
797 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags); 868 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
798#endif 869#endif
799#if EV_USE_EPOLL 870#if EV_USE_EPOLL
800 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags); 871 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
801#endif 872#endif
802#if EV_USE_POLL 873#if EV_USE_POLL
803 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags); 874 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
804#endif 875#endif
805#if EV_USE_SELECT 876#if EV_USE_SELECT
806 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags); 877 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
807#endif 878#endif
808 879
809 ev_init (&sigev, sigcb); 880 ev_init (&sigev, sigcb);
810 ev_set_priority (&sigev, EV_MAXPRI); 881 ev_set_priority (&sigev, EV_MAXPRI);
811 } 882 }
812} 883}
813 884
814void 885static void
815loop_destroy (EV_P) 886loop_destroy (EV_P)
816{ 887{
817 int i; 888 int i;
818 889
819#if EV_USE_PORT 890#if EV_USE_PORT
820 if (method == EVMETHOD_PORT ) port_destroy (EV_A); 891 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
821#endif 892#endif
822#if EV_USE_KQUEUE 893#if EV_USE_KQUEUE
823 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 894 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
824#endif 895#endif
825#if EV_USE_EPOLL 896#if EV_USE_EPOLL
826 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 897 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
827#endif 898#endif
828#if EV_USE_POLL 899#if EV_USE_POLL
829 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 900 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
830#endif 901#endif
831#if EV_USE_SELECT 902#if EV_USE_SELECT
832 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 903 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
833#endif 904#endif
834 905
835 for (i = NUMPRI; i--; ) 906 for (i = NUMPRI; i--; )
836 array_free (pending, [i]); 907 array_free (pending, [i]);
837 908
… …
843#endif 914#endif
844 array_free (idle, EMPTY0); 915 array_free (idle, EMPTY0);
845 array_free (prepare, EMPTY0); 916 array_free (prepare, EMPTY0);
846 array_free (check, EMPTY0); 917 array_free (check, EMPTY0);
847 918
848 method = 0; 919 backend = 0;
849} 920}
850 921
851static void 922static void
852loop_fork (EV_P) 923loop_fork (EV_P)
853{ 924{
854#if EV_USE_PORT 925#if EV_USE_PORT
855 if (method == EVMETHOD_PORT ) port_fork (EV_A); 926 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
856#endif 927#endif
857#if EV_USE_KQUEUE 928#if EV_USE_KQUEUE
858 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 929 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
859#endif 930#endif
860#if EV_USE_EPOLL 931#if EV_USE_EPOLL
861 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 932 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
862#endif 933#endif
863 934
864 if (ev_is_active (&sigev)) 935 if (ev_is_active (&sigev))
865 { 936 {
866 /* default loop */ 937 /* default loop */
… …
887 958
888 memset (loop, 0, sizeof (struct ev_loop)); 959 memset (loop, 0, sizeof (struct ev_loop));
889 960
890 loop_init (EV_A_ flags); 961 loop_init (EV_A_ flags);
891 962
892 if (ev_method (EV_A)) 963 if (ev_backend (EV_A))
893 return loop; 964 return loop;
894 965
895 return 0; 966 return 0;
896} 967}
897 968
… …
910 981
911#endif 982#endif
912 983
913#if EV_MULTIPLICITY 984#if EV_MULTIPLICITY
914struct ev_loop * 985struct ev_loop *
915ev_default_loop_ (unsigned int flags) 986ev_default_loop_init (unsigned int flags)
916#else 987#else
917int 988int
918ev_default_loop (unsigned int flags) 989ev_default_loop (unsigned int flags)
919#endif 990#endif
920{ 991{
… …
930 ev_default_loop_ptr = 1; 1001 ev_default_loop_ptr = 1;
931#endif 1002#endif
932 1003
933 loop_init (EV_A_ flags); 1004 loop_init (EV_A_ flags);
934 1005
935 if (ev_method (EV_A)) 1006 if (ev_backend (EV_A))
936 { 1007 {
937 siginit (EV_A); 1008 siginit (EV_A);
938 1009
939#ifndef _WIN32 1010#ifndef _WIN32
940 ev_signal_init (&childev, childcb, SIGCHLD); 1011 ev_signal_init (&childev, childcb, SIGCHLD);
… …
976{ 1047{
977#if EV_MULTIPLICITY 1048#if EV_MULTIPLICITY
978 struct ev_loop *loop = ev_default_loop_ptr; 1049 struct ev_loop *loop = ev_default_loop_ptr;
979#endif 1050#endif
980 1051
981 if (method) 1052 if (backend)
982 postfork = 1; 1053 postfork = 1;
983} 1054}
984 1055
985/*****************************************************************************/ 1056/*****************************************************************************/
986 1057
… …
1012 EV_CB_INVOKE (p->w, p->events); 1083 EV_CB_INVOKE (p->w, p->events);
1013 } 1084 }
1014 } 1085 }
1015} 1086}
1016 1087
1017static void 1088inline void
1018timers_reify (EV_P) 1089timers_reify (EV_P)
1019{ 1090{
1020 while (timercnt && ((WT)timers [0])->at <= mn_now) 1091 while (timercnt && ((WT)timers [0])->at <= mn_now)
1021 { 1092 {
1022 struct ev_timer *w = timers [0]; 1093 struct ev_timer *w = timers [0];
… …
1040 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1111 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1041 } 1112 }
1042} 1113}
1043 1114
1044#if EV_PERIODICS 1115#if EV_PERIODICS
1045static void 1116inline void
1046periodics_reify (EV_P) 1117periodics_reify (EV_P)
1047{ 1118{
1048 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1119 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1049 { 1120 {
1050 struct ev_periodic *w = periodics [0]; 1121 struct ev_periodic *w = periodics [0];
… …
1109 ev_rt_now = ev_time (); 1180 ev_rt_now = ev_time ();
1110 return 1; 1181 return 1;
1111 } 1182 }
1112} 1183}
1113 1184
1114static void 1185inline void
1115time_update (EV_P) 1186time_update (EV_P)
1116{ 1187{
1117 int i; 1188 int i;
1118 1189
1119#if EV_USE_MONOTONIC 1190#if EV_USE_MONOTONIC
… …
1218 { 1289 {
1219 block = MAX_BLOCKTIME; 1290 block = MAX_BLOCKTIME;
1220 1291
1221 if (timercnt) 1292 if (timercnt)
1222 { 1293 {
1223 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1294 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1224 if (block > to) block = to; 1295 if (block > to) block = to;
1225 } 1296 }
1226 1297
1227#if EV_PERIODICS 1298#if EV_PERIODICS
1228 if (periodiccnt) 1299 if (periodiccnt)
1229 { 1300 {
1230 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1301 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1231 if (block > to) block = to; 1302 if (block > to) block = to;
1232 } 1303 }
1233#endif 1304#endif
1234 1305
1235 if (block < 0.) block = 0.; 1306 if (expect_false (block < 0.)) block = 0.;
1236 } 1307 }
1237 1308
1238 method_poll (EV_A_ block); 1309 backend_poll (EV_A_ block);
1239 1310
1240 /* update ev_rt_now, do magic */ 1311 /* update ev_rt_now, do magic */
1241 time_update (EV_A); 1312 time_update (EV_A);
1242 1313
1243 /* queue pending timers and reschedule them */ 1314 /* queue pending timers and reschedule them */
… …
1249 /* queue idle watchers unless io or timers are pending */ 1320 /* queue idle watchers unless io or timers are pending */
1250 if (idlecnt && !any_pending (EV_A)) 1321 if (idlecnt && !any_pending (EV_A))
1251 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1322 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1252 1323
1253 /* queue check watchers, to be executed first */ 1324 /* queue check watchers, to be executed first */
1254 if (checkcnt) 1325 if (expect_false (checkcnt))
1255 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1326 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1256 1327
1257 call_pending (EV_A); 1328 call_pending (EV_A);
1258 1329
1259 if (loop_done) 1330 if (expect_false (loop_done))
1260 break; 1331 break;
1261 } 1332 }
1262 1333
1263 if (loop_done != 2) 1334 if (loop_done != 2)
1264 loop_done = 0; 1335 loop_done = 0;
… …
1326void 1397void
1327ev_io_start (EV_P_ struct ev_io *w) 1398ev_io_start (EV_P_ struct ev_io *w)
1328{ 1399{
1329 int fd = w->fd; 1400 int fd = w->fd;
1330 1401
1331 if (ev_is_active (w)) 1402 if (expect_false (ev_is_active (w)))
1332 return; 1403 return;
1333 1404
1334 assert (("ev_io_start called with negative fd", fd >= 0)); 1405 assert (("ev_io_start called with negative fd", fd >= 0));
1335 1406
1336 ev_start (EV_A_ (W)w, 1); 1407 ev_start (EV_A_ (W)w, 1);
… …
1342 1413
1343void 1414void
1344ev_io_stop (EV_P_ struct ev_io *w) 1415ev_io_stop (EV_P_ struct ev_io *w)
1345{ 1416{
1346 ev_clear_pending (EV_A_ (W)w); 1417 ev_clear_pending (EV_A_ (W)w);
1347 if (!ev_is_active (w)) 1418 if (expect_false (!ev_is_active (w)))
1348 return; 1419 return;
1349 1420
1350 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1421 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1351 1422
1352 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1423 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
… …
1356} 1427}
1357 1428
1358void 1429void
1359ev_timer_start (EV_P_ struct ev_timer *w) 1430ev_timer_start (EV_P_ struct ev_timer *w)
1360{ 1431{
1361 if (ev_is_active (w)) 1432 if (expect_false (ev_is_active (w)))
1362 return; 1433 return;
1363 1434
1364 ((WT)w)->at += mn_now; 1435 ((WT)w)->at += mn_now;
1365 1436
1366 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1437 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
… …
1375 1446
1376void 1447void
1377ev_timer_stop (EV_P_ struct ev_timer *w) 1448ev_timer_stop (EV_P_ struct ev_timer *w)
1378{ 1449{
1379 ev_clear_pending (EV_A_ (W)w); 1450 ev_clear_pending (EV_A_ (W)w);
1380 if (!ev_is_active (w)) 1451 if (expect_false (!ev_is_active (w)))
1381 return; 1452 return;
1382 1453
1383 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1454 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1384 1455
1385 if (((W)w)->active < timercnt--) 1456 if (expect_true (((W)w)->active < timercnt--))
1386 { 1457 {
1387 timers [((W)w)->active - 1] = timers [timercnt]; 1458 timers [((W)w)->active - 1] = timers [timercnt];
1388 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1459 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1389 } 1460 }
1390 1461
… …
1415 1486
1416#if EV_PERIODICS 1487#if EV_PERIODICS
1417void 1488void
1418ev_periodic_start (EV_P_ struct ev_periodic *w) 1489ev_periodic_start (EV_P_ struct ev_periodic *w)
1419{ 1490{
1420 if (ev_is_active (w)) 1491 if (expect_false (ev_is_active (w)))
1421 return; 1492 return;
1422 1493
1423 if (w->reschedule_cb) 1494 if (w->reschedule_cb)
1424 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1495 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1425 else if (w->interval) 1496 else if (w->interval)
… …
1439 1510
1440void 1511void
1441ev_periodic_stop (EV_P_ struct ev_periodic *w) 1512ev_periodic_stop (EV_P_ struct ev_periodic *w)
1442{ 1513{
1443 ev_clear_pending (EV_A_ (W)w); 1514 ev_clear_pending (EV_A_ (W)w);
1444 if (!ev_is_active (w)) 1515 if (expect_false (!ev_is_active (w)))
1445 return; 1516 return;
1446 1517
1447 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1518 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1448 1519
1449 if (((W)w)->active < periodiccnt--) 1520 if (expect_true (((W)w)->active < periodiccnt--))
1450 { 1521 {
1451 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1522 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1452 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1523 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1453 } 1524 }
1454 1525
… …
1465#endif 1536#endif
1466 1537
1467void 1538void
1468ev_idle_start (EV_P_ struct ev_idle *w) 1539ev_idle_start (EV_P_ struct ev_idle *w)
1469{ 1540{
1470 if (ev_is_active (w)) 1541 if (expect_false (ev_is_active (w)))
1471 return; 1542 return;
1472 1543
1473 ev_start (EV_A_ (W)w, ++idlecnt); 1544 ev_start (EV_A_ (W)w, ++idlecnt);
1474 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2); 1545 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1475 idles [idlecnt - 1] = w; 1546 idles [idlecnt - 1] = w;
… …
1477 1548
1478void 1549void
1479ev_idle_stop (EV_P_ struct ev_idle *w) 1550ev_idle_stop (EV_P_ struct ev_idle *w)
1480{ 1551{
1481 ev_clear_pending (EV_A_ (W)w); 1552 ev_clear_pending (EV_A_ (W)w);
1482 if (!ev_is_active (w)) 1553 if (expect_false (!ev_is_active (w)))
1483 return; 1554 return;
1484 1555
1485 idles [((W)w)->active - 1] = idles [--idlecnt]; 1556 idles [((W)w)->active - 1] = idles [--idlecnt];
1486 ev_stop (EV_A_ (W)w); 1557 ev_stop (EV_A_ (W)w);
1487} 1558}
1488 1559
1489void 1560void
1490ev_prepare_start (EV_P_ struct ev_prepare *w) 1561ev_prepare_start (EV_P_ struct ev_prepare *w)
1491{ 1562{
1492 if (ev_is_active (w)) 1563 if (expect_false (ev_is_active (w)))
1493 return; 1564 return;
1494 1565
1495 ev_start (EV_A_ (W)w, ++preparecnt); 1566 ev_start (EV_A_ (W)w, ++preparecnt);
1496 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 1567 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1497 prepares [preparecnt - 1] = w; 1568 prepares [preparecnt - 1] = w;
… …
1499 1570
1500void 1571void
1501ev_prepare_stop (EV_P_ struct ev_prepare *w) 1572ev_prepare_stop (EV_P_ struct ev_prepare *w)
1502{ 1573{
1503 ev_clear_pending (EV_A_ (W)w); 1574 ev_clear_pending (EV_A_ (W)w);
1504 if (!ev_is_active (w)) 1575 if (expect_false (!ev_is_active (w)))
1505 return; 1576 return;
1506 1577
1507 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1578 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1508 ev_stop (EV_A_ (W)w); 1579 ev_stop (EV_A_ (W)w);
1509} 1580}
1510 1581
1511void 1582void
1512ev_check_start (EV_P_ struct ev_check *w) 1583ev_check_start (EV_P_ struct ev_check *w)
1513{ 1584{
1514 if (ev_is_active (w)) 1585 if (expect_false (ev_is_active (w)))
1515 return; 1586 return;
1516 1587
1517 ev_start (EV_A_ (W)w, ++checkcnt); 1588 ev_start (EV_A_ (W)w, ++checkcnt);
1518 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2); 1589 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1519 checks [checkcnt - 1] = w; 1590 checks [checkcnt - 1] = w;
… …
1521 1592
1522void 1593void
1523ev_check_stop (EV_P_ struct ev_check *w) 1594ev_check_stop (EV_P_ struct ev_check *w)
1524{ 1595{
1525 ev_clear_pending (EV_A_ (W)w); 1596 ev_clear_pending (EV_A_ (W)w);
1526 if (!ev_is_active (w)) 1597 if (expect_false (!ev_is_active (w)))
1527 return; 1598 return;
1528 1599
1529 checks [((W)w)->active - 1] = checks [--checkcnt]; 1600 checks [((W)w)->active - 1] = checks [--checkcnt];
1530 ev_stop (EV_A_ (W)w); 1601 ev_stop (EV_A_ (W)w);
1531} 1602}
… …
1538ev_signal_start (EV_P_ struct ev_signal *w) 1609ev_signal_start (EV_P_ struct ev_signal *w)
1539{ 1610{
1540#if EV_MULTIPLICITY 1611#if EV_MULTIPLICITY
1541 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1612 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1542#endif 1613#endif
1543 if (ev_is_active (w)) 1614 if (expect_false (ev_is_active (w)))
1544 return; 1615 return;
1545 1616
1546 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1617 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1547 1618
1548 ev_start (EV_A_ (W)w, 1); 1619 ev_start (EV_A_ (W)w, 1);
… …
1565 1636
1566void 1637void
1567ev_signal_stop (EV_P_ struct ev_signal *w) 1638ev_signal_stop (EV_P_ struct ev_signal *w)
1568{ 1639{
1569 ev_clear_pending (EV_A_ (W)w); 1640 ev_clear_pending (EV_A_ (W)w);
1570 if (!ev_is_active (w)) 1641 if (expect_false (!ev_is_active (w)))
1571 return; 1642 return;
1572 1643
1573 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1644 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1574 ev_stop (EV_A_ (W)w); 1645 ev_stop (EV_A_ (W)w);
1575 1646
… …
1581ev_child_start (EV_P_ struct ev_child *w) 1652ev_child_start (EV_P_ struct ev_child *w)
1582{ 1653{
1583#if EV_MULTIPLICITY 1654#if EV_MULTIPLICITY
1584 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1655 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1585#endif 1656#endif
1586 if (ev_is_active (w)) 1657 if (expect_false (ev_is_active (w)))
1587 return; 1658 return;
1588 1659
1589 ev_start (EV_A_ (W)w, 1); 1660 ev_start (EV_A_ (W)w, 1);
1590 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1661 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1591} 1662}
1592 1663
1593void 1664void
1594ev_child_stop (EV_P_ struct ev_child *w) 1665ev_child_stop (EV_P_ struct ev_child *w)
1595{ 1666{
1596 ev_clear_pending (EV_A_ (W)w); 1667 ev_clear_pending (EV_A_ (W)w);
1597 if (!ev_is_active (w)) 1668 if (expect_false (!ev_is_active (w)))
1598 return; 1669 return;
1599 1670
1600 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1671 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1601 ev_stop (EV_A_ (W)w); 1672 ev_stop (EV_A_ (W)w);
1602} 1673}
1674
1675#if EV_MULTIPLICITY
1676static void
1677embed_cb (EV_P_ struct ev_io *io, int revents)
1678{
1679 struct ev_embed *w = (struct ev_embed *)(((char *)io) - offsetof (struct ev_embed, io));
1680
1681 ev_feed_event (EV_A_ (W)w, EV_EMBED);
1682 ev_loop (w->loop, EVLOOP_NONBLOCK);
1683}
1684
1685void
1686ev_embed_start (EV_P_ struct ev_embed *w)
1687{
1688 if (expect_false (ev_is_active (w)))
1689 return;
1690
1691 {
1692 struct ev_loop *loop = w->loop;
1693 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
1694 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ);
1695 }
1696
1697 ev_io_start (EV_A_ &w->io);
1698 ev_start (EV_A_ (W)w, 1);
1699}
1700
1701void
1702ev_embed_stop (EV_P_ struct ev_embed *w)
1703{
1704 ev_clear_pending (EV_A_ (W)w);
1705 if (expect_false (!ev_is_active (w)))
1706 return;
1707
1708 ev_io_stop (EV_A_ &w->io);
1709 ev_stop (EV_A_ (W)w);
1710}
1711#endif
1603 1712
1604/*****************************************************************************/ 1713/*****************************************************************************/
1605 1714
1606struct ev_once 1715struct ev_once
1607{ 1716{
… …
1639void 1748void
1640ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1749ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1641{ 1750{
1642 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 1751 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1643 1752
1644 if (!once) 1753 if (expect_false (!once))
1754 {
1645 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1755 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1646 else 1756 return;
1647 { 1757 }
1758
1648 once->cb = cb; 1759 once->cb = cb;
1649 once->arg = arg; 1760 once->arg = arg;
1650 1761
1651 ev_init (&once->io, once_cb_io); 1762 ev_init (&once->io, once_cb_io);
1652 if (fd >= 0) 1763 if (fd >= 0)
1653 { 1764 {
1654 ev_io_set (&once->io, fd, events); 1765 ev_io_set (&once->io, fd, events);
1655 ev_io_start (EV_A_ &once->io); 1766 ev_io_start (EV_A_ &once->io);
1656 } 1767 }
1657 1768
1658 ev_init (&once->to, once_cb_to); 1769 ev_init (&once->to, once_cb_to);
1659 if (timeout >= 0.) 1770 if (timeout >= 0.)
1660 { 1771 {
1661 ev_timer_set (&once->to, timeout, 0.); 1772 ev_timer_set (&once->to, timeout, 0.);
1662 ev_timer_start (EV_A_ &once->to); 1773 ev_timer_start (EV_A_ &once->to);
1663 }
1664 } 1774 }
1665} 1775}
1666 1776
1667#ifdef __cplusplus 1777#ifdef __cplusplus
1668} 1778}

Diff Legend

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