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

Comparing libev/ev.c (file contents):
Revision 1.276 by root, Sun Dec 14 13:03:54 2008 UTC vs.
Revision 1.284 by root, Wed Apr 15 17:49:26 2009 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
64# if HAVE_CLOCK_GETTIME 64# if HAVE_CLOCK_GETTIME
65# ifndef EV_USE_MONOTONIC 65# ifndef EV_USE_MONOTONIC
66# define EV_USE_MONOTONIC 1 66# define EV_USE_MONOTONIC 1
67# endif 67# endif
68# ifndef EV_USE_REALTIME 68# ifndef EV_USE_REALTIME
69# define EV_USE_REALTIME 1 69# define EV_USE_REALTIME 0
70# endif 70# endif
71# else 71# else
72# ifndef EV_USE_MONOTONIC 72# ifndef EV_USE_MONOTONIC
73# define EV_USE_MONOTONIC 0 73# define EV_USE_MONOTONIC 0
74# endif 74# endif
… …
193# define EV_USE_MONOTONIC 0 193# define EV_USE_MONOTONIC 0
194# endif 194# endif
195#endif 195#endif
196 196
197#ifndef EV_USE_REALTIME 197#ifndef EV_USE_REALTIME
198# define EV_USE_REALTIME 0 198# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
199#endif 199#endif
200 200
201#ifndef EV_USE_NANOSLEEP 201#ifndef EV_USE_NANOSLEEP
202# if _POSIX_C_SOURCE >= 199309L 202# if _POSIX_C_SOURCE >= 199309L
203# define EV_USE_NANOSLEEP 1 203# define EV_USE_NANOSLEEP 1
… …
397typedef ev_watcher_time *WT; 397typedef ev_watcher_time *WT;
398 398
399#define ev_active(w) ((W)(w))->active 399#define ev_active(w) ((W)(w))->active
400#define ev_at(w) ((WT)(w))->at 400#define ev_at(w) ((WT)(w))->at
401 401
402#if EV_USE_MONOTONIC 402#if EV_USE_REALTIME
403/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 403/* sig_atomic_t is used to avoid per-thread variables or locking but still */
404/* giving it a reasonably high chance of working on typical architetcures */ 404/* giving it a reasonably high chance of working on typical architetcures */
405static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
406#endif
407
408#if EV_USE_MONOTONIC
405static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 409static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
406#endif 410#endif
407 411
408#ifdef _WIN32 412#ifdef _WIN32
409# include "ev_win32.c" 413# include "ev_win32.c"
… …
553 557
554ev_tstamp 558ev_tstamp
555ev_time (void) 559ev_time (void)
556{ 560{
557#if EV_USE_REALTIME 561#if EV_USE_REALTIME
562 if (expect_true (have_realtime))
563 {
558 struct timespec ts; 564 struct timespec ts;
559 clock_gettime (CLOCK_REALTIME, &ts); 565 clock_gettime (CLOCK_REALTIME, &ts);
560 return ts.tv_sec + ts.tv_nsec * 1e-9; 566 return ts.tv_sec + ts.tv_nsec * 1e-9;
561#else 567 }
568#endif
569
562 struct timeval tv; 570 struct timeval tv;
563 gettimeofday (&tv, 0); 571 gettimeofday (&tv, 0);
564 return tv.tv_sec + tv.tv_usec * 1e-6; 572 return tv.tv_sec + tv.tv_usec * 1e-6;
565#endif
566} 573}
567 574
568ev_tstamp inline_size 575inline_size ev_tstamp
569get_clock (void) 576get_clock (void)
570{ 577{
571#if EV_USE_MONOTONIC 578#if EV_USE_MONOTONIC
572 if (expect_true (have_monotonic)) 579 if (expect_true (have_monotonic))
573 { 580 {
… …
618 625
619/*****************************************************************************/ 626/*****************************************************************************/
620 627
621#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 628#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
622 629
623int inline_size 630inline_size int
624array_nextsize (int elem, int cur, int cnt) 631array_nextsize (int elem, int cur, int cnt)
625{ 632{
626 int ncur = cur + 1; 633 int ncur = cur + 1;
627 634
628 do 635 do
… …
669 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 676 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
670 } 677 }
671#endif 678#endif
672 679
673#define array_free(stem, idx) \ 680#define array_free(stem, idx) \
674 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 681 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
675 682
676/*****************************************************************************/ 683/*****************************************************************************/
677 684
678void noinline 685void noinline
679ev_feed_event (EV_P_ void *w, int revents) 686ev_feed_event (EV_P_ void *w, int revents)
… …
690 pendings [pri][w_->pending - 1].w = w_; 697 pendings [pri][w_->pending - 1].w = w_;
691 pendings [pri][w_->pending - 1].events = revents; 698 pendings [pri][w_->pending - 1].events = revents;
692 } 699 }
693} 700}
694 701
695void inline_speed 702inline_speed void
703feed_reverse (EV_P_ W w)
704{
705 array_needsize (W, rfeeds, rfeedmax, rfeedcnt + 1, EMPTY2);
706 rfeeds [rfeedcnt++] = w;
707}
708
709inline_size void
710feed_reverse_done (EV_P_ int revents)
711{
712 do
713 ev_feed_event (EV_A_ rfeeds [--rfeedcnt], revents);
714 while (rfeedcnt);
715}
716
717inline_speed void
696queue_events (EV_P_ W *events, int eventcnt, int type) 718queue_events (EV_P_ W *events, int eventcnt, int type)
697{ 719{
698 int i; 720 int i;
699 721
700 for (i = 0; i < eventcnt; ++i) 722 for (i = 0; i < eventcnt; ++i)
701 ev_feed_event (EV_A_ events [i], type); 723 ev_feed_event (EV_A_ events [i], type);
702} 724}
703 725
704/*****************************************************************************/ 726/*****************************************************************************/
705 727
706void inline_speed 728inline_speed void
707fd_event (EV_P_ int fd, int revents) 729fd_event (EV_P_ int fd, int revents)
708{ 730{
709 ANFD *anfd = anfds + fd; 731 ANFD *anfd = anfds + fd;
710 ev_io *w; 732 ev_io *w;
711 733
… …
723{ 745{
724 if (fd >= 0 && fd < anfdmax) 746 if (fd >= 0 && fd < anfdmax)
725 fd_event (EV_A_ fd, revents); 747 fd_event (EV_A_ fd, revents);
726} 748}
727 749
728void inline_size 750inline_size void
729fd_reify (EV_P) 751fd_reify (EV_P)
730{ 752{
731 int i; 753 int i;
732 754
733 for (i = 0; i < fdchangecnt; ++i) 755 for (i = 0; i < fdchangecnt; ++i)
… …
748 #ifdef EV_FD_TO_WIN32_HANDLE 770 #ifdef EV_FD_TO_WIN32_HANDLE
749 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 771 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
750 #else 772 #else
751 anfd->handle = _get_osfhandle (fd); 773 anfd->handle = _get_osfhandle (fd);
752 #endif 774 #endif
753 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 775 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
754 } 776 }
755#endif 777#endif
756 778
757 { 779 {
758 unsigned char o_events = anfd->events; 780 unsigned char o_events = anfd->events;
759 unsigned char o_reify = anfd->reify; 781 unsigned char o_reify = anfd->reify;
760 782
761 anfd->reify = 0; 783 anfd->reify = 0;
762 anfd->events = events; 784 anfd->events = events;
763 785
764 if (o_events != events || o_reify & EV_IOFDSET) 786 if (o_events != events || o_reify & EV__IOFDSET)
765 backend_modify (EV_A_ fd, o_events, events); 787 backend_modify (EV_A_ fd, o_events, events);
766 } 788 }
767 } 789 }
768 790
769 fdchangecnt = 0; 791 fdchangecnt = 0;
770} 792}
771 793
772void inline_size 794inline_size void
773fd_change (EV_P_ int fd, int flags) 795fd_change (EV_P_ int fd, int flags)
774{ 796{
775 unsigned char reify = anfds [fd].reify; 797 unsigned char reify = anfds [fd].reify;
776 anfds [fd].reify |= flags; 798 anfds [fd].reify |= flags;
777 799
… …
781 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 803 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
782 fdchanges [fdchangecnt - 1] = fd; 804 fdchanges [fdchangecnt - 1] = fd;
783 } 805 }
784} 806}
785 807
786void inline_speed 808inline_speed void
787fd_kill (EV_P_ int fd) 809fd_kill (EV_P_ int fd)
788{ 810{
789 ev_io *w; 811 ev_io *w;
790 812
791 while ((w = (ev_io *)anfds [fd].head)) 813 while ((w = (ev_io *)anfds [fd].head))
… …
793 ev_io_stop (EV_A_ w); 815 ev_io_stop (EV_A_ w);
794 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 816 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
795 } 817 }
796} 818}
797 819
798int inline_size 820inline_size int
799fd_valid (int fd) 821fd_valid (int fd)
800{ 822{
801#ifdef _WIN32 823#ifdef _WIN32
802 return _get_osfhandle (fd) != -1; 824 return _get_osfhandle (fd) != -1;
803#else 825#else
… …
840 for (fd = 0; fd < anfdmax; ++fd) 862 for (fd = 0; fd < anfdmax; ++fd)
841 if (anfds [fd].events) 863 if (anfds [fd].events)
842 { 864 {
843 anfds [fd].events = 0; 865 anfds [fd].events = 0;
844 anfds [fd].emask = 0; 866 anfds [fd].emask = 0;
845 fd_change (EV_A_ fd, EV_IOFDSET | 1); 867 fd_change (EV_A_ fd, EV__IOFDSET | 1);
846 } 868 }
847} 869}
848 870
849/*****************************************************************************/ 871/*****************************************************************************/
850 872
… …
866#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 888#define HEAP0 (DHEAP - 1) /* index of first element in heap */
867#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 889#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
868#define UPHEAP_DONE(p,k) ((p) == (k)) 890#define UPHEAP_DONE(p,k) ((p) == (k))
869 891
870/* away from the root */ 892/* away from the root */
871void inline_speed 893inline_speed void
872downheap (ANHE *heap, int N, int k) 894downheap (ANHE *heap, int N, int k)
873{ 895{
874 ANHE he = heap [k]; 896 ANHE he = heap [k];
875 ANHE *E = heap + N + HEAP0; 897 ANHE *E = heap + N + HEAP0;
876 898
… …
916#define HEAP0 1 938#define HEAP0 1
917#define HPARENT(k) ((k) >> 1) 939#define HPARENT(k) ((k) >> 1)
918#define UPHEAP_DONE(p,k) (!(p)) 940#define UPHEAP_DONE(p,k) (!(p))
919 941
920/* away from the root */ 942/* away from the root */
921void inline_speed 943inline_speed void
922downheap (ANHE *heap, int N, int k) 944downheap (ANHE *heap, int N, int k)
923{ 945{
924 ANHE he = heap [k]; 946 ANHE he = heap [k];
925 947
926 for (;;) 948 for (;;)
… …
946 ev_active (ANHE_w (he)) = k; 968 ev_active (ANHE_w (he)) = k;
947} 969}
948#endif 970#endif
949 971
950/* towards the root */ 972/* towards the root */
951void inline_speed 973inline_speed void
952upheap (ANHE *heap, int k) 974upheap (ANHE *heap, int k)
953{ 975{
954 ANHE he = heap [k]; 976 ANHE he = heap [k];
955 977
956 for (;;) 978 for (;;)
… …
967 989
968 heap [k] = he; 990 heap [k] = he;
969 ev_active (ANHE_w (he)) = k; 991 ev_active (ANHE_w (he)) = k;
970} 992}
971 993
972void inline_size 994inline_size void
973adjustheap (ANHE *heap, int N, int k) 995adjustheap (ANHE *heap, int N, int k)
974{ 996{
975 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 997 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
976 upheap (heap, k); 998 upheap (heap, k);
977 else 999 else
978 downheap (heap, N, k); 1000 downheap (heap, N, k);
979} 1001}
980 1002
981/* rebuild the heap: this function is used only once and executed rarely */ 1003/* rebuild the heap: this function is used only once and executed rarely */
982void inline_size 1004inline_size void
983reheap (ANHE *heap, int N) 1005reheap (ANHE *heap, int N)
984{ 1006{
985 int i; 1007 int i;
986 1008
987 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 1009 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
… …
1003 1025
1004static EV_ATOMIC_T gotsig; 1026static EV_ATOMIC_T gotsig;
1005 1027
1006/*****************************************************************************/ 1028/*****************************************************************************/
1007 1029
1008void inline_speed 1030inline_speed void
1009fd_intern (int fd) 1031fd_intern (int fd)
1010{ 1032{
1011#ifdef _WIN32 1033#ifdef _WIN32
1012 unsigned long arg = 1; 1034 unsigned long arg = 1;
1013 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1035 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
1043 ev_io_start (EV_A_ &pipeev); 1065 ev_io_start (EV_A_ &pipeev);
1044 ev_unref (EV_A); /* watcher should not keep loop alive */ 1066 ev_unref (EV_A); /* watcher should not keep loop alive */
1045 } 1067 }
1046} 1068}
1047 1069
1048void inline_size 1070inline_size void
1049evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1071evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1050{ 1072{
1051 if (!*flag) 1073 if (!*flag)
1052 { 1074 {
1053 int old_errno = errno; /* save errno because write might clobber it */ 1075 int old_errno = errno; /* save errno because write might clobber it */
… …
1131ev_feed_signal_event (EV_P_ int signum) 1153ev_feed_signal_event (EV_P_ int signum)
1132{ 1154{
1133 WL w; 1155 WL w;
1134 1156
1135#if EV_MULTIPLICITY 1157#if EV_MULTIPLICITY
1136 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1158 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
1137#endif 1159#endif
1138 1160
1139 --signum; 1161 --signum;
1140 1162
1141 if (signum < 0 || signum >= signalmax) 1163 if (signum < 0 || signum >= signalmax)
… …
1157 1179
1158#ifndef WIFCONTINUED 1180#ifndef WIFCONTINUED
1159# define WIFCONTINUED(status) 0 1181# define WIFCONTINUED(status) 0
1160#endif 1182#endif
1161 1183
1162void inline_speed 1184inline_speed void
1163child_reap (EV_P_ int chain, int pid, int status) 1185child_reap (EV_P_ int chain, int pid, int status)
1164{ 1186{
1165 ev_child *w; 1187 ev_child *w;
1166 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1188 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1167 1189
… …
1270 /* kqueue is borked on everything but netbsd apparently */ 1292 /* kqueue is borked on everything but netbsd apparently */
1271 /* it usually doesn't work correctly on anything but sockets and pipes */ 1293 /* it usually doesn't work correctly on anything but sockets and pipes */
1272 flags &= ~EVBACKEND_KQUEUE; 1294 flags &= ~EVBACKEND_KQUEUE;
1273#endif 1295#endif
1274#ifdef __APPLE__ 1296#ifdef __APPLE__
1275 // flags &= ~EVBACKEND_KQUEUE & ~EVBACKEND_POLL; for documentation 1297 /* only select works correctly on that "unix-certified" platform */
1276 flags &= ~EVBACKEND_SELECT; 1298 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1299 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1277#endif 1300#endif
1278 1301
1279 return flags; 1302 return flags;
1280} 1303}
1281 1304
… …
1318static void noinline 1341static void noinline
1319loop_init (EV_P_ unsigned int flags) 1342loop_init (EV_P_ unsigned int flags)
1320{ 1343{
1321 if (!backend) 1344 if (!backend)
1322 { 1345 {
1346#if EV_USE_REALTIME
1347 if (!have_realtime)
1348 {
1349 struct timespec ts;
1350
1351 if (!clock_gettime (CLOCK_REALTIME, &ts))
1352 have_realtime = 1;
1353 }
1354#endif
1355
1323#if EV_USE_MONOTONIC 1356#if EV_USE_MONOTONIC
1357 if (!have_monotonic)
1324 { 1358 {
1325 struct timespec ts; 1359 struct timespec ts;
1360
1326 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1361 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1327 have_monotonic = 1; 1362 have_monotonic = 1;
1328 } 1363 }
1329#endif 1364#endif
1330 1365
1331 ev_rt_now = ev_time (); 1366 ev_rt_now = ev_time ();
1332 mn_now = get_clock (); 1367 mn_now = get_clock ();
1333 now_floor = mn_now; 1368 now_floor = mn_now;
… …
1432 } 1467 }
1433 1468
1434 ev_free (anfds); anfdmax = 0; 1469 ev_free (anfds); anfdmax = 0;
1435 1470
1436 /* have to use the microsoft-never-gets-it-right macro */ 1471 /* have to use the microsoft-never-gets-it-right macro */
1472 array_free (rfeed, EMPTY);
1437 array_free (fdchange, EMPTY); 1473 array_free (fdchange, EMPTY);
1438 array_free (timer, EMPTY); 1474 array_free (timer, EMPTY);
1439#if EV_PERIODIC_ENABLE 1475#if EV_PERIODIC_ENABLE
1440 array_free (periodic, EMPTY); 1476 array_free (periodic, EMPTY);
1441#endif 1477#endif
… …
1450 1486
1451 backend = 0; 1487 backend = 0;
1452} 1488}
1453 1489
1454#if EV_USE_INOTIFY 1490#if EV_USE_INOTIFY
1455void inline_size infy_fork (EV_P); 1491inline_size void infy_fork (EV_P);
1456#endif 1492#endif
1457 1493
1458void inline_size 1494inline_size void
1459loop_fork (EV_P) 1495loop_fork (EV_P)
1460{ 1496{
1461#if EV_USE_PORT 1497#if EV_USE_PORT
1462 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1498 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1463#endif 1499#endif
… …
1534 1570
1535#if EV_VERIFY 1571#if EV_VERIFY
1536static void noinline 1572static void noinline
1537verify_watcher (EV_P_ W w) 1573verify_watcher (EV_P_ W w)
1538{ 1574{
1539 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1575 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1540 1576
1541 if (w->pending) 1577 if (w->pending)
1542 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 1578 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1543} 1579}
1544 1580
1545static void noinline 1581static void noinline
1546verify_heap (EV_P_ ANHE *heap, int N) 1582verify_heap (EV_P_ ANHE *heap, int N)
1547{ 1583{
1548 int i; 1584 int i;
1549 1585
1550 for (i = HEAP0; i < N + HEAP0; ++i) 1586 for (i = HEAP0; i < N + HEAP0; ++i)
1551 { 1587 {
1552 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i)); 1588 assert (("libev: active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1553 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i]))); 1589 assert (("libev: heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1554 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i])))); 1590 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1555 1591
1556 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1592 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1557 } 1593 }
1558} 1594}
1559 1595
1560static void noinline 1596static void noinline
1561array_verify (EV_P_ W *ws, int cnt) 1597array_verify (EV_P_ W *ws, int cnt)
1562{ 1598{
1563 while (cnt--) 1599 while (cnt--)
1564 { 1600 {
1565 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1601 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1566 verify_watcher (EV_A_ ws [cnt]); 1602 verify_watcher (EV_A_ ws [cnt]);
1567 } 1603 }
1568} 1604}
1569#endif 1605#endif
1570 1606
… …
1577 1613
1578 assert (activecnt >= -1); 1614 assert (activecnt >= -1);
1579 1615
1580 assert (fdchangemax >= fdchangecnt); 1616 assert (fdchangemax >= fdchangecnt);
1581 for (i = 0; i < fdchangecnt; ++i) 1617 for (i = 0; i < fdchangecnt; ++i)
1582 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1618 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1583 1619
1584 assert (anfdmax >= 0); 1620 assert (anfdmax >= 0);
1585 for (i = 0; i < anfdmax; ++i) 1621 for (i = 0; i < anfdmax; ++i)
1586 for (w = anfds [i].head; w; w = w->next) 1622 for (w = anfds [i].head; w; w = w->next)
1587 { 1623 {
1588 verify_watcher (EV_A_ (W)w); 1624 verify_watcher (EV_A_ (W)w);
1589 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1625 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1590 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i)); 1626 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1591 } 1627 }
1592 1628
1593 assert (timermax >= timercnt); 1629 assert (timermax >= timercnt);
1594 verify_heap (EV_A_ timers, timercnt); 1630 verify_heap (EV_A_ timers, timercnt);
1595 1631
… …
1700ev_invoke (EV_P_ void *w, int revents) 1736ev_invoke (EV_P_ void *w, int revents)
1701{ 1737{
1702 EV_CB_INVOKE ((W)w, revents); 1738 EV_CB_INVOKE ((W)w, revents);
1703} 1739}
1704 1740
1705void inline_speed 1741inline_speed void
1706call_pending (EV_P) 1742call_pending (EV_P)
1707{ 1743{
1708 int pri; 1744 int pri;
1709 1745
1710 for (pri = NUMPRI; pri--; ) 1746 for (pri = NUMPRI; pri--; )
… …
1712 { 1748 {
1713 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1749 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1714 1750
1715 if (expect_true (p->w)) 1751 if (expect_true (p->w))
1716 { 1752 {
1717 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1753 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1718 1754
1719 p->w->pending = 0; 1755 p->w->pending = 0;
1720 EV_CB_INVOKE (p->w, p->events); 1756 EV_CB_INVOKE (p->w, p->events);
1721 EV_FREQUENT_CHECK; 1757 EV_FREQUENT_CHECK;
1722 } 1758 }
1723 } 1759 }
1724} 1760}
1725 1761
1726#if EV_IDLE_ENABLE 1762#if EV_IDLE_ENABLE
1727void inline_size 1763inline_size void
1728idle_reify (EV_P) 1764idle_reify (EV_P)
1729{ 1765{
1730 if (expect_false (idleall)) 1766 if (expect_false (idleall))
1731 { 1767 {
1732 int pri; 1768 int pri;
… …
1744 } 1780 }
1745 } 1781 }
1746} 1782}
1747#endif 1783#endif
1748 1784
1749void inline_size 1785inline_size void
1750timers_reify (EV_P) 1786timers_reify (EV_P)
1751{ 1787{
1752 EV_FREQUENT_CHECK; 1788 EV_FREQUENT_CHECK;
1753 1789
1754 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 1790 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1755 { 1791 {
1756 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 1792 do
1757
1758 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1759
1760 /* first reschedule or stop timer */
1761 if (w->repeat)
1762 { 1793 {
1794 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1795
1796 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
1797
1798 /* first reschedule or stop timer */
1799 if (w->repeat)
1800 {
1763 ev_at (w) += w->repeat; 1801 ev_at (w) += w->repeat;
1764 if (ev_at (w) < mn_now) 1802 if (ev_at (w) < mn_now)
1765 ev_at (w) = mn_now; 1803 ev_at (w) = mn_now;
1766 1804
1767 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1805 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1768 1806
1769 ANHE_at_cache (timers [HEAP0]); 1807 ANHE_at_cache (timers [HEAP0]);
1770 downheap (timers, timercnt, HEAP0); 1808 downheap (timers, timercnt, HEAP0);
1809 }
1810 else
1811 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1812
1813 EV_FREQUENT_CHECK;
1814 feed_reverse (EV_A_ (W)w);
1771 } 1815 }
1772 else 1816 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1773 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1774 1817
1775 EV_FREQUENT_CHECK;
1776 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1818 feed_reverse_done (EV_A_ EV_TIMEOUT);
1777 } 1819 }
1778} 1820}
1779 1821
1780#if EV_PERIODIC_ENABLE 1822#if EV_PERIODIC_ENABLE
1781void inline_size 1823inline_size void
1782periodics_reify (EV_P) 1824periodics_reify (EV_P)
1783{ 1825{
1784 EV_FREQUENT_CHECK; 1826 EV_FREQUENT_CHECK;
1785 1827
1786 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 1828 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1787 { 1829 {
1788 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1830 int feed_count = 0;
1789 1831
1790 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1832 do
1791
1792 /* first reschedule or stop timer */
1793 if (w->reschedule_cb)
1794 { 1833 {
1834 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1835
1836 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
1837
1838 /* first reschedule or stop timer */
1839 if (w->reschedule_cb)
1840 {
1795 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1841 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1796 1842
1797 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 1843 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1798 1844
1799 ANHE_at_cache (periodics [HEAP0]); 1845 ANHE_at_cache (periodics [HEAP0]);
1800 downheap (periodics, periodiccnt, HEAP0); 1846 downheap (periodics, periodiccnt, HEAP0);
1847 }
1848 else if (w->interval)
1849 {
1850 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1851 /* if next trigger time is not sufficiently in the future, put it there */
1852 /* this might happen because of floating point inexactness */
1853 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1854 {
1855 ev_at (w) += w->interval;
1856
1857 /* if interval is unreasonably low we might still have a time in the past */
1858 /* so correct this. this will make the periodic very inexact, but the user */
1859 /* has effectively asked to get triggered more often than possible */
1860 if (ev_at (w) < ev_rt_now)
1861 ev_at (w) = ev_rt_now;
1862 }
1863
1864 ANHE_at_cache (periodics [HEAP0]);
1865 downheap (periodics, periodiccnt, HEAP0);
1866 }
1867 else
1868 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1869
1870 EV_FREQUENT_CHECK;
1871 feed_reverse (EV_A_ (W)w);
1801 } 1872 }
1802 else if (w->interval) 1873 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
1803 {
1804 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1805 /* if next trigger time is not sufficiently in the future, put it there */
1806 /* this might happen because of floating point inexactness */
1807 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1808 {
1809 ev_at (w) += w->interval;
1810 1874
1811 /* if interval is unreasonably low we might still have a time in the past */
1812 /* so correct this. this will make the periodic very inexact, but the user */
1813 /* has effectively asked to get triggered more often than possible */
1814 if (ev_at (w) < ev_rt_now)
1815 ev_at (w) = ev_rt_now;
1816 }
1817
1818 ANHE_at_cache (periodics [HEAP0]);
1819 downheap (periodics, periodiccnt, HEAP0);
1820 }
1821 else
1822 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1823
1824 EV_FREQUENT_CHECK;
1825 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1875 feed_reverse_done (EV_A_ EV_PERIODIC);
1826 } 1876 }
1827} 1877}
1828 1878
1829static void noinline 1879static void noinline
1830periodics_reschedule (EV_P) 1880periodics_reschedule (EV_P)
… …
1846 1896
1847 reheap (periodics, periodiccnt); 1897 reheap (periodics, periodiccnt);
1848} 1898}
1849#endif 1899#endif
1850 1900
1851void inline_speed 1901inline_speed void
1852time_update (EV_P_ ev_tstamp max_block) 1902time_update (EV_P_ ev_tstamp max_block)
1853{ 1903{
1854 int i; 1904 int i;
1855 1905
1856#if EV_USE_MONOTONIC 1906#if EV_USE_MONOTONIC
… …
1977 { 2027 {
1978 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2028 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1979 call_pending (EV_A); 2029 call_pending (EV_A);
1980 } 2030 }
1981 2031
1982 if (expect_false (!activecnt))
1983 break;
1984
1985 /* we might have forked, so reify kernel state if necessary */ 2032 /* we might have forked, so reify kernel state if necessary */
1986 if (expect_false (postfork)) 2033 if (expect_false (postfork))
1987 loop_fork (EV_A); 2034 loop_fork (EV_A);
1988 2035
1989 /* update fd-related kernel structures */ 2036 /* update fd-related kernel structures */
… …
1996 2043
1997 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2044 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1998 { 2045 {
1999 /* update time to cancel out callback processing overhead */ 2046 /* update time to cancel out callback processing overhead */
2000 time_update (EV_A_ 1e100); 2047 time_update (EV_A_ 1e100);
2001
2002 waittime = MAX_BLOCKTIME;
2003 2048
2004 if (timercnt) 2049 if (timercnt)
2005 { 2050 {
2006 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2051 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
2007 if (waittime > to) waittime = to; 2052 if (waittime > to) waittime = to;
… …
2070 loop_done = how; 2115 loop_done = how;
2071} 2116}
2072 2117
2073/*****************************************************************************/ 2118/*****************************************************************************/
2074 2119
2075void inline_size 2120inline_size void
2076wlist_add (WL *head, WL elem) 2121wlist_add (WL *head, WL elem)
2077{ 2122{
2078 elem->next = *head; 2123 elem->next = *head;
2079 *head = elem; 2124 *head = elem;
2080} 2125}
2081 2126
2082void inline_size 2127inline_size void
2083wlist_del (WL *head, WL elem) 2128wlist_del (WL *head, WL elem)
2084{ 2129{
2085 while (*head) 2130 while (*head)
2086 { 2131 {
2087 if (*head == elem) 2132 if (*head == elem)
… …
2092 2137
2093 head = &(*head)->next; 2138 head = &(*head)->next;
2094 } 2139 }
2095} 2140}
2096 2141
2097void inline_speed 2142inline_speed void
2098clear_pending (EV_P_ W w) 2143clear_pending (EV_P_ W w)
2099{ 2144{
2100 if (w->pending) 2145 if (w->pending)
2101 { 2146 {
2102 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2147 pendings [ABSPRI (w)][w->pending - 1].w = 0;
… …
2119 } 2164 }
2120 else 2165 else
2121 return 0; 2166 return 0;
2122} 2167}
2123 2168
2124void inline_size 2169inline_size void
2125pri_adjust (EV_P_ W w) 2170pri_adjust (EV_P_ W w)
2126{ 2171{
2127 int pri = w->priority; 2172 int pri = w->priority;
2128 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2173 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2129 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2174 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2130 w->priority = pri; 2175 w->priority = pri;
2131} 2176}
2132 2177
2133void inline_speed 2178inline_speed void
2134ev_start (EV_P_ W w, int active) 2179ev_start (EV_P_ W w, int active)
2135{ 2180{
2136 pri_adjust (EV_A_ w); 2181 pri_adjust (EV_A_ w);
2137 w->active = active; 2182 w->active = active;
2138 ev_ref (EV_A); 2183 ev_ref (EV_A);
2139} 2184}
2140 2185
2141void inline_size 2186inline_size void
2142ev_stop (EV_P_ W w) 2187ev_stop (EV_P_ W w)
2143{ 2188{
2144 ev_unref (EV_A); 2189 ev_unref (EV_A);
2145 w->active = 0; 2190 w->active = 0;
2146} 2191}
… …
2153 int fd = w->fd; 2198 int fd = w->fd;
2154 2199
2155 if (expect_false (ev_is_active (w))) 2200 if (expect_false (ev_is_active (w)))
2156 return; 2201 return;
2157 2202
2158 assert (("ev_io_start called with negative fd", fd >= 0)); 2203 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2159 assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE)))); 2204 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2160 2205
2161 EV_FREQUENT_CHECK; 2206 EV_FREQUENT_CHECK;
2162 2207
2163 ev_start (EV_A_ (W)w, 1); 2208 ev_start (EV_A_ (W)w, 1);
2164 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2209 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2165 wlist_add (&anfds[fd].head, (WL)w); 2210 wlist_add (&anfds[fd].head, (WL)w);
2166 2211
2167 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2212 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1);
2168 w->events &= ~EV_IOFDSET; 2213 w->events &= ~EV__IOFDSET;
2169 2214
2170 EV_FREQUENT_CHECK; 2215 EV_FREQUENT_CHECK;
2171} 2216}
2172 2217
2173void noinline 2218void noinline
… …
2175{ 2220{
2176 clear_pending (EV_A_ (W)w); 2221 clear_pending (EV_A_ (W)w);
2177 if (expect_false (!ev_is_active (w))) 2222 if (expect_false (!ev_is_active (w)))
2178 return; 2223 return;
2179 2224
2180 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2225 assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2181 2226
2182 EV_FREQUENT_CHECK; 2227 EV_FREQUENT_CHECK;
2183 2228
2184 wlist_del (&anfds[w->fd].head, (WL)w); 2229 wlist_del (&anfds[w->fd].head, (WL)w);
2185 ev_stop (EV_A_ (W)w); 2230 ev_stop (EV_A_ (W)w);
… …
2195 if (expect_false (ev_is_active (w))) 2240 if (expect_false (ev_is_active (w)))
2196 return; 2241 return;
2197 2242
2198 ev_at (w) += mn_now; 2243 ev_at (w) += mn_now;
2199 2244
2200 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2245 assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2201 2246
2202 EV_FREQUENT_CHECK; 2247 EV_FREQUENT_CHECK;
2203 2248
2204 ++timercnt; 2249 ++timercnt;
2205 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2250 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2208 ANHE_at_cache (timers [ev_active (w)]); 2253 ANHE_at_cache (timers [ev_active (w)]);
2209 upheap (timers, ev_active (w)); 2254 upheap (timers, ev_active (w));
2210 2255
2211 EV_FREQUENT_CHECK; 2256 EV_FREQUENT_CHECK;
2212 2257
2213 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2258 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2214} 2259}
2215 2260
2216void noinline 2261void noinline
2217ev_timer_stop (EV_P_ ev_timer *w) 2262ev_timer_stop (EV_P_ ev_timer *w)
2218{ 2263{
… …
2223 EV_FREQUENT_CHECK; 2268 EV_FREQUENT_CHECK;
2224 2269
2225 { 2270 {
2226 int active = ev_active (w); 2271 int active = ev_active (w);
2227 2272
2228 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2273 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2229 2274
2230 --timercnt; 2275 --timercnt;
2231 2276
2232 if (expect_true (active < timercnt + HEAP0)) 2277 if (expect_true (active < timercnt + HEAP0))
2233 { 2278 {
… …
2277 2322
2278 if (w->reschedule_cb) 2323 if (w->reschedule_cb)
2279 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2324 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2280 else if (w->interval) 2325 else if (w->interval)
2281 { 2326 {
2282 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2327 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2283 /* this formula differs from the one in periodic_reify because we do not always round up */ 2328 /* this formula differs from the one in periodic_reify because we do not always round up */
2284 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2329 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2285 } 2330 }
2286 else 2331 else
2287 ev_at (w) = w->offset; 2332 ev_at (w) = w->offset;
… …
2295 ANHE_at_cache (periodics [ev_active (w)]); 2340 ANHE_at_cache (periodics [ev_active (w)]);
2296 upheap (periodics, ev_active (w)); 2341 upheap (periodics, ev_active (w));
2297 2342
2298 EV_FREQUENT_CHECK; 2343 EV_FREQUENT_CHECK;
2299 2344
2300 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2345 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2301} 2346}
2302 2347
2303void noinline 2348void noinline
2304ev_periodic_stop (EV_P_ ev_periodic *w) 2349ev_periodic_stop (EV_P_ ev_periodic *w)
2305{ 2350{
… …
2310 EV_FREQUENT_CHECK; 2355 EV_FREQUENT_CHECK;
2311 2356
2312 { 2357 {
2313 int active = ev_active (w); 2358 int active = ev_active (w);
2314 2359
2315 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2360 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2316 2361
2317 --periodiccnt; 2362 --periodiccnt;
2318 2363
2319 if (expect_true (active < periodiccnt + HEAP0)) 2364 if (expect_true (active < periodiccnt + HEAP0))
2320 { 2365 {
… …
2343 2388
2344void noinline 2389void noinline
2345ev_signal_start (EV_P_ ev_signal *w) 2390ev_signal_start (EV_P_ ev_signal *w)
2346{ 2391{
2347#if EV_MULTIPLICITY 2392#if EV_MULTIPLICITY
2348 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2393 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2349#endif 2394#endif
2350 if (expect_false (ev_is_active (w))) 2395 if (expect_false (ev_is_active (w)))
2351 return; 2396 return;
2352 2397
2353 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2398 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0));
2354 2399
2355 evpipe_init (EV_A); 2400 evpipe_init (EV_A);
2356 2401
2357 EV_FREQUENT_CHECK; 2402 EV_FREQUENT_CHECK;
2358 2403
… …
2409 2454
2410void 2455void
2411ev_child_start (EV_P_ ev_child *w) 2456ev_child_start (EV_P_ ev_child *w)
2412{ 2457{
2413#if EV_MULTIPLICITY 2458#if EV_MULTIPLICITY
2414 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2459 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2415#endif 2460#endif
2416 if (expect_false (ev_is_active (w))) 2461 if (expect_false (ev_is_active (w)))
2417 return; 2462 return;
2418 2463
2419 EV_FREQUENT_CHECK; 2464 EV_FREQUENT_CHECK;
… …
2571 2616
2572 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2617 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2573 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2618 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2574} 2619}
2575 2620
2576void inline_size 2621inline_size void
2577check_2625 (EV_P) 2622check_2625 (EV_P)
2578{ 2623{
2579 /* kernels < 2.6.25 are borked 2624 /* kernels < 2.6.25 are borked
2580 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 2625 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2581 */ 2626 */
… …
2594 return; 2639 return;
2595 2640
2596 fs_2625 = 1; 2641 fs_2625 = 1;
2597} 2642}
2598 2643
2599void inline_size 2644inline_size void
2600infy_init (EV_P) 2645infy_init (EV_P)
2601{ 2646{
2602 if (fs_fd != -2) 2647 if (fs_fd != -2)
2603 return; 2648 return;
2604 2649
… …
2614 ev_set_priority (&fs_w, EV_MAXPRI); 2659 ev_set_priority (&fs_w, EV_MAXPRI);
2615 ev_io_start (EV_A_ &fs_w); 2660 ev_io_start (EV_A_ &fs_w);
2616 } 2661 }
2617} 2662}
2618 2663
2619void inline_size 2664inline_size void
2620infy_fork (EV_P) 2665infy_fork (EV_P)
2621{ 2666{
2622 int slot; 2667 int slot;
2623 2668
2624 if (fs_fd < 0) 2669 if (fs_fd < 0)
… …
2905static void 2950static void
2906embed_fork_cb (EV_P_ ev_fork *fork_w, int revents) 2951embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2907{ 2952{
2908 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 2953 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2909 2954
2955 ev_embed_stop (EV_A_ w);
2956
2910 { 2957 {
2911 struct ev_loop *loop = w->other; 2958 struct ev_loop *loop = w->other;
2912 2959
2913 ev_loop_fork (EV_A); 2960 ev_loop_fork (EV_A);
2961 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2914 } 2962 }
2963
2964 ev_embed_start (EV_A_ w);
2915} 2965}
2916 2966
2917#if 0 2967#if 0
2918static void 2968static void
2919embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2969embed_idle_cb (EV_P_ ev_idle *idle, int revents)
… …
2928 if (expect_false (ev_is_active (w))) 2978 if (expect_false (ev_is_active (w)))
2929 return; 2979 return;
2930 2980
2931 { 2981 {
2932 struct ev_loop *loop = w->other; 2982 struct ev_loop *loop = w->other;
2933 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2983 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2934 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 2984 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2935 } 2985 }
2936 2986
2937 EV_FREQUENT_CHECK; 2987 EV_FREQUENT_CHECK;
2938 2988
… …
3121 ev_timer_set (&once->to, timeout, 0.); 3171 ev_timer_set (&once->to, timeout, 0.);
3122 ev_timer_start (EV_A_ &once->to); 3172 ev_timer_start (EV_A_ &once->to);
3123 } 3173 }
3124} 3174}
3125 3175
3176/*****************************************************************************/
3177
3178#if 0
3179void
3180ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3181{
3182 int i, j;
3183 ev_watcher_list *wl, *wn;
3184
3185 if (types & (EV_IO | EV_EMBED))
3186 for (i = 0; i < anfdmax; ++i)
3187 for (wl = anfds [i].head; wl; )
3188 {
3189 wn = wl->next;
3190
3191#if EV_EMBED_ENABLE
3192 if (ev_cb ((ev_io *)wl) == embed_io_cb)
3193 {
3194 if (types & EV_EMBED)
3195 cb (EV_A_ EV_EMBED, ((char *)wl) - offsetof (struct ev_embed, io));
3196 }
3197 else
3198#endif
3199#if EV_USE_INOTIFY
3200 if (ev_cb ((ev_io *)wl) == infy_cb)
3201 ;
3202 else
3203#endif
3204 if ((ev_io *)wl != &pipeev)
3205 if (types & EV_IO)
3206 cb (EV_A_ EV_IO, wl);
3207
3208 wl = wn;
3209 }
3210
3211 if (types & (EV_TIMER | EV_STAT))
3212 for (i = timercnt + HEAP0; i-- > HEAP0; )
3213#if EV_STAT_ENABLE
3214 /*TODO: timer is not always active*/
3215 if (ev_cb ((ev_timer *)ANHE_w (timers [i])) == stat_timer_cb)
3216 {
3217 if (types & EV_STAT)
3218 cb (EV_A_ EV_STAT, ((char *)ANHE_w (timers [i])) - offsetof (struct ev_stat, timer));
3219 }
3220 else
3221#endif
3222 if (types & EV_TIMER)
3223 cb (EV_A_ EV_TIMER, ANHE_w (timers [i]));
3224
3225#if EV_PERIODIC_ENABLE
3226 if (types & EV_PERIODIC)
3227 for (i = periodiccnt + HEAP0; i-- > HEAP0; )
3228 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3229#endif
3230
3231#if EV_IDLE_ENABLE
3232 if (types & EV_IDLE)
3233 for (j = NUMPRI; i--; )
3234 for (i = idlecnt [j]; i--; )
3235 cb (EV_A_ EV_IDLE, idles [j][i]);
3236#endif
3237
3238#if EV_FORK_ENABLE
3239 if (types & EV_FORK)
3240 for (i = forkcnt; i--; )
3241 if (ev_cb (forks [i]) != embed_fork_cb)
3242 cb (EV_A_ EV_FORK, forks [i]);
3243#endif
3244
3245#if EV_ASYNC_ENABLE
3246 if (types & EV_ASYNC)
3247 for (i = asynccnt; i--; )
3248 cb (EV_A_ EV_ASYNC, asyncs [i]);
3249#endif
3250
3251 if (types & EV_PREPARE)
3252 for (i = preparecnt; i--; )
3253#if EV_EMBED_ENABLE
3254 if (ev_cb (prepares [i]) != embed_prepare_cb)
3255#endif
3256 cb (EV_A_ EV_PREPARE, prepares [i]);
3257
3258 if (types & EV_CHECK)
3259 for (i = checkcnt; i--; )
3260 cb (EV_A_ EV_CHECK, checks [i]);
3261
3262 if (types & EV_SIGNAL)
3263 for (i = 0; i < signalmax; ++i)
3264 for (wl = signals [i].head; wl; )
3265 {
3266 wn = wl->next;
3267 cb (EV_A_ EV_SIGNAL, wl);
3268 wl = wn;
3269 }
3270
3271 if (types & EV_CHILD)
3272 for (i = EV_PID_HASHSIZE; i--; )
3273 for (wl = childs [i]; wl; )
3274 {
3275 wn = wl->next;
3276 cb (EV_A_ EV_CHILD, wl);
3277 wl = wn;
3278 }
3279/* EV_STAT 0x00001000 /* stat data changed */
3280/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3281}
3282#endif
3283
3126#if EV_MULTIPLICITY 3284#if EV_MULTIPLICITY
3127 #include "ev_wrap.h" 3285 #include "ev_wrap.h"
3128#endif 3286#endif
3129 3287
3130#ifdef __cplusplus 3288#ifdef __cplusplus

Diff Legend

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