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

Diff Legend

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