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

Comparing libev/ev.c (file contents):
Revision 1.251 by root, Thu May 22 03:42:34 2008 UTC vs.
Revision 1.273 by root, Mon Nov 3 14:27:06 2008 UTC

… …
154#ifndef _WIN32 154#ifndef _WIN32
155# include <sys/time.h> 155# include <sys/time.h>
156# include <sys/wait.h> 156# include <sys/wait.h>
157# include <unistd.h> 157# include <unistd.h>
158#else 158#else
159# include <io.h>
159# define WIN32_LEAN_AND_MEAN 160# define WIN32_LEAN_AND_MEAN
160# include <windows.h> 161# include <windows.h>
161# ifndef EV_SELECT_IS_WINSOCKET 162# ifndef EV_SELECT_IS_WINSOCKET
162# define EV_SELECT_IS_WINSOCKET 1 163# define EV_SELECT_IS_WINSOCKET 1
163# endif 164# endif
164#endif 165#endif
165 166
166/* this block tries to deduce configuration from header-defined symbols and defaults */ 167/* this block tries to deduce configuration from header-defined symbols and defaults */
167 168
168#ifndef EV_USE_MONOTONIC 169#ifndef EV_USE_MONOTONIC
170# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
171# define EV_USE_MONOTONIC 1
172# else
169# define EV_USE_MONOTONIC 0 173# define EV_USE_MONOTONIC 0
174# endif
170#endif 175#endif
171 176
172#ifndef EV_USE_REALTIME 177#ifndef EV_USE_REALTIME
173# define EV_USE_REALTIME 0 178# define EV_USE_REALTIME 0
174#endif 179#endif
175 180
176#ifndef EV_USE_NANOSLEEP 181#ifndef EV_USE_NANOSLEEP
182# if _POSIX_C_SOURCE >= 199309L
183# define EV_USE_NANOSLEEP 1
184# else
177# define EV_USE_NANOSLEEP 0 185# define EV_USE_NANOSLEEP 0
186# endif
178#endif 187#endif
179 188
180#ifndef EV_USE_SELECT 189#ifndef EV_USE_SELECT
181# define EV_USE_SELECT 1 190# define EV_USE_SELECT 1
182#endif 191#endif
… …
277# include <sys/select.h> 286# include <sys/select.h>
278# endif 287# endif
279#endif 288#endif
280 289
281#if EV_USE_INOTIFY 290#if EV_USE_INOTIFY
291# include <sys/utsname.h>
292# include <sys/statfs.h>
282# include <sys/inotify.h> 293# include <sys/inotify.h>
294/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
295# ifndef IN_DONT_FOLLOW
296# undef EV_USE_INOTIFY
297# define EV_USE_INOTIFY 0
298# endif
283#endif 299#endif
284 300
285#if EV_SELECT_IS_WINSOCKET 301#if EV_SELECT_IS_WINSOCKET
286# include <winsock.h> 302# include <winsock.h>
287#endif 303#endif
… …
373{ 389{
374 syserr_cb = cb; 390 syserr_cb = cb;
375} 391}
376 392
377static void noinline 393static void noinline
378syserr (const char *msg) 394ev_syserr (const char *msg)
379{ 395{
380 if (!msg) 396 if (!msg)
381 msg = "(libev) system error"; 397 msg = "(libev) system error";
382 398
383 if (syserr_cb) 399 if (syserr_cb)
… …
434typedef struct 450typedef struct
435{ 451{
436 WL head; 452 WL head;
437 unsigned char events; 453 unsigned char events;
438 unsigned char reify; 454 unsigned char reify;
455 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
456 unsigned char unused;
457#if EV_USE_EPOLL
458 unsigned int egen; /* generation counter to counter epoll bugs */
459#endif
439#if EV_SELECT_IS_WINSOCKET 460#if EV_SELECT_IS_WINSOCKET
440 SOCKET handle; 461 SOCKET handle;
441#endif 462#endif
442} ANFD; 463} ANFD;
443 464
… …
556 struct timeval tv; 577 struct timeval tv;
557 578
558 tv.tv_sec = (time_t)delay; 579 tv.tv_sec = (time_t)delay;
559 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 580 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
560 581
582 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
583 /* somehting nto guaranteed by newer posix versions, but guaranteed */
584 /* by older ones */
561 select (0, 0, 0, 0, &tv); 585 select (0, 0, 0, 0, &tv);
562#endif 586#endif
563 } 587 }
564} 588}
565 589
… …
592array_realloc (int elem, void *base, int *cur, int cnt) 616array_realloc (int elem, void *base, int *cur, int cnt)
593{ 617{
594 *cur = array_nextsize (elem, *cur, cnt); 618 *cur = array_nextsize (elem, *cur, cnt);
595 return ev_realloc (base, elem * *cur); 619 return ev_realloc (base, elem * *cur);
596} 620}
621
622#define array_init_zero(base,count) \
623 memset ((void *)(base), 0, sizeof (*(base)) * (count))
597 624
598#define array_needsize(type,base,cur,cnt,init) \ 625#define array_needsize(type,base,cur,cnt,init) \
599 if (expect_false ((cnt) > (cur))) \ 626 if (expect_false ((cnt) > (cur))) \
600 { \ 627 { \
601 int ocur_ = (cur); \ 628 int ocur_ = (cur); \
… …
645 ev_feed_event (EV_A_ events [i], type); 672 ev_feed_event (EV_A_ events [i], type);
646} 673}
647 674
648/*****************************************************************************/ 675/*****************************************************************************/
649 676
650void inline_size
651anfds_init (ANFD *base, int count)
652{
653 while (count--)
654 {
655 base->head = 0;
656 base->events = EV_NONE;
657 base->reify = 0;
658
659 ++base;
660 }
661}
662
663void inline_speed 677void inline_speed
664fd_event (EV_P_ int fd, int revents) 678fd_event (EV_P_ int fd, int revents)
665{ 679{
666 ANFD *anfd = anfds + fd; 680 ANFD *anfd = anfds + fd;
667 ev_io *w; 681 ev_io *w;
… …
699 events |= (unsigned char)w->events; 713 events |= (unsigned char)w->events;
700 714
701#if EV_SELECT_IS_WINSOCKET 715#if EV_SELECT_IS_WINSOCKET
702 if (events) 716 if (events)
703 { 717 {
704 unsigned long argp; 718 unsigned long arg;
705 #ifdef EV_FD_TO_WIN32_HANDLE 719 #ifdef EV_FD_TO_WIN32_HANDLE
706 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 720 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
707 #else 721 #else
708 anfd->handle = _get_osfhandle (fd); 722 anfd->handle = _get_osfhandle (fd);
709 #endif 723 #endif
710 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 724 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
711 } 725 }
712#endif 726#endif
713 727
714 { 728 {
715 unsigned char o_events = anfd->events; 729 unsigned char o_events = anfd->events;
… …
768{ 782{
769 int fd; 783 int fd;
770 784
771 for (fd = 0; fd < anfdmax; ++fd) 785 for (fd = 0; fd < anfdmax; ++fd)
772 if (anfds [fd].events) 786 if (anfds [fd].events)
773 if (!fd_valid (fd) == -1 && errno == EBADF) 787 if (!fd_valid (fd) && errno == EBADF)
774 fd_kill (EV_A_ fd); 788 fd_kill (EV_A_ fd);
775} 789}
776 790
777/* called on ENOMEM in select/poll to kill some fds and retry */ 791/* called on ENOMEM in select/poll to kill some fds and retry */
778static void noinline 792static void noinline
… …
796 810
797 for (fd = 0; fd < anfdmax; ++fd) 811 for (fd = 0; fd < anfdmax; ++fd)
798 if (anfds [fd].events) 812 if (anfds [fd].events)
799 { 813 {
800 anfds [fd].events = 0; 814 anfds [fd].events = 0;
815 anfds [fd].emask = 0;
801 fd_change (EV_A_ fd, EV_IOFDSET | 1); 816 fd_change (EV_A_ fd, EV_IOFDSET | 1);
802 } 817 }
803} 818}
804 819
805/*****************************************************************************/ 820/*****************************************************************************/
… …
957static ANSIG *signals; 972static ANSIG *signals;
958static int signalmax; 973static int signalmax;
959 974
960static EV_ATOMIC_T gotsig; 975static EV_ATOMIC_T gotsig;
961 976
962void inline_size
963signals_init (ANSIG *base, int count)
964{
965 while (count--)
966 {
967 base->head = 0;
968 base->gotsig = 0;
969
970 ++base;
971 }
972}
973
974/*****************************************************************************/ 977/*****************************************************************************/
975 978
976void inline_speed 979void inline_speed
977fd_intern (int fd) 980fd_intern (int fd)
978{ 981{
979#ifdef _WIN32 982#ifdef _WIN32
980 int arg = 1; 983 unsigned long arg = 1;
981 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 984 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
982#else 985#else
983 fcntl (fd, F_SETFD, FD_CLOEXEC); 986 fcntl (fd, F_SETFD, FD_CLOEXEC);
984 fcntl (fd, F_SETFL, O_NONBLOCK); 987 fcntl (fd, F_SETFL, O_NONBLOCK);
985#endif 988#endif
… …
999 } 1002 }
1000 else 1003 else
1001#endif 1004#endif
1002 { 1005 {
1003 while (pipe (evpipe)) 1006 while (pipe (evpipe))
1004 syserr ("(libev) error creating signal/async pipe"); 1007 ev_syserr ("(libev) error creating signal/async pipe");
1005 1008
1006 fd_intern (evpipe [0]); 1009 fd_intern (evpipe [0]);
1007 fd_intern (evpipe [1]); 1010 fd_intern (evpipe [1]);
1008 ev_io_set (&pipeev, evpipe [0], EV_READ); 1011 ev_io_set (&pipeev, evpipe [0], EV_READ);
1009 } 1012 }
… …
1499{ 1502{
1500 postfork = 1; /* must be in line with ev_default_fork */ 1503 postfork = 1; /* must be in line with ev_default_fork */
1501} 1504}
1502 1505
1503#if EV_VERIFY 1506#if EV_VERIFY
1504void noinline 1507static void noinline
1505verify_watcher (EV_P_ W w) 1508verify_watcher (EV_P_ W w)
1506{ 1509{
1507 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1510 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1508 1511
1509 if (w->pending) 1512 if (w->pending)
… …
1568 1571
1569 for (i = NUMPRI; i--; ) 1572 for (i = NUMPRI; i--; )
1570 { 1573 {
1571 assert (pendingmax [i] >= pendingcnt [i]); 1574 assert (pendingmax [i] >= pendingcnt [i]);
1572#if EV_IDLE_ENABLE 1575#if EV_IDLE_ENABLE
1576 assert (idleall >= 0);
1573 assert (idlemax [i] >= idlecnt [i]); 1577 assert (idlemax [i] >= idlecnt [i]);
1574 array_verify (EV_A_ (W *)idles [i], idlecnt [i]); 1578 array_verify (EV_A_ (W *)idles [i], idlecnt [i]);
1575#endif 1579#endif
1576 } 1580 }
1577 1581
… …
1639{ 1643{
1640#if EV_MULTIPLICITY 1644#if EV_MULTIPLICITY
1641 struct ev_loop *loop = ev_default_loop_ptr; 1645 struct ev_loop *loop = ev_default_loop_ptr;
1642#endif 1646#endif
1643 1647
1648 ev_default_loop_ptr = 0;
1649
1644#ifndef _WIN32 1650#ifndef _WIN32
1645 ev_ref (EV_A); /* child watcher */ 1651 ev_ref (EV_A); /* child watcher */
1646 ev_signal_stop (EV_A_ &childev); 1652 ev_signal_stop (EV_A_ &childev);
1647#endif 1653#endif
1648 1654
… …
1654{ 1660{
1655#if EV_MULTIPLICITY 1661#if EV_MULTIPLICITY
1656 struct ev_loop *loop = ev_default_loop_ptr; 1662 struct ev_loop *loop = ev_default_loop_ptr;
1657#endif 1663#endif
1658 1664
1659 if (backend)
1660 postfork = 1; /* must be in line with ev_loop_fork */ 1665 postfork = 1; /* must be in line with ev_loop_fork */
1661} 1666}
1662 1667
1663/*****************************************************************************/ 1668/*****************************************************************************/
1664 1669
1665void 1670void
… …
1896ev_unref (EV_P) 1901ev_unref (EV_P)
1897{ 1902{
1898 --activecnt; 1903 --activecnt;
1899} 1904}
1900 1905
1906void
1907ev_now_update (EV_P)
1908{
1909 time_update (EV_A_ 1e100);
1910}
1911
1901static int loop_done; 1912static int loop_done;
1902 1913
1903void 1914void
1904ev_loop (EV_P_ int flags) 1915ev_loop (EV_P_ int flags)
1905{ 1916{
… …
2114 2125
2115 if (expect_false (ev_is_active (w))) 2126 if (expect_false (ev_is_active (w)))
2116 return; 2127 return;
2117 2128
2118 assert (("ev_io_start called with negative fd", fd >= 0)); 2129 assert (("ev_io_start called with negative fd", fd >= 0));
2130 assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE))));
2119 2131
2120 EV_FREQUENT_CHECK; 2132 EV_FREQUENT_CHECK;
2121 2133
2122 ev_start (EV_A_ (W)w, 1); 2134 ev_start (EV_A_ (W)w, 1);
2123 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2135 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2124 wlist_add (&anfds[fd].head, (WL)w); 2136 wlist_add (&anfds[fd].head, (WL)w);
2125 2137
2126 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2138 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
2127 w->events &= ~EV_IOFDSET; 2139 w->events &= ~EV_IOFDSET;
2128 2140
… …
2320 sigset_t full, prev; 2332 sigset_t full, prev;
2321 sigfillset (&full); 2333 sigfillset (&full);
2322 sigprocmask (SIG_SETMASK, &full, &prev); 2334 sigprocmask (SIG_SETMASK, &full, &prev);
2323#endif 2335#endif
2324 2336
2325 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2337 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2326 2338
2327#ifndef _WIN32 2339#ifndef _WIN32
2328 sigprocmask (SIG_SETMASK, &prev, 0); 2340 sigprocmask (SIG_SETMASK, &prev, 0);
2329#endif 2341#endif
2330 } 2342 }
… …
2403# ifdef _WIN32 2415# ifdef _WIN32
2404# undef lstat 2416# undef lstat
2405# define lstat(a,b) _stati64 (a,b) 2417# define lstat(a,b) _stati64 (a,b)
2406# endif 2418# endif
2407 2419
2408#define DEF_STAT_INTERVAL 5.0074891 2420#define DEF_STAT_INTERVAL 5.0074891
2421#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
2409#define MIN_STAT_INTERVAL 0.1074891 2422#define MIN_STAT_INTERVAL 0.1074891
2410 2423
2411static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2424static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2412 2425
2413#if EV_USE_INOTIFY 2426#if EV_USE_INOTIFY
2414# define EV_INOTIFY_BUFSIZE 8192 2427# define EV_INOTIFY_BUFSIZE 8192
… …
2418{ 2431{
2419 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD); 2432 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
2420 2433
2421 if (w->wd < 0) 2434 if (w->wd < 0)
2422 { 2435 {
2436 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2423 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2437 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2424 2438
2425 /* monitor some parent directory for speedup hints */ 2439 /* monitor some parent directory for speedup hints */
2426 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2440 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2427 /* but an efficiency issue only */ 2441 /* but an efficiency issue only */
2428 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2442 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2429 { 2443 {
2430 char path [4096]; 2444 char path [4096];
2431 strcpy (path, w->path); 2445 strcpy (path, w->path);
… …
2445 } 2459 }
2446 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2460 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2447 } 2461 }
2448 } 2462 }
2449 else 2463 else
2450 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */ 2464 {
2451
2452 if (w->wd >= 0)
2453 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2465 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2466
2467 /* now local changes will be tracked by inotify, but remote changes won't */
2468 /* unless the filesystem it known to be local, we therefore still poll */
2469 /* also do poll on <2.6.25, but with normal frequency */
2470 struct statfs sfs;
2471
2472 if (fs_2625 && !statfs (w->path, &sfs))
2473 if (sfs.f_type == 0x1373 /* devfs */
2474 || sfs.f_type == 0xEF53 /* ext2/3 */
2475 || sfs.f_type == 0x3153464a /* jfs */
2476 || sfs.f_type == 0x52654973 /* reiser3 */
2477 || sfs.f_type == 0x01021994 /* tempfs */
2478 || sfs.f_type == 0x58465342 /* xfs */)
2479 return;
2480
2481 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2482 ev_timer_again (EV_A_ &w->timer);
2483 }
2454} 2484}
2455 2485
2456static void noinline 2486static void noinline
2457infy_del (EV_P_ ev_stat *w) 2487infy_del (EV_P_ ev_stat *w)
2458{ 2488{
… …
2472 2502
2473static void noinline 2503static void noinline
2474infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2504infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2475{ 2505{
2476 if (slot < 0) 2506 if (slot < 0)
2477 /* overflow, need to check for all hahs slots */ 2507 /* overflow, need to check for all hash slots */
2478 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2508 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2479 infy_wd (EV_A_ slot, wd, ev); 2509 infy_wd (EV_A_ slot, wd, ev);
2480 else 2510 else
2481 { 2511 {
2482 WL w_; 2512 WL w_;
… …
2511 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2541 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2512 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2542 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2513} 2543}
2514 2544
2515void inline_size 2545void inline_size
2546check_2625 (EV_P)
2547{
2548 /* kernels < 2.6.25 are borked
2549 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2550 */
2551 struct utsname buf;
2552 int major, minor, micro;
2553
2554 if (uname (&buf))
2555 return;
2556
2557 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2558 return;
2559
2560 if (major < 2
2561 || (major == 2 && minor < 6)
2562 || (major == 2 && minor == 6 && micro < 25))
2563 return;
2564
2565 fs_2625 = 1;
2566}
2567
2568void inline_size
2516infy_init (EV_P) 2569infy_init (EV_P)
2517{ 2570{
2518 if (fs_fd != -2) 2571 if (fs_fd != -2)
2519 return; 2572 return;
2573
2574 fs_fd = -1;
2575
2576 check_2625 (EV_A);
2520 2577
2521 fs_fd = inotify_init (); 2578 fs_fd = inotify_init ();
2522 2579
2523 if (fs_fd >= 0) 2580 if (fs_fd >= 0)
2524 { 2581 {
… …
2552 w->wd = -1; 2609 w->wd = -1;
2553 2610
2554 if (fs_fd >= 0) 2611 if (fs_fd >= 0)
2555 infy_add (EV_A_ w); /* re-add, no matter what */ 2612 infy_add (EV_A_ w); /* re-add, no matter what */
2556 else 2613 else
2557 ev_timer_start (EV_A_ &w->timer); 2614 ev_timer_again (EV_A_ &w->timer);
2558 } 2615 }
2559
2560 } 2616 }
2561} 2617}
2562 2618
2619#endif
2620
2621#ifdef _WIN32
2622# define EV_LSTAT(p,b) _stati64 (p, b)
2623#else
2624# define EV_LSTAT(p,b) lstat (p, b)
2563#endif 2625#endif
2564 2626
2565void 2627void
2566ev_stat_stat (EV_P_ ev_stat *w) 2628ev_stat_stat (EV_P_ ev_stat *w)
2567{ 2629{
… …
2594 || w->prev.st_atime != w->attr.st_atime 2656 || w->prev.st_atime != w->attr.st_atime
2595 || w->prev.st_mtime != w->attr.st_mtime 2657 || w->prev.st_mtime != w->attr.st_mtime
2596 || w->prev.st_ctime != w->attr.st_ctime 2658 || w->prev.st_ctime != w->attr.st_ctime
2597 ) { 2659 ) {
2598 #if EV_USE_INOTIFY 2660 #if EV_USE_INOTIFY
2661 if (fs_fd >= 0)
2662 {
2599 infy_del (EV_A_ w); 2663 infy_del (EV_A_ w);
2600 infy_add (EV_A_ w); 2664 infy_add (EV_A_ w);
2601 ev_stat_stat (EV_A_ w); /* avoid race... */ 2665 ev_stat_stat (EV_A_ w); /* avoid race... */
2666 }
2602 #endif 2667 #endif
2603 2668
2604 ev_feed_event (EV_A_ w, EV_STAT); 2669 ev_feed_event (EV_A_ w, EV_STAT);
2605 } 2670 }
2606} 2671}
… …
2609ev_stat_start (EV_P_ ev_stat *w) 2674ev_stat_start (EV_P_ ev_stat *w)
2610{ 2675{
2611 if (expect_false (ev_is_active (w))) 2676 if (expect_false (ev_is_active (w)))
2612 return; 2677 return;
2613 2678
2614 /* since we use memcmp, we need to clear any padding data etc. */
2615 memset (&w->prev, 0, sizeof (ev_statdata));
2616 memset (&w->attr, 0, sizeof (ev_statdata));
2617
2618 ev_stat_stat (EV_A_ w); 2679 ev_stat_stat (EV_A_ w);
2619 2680
2681 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2620 if (w->interval < MIN_STAT_INTERVAL) 2682 w->interval = MIN_STAT_INTERVAL;
2621 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2622 2683
2623 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 2684 ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2624 ev_set_priority (&w->timer, ev_priority (w)); 2685 ev_set_priority (&w->timer, ev_priority (w));
2625 2686
2626#if EV_USE_INOTIFY 2687#if EV_USE_INOTIFY
2627 infy_init (EV_A); 2688 infy_init (EV_A);
2628 2689
2629 if (fs_fd >= 0) 2690 if (fs_fd >= 0)
2630 infy_add (EV_A_ w); 2691 infy_add (EV_A_ w);
2631 else 2692 else
2632#endif 2693#endif
2633 ev_timer_start (EV_A_ &w->timer); 2694 ev_timer_again (EV_A_ &w->timer);
2634 2695
2635 ev_start (EV_A_ (W)w, 1); 2696 ev_start (EV_A_ (W)w, 1);
2636 2697
2637 EV_FREQUENT_CHECK; 2698 EV_FREQUENT_CHECK;
2638} 2699}
… …
2808 ev_loop (EV_A_ EVLOOP_NONBLOCK); 2869 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2809 } 2870 }
2810 } 2871 }
2811} 2872}
2812 2873
2874static void
2875embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2876{
2877 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2878
2879 {
2880 struct ev_loop *loop = w->other;
2881
2882 ev_loop_fork (EV_A);
2883 }
2884}
2885
2813#if 0 2886#if 0
2814static void 2887static void
2815embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2888embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2816{ 2889{
2817 ev_idle_stop (EV_A_ idle); 2890 ev_idle_stop (EV_A_ idle);
… …
2837 2910
2838 ev_prepare_init (&w->prepare, embed_prepare_cb); 2911 ev_prepare_init (&w->prepare, embed_prepare_cb);
2839 ev_set_priority (&w->prepare, EV_MINPRI); 2912 ev_set_priority (&w->prepare, EV_MINPRI);
2840 ev_prepare_start (EV_A_ &w->prepare); 2913 ev_prepare_start (EV_A_ &w->prepare);
2841 2914
2915 ev_fork_init (&w->fork, embed_fork_cb);
2916 ev_fork_start (EV_A_ &w->fork);
2917
2842 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2918 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2843 2919
2844 ev_start (EV_A_ (W)w, 1); 2920 ev_start (EV_A_ (W)w, 1);
2845 2921
2846 EV_FREQUENT_CHECK; 2922 EV_FREQUENT_CHECK;
… …
2853 if (expect_false (!ev_is_active (w))) 2929 if (expect_false (!ev_is_active (w)))
2854 return; 2930 return;
2855 2931
2856 EV_FREQUENT_CHECK; 2932 EV_FREQUENT_CHECK;
2857 2933
2858 ev_io_stop (EV_A_ &w->io); 2934 ev_io_stop (EV_A_ &w->io);
2859 ev_prepare_stop (EV_A_ &w->prepare); 2935 ev_prepare_stop (EV_A_ &w->prepare);
2860 2936 ev_fork_stop (EV_A_ &w->fork);
2861 ev_stop (EV_A_ (W)w);
2862 2937
2863 EV_FREQUENT_CHECK; 2938 EV_FREQUENT_CHECK;
2864} 2939}
2865#endif 2940#endif
2866 2941
… …
2963once_cb (EV_P_ struct ev_once *once, int revents) 3038once_cb (EV_P_ struct ev_once *once, int revents)
2964{ 3039{
2965 void (*cb)(int revents, void *arg) = once->cb; 3040 void (*cb)(int revents, void *arg) = once->cb;
2966 void *arg = once->arg; 3041 void *arg = once->arg;
2967 3042
2968 ev_io_stop (EV_A_ &once->io); 3043 ev_io_stop (EV_A_ &once->io);
2969 ev_timer_stop (EV_A_ &once->to); 3044 ev_timer_stop (EV_A_ &once->to);
2970 ev_free (once); 3045 ev_free (once);
2971 3046
2972 cb (revents, arg); 3047 cb (revents, arg);
2973} 3048}
2974 3049
2975static void 3050static void
2976once_cb_io (EV_P_ ev_io *w, int revents) 3051once_cb_io (EV_P_ ev_io *w, int revents)
2977{ 3052{
2978 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3053 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3054
3055 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
2979} 3056}
2980 3057
2981static void 3058static void
2982once_cb_to (EV_P_ ev_timer *w, int revents) 3059once_cb_to (EV_P_ ev_timer *w, int revents)
2983{ 3060{
2984 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3061 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3062
3063 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
2985} 3064}
2986 3065
2987void 3066void
2988ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3067ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
2989{ 3068{

Diff Legend

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