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

Comparing libev/ev.c (file contents):
Revision 1.344 by root, Fri Jul 9 20:55:14 2010 UTC vs.
Revision 1.357 by root, Sat Oct 23 22:25:44 2010 UTC

… …
35 * and other provisions required by the GPL. If you do not delete the 35 * and other provisions required by the GPL. If you do not delete the
36 * provisions above, a recipient may use your version of this file under 36 * provisions above, a recipient may use your version of this file under
37 * either the BSD or the GPL. 37 * either the BSD or the GPL.
38 */ 38 */
39 39
40#ifdef __cplusplus
41extern "C" {
42#endif
43
44/* this big block deduces configuration from config.h */ 40/* this big block deduces configuration from config.h */
45#ifndef EV_STANDALONE 41#ifndef EV_STANDALONE
46# ifdef EV_CONFIG_H 42# ifdef EV_CONFIG_H
47# include EV_CONFIG_H 43# include EV_CONFIG_H
48# else 44# else
… …
182# include EV_H 178# include EV_H
183#else 179#else
184# include "ev.h" 180# include "ev.h"
185#endif 181#endif
186 182
183EV_CPP(extern "C" {)
184
187#ifndef _WIN32 185#ifndef _WIN32
188# include <sys/time.h> 186# include <sys/time.h>
189# include <sys/wait.h> 187# include <sys/wait.h>
190# include <unistd.h> 188# include <unistd.h>
191#else 189#else
… …
384# include <sys/select.h> 382# include <sys/select.h>
385# endif 383# endif
386#endif 384#endif
387 385
388#if EV_USE_INOTIFY 386#if EV_USE_INOTIFY
389# include <sys/utsname.h>
390# include <sys/statfs.h> 387# include <sys/statfs.h>
391# include <sys/inotify.h> 388# include <sys/inotify.h>
392/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 389/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
393# ifndef IN_DONT_FOLLOW 390# ifndef IN_DONT_FOLLOW
394# undef EV_USE_INOTIFY 391# undef EV_USE_INOTIFY
… …
411# define EFD_CLOEXEC O_CLOEXEC 408# define EFD_CLOEXEC O_CLOEXEC
412# else 409# else
413# define EFD_CLOEXEC 02000000 410# define EFD_CLOEXEC 02000000
414# endif 411# endif
415# endif 412# endif
416# ifdef __cplusplus
417extern "C" {
418# endif
419int (eventfd) (unsigned int initval, int flags); 413EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
420# ifdef __cplusplus
421}
422# endif
423#endif 414#endif
424 415
425#if EV_USE_SIGNALFD 416#if EV_USE_SIGNALFD
426/* 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 */
427# include <stdint.h> 418# include <stdint.h>
… …
433# define SFD_CLOEXEC O_CLOEXEC 424# define SFD_CLOEXEC O_CLOEXEC
434# else 425# else
435# define SFD_CLOEXEC 02000000 426# define SFD_CLOEXEC 02000000
436# endif 427# endif
437# endif 428# endif
438# ifdef __cplusplus
439extern "C" {
440# endif
441int signalfd (int fd, const sigset_t *mask, int flags); 429EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
442 430
443struct signalfd_siginfo 431struct signalfd_siginfo
444{ 432{
445 uint32_t ssi_signo; 433 uint32_t ssi_signo;
446 char pad[128 - sizeof (uint32_t)]; 434 char pad[128 - sizeof (uint32_t)];
447}; 435};
448# ifdef __cplusplus
449}
450# endif 436#endif
451#endif
452
453 437
454/**/ 438/**/
455 439
456#if EV_VERIFY >= 3 440#if EV_VERIFY >= 3
457# define EV_FREQUENT_CHECK ev_verify (EV_A) 441# define EV_FREQUENT_CHECK ev_verify (EV_A)
… …
470#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 454#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
471 455
472#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 456#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
473#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 457#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
474 458
459#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
460#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
461
475#if __GNUC__ >= 4 462#if __GNUC__ >= 4
476# define expect(expr,value) __builtin_expect ((expr),(value)) 463# define expect(expr,value) __builtin_expect ((expr),(value))
477# define noinline __attribute__ ((noinline)) 464# define noinline __attribute__ ((noinline))
478#else 465#else
479# define expect(expr,value) (expr) 466# define expect(expr,value) (expr)
… …
511#define ev_active(w) ((W)(w))->active 498#define ev_active(w) ((W)(w))->active
512#define ev_at(w) ((WT)(w))->at 499#define ev_at(w) ((WT)(w))->at
513 500
514#if EV_USE_REALTIME 501#if EV_USE_REALTIME
515/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 502/* sig_atomic_t is used to avoid per-thread variables or locking but still */
516/* giving it a reasonably high chance of working on typical architetcures */ 503/* giving it a reasonably high chance of working on typical architectures */
517static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 504static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
518#endif 505#endif
519 506
520#if EV_USE_MONOTONIC 507#if EV_USE_MONOTONIC
521static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 508static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
… …
532#endif 519#endif
533 520
534#ifdef _WIN32 521#ifdef _WIN32
535# include "ev_win32.c" 522# include "ev_win32.c"
536#endif 523#endif
524
525/*****************************************************************************/
526
527#ifdef __linux
528# include <sys/utsname.h>
529#endif
530
531static unsigned int noinline
532ev_linux_version (void)
533{
534#ifdef __linux
535 struct utsname buf;
536 unsigned int v;
537 int i;
538 char *p = buf.release;
539
540 if (uname (&buf))
541 return 0;
542
543 for (i = 3+1; --i; )
544 {
545 unsigned int c = 0;
546
547 for (;;)
548 {
549 if (*p >= '0' && *p <= '9')
550 c = c * 10 + *p++ - '0';
551 else
552 {
553 p += *p == '.';
554 break;
555 }
556 }
557
558 v = (v << 8) | c;
559 }
560
561 return v;
562#else
563 return 0;
564#endif
565}
537 566
538/*****************************************************************************/ 567/*****************************************************************************/
539 568
540#if EV_AVOID_STDIO 569#if EV_AVOID_STDIO
541static void noinline 570static void noinline
… …
639 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 668 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
640 unsigned char unused; 669 unsigned char unused;
641#if EV_USE_EPOLL 670#if EV_USE_EPOLL
642 unsigned int egen; /* generation counter to counter epoll bugs */ 671 unsigned int egen; /* generation counter to counter epoll bugs */
643#endif 672#endif
644#if EV_SELECT_IS_WINSOCKET 673#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
645 SOCKET handle; 674 SOCKET handle;
675#endif
676#if EV_USE_IOCP
677 OVERLAPPED or, ow;
646#endif 678#endif
647} ANFD; 679} ANFD;
648 680
649/* stores the pending event set for a given watcher */ 681/* stores the pending event set for a given watcher */
650typedef struct 682typedef struct
… …
715# define EV_RELEASE_CB (void)0 747# define EV_RELEASE_CB (void)0
716# define EV_ACQUIRE_CB (void)0 748# define EV_ACQUIRE_CB (void)0
717# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 749# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
718#endif 750#endif
719 751
720#define EVUNLOOP_RECURSE 0x80 752#define EVBREAK_RECURSE 0x80
721 753
722/*****************************************************************************/ 754/*****************************************************************************/
723 755
724#ifndef EV_HAVE_EV_TIME 756#ifndef EV_HAVE_EV_TIME
725ev_tstamp 757ev_tstamp
… …
769 if (delay > 0.) 801 if (delay > 0.)
770 { 802 {
771#if EV_USE_NANOSLEEP 803#if EV_USE_NANOSLEEP
772 struct timespec ts; 804 struct timespec ts;
773 805
774 ts.tv_sec = (time_t)delay; 806 EV_TS_SET (ts, delay);
775 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
776
777 nanosleep (&ts, 0); 807 nanosleep (&ts, 0);
778#elif defined(_WIN32) 808#elif defined(_WIN32)
779 Sleep ((unsigned long)(delay * 1e3)); 809 Sleep ((unsigned long)(delay * 1e3));
780#else 810#else
781 struct timeval tv; 811 struct timeval tv;
782 812
783 tv.tv_sec = (time_t)delay;
784 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
785
786 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 813 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
787 /* something not guaranteed by newer posix versions, but guaranteed */ 814 /* something not guaranteed by newer posix versions, but guaranteed */
788 /* by older ones */ 815 /* by older ones */
816 EV_TV_SET (tv, delay);
789 select (0, 0, 0, 0, &tv); 817 select (0, 0, 0, 0, &tv);
790#endif 818#endif
791 } 819 }
792} 820}
793 821
794/*****************************************************************************/ 822/*****************************************************************************/
795 823
796#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 824#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
797 825
798/* find a suitable new size for the given array, */ 826/* find a suitable new size for the given array, */
799/* hopefully by rounding to a ncie-to-malloc size */ 827/* hopefully by rounding to a nice-to-malloc size */
800inline_size int 828inline_size int
801array_nextsize (int elem, int cur, int cnt) 829array_nextsize (int elem, int cur, int cnt)
802{ 830{
803 int ncur = cur + 1; 831 int ncur = cur + 1;
804 832
… …
945 { 973 {
946 int fd = fdchanges [i]; 974 int fd = fdchanges [i];
947 ANFD *anfd = anfds + fd; 975 ANFD *anfd = anfds + fd;
948 ev_io *w; 976 ev_io *w;
949 977
950 unsigned char events = 0; 978 unsigned char o_events = anfd->events;
979 unsigned char o_reify = anfd->reify;
951 980
952 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 981 anfd->reify = 0;
953 events |= (unsigned char)w->events;
954 982
955#if EV_SELECT_IS_WINSOCKET 983#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
956 if (events) 984 if (o_reify & EV__IOFDSET)
957 { 985 {
958 unsigned long arg; 986 unsigned long arg;
959 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 987 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
960 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 988 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
989 printf ("oi %d %x\n", fd, anfd->handle);//D
961 } 990 }
962#endif 991#endif
963 992
993 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
964 { 994 {
965 unsigned char o_events = anfd->events;
966 unsigned char o_reify = anfd->reify;
967
968 anfd->reify = 0;
969 anfd->events = events; 995 anfd->events = 0;
970 996
971 if (o_events != events || o_reify & EV__IOFDSET) 997 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
998 anfd->events |= (unsigned char)w->events;
999
1000 if (o_events != anfd->events)
1001 o_reify = EV__IOFDSET; /* actually |= */
1002 }
1003
1004 if (o_reify & EV__IOFDSET)
972 backend_modify (EV_A_ fd, o_events, events); 1005 backend_modify (EV_A_ fd, o_events, anfd->events);
973 }
974 } 1006 }
975 1007
976 fdchangecnt = 0; 1008 fdchangecnt = 0;
977} 1009}
978 1010
… …
1071} 1103}
1072 1104
1073/*****************************************************************************/ 1105/*****************************************************************************/
1074 1106
1075/* 1107/*
1076 * the heap functions want a real array index. array index 0 uis guaranteed to not 1108 * the heap functions want a real array index. array index 0 is guaranteed to not
1077 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1109 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
1078 * the branching factor of the d-tree. 1110 * the branching factor of the d-tree.
1079 */ 1111 */
1080 1112
1081/* 1113/*
… …
1281 uint64_t counter = 1; 1313 uint64_t counter = 1;
1282 write (evfd, &counter, sizeof (uint64_t)); 1314 write (evfd, &counter, sizeof (uint64_t));
1283 } 1315 }
1284 else 1316 else
1285#endif 1317#endif
1318 /* win32 people keep sending patches that change this write() to send() */
1319 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1320 /* so when you think this write should be a send instead, please find out */
1321 /* where your send() is from - it's definitely not the microsoft send, and */
1322 /* tell me. thank you. */
1286 write (evpipe [1], &dummy, 1); 1323 write (evpipe [1], &dummy, 1);
1287 1324
1288 errno = old_errno; 1325 errno = old_errno;
1289 } 1326 }
1290} 1327}
… …
1304 } 1341 }
1305 else 1342 else
1306#endif 1343#endif
1307 { 1344 {
1308 char dummy; 1345 char dummy;
1346 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1309 read (evpipe [0], &dummy, 1); 1347 read (evpipe [0], &dummy, 1);
1310 } 1348 }
1311 1349
1312 if (sig_pending) 1350 if (sig_pending)
1313 { 1351 {
… …
1455 1493
1456#endif 1494#endif
1457 1495
1458/*****************************************************************************/ 1496/*****************************************************************************/
1459 1497
1498#if EV_USE_IOCP
1499# include "ev_iocp.c"
1500#endif
1460#if EV_USE_PORT 1501#if EV_USE_PORT
1461# include "ev_port.c" 1502# include "ev_port.c"
1462#endif 1503#endif
1463#if EV_USE_KQUEUE 1504#if EV_USE_KQUEUE
1464# include "ev_kqueue.c" 1505# include "ev_kqueue.c"
… …
1537ev_embeddable_backends (void) 1578ev_embeddable_backends (void)
1538{ 1579{
1539 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1580 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1540 1581
1541 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1582 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1542 /* please fix it and tell me how to detect the fix */ 1583 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1543 flags &= ~EVBACKEND_EPOLL; 1584 flags &= ~EVBACKEND_EPOLL;
1544 1585
1545 return flags; 1586 return flags;
1546} 1587}
1547 1588
1548unsigned int 1589unsigned int
… …
1661#endif 1702#endif
1662 1703
1663 if (!(flags & 0x0000ffffU)) 1704 if (!(flags & 0x0000ffffU))
1664 flags |= ev_recommended_backends (); 1705 flags |= ev_recommended_backends ();
1665 1706
1707#if EV_USE_IOCP
1708 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1709#endif
1666#if EV_USE_PORT 1710#if EV_USE_PORT
1667 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1711 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1668#endif 1712#endif
1669#if EV_USE_KQUEUE 1713#if EV_USE_KQUEUE
1670 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1714 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1722#endif 1766#endif
1723 1767
1724 if (backend_fd >= 0) 1768 if (backend_fd >= 0)
1725 close (backend_fd); 1769 close (backend_fd);
1726 1770
1771#if EV_USE_IOCP
1772 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1773#endif
1727#if EV_USE_PORT 1774#if EV_USE_PORT
1728 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1775 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1729#endif 1776#endif
1730#if EV_USE_KQUEUE 1777#if EV_USE_KQUEUE
1731 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1778 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
2179 feed_reverse_done (EV_A_ EV_PERIODIC); 2226 feed_reverse_done (EV_A_ EV_PERIODIC);
2180 } 2227 }
2181} 2228}
2182 2229
2183/* simply recalculate all periodics */ 2230/* simply recalculate all periodics */
2184/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2231/* TODO: maybe ensure that at least one event happens when jumping forward? */
2185static void noinline 2232static void noinline
2186periodics_reschedule (EV_P) 2233periodics_reschedule (EV_P)
2187{ 2234{
2188 int i; 2235 int i;
2189 2236
… …
2285 mn_now = ev_rt_now; 2332 mn_now = ev_rt_now;
2286 } 2333 }
2287} 2334}
2288 2335
2289void 2336void
2290ev_loop (EV_P_ int flags) 2337ev_run (EV_P_ int flags)
2291{ 2338{
2292#if EV_FEATURE_API 2339#if EV_FEATURE_API
2293 ++loop_depth; 2340 ++loop_depth;
2294#endif 2341#endif
2295 2342
2296 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2343 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2297 2344
2298 loop_done = EVUNLOOP_CANCEL; 2345 loop_done = EVBREAK_CANCEL;
2299 2346
2300 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2347 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2301 2348
2302 do 2349 do
2303 { 2350 {
… …
2346 /* calculate blocking time */ 2393 /* calculate blocking time */
2347 { 2394 {
2348 ev_tstamp waittime = 0.; 2395 ev_tstamp waittime = 0.;
2349 ev_tstamp sleeptime = 0.; 2396 ev_tstamp sleeptime = 0.;
2350 2397
2398 /* remember old timestamp for io_blocktime calculation */
2399 ev_tstamp prev_mn_now = mn_now;
2400
2401 /* update time to cancel out callback processing overhead */
2402 time_update (EV_A_ 1e100);
2403
2351 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2404 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2352 { 2405 {
2353 /* remember old timestamp for io_blocktime calculation */
2354 ev_tstamp prev_mn_now = mn_now;
2355
2356 /* update time to cancel out callback processing overhead */
2357 time_update (EV_A_ 1e100);
2358
2359 waittime = MAX_BLOCKTIME; 2406 waittime = MAX_BLOCKTIME;
2360 2407
2361 if (timercnt) 2408 if (timercnt)
2362 { 2409 {
2363 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2410 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2393 } 2440 }
2394 2441
2395#if EV_FEATURE_API 2442#if EV_FEATURE_API
2396 ++loop_count; 2443 ++loop_count;
2397#endif 2444#endif
2398 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2445 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2399 backend_poll (EV_A_ waittime); 2446 backend_poll (EV_A_ waittime);
2400 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2447 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2401 2448
2402 /* update ev_rt_now, do magic */ 2449 /* update ev_rt_now, do magic */
2403 time_update (EV_A_ waittime + sleeptime); 2450 time_update (EV_A_ waittime + sleeptime);
2404 } 2451 }
2405 2452
… …
2423 EV_INVOKE_PENDING; 2470 EV_INVOKE_PENDING;
2424 } 2471 }
2425 while (expect_true ( 2472 while (expect_true (
2426 activecnt 2473 activecnt
2427 && !loop_done 2474 && !loop_done
2428 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2475 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2429 )); 2476 ));
2430 2477
2431 if (loop_done == EVUNLOOP_ONE) 2478 if (loop_done == EVBREAK_ONE)
2432 loop_done = EVUNLOOP_CANCEL; 2479 loop_done = EVBREAK_CANCEL;
2433 2480
2434#if EV_FEATURE_API 2481#if EV_FEATURE_API
2435 --loop_depth; 2482 --loop_depth;
2436#endif 2483#endif
2437} 2484}
2438 2485
2439void 2486void
2440ev_unloop (EV_P_ int how) 2487ev_break (EV_P_ int how)
2441{ 2488{
2442 loop_done = how; 2489 loop_done = how;
2443} 2490}
2444 2491
2445void 2492void
… …
2593 EV_FREQUENT_CHECK; 2640 EV_FREQUENT_CHECK;
2594 2641
2595 wlist_del (&anfds[w->fd].head, (WL)w); 2642 wlist_del (&anfds[w->fd].head, (WL)w);
2596 ev_stop (EV_A_ (W)w); 2643 ev_stop (EV_A_ (W)w);
2597 2644
2598 fd_change (EV_A_ w->fd, 1); 2645 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2599 2646
2600 EV_FREQUENT_CHECK; 2647 EV_FREQUENT_CHECK;
2601} 2648}
2602 2649
2603void noinline 2650void noinline
… …
3055 { 3102 {
3056 struct inotify_event *ev = (struct inotify_event *)(buf + ofs); 3103 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
3057 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3104 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3058 ofs += sizeof (struct inotify_event) + ev->len; 3105 ofs += sizeof (struct inotify_event) + ev->len;
3059 } 3106 }
3060}
3061
3062inline_size unsigned int
3063ev_linux_version (void)
3064{
3065 struct utsname buf;
3066 unsigned int v;
3067 int i;
3068 char *p = buf.release;
3069
3070 if (uname (&buf))
3071 return 0;
3072
3073 for (i = 3+1; --i; )
3074 {
3075 unsigned int c = 0;
3076
3077 for (;;)
3078 {
3079 if (*p >= '0' && *p <= '9')
3080 c = c * 10 + *p++ - '0';
3081 else
3082 {
3083 p += *p == '.';
3084 break;
3085 }
3086 }
3087
3088 v = (v << 8) | c;
3089 }
3090
3091 return v;
3092} 3107}
3093 3108
3094inline_size void 3109inline_size void
3095ev_check_2625 (EV_P) 3110ev_check_2625 (EV_P)
3096{ 3111{
… …
3420 3435
3421#if EV_EMBED_ENABLE 3436#if EV_EMBED_ENABLE
3422void noinline 3437void noinline
3423ev_embed_sweep (EV_P_ ev_embed *w) 3438ev_embed_sweep (EV_P_ ev_embed *w)
3424{ 3439{
3425 ev_loop (w->other, EVLOOP_NONBLOCK); 3440 ev_run (w->other, EVRUN_NOWAIT);
3426} 3441}
3427 3442
3428static void 3443static void
3429embed_io_cb (EV_P_ ev_io *io, int revents) 3444embed_io_cb (EV_P_ ev_io *io, int revents)
3430{ 3445{
3431 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3446 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3432 3447
3433 if (ev_cb (w)) 3448 if (ev_cb (w))
3434 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3449 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3435 else 3450 else
3436 ev_loop (w->other, EVLOOP_NONBLOCK); 3451 ev_run (w->other, EVRUN_NOWAIT);
3437} 3452}
3438 3453
3439static void 3454static void
3440embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3455embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3441{ 3456{
… …
3445 EV_P = w->other; 3460 EV_P = w->other;
3446 3461
3447 while (fdchangecnt) 3462 while (fdchangecnt)
3448 { 3463 {
3449 fd_reify (EV_A); 3464 fd_reify (EV_A);
3450 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3465 ev_run (EV_A_ EVRUN_NOWAIT);
3451 } 3466 }
3452 } 3467 }
3453} 3468}
3454 3469
3455static void 3470static void
… …
3461 3476
3462 { 3477 {
3463 EV_P = w->other; 3478 EV_P = w->other;
3464 3479
3465 ev_loop_fork (EV_A); 3480 ev_loop_fork (EV_A);
3466 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3481 ev_run (EV_A_ EVRUN_NOWAIT);
3467 } 3482 }
3468 3483
3469 ev_embed_start (EV_A_ w); 3484 ev_embed_start (EV_A_ w);
3470} 3485}
3471 3486
… …
3569void 3584void
3570ev_async_start (EV_P_ ev_async *w) 3585ev_async_start (EV_P_ ev_async *w)
3571{ 3586{
3572 if (expect_false (ev_is_active (w))) 3587 if (expect_false (ev_is_active (w)))
3573 return; 3588 return;
3589
3590 w->sent = 0;
3574 3591
3575 evpipe_init (EV_A); 3592 evpipe_init (EV_A);
3576 3593
3577 EV_FREQUENT_CHECK; 3594 EV_FREQUENT_CHECK;
3578 3595
… …
3798 3815
3799#if EV_MULTIPLICITY 3816#if EV_MULTIPLICITY
3800 #include "ev_wrap.h" 3817 #include "ev_wrap.h"
3801#endif 3818#endif
3802 3819
3803#ifdef __cplusplus 3820EV_CPP(})
3804}
3805#endif
3806 3821

Diff Legend

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