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

Comparing libev/ev.c (file contents):
Revision 1.116 by root, Thu Nov 15 09:19:42 2007 UTC vs.
Revision 1.125 by root, Sat Nov 17 02:28:43 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/**/
124 131
125/* darwin simply cannot be helped */ 132/* darwin simply cannot be helped */
… …
143#endif 150#endif
144 151
145/**/ 152/**/
146 153
147#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) */
148#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) */
149#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 */
150/*#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 */
151 158
152#ifdef EV_H 159#ifdef EV_H
153# include EV_H 160# include EV_H
154#else 161#else
155# include "ev.h" 162# include "ev.h"
156#endif 163#endif
157 164
158#if __GNUC__ >= 3 165#if __GNUC__ >= 3
159# define expect(expr,value) __builtin_expect ((expr),(value)) 166# define expect(expr,value) __builtin_expect ((expr),(value))
160# define inline inline 167# define inline static inline
161#else 168#else
162# define expect(expr,value) (expr) 169# define expect(expr,value) (expr)
163# define inline static 170# define inline static
164#endif 171#endif
165 172
… …
359void 366void
360ev_feed_event (EV_P_ void *w, int revents) 367ev_feed_event (EV_P_ void *w, int revents)
361{ 368{
362 W w_ = (W)w; 369 W w_ = (W)w;
363 370
364 if (w_->pending) 371 if (expect_false (w_->pending))
365 { 372 {
366 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 373 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
367 return; 374 return;
368 } 375 }
369 376
… …
403 fd_event (EV_A_ fd, revents); 410 fd_event (EV_A_ fd, revents);
404} 411}
405 412
406/*****************************************************************************/ 413/*****************************************************************************/
407 414
408static void 415inline void
409fd_reify (EV_P) 416fd_reify (EV_P)
410{ 417{
411 int i; 418 int i;
412 419
413 for (i = 0; i < fdchangecnt; ++i) 420 for (i = 0; i < fdchangecnt; ++i)
… …
440} 447}
441 448
442static void 449static void
443fd_change (EV_P_ int fd) 450fd_change (EV_P_ int fd)
444{ 451{
445 if (anfds [fd].reify) 452 if (expect_false (anfds [fd].reify))
446 return; 453 return;
447 454
448 anfds [fd].reify = 1; 455 anfds [fd].reify = 1;
449 456
450 ++fdchangecnt; 457 ++fdchangecnt;
… …
462 ev_io_stop (EV_A_ w); 469 ev_io_stop (EV_A_ w);
463 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);
464 } 471 }
465} 472}
466 473
467static int 474inline int
468fd_valid (int fd) 475fd_valid (int fd)
469{ 476{
470#ifdef _WIN32 477#ifdef _WIN32
471 return _get_osfhandle (fd) != -1; 478 return _get_osfhandle (fd) != -1;
472#else 479#else
… …
641 for (signum = signalmax; signum--; ) 648 for (signum = signalmax; signum--; )
642 if (signals [signum].gotsig) 649 if (signals [signum].gotsig)
643 ev_feed_signal_event (EV_A_ signum + 1); 650 ev_feed_signal_event (EV_A_ signum + 1);
644} 651}
645 652
646inline void 653static void
647fd_intern (int fd) 654fd_intern (int fd)
648{ 655{
649#ifdef _WIN32 656#ifdef _WIN32
650 int arg = 1; 657 int arg = 1;
651 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 658 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
710 717
711#endif 718#endif
712 719
713/*****************************************************************************/ 720/*****************************************************************************/
714 721
722#if EV_USE_PORT
723# include "ev_port.c"
724#endif
715#if EV_USE_KQUEUE 725#if EV_USE_KQUEUE
716# include "ev_kqueue.c" 726# include "ev_kqueue.c"
717#endif 727#endif
718#if EV_USE_EPOLL 728#if EV_USE_EPOLL
719# include "ev_epoll.c" 729# include "ev_epoll.c"
… …
778 788
779 if (!(flags & 0x0000ffff)) 789 if (!(flags & 0x0000ffff))
780 flags |= 0x0000ffff; 790 flags |= 0x0000ffff;
781 791
782 method = 0; 792 method = 0;
793#if EV_USE_PORT
794 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags);
795#endif
783#if EV_USE_KQUEUE 796#if EV_USE_KQUEUE
784 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags); 797 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
785#endif 798#endif
786#if EV_USE_EPOLL 799#if EV_USE_EPOLL
787 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags); 800 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
… …
796 ev_init (&sigev, sigcb); 809 ev_init (&sigev, sigcb);
797 ev_set_priority (&sigev, EV_MAXPRI); 810 ev_set_priority (&sigev, EV_MAXPRI);
798 } 811 }
799} 812}
800 813
801void 814static void
802loop_destroy (EV_P) 815loop_destroy (EV_P)
803{ 816{
804 int i; 817 int i;
805 818
819#if EV_USE_PORT
820 if (method == EVMETHOD_PORT ) port_destroy (EV_A);
821#endif
806#if EV_USE_KQUEUE 822#if EV_USE_KQUEUE
807 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 823 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
808#endif 824#endif
809#if EV_USE_EPOLL 825#if EV_USE_EPOLL
810 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 826 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
… …
833} 849}
834 850
835static void 851static void
836loop_fork (EV_P) 852loop_fork (EV_P)
837{ 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
838#if EV_USE_EPOLL 860#if EV_USE_EPOLL
839 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 861 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
840#endif
841#if EV_USE_KQUEUE
842 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
843#endif 862#endif
844 863
845 if (ev_is_active (&sigev)) 864 if (ev_is_active (&sigev))
846 { 865 {
847 /* default loop */ 866 /* default loop */
… …
891 910
892#endif 911#endif
893 912
894#if EV_MULTIPLICITY 913#if EV_MULTIPLICITY
895struct ev_loop * 914struct ev_loop *
896ev_default_loop_ (unsigned int flags) 915ev_default_loop_init (unsigned int flags)
897#else 916#else
898int 917int
899ev_default_loop (unsigned int flags) 918ev_default_loop (unsigned int flags)
900#endif 919#endif
901{ 920{
… …
906 if (!ev_default_loop_ptr) 925 if (!ev_default_loop_ptr)
907 { 926 {
908#if EV_MULTIPLICITY 927#if EV_MULTIPLICITY
909 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 928 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
910#else 929#else
911 ev_default_default_loop_ptr = 1; 930 ev_default_loop_ptr = 1;
912#endif 931#endif
913 932
914 loop_init (EV_A_ flags); 933 loop_init (EV_A_ flags);
915 934
916 if (ev_method (EV_A)) 935 if (ev_method (EV_A))
… …
975 return 1; 994 return 1;
976 995
977 return 0; 996 return 0;
978} 997}
979 998
980static void 999inline void
981call_pending (EV_P) 1000call_pending (EV_P)
982{ 1001{
983 int pri; 1002 int pri;
984 1003
985 for (pri = NUMPRI; pri--; ) 1004 for (pri = NUMPRI; pri--; )
986 while (pendingcnt [pri]) 1005 while (pendingcnt [pri])
987 { 1006 {
988 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1007 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
989 1008
990 if (p->w) 1009 if (expect_true (p->w))
991 { 1010 {
992 p->w->pending = 0; 1011 p->w->pending = 0;
993 EV_CB_INVOKE (p->w, p->events); 1012 EV_CB_INVOKE (p->w, p->events);
994 } 1013 }
995 } 1014 }
996} 1015}
997 1016
998static void 1017inline void
999timers_reify (EV_P) 1018timers_reify (EV_P)
1000{ 1019{
1001 while (timercnt && ((WT)timers [0])->at <= mn_now) 1020 while (timercnt && ((WT)timers [0])->at <= mn_now)
1002 { 1021 {
1003 struct ev_timer *w = timers [0]; 1022 struct ev_timer *w = timers [0];
… …
1021 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1040 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1022 } 1041 }
1023} 1042}
1024 1043
1025#if EV_PERIODICS 1044#if EV_PERIODICS
1026static void 1045inline void
1027periodics_reify (EV_P) 1046periodics_reify (EV_P)
1028{ 1047{
1029 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1048 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1030 { 1049 {
1031 struct ev_periodic *w = periodics [0]; 1050 struct ev_periodic *w = periodics [0];
… …
1090 ev_rt_now = ev_time (); 1109 ev_rt_now = ev_time ();
1091 return 1; 1110 return 1;
1092 } 1111 }
1093} 1112}
1094 1113
1095static void 1114inline void
1096time_update (EV_P) 1115time_update (EV_P)
1097{ 1116{
1098 int i; 1117 int i;
1099 1118
1100#if EV_USE_MONOTONIC 1119#if EV_USE_MONOTONIC
… …
1211 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;
1212 if (block > to) block = to; 1231 if (block > to) block = to;
1213 } 1232 }
1214#endif 1233#endif
1215 1234
1216 if (block < 0.) block = 0.; 1235 if (expect_false (block < 0.)) block = 0.;
1217 } 1236 }
1218 1237
1219 method_poll (EV_A_ block); 1238 method_poll (EV_A_ block);
1220 1239
1221 /* update ev_rt_now, do magic */ 1240 /* update ev_rt_now, do magic */
… …
1230 /* queue idle watchers unless io or timers are pending */ 1249 /* queue idle watchers unless io or timers are pending */
1231 if (idlecnt && !any_pending (EV_A)) 1250 if (idlecnt && !any_pending (EV_A))
1232 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1251 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1233 1252
1234 /* queue check watchers, to be executed first */ 1253 /* queue check watchers, to be executed first */
1235 if (checkcnt) 1254 if (expect_false (checkcnt))
1236 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1255 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1237 1256
1238 call_pending (EV_A); 1257 call_pending (EV_A);
1239 1258
1240 if (loop_done) 1259 if (expect_false (loop_done))
1241 break; 1260 break;
1242 } 1261 }
1243 1262
1244 if (loop_done != 2) 1263 if (loop_done != 2)
1245 loop_done = 0; 1264 loop_done = 0;
… …
1307void 1326void
1308ev_io_start (EV_P_ struct ev_io *w) 1327ev_io_start (EV_P_ struct ev_io *w)
1309{ 1328{
1310 int fd = w->fd; 1329 int fd = w->fd;
1311 1330
1312 if (ev_is_active (w)) 1331 if (expect_false (ev_is_active (w)))
1313 return; 1332 return;
1314 1333
1315 assert (("ev_io_start called with negative fd", fd >= 0)); 1334 assert (("ev_io_start called with negative fd", fd >= 0));
1316 1335
1317 ev_start (EV_A_ (W)w, 1); 1336 ev_start (EV_A_ (W)w, 1);
… …
1323 1342
1324void 1343void
1325ev_io_stop (EV_P_ struct ev_io *w) 1344ev_io_stop (EV_P_ struct ev_io *w)
1326{ 1345{
1327 ev_clear_pending (EV_A_ (W)w); 1346 ev_clear_pending (EV_A_ (W)w);
1328 if (!ev_is_active (w)) 1347 if (expect_false (!ev_is_active (w)))
1329 return; 1348 return;
1330 1349
1331 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));
1332 1351
1333 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1352 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
… …
1337} 1356}
1338 1357
1339void 1358void
1340ev_timer_start (EV_P_ struct ev_timer *w) 1359ev_timer_start (EV_P_ struct ev_timer *w)
1341{ 1360{
1342 if (ev_is_active (w)) 1361 if (expect_false (ev_is_active (w)))
1343 return; 1362 return;
1344 1363
1345 ((WT)w)->at += mn_now; 1364 ((WT)w)->at += mn_now;
1346 1365
1347 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.));
… …
1356 1375
1357void 1376void
1358ev_timer_stop (EV_P_ struct ev_timer *w) 1377ev_timer_stop (EV_P_ struct ev_timer *w)
1359{ 1378{
1360 ev_clear_pending (EV_A_ (W)w); 1379 ev_clear_pending (EV_A_ (W)w);
1361 if (!ev_is_active (w)) 1380 if (expect_false (!ev_is_active (w)))
1362 return; 1381 return;
1363 1382
1364 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1383 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1365 1384
1366 if (((W)w)->active < timercnt--) 1385 if (expect_true (((W)w)->active < timercnt--))
1367 { 1386 {
1368 timers [((W)w)->active - 1] = timers [timercnt]; 1387 timers [((W)w)->active - 1] = timers [timercnt];
1369 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1388 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1370 } 1389 }
1371 1390
… …
1396 1415
1397#if EV_PERIODICS 1416#if EV_PERIODICS
1398void 1417void
1399ev_periodic_start (EV_P_ struct ev_periodic *w) 1418ev_periodic_start (EV_P_ struct ev_periodic *w)
1400{ 1419{
1401 if (ev_is_active (w)) 1420 if (expect_false (ev_is_active (w)))
1402 return; 1421 return;
1403 1422
1404 if (w->reschedule_cb) 1423 if (w->reschedule_cb)
1405 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1424 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1406 else if (w->interval) 1425 else if (w->interval)
… …
1420 1439
1421void 1440void
1422ev_periodic_stop (EV_P_ struct ev_periodic *w) 1441ev_periodic_stop (EV_P_ struct ev_periodic *w)
1423{ 1442{
1424 ev_clear_pending (EV_A_ (W)w); 1443 ev_clear_pending (EV_A_ (W)w);
1425 if (!ev_is_active (w)) 1444 if (expect_false (!ev_is_active (w)))
1426 return; 1445 return;
1427 1446
1428 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1447 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1429 1448
1430 if (((W)w)->active < periodiccnt--) 1449 if (expect_true (((W)w)->active < periodiccnt--))
1431 { 1450 {
1432 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1451 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1433 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1452 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1434 } 1453 }
1435 1454
… …
1446#endif 1465#endif
1447 1466
1448void 1467void
1449ev_idle_start (EV_P_ struct ev_idle *w) 1468ev_idle_start (EV_P_ struct ev_idle *w)
1450{ 1469{
1451 if (ev_is_active (w)) 1470 if (expect_false (ev_is_active (w)))
1452 return; 1471 return;
1453 1472
1454 ev_start (EV_A_ (W)w, ++idlecnt); 1473 ev_start (EV_A_ (W)w, ++idlecnt);
1455 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2); 1474 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1456 idles [idlecnt - 1] = w; 1475 idles [idlecnt - 1] = w;
… …
1458 1477
1459void 1478void
1460ev_idle_stop (EV_P_ struct ev_idle *w) 1479ev_idle_stop (EV_P_ struct ev_idle *w)
1461{ 1480{
1462 ev_clear_pending (EV_A_ (W)w); 1481 ev_clear_pending (EV_A_ (W)w);
1463 if (!ev_is_active (w)) 1482 if (expect_false (!ev_is_active (w)))
1464 return; 1483 return;
1465 1484
1466 idles [((W)w)->active - 1] = idles [--idlecnt]; 1485 idles [((W)w)->active - 1] = idles [--idlecnt];
1467 ev_stop (EV_A_ (W)w); 1486 ev_stop (EV_A_ (W)w);
1468} 1487}
1469 1488
1470void 1489void
1471ev_prepare_start (EV_P_ struct ev_prepare *w) 1490ev_prepare_start (EV_P_ struct ev_prepare *w)
1472{ 1491{
1473 if (ev_is_active (w)) 1492 if (expect_false (ev_is_active (w)))
1474 return; 1493 return;
1475 1494
1476 ev_start (EV_A_ (W)w, ++preparecnt); 1495 ev_start (EV_A_ (W)w, ++preparecnt);
1477 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 1496 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1478 prepares [preparecnt - 1] = w; 1497 prepares [preparecnt - 1] = w;
… …
1480 1499
1481void 1500void
1482ev_prepare_stop (EV_P_ struct ev_prepare *w) 1501ev_prepare_stop (EV_P_ struct ev_prepare *w)
1483{ 1502{
1484 ev_clear_pending (EV_A_ (W)w); 1503 ev_clear_pending (EV_A_ (W)w);
1485 if (!ev_is_active (w)) 1504 if (expect_false (!ev_is_active (w)))
1486 return; 1505 return;
1487 1506
1488 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1507 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1489 ev_stop (EV_A_ (W)w); 1508 ev_stop (EV_A_ (W)w);
1490} 1509}
1491 1510
1492void 1511void
1493ev_check_start (EV_P_ struct ev_check *w) 1512ev_check_start (EV_P_ struct ev_check *w)
1494{ 1513{
1495 if (ev_is_active (w)) 1514 if (expect_false (ev_is_active (w)))
1496 return; 1515 return;
1497 1516
1498 ev_start (EV_A_ (W)w, ++checkcnt); 1517 ev_start (EV_A_ (W)w, ++checkcnt);
1499 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2); 1518 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1500 checks [checkcnt - 1] = w; 1519 checks [checkcnt - 1] = w;
… …
1502 1521
1503void 1522void
1504ev_check_stop (EV_P_ struct ev_check *w) 1523ev_check_stop (EV_P_ struct ev_check *w)
1505{ 1524{
1506 ev_clear_pending (EV_A_ (W)w); 1525 ev_clear_pending (EV_A_ (W)w);
1507 if (!ev_is_active (w)) 1526 if (expect_false (!ev_is_active (w)))
1508 return; 1527 return;
1509 1528
1510 checks [((W)w)->active - 1] = checks [--checkcnt]; 1529 checks [((W)w)->active - 1] = checks [--checkcnt];
1511 ev_stop (EV_A_ (W)w); 1530 ev_stop (EV_A_ (W)w);
1512} 1531}
… …
1519ev_signal_start (EV_P_ struct ev_signal *w) 1538ev_signal_start (EV_P_ struct ev_signal *w)
1520{ 1539{
1521#if EV_MULTIPLICITY 1540#if EV_MULTIPLICITY
1522 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1541 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1523#endif 1542#endif
1524 if (ev_is_active (w)) 1543 if (expect_false (ev_is_active (w)))
1525 return; 1544 return;
1526 1545
1527 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));
1528 1547
1529 ev_start (EV_A_ (W)w, 1); 1548 ev_start (EV_A_ (W)w, 1);
… …
1546 1565
1547void 1566void
1548ev_signal_stop (EV_P_ struct ev_signal *w) 1567ev_signal_stop (EV_P_ struct ev_signal *w)
1549{ 1568{
1550 ev_clear_pending (EV_A_ (W)w); 1569 ev_clear_pending (EV_A_ (W)w);
1551 if (!ev_is_active (w)) 1570 if (expect_false (!ev_is_active (w)))
1552 return; 1571 return;
1553 1572
1554 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1573 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1555 ev_stop (EV_A_ (W)w); 1574 ev_stop (EV_A_ (W)w);
1556 1575
… …
1562ev_child_start (EV_P_ struct ev_child *w) 1581ev_child_start (EV_P_ struct ev_child *w)
1563{ 1582{
1564#if EV_MULTIPLICITY 1583#if EV_MULTIPLICITY
1565 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1584 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1566#endif 1585#endif
1567 if (ev_is_active (w)) 1586 if (expect_false (ev_is_active (w)))
1568 return; 1587 return;
1569 1588
1570 ev_start (EV_A_ (W)w, 1); 1589 ev_start (EV_A_ (W)w, 1);
1571 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1590 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1572} 1591}
1573 1592
1574void 1593void
1575ev_child_stop (EV_P_ struct ev_child *w) 1594ev_child_stop (EV_P_ struct ev_child *w)
1576{ 1595{
1577 ev_clear_pending (EV_A_ (W)w); 1596 ev_clear_pending (EV_A_ (W)w);
1578 if (!ev_is_active (w)) 1597 if (expect_false (!ev_is_active (w)))
1579 return; 1598 return;
1580 1599
1581 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1600 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1582 ev_stop (EV_A_ (W)w); 1601 ev_stop (EV_A_ (W)w);
1583} 1602}
… …
1620void 1639void
1621ev_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)
1622{ 1641{
1623 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));
1624 1643
1625 if (!once) 1644 if (expect_false (!once))
1645 {
1626 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1646 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1627 else 1647 return;
1628 { 1648 }
1649
1629 once->cb = cb; 1650 once->cb = cb;
1630 once->arg = arg; 1651 once->arg = arg;
1631 1652
1632 ev_init (&once->io, once_cb_io); 1653 ev_init (&once->io, once_cb_io);
1633 if (fd >= 0) 1654 if (fd >= 0)
1634 { 1655 {
1635 ev_io_set (&once->io, fd, events); 1656 ev_io_set (&once->io, fd, events);
1636 ev_io_start (EV_A_ &once->io); 1657 ev_io_start (EV_A_ &once->io);
1637 } 1658 }
1638 1659
1639 ev_init (&once->to, once_cb_to); 1660 ev_init (&once->to, once_cb_to);
1640 if (timeout >= 0.) 1661 if (timeout >= 0.)
1641 { 1662 {
1642 ev_timer_set (&once->to, timeout, 0.); 1663 ev_timer_set (&once->to, timeout, 0.);
1643 ev_timer_start (EV_A_ &once->to); 1664 ev_timer_start (EV_A_ &once->to);
1644 }
1645 } 1665 }
1646} 1666}
1647 1667
1648#ifdef __cplusplus 1668#ifdef __cplusplus
1649} 1669}

Diff Legend

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