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.427 by root, Sun May 6 19:29:59 2012 UTC

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

Diff Legend

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