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

Comparing libev/ev.c (file contents):
Revision 1.273 by root, Mon Nov 3 14:27:06 2008 UTC vs.
Revision 1.283 by root, Wed Apr 15 09:51:19 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 *
… …
47# include EV_CONFIG_H 47# include EV_CONFIG_H
48# else 48# else
49# include "config.h" 49# include "config.h"
50# endif 50# endif
51 51
52# if HAVE_CLOCK_SYSCALL
53# ifndef EV_USE_CLOCK_SYSCALL
54# define EV_USE_CLOCK_SYSCALL 1
55# ifndef EV_USE_REALTIME
56# define EV_USE_REALTIME 0
57# endif
58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1
60# endif
61# endif
62# endif
63
52# if HAVE_CLOCK_GETTIME 64# if HAVE_CLOCK_GETTIME
53# ifndef EV_USE_MONOTONIC 65# ifndef EV_USE_MONOTONIC
54# define EV_USE_MONOTONIC 1 66# define EV_USE_MONOTONIC 1
55# endif 67# endif
56# ifndef EV_USE_REALTIME 68# ifndef EV_USE_REALTIME
57# define EV_USE_REALTIME 1 69# define EV_USE_REALTIME 0
58# endif 70# endif
59# else 71# else
60# ifndef EV_USE_MONOTONIC 72# ifndef EV_USE_MONOTONIC
61# define EV_USE_MONOTONIC 0 73# define EV_USE_MONOTONIC 0
62# endif 74# endif
… …
164# endif 176# endif
165#endif 177#endif
166 178
167/* this block tries to deduce configuration from header-defined symbols and defaults */ 179/* this block tries to deduce configuration from header-defined symbols and defaults */
168 180
181#ifndef EV_USE_CLOCK_SYSCALL
182# if __linux && __GLIBC__ >= 2
183# define EV_USE_CLOCK_SYSCALL 1
184# else
185# define EV_USE_CLOCK_SYSCALL 0
186# endif
187#endif
188
169#ifndef EV_USE_MONOTONIC 189#ifndef EV_USE_MONOTONIC
170# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 190# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
171# define EV_USE_MONOTONIC 1 191# define EV_USE_MONOTONIC 1
172# else 192# else
173# define EV_USE_MONOTONIC 0 193# define EV_USE_MONOTONIC 0
174# endif 194# endif
175#endif 195#endif
176 196
177#ifndef EV_USE_REALTIME 197#ifndef EV_USE_REALTIME
178# define EV_USE_REALTIME 0 198# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
179#endif 199#endif
180 200
181#ifndef EV_USE_NANOSLEEP 201#ifndef EV_USE_NANOSLEEP
182# if _POSIX_C_SOURCE >= 199309L 202# if _POSIX_C_SOURCE >= 199309L
183# define EV_USE_NANOSLEEP 1 203# define EV_USE_NANOSLEEP 1
… …
300 320
301#if EV_SELECT_IS_WINSOCKET 321#if EV_SELECT_IS_WINSOCKET
302# include <winsock.h> 322# include <winsock.h>
303#endif 323#endif
304 324
325/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
326/* which makes programs even slower. might work on other unices, too. */
327#if EV_USE_CLOCK_SYSCALL
328# include <syscall.h>
329# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
330# undef EV_USE_MONOTONIC
331# define EV_USE_MONOTONIC 1
332#endif
333
305#if EV_USE_EVENTFD 334#if EV_USE_EVENTFD
306/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 335/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
307# include <stdint.h> 336# include <stdint.h>
308# ifdef __cplusplus 337# ifdef __cplusplus
309extern "C" { 338extern "C" {
… …
368typedef ev_watcher_time *WT; 397typedef ev_watcher_time *WT;
369 398
370#define ev_active(w) ((W)(w))->active 399#define ev_active(w) ((W)(w))->active
371#define ev_at(w) ((WT)(w))->at 400#define ev_at(w) ((WT)(w))->at
372 401
373#if EV_USE_MONOTONIC 402#if EV_USE_REALTIME
374/* 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 */
375/* 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
376static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 409static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
377#endif 410#endif
378 411
379#ifdef _WIN32 412#ifdef _WIN32
380# include "ev_win32.c" 413# include "ev_win32.c"
… …
524 557
525ev_tstamp 558ev_tstamp
526ev_time (void) 559ev_time (void)
527{ 560{
528#if EV_USE_REALTIME 561#if EV_USE_REALTIME
562 if (expect_true (have_realtime))
563 {
529 struct timespec ts; 564 struct timespec ts;
530 clock_gettime (CLOCK_REALTIME, &ts); 565 clock_gettime (CLOCK_REALTIME, &ts);
531 return ts.tv_sec + ts.tv_nsec * 1e-9; 566 return ts.tv_sec + ts.tv_nsec * 1e-9;
532#else 567 }
568#endif
569
533 struct timeval tv; 570 struct timeval tv;
534 gettimeofday (&tv, 0); 571 gettimeofday (&tv, 0);
535 return tv.tv_sec + tv.tv_usec * 1e-6; 572 return tv.tv_sec + tv.tv_usec * 1e-6;
536#endif
537} 573}
538 574
539ev_tstamp inline_size 575ev_tstamp inline_size
540get_clock (void) 576get_clock (void)
541{ 577{
… …
640 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 676 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
641 } 677 }
642#endif 678#endif
643 679
644#define array_free(stem, idx) \ 680#define array_free(stem, idx) \
645 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
646 682
647/*****************************************************************************/ 683/*****************************************************************************/
648 684
649void noinline 685void noinline
650ev_feed_event (EV_P_ void *w, int revents) 686ev_feed_event (EV_P_ void *w, int revents)
… …
719 #ifdef EV_FD_TO_WIN32_HANDLE 755 #ifdef EV_FD_TO_WIN32_HANDLE
720 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 756 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
721 #else 757 #else
722 anfd->handle = _get_osfhandle (fd); 758 anfd->handle = _get_osfhandle (fd);
723 #endif 759 #endif
724 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 760 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
725 } 761 }
726#endif 762#endif
727 763
728 { 764 {
729 unsigned char o_events = anfd->events; 765 unsigned char o_events = anfd->events;
730 unsigned char o_reify = anfd->reify; 766 unsigned char o_reify = anfd->reify;
731 767
732 anfd->reify = 0; 768 anfd->reify = 0;
733 anfd->events = events; 769 anfd->events = events;
734 770
735 if (o_events != events || o_reify & EV_IOFDSET) 771 if (o_events != events || o_reify & EV__IOFDSET)
736 backend_modify (EV_A_ fd, o_events, events); 772 backend_modify (EV_A_ fd, o_events, events);
737 } 773 }
738 } 774 }
739 775
740 fdchangecnt = 0; 776 fdchangecnt = 0;
… …
811 for (fd = 0; fd < anfdmax; ++fd) 847 for (fd = 0; fd < anfdmax; ++fd)
812 if (anfds [fd].events) 848 if (anfds [fd].events)
813 { 849 {
814 anfds [fd].events = 0; 850 anfds [fd].events = 0;
815 anfds [fd].emask = 0; 851 anfds [fd].emask = 0;
816 fd_change (EV_A_ fd, EV_IOFDSET | 1); 852 fd_change (EV_A_ fd, EV__IOFDSET | 1);
817 } 853 }
818} 854}
819 855
820/*****************************************************************************/ 856/*****************************************************************************/
821 857
… …
1102ev_feed_signal_event (EV_P_ int signum) 1138ev_feed_signal_event (EV_P_ int signum)
1103{ 1139{
1104 WL w; 1140 WL w;
1105 1141
1106#if EV_MULTIPLICITY 1142#if EV_MULTIPLICITY
1107 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1143 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
1108#endif 1144#endif
1109 1145
1110 --signum; 1146 --signum;
1111 1147
1112 if (signum < 0 || signum >= signalmax) 1148 if (signum < 0 || signum >= signalmax)
… …
1241 /* kqueue is borked on everything but netbsd apparently */ 1277 /* kqueue is borked on everything but netbsd apparently */
1242 /* it usually doesn't work correctly on anything but sockets and pipes */ 1278 /* it usually doesn't work correctly on anything but sockets and pipes */
1243 flags &= ~EVBACKEND_KQUEUE; 1279 flags &= ~EVBACKEND_KQUEUE;
1244#endif 1280#endif
1245#ifdef __APPLE__ 1281#ifdef __APPLE__
1246 // flags &= ~EVBACKEND_KQUEUE; for documentation 1282 /* only select works correctly on that "unix-certified" platform */
1247 flags &= ~EVBACKEND_POLL; 1283 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1284 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1248#endif 1285#endif
1249 1286
1250 return flags; 1287 return flags;
1251} 1288}
1252 1289
… …
1289static void noinline 1326static void noinline
1290loop_init (EV_P_ unsigned int flags) 1327loop_init (EV_P_ unsigned int flags)
1291{ 1328{
1292 if (!backend) 1329 if (!backend)
1293 { 1330 {
1331#if EV_USE_REALTIME
1332 if (!have_realtime)
1333 {
1334 struct timespec ts;
1335
1336 if (!clock_gettime (CLOCK_REALTIME, &ts))
1337 have_realtime = 1;
1338 }
1339#endif
1340
1294#if EV_USE_MONOTONIC 1341#if EV_USE_MONOTONIC
1342 if (!have_monotonic)
1295 { 1343 {
1296 struct timespec ts; 1344 struct timespec ts;
1345
1297 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1346 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1298 have_monotonic = 1; 1347 have_monotonic = 1;
1299 } 1348 }
1300#endif 1349#endif
1301 1350
1302 ev_rt_now = ev_time (); 1351 ev_rt_now = ev_time ();
1303 mn_now = get_clock (); 1352 mn_now = get_clock ();
1304 now_floor = mn_now; 1353 now_floor = mn_now;
… …
1505 1554
1506#if EV_VERIFY 1555#if EV_VERIFY
1507static void noinline 1556static void noinline
1508verify_watcher (EV_P_ W w) 1557verify_watcher (EV_P_ W w)
1509{ 1558{
1510 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1559 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1511 1560
1512 if (w->pending) 1561 if (w->pending)
1513 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 1562 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1514} 1563}
1515 1564
1516static void noinline 1565static void noinline
1517verify_heap (EV_P_ ANHE *heap, int N) 1566verify_heap (EV_P_ ANHE *heap, int N)
1518{ 1567{
1519 int i; 1568 int i;
1520 1569
1521 for (i = HEAP0; i < N + HEAP0; ++i) 1570 for (i = HEAP0; i < N + HEAP0; ++i)
1522 { 1571 {
1523 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i)); 1572 assert (("libev: active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1524 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i]))); 1573 assert (("libev: heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1525 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i])))); 1574 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1526 1575
1527 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1576 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1528 } 1577 }
1529} 1578}
1530 1579
1531static void noinline 1580static void noinline
1532array_verify (EV_P_ W *ws, int cnt) 1581array_verify (EV_P_ W *ws, int cnt)
1533{ 1582{
1534 while (cnt--) 1583 while (cnt--)
1535 { 1584 {
1536 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1585 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1537 verify_watcher (EV_A_ ws [cnt]); 1586 verify_watcher (EV_A_ ws [cnt]);
1538 } 1587 }
1539} 1588}
1540#endif 1589#endif
1541 1590
… …
1548 1597
1549 assert (activecnt >= -1); 1598 assert (activecnt >= -1);
1550 1599
1551 assert (fdchangemax >= fdchangecnt); 1600 assert (fdchangemax >= fdchangecnt);
1552 for (i = 0; i < fdchangecnt; ++i) 1601 for (i = 0; i < fdchangecnt; ++i)
1553 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1602 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1554 1603
1555 assert (anfdmax >= 0); 1604 assert (anfdmax >= 0);
1556 for (i = 0; i < anfdmax; ++i) 1605 for (i = 0; i < anfdmax; ++i)
1557 for (w = anfds [i].head; w; w = w->next) 1606 for (w = anfds [i].head; w; w = w->next)
1558 { 1607 {
1559 verify_watcher (EV_A_ (W)w); 1608 verify_watcher (EV_A_ (W)w);
1560 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1609 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1561 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i)); 1610 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1562 } 1611 }
1563 1612
1564 assert (timermax >= timercnt); 1613 assert (timermax >= timercnt);
1565 verify_heap (EV_A_ timers, timercnt); 1614 verify_heap (EV_A_ timers, timercnt);
1566 1615
… …
1683 { 1732 {
1684 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1733 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1685 1734
1686 if (expect_true (p->w)) 1735 if (expect_true (p->w))
1687 { 1736 {
1688 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1737 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1689 1738
1690 p->w->pending = 0; 1739 p->w->pending = 0;
1691 EV_CB_INVOKE (p->w, p->events); 1740 EV_CB_INVOKE (p->w, p->events);
1692 EV_FREQUENT_CHECK; 1741 EV_FREQUENT_CHECK;
1693 } 1742 }
… …
1724 1773
1725 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 1774 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1726 { 1775 {
1727 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 1776 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1728 1777
1729 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1778 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
1730 1779
1731 /* first reschedule or stop timer */ 1780 /* first reschedule or stop timer */
1732 if (w->repeat) 1781 if (w->repeat)
1733 { 1782 {
1734 ev_at (w) += w->repeat; 1783 ev_at (w) += w->repeat;
1735 if (ev_at (w) < mn_now) 1784 if (ev_at (w) < mn_now)
1736 ev_at (w) = mn_now; 1785 ev_at (w) = mn_now;
1737 1786
1738 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1787 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1739 1788
1740 ANHE_at_cache (timers [HEAP0]); 1789 ANHE_at_cache (timers [HEAP0]);
1741 downheap (timers, timercnt, HEAP0); 1790 downheap (timers, timercnt, HEAP0);
1742 } 1791 }
1743 else 1792 else
… …
1756 1805
1757 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 1806 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1758 { 1807 {
1759 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1808 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1760 1809
1761 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1810 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
1762 1811
1763 /* first reschedule or stop timer */ 1812 /* first reschedule or stop timer */
1764 if (w->reschedule_cb) 1813 if (w->reschedule_cb)
1765 { 1814 {
1766 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1815 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1767 1816
1768 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 1817 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1769 1818
1770 ANHE_at_cache (periodics [HEAP0]); 1819 ANHE_at_cache (periodics [HEAP0]);
1771 downheap (periodics, periodiccnt, HEAP0); 1820 downheap (periodics, periodiccnt, HEAP0);
1772 } 1821 }
1773 else if (w->interval) 1822 else if (w->interval)
… …
1948 { 1997 {
1949 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1998 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1950 call_pending (EV_A); 1999 call_pending (EV_A);
1951 } 2000 }
1952 2001
1953 if (expect_false (!activecnt))
1954 break;
1955
1956 /* we might have forked, so reify kernel state if necessary */ 2002 /* we might have forked, so reify kernel state if necessary */
1957 if (expect_false (postfork)) 2003 if (expect_false (postfork))
1958 loop_fork (EV_A); 2004 loop_fork (EV_A);
1959 2005
1960 /* update fd-related kernel structures */ 2006 /* update fd-related kernel structures */
… …
2124 int fd = w->fd; 2170 int fd = w->fd;
2125 2171
2126 if (expect_false (ev_is_active (w))) 2172 if (expect_false (ev_is_active (w)))
2127 return; 2173 return;
2128 2174
2129 assert (("ev_io_start called with negative fd", fd >= 0)); 2175 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2130 assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE)))); 2176 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2131 2177
2132 EV_FREQUENT_CHECK; 2178 EV_FREQUENT_CHECK;
2133 2179
2134 ev_start (EV_A_ (W)w, 1); 2180 ev_start (EV_A_ (W)w, 1);
2135 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2181 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2136 wlist_add (&anfds[fd].head, (WL)w); 2182 wlist_add (&anfds[fd].head, (WL)w);
2137 2183
2138 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2184 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1);
2139 w->events &= ~EV_IOFDSET; 2185 w->events &= ~EV__IOFDSET;
2140 2186
2141 EV_FREQUENT_CHECK; 2187 EV_FREQUENT_CHECK;
2142} 2188}
2143 2189
2144void noinline 2190void noinline
… …
2146{ 2192{
2147 clear_pending (EV_A_ (W)w); 2193 clear_pending (EV_A_ (W)w);
2148 if (expect_false (!ev_is_active (w))) 2194 if (expect_false (!ev_is_active (w)))
2149 return; 2195 return;
2150 2196
2151 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2197 assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2152 2198
2153 EV_FREQUENT_CHECK; 2199 EV_FREQUENT_CHECK;
2154 2200
2155 wlist_del (&anfds[w->fd].head, (WL)w); 2201 wlist_del (&anfds[w->fd].head, (WL)w);
2156 ev_stop (EV_A_ (W)w); 2202 ev_stop (EV_A_ (W)w);
… …
2166 if (expect_false (ev_is_active (w))) 2212 if (expect_false (ev_is_active (w)))
2167 return; 2213 return;
2168 2214
2169 ev_at (w) += mn_now; 2215 ev_at (w) += mn_now;
2170 2216
2171 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2217 assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2172 2218
2173 EV_FREQUENT_CHECK; 2219 EV_FREQUENT_CHECK;
2174 2220
2175 ++timercnt; 2221 ++timercnt;
2176 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2222 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2179 ANHE_at_cache (timers [ev_active (w)]); 2225 ANHE_at_cache (timers [ev_active (w)]);
2180 upheap (timers, ev_active (w)); 2226 upheap (timers, ev_active (w));
2181 2227
2182 EV_FREQUENT_CHECK; 2228 EV_FREQUENT_CHECK;
2183 2229
2184 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2230 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2185} 2231}
2186 2232
2187void noinline 2233void noinline
2188ev_timer_stop (EV_P_ ev_timer *w) 2234ev_timer_stop (EV_P_ ev_timer *w)
2189{ 2235{
… …
2194 EV_FREQUENT_CHECK; 2240 EV_FREQUENT_CHECK;
2195 2241
2196 { 2242 {
2197 int active = ev_active (w); 2243 int active = ev_active (w);
2198 2244
2199 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2245 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2200 2246
2201 --timercnt; 2247 --timercnt;
2202 2248
2203 if (expect_true (active < timercnt + HEAP0)) 2249 if (expect_true (active < timercnt + HEAP0))
2204 { 2250 {
… …
2248 2294
2249 if (w->reschedule_cb) 2295 if (w->reschedule_cb)
2250 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2296 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2251 else if (w->interval) 2297 else if (w->interval)
2252 { 2298 {
2253 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2299 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2254 /* this formula differs from the one in periodic_reify because we do not always round up */ 2300 /* this formula differs from the one in periodic_reify because we do not always round up */
2255 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2301 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2256 } 2302 }
2257 else 2303 else
2258 ev_at (w) = w->offset; 2304 ev_at (w) = w->offset;
… …
2266 ANHE_at_cache (periodics [ev_active (w)]); 2312 ANHE_at_cache (periodics [ev_active (w)]);
2267 upheap (periodics, ev_active (w)); 2313 upheap (periodics, ev_active (w));
2268 2314
2269 EV_FREQUENT_CHECK; 2315 EV_FREQUENT_CHECK;
2270 2316
2271 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2317 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2272} 2318}
2273 2319
2274void noinline 2320void noinline
2275ev_periodic_stop (EV_P_ ev_periodic *w) 2321ev_periodic_stop (EV_P_ ev_periodic *w)
2276{ 2322{
… …
2281 EV_FREQUENT_CHECK; 2327 EV_FREQUENT_CHECK;
2282 2328
2283 { 2329 {
2284 int active = ev_active (w); 2330 int active = ev_active (w);
2285 2331
2286 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2332 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2287 2333
2288 --periodiccnt; 2334 --periodiccnt;
2289 2335
2290 if (expect_true (active < periodiccnt + HEAP0)) 2336 if (expect_true (active < periodiccnt + HEAP0))
2291 { 2337 {
… …
2314 2360
2315void noinline 2361void noinline
2316ev_signal_start (EV_P_ ev_signal *w) 2362ev_signal_start (EV_P_ ev_signal *w)
2317{ 2363{
2318#if EV_MULTIPLICITY 2364#if EV_MULTIPLICITY
2319 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2365 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2320#endif 2366#endif
2321 if (expect_false (ev_is_active (w))) 2367 if (expect_false (ev_is_active (w)))
2322 return; 2368 return;
2323 2369
2324 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2370 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0));
2325 2371
2326 evpipe_init (EV_A); 2372 evpipe_init (EV_A);
2327 2373
2328 EV_FREQUENT_CHECK; 2374 EV_FREQUENT_CHECK;
2329 2375
… …
2380 2426
2381void 2427void
2382ev_child_start (EV_P_ ev_child *w) 2428ev_child_start (EV_P_ ev_child *w)
2383{ 2429{
2384#if EV_MULTIPLICITY 2430#if EV_MULTIPLICITY
2385 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2431 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2386#endif 2432#endif
2387 if (expect_false (ev_is_active (w))) 2433 if (expect_false (ev_is_active (w)))
2388 return; 2434 return;
2389 2435
2390 EV_FREQUENT_CHECK; 2436 EV_FREQUENT_CHECK;
… …
2449 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2495 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2450 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2496 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2451 2497
2452 char *pend = strrchr (path, '/'); 2498 char *pend = strrchr (path, '/');
2453 2499
2454 if (!pend) 2500 if (!pend || pend == path)
2455 break; /* whoops, no '/', complain to your admin */ 2501 break;
2456 2502
2457 *pend = 0; 2503 *pend = 0;
2458 w->wd = inotify_add_watch (fs_fd, path, mask); 2504 w->wd = inotify_add_watch (fs_fd, path, mask);
2459 } 2505 }
2460 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2506 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2461 } 2507 }
2462 } 2508 }
2463 else 2509
2510 if (w->wd >= 0)
2464 { 2511 {
2465 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2512 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2466 2513
2467 /* now local changes will be tracked by inotify, but remote changes won't */ 2514 /* now local changes will be tracked by inotify, but remote changes won't */
2468 /* unless the filesystem it known to be local, we therefore still poll */ 2515 /* unless the filesystem it known to be local, we therefore still poll */
… …
2518 2565
2519 if (w->wd == wd || wd == -1) 2566 if (w->wd == wd || wd == -1)
2520 { 2567 {
2521 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2568 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2522 { 2569 {
2570 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2523 w->wd = -1; 2571 w->wd = -1;
2524 infy_add (EV_A_ w); /* re-add, no matter what */ 2572 infy_add (EV_A_ w); /* re-add, no matter what */
2525 } 2573 }
2526 2574
2527 stat_timer_cb (EV_A_ &w->timer, 0); 2575 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2874static void 2922static void
2875embed_fork_cb (EV_P_ ev_fork *fork_w, int revents) 2923embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2876{ 2924{
2877 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 2925 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2878 2926
2927 ev_embed_stop (EV_A_ w);
2928
2879 { 2929 {
2880 struct ev_loop *loop = w->other; 2930 struct ev_loop *loop = w->other;
2881 2931
2882 ev_loop_fork (EV_A); 2932 ev_loop_fork (EV_A);
2933 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2883 } 2934 }
2935
2936 ev_embed_start (EV_A_ w);
2884} 2937}
2885 2938
2886#if 0 2939#if 0
2887static void 2940static void
2888embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2941embed_idle_cb (EV_P_ ev_idle *idle, int revents)
… …
2897 if (expect_false (ev_is_active (w))) 2950 if (expect_false (ev_is_active (w)))
2898 return; 2951 return;
2899 2952
2900 { 2953 {
2901 struct ev_loop *loop = w->other; 2954 struct ev_loop *loop = w->other;
2902 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2955 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2903 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 2956 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2904 } 2957 }
2905 2958
2906 EV_FREQUENT_CHECK; 2959 EV_FREQUENT_CHECK;
2907 2960
… …
3090 ev_timer_set (&once->to, timeout, 0.); 3143 ev_timer_set (&once->to, timeout, 0.);
3091 ev_timer_start (EV_A_ &once->to); 3144 ev_timer_start (EV_A_ &once->to);
3092 } 3145 }
3093} 3146}
3094 3147
3148/*****************************************************************************/
3149
3150#if 0
3151void
3152ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3153{
3154 int i, j;
3155 ev_watcher_list *wl, *wn;
3156
3157 if (types & (EV_IO | EV_EMBED))
3158 for (i = 0; i < anfdmax; ++i)
3159 for (wl = anfds [i].head; wl; )
3160 {
3161 wn = wl->next;
3162
3163#if EV_EMBED_ENABLE
3164 if (ev_cb ((ev_io *)wl) == embed_io_cb)
3165 {
3166 if (types & EV_EMBED)
3167 cb (EV_A_ EV_EMBED, ((char *)wl) - offsetof (struct ev_embed, io));
3168 }
3169 else
3170#endif
3171#if EV_USE_INOTIFY
3172 if (ev_cb ((ev_io *)wl) == infy_cb)
3173 ;
3174 else
3175#endif
3176 if ((ev_io *)wl != &pipeev)
3177 if (types & EV_IO)
3178 cb (EV_A_ EV_IO, wl);
3179
3180 wl = wn;
3181 }
3182
3183 if (types & (EV_TIMER | EV_STAT))
3184 for (i = timercnt + HEAP0; i-- > HEAP0; )
3185#if EV_STAT_ENABLE
3186 /*TODO: timer is not always active*/
3187 if (ev_cb ((ev_timer *)ANHE_w (timers [i])) == stat_timer_cb)
3188 {
3189 if (types & EV_STAT)
3190 cb (EV_A_ EV_STAT, ((char *)ANHE_w (timers [i])) - offsetof (struct ev_stat, timer));
3191 }
3192 else
3193#endif
3194 if (types & EV_TIMER)
3195 cb (EV_A_ EV_TIMER, ANHE_w (timers [i]));
3196
3197#if EV_PERIODIC_ENABLE
3198 if (types & EV_PERIODIC)
3199 for (i = periodiccnt + HEAP0; i-- > HEAP0; )
3200 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3201#endif
3202
3203#if EV_IDLE_ENABLE
3204 if (types & EV_IDLE)
3205 for (j = NUMPRI; i--; )
3206 for (i = idlecnt [j]; i--; )
3207 cb (EV_A_ EV_IDLE, idles [j][i]);
3208#endif
3209
3210#if EV_FORK_ENABLE
3211 if (types & EV_FORK)
3212 for (i = forkcnt; i--; )
3213 if (ev_cb (forks [i]) != embed_fork_cb)
3214 cb (EV_A_ EV_FORK, forks [i]);
3215#endif
3216
3217#if EV_ASYNC_ENABLE
3218 if (types & EV_ASYNC)
3219 for (i = asynccnt; i--; )
3220 cb (EV_A_ EV_ASYNC, asyncs [i]);
3221#endif
3222
3223 if (types & EV_PREPARE)
3224 for (i = preparecnt; i--; )
3225#if EV_EMBED_ENABLE
3226 if (ev_cb (prepares [i]) != embed_prepare_cb)
3227#endif
3228 cb (EV_A_ EV_PREPARE, prepares [i]);
3229
3230 if (types & EV_CHECK)
3231 for (i = checkcnt; i--; )
3232 cb (EV_A_ EV_CHECK, checks [i]);
3233
3234 if (types & EV_SIGNAL)
3235 for (i = 0; i < signalmax; ++i)
3236 for (wl = signals [i].head; wl; )
3237 {
3238 wn = wl->next;
3239 cb (EV_A_ EV_SIGNAL, wl);
3240 wl = wn;
3241 }
3242
3243 if (types & EV_CHILD)
3244 for (i = EV_PID_HASHSIZE; i--; )
3245 for (wl = childs [i]; wl; )
3246 {
3247 wn = wl->next;
3248 cb (EV_A_ EV_CHILD, wl);
3249 wl = wn;
3250 }
3251/* EV_STAT 0x00001000 /* stat data changed */
3252/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3253}
3254#endif
3255
3095#if EV_MULTIPLICITY 3256#if EV_MULTIPLICITY
3096 #include "ev_wrap.h" 3257 #include "ev_wrap.h"
3097#endif 3258#endif
3098 3259
3099#ifdef __cplusplus 3260#ifdef __cplusplus

Diff Legend

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