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

Comparing libev/ev.c (file contents):
Revision 1.419 by root, Thu Apr 12 04:10:15 2012 UTC vs.
Revision 1.429 by root, Tue May 8 15:50:49 2012 UTC

… …
202# include <unistd.h> 202# include <unistd.h>
203#else 203#else
204# include <io.h> 204# include <io.h>
205# define WIN32_LEAN_AND_MEAN 205# define WIN32_LEAN_AND_MEAN
206# include <windows.h> 206# include <windows.h>
207# include <winsock2.h>
207# ifndef EV_SELECT_IS_WINSOCKET 208# ifndef EV_SELECT_IS_WINSOCKET
208# define EV_SELECT_IS_WINSOCKET 1 209# define EV_SELECT_IS_WINSOCKET 1
209# endif 210# endif
210# undef EV_AVOID_STDIO 211# undef EV_AVOID_STDIO
211#endif 212#endif
… …
359#endif 360#endif
360 361
361/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 362/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
362/* which makes programs even slower. might work on other unices, too. */ 363/* which makes programs even slower. might work on other unices, too. */
363#if EV_USE_CLOCK_SYSCALL 364#if EV_USE_CLOCK_SYSCALL
364# include <syscall.h> 365# include <sys/syscall.h>
365# ifdef SYS_clock_gettime 366# ifdef SYS_clock_gettime
366# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts)) 367# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
367# undef EV_USE_MONOTONIC 368# undef EV_USE_MONOTONIC
368# define EV_USE_MONOTONIC 1 369# define EV_USE_MONOTONIC 1
369# else 370# else
… …
1105{ 1106{
1106 write (STDERR_FILENO, msg, strlen (msg)); 1107 write (STDERR_FILENO, msg, strlen (msg));
1107} 1108}
1108#endif 1109#endif
1109 1110
1110static void (*syserr_cb)(const char *msg); 1111static void (*syserr_cb)(const char *msg) EV_THROW;
1111 1112
1112void ecb_cold 1113void ecb_cold
1113ev_set_syserr_cb (void (*cb)(const char *msg)) 1114ev_set_syserr_cb (void (*cb)(const char *msg)) EV_THROW
1114{ 1115{
1115 syserr_cb = cb; 1116 syserr_cb = cb;
1116} 1117}
1117 1118
1118static void noinline ecb_cold 1119static void noinline ecb_cold
… …
1154 free (ptr); 1155 free (ptr);
1155 return 0; 1156 return 0;
1156#endif 1157#endif
1157} 1158}
1158 1159
1159static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 1160static void *(*alloc)(void *ptr, long size) EV_THROW = ev_realloc_emul;
1160 1161
1161void ecb_cold 1162void ecb_cold
1162ev_set_allocator (void *(*cb)(void *ptr, long size)) 1163ev_set_allocator (void *(*cb)(void *ptr, long size)) EV_THROW
1163{ 1164{
1164 alloc = cb; 1165 alloc = cb;
1165} 1166}
1166 1167
1167inline_speed void * 1168inline_speed void *
… …
1284 1285
1285/*****************************************************************************/ 1286/*****************************************************************************/
1286 1287
1287#ifndef EV_HAVE_EV_TIME 1288#ifndef EV_HAVE_EV_TIME
1288ev_tstamp 1289ev_tstamp
1289ev_time (void) 1290ev_time (void) EV_THROW
1290{ 1291{
1291#if EV_USE_REALTIME 1292#if EV_USE_REALTIME
1292 if (expect_true (have_realtime)) 1293 if (expect_true (have_realtime))
1293 { 1294 {
1294 struct timespec ts; 1295 struct timespec ts;
… …
1318 return ev_time (); 1319 return ev_time ();
1319} 1320}
1320 1321
1321#if EV_MULTIPLICITY 1322#if EV_MULTIPLICITY
1322ev_tstamp 1323ev_tstamp
1323ev_now (EV_P) 1324ev_now (EV_P) EV_THROW
1324{ 1325{
1325 return ev_rt_now; 1326 return ev_rt_now;
1326} 1327}
1327#endif 1328#endif
1328 1329
1329void 1330void
1330ev_sleep (ev_tstamp delay) 1331ev_sleep (ev_tstamp delay) EV_THROW
1331{ 1332{
1332 if (delay > 0.) 1333 if (delay > 0.)
1333 { 1334 {
1334#if EV_USE_NANOSLEEP 1335#if EV_USE_NANOSLEEP
1335 struct timespec ts; 1336 struct timespec ts;
… …
1416pendingcb (EV_P_ ev_prepare *w, int revents) 1417pendingcb (EV_P_ ev_prepare *w, int revents)
1417{ 1418{
1418} 1419}
1419 1420
1420void noinline 1421void noinline
1421ev_feed_event (EV_P_ void *w, int revents) 1422ev_feed_event (EV_P_ void *w, int revents) EV_THROW
1422{ 1423{
1423 W w_ = (W)w; 1424 W w_ = (W)w;
1424 int pri = ABSPRI (w_); 1425 int pri = ABSPRI (w_);
1425 1426
1426 if (expect_false (w_->pending)) 1427 if (expect_false (w_->pending))
… …
1430 w_->pending = ++pendingcnt [pri]; 1431 w_->pending = ++pendingcnt [pri];
1431 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2); 1432 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
1432 pendings [pri][w_->pending - 1].w = w_; 1433 pendings [pri][w_->pending - 1].w = w_;
1433 pendings [pri][w_->pending - 1].events = revents; 1434 pendings [pri][w_->pending - 1].events = revents;
1434 } 1435 }
1436
1437 pendingpri = NUMPRI - 1;
1435} 1438}
1436 1439
1437inline_speed void 1440inline_speed void
1438feed_reverse (EV_P_ W w) 1441feed_reverse (EV_P_ W w)
1439{ 1442{
… …
1485 if (expect_true (!anfd->reify)) 1488 if (expect_true (!anfd->reify))
1486 fd_event_nocheck (EV_A_ fd, revents); 1489 fd_event_nocheck (EV_A_ fd, revents);
1487} 1490}
1488 1491
1489void 1492void
1490ev_feed_fd_event (EV_P_ int fd, int revents) 1493ev_feed_fd_event (EV_P_ int fd, int revents) EV_THROW
1491{ 1494{
1492 if (fd >= 0 && fd < anfdmax) 1495 if (fd >= 0 && fd < anfdmax)
1493 fd_event_nocheck (EV_A_ fd, revents); 1496 fd_event_nocheck (EV_A_ fd, revents);
1494} 1497}
1495 1498
… …
1844} 1847}
1845 1848
1846inline_speed void 1849inline_speed void
1847evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1850evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1848{ 1851{
1852 ECB_MEMORY_FENCE; /* push out the write before this function was called, acquire flag */
1853
1849 if (expect_true (*flag)) 1854 if (expect_true (*flag))
1850 return; 1855 return;
1851 1856
1852 *flag = 1; 1857 *flag = 1;
1853 1858
… …
1872 write (evfd, &counter, sizeof (uint64_t)); 1877 write (evfd, &counter, sizeof (uint64_t));
1873 } 1878 }
1874 else 1879 else
1875#endif 1880#endif
1876 { 1881 {
1877 /* win32 people keep sending patches that change this write() to send() */ 1882#ifdef _WIN32
1878 /* and then run away. but send() is wrong, it wants a socket handle on win32 */ 1883 WSABUF buf;
1879 /* so when you think this write should be a send instead, please find out */ 1884 DWORD sent;
1880 /* where your send() is from - it's definitely not the microsoft send, and */ 1885 buf.buf = &buf;
1881 /* tell me. thank you. */ 1886 buf.len = 1;
1882 /* it might be that your problem is that your environment needs EV_USE_WSASOCKET */ 1887 WSASend (EV_FD_TO_WIN32_HANDLE (evpipe [1]), &buf, 1, &sent, 0, 0, 0);
1883 /* check the ev documentation on how to use this flag */ 1888#else
1884 write (evpipe [1], &(evpipe [1]), 1); 1889 write (evpipe [1], &(evpipe [1]), 1);
1890#endif
1885 } 1891 }
1886 1892
1887 errno = old_errno; 1893 errno = old_errno;
1888 } 1894 }
1889} 1895}
… …
1904 read (evfd, &counter, sizeof (uint64_t)); 1910 read (evfd, &counter, sizeof (uint64_t));
1905 } 1911 }
1906 else 1912 else
1907#endif 1913#endif
1908 { 1914 {
1909 char dummy; 1915 char dummy[4];
1910 /* see discussion in evpipe_write when you think this read should be recv in win32 */ 1916#ifdef _WIN32
1917 WSABUF buf;
1918 DWORD recvd;
1919 buf.buf = dummy;
1920 buf.len = sizeof (dummy);
1921 WSARecv (EV_FD_TO_WIN32_HANDLE (evpipe [0]), &buf, 1, &recvd, 0, 0, 0);
1922#else
1911 read (evpipe [0], &dummy, 1); 1923 read (evpipe [0], &dummy, sizeof (dummy));
1924#endif
1912 } 1925 }
1913 } 1926 }
1914 1927
1915 pipe_write_skipped = 0; 1928 pipe_write_skipped = 0;
1929
1930 ECB_MEMORY_FENCE; /* push out skipped, acquire flags */
1916 1931
1917#if EV_SIGNAL_ENABLE 1932#if EV_SIGNAL_ENABLE
1918 if (sig_pending) 1933 if (sig_pending)
1919 { 1934 {
1920 sig_pending = 0; 1935 sig_pending = 0;
1936
1937 ECB_MEMORY_FENCE_RELEASE;
1921 1938
1922 for (i = EV_NSIG - 1; i--; ) 1939 for (i = EV_NSIG - 1; i--; )
1923 if (expect_false (signals [i].pending)) 1940 if (expect_false (signals [i].pending))
1924 ev_feed_signal_event (EV_A_ i + 1); 1941 ev_feed_signal_event (EV_A_ i + 1);
1925 } 1942 }
… …
1927 1944
1928#if EV_ASYNC_ENABLE 1945#if EV_ASYNC_ENABLE
1929 if (async_pending) 1946 if (async_pending)
1930 { 1947 {
1931 async_pending = 0; 1948 async_pending = 0;
1949
1950 ECB_MEMORY_FENCE_RELEASE;
1932 1951
1933 for (i = asynccnt; i--; ) 1952 for (i = asynccnt; i--; )
1934 if (asyncs [i]->sent) 1953 if (asyncs [i]->sent)
1935 { 1954 {
1936 asyncs [i]->sent = 0; 1955 asyncs [i]->sent = 0;
… …
1941} 1960}
1942 1961
1943/*****************************************************************************/ 1962/*****************************************************************************/
1944 1963
1945void 1964void
1946ev_feed_signal (int signum) 1965ev_feed_signal (int signum) EV_THROW
1947{ 1966{
1948#if EV_MULTIPLICITY 1967#if EV_MULTIPLICITY
1949 EV_P = signals [signum - 1].loop; 1968 EV_P = signals [signum - 1].loop;
1950 1969
1951 if (!EV_A) 1970 if (!EV_A)
… …
1968 1987
1969 ev_feed_signal (signum); 1988 ev_feed_signal (signum);
1970} 1989}
1971 1990
1972void noinline 1991void noinline
1973ev_feed_signal_event (EV_P_ int signum) 1992ev_feed_signal_event (EV_P_ int signum) EV_THROW
1974{ 1993{
1975 WL w; 1994 WL w;
1976 1995
1977 if (expect_false (signum <= 0 || signum > EV_NSIG)) 1996 if (expect_false (signum <= 0 || signum > EV_NSIG))
1978 return; 1997 return;
… …
2094#if EV_USE_SELECT 2113#if EV_USE_SELECT
2095# include "ev_select.c" 2114# include "ev_select.c"
2096#endif 2115#endif
2097 2116
2098int ecb_cold 2117int ecb_cold
2099ev_version_major (void) 2118ev_version_major (void) EV_THROW
2100{ 2119{
2101 return EV_VERSION_MAJOR; 2120 return EV_VERSION_MAJOR;
2102} 2121}
2103 2122
2104int ecb_cold 2123int ecb_cold
2105ev_version_minor (void) 2124ev_version_minor (void) EV_THROW
2106{ 2125{
2107 return EV_VERSION_MINOR; 2126 return EV_VERSION_MINOR;
2108} 2127}
2109 2128
2110/* return true if we are running with elevated privileges and should ignore env variables */ 2129/* return true if we are running with elevated privileges and should ignore env variables */
… …
2118 || getgid () != getegid (); 2137 || getgid () != getegid ();
2119#endif 2138#endif
2120} 2139}
2121 2140
2122unsigned int ecb_cold 2141unsigned int ecb_cold
2123ev_supported_backends (void) 2142ev_supported_backends (void) EV_THROW
2124{ 2143{
2125 unsigned int flags = 0; 2144 unsigned int flags = 0;
2126 2145
2127 if (EV_USE_PORT ) flags |= EVBACKEND_PORT; 2146 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
2128 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE; 2147 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE;
… …
2132 2151
2133 return flags; 2152 return flags;
2134} 2153}
2135 2154
2136unsigned int ecb_cold 2155unsigned int ecb_cold
2137ev_recommended_backends (void) 2156ev_recommended_backends (void) EV_THROW
2138{ 2157{
2139 unsigned int flags = ev_supported_backends (); 2158 unsigned int flags = ev_supported_backends ();
2140 2159
2141#ifndef __NetBSD__ 2160#ifndef __NetBSD__
2142 /* kqueue is borked on everything but netbsd apparently */ 2161 /* kqueue is borked on everything but netbsd apparently */
… …
2154 2173
2155 return flags; 2174 return flags;
2156} 2175}
2157 2176
2158unsigned int ecb_cold 2177unsigned int ecb_cold
2159ev_embeddable_backends (void) 2178ev_embeddable_backends (void) EV_THROW
2160{ 2179{
2161 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 2180 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
2162 2181
2163 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 2182 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
2164 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */ 2183 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
… …
2166 2185
2167 return flags; 2186 return flags;
2168} 2187}
2169 2188
2170unsigned int 2189unsigned int
2171ev_backend (EV_P) 2190ev_backend (EV_P) EV_THROW
2172{ 2191{
2173 return backend; 2192 return backend;
2174} 2193}
2175 2194
2176#if EV_FEATURE_API 2195#if EV_FEATURE_API
2177unsigned int 2196unsigned int
2178ev_iteration (EV_P) 2197ev_iteration (EV_P) EV_THROW
2179{ 2198{
2180 return loop_count; 2199 return loop_count;
2181} 2200}
2182 2201
2183unsigned int 2202unsigned int
2184ev_depth (EV_P) 2203ev_depth (EV_P) EV_THROW
2185{ 2204{
2186 return loop_depth; 2205 return loop_depth;
2187} 2206}
2188 2207
2189void 2208void
2190ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 2209ev_set_io_collect_interval (EV_P_ ev_tstamp interval) EV_THROW
2191{ 2210{
2192 io_blocktime = interval; 2211 io_blocktime = interval;
2193} 2212}
2194 2213
2195void 2214void
2196ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 2215ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) EV_THROW
2197{ 2216{
2198 timeout_blocktime = interval; 2217 timeout_blocktime = interval;
2199} 2218}
2200 2219
2201void 2220void
2202ev_set_userdata (EV_P_ void *data) 2221ev_set_userdata (EV_P_ void *data) EV_THROW
2203{ 2222{
2204 userdata = data; 2223 userdata = data;
2205} 2224}
2206 2225
2207void * 2226void *
2208ev_userdata (EV_P) 2227ev_userdata (EV_P) EV_THROW
2209{ 2228{
2210 return userdata; 2229 return userdata;
2211} 2230}
2212 2231
2213void 2232void
2214ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) 2233ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) EV_THROW
2215{ 2234{
2216 invoke_cb = invoke_pending_cb; 2235 invoke_cb = invoke_pending_cb;
2217} 2236}
2218 2237
2219void 2238void
2220ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P)) 2239ev_set_loop_release_cb (EV_P_ void (*release)(EV_P) EV_THROW, void (*acquire)(EV_P) EV_THROW) EV_THROW
2221{ 2240{
2222 release_cb = release; 2241 release_cb = release;
2223 acquire_cb = acquire; 2242 acquire_cb = acquire;
2224} 2243}
2225#endif 2244#endif
2226 2245
2227/* initialise a loop structure, must be zero-initialised */ 2246/* initialise a loop structure, must be zero-initialised */
2228static void noinline ecb_cold 2247static void noinline ecb_cold
2229loop_init (EV_P_ unsigned int flags) 2248loop_init (EV_P_ unsigned int flags) EV_THROW
2230{ 2249{
2231 if (!backend) 2250 if (!backend)
2232 { 2251 {
2233 origflags = flags; 2252 origflags = flags;
2234 2253
… …
2487} 2506}
2488 2507
2489#if EV_MULTIPLICITY 2508#if EV_MULTIPLICITY
2490 2509
2491struct ev_loop * ecb_cold 2510struct ev_loop * ecb_cold
2492ev_loop_new (unsigned int flags) 2511ev_loop_new (unsigned int flags) EV_THROW
2493{ 2512{
2494 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 2513 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
2495 2514
2496 memset (EV_A, 0, sizeof (struct ev_loop)); 2515 memset (EV_A, 0, sizeof (struct ev_loop));
2497 loop_init (EV_A_ flags); 2516 loop_init (EV_A_ flags);
… …
2541} 2560}
2542#endif 2561#endif
2543 2562
2544#if EV_FEATURE_API 2563#if EV_FEATURE_API
2545void ecb_cold 2564void ecb_cold
2546ev_verify (EV_P) 2565ev_verify (EV_P) EV_THROW
2547{ 2566{
2548#if EV_VERIFY 2567#if EV_VERIFY
2549 int i; 2568 int i;
2550 WL w; 2569 WL w, w2;
2551 2570
2552 assert (activecnt >= -1); 2571 assert (activecnt >= -1);
2553 2572
2554 assert (fdchangemax >= fdchangecnt); 2573 assert (fdchangemax >= fdchangecnt);
2555 for (i = 0; i < fdchangecnt; ++i) 2574 for (i = 0; i < fdchangecnt; ++i)
2556 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0)); 2575 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
2557 2576
2558 assert (anfdmax >= 0); 2577 assert (anfdmax >= 0);
2559 for (i = 0; i < anfdmax; ++i) 2578 for (i = 0; i < anfdmax; ++i)
2579 {
2580 int j = 0;
2581
2560 for (w = anfds [i].head; w; w = w->next) 2582 for (w = w2 = anfds [i].head; w; w = w->next)
2561 { 2583 {
2562 verify_watcher (EV_A_ (W)w); 2584 verify_watcher (EV_A_ (W)w);
2585
2586 if (j++ & 1)
2587 {
2588 assert (("libev: io watcher list contains a loop", w != w2));
2589 w2 = w2->next;
2590 }
2591
2563 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1)); 2592 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
2564 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i)); 2593 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
2565 } 2594 }
2595 }
2566 2596
2567 assert (timermax >= timercnt); 2597 assert (timermax >= timercnt);
2568 verify_heap (EV_A_ timers, timercnt); 2598 verify_heap (EV_A_ timers, timercnt);
2569 2599
2570#if EV_PERIODIC_ENABLE 2600#if EV_PERIODIC_ENABLE
… …
2620#if EV_MULTIPLICITY 2650#if EV_MULTIPLICITY
2621struct ev_loop * ecb_cold 2651struct ev_loop * ecb_cold
2622#else 2652#else
2623int 2653int
2624#endif 2654#endif
2625ev_default_loop (unsigned int flags) 2655ev_default_loop (unsigned int flags) EV_THROW
2626{ 2656{
2627 if (!ev_default_loop_ptr) 2657 if (!ev_default_loop_ptr)
2628 { 2658 {
2629#if EV_MULTIPLICITY 2659#if EV_MULTIPLICITY
2630 EV_P = ev_default_loop_ptr = &default_loop_struct; 2660 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
2649 2679
2650 return ev_default_loop_ptr; 2680 return ev_default_loop_ptr;
2651} 2681}
2652 2682
2653void 2683void
2654ev_loop_fork (EV_P) 2684ev_loop_fork (EV_P) EV_THROW
2655{ 2685{
2656 postfork = 1; /* must be in line with ev_default_fork */ 2686 postfork = 1; /* must be in line with ev_default_fork */
2657} 2687}
2658 2688
2659/*****************************************************************************/ 2689/*****************************************************************************/
… …
2663{ 2693{
2664 EV_CB_INVOKE ((W)w, revents); 2694 EV_CB_INVOKE ((W)w, revents);
2665} 2695}
2666 2696
2667unsigned int 2697unsigned int
2668ev_pending_count (EV_P) 2698ev_pending_count (EV_P) EV_THROW
2669{ 2699{
2670 int pri; 2700 int pri;
2671 unsigned int count = 0; 2701 unsigned int count = 0;
2672 2702
2673 for (pri = NUMPRI; pri--; ) 2703 for (pri = NUMPRI; pri--; )
… …
2677} 2707}
2678 2708
2679void noinline 2709void noinline
2680ev_invoke_pending (EV_P) 2710ev_invoke_pending (EV_P)
2681{ 2711{
2682 int pri; 2712 for (pendingpri = NUMPRI; pendingpri--; ) /* pendingpri is modified during the loop */
2683
2684 for (pri = NUMPRI; pri--; )
2685 while (pendingcnt [pri]) 2713 while (pendingcnt [pendingpri])
2686 { 2714 {
2687 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2715 ANPENDING *p = pendings [pendingpri] + --pendingcnt [pendingpri];
2688 2716
2689 p->w->pending = 0; 2717 p->w->pending = 0;
2690 EV_CB_INVOKE (p->w, p->events); 2718 EV_CB_INVOKE (p->w, p->events);
2691 EV_FREQUENT_CHECK; 2719 EV_FREQUENT_CHECK;
2692 } 2720 }
… …
3104 3132
3105 return activecnt; 3133 return activecnt;
3106} 3134}
3107 3135
3108void 3136void
3109ev_break (EV_P_ int how) 3137ev_break (EV_P_ int how) EV_THROW
3110{ 3138{
3111 loop_done = how; 3139 loop_done = how;
3112} 3140}
3113 3141
3114void 3142void
3115ev_ref (EV_P) 3143ev_ref (EV_P) EV_THROW
3116{ 3144{
3117 ++activecnt; 3145 ++activecnt;
3118} 3146}
3119 3147
3120void 3148void
3121ev_unref (EV_P) 3149ev_unref (EV_P) EV_THROW
3122{ 3150{
3123 --activecnt; 3151 --activecnt;
3124} 3152}
3125 3153
3126void 3154void
3127ev_now_update (EV_P) 3155ev_now_update (EV_P) EV_THROW
3128{ 3156{
3129 time_update (EV_A_ 1e100); 3157 time_update (EV_A_ 1e100);
3130} 3158}
3131 3159
3132void 3160void
3133ev_suspend (EV_P) 3161ev_suspend (EV_P) EV_THROW
3134{ 3162{
3135 ev_now_update (EV_A); 3163 ev_now_update (EV_A);
3136} 3164}
3137 3165
3138void 3166void
3139ev_resume (EV_P) 3167ev_resume (EV_P) EV_THROW
3140{ 3168{
3141 ev_tstamp mn_prev = mn_now; 3169 ev_tstamp mn_prev = mn_now;
3142 3170
3143 ev_now_update (EV_A); 3171 ev_now_update (EV_A);
3144 timers_reschedule (EV_A_ mn_now - mn_prev); 3172 timers_reschedule (EV_A_ mn_now - mn_prev);
… …
3183 w->pending = 0; 3211 w->pending = 0;
3184 } 3212 }
3185} 3213}
3186 3214
3187int 3215int
3188ev_clear_pending (EV_P_ void *w) 3216ev_clear_pending (EV_P_ void *w) EV_THROW
3189{ 3217{
3190 W w_ = (W)w; 3218 W w_ = (W)w;
3191 int pending = w_->pending; 3219 int pending = w_->pending;
3192 3220
3193 if (expect_true (pending)) 3221 if (expect_true (pending))
… …
3226} 3254}
3227 3255
3228/*****************************************************************************/ 3256/*****************************************************************************/
3229 3257
3230void noinline 3258void noinline
3231ev_io_start (EV_P_ ev_io *w) 3259ev_io_start (EV_P_ ev_io *w) EV_THROW
3232{ 3260{
3233 int fd = w->fd; 3261 int fd = w->fd;
3234 3262
3235 if (expect_false (ev_is_active (w))) 3263 if (expect_false (ev_is_active (w)))
3236 return; 3264 return;
… …
3242 3270
3243 ev_start (EV_A_ (W)w, 1); 3271 ev_start (EV_A_ (W)w, 1);
3244 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 3272 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
3245 wlist_add (&anfds[fd].head, (WL)w); 3273 wlist_add (&anfds[fd].head, (WL)w);
3246 3274
3275 /* common bug, apparently */
3276 assert (("libev: ev_io_start called with corrupted watcher", ((WL)w)->next != (WL)w));
3277
3247 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY); 3278 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
3248 w->events &= ~EV__IOFDSET; 3279 w->events &= ~EV__IOFDSET;
3249 3280
3250 EV_FREQUENT_CHECK; 3281 EV_FREQUENT_CHECK;
3251} 3282}
3252 3283
3253void noinline 3284void noinline
3254ev_io_stop (EV_P_ ev_io *w) 3285ev_io_stop (EV_P_ ev_io *w) EV_THROW
3255{ 3286{
3256 clear_pending (EV_A_ (W)w); 3287 clear_pending (EV_A_ (W)w);
3257 if (expect_false (!ev_is_active (w))) 3288 if (expect_false (!ev_is_active (w)))
3258 return; 3289 return;
3259 3290
… …
3268 3299
3269 EV_FREQUENT_CHECK; 3300 EV_FREQUENT_CHECK;
3270} 3301}
3271 3302
3272void noinline 3303void noinline
3273ev_timer_start (EV_P_ ev_timer *w) 3304ev_timer_start (EV_P_ ev_timer *w) EV_THROW
3274{ 3305{
3275 if (expect_false (ev_is_active (w))) 3306 if (expect_false (ev_is_active (w)))
3276 return; 3307 return;
3277 3308
3278 ev_at (w) += mn_now; 3309 ev_at (w) += mn_now;
… …
3292 3323
3293 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 3324 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
3294} 3325}
3295 3326
3296void noinline 3327void noinline
3297ev_timer_stop (EV_P_ ev_timer *w) 3328ev_timer_stop (EV_P_ ev_timer *w) EV_THROW
3298{ 3329{
3299 clear_pending (EV_A_ (W)w); 3330 clear_pending (EV_A_ (W)w);
3300 if (expect_false (!ev_is_active (w))) 3331 if (expect_false (!ev_is_active (w)))
3301 return; 3332 return;
3302 3333
… …
3322 3353
3323 EV_FREQUENT_CHECK; 3354 EV_FREQUENT_CHECK;
3324} 3355}
3325 3356
3326void noinline 3357void noinline
3327ev_timer_again (EV_P_ ev_timer *w) 3358ev_timer_again (EV_P_ ev_timer *w) EV_THROW
3328{ 3359{
3329 EV_FREQUENT_CHECK; 3360 EV_FREQUENT_CHECK;
3330 3361
3331 clear_pending (EV_A_ (W)w); 3362 clear_pending (EV_A_ (W)w);
3332 3363
… …
3349 3380
3350 EV_FREQUENT_CHECK; 3381 EV_FREQUENT_CHECK;
3351} 3382}
3352 3383
3353ev_tstamp 3384ev_tstamp
3354ev_timer_remaining (EV_P_ ev_timer *w) 3385ev_timer_remaining (EV_P_ ev_timer *w) EV_THROW
3355{ 3386{
3356 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.); 3387 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
3357} 3388}
3358 3389
3359#if EV_PERIODIC_ENABLE 3390#if EV_PERIODIC_ENABLE
3360void noinline 3391void noinline
3361ev_periodic_start (EV_P_ ev_periodic *w) 3392ev_periodic_start (EV_P_ ev_periodic *w) EV_THROW
3362{ 3393{
3363 if (expect_false (ev_is_active (w))) 3394 if (expect_false (ev_is_active (w)))
3364 return; 3395 return;
3365 3396
3366 if (w->reschedule_cb) 3397 if (w->reschedule_cb)
… …
3386 3417
3387 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 3418 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
3388} 3419}
3389 3420
3390void noinline 3421void noinline
3391ev_periodic_stop (EV_P_ ev_periodic *w) 3422ev_periodic_stop (EV_P_ ev_periodic *w) EV_THROW
3392{ 3423{
3393 clear_pending (EV_A_ (W)w); 3424 clear_pending (EV_A_ (W)w);
3394 if (expect_false (!ev_is_active (w))) 3425 if (expect_false (!ev_is_active (w)))
3395 return; 3426 return;
3396 3427
… …
3414 3445
3415 EV_FREQUENT_CHECK; 3446 EV_FREQUENT_CHECK;
3416} 3447}
3417 3448
3418void noinline 3449void noinline
3419ev_periodic_again (EV_P_ ev_periodic *w) 3450ev_periodic_again (EV_P_ ev_periodic *w) EV_THROW
3420{ 3451{
3421 /* TODO: use adjustheap and recalculation */ 3452 /* TODO: use adjustheap and recalculation */
3422 ev_periodic_stop (EV_A_ w); 3453 ev_periodic_stop (EV_A_ w);
3423 ev_periodic_start (EV_A_ w); 3454 ev_periodic_start (EV_A_ w);
3424} 3455}
… …
3429#endif 3460#endif
3430 3461
3431#if EV_SIGNAL_ENABLE 3462#if EV_SIGNAL_ENABLE
3432 3463
3433void noinline 3464void noinline
3434ev_signal_start (EV_P_ ev_signal *w) 3465ev_signal_start (EV_P_ ev_signal *w) EV_THROW
3435{ 3466{
3436 if (expect_false (ev_is_active (w))) 3467 if (expect_false (ev_is_active (w)))
3437 return; 3468 return;
3438 3469
3439 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG)); 3470 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
… …
3510 3541
3511 EV_FREQUENT_CHECK; 3542 EV_FREQUENT_CHECK;
3512} 3543}
3513 3544
3514void noinline 3545void noinline
3515ev_signal_stop (EV_P_ ev_signal *w) 3546ev_signal_stop (EV_P_ ev_signal *w) EV_THROW
3516{ 3547{
3517 clear_pending (EV_A_ (W)w); 3548 clear_pending (EV_A_ (W)w);
3518 if (expect_false (!ev_is_active (w))) 3549 if (expect_false (!ev_is_active (w)))
3519 return; 3550 return;
3520 3551
… …
3551#endif 3582#endif
3552 3583
3553#if EV_CHILD_ENABLE 3584#if EV_CHILD_ENABLE
3554 3585
3555void 3586void
3556ev_child_start (EV_P_ ev_child *w) 3587ev_child_start (EV_P_ ev_child *w) EV_THROW
3557{ 3588{
3558#if EV_MULTIPLICITY 3589#if EV_MULTIPLICITY
3559 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 3590 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
3560#endif 3591#endif
3561 if (expect_false (ev_is_active (w))) 3592 if (expect_false (ev_is_active (w)))
… …
3568 3599
3569 EV_FREQUENT_CHECK; 3600 EV_FREQUENT_CHECK;
3570} 3601}
3571 3602
3572void 3603void
3573ev_child_stop (EV_P_ ev_child *w) 3604ev_child_stop (EV_P_ ev_child *w) EV_THROW
3574{ 3605{
3575 clear_pending (EV_A_ (W)w); 3606 clear_pending (EV_A_ (W)w);
3576 if (expect_false (!ev_is_active (w))) 3607 if (expect_false (!ev_is_active (w)))
3577 return; 3608 return;
3578 3609
… …
3830#else 3861#else
3831# define EV_LSTAT(p,b) lstat (p, b) 3862# define EV_LSTAT(p,b) lstat (p, b)
3832#endif 3863#endif
3833 3864
3834void 3865void
3835ev_stat_stat (EV_P_ ev_stat *w) 3866ev_stat_stat (EV_P_ ev_stat *w) EV_THROW
3836{ 3867{
3837 if (lstat (w->path, &w->attr) < 0) 3868 if (lstat (w->path, &w->attr) < 0)
3838 w->attr.st_nlink = 0; 3869 w->attr.st_nlink = 0;
3839 else if (!w->attr.st_nlink) 3870 else if (!w->attr.st_nlink)
3840 w->attr.st_nlink = 1; 3871 w->attr.st_nlink = 1;
… …
3879 ev_feed_event (EV_A_ w, EV_STAT); 3910 ev_feed_event (EV_A_ w, EV_STAT);
3880 } 3911 }
3881} 3912}
3882 3913
3883void 3914void
3884ev_stat_start (EV_P_ ev_stat *w) 3915ev_stat_start (EV_P_ ev_stat *w) EV_THROW
3885{ 3916{
3886 if (expect_false (ev_is_active (w))) 3917 if (expect_false (ev_is_active (w)))
3887 return; 3918 return;
3888 3919
3889 ev_stat_stat (EV_A_ w); 3920 ev_stat_stat (EV_A_ w);
… …
3910 3941
3911 EV_FREQUENT_CHECK; 3942 EV_FREQUENT_CHECK;
3912} 3943}
3913 3944
3914void 3945void
3915ev_stat_stop (EV_P_ ev_stat *w) 3946ev_stat_stop (EV_P_ ev_stat *w) EV_THROW
3916{ 3947{
3917 clear_pending (EV_A_ (W)w); 3948 clear_pending (EV_A_ (W)w);
3918 if (expect_false (!ev_is_active (w))) 3949 if (expect_false (!ev_is_active (w)))
3919 return; 3950 return;
3920 3951
… …
3936} 3967}
3937#endif 3968#endif
3938 3969
3939#if EV_IDLE_ENABLE 3970#if EV_IDLE_ENABLE
3940void 3971void
3941ev_idle_start (EV_P_ ev_idle *w) 3972ev_idle_start (EV_P_ ev_idle *w) EV_THROW
3942{ 3973{
3943 if (expect_false (ev_is_active (w))) 3974 if (expect_false (ev_is_active (w)))
3944 return; 3975 return;
3945 3976
3946 pri_adjust (EV_A_ (W)w); 3977 pri_adjust (EV_A_ (W)w);
… …
3959 3990
3960 EV_FREQUENT_CHECK; 3991 EV_FREQUENT_CHECK;
3961} 3992}
3962 3993
3963void 3994void
3964ev_idle_stop (EV_P_ ev_idle *w) 3995ev_idle_stop (EV_P_ ev_idle *w) EV_THROW
3965{ 3996{
3966 clear_pending (EV_A_ (W)w); 3997 clear_pending (EV_A_ (W)w);
3967 if (expect_false (!ev_is_active (w))) 3998 if (expect_false (!ev_is_active (w)))
3968 return; 3999 return;
3969 4000
… …
3983} 4014}
3984#endif 4015#endif
3985 4016
3986#if EV_PREPARE_ENABLE 4017#if EV_PREPARE_ENABLE
3987void 4018void
3988ev_prepare_start (EV_P_ ev_prepare *w) 4019ev_prepare_start (EV_P_ ev_prepare *w) EV_THROW
3989{ 4020{
3990 if (expect_false (ev_is_active (w))) 4021 if (expect_false (ev_is_active (w)))
3991 return; 4022 return;
3992 4023
3993 EV_FREQUENT_CHECK; 4024 EV_FREQUENT_CHECK;
… …
3998 4029
3999 EV_FREQUENT_CHECK; 4030 EV_FREQUENT_CHECK;
4000} 4031}
4001 4032
4002void 4033void
4003ev_prepare_stop (EV_P_ ev_prepare *w) 4034ev_prepare_stop (EV_P_ ev_prepare *w) EV_THROW
4004{ 4035{
4005 clear_pending (EV_A_ (W)w); 4036 clear_pending (EV_A_ (W)w);
4006 if (expect_false (!ev_is_active (w))) 4037 if (expect_false (!ev_is_active (w)))
4007 return; 4038 return;
4008 4039
… …
4021} 4052}
4022#endif 4053#endif
4023 4054
4024#if EV_CHECK_ENABLE 4055#if EV_CHECK_ENABLE
4025void 4056void
4026ev_check_start (EV_P_ ev_check *w) 4057ev_check_start (EV_P_ ev_check *w) EV_THROW
4027{ 4058{
4028 if (expect_false (ev_is_active (w))) 4059 if (expect_false (ev_is_active (w)))
4029 return; 4060 return;
4030 4061
4031 EV_FREQUENT_CHECK; 4062 EV_FREQUENT_CHECK;
… …
4036 4067
4037 EV_FREQUENT_CHECK; 4068 EV_FREQUENT_CHECK;
4038} 4069}
4039 4070
4040void 4071void
4041ev_check_stop (EV_P_ ev_check *w) 4072ev_check_stop (EV_P_ ev_check *w) EV_THROW
4042{ 4073{
4043 clear_pending (EV_A_ (W)w); 4074 clear_pending (EV_A_ (W)w);
4044 if (expect_false (!ev_is_active (w))) 4075 if (expect_false (!ev_is_active (w)))
4045 return; 4076 return;
4046 4077
… …
4059} 4090}
4060#endif 4091#endif
4061 4092
4062#if EV_EMBED_ENABLE 4093#if EV_EMBED_ENABLE
4063void noinline 4094void noinline
4064ev_embed_sweep (EV_P_ ev_embed *w) 4095ev_embed_sweep (EV_P_ ev_embed *w) EV_THROW
4065{ 4096{
4066 ev_run (w->other, EVRUN_NOWAIT); 4097 ev_run (w->other, EVRUN_NOWAIT);
4067} 4098}
4068 4099
4069static void 4100static void
… …
4117 ev_idle_stop (EV_A_ idle); 4148 ev_idle_stop (EV_A_ idle);
4118} 4149}
4119#endif 4150#endif
4120 4151
4121void 4152void
4122ev_embed_start (EV_P_ ev_embed *w) 4153ev_embed_start (EV_P_ ev_embed *w) EV_THROW
4123{ 4154{
4124 if (expect_false (ev_is_active (w))) 4155 if (expect_false (ev_is_active (w)))
4125 return; 4156 return;
4126 4157
4127 { 4158 {
… …
4148 4179
4149 EV_FREQUENT_CHECK; 4180 EV_FREQUENT_CHECK;
4150} 4181}
4151 4182
4152void 4183void
4153ev_embed_stop (EV_P_ ev_embed *w) 4184ev_embed_stop (EV_P_ ev_embed *w) EV_THROW
4154{ 4185{
4155 clear_pending (EV_A_ (W)w); 4186 clear_pending (EV_A_ (W)w);
4156 if (expect_false (!ev_is_active (w))) 4187 if (expect_false (!ev_is_active (w)))
4157 return; 4188 return;
4158 4189
… …
4168} 4199}
4169#endif 4200#endif
4170 4201
4171#if EV_FORK_ENABLE 4202#if EV_FORK_ENABLE
4172void 4203void
4173ev_fork_start (EV_P_ ev_fork *w) 4204ev_fork_start (EV_P_ ev_fork *w) EV_THROW
4174{ 4205{
4175 if (expect_false (ev_is_active (w))) 4206 if (expect_false (ev_is_active (w)))
4176 return; 4207 return;
4177 4208
4178 EV_FREQUENT_CHECK; 4209 EV_FREQUENT_CHECK;
… …
4183 4214
4184 EV_FREQUENT_CHECK; 4215 EV_FREQUENT_CHECK;
4185} 4216}
4186 4217
4187void 4218void
4188ev_fork_stop (EV_P_ ev_fork *w) 4219ev_fork_stop (EV_P_ ev_fork *w) EV_THROW
4189{ 4220{
4190 clear_pending (EV_A_ (W)w); 4221 clear_pending (EV_A_ (W)w);
4191 if (expect_false (!ev_is_active (w))) 4222 if (expect_false (!ev_is_active (w)))
4192 return; 4223 return;
4193 4224
… …
4206} 4237}
4207#endif 4238#endif
4208 4239
4209#if EV_CLEANUP_ENABLE 4240#if EV_CLEANUP_ENABLE
4210void 4241void
4211ev_cleanup_start (EV_P_ ev_cleanup *w) 4242ev_cleanup_start (EV_P_ ev_cleanup *w) EV_THROW
4212{ 4243{
4213 if (expect_false (ev_is_active (w))) 4244 if (expect_false (ev_is_active (w)))
4214 return; 4245 return;
4215 4246
4216 EV_FREQUENT_CHECK; 4247 EV_FREQUENT_CHECK;
… …
4223 ev_unref (EV_A); 4254 ev_unref (EV_A);
4224 EV_FREQUENT_CHECK; 4255 EV_FREQUENT_CHECK;
4225} 4256}
4226 4257
4227void 4258void
4228ev_cleanup_stop (EV_P_ ev_cleanup *w) 4259ev_cleanup_stop (EV_P_ ev_cleanup *w) EV_THROW
4229{ 4260{
4230 clear_pending (EV_A_ (W)w); 4261 clear_pending (EV_A_ (W)w);
4231 if (expect_false (!ev_is_active (w))) 4262 if (expect_false (!ev_is_active (w)))
4232 return; 4263 return;
4233 4264
… …
4247} 4278}
4248#endif 4279#endif
4249 4280
4250#if EV_ASYNC_ENABLE 4281#if EV_ASYNC_ENABLE
4251void 4282void
4252ev_async_start (EV_P_ ev_async *w) 4283ev_async_start (EV_P_ ev_async *w) EV_THROW
4253{ 4284{
4254 if (expect_false (ev_is_active (w))) 4285 if (expect_false (ev_is_active (w)))
4255 return; 4286 return;
4256 4287
4257 w->sent = 0; 4288 w->sent = 0;
… …
4266 4297
4267 EV_FREQUENT_CHECK; 4298 EV_FREQUENT_CHECK;
4268} 4299}
4269 4300
4270void 4301void
4271ev_async_stop (EV_P_ ev_async *w) 4302ev_async_stop (EV_P_ ev_async *w) EV_THROW
4272{ 4303{
4273 clear_pending (EV_A_ (W)w); 4304 clear_pending (EV_A_ (W)w);
4274 if (expect_false (!ev_is_active (w))) 4305 if (expect_false (!ev_is_active (w)))
4275 return; 4306 return;
4276 4307
… …
4287 4318
4288 EV_FREQUENT_CHECK; 4319 EV_FREQUENT_CHECK;
4289} 4320}
4290 4321
4291void 4322void
4292ev_async_send (EV_P_ ev_async *w) 4323ev_async_send (EV_P_ ev_async *w) EV_THROW
4293{ 4324{
4294 w->sent = 1; 4325 w->sent = 1;
4295 evpipe_write (EV_A_ &async_pending); 4326 evpipe_write (EV_A_ &async_pending);
4296} 4327}
4297#endif 4328#endif
… …
4334 4365
4335 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io)); 4366 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
4336} 4367}
4337 4368
4338void 4369void
4339ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 4370ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) EV_THROW
4340{ 4371{
4341 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 4372 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
4342 4373
4343 if (expect_false (!once)) 4374 if (expect_false (!once))
4344 { 4375 {
… …
4366 4397
4367/*****************************************************************************/ 4398/*****************************************************************************/
4368 4399
4369#if EV_WALK_ENABLE 4400#if EV_WALK_ENABLE
4370void ecb_cold 4401void ecb_cold
4371ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 4402ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) EV_THROW
4372{ 4403{
4373 int i, j; 4404 int i, j;
4374 ev_watcher_list *wl, *wn; 4405 ev_watcher_list *wl, *wn;
4375 4406
4376 if (types & (EV_IO | EV_EMBED)) 4407 if (types & (EV_IO | EV_EMBED))

Diff Legend

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