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.128 by root, Thu Nov 22 12:28:27 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>
… …
162# include "ev.h" 189# include "ev.h"
163#endif 190#endif
164 191
165#if __GNUC__ >= 3 192#if __GNUC__ >= 3
166# define expect(expr,value) __builtin_expect ((expr),(value)) 193# define expect(expr,value) __builtin_expect ((expr),(value))
167# define inline inline 194# define inline static inline
168#else 195#else
169# define expect(expr,value) (expr) 196# define expect(expr,value) (expr)
170# define inline static 197# define inline static
171#endif 198#endif
172 199
… …
366void 393void
367ev_feed_event (EV_P_ void *w, int revents) 394ev_feed_event (EV_P_ void *w, int revents)
368{ 395{
369 W w_ = (W)w; 396 W w_ = (W)w;
370 397
371 if (w_->pending) 398 if (expect_false (w_->pending))
372 { 399 {
373 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 400 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
374 return; 401 return;
375 } 402 }
376 403
… …
410 fd_event (EV_A_ fd, revents); 437 fd_event (EV_A_ fd, revents);
411} 438}
412 439
413/*****************************************************************************/ 440/*****************************************************************************/
414 441
415static void 442inline void
416fd_reify (EV_P) 443fd_reify (EV_P)
417{ 444{
418 int i; 445 int i;
419 446
420 for (i = 0; i < fdchangecnt; ++i) 447 for (i = 0; i < fdchangecnt; ++i)
… …
447} 474}
448 475
449static void 476static void
450fd_change (EV_P_ int fd) 477fd_change (EV_P_ int fd)
451{ 478{
452 if (anfds [fd].reify) 479 if (expect_false (anfds [fd].reify))
453 return; 480 return;
454 481
455 anfds [fd].reify = 1; 482 anfds [fd].reify = 1;
456 483
457 ++fdchangecnt; 484 ++fdchangecnt;
… …
469 ev_io_stop (EV_A_ w); 496 ev_io_stop (EV_A_ w);
470 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 497 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
471 } 498 }
472} 499}
473 500
474static int 501inline int
475fd_valid (int fd) 502fd_valid (int fd)
476{ 503{
477#ifdef _WIN32 504#ifdef _WIN32
478 return _get_osfhandle (fd) != -1; 505 return _get_osfhandle (fd) != -1;
479#else 506#else
… …
648 for (signum = signalmax; signum--; ) 675 for (signum = signalmax; signum--; )
649 if (signals [signum].gotsig) 676 if (signals [signum].gotsig)
650 ev_feed_signal_event (EV_A_ signum + 1); 677 ev_feed_signal_event (EV_A_ signum + 1);
651} 678}
652 679
653inline void 680static void
654fd_intern (int fd) 681fd_intern (int fd)
655{ 682{
656#ifdef _WIN32 683#ifdef _WIN32
657 int arg = 1; 684 int arg = 1;
658 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 685 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
781 ev_rt_now = ev_time (); 808 ev_rt_now = ev_time ();
782 mn_now = get_clock (); 809 mn_now = get_clock ();
783 now_floor = mn_now; 810 now_floor = mn_now;
784 rtmn_diff = ev_rt_now - mn_now; 811 rtmn_diff = ev_rt_now - mn_now;
785 812
786 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS")) 813 if (!(flags & EVFLAG_NOENV)
814 && !enable_secure ()
815 && getenv ("LIBEV_FLAGS"))
787 flags = atoi (getenv ("LIBEV_FLAGS")); 816 flags = atoi (getenv ("LIBEV_FLAGS"));
788 817
789 if (!(flags & 0x0000ffff)) 818 if (!(flags & EVMETHOD_ALL))
790 flags |= 0x0000ffff; 819 {
820 flags |= EVMETHOD_ALL;
821#if EV_USE_KQUEUE && !defined (__NetBSD__)
822 /* kqueue is borked on everything but netbsd apparently */
823 /* it usually doesn't work correctly on anything but sockets and pipes */
824 flags &= ~EVMETHOD_KQUEUE;
825#endif
826 }
791 827
792 method = 0; 828 method = 0;
793#if EV_USE_PORT 829#if EV_USE_PORT
794 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags); 830 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags);
795#endif 831#endif
… …
809 ev_init (&sigev, sigcb); 845 ev_init (&sigev, sigcb);
810 ev_set_priority (&sigev, EV_MAXPRI); 846 ev_set_priority (&sigev, EV_MAXPRI);
811 } 847 }
812} 848}
813 849
814void 850static void
815loop_destroy (EV_P) 851loop_destroy (EV_P)
816{ 852{
817 int i; 853 int i;
818 854
819#if EV_USE_PORT 855#if EV_USE_PORT
… …
910 946
911#endif 947#endif
912 948
913#if EV_MULTIPLICITY 949#if EV_MULTIPLICITY
914struct ev_loop * 950struct ev_loop *
915ev_default_loop_ (unsigned int flags) 951ev_default_loop_init (unsigned int flags)
916#else 952#else
917int 953int
918ev_default_loop (unsigned int flags) 954ev_default_loop (unsigned int flags)
919#endif 955#endif
920{ 956{
… …
1012 EV_CB_INVOKE (p->w, p->events); 1048 EV_CB_INVOKE (p->w, p->events);
1013 } 1049 }
1014 } 1050 }
1015} 1051}
1016 1052
1017static void 1053inline void
1018timers_reify (EV_P) 1054timers_reify (EV_P)
1019{ 1055{
1020 while (timercnt && ((WT)timers [0])->at <= mn_now) 1056 while (timercnt && ((WT)timers [0])->at <= mn_now)
1021 { 1057 {
1022 struct ev_timer *w = timers [0]; 1058 struct ev_timer *w = timers [0];
… …
1040 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1076 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1041 } 1077 }
1042} 1078}
1043 1079
1044#if EV_PERIODICS 1080#if EV_PERIODICS
1045static void 1081inline void
1046periodics_reify (EV_P) 1082periodics_reify (EV_P)
1047{ 1083{
1048 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1084 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1049 { 1085 {
1050 struct ev_periodic *w = periodics [0]; 1086 struct ev_periodic *w = periodics [0];
… …
1109 ev_rt_now = ev_time (); 1145 ev_rt_now = ev_time ();
1110 return 1; 1146 return 1;
1111 } 1147 }
1112} 1148}
1113 1149
1114static void 1150inline void
1115time_update (EV_P) 1151time_update (EV_P)
1116{ 1152{
1117 int i; 1153 int i;
1118 1154
1119#if EV_USE_MONOTONIC 1155#if EV_USE_MONOTONIC
… …
1230 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1266 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1231 if (block > to) block = to; 1267 if (block > to) block = to;
1232 } 1268 }
1233#endif 1269#endif
1234 1270
1235 if (block < 0.) block = 0.; 1271 if (expect_false (block < 0.)) block = 0.;
1236 } 1272 }
1237 1273
1238 method_poll (EV_A_ block); 1274 method_poll (EV_A_ block);
1239 1275
1240 /* update ev_rt_now, do magic */ 1276 /* update ev_rt_now, do magic */
… …
1249 /* queue idle watchers unless io or timers are pending */ 1285 /* queue idle watchers unless io or timers are pending */
1250 if (idlecnt && !any_pending (EV_A)) 1286 if (idlecnt && !any_pending (EV_A))
1251 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1287 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1252 1288
1253 /* queue check watchers, to be executed first */ 1289 /* queue check watchers, to be executed first */
1254 if (checkcnt) 1290 if (expect_false (checkcnt))
1255 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1291 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1256 1292
1257 call_pending (EV_A); 1293 call_pending (EV_A);
1258 1294
1259 if (loop_done) 1295 if (expect_false (loop_done))
1260 break; 1296 break;
1261 } 1297 }
1262 1298
1263 if (loop_done != 2) 1299 if (loop_done != 2)
1264 loop_done = 0; 1300 loop_done = 0;
… …
1326void 1362void
1327ev_io_start (EV_P_ struct ev_io *w) 1363ev_io_start (EV_P_ struct ev_io *w)
1328{ 1364{
1329 int fd = w->fd; 1365 int fd = w->fd;
1330 1366
1331 if (ev_is_active (w)) 1367 if (expect_false (ev_is_active (w)))
1332 return; 1368 return;
1333 1369
1334 assert (("ev_io_start called with negative fd", fd >= 0)); 1370 assert (("ev_io_start called with negative fd", fd >= 0));
1335 1371
1336 ev_start (EV_A_ (W)w, 1); 1372 ev_start (EV_A_ (W)w, 1);
… …
1342 1378
1343void 1379void
1344ev_io_stop (EV_P_ struct ev_io *w) 1380ev_io_stop (EV_P_ struct ev_io *w)
1345{ 1381{
1346 ev_clear_pending (EV_A_ (W)w); 1382 ev_clear_pending (EV_A_ (W)w);
1347 if (!ev_is_active (w)) 1383 if (expect_false (!ev_is_active (w)))
1348 return; 1384 return;
1349 1385
1350 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1386 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1351 1387
1352 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1388 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
… …
1356} 1392}
1357 1393
1358void 1394void
1359ev_timer_start (EV_P_ struct ev_timer *w) 1395ev_timer_start (EV_P_ struct ev_timer *w)
1360{ 1396{
1361 if (ev_is_active (w)) 1397 if (expect_false (ev_is_active (w)))
1362 return; 1398 return;
1363 1399
1364 ((WT)w)->at += mn_now; 1400 ((WT)w)->at += mn_now;
1365 1401
1366 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1402 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
… …
1375 1411
1376void 1412void
1377ev_timer_stop (EV_P_ struct ev_timer *w) 1413ev_timer_stop (EV_P_ struct ev_timer *w)
1378{ 1414{
1379 ev_clear_pending (EV_A_ (W)w); 1415 ev_clear_pending (EV_A_ (W)w);
1380 if (!ev_is_active (w)) 1416 if (expect_false (!ev_is_active (w)))
1381 return; 1417 return;
1382 1418
1383 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1419 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1384 1420
1385 if (((W)w)->active < timercnt--) 1421 if (expect_true (((W)w)->active < timercnt--))
1386 { 1422 {
1387 timers [((W)w)->active - 1] = timers [timercnt]; 1423 timers [((W)w)->active - 1] = timers [timercnt];
1388 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1424 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1389 } 1425 }
1390 1426
… …
1415 1451
1416#if EV_PERIODICS 1452#if EV_PERIODICS
1417void 1453void
1418ev_periodic_start (EV_P_ struct ev_periodic *w) 1454ev_periodic_start (EV_P_ struct ev_periodic *w)
1419{ 1455{
1420 if (ev_is_active (w)) 1456 if (expect_false (ev_is_active (w)))
1421 return; 1457 return;
1422 1458
1423 if (w->reschedule_cb) 1459 if (w->reschedule_cb)
1424 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1460 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1425 else if (w->interval) 1461 else if (w->interval)
… …
1439 1475
1440void 1476void
1441ev_periodic_stop (EV_P_ struct ev_periodic *w) 1477ev_periodic_stop (EV_P_ struct ev_periodic *w)
1442{ 1478{
1443 ev_clear_pending (EV_A_ (W)w); 1479 ev_clear_pending (EV_A_ (W)w);
1444 if (!ev_is_active (w)) 1480 if (expect_false (!ev_is_active (w)))
1445 return; 1481 return;
1446 1482
1447 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1483 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1448 1484
1449 if (((W)w)->active < periodiccnt--) 1485 if (expect_true (((W)w)->active < periodiccnt--))
1450 { 1486 {
1451 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1487 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1452 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1488 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1453 } 1489 }
1454 1490
… …
1465#endif 1501#endif
1466 1502
1467void 1503void
1468ev_idle_start (EV_P_ struct ev_idle *w) 1504ev_idle_start (EV_P_ struct ev_idle *w)
1469{ 1505{
1470 if (ev_is_active (w)) 1506 if (expect_false (ev_is_active (w)))
1471 return; 1507 return;
1472 1508
1473 ev_start (EV_A_ (W)w, ++idlecnt); 1509 ev_start (EV_A_ (W)w, ++idlecnt);
1474 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2); 1510 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1475 idles [idlecnt - 1] = w; 1511 idles [idlecnt - 1] = w;
… …
1477 1513
1478void 1514void
1479ev_idle_stop (EV_P_ struct ev_idle *w) 1515ev_idle_stop (EV_P_ struct ev_idle *w)
1480{ 1516{
1481 ev_clear_pending (EV_A_ (W)w); 1517 ev_clear_pending (EV_A_ (W)w);
1482 if (!ev_is_active (w)) 1518 if (expect_false (!ev_is_active (w)))
1483 return; 1519 return;
1484 1520
1485 idles [((W)w)->active - 1] = idles [--idlecnt]; 1521 idles [((W)w)->active - 1] = idles [--idlecnt];
1486 ev_stop (EV_A_ (W)w); 1522 ev_stop (EV_A_ (W)w);
1487} 1523}
1488 1524
1489void 1525void
1490ev_prepare_start (EV_P_ struct ev_prepare *w) 1526ev_prepare_start (EV_P_ struct ev_prepare *w)
1491{ 1527{
1492 if (ev_is_active (w)) 1528 if (expect_false (ev_is_active (w)))
1493 return; 1529 return;
1494 1530
1495 ev_start (EV_A_ (W)w, ++preparecnt); 1531 ev_start (EV_A_ (W)w, ++preparecnt);
1496 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 1532 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1497 prepares [preparecnt - 1] = w; 1533 prepares [preparecnt - 1] = w;
… …
1499 1535
1500void 1536void
1501ev_prepare_stop (EV_P_ struct ev_prepare *w) 1537ev_prepare_stop (EV_P_ struct ev_prepare *w)
1502{ 1538{
1503 ev_clear_pending (EV_A_ (W)w); 1539 ev_clear_pending (EV_A_ (W)w);
1504 if (!ev_is_active (w)) 1540 if (expect_false (!ev_is_active (w)))
1505 return; 1541 return;
1506 1542
1507 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1543 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1508 ev_stop (EV_A_ (W)w); 1544 ev_stop (EV_A_ (W)w);
1509} 1545}
1510 1546
1511void 1547void
1512ev_check_start (EV_P_ struct ev_check *w) 1548ev_check_start (EV_P_ struct ev_check *w)
1513{ 1549{
1514 if (ev_is_active (w)) 1550 if (expect_false (ev_is_active (w)))
1515 return; 1551 return;
1516 1552
1517 ev_start (EV_A_ (W)w, ++checkcnt); 1553 ev_start (EV_A_ (W)w, ++checkcnt);
1518 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2); 1554 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1519 checks [checkcnt - 1] = w; 1555 checks [checkcnt - 1] = w;
… …
1521 1557
1522void 1558void
1523ev_check_stop (EV_P_ struct ev_check *w) 1559ev_check_stop (EV_P_ struct ev_check *w)
1524{ 1560{
1525 ev_clear_pending (EV_A_ (W)w); 1561 ev_clear_pending (EV_A_ (W)w);
1526 if (!ev_is_active (w)) 1562 if (expect_false (!ev_is_active (w)))
1527 return; 1563 return;
1528 1564
1529 checks [((W)w)->active - 1] = checks [--checkcnt]; 1565 checks [((W)w)->active - 1] = checks [--checkcnt];
1530 ev_stop (EV_A_ (W)w); 1566 ev_stop (EV_A_ (W)w);
1531} 1567}
… …
1538ev_signal_start (EV_P_ struct ev_signal *w) 1574ev_signal_start (EV_P_ struct ev_signal *w)
1539{ 1575{
1540#if EV_MULTIPLICITY 1576#if EV_MULTIPLICITY
1541 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1577 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1542#endif 1578#endif
1543 if (ev_is_active (w)) 1579 if (expect_false (ev_is_active (w)))
1544 return; 1580 return;
1545 1581
1546 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1582 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1547 1583
1548 ev_start (EV_A_ (W)w, 1); 1584 ev_start (EV_A_ (W)w, 1);
… …
1565 1601
1566void 1602void
1567ev_signal_stop (EV_P_ struct ev_signal *w) 1603ev_signal_stop (EV_P_ struct ev_signal *w)
1568{ 1604{
1569 ev_clear_pending (EV_A_ (W)w); 1605 ev_clear_pending (EV_A_ (W)w);
1570 if (!ev_is_active (w)) 1606 if (expect_false (!ev_is_active (w)))
1571 return; 1607 return;
1572 1608
1573 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1609 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1574 ev_stop (EV_A_ (W)w); 1610 ev_stop (EV_A_ (W)w);
1575 1611
… …
1581ev_child_start (EV_P_ struct ev_child *w) 1617ev_child_start (EV_P_ struct ev_child *w)
1582{ 1618{
1583#if EV_MULTIPLICITY 1619#if EV_MULTIPLICITY
1584 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1620 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1585#endif 1621#endif
1586 if (ev_is_active (w)) 1622 if (expect_false (ev_is_active (w)))
1587 return; 1623 return;
1588 1624
1589 ev_start (EV_A_ (W)w, 1); 1625 ev_start (EV_A_ (W)w, 1);
1590 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1626 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1591} 1627}
1592 1628
1593void 1629void
1594ev_child_stop (EV_P_ struct ev_child *w) 1630ev_child_stop (EV_P_ struct ev_child *w)
1595{ 1631{
1596 ev_clear_pending (EV_A_ (W)w); 1632 ev_clear_pending (EV_A_ (W)w);
1597 if (!ev_is_active (w)) 1633 if (expect_false (!ev_is_active (w)))
1598 return; 1634 return;
1599 1635
1600 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1636 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1601 ev_stop (EV_A_ (W)w); 1637 ev_stop (EV_A_ (W)w);
1602} 1638}
… …
1639void 1675void
1640ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1676ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1641{ 1677{
1642 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 1678 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1643 1679
1644 if (!once) 1680 if (expect_false (!once))
1681 {
1645 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1682 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1646 else 1683 return;
1647 { 1684 }
1685
1648 once->cb = cb; 1686 once->cb = cb;
1649 once->arg = arg; 1687 once->arg = arg;
1650 1688
1651 ev_init (&once->io, once_cb_io); 1689 ev_init (&once->io, once_cb_io);
1652 if (fd >= 0) 1690 if (fd >= 0)
1653 { 1691 {
1654 ev_io_set (&once->io, fd, events); 1692 ev_io_set (&once->io, fd, events);
1655 ev_io_start (EV_A_ &once->io); 1693 ev_io_start (EV_A_ &once->io);
1656 } 1694 }
1657 1695
1658 ev_init (&once->to, once_cb_to); 1696 ev_init (&once->to, once_cb_to);
1659 if (timeout >= 0.) 1697 if (timeout >= 0.)
1660 { 1698 {
1661 ev_timer_set (&once->to, timeout, 0.); 1699 ev_timer_set (&once->to, timeout, 0.);
1662 ev_timer_start (EV_A_ &once->to); 1700 ev_timer_start (EV_A_ &once->to);
1663 }
1664 } 1701 }
1665} 1702}
1666 1703
1667#ifdef __cplusplus 1704#ifdef __cplusplus
1668} 1705}

Diff Legend

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