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

Comparing libev/ev.c (file contents):
Revision 1.418 by root, Mon Apr 2 23:14:41 2012 UTC vs.
Revision 1.426 by root, Sun May 6 13:42:10 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
… …
579 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore") 579 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore")
580 #elif defined __s390__ || defined __s390x__ 580 #elif defined __s390__ || defined __s390x__
581 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory") 581 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory")
582 #elif defined __mips__ 582 #elif defined __mips__
583 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory") 583 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory")
584 #elif defined __alpha__
585 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mb" : : : "memory")
584 #endif 586 #endif
585 #endif 587 #endif
586#endif 588#endif
587 589
588#ifndef ECB_MEMORY_FENCE 590#ifndef ECB_MEMORY_FENCE
… …
1103{ 1105{
1104 write (STDERR_FILENO, msg, strlen (msg)); 1106 write (STDERR_FILENO, msg, strlen (msg));
1105} 1107}
1106#endif 1108#endif
1107 1109
1108static void (*syserr_cb)(const char *msg); 1110static void (*syserr_cb)(const char *msg) EV_THROW;
1109 1111
1110void ecb_cold 1112void ecb_cold
1111ev_set_syserr_cb (void (*cb)(const char *msg)) 1113ev_set_syserr_cb (void (*cb)(const char *msg)) EV_THROW
1112{ 1114{
1113 syserr_cb = cb; 1115 syserr_cb = cb;
1114} 1116}
1115 1117
1116static void noinline ecb_cold 1118static void noinline ecb_cold
… …
1152 free (ptr); 1154 free (ptr);
1153 return 0; 1155 return 0;
1154#endif 1156#endif
1155} 1157}
1156 1158
1157static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 1159static void *(*alloc)(void *ptr, long size) EV_THROW = ev_realloc_emul;
1158 1160
1159void ecb_cold 1161void ecb_cold
1160ev_set_allocator (void *(*cb)(void *ptr, long size)) 1162ev_set_allocator (void *(*cb)(void *ptr, long size)) EV_THROW
1161{ 1163{
1162 alloc = cb; 1164 alloc = cb;
1163} 1165}
1164 1166
1165inline_speed void * 1167inline_speed void *
… …
1282 1284
1283/*****************************************************************************/ 1285/*****************************************************************************/
1284 1286
1285#ifndef EV_HAVE_EV_TIME 1287#ifndef EV_HAVE_EV_TIME
1286ev_tstamp 1288ev_tstamp
1287ev_time (void) 1289ev_time (void) EV_THROW
1288{ 1290{
1289#if EV_USE_REALTIME 1291#if EV_USE_REALTIME
1290 if (expect_true (have_realtime)) 1292 if (expect_true (have_realtime))
1291 { 1293 {
1292 struct timespec ts; 1294 struct timespec ts;
… …
1316 return ev_time (); 1318 return ev_time ();
1317} 1319}
1318 1320
1319#if EV_MULTIPLICITY 1321#if EV_MULTIPLICITY
1320ev_tstamp 1322ev_tstamp
1321ev_now (EV_P) 1323ev_now (EV_P) EV_THROW
1322{ 1324{
1323 return ev_rt_now; 1325 return ev_rt_now;
1324} 1326}
1325#endif 1327#endif
1326 1328
1327void 1329void
1328ev_sleep (ev_tstamp delay) 1330ev_sleep (ev_tstamp delay) EV_THROW
1329{ 1331{
1330 if (delay > 0.) 1332 if (delay > 0.)
1331 { 1333 {
1332#if EV_USE_NANOSLEEP 1334#if EV_USE_NANOSLEEP
1333 struct timespec ts; 1335 struct timespec ts;
… …
1414pendingcb (EV_P_ ev_prepare *w, int revents) 1416pendingcb (EV_P_ ev_prepare *w, int revents)
1415{ 1417{
1416} 1418}
1417 1419
1418void noinline 1420void noinline
1419ev_feed_event (EV_P_ void *w, int revents) 1421ev_feed_event (EV_P_ void *w, int revents) EV_THROW
1420{ 1422{
1421 W w_ = (W)w; 1423 W w_ = (W)w;
1422 int pri = ABSPRI (w_); 1424 int pri = ABSPRI (w_);
1423 1425
1424 if (expect_false (w_->pending)) 1426 if (expect_false (w_->pending))
… …
1428 w_->pending = ++pendingcnt [pri]; 1430 w_->pending = ++pendingcnt [pri];
1429 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2); 1431 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
1430 pendings [pri][w_->pending - 1].w = w_; 1432 pendings [pri][w_->pending - 1].w = w_;
1431 pendings [pri][w_->pending - 1].events = revents; 1433 pendings [pri][w_->pending - 1].events = revents;
1432 } 1434 }
1435
1436 pendingpri = NUMPRI - 1;
1433} 1437}
1434 1438
1435inline_speed void 1439inline_speed void
1436feed_reverse (EV_P_ W w) 1440feed_reverse (EV_P_ W w)
1437{ 1441{
… …
1483 if (expect_true (!anfd->reify)) 1487 if (expect_true (!anfd->reify))
1484 fd_event_nocheck (EV_A_ fd, revents); 1488 fd_event_nocheck (EV_A_ fd, revents);
1485} 1489}
1486 1490
1487void 1491void
1488ev_feed_fd_event (EV_P_ int fd, int revents) 1492ev_feed_fd_event (EV_P_ int fd, int revents) EV_THROW
1489{ 1493{
1490 if (fd >= 0 && fd < anfdmax) 1494 if (fd >= 0 && fd < anfdmax)
1491 fd_event_nocheck (EV_A_ fd, revents); 1495 fd_event_nocheck (EV_A_ fd, revents);
1492} 1496}
1493 1497
… …
1842} 1846}
1843 1847
1844inline_speed void 1848inline_speed void
1845evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1849evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1846{ 1850{
1851 ECB_MEMORY_FENCE; /* push out the write before this function was called, acquire flag */
1852
1847 if (expect_true (*flag)) 1853 if (expect_true (*flag))
1848 return; 1854 return;
1849 1855
1850 *flag = 1; 1856 *flag = 1;
1851 1857
… …
1910 } 1916 }
1911 } 1917 }
1912 1918
1913 pipe_write_skipped = 0; 1919 pipe_write_skipped = 0;
1914 1920
1921 ECB_MEMORY_FENCE; /* push out skipped, acquire flags */
1922
1915#if EV_SIGNAL_ENABLE 1923#if EV_SIGNAL_ENABLE
1916 if (sig_pending) 1924 if (sig_pending)
1917 { 1925 {
1918 sig_pending = 0; 1926 sig_pending = 0;
1927
1928 ECB_MEMORY_FENCE_RELEASE;
1919 1929
1920 for (i = EV_NSIG - 1; i--; ) 1930 for (i = EV_NSIG - 1; i--; )
1921 if (expect_false (signals [i].pending)) 1931 if (expect_false (signals [i].pending))
1922 ev_feed_signal_event (EV_A_ i + 1); 1932 ev_feed_signal_event (EV_A_ i + 1);
1923 } 1933 }
… …
1925 1935
1926#if EV_ASYNC_ENABLE 1936#if EV_ASYNC_ENABLE
1927 if (async_pending) 1937 if (async_pending)
1928 { 1938 {
1929 async_pending = 0; 1939 async_pending = 0;
1940
1941 ECB_MEMORY_FENCE_RELEASE;
1930 1942
1931 for (i = asynccnt; i--; ) 1943 for (i = asynccnt; i--; )
1932 if (asyncs [i]->sent) 1944 if (asyncs [i]->sent)
1933 { 1945 {
1934 asyncs [i]->sent = 0; 1946 asyncs [i]->sent = 0;
… …
1939} 1951}
1940 1952
1941/*****************************************************************************/ 1953/*****************************************************************************/
1942 1954
1943void 1955void
1944ev_feed_signal (int signum) 1956ev_feed_signal (int signum) EV_THROW
1945{ 1957{
1946#if EV_MULTIPLICITY 1958#if EV_MULTIPLICITY
1947 EV_P = signals [signum - 1].loop; 1959 EV_P = signals [signum - 1].loop;
1948 1960
1949 if (!EV_A) 1961 if (!EV_A)
… …
1966 1978
1967 ev_feed_signal (signum); 1979 ev_feed_signal (signum);
1968} 1980}
1969 1981
1970void noinline 1982void noinline
1971ev_feed_signal_event (EV_P_ int signum) 1983ev_feed_signal_event (EV_P_ int signum) EV_THROW
1972{ 1984{
1973 WL w; 1985 WL w;
1974 1986
1975 if (expect_false (signum <= 0 || signum > EV_NSIG)) 1987 if (expect_false (signum <= 0 || signum > EV_NSIG))
1976 return; 1988 return;
… …
2092#if EV_USE_SELECT 2104#if EV_USE_SELECT
2093# include "ev_select.c" 2105# include "ev_select.c"
2094#endif 2106#endif
2095 2107
2096int ecb_cold 2108int ecb_cold
2097ev_version_major (void) 2109ev_version_major (void) EV_THROW
2098{ 2110{
2099 return EV_VERSION_MAJOR; 2111 return EV_VERSION_MAJOR;
2100} 2112}
2101 2113
2102int ecb_cold 2114int ecb_cold
2103ev_version_minor (void) 2115ev_version_minor (void) EV_THROW
2104{ 2116{
2105 return EV_VERSION_MINOR; 2117 return EV_VERSION_MINOR;
2106} 2118}
2107 2119
2108/* return true if we are running with elevated privileges and should ignore env variables */ 2120/* return true if we are running with elevated privileges and should ignore env variables */
… …
2116 || getgid () != getegid (); 2128 || getgid () != getegid ();
2117#endif 2129#endif
2118} 2130}
2119 2131
2120unsigned int ecb_cold 2132unsigned int ecb_cold
2121ev_supported_backends (void) 2133ev_supported_backends (void) EV_THROW
2122{ 2134{
2123 unsigned int flags = 0; 2135 unsigned int flags = 0;
2124 2136
2125 if (EV_USE_PORT ) flags |= EVBACKEND_PORT; 2137 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
2126 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE; 2138 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE;
… …
2130 2142
2131 return flags; 2143 return flags;
2132} 2144}
2133 2145
2134unsigned int ecb_cold 2146unsigned int ecb_cold
2135ev_recommended_backends (void) 2147ev_recommended_backends (void) EV_THROW
2136{ 2148{
2137 unsigned int flags = ev_supported_backends (); 2149 unsigned int flags = ev_supported_backends ();
2138 2150
2139#ifndef __NetBSD__ 2151#ifndef __NetBSD__
2140 /* kqueue is borked on everything but netbsd apparently */ 2152 /* kqueue is borked on everything but netbsd apparently */
… …
2152 2164
2153 return flags; 2165 return flags;
2154} 2166}
2155 2167
2156unsigned int ecb_cold 2168unsigned int ecb_cold
2157ev_embeddable_backends (void) 2169ev_embeddable_backends (void) EV_THROW
2158{ 2170{
2159 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 2171 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
2160 2172
2161 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 2173 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
2162 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */ 2174 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
… …
2164 2176
2165 return flags; 2177 return flags;
2166} 2178}
2167 2179
2168unsigned int 2180unsigned int
2169ev_backend (EV_P) 2181ev_backend (EV_P) EV_THROW
2170{ 2182{
2171 return backend; 2183 return backend;
2172} 2184}
2173 2185
2174#if EV_FEATURE_API 2186#if EV_FEATURE_API
2175unsigned int 2187unsigned int
2176ev_iteration (EV_P) 2188ev_iteration (EV_P) EV_THROW
2177{ 2189{
2178 return loop_count; 2190 return loop_count;
2179} 2191}
2180 2192
2181unsigned int 2193unsigned int
2182ev_depth (EV_P) 2194ev_depth (EV_P) EV_THROW
2183{ 2195{
2184 return loop_depth; 2196 return loop_depth;
2185} 2197}
2186 2198
2187void 2199void
2188ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 2200ev_set_io_collect_interval (EV_P_ ev_tstamp interval) EV_THROW
2189{ 2201{
2190 io_blocktime = interval; 2202 io_blocktime = interval;
2191} 2203}
2192 2204
2193void 2205void
2194ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 2206ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) EV_THROW
2195{ 2207{
2196 timeout_blocktime = interval; 2208 timeout_blocktime = interval;
2197} 2209}
2198 2210
2199void 2211void
2200ev_set_userdata (EV_P_ void *data) 2212ev_set_userdata (EV_P_ void *data) EV_THROW
2201{ 2213{
2202 userdata = data; 2214 userdata = data;
2203} 2215}
2204 2216
2205void * 2217void *
2206ev_userdata (EV_P) 2218ev_userdata (EV_P) EV_THROW
2207{ 2219{
2208 return userdata; 2220 return userdata;
2209} 2221}
2210 2222
2211void 2223void
2212ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) 2224ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) EV_THROW
2213{ 2225{
2214 invoke_cb = invoke_pending_cb; 2226 invoke_cb = invoke_pending_cb;
2215} 2227}
2216 2228
2217void 2229void
2218ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P)) 2230ev_set_loop_release_cb (EV_P_ void (*release)(EV_P) EV_THROW, void (*acquire)(EV_P) EV_THROW) EV_THROW
2219{ 2231{
2220 release_cb = release; 2232 release_cb = release;
2221 acquire_cb = acquire; 2233 acquire_cb = acquire;
2222} 2234}
2223#endif 2235#endif
2224 2236
2225/* initialise a loop structure, must be zero-initialised */ 2237/* initialise a loop structure, must be zero-initialised */
2226static void noinline ecb_cold 2238static void noinline ecb_cold
2227loop_init (EV_P_ unsigned int flags) 2239loop_init (EV_P_ unsigned int flags) EV_THROW
2228{ 2240{
2229 if (!backend) 2241 if (!backend)
2230 { 2242 {
2231 origflags = flags; 2243 origflags = flags;
2232 2244
… …
2485} 2497}
2486 2498
2487#if EV_MULTIPLICITY 2499#if EV_MULTIPLICITY
2488 2500
2489struct ev_loop * ecb_cold 2501struct ev_loop * ecb_cold
2490ev_loop_new (unsigned int flags) 2502ev_loop_new (unsigned int flags) EV_THROW
2491{ 2503{
2492 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 2504 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
2493 2505
2494 memset (EV_A, 0, sizeof (struct ev_loop)); 2506 memset (EV_A, 0, sizeof (struct ev_loop));
2495 loop_init (EV_A_ flags); 2507 loop_init (EV_A_ flags);
… …
2539} 2551}
2540#endif 2552#endif
2541 2553
2542#if EV_FEATURE_API 2554#if EV_FEATURE_API
2543void ecb_cold 2555void ecb_cold
2544ev_verify (EV_P) 2556ev_verify (EV_P) EV_THROW
2545{ 2557{
2546#if EV_VERIFY 2558#if EV_VERIFY
2547 int i; 2559 int i, j;
2548 WL w; 2560 WL w, w2;
2549 2561
2550 assert (activecnt >= -1); 2562 assert (activecnt >= -1);
2551 2563
2552 assert (fdchangemax >= fdchangecnt); 2564 assert (fdchangemax >= fdchangecnt);
2553 for (i = 0; i < fdchangecnt; ++i) 2565 for (i = 0; i < fdchangecnt; ++i)
2554 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0)); 2566 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
2555 2567
2556 assert (anfdmax >= 0); 2568 assert (anfdmax >= 0);
2557 for (i = 0; i < anfdmax; ++i) 2569 for (i = j = 0; i < anfdmax; ++i)
2558 for (w = anfds [i].head; w; w = w->next) 2570 for (w = w2 = anfds [i].head; w; w = w->next)
2559 { 2571 {
2560 verify_watcher (EV_A_ (W)w); 2572 verify_watcher (EV_A_ (W)w);
2573
2574 if (++j & 1)
2575 w2 = w2->next;
2576
2577 assert (("libev: io watcher list contains a loop", w != w2));
2561 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1)); 2578 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
2562 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i)); 2579 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
2563 } 2580 }
2564 2581
2565 assert (timermax >= timercnt); 2582 assert (timermax >= timercnt);
… …
2618#if EV_MULTIPLICITY 2635#if EV_MULTIPLICITY
2619struct ev_loop * ecb_cold 2636struct ev_loop * ecb_cold
2620#else 2637#else
2621int 2638int
2622#endif 2639#endif
2623ev_default_loop (unsigned int flags) 2640ev_default_loop (unsigned int flags) EV_THROW
2624{ 2641{
2625 if (!ev_default_loop_ptr) 2642 if (!ev_default_loop_ptr)
2626 { 2643 {
2627#if EV_MULTIPLICITY 2644#if EV_MULTIPLICITY
2628 EV_P = ev_default_loop_ptr = &default_loop_struct; 2645 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
2647 2664
2648 return ev_default_loop_ptr; 2665 return ev_default_loop_ptr;
2649} 2666}
2650 2667
2651void 2668void
2652ev_loop_fork (EV_P) 2669ev_loop_fork (EV_P) EV_THROW
2653{ 2670{
2654 postfork = 1; /* must be in line with ev_default_fork */ 2671 postfork = 1; /* must be in line with ev_default_fork */
2655} 2672}
2656 2673
2657/*****************************************************************************/ 2674/*****************************************************************************/
… …
2661{ 2678{
2662 EV_CB_INVOKE ((W)w, revents); 2679 EV_CB_INVOKE ((W)w, revents);
2663} 2680}
2664 2681
2665unsigned int 2682unsigned int
2666ev_pending_count (EV_P) 2683ev_pending_count (EV_P) EV_THROW
2667{ 2684{
2668 int pri; 2685 int pri;
2669 unsigned int count = 0; 2686 unsigned int count = 0;
2670 2687
2671 for (pri = NUMPRI; pri--; ) 2688 for (pri = NUMPRI; pri--; )
… …
2675} 2692}
2676 2693
2677void noinline 2694void noinline
2678ev_invoke_pending (EV_P) 2695ev_invoke_pending (EV_P)
2679{ 2696{
2680 int pri; 2697 for (pendingpri = NUMPRI; pendingpri--; ) /* pendingpri is modified during the loop */
2681
2682 for (pri = NUMPRI; pri--; )
2683 while (pendingcnt [pri]) 2698 while (pendingcnt [pendingpri])
2684 { 2699 {
2685 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2700 ANPENDING *p = pendings [pendingpri] + --pendingcnt [pendingpri];
2686 2701
2687 p->w->pending = 0; 2702 p->w->pending = 0;
2688 EV_CB_INVOKE (p->w, p->events); 2703 EV_CB_INVOKE (p->w, p->events);
2689 EV_FREQUENT_CHECK; 2704 EV_FREQUENT_CHECK;
2690 } 2705 }
… …
3102 3117
3103 return activecnt; 3118 return activecnt;
3104} 3119}
3105 3120
3106void 3121void
3107ev_break (EV_P_ int how) 3122ev_break (EV_P_ int how) EV_THROW
3108{ 3123{
3109 loop_done = how; 3124 loop_done = how;
3110} 3125}
3111 3126
3112void 3127void
3113ev_ref (EV_P) 3128ev_ref (EV_P) EV_THROW
3114{ 3129{
3115 ++activecnt; 3130 ++activecnt;
3116} 3131}
3117 3132
3118void 3133void
3119ev_unref (EV_P) 3134ev_unref (EV_P) EV_THROW
3120{ 3135{
3121 --activecnt; 3136 --activecnt;
3122} 3137}
3123 3138
3124void 3139void
3125ev_now_update (EV_P) 3140ev_now_update (EV_P) EV_THROW
3126{ 3141{
3127 time_update (EV_A_ 1e100); 3142 time_update (EV_A_ 1e100);
3128} 3143}
3129 3144
3130void 3145void
3131ev_suspend (EV_P) 3146ev_suspend (EV_P) EV_THROW
3132{ 3147{
3133 ev_now_update (EV_A); 3148 ev_now_update (EV_A);
3134} 3149}
3135 3150
3136void 3151void
3137ev_resume (EV_P) 3152ev_resume (EV_P) EV_THROW
3138{ 3153{
3139 ev_tstamp mn_prev = mn_now; 3154 ev_tstamp mn_prev = mn_now;
3140 3155
3141 ev_now_update (EV_A); 3156 ev_now_update (EV_A);
3142 timers_reschedule (EV_A_ mn_now - mn_prev); 3157 timers_reschedule (EV_A_ mn_now - mn_prev);
… …
3181 w->pending = 0; 3196 w->pending = 0;
3182 } 3197 }
3183} 3198}
3184 3199
3185int 3200int
3186ev_clear_pending (EV_P_ void *w) 3201ev_clear_pending (EV_P_ void *w) EV_THROW
3187{ 3202{
3188 W w_ = (W)w; 3203 W w_ = (W)w;
3189 int pending = w_->pending; 3204 int pending = w_->pending;
3190 3205
3191 if (expect_true (pending)) 3206 if (expect_true (pending))
… …
3224} 3239}
3225 3240
3226/*****************************************************************************/ 3241/*****************************************************************************/
3227 3242
3228void noinline 3243void noinline
3229ev_io_start (EV_P_ ev_io *w) 3244ev_io_start (EV_P_ ev_io *w) EV_THROW
3230{ 3245{
3231 int fd = w->fd; 3246 int fd = w->fd;
3232 3247
3233 if (expect_false (ev_is_active (w))) 3248 if (expect_false (ev_is_active (w)))
3234 return; 3249 return;
… …
3240 3255
3241 ev_start (EV_A_ (W)w, 1); 3256 ev_start (EV_A_ (W)w, 1);
3242 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 3257 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
3243 wlist_add (&anfds[fd].head, (WL)w); 3258 wlist_add (&anfds[fd].head, (WL)w);
3244 3259
3260 /* common bug, apparently */
3261 assert (("libev: ev_io_start called with corrupted watcher", ((WL)w)->next != (WL)w));
3262
3245 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY); 3263 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
3246 w->events &= ~EV__IOFDSET; 3264 w->events &= ~EV__IOFDSET;
3247 3265
3248 EV_FREQUENT_CHECK; 3266 EV_FREQUENT_CHECK;
3249} 3267}
3250 3268
3251void noinline 3269void noinline
3252ev_io_stop (EV_P_ ev_io *w) 3270ev_io_stop (EV_P_ ev_io *w) EV_THROW
3253{ 3271{
3254 clear_pending (EV_A_ (W)w); 3272 clear_pending (EV_A_ (W)w);
3255 if (expect_false (!ev_is_active (w))) 3273 if (expect_false (!ev_is_active (w)))
3256 return; 3274 return;
3257 3275
… …
3266 3284
3267 EV_FREQUENT_CHECK; 3285 EV_FREQUENT_CHECK;
3268} 3286}
3269 3287
3270void noinline 3288void noinline
3271ev_timer_start (EV_P_ ev_timer *w) 3289ev_timer_start (EV_P_ ev_timer *w) EV_THROW
3272{ 3290{
3273 if (expect_false (ev_is_active (w))) 3291 if (expect_false (ev_is_active (w)))
3274 return; 3292 return;
3275 3293
3276 ev_at (w) += mn_now; 3294 ev_at (w) += mn_now;
… …
3290 3308
3291 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 3309 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
3292} 3310}
3293 3311
3294void noinline 3312void noinline
3295ev_timer_stop (EV_P_ ev_timer *w) 3313ev_timer_stop (EV_P_ ev_timer *w) EV_THROW
3296{ 3314{
3297 clear_pending (EV_A_ (W)w); 3315 clear_pending (EV_A_ (W)w);
3298 if (expect_false (!ev_is_active (w))) 3316 if (expect_false (!ev_is_active (w)))
3299 return; 3317 return;
3300 3318
… …
3320 3338
3321 EV_FREQUENT_CHECK; 3339 EV_FREQUENT_CHECK;
3322} 3340}
3323 3341
3324void noinline 3342void noinline
3325ev_timer_again (EV_P_ ev_timer *w) 3343ev_timer_again (EV_P_ ev_timer *w) EV_THROW
3326{ 3344{
3327 EV_FREQUENT_CHECK; 3345 EV_FREQUENT_CHECK;
3328 3346
3329 clear_pending (EV_A_ (W)w); 3347 clear_pending (EV_A_ (W)w);
3330 3348
… …
3347 3365
3348 EV_FREQUENT_CHECK; 3366 EV_FREQUENT_CHECK;
3349} 3367}
3350 3368
3351ev_tstamp 3369ev_tstamp
3352ev_timer_remaining (EV_P_ ev_timer *w) 3370ev_timer_remaining (EV_P_ ev_timer *w) EV_THROW
3353{ 3371{
3354 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.); 3372 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
3355} 3373}
3356 3374
3357#if EV_PERIODIC_ENABLE 3375#if EV_PERIODIC_ENABLE
3358void noinline 3376void noinline
3359ev_periodic_start (EV_P_ ev_periodic *w) 3377ev_periodic_start (EV_P_ ev_periodic *w) EV_THROW
3360{ 3378{
3361 if (expect_false (ev_is_active (w))) 3379 if (expect_false (ev_is_active (w)))
3362 return; 3380 return;
3363 3381
3364 if (w->reschedule_cb) 3382 if (w->reschedule_cb)
… …
3384 3402
3385 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 3403 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
3386} 3404}
3387 3405
3388void noinline 3406void noinline
3389ev_periodic_stop (EV_P_ ev_periodic *w) 3407ev_periodic_stop (EV_P_ ev_periodic *w) EV_THROW
3390{ 3408{
3391 clear_pending (EV_A_ (W)w); 3409 clear_pending (EV_A_ (W)w);
3392 if (expect_false (!ev_is_active (w))) 3410 if (expect_false (!ev_is_active (w)))
3393 return; 3411 return;
3394 3412
… …
3412 3430
3413 EV_FREQUENT_CHECK; 3431 EV_FREQUENT_CHECK;
3414} 3432}
3415 3433
3416void noinline 3434void noinline
3417ev_periodic_again (EV_P_ ev_periodic *w) 3435ev_periodic_again (EV_P_ ev_periodic *w) EV_THROW
3418{ 3436{
3419 /* TODO: use adjustheap and recalculation */ 3437 /* TODO: use adjustheap and recalculation */
3420 ev_periodic_stop (EV_A_ w); 3438 ev_periodic_stop (EV_A_ w);
3421 ev_periodic_start (EV_A_ w); 3439 ev_periodic_start (EV_A_ w);
3422} 3440}
… …
3427#endif 3445#endif
3428 3446
3429#if EV_SIGNAL_ENABLE 3447#if EV_SIGNAL_ENABLE
3430 3448
3431void noinline 3449void noinline
3432ev_signal_start (EV_P_ ev_signal *w) 3450ev_signal_start (EV_P_ ev_signal *w) EV_THROW
3433{ 3451{
3434 if (expect_false (ev_is_active (w))) 3452 if (expect_false (ev_is_active (w)))
3435 return; 3453 return;
3436 3454
3437 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG)); 3455 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
… …
3508 3526
3509 EV_FREQUENT_CHECK; 3527 EV_FREQUENT_CHECK;
3510} 3528}
3511 3529
3512void noinline 3530void noinline
3513ev_signal_stop (EV_P_ ev_signal *w) 3531ev_signal_stop (EV_P_ ev_signal *w) EV_THROW
3514{ 3532{
3515 clear_pending (EV_A_ (W)w); 3533 clear_pending (EV_A_ (W)w);
3516 if (expect_false (!ev_is_active (w))) 3534 if (expect_false (!ev_is_active (w)))
3517 return; 3535 return;
3518 3536
… …
3549#endif 3567#endif
3550 3568
3551#if EV_CHILD_ENABLE 3569#if EV_CHILD_ENABLE
3552 3570
3553void 3571void
3554ev_child_start (EV_P_ ev_child *w) 3572ev_child_start (EV_P_ ev_child *w) EV_THROW
3555{ 3573{
3556#if EV_MULTIPLICITY 3574#if EV_MULTIPLICITY
3557 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 3575 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
3558#endif 3576#endif
3559 if (expect_false (ev_is_active (w))) 3577 if (expect_false (ev_is_active (w)))
… …
3566 3584
3567 EV_FREQUENT_CHECK; 3585 EV_FREQUENT_CHECK;
3568} 3586}
3569 3587
3570void 3588void
3571ev_child_stop (EV_P_ ev_child *w) 3589ev_child_stop (EV_P_ ev_child *w) EV_THROW
3572{ 3590{
3573 clear_pending (EV_A_ (W)w); 3591 clear_pending (EV_A_ (W)w);
3574 if (expect_false (!ev_is_active (w))) 3592 if (expect_false (!ev_is_active (w)))
3575 return; 3593 return;
3576 3594
… …
3828#else 3846#else
3829# define EV_LSTAT(p,b) lstat (p, b) 3847# define EV_LSTAT(p,b) lstat (p, b)
3830#endif 3848#endif
3831 3849
3832void 3850void
3833ev_stat_stat (EV_P_ ev_stat *w) 3851ev_stat_stat (EV_P_ ev_stat *w) EV_THROW
3834{ 3852{
3835 if (lstat (w->path, &w->attr) < 0) 3853 if (lstat (w->path, &w->attr) < 0)
3836 w->attr.st_nlink = 0; 3854 w->attr.st_nlink = 0;
3837 else if (!w->attr.st_nlink) 3855 else if (!w->attr.st_nlink)
3838 w->attr.st_nlink = 1; 3856 w->attr.st_nlink = 1;
… …
3877 ev_feed_event (EV_A_ w, EV_STAT); 3895 ev_feed_event (EV_A_ w, EV_STAT);
3878 } 3896 }
3879} 3897}
3880 3898
3881void 3899void
3882ev_stat_start (EV_P_ ev_stat *w) 3900ev_stat_start (EV_P_ ev_stat *w) EV_THROW
3883{ 3901{
3884 if (expect_false (ev_is_active (w))) 3902 if (expect_false (ev_is_active (w)))
3885 return; 3903 return;
3886 3904
3887 ev_stat_stat (EV_A_ w); 3905 ev_stat_stat (EV_A_ w);
… …
3908 3926
3909 EV_FREQUENT_CHECK; 3927 EV_FREQUENT_CHECK;
3910} 3928}
3911 3929
3912void 3930void
3913ev_stat_stop (EV_P_ ev_stat *w) 3931ev_stat_stop (EV_P_ ev_stat *w) EV_THROW
3914{ 3932{
3915 clear_pending (EV_A_ (W)w); 3933 clear_pending (EV_A_ (W)w);
3916 if (expect_false (!ev_is_active (w))) 3934 if (expect_false (!ev_is_active (w)))
3917 return; 3935 return;
3918 3936
… …
3934} 3952}
3935#endif 3953#endif
3936 3954
3937#if EV_IDLE_ENABLE 3955#if EV_IDLE_ENABLE
3938void 3956void
3939ev_idle_start (EV_P_ ev_idle *w) 3957ev_idle_start (EV_P_ ev_idle *w) EV_THROW
3940{ 3958{
3941 if (expect_false (ev_is_active (w))) 3959 if (expect_false (ev_is_active (w)))
3942 return; 3960 return;
3943 3961
3944 pri_adjust (EV_A_ (W)w); 3962 pri_adjust (EV_A_ (W)w);
… …
3957 3975
3958 EV_FREQUENT_CHECK; 3976 EV_FREQUENT_CHECK;
3959} 3977}
3960 3978
3961void 3979void
3962ev_idle_stop (EV_P_ ev_idle *w) 3980ev_idle_stop (EV_P_ ev_idle *w) EV_THROW
3963{ 3981{
3964 clear_pending (EV_A_ (W)w); 3982 clear_pending (EV_A_ (W)w);
3965 if (expect_false (!ev_is_active (w))) 3983 if (expect_false (!ev_is_active (w)))
3966 return; 3984 return;
3967 3985
… …
3981} 3999}
3982#endif 4000#endif
3983 4001
3984#if EV_PREPARE_ENABLE 4002#if EV_PREPARE_ENABLE
3985void 4003void
3986ev_prepare_start (EV_P_ ev_prepare *w) 4004ev_prepare_start (EV_P_ ev_prepare *w) EV_THROW
3987{ 4005{
3988 if (expect_false (ev_is_active (w))) 4006 if (expect_false (ev_is_active (w)))
3989 return; 4007 return;
3990 4008
3991 EV_FREQUENT_CHECK; 4009 EV_FREQUENT_CHECK;
… …
3996 4014
3997 EV_FREQUENT_CHECK; 4015 EV_FREQUENT_CHECK;
3998} 4016}
3999 4017
4000void 4018void
4001ev_prepare_stop (EV_P_ ev_prepare *w) 4019ev_prepare_stop (EV_P_ ev_prepare *w) EV_THROW
4002{ 4020{
4003 clear_pending (EV_A_ (W)w); 4021 clear_pending (EV_A_ (W)w);
4004 if (expect_false (!ev_is_active (w))) 4022 if (expect_false (!ev_is_active (w)))
4005 return; 4023 return;
4006 4024
… …
4019} 4037}
4020#endif 4038#endif
4021 4039
4022#if EV_CHECK_ENABLE 4040#if EV_CHECK_ENABLE
4023void 4041void
4024ev_check_start (EV_P_ ev_check *w) 4042ev_check_start (EV_P_ ev_check *w) EV_THROW
4025{ 4043{
4026 if (expect_false (ev_is_active (w))) 4044 if (expect_false (ev_is_active (w)))
4027 return; 4045 return;
4028 4046
4029 EV_FREQUENT_CHECK; 4047 EV_FREQUENT_CHECK;
… …
4034 4052
4035 EV_FREQUENT_CHECK; 4053 EV_FREQUENT_CHECK;
4036} 4054}
4037 4055
4038void 4056void
4039ev_check_stop (EV_P_ ev_check *w) 4057ev_check_stop (EV_P_ ev_check *w) EV_THROW
4040{ 4058{
4041 clear_pending (EV_A_ (W)w); 4059 clear_pending (EV_A_ (W)w);
4042 if (expect_false (!ev_is_active (w))) 4060 if (expect_false (!ev_is_active (w)))
4043 return; 4061 return;
4044 4062
… …
4057} 4075}
4058#endif 4076#endif
4059 4077
4060#if EV_EMBED_ENABLE 4078#if EV_EMBED_ENABLE
4061void noinline 4079void noinline
4062ev_embed_sweep (EV_P_ ev_embed *w) 4080ev_embed_sweep (EV_P_ ev_embed *w) EV_THROW
4063{ 4081{
4064 ev_run (w->other, EVRUN_NOWAIT); 4082 ev_run (w->other, EVRUN_NOWAIT);
4065} 4083}
4066 4084
4067static void 4085static void
… …
4115 ev_idle_stop (EV_A_ idle); 4133 ev_idle_stop (EV_A_ idle);
4116} 4134}
4117#endif 4135#endif
4118 4136
4119void 4137void
4120ev_embed_start (EV_P_ ev_embed *w) 4138ev_embed_start (EV_P_ ev_embed *w) EV_THROW
4121{ 4139{
4122 if (expect_false (ev_is_active (w))) 4140 if (expect_false (ev_is_active (w)))
4123 return; 4141 return;
4124 4142
4125 { 4143 {
… …
4146 4164
4147 EV_FREQUENT_CHECK; 4165 EV_FREQUENT_CHECK;
4148} 4166}
4149 4167
4150void 4168void
4151ev_embed_stop (EV_P_ ev_embed *w) 4169ev_embed_stop (EV_P_ ev_embed *w) EV_THROW
4152{ 4170{
4153 clear_pending (EV_A_ (W)w); 4171 clear_pending (EV_A_ (W)w);
4154 if (expect_false (!ev_is_active (w))) 4172 if (expect_false (!ev_is_active (w)))
4155 return; 4173 return;
4156 4174
… …
4166} 4184}
4167#endif 4185#endif
4168 4186
4169#if EV_FORK_ENABLE 4187#if EV_FORK_ENABLE
4170void 4188void
4171ev_fork_start (EV_P_ ev_fork *w) 4189ev_fork_start (EV_P_ ev_fork *w) EV_THROW
4172{ 4190{
4173 if (expect_false (ev_is_active (w))) 4191 if (expect_false (ev_is_active (w)))
4174 return; 4192 return;
4175 4193
4176 EV_FREQUENT_CHECK; 4194 EV_FREQUENT_CHECK;
… …
4181 4199
4182 EV_FREQUENT_CHECK; 4200 EV_FREQUENT_CHECK;
4183} 4201}
4184 4202
4185void 4203void
4186ev_fork_stop (EV_P_ ev_fork *w) 4204ev_fork_stop (EV_P_ ev_fork *w) EV_THROW
4187{ 4205{
4188 clear_pending (EV_A_ (W)w); 4206 clear_pending (EV_A_ (W)w);
4189 if (expect_false (!ev_is_active (w))) 4207 if (expect_false (!ev_is_active (w)))
4190 return; 4208 return;
4191 4209
… …
4204} 4222}
4205#endif 4223#endif
4206 4224
4207#if EV_CLEANUP_ENABLE 4225#if EV_CLEANUP_ENABLE
4208void 4226void
4209ev_cleanup_start (EV_P_ ev_cleanup *w) 4227ev_cleanup_start (EV_P_ ev_cleanup *w) EV_THROW
4210{ 4228{
4211 if (expect_false (ev_is_active (w))) 4229 if (expect_false (ev_is_active (w)))
4212 return; 4230 return;
4213 4231
4214 EV_FREQUENT_CHECK; 4232 EV_FREQUENT_CHECK;
… …
4221 ev_unref (EV_A); 4239 ev_unref (EV_A);
4222 EV_FREQUENT_CHECK; 4240 EV_FREQUENT_CHECK;
4223} 4241}
4224 4242
4225void 4243void
4226ev_cleanup_stop (EV_P_ ev_cleanup *w) 4244ev_cleanup_stop (EV_P_ ev_cleanup *w) EV_THROW
4227{ 4245{
4228 clear_pending (EV_A_ (W)w); 4246 clear_pending (EV_A_ (W)w);
4229 if (expect_false (!ev_is_active (w))) 4247 if (expect_false (!ev_is_active (w)))
4230 return; 4248 return;
4231 4249
… …
4245} 4263}
4246#endif 4264#endif
4247 4265
4248#if EV_ASYNC_ENABLE 4266#if EV_ASYNC_ENABLE
4249void 4267void
4250ev_async_start (EV_P_ ev_async *w) 4268ev_async_start (EV_P_ ev_async *w) EV_THROW
4251{ 4269{
4252 if (expect_false (ev_is_active (w))) 4270 if (expect_false (ev_is_active (w)))
4253 return; 4271 return;
4254 4272
4255 w->sent = 0; 4273 w->sent = 0;
… …
4264 4282
4265 EV_FREQUENT_CHECK; 4283 EV_FREQUENT_CHECK;
4266} 4284}
4267 4285
4268void 4286void
4269ev_async_stop (EV_P_ ev_async *w) 4287ev_async_stop (EV_P_ ev_async *w) EV_THROW
4270{ 4288{
4271 clear_pending (EV_A_ (W)w); 4289 clear_pending (EV_A_ (W)w);
4272 if (expect_false (!ev_is_active (w))) 4290 if (expect_false (!ev_is_active (w)))
4273 return; 4291 return;
4274 4292
… …
4285 4303
4286 EV_FREQUENT_CHECK; 4304 EV_FREQUENT_CHECK;
4287} 4305}
4288 4306
4289void 4307void
4290ev_async_send (EV_P_ ev_async *w) 4308ev_async_send (EV_P_ ev_async *w) EV_THROW
4291{ 4309{
4292 w->sent = 1; 4310 w->sent = 1;
4293 evpipe_write (EV_A_ &async_pending); 4311 evpipe_write (EV_A_ &async_pending);
4294} 4312}
4295#endif 4313#endif
… …
4332 4350
4333 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io)); 4351 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
4334} 4352}
4335 4353
4336void 4354void
4337ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 4355ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) EV_THROW
4338{ 4356{
4339 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 4357 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
4340 4358
4341 if (expect_false (!once)) 4359 if (expect_false (!once))
4342 { 4360 {
… …
4364 4382
4365/*****************************************************************************/ 4383/*****************************************************************************/
4366 4384
4367#if EV_WALK_ENABLE 4385#if EV_WALK_ENABLE
4368void ecb_cold 4386void ecb_cold
4369ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 4387ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) EV_THROW
4370{ 4388{
4371 int i, j; 4389 int i, j;
4372 ev_watcher_list *wl, *wn; 4390 ev_watcher_list *wl, *wn;
4373 4391
4374 if (types & (EV_IO | EV_EMBED)) 4392 if (types & (EV_IO | EV_EMBED))

Diff Legend

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