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.132 by root, Fri Nov 23 10:36:30 2007 UTC

… …
41# define EV_USE_MONOTONIC 1 41# define EV_USE_MONOTONIC 1
42# endif 42# endif
43# ifndef EV_USE_REALTIME 43# ifndef EV_USE_REALTIME
44# define EV_USE_REALTIME 1 44# define EV_USE_REALTIME 1
45# endif 45# endif
46# else
47# ifndef EV_USE_MONOTONIC
48# define EV_USE_MONOTONIC 0
49# endif
50# ifndef EV_USE_REALTIME
51# define EV_USE_REALTIME 0
52# endif
46# endif 53# endif
47 54
48# if HAVE_SELECT && HAVE_SYS_SELECT_H && !defined (EV_USE_SELECT) 55# ifndef EV_USE_SELECT
56# if HAVE_SELECT && HAVE_SYS_SELECT_H
49# define EV_USE_SELECT 1 57# define EV_USE_SELECT 1
58# else
59# define EV_USE_SELECT 0
60# endif
50# endif 61# endif
51 62
52# if HAVE_POLL && HAVE_POLL_H && !defined (EV_USE_POLL) 63# ifndef EV_USE_POLL
64# if HAVE_POLL && HAVE_POLL_H
53# define EV_USE_POLL 1 65# define EV_USE_POLL 1
66# else
67# define EV_USE_POLL 0
68# endif
54# endif 69# endif
55 70
56# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H && !defined (EV_USE_EPOLL) 71# ifndef EV_USE_EPOLL
72# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
57# define EV_USE_EPOLL 1 73# define EV_USE_EPOLL 1
74# else
75# define EV_USE_EPOLL 0
76# endif
58# endif 77# endif
59 78
79# ifndef EV_USE_KQUEUE
60# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE) 80# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
61# define EV_USE_KQUEUE 1 81# define EV_USE_KQUEUE 1
82# else
83# define EV_USE_KQUEUE 0
84# endif
62# endif 85# endif
63 86
64# if HAVE_PORT_H && HAVE_PORT_CREATE && !defined (EV_USE_PORT) 87# ifndef EV_USE_PORT
88# if HAVE_PORT_H && HAVE_PORT_CREATE
65# define EV_USE_PORT 1 89# define EV_USE_PORT 1
90# else
91# define EV_USE_PORT 0
92# endif
66# endif 93# endif
67 94
68#endif 95#endif
69 96
70#include <math.h> 97#include <math.h>
… …
127# define EV_USE_PORT 0 154# define EV_USE_PORT 0
128#endif 155#endif
129 156
130/**/ 157/**/
131 158
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 159#ifndef CLOCK_MONOTONIC
139# undef EV_USE_MONOTONIC 160# undef EV_USE_MONOTONIC
140# define EV_USE_MONOTONIC 0 161# define EV_USE_MONOTONIC 0
141#endif 162#endif
142 163
… …
162# include "ev.h" 183# include "ev.h"
163#endif 184#endif
164 185
165#if __GNUC__ >= 3 186#if __GNUC__ >= 3
166# define expect(expr,value) __builtin_expect ((expr),(value)) 187# define expect(expr,value) __builtin_expect ((expr),(value))
167# define inline inline 188# define inline static inline
168#else 189#else
169# define expect(expr,value) (expr) 190# define expect(expr,value) (expr)
170# define inline static 191# define inline static
171#endif 192#endif
172 193
… …
366void 387void
367ev_feed_event (EV_P_ void *w, int revents) 388ev_feed_event (EV_P_ void *w, int revents)
368{ 389{
369 W w_ = (W)w; 390 W w_ = (W)w;
370 391
371 if (w_->pending) 392 if (expect_false (w_->pending))
372 { 393 {
373 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 394 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
374 return; 395 return;
375 } 396 }
376 397
… …
410 fd_event (EV_A_ fd, revents); 431 fd_event (EV_A_ fd, revents);
411} 432}
412 433
413/*****************************************************************************/ 434/*****************************************************************************/
414 435
415static void 436inline void
416fd_reify (EV_P) 437fd_reify (EV_P)
417{ 438{
418 int i; 439 int i;
419 440
420 for (i = 0; i < fdchangecnt; ++i) 441 for (i = 0; i < fdchangecnt; ++i)
… …
437 } 458 }
438#endif 459#endif
439 460
440 anfd->reify = 0; 461 anfd->reify = 0;
441 462
442 method_modify (EV_A_ fd, anfd->events, events); 463 backend_modify (EV_A_ fd, anfd->events, events);
443 anfd->events = events; 464 anfd->events = events;
444 } 465 }
445 466
446 fdchangecnt = 0; 467 fdchangecnt = 0;
447} 468}
448 469
449static void 470static void
450fd_change (EV_P_ int fd) 471fd_change (EV_P_ int fd)
451{ 472{
452 if (anfds [fd].reify) 473 if (expect_false (anfds [fd].reify))
453 return; 474 return;
454 475
455 anfds [fd].reify = 1; 476 anfds [fd].reify = 1;
456 477
457 ++fdchangecnt; 478 ++fdchangecnt;
… …
469 ev_io_stop (EV_A_ w); 490 ev_io_stop (EV_A_ w);
470 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 491 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
471 } 492 }
472} 493}
473 494
474static int 495inline int
475fd_valid (int fd) 496fd_valid (int fd)
476{ 497{
477#ifdef _WIN32 498#ifdef _WIN32
478 return _get_osfhandle (fd) != -1; 499 return _get_osfhandle (fd) != -1;
479#else 500#else
… …
505 fd_kill (EV_A_ fd); 526 fd_kill (EV_A_ fd);
506 return; 527 return;
507 } 528 }
508} 529}
509 530
510/* usually called after fork if method needs to re-arm all fds from scratch */ 531/* usually called after fork if backend needs to re-arm all fds from scratch */
511static void 532static void
512fd_rearm_all (EV_P) 533fd_rearm_all (EV_P)
513{ 534{
514 int fd; 535 int fd;
515 536
… …
648 for (signum = signalmax; signum--; ) 669 for (signum = signalmax; signum--; )
649 if (signals [signum].gotsig) 670 if (signals [signum].gotsig)
650 ev_feed_signal_event (EV_A_ signum + 1); 671 ev_feed_signal_event (EV_A_ signum + 1);
651} 672}
652 673
653inline void 674static void
654fd_intern (int fd) 675fd_intern (int fd)
655{ 676{
656#ifdef _WIN32 677#ifdef _WIN32
657 int arg = 1; 678 int arg = 1;
658 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 679 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
706 int pid, status; 727 int pid, status;
707 728
708 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 729 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
709 { 730 {
710 /* make sure we are called again until all childs have been reaped */ 731 /* make sure we are called again until all childs have been reaped */
732 /* 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); 733 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
712 734
713 child_reap (EV_A_ sw, pid, pid, status); 735 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 */ 736 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
715 } 737 }
716} 738}
717 739
718#endif 740#endif
719 741
… …
758 || getgid () != getegid (); 780 || getgid () != getegid ();
759#endif 781#endif
760} 782}
761 783
762unsigned int 784unsigned int
763ev_method (EV_P) 785ev_supported_backends (void)
764{ 786{
765 return method; 787 unsigned int flags = 0;
788
789 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
790 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE;
791 if (EV_USE_EPOLL ) flags |= EVBACKEND_EPOLL;
792 if (EV_USE_POLL ) flags |= EVBACKEND_POLL;
793 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
794
795 return flags;
796}
797
798unsigned int
799ev_recommended_backends (void)
800{
801 unsigned int flags = ev_supported_backends ();
802
803#ifndef __NetBSD__
804 /* kqueue is borked on everything but netbsd apparently */
805 /* it usually doesn't work correctly on anything but sockets and pipes */
806 flags &= ~EVBACKEND_KQUEUE;
807#endif
808#ifdef __APPLE__
809 // flags &= ~EVBACKEND_KQUEUE; for documentation
810 flags &= ~EVBACKEND_POLL;
811#endif
812
813 return flags;
814}
815
816unsigned int
817ev_backend (EV_P)
818{
819 return backend;
766} 820}
767 821
768static void 822static void
769loop_init (EV_P_ unsigned int flags) 823loop_init (EV_P_ unsigned int flags)
770{ 824{
771 if (!method) 825 if (!backend)
772 { 826 {
773#if EV_USE_MONOTONIC 827#if EV_USE_MONOTONIC
774 { 828 {
775 struct timespec ts; 829 struct timespec ts;
776 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 830 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
… …
781 ev_rt_now = ev_time (); 835 ev_rt_now = ev_time ();
782 mn_now = get_clock (); 836 mn_now = get_clock ();
783 now_floor = mn_now; 837 now_floor = mn_now;
784 rtmn_diff = ev_rt_now - mn_now; 838 rtmn_diff = ev_rt_now - mn_now;
785 839
786 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS")) 840 if (!(flags & EVFLAG_NOENV)
841 && !enable_secure ()
842 && getenv ("LIBEV_FLAGS"))
787 flags = atoi (getenv ("LIBEV_FLAGS")); 843 flags = atoi (getenv ("LIBEV_FLAGS"));
788 844
789 if (!(flags & 0x0000ffff)) 845 if (!(flags & 0x0000ffffUL))
790 flags |= 0x0000ffff; 846 flags |= ev_recommended_backends ();
791 847
792 method = 0; 848 backend = 0;
793#if EV_USE_PORT 849#if EV_USE_PORT
794 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags); 850 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
795#endif 851#endif
796#if EV_USE_KQUEUE 852#if EV_USE_KQUEUE
797 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags); 853 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
798#endif 854#endif
799#if EV_USE_EPOLL 855#if EV_USE_EPOLL
800 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags); 856 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
801#endif 857#endif
802#if EV_USE_POLL 858#if EV_USE_POLL
803 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags); 859 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
804#endif 860#endif
805#if EV_USE_SELECT 861#if EV_USE_SELECT
806 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags); 862 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
807#endif 863#endif
808 864
809 ev_init (&sigev, sigcb); 865 ev_init (&sigev, sigcb);
810 ev_set_priority (&sigev, EV_MAXPRI); 866 ev_set_priority (&sigev, EV_MAXPRI);
811 } 867 }
812} 868}
813 869
814void 870static void
815loop_destroy (EV_P) 871loop_destroy (EV_P)
816{ 872{
817 int i; 873 int i;
818 874
819#if EV_USE_PORT 875#if EV_USE_PORT
820 if (method == EVMETHOD_PORT ) port_destroy (EV_A); 876 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
821#endif 877#endif
822#if EV_USE_KQUEUE 878#if EV_USE_KQUEUE
823 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 879 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
824#endif 880#endif
825#if EV_USE_EPOLL 881#if EV_USE_EPOLL
826 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 882 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
827#endif 883#endif
828#if EV_USE_POLL 884#if EV_USE_POLL
829 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 885 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
830#endif 886#endif
831#if EV_USE_SELECT 887#if EV_USE_SELECT
832 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 888 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
833#endif 889#endif
834 890
835 for (i = NUMPRI; i--; ) 891 for (i = NUMPRI; i--; )
836 array_free (pending, [i]); 892 array_free (pending, [i]);
837 893
… …
843#endif 899#endif
844 array_free (idle, EMPTY0); 900 array_free (idle, EMPTY0);
845 array_free (prepare, EMPTY0); 901 array_free (prepare, EMPTY0);
846 array_free (check, EMPTY0); 902 array_free (check, EMPTY0);
847 903
848 method = 0; 904 backend = 0;
849} 905}
850 906
851static void 907static void
852loop_fork (EV_P) 908loop_fork (EV_P)
853{ 909{
854#if EV_USE_PORT 910#if EV_USE_PORT
855 if (method == EVMETHOD_PORT ) port_fork (EV_A); 911 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
856#endif 912#endif
857#if EV_USE_KQUEUE 913#if EV_USE_KQUEUE
858 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 914 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
859#endif 915#endif
860#if EV_USE_EPOLL 916#if EV_USE_EPOLL
861 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 917 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
862#endif 918#endif
863 919
864 if (ev_is_active (&sigev)) 920 if (ev_is_active (&sigev))
865 { 921 {
866 /* default loop */ 922 /* default loop */
… …
887 943
888 memset (loop, 0, sizeof (struct ev_loop)); 944 memset (loop, 0, sizeof (struct ev_loop));
889 945
890 loop_init (EV_A_ flags); 946 loop_init (EV_A_ flags);
891 947
892 if (ev_method (EV_A)) 948 if (ev_backend (EV_A))
893 return loop; 949 return loop;
894 950
895 return 0; 951 return 0;
896} 952}
897 953
… …
910 966
911#endif 967#endif
912 968
913#if EV_MULTIPLICITY 969#if EV_MULTIPLICITY
914struct ev_loop * 970struct ev_loop *
915ev_default_loop_ (unsigned int flags) 971ev_default_loop_init (unsigned int flags)
916#else 972#else
917int 973int
918ev_default_loop (unsigned int flags) 974ev_default_loop (unsigned int flags)
919#endif 975#endif
920{ 976{
… …
930 ev_default_loop_ptr = 1; 986 ev_default_loop_ptr = 1;
931#endif 987#endif
932 988
933 loop_init (EV_A_ flags); 989 loop_init (EV_A_ flags);
934 990
935 if (ev_method (EV_A)) 991 if (ev_backend (EV_A))
936 { 992 {
937 siginit (EV_A); 993 siginit (EV_A);
938 994
939#ifndef _WIN32 995#ifndef _WIN32
940 ev_signal_init (&childev, childcb, SIGCHLD); 996 ev_signal_init (&childev, childcb, SIGCHLD);
… …
976{ 1032{
977#if EV_MULTIPLICITY 1033#if EV_MULTIPLICITY
978 struct ev_loop *loop = ev_default_loop_ptr; 1034 struct ev_loop *loop = ev_default_loop_ptr;
979#endif 1035#endif
980 1036
981 if (method) 1037 if (backend)
982 postfork = 1; 1038 postfork = 1;
983} 1039}
984 1040
985/*****************************************************************************/ 1041/*****************************************************************************/
986 1042
… …
1012 EV_CB_INVOKE (p->w, p->events); 1068 EV_CB_INVOKE (p->w, p->events);
1013 } 1069 }
1014 } 1070 }
1015} 1071}
1016 1072
1017static void 1073inline void
1018timers_reify (EV_P) 1074timers_reify (EV_P)
1019{ 1075{
1020 while (timercnt && ((WT)timers [0])->at <= mn_now) 1076 while (timercnt && ((WT)timers [0])->at <= mn_now)
1021 { 1077 {
1022 struct ev_timer *w = timers [0]; 1078 struct ev_timer *w = timers [0];
… …
1040 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1096 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1041 } 1097 }
1042} 1098}
1043 1099
1044#if EV_PERIODICS 1100#if EV_PERIODICS
1045static void 1101inline void
1046periodics_reify (EV_P) 1102periodics_reify (EV_P)
1047{ 1103{
1048 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1104 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1049 { 1105 {
1050 struct ev_periodic *w = periodics [0]; 1106 struct ev_periodic *w = periodics [0];
… …
1109 ev_rt_now = ev_time (); 1165 ev_rt_now = ev_time ();
1110 return 1; 1166 return 1;
1111 } 1167 }
1112} 1168}
1113 1169
1114static void 1170inline void
1115time_update (EV_P) 1171time_update (EV_P)
1116{ 1172{
1117 int i; 1173 int i;
1118 1174
1119#if EV_USE_MONOTONIC 1175#if EV_USE_MONOTONIC
… …
1218 { 1274 {
1219 block = MAX_BLOCKTIME; 1275 block = MAX_BLOCKTIME;
1220 1276
1221 if (timercnt) 1277 if (timercnt)
1222 { 1278 {
1223 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1279 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1224 if (block > to) block = to; 1280 if (block > to) block = to;
1225 } 1281 }
1226 1282
1227#if EV_PERIODICS 1283#if EV_PERIODICS
1228 if (periodiccnt) 1284 if (periodiccnt)
1229 { 1285 {
1230 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1286 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1231 if (block > to) block = to; 1287 if (block > to) block = to;
1232 } 1288 }
1233#endif 1289#endif
1234 1290
1235 if (block < 0.) block = 0.; 1291 if (expect_false (block < 0.)) block = 0.;
1236 } 1292 }
1237 1293
1238 method_poll (EV_A_ block); 1294 backend_poll (EV_A_ block);
1239 1295
1240 /* update ev_rt_now, do magic */ 1296 /* update ev_rt_now, do magic */
1241 time_update (EV_A); 1297 time_update (EV_A);
1242 1298
1243 /* queue pending timers and reschedule them */ 1299 /* queue pending timers and reschedule them */
… …
1249 /* queue idle watchers unless io or timers are pending */ 1305 /* queue idle watchers unless io or timers are pending */
1250 if (idlecnt && !any_pending (EV_A)) 1306 if (idlecnt && !any_pending (EV_A))
1251 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1307 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1252 1308
1253 /* queue check watchers, to be executed first */ 1309 /* queue check watchers, to be executed first */
1254 if (checkcnt) 1310 if (expect_false (checkcnt))
1255 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1311 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1256 1312
1257 call_pending (EV_A); 1313 call_pending (EV_A);
1258 1314
1259 if (loop_done) 1315 if (expect_false (loop_done))
1260 break; 1316 break;
1261 } 1317 }
1262 1318
1263 if (loop_done != 2) 1319 if (loop_done != 2)
1264 loop_done = 0; 1320 loop_done = 0;
… …
1326void 1382void
1327ev_io_start (EV_P_ struct ev_io *w) 1383ev_io_start (EV_P_ struct ev_io *w)
1328{ 1384{
1329 int fd = w->fd; 1385 int fd = w->fd;
1330 1386
1331 if (ev_is_active (w)) 1387 if (expect_false (ev_is_active (w)))
1332 return; 1388 return;
1333 1389
1334 assert (("ev_io_start called with negative fd", fd >= 0)); 1390 assert (("ev_io_start called with negative fd", fd >= 0));
1335 1391
1336 ev_start (EV_A_ (W)w, 1); 1392 ev_start (EV_A_ (W)w, 1);
… …
1342 1398
1343void 1399void
1344ev_io_stop (EV_P_ struct ev_io *w) 1400ev_io_stop (EV_P_ struct ev_io *w)
1345{ 1401{
1346 ev_clear_pending (EV_A_ (W)w); 1402 ev_clear_pending (EV_A_ (W)w);
1347 if (!ev_is_active (w)) 1403 if (expect_false (!ev_is_active (w)))
1348 return; 1404 return;
1349 1405
1350 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1406 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1351 1407
1352 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1408 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
… …
1356} 1412}
1357 1413
1358void 1414void
1359ev_timer_start (EV_P_ struct ev_timer *w) 1415ev_timer_start (EV_P_ struct ev_timer *w)
1360{ 1416{
1361 if (ev_is_active (w)) 1417 if (expect_false (ev_is_active (w)))
1362 return; 1418 return;
1363 1419
1364 ((WT)w)->at += mn_now; 1420 ((WT)w)->at += mn_now;
1365 1421
1366 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1422 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
… …
1375 1431
1376void 1432void
1377ev_timer_stop (EV_P_ struct ev_timer *w) 1433ev_timer_stop (EV_P_ struct ev_timer *w)
1378{ 1434{
1379 ev_clear_pending (EV_A_ (W)w); 1435 ev_clear_pending (EV_A_ (W)w);
1380 if (!ev_is_active (w)) 1436 if (expect_false (!ev_is_active (w)))
1381 return; 1437 return;
1382 1438
1383 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1439 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1384 1440
1385 if (((W)w)->active < timercnt--) 1441 if (expect_true (((W)w)->active < timercnt--))
1386 { 1442 {
1387 timers [((W)w)->active - 1] = timers [timercnt]; 1443 timers [((W)w)->active - 1] = timers [timercnt];
1388 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1444 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1389 } 1445 }
1390 1446
… …
1415 1471
1416#if EV_PERIODICS 1472#if EV_PERIODICS
1417void 1473void
1418ev_periodic_start (EV_P_ struct ev_periodic *w) 1474ev_periodic_start (EV_P_ struct ev_periodic *w)
1419{ 1475{
1420 if (ev_is_active (w)) 1476 if (expect_false (ev_is_active (w)))
1421 return; 1477 return;
1422 1478
1423 if (w->reschedule_cb) 1479 if (w->reschedule_cb)
1424 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1480 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1425 else if (w->interval) 1481 else if (w->interval)
… …
1439 1495
1440void 1496void
1441ev_periodic_stop (EV_P_ struct ev_periodic *w) 1497ev_periodic_stop (EV_P_ struct ev_periodic *w)
1442{ 1498{
1443 ev_clear_pending (EV_A_ (W)w); 1499 ev_clear_pending (EV_A_ (W)w);
1444 if (!ev_is_active (w)) 1500 if (expect_false (!ev_is_active (w)))
1445 return; 1501 return;
1446 1502
1447 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1503 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1448 1504
1449 if (((W)w)->active < periodiccnt--) 1505 if (expect_true (((W)w)->active < periodiccnt--))
1450 { 1506 {
1451 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1507 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1452 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1508 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1453 } 1509 }
1454 1510
… …
1465#endif 1521#endif
1466 1522
1467void 1523void
1468ev_idle_start (EV_P_ struct ev_idle *w) 1524ev_idle_start (EV_P_ struct ev_idle *w)
1469{ 1525{
1470 if (ev_is_active (w)) 1526 if (expect_false (ev_is_active (w)))
1471 return; 1527 return;
1472 1528
1473 ev_start (EV_A_ (W)w, ++idlecnt); 1529 ev_start (EV_A_ (W)w, ++idlecnt);
1474 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2); 1530 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1475 idles [idlecnt - 1] = w; 1531 idles [idlecnt - 1] = w;
… …
1477 1533
1478void 1534void
1479ev_idle_stop (EV_P_ struct ev_idle *w) 1535ev_idle_stop (EV_P_ struct ev_idle *w)
1480{ 1536{
1481 ev_clear_pending (EV_A_ (W)w); 1537 ev_clear_pending (EV_A_ (W)w);
1482 if (!ev_is_active (w)) 1538 if (expect_false (!ev_is_active (w)))
1483 return; 1539 return;
1484 1540
1485 idles [((W)w)->active - 1] = idles [--idlecnt]; 1541 idles [((W)w)->active - 1] = idles [--idlecnt];
1486 ev_stop (EV_A_ (W)w); 1542 ev_stop (EV_A_ (W)w);
1487} 1543}
1488 1544
1489void 1545void
1490ev_prepare_start (EV_P_ struct ev_prepare *w) 1546ev_prepare_start (EV_P_ struct ev_prepare *w)
1491{ 1547{
1492 if (ev_is_active (w)) 1548 if (expect_false (ev_is_active (w)))
1493 return; 1549 return;
1494 1550
1495 ev_start (EV_A_ (W)w, ++preparecnt); 1551 ev_start (EV_A_ (W)w, ++preparecnt);
1496 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 1552 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1497 prepares [preparecnt - 1] = w; 1553 prepares [preparecnt - 1] = w;
… …
1499 1555
1500void 1556void
1501ev_prepare_stop (EV_P_ struct ev_prepare *w) 1557ev_prepare_stop (EV_P_ struct ev_prepare *w)
1502{ 1558{
1503 ev_clear_pending (EV_A_ (W)w); 1559 ev_clear_pending (EV_A_ (W)w);
1504 if (!ev_is_active (w)) 1560 if (expect_false (!ev_is_active (w)))
1505 return; 1561 return;
1506 1562
1507 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1563 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1508 ev_stop (EV_A_ (W)w); 1564 ev_stop (EV_A_ (W)w);
1509} 1565}
1510 1566
1511void 1567void
1512ev_check_start (EV_P_ struct ev_check *w) 1568ev_check_start (EV_P_ struct ev_check *w)
1513{ 1569{
1514 if (ev_is_active (w)) 1570 if (expect_false (ev_is_active (w)))
1515 return; 1571 return;
1516 1572
1517 ev_start (EV_A_ (W)w, ++checkcnt); 1573 ev_start (EV_A_ (W)w, ++checkcnt);
1518 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2); 1574 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1519 checks [checkcnt - 1] = w; 1575 checks [checkcnt - 1] = w;
… …
1521 1577
1522void 1578void
1523ev_check_stop (EV_P_ struct ev_check *w) 1579ev_check_stop (EV_P_ struct ev_check *w)
1524{ 1580{
1525 ev_clear_pending (EV_A_ (W)w); 1581 ev_clear_pending (EV_A_ (W)w);
1526 if (!ev_is_active (w)) 1582 if (expect_false (!ev_is_active (w)))
1527 return; 1583 return;
1528 1584
1529 checks [((W)w)->active - 1] = checks [--checkcnt]; 1585 checks [((W)w)->active - 1] = checks [--checkcnt];
1530 ev_stop (EV_A_ (W)w); 1586 ev_stop (EV_A_ (W)w);
1531} 1587}
… …
1538ev_signal_start (EV_P_ struct ev_signal *w) 1594ev_signal_start (EV_P_ struct ev_signal *w)
1539{ 1595{
1540#if EV_MULTIPLICITY 1596#if EV_MULTIPLICITY
1541 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1597 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1542#endif 1598#endif
1543 if (ev_is_active (w)) 1599 if (expect_false (ev_is_active (w)))
1544 return; 1600 return;
1545 1601
1546 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1602 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1547 1603
1548 ev_start (EV_A_ (W)w, 1); 1604 ev_start (EV_A_ (W)w, 1);
… …
1565 1621
1566void 1622void
1567ev_signal_stop (EV_P_ struct ev_signal *w) 1623ev_signal_stop (EV_P_ struct ev_signal *w)
1568{ 1624{
1569 ev_clear_pending (EV_A_ (W)w); 1625 ev_clear_pending (EV_A_ (W)w);
1570 if (!ev_is_active (w)) 1626 if (expect_false (!ev_is_active (w)))
1571 return; 1627 return;
1572 1628
1573 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1629 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1574 ev_stop (EV_A_ (W)w); 1630 ev_stop (EV_A_ (W)w);
1575 1631
… …
1581ev_child_start (EV_P_ struct ev_child *w) 1637ev_child_start (EV_P_ struct ev_child *w)
1582{ 1638{
1583#if EV_MULTIPLICITY 1639#if EV_MULTIPLICITY
1584 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1640 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1585#endif 1641#endif
1586 if (ev_is_active (w)) 1642 if (expect_false (ev_is_active (w)))
1587 return; 1643 return;
1588 1644
1589 ev_start (EV_A_ (W)w, 1); 1645 ev_start (EV_A_ (W)w, 1);
1590 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1646 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1591} 1647}
1592 1648
1593void 1649void
1594ev_child_stop (EV_P_ struct ev_child *w) 1650ev_child_stop (EV_P_ struct ev_child *w)
1595{ 1651{
1596 ev_clear_pending (EV_A_ (W)w); 1652 ev_clear_pending (EV_A_ (W)w);
1597 if (!ev_is_active (w)) 1653 if (expect_false (!ev_is_active (w)))
1598 return; 1654 return;
1599 1655
1600 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1656 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1601 ev_stop (EV_A_ (W)w); 1657 ev_stop (EV_A_ (W)w);
1602} 1658}
… …
1639void 1695void
1640ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1696ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1641{ 1697{
1642 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 1698 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1643 1699
1644 if (!once) 1700 if (expect_false (!once))
1701 {
1645 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1702 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1646 else 1703 return;
1647 { 1704 }
1705
1648 once->cb = cb; 1706 once->cb = cb;
1649 once->arg = arg; 1707 once->arg = arg;
1650 1708
1651 ev_init (&once->io, once_cb_io); 1709 ev_init (&once->io, once_cb_io);
1652 if (fd >= 0) 1710 if (fd >= 0)
1653 { 1711 {
1654 ev_io_set (&once->io, fd, events); 1712 ev_io_set (&once->io, fd, events);
1655 ev_io_start (EV_A_ &once->io); 1713 ev_io_start (EV_A_ &once->io);
1656 } 1714 }
1657 1715
1658 ev_init (&once->to, once_cb_to); 1716 ev_init (&once->to, once_cb_to);
1659 if (timeout >= 0.) 1717 if (timeout >= 0.)
1660 { 1718 {
1661 ev_timer_set (&once->to, timeout, 0.); 1719 ev_timer_set (&once->to, timeout, 0.);
1662 ev_timer_start (EV_A_ &once->to); 1720 ev_timer_start (EV_A_ &once->to);
1663 }
1664 } 1721 }
1665} 1722}
1666 1723
1667#ifdef __cplusplus 1724#ifdef __cplusplus
1668} 1725}

Diff Legend

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