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

Comparing libev/ev.c (file contents):
Revision 1.118 by root, Fri Nov 16 01:33:54 2007 UTC vs.
Revision 1.126 by root, Sun Nov 18 01:25:23 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# if HAVE_SELECT && HAVE_SYS_SELECT_H && !defined (EV_USE_SELECT)
49# define EV_USE_SELECT 1 56# define EV_USE_SELECT 1
57# else
58# define EV_USE_SELECT 0
50# endif 59# endif
51 60
52# if HAVE_POLL && HAVE_POLL_H && !defined (EV_USE_POLL) 61# if HAVE_POLL && HAVE_POLL_H && !defined (EV_USE_POLL)
53# define EV_USE_POLL 1 62# define EV_USE_POLL 1
63# else
64# define EV_USE_POLL 0
54# endif 65# endif
55 66
56# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H && !defined (EV_USE_EPOLL) 67# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H && !defined (EV_USE_EPOLL)
57# define EV_USE_EPOLL 1 68# define EV_USE_EPOLL 1
69# else
70# define EV_USE_EPOLL 0
58# endif 71# endif
59 72
60# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE) 73# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE)
61# define EV_USE_KQUEUE 1 74# define EV_USE_KQUEUE 1
75# else
76# define EV_USE_KQUEUE 0
62# endif 77# endif
63 78
64# if HAVE_PORT_H && HAVE_PORT_H && HAVE_PORT_CREATE && !defined (EV_USE_PORT) 79# if HAVE_PORT_H && HAVE_PORT_CREATE && !defined (EV_USE_PORT)
65# define EV_USE_PORT 1 80# define EV_USE_PORT 1
81# else
82# define EV_USE_PORT 0
66# endif 83# endif
67 84
68#endif 85#endif
69 86
70#include <math.h> 87#include <math.h>
94#endif 111#endif
95 112
96/**/ 113/**/
97 114
98#ifndef EV_USE_MONOTONIC 115#ifndef EV_USE_MONOTONIC
99# define EV_USE_MONOTONIC 1 116# define EV_USE_MONOTONIC 0
100#endif 117#endif
101 118
102#ifndef EV_USE_REALTIME 119#ifndef EV_USE_REALTIME
103# define EV_USE_REALTIME 1 120# define EV_USE_REALTIME 0
104#endif 121#endif
105 122
106#ifndef EV_USE_SELECT 123#ifndef EV_USE_SELECT
107# define EV_USE_SELECT 1 124# define EV_USE_SELECT 1
108# define EV_SELECT_USE_FD_SET 1
109#endif 125#endif
110 126
111#ifndef EV_USE_POLL 127#ifndef EV_USE_POLL
112# ifdef _WIN32 128# ifdef _WIN32
113# define EV_USE_POLL 0 129# define EV_USE_POLL 0
151#endif 167#endif
152 168
153/**/ 169/**/
154 170
155#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 171#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
156#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */ 172#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
157#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */ 173#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
158/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */ 174/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
159 175
160#ifdef EV_H 176#ifdef EV_H
161# include EV_H 177# include EV_H
162#else 178#else
163# include "ev.h" 179# include "ev.h"
164#endif 180#endif
165 181
166#if __GNUC__ >= 3 182#if __GNUC__ >= 3
167# define expect(expr,value) __builtin_expect ((expr),(value)) 183# define expect(expr,value) __builtin_expect ((expr),(value))
168# define inline inline 184# define inline static inline
169#else 185#else
170# define expect(expr,value) (expr) 186# define expect(expr,value) (expr)
171# define inline static 187# define inline static
172#endif 188#endif
173 189
367void 383void
368ev_feed_event (EV_P_ void *w, int revents) 384ev_feed_event (EV_P_ void *w, int revents)
369{ 385{
370 W w_ = (W)w; 386 W w_ = (W)w;
371 387
372 if (w_->pending) 388 if (expect_false (w_->pending))
373 { 389 {
374 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 390 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
375 return; 391 return;
376 } 392 }
377 393
411 fd_event (EV_A_ fd, revents); 427 fd_event (EV_A_ fd, revents);
412} 428}
413 429
414/*****************************************************************************/ 430/*****************************************************************************/
415 431
416static void 432inline void
417fd_reify (EV_P) 433fd_reify (EV_P)
418{ 434{
419 int i; 435 int i;
420 436
421 for (i = 0; i < fdchangecnt; ++i) 437 for (i = 0; i < fdchangecnt; ++i)
448} 464}
449 465
450static void 466static void
451fd_change (EV_P_ int fd) 467fd_change (EV_P_ int fd)
452{ 468{
453 if (anfds [fd].reify) 469 if (expect_false (anfds [fd].reify))
454 return; 470 return;
455 471
456 anfds [fd].reify = 1; 472 anfds [fd].reify = 1;
457 473
458 ++fdchangecnt; 474 ++fdchangecnt;
470 ev_io_stop (EV_A_ w); 486 ev_io_stop (EV_A_ w);
471 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 487 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
472 } 488 }
473} 489}
474 490
475static int 491inline int
476fd_valid (int fd) 492fd_valid (int fd)
477{ 493{
478#ifdef _WIN32 494#ifdef _WIN32
479 return _get_osfhandle (fd) != -1; 495 return _get_osfhandle (fd) != -1;
480#else 496#else
649 for (signum = signalmax; signum--; ) 665 for (signum = signalmax; signum--; )
650 if (signals [signum].gotsig) 666 if (signals [signum].gotsig)
651 ev_feed_signal_event (EV_A_ signum + 1); 667 ev_feed_signal_event (EV_A_ signum + 1);
652} 668}
653 669
654inline void 670static void
655fd_intern (int fd) 671fd_intern (int fd)
656{ 672{
657#ifdef _WIN32 673#ifdef _WIN32
658 int arg = 1; 674 int arg = 1;
659 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 675 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
810 ev_init (&sigev, sigcb); 826 ev_init (&sigev, sigcb);
811 ev_set_priority (&sigev, EV_MAXPRI); 827 ev_set_priority (&sigev, EV_MAXPRI);
812 } 828 }
813} 829}
814 830
815void 831static void
816loop_destroy (EV_P) 832loop_destroy (EV_P)
817{ 833{
818 int i; 834 int i;
819 835
820#if EV_USE_PORT 836#if EV_USE_PORT
911 927
912#endif 928#endif
913 929
914#if EV_MULTIPLICITY 930#if EV_MULTIPLICITY
915struct ev_loop * 931struct ev_loop *
916ev_default_loop_ (unsigned int flags) 932ev_default_loop_init (unsigned int flags)
917#else 933#else
918int 934int
919ev_default_loop (unsigned int flags) 935ev_default_loop (unsigned int flags)
920#endif 936#endif
921{ 937{
995 return 1; 1011 return 1;
996 1012
997 return 0; 1013 return 0;
998} 1014}
999 1015
1000static void 1016inline void
1001call_pending (EV_P) 1017call_pending (EV_P)
1002{ 1018{
1003 int pri; 1019 int pri;
1004 1020
1005 for (pri = NUMPRI; pri--; ) 1021 for (pri = NUMPRI; pri--; )
1006 while (pendingcnt [pri]) 1022 while (pendingcnt [pri])
1007 { 1023 {
1008 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1024 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1009 1025
1010 if (p->w) 1026 if (expect_true (p->w))
1011 { 1027 {
1012 p->w->pending = 0; 1028 p->w->pending = 0;
1013 EV_CB_INVOKE (p->w, p->events); 1029 EV_CB_INVOKE (p->w, p->events);
1014 } 1030 }
1015 } 1031 }
1016} 1032}
1017 1033
1018static void 1034inline void
1019timers_reify (EV_P) 1035timers_reify (EV_P)
1020{ 1036{
1021 while (timercnt && ((WT)timers [0])->at <= mn_now) 1037 while (timercnt && ((WT)timers [0])->at <= mn_now)
1022 { 1038 {
1023 struct ev_timer *w = timers [0]; 1039 struct ev_timer *w = timers [0];
1041 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1057 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1042 } 1058 }
1043} 1059}
1044 1060
1045#if EV_PERIODICS 1061#if EV_PERIODICS
1046static void 1062inline void
1047periodics_reify (EV_P) 1063periodics_reify (EV_P)
1048{ 1064{
1049 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1065 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1050 { 1066 {
1051 struct ev_periodic *w = periodics [0]; 1067 struct ev_periodic *w = periodics [0];
1110 ev_rt_now = ev_time (); 1126 ev_rt_now = ev_time ();
1111 return 1; 1127 return 1;
1112 } 1128 }
1113} 1129}
1114 1130
1115static void 1131inline void
1116time_update (EV_P) 1132time_update (EV_P)
1117{ 1133{
1118 int i; 1134 int i;
1119 1135
1120#if EV_USE_MONOTONIC 1136#if EV_USE_MONOTONIC
1231 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1247 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1232 if (block > to) block = to; 1248 if (block > to) block = to;
1233 } 1249 }
1234#endif 1250#endif
1235 1251
1236 if (block < 0.) block = 0.; 1252 if (expect_false (block < 0.)) block = 0.;
1237 } 1253 }
1238 1254
1239 method_poll (EV_A_ block); 1255 method_poll (EV_A_ block);
1240 1256
1241 /* update ev_rt_now, do magic */ 1257 /* update ev_rt_now, do magic */
1250 /* queue idle watchers unless io or timers are pending */ 1266 /* queue idle watchers unless io or timers are pending */
1251 if (idlecnt && !any_pending (EV_A)) 1267 if (idlecnt && !any_pending (EV_A))
1252 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1268 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1253 1269
1254 /* queue check watchers, to be executed first */ 1270 /* queue check watchers, to be executed first */
1255 if (checkcnt) 1271 if (expect_false (checkcnt))
1256 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1272 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1257 1273
1258 call_pending (EV_A); 1274 call_pending (EV_A);
1259 1275
1260 if (loop_done) 1276 if (expect_false (loop_done))
1261 break; 1277 break;
1262 } 1278 }
1263 1279
1264 if (loop_done != 2) 1280 if (loop_done != 2)
1265 loop_done = 0; 1281 loop_done = 0;
1327void 1343void
1328ev_io_start (EV_P_ struct ev_io *w) 1344ev_io_start (EV_P_ struct ev_io *w)
1329{ 1345{
1330 int fd = w->fd; 1346 int fd = w->fd;
1331 1347
1332 if (ev_is_active (w)) 1348 if (expect_false (ev_is_active (w)))
1333 return; 1349 return;
1334 1350
1335 assert (("ev_io_start called with negative fd", fd >= 0)); 1351 assert (("ev_io_start called with negative fd", fd >= 0));
1336 1352
1337 ev_start (EV_A_ (W)w, 1); 1353 ev_start (EV_A_ (W)w, 1);
1343 1359
1344void 1360void
1345ev_io_stop (EV_P_ struct ev_io *w) 1361ev_io_stop (EV_P_ struct ev_io *w)
1346{ 1362{
1347 ev_clear_pending (EV_A_ (W)w); 1363 ev_clear_pending (EV_A_ (W)w);
1348 if (!ev_is_active (w)) 1364 if (expect_false (!ev_is_active (w)))
1349 return; 1365 return;
1350 1366
1351 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1367 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1352 1368
1353 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1369 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1357} 1373}
1358 1374
1359void 1375void
1360ev_timer_start (EV_P_ struct ev_timer *w) 1376ev_timer_start (EV_P_ struct ev_timer *w)
1361{ 1377{
1362 if (ev_is_active (w)) 1378 if (expect_false (ev_is_active (w)))
1363 return; 1379 return;
1364 1380
1365 ((WT)w)->at += mn_now; 1381 ((WT)w)->at += mn_now;
1366 1382
1367 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1383 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1376 1392
1377void 1393void
1378ev_timer_stop (EV_P_ struct ev_timer *w) 1394ev_timer_stop (EV_P_ struct ev_timer *w)
1379{ 1395{
1380 ev_clear_pending (EV_A_ (W)w); 1396 ev_clear_pending (EV_A_ (W)w);
1381 if (!ev_is_active (w)) 1397 if (expect_false (!ev_is_active (w)))
1382 return; 1398 return;
1383 1399
1384 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1400 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1385 1401
1386 if (((W)w)->active < timercnt--) 1402 if (expect_true (((W)w)->active < timercnt--))
1387 { 1403 {
1388 timers [((W)w)->active - 1] = timers [timercnt]; 1404 timers [((W)w)->active - 1] = timers [timercnt];
1389 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1405 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1390 } 1406 }
1391 1407
1416 1432
1417#if EV_PERIODICS 1433#if EV_PERIODICS
1418void 1434void
1419ev_periodic_start (EV_P_ struct ev_periodic *w) 1435ev_periodic_start (EV_P_ struct ev_periodic *w)
1420{ 1436{
1421 if (ev_is_active (w)) 1437 if (expect_false (ev_is_active (w)))
1422 return; 1438 return;
1423 1439
1424 if (w->reschedule_cb) 1440 if (w->reschedule_cb)
1425 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1441 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1426 else if (w->interval) 1442 else if (w->interval)
1440 1456
1441void 1457void
1442ev_periodic_stop (EV_P_ struct ev_periodic *w) 1458ev_periodic_stop (EV_P_ struct ev_periodic *w)
1443{ 1459{
1444 ev_clear_pending (EV_A_ (W)w); 1460 ev_clear_pending (EV_A_ (W)w);
1445 if (!ev_is_active (w)) 1461 if (expect_false (!ev_is_active (w)))
1446 return; 1462 return;
1447 1463
1448 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1464 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1449 1465
1450 if (((W)w)->active < periodiccnt--) 1466 if (expect_true (((W)w)->active < periodiccnt--))
1451 { 1467 {
1452 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1468 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1453 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1469 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1454 } 1470 }
1455 1471
1466#endif 1482#endif
1467 1483
1468void 1484void
1469ev_idle_start (EV_P_ struct ev_idle *w) 1485ev_idle_start (EV_P_ struct ev_idle *w)
1470{ 1486{
1471 if (ev_is_active (w)) 1487 if (expect_false (ev_is_active (w)))
1472 return; 1488 return;
1473 1489
1474 ev_start (EV_A_ (W)w, ++idlecnt); 1490 ev_start (EV_A_ (W)w, ++idlecnt);
1475 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2); 1491 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1476 idles [idlecnt - 1] = w; 1492 idles [idlecnt - 1] = w;
1478 1494
1479void 1495void
1480ev_idle_stop (EV_P_ struct ev_idle *w) 1496ev_idle_stop (EV_P_ struct ev_idle *w)
1481{ 1497{
1482 ev_clear_pending (EV_A_ (W)w); 1498 ev_clear_pending (EV_A_ (W)w);
1483 if (!ev_is_active (w)) 1499 if (expect_false (!ev_is_active (w)))
1484 return; 1500 return;
1485 1501
1486 idles [((W)w)->active - 1] = idles [--idlecnt]; 1502 idles [((W)w)->active - 1] = idles [--idlecnt];
1487 ev_stop (EV_A_ (W)w); 1503 ev_stop (EV_A_ (W)w);
1488} 1504}
1489 1505
1490void 1506void
1491ev_prepare_start (EV_P_ struct ev_prepare *w) 1507ev_prepare_start (EV_P_ struct ev_prepare *w)
1492{ 1508{
1493 if (ev_is_active (w)) 1509 if (expect_false (ev_is_active (w)))
1494 return; 1510 return;
1495 1511
1496 ev_start (EV_A_ (W)w, ++preparecnt); 1512 ev_start (EV_A_ (W)w, ++preparecnt);
1497 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 1513 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1498 prepares [preparecnt - 1] = w; 1514 prepares [preparecnt - 1] = w;
1500 1516
1501void 1517void
1502ev_prepare_stop (EV_P_ struct ev_prepare *w) 1518ev_prepare_stop (EV_P_ struct ev_prepare *w)
1503{ 1519{
1504 ev_clear_pending (EV_A_ (W)w); 1520 ev_clear_pending (EV_A_ (W)w);
1505 if (!ev_is_active (w)) 1521 if (expect_false (!ev_is_active (w)))
1506 return; 1522 return;
1507 1523
1508 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1524 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1509 ev_stop (EV_A_ (W)w); 1525 ev_stop (EV_A_ (W)w);
1510} 1526}
1511 1527
1512void 1528void
1513ev_check_start (EV_P_ struct ev_check *w) 1529ev_check_start (EV_P_ struct ev_check *w)
1514{ 1530{
1515 if (ev_is_active (w)) 1531 if (expect_false (ev_is_active (w)))
1516 return; 1532 return;
1517 1533
1518 ev_start (EV_A_ (W)w, ++checkcnt); 1534 ev_start (EV_A_ (W)w, ++checkcnt);
1519 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2); 1535 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1520 checks [checkcnt - 1] = w; 1536 checks [checkcnt - 1] = w;
1522 1538
1523void 1539void
1524ev_check_stop (EV_P_ struct ev_check *w) 1540ev_check_stop (EV_P_ struct ev_check *w)
1525{ 1541{
1526 ev_clear_pending (EV_A_ (W)w); 1542 ev_clear_pending (EV_A_ (W)w);
1527 if (!ev_is_active (w)) 1543 if (expect_false (!ev_is_active (w)))
1528 return; 1544 return;
1529 1545
1530 checks [((W)w)->active - 1] = checks [--checkcnt]; 1546 checks [((W)w)->active - 1] = checks [--checkcnt];
1531 ev_stop (EV_A_ (W)w); 1547 ev_stop (EV_A_ (W)w);
1532} 1548}
1539ev_signal_start (EV_P_ struct ev_signal *w) 1555ev_signal_start (EV_P_ struct ev_signal *w)
1540{ 1556{
1541#if EV_MULTIPLICITY 1557#if EV_MULTIPLICITY
1542 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1558 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1543#endif 1559#endif
1544 if (ev_is_active (w)) 1560 if (expect_false (ev_is_active (w)))
1545 return; 1561 return;
1546 1562
1547 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1563 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1548 1564
1549 ev_start (EV_A_ (W)w, 1); 1565 ev_start (EV_A_ (W)w, 1);
1566 1582
1567void 1583void
1568ev_signal_stop (EV_P_ struct ev_signal *w) 1584ev_signal_stop (EV_P_ struct ev_signal *w)
1569{ 1585{
1570 ev_clear_pending (EV_A_ (W)w); 1586 ev_clear_pending (EV_A_ (W)w);
1571 if (!ev_is_active (w)) 1587 if (expect_false (!ev_is_active (w)))
1572 return; 1588 return;
1573 1589
1574 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1590 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1575 ev_stop (EV_A_ (W)w); 1591 ev_stop (EV_A_ (W)w);
1576 1592
1582ev_child_start (EV_P_ struct ev_child *w) 1598ev_child_start (EV_P_ struct ev_child *w)
1583{ 1599{
1584#if EV_MULTIPLICITY 1600#if EV_MULTIPLICITY
1585 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1601 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1586#endif 1602#endif
1587 if (ev_is_active (w)) 1603 if (expect_false (ev_is_active (w)))
1588 return; 1604 return;
1589 1605
1590 ev_start (EV_A_ (W)w, 1); 1606 ev_start (EV_A_ (W)w, 1);
1591 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1607 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1592} 1608}
1593 1609
1594void 1610void
1595ev_child_stop (EV_P_ struct ev_child *w) 1611ev_child_stop (EV_P_ struct ev_child *w)
1596{ 1612{
1597 ev_clear_pending (EV_A_ (W)w); 1613 ev_clear_pending (EV_A_ (W)w);
1598 if (!ev_is_active (w)) 1614 if (expect_false (!ev_is_active (w)))
1599 return; 1615 return;
1600 1616
1601 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1617 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1602 ev_stop (EV_A_ (W)w); 1618 ev_stop (EV_A_ (W)w);
1603} 1619}
1640void 1656void
1641ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1657ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1642{ 1658{
1643 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 1659 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1644 1660
1645 if (!once) 1661 if (expect_false (!once))
1662 {
1646 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1663 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1647 else 1664 return;
1648 { 1665 }
1666
1649 once->cb = cb; 1667 once->cb = cb;
1650 once->arg = arg; 1668 once->arg = arg;
1651 1669
1652 ev_init (&once->io, once_cb_io); 1670 ev_init (&once->io, once_cb_io);
1653 if (fd >= 0) 1671 if (fd >= 0)
1654 { 1672 {
1655 ev_io_set (&once->io, fd, events); 1673 ev_io_set (&once->io, fd, events);
1656 ev_io_start (EV_A_ &once->io); 1674 ev_io_start (EV_A_ &once->io);
1657 } 1675 }
1658 1676
1659 ev_init (&once->to, once_cb_to); 1677 ev_init (&once->to, once_cb_to);
1660 if (timeout >= 0.) 1678 if (timeout >= 0.)
1661 { 1679 {
1662 ev_timer_set (&once->to, timeout, 0.); 1680 ev_timer_set (&once->to, timeout, 0.);
1663 ev_timer_start (EV_A_ &once->to); 1681 ev_timer_start (EV_A_ &once->to);
1664 }
1665 } 1682 }
1666} 1683}
1667 1684
1668#ifdef __cplusplus 1685#ifdef __cplusplus
1669} 1686}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines