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.275 by root, Fri Dec 12 20:35:21 2008 UTC

… …
47# include EV_CONFIG_H 47# include EV_CONFIG_H
48# else 48# else
49# include "config.h" 49# include "config.h"
50# endif 50# endif
51 51
52# if HAVE_CLOCK_SYSCALL
53# ifndef EV_USE_CLOCK_SYSCALL
54# define EV_USE_CLOCK_SYSCALL 1
55# ifndef EV_USE_REALTIME
56# define EV_USE_REALTIME 0
57# endif
58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1
60# endif
61# endif
62# endif
63
52# if HAVE_CLOCK_GETTIME 64# if HAVE_CLOCK_GETTIME
53# ifndef EV_USE_MONOTONIC 65# ifndef EV_USE_MONOTONIC
54# define EV_USE_MONOTONIC 1 66# define EV_USE_MONOTONIC 1
55# endif 67# endif
56# ifndef EV_USE_REALTIME 68# ifndef EV_USE_REALTIME
… …
154#ifndef _WIN32 166#ifndef _WIN32
155# include <sys/time.h> 167# include <sys/time.h>
156# include <sys/wait.h> 168# include <sys/wait.h>
157# include <unistd.h> 169# include <unistd.h>
158#else 170#else
171# include <io.h>
159# define WIN32_LEAN_AND_MEAN 172# define WIN32_LEAN_AND_MEAN
160# include <windows.h> 173# include <windows.h>
161# ifndef EV_SELECT_IS_WINSOCKET 174# ifndef EV_SELECT_IS_WINSOCKET
162# define EV_SELECT_IS_WINSOCKET 1 175# define EV_SELECT_IS_WINSOCKET 1
163# endif 176# endif
164#endif 177#endif
165 178
166/* this block tries to deduce configuration from header-defined symbols and defaults */ 179/* this block tries to deduce configuration from header-defined symbols and defaults */
167 180
181#ifndef EV_USE_CLOCK_SYSCALL
182# if __linux && __GLIBC__ >= 2
183# define EV_USE_CLOCK_SYSCALL 1
184# else
185# define EV_USE_CLOCK_SYSCALL 0
186# endif
187#endif
188
168#ifndef EV_USE_MONOTONIC 189#ifndef EV_USE_MONOTONIC
190# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
191# define EV_USE_MONOTONIC 1
192# else
169# define EV_USE_MONOTONIC 0 193# define EV_USE_MONOTONIC 0
194# endif
170#endif 195#endif
171 196
172#ifndef EV_USE_REALTIME 197#ifndef EV_USE_REALTIME
173# define EV_USE_REALTIME 0 198# define EV_USE_REALTIME 0
174#endif 199#endif
175 200
176#ifndef EV_USE_NANOSLEEP 201#ifndef EV_USE_NANOSLEEP
202# if _POSIX_C_SOURCE >= 199309L
203# define EV_USE_NANOSLEEP 1
204# else
177# define EV_USE_NANOSLEEP 0 205# define EV_USE_NANOSLEEP 0
206# endif
178#endif 207#endif
179 208
180#ifndef EV_USE_SELECT 209#ifndef EV_USE_SELECT
181# define EV_USE_SELECT 1 210# define EV_USE_SELECT 1
182#endif 211#endif
… …
277# include <sys/select.h> 306# include <sys/select.h>
278# endif 307# endif
279#endif 308#endif
280 309
281#if EV_USE_INOTIFY 310#if EV_USE_INOTIFY
311# include <sys/utsname.h>
312# include <sys/statfs.h>
282# include <sys/inotify.h> 313# include <sys/inotify.h>
314/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
315# ifndef IN_DONT_FOLLOW
316# undef EV_USE_INOTIFY
317# define EV_USE_INOTIFY 0
318# endif
283#endif 319#endif
284 320
285#if EV_SELECT_IS_WINSOCKET 321#if EV_SELECT_IS_WINSOCKET
286# include <winsock.h> 322# include <winsock.h>
323#endif
324
325/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
326/* which makes programs even slower. might work on other unices, too. */
327#if EV_USE_CLOCK_SYSCALL
328# include <syscall.h>
329# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
330# undef EV_USE_MONOTONIC
331# define EV_USE_MONOTONIC 1
287#endif 332#endif
288 333
289#if EV_USE_EVENTFD 334#if EV_USE_EVENTFD
290/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 335/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
291# include <stdint.h> 336# include <stdint.h>
… …
373{ 418{
374 syserr_cb = cb; 419 syserr_cb = cb;
375} 420}
376 421
377static void noinline 422static void noinline
378syserr (const char *msg) 423ev_syserr (const char *msg)
379{ 424{
380 if (!msg) 425 if (!msg)
381 msg = "(libev) system error"; 426 msg = "(libev) system error";
382 427
383 if (syserr_cb) 428 if (syserr_cb)
… …
434typedef struct 479typedef struct
435{ 480{
436 WL head; 481 WL head;
437 unsigned char events; 482 unsigned char events;
438 unsigned char reify; 483 unsigned char reify;
484 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
485 unsigned char unused;
486#if EV_USE_EPOLL
487 unsigned int egen; /* generation counter to counter epoll bugs */
488#endif
439#if EV_SELECT_IS_WINSOCKET 489#if EV_SELECT_IS_WINSOCKET
440 SOCKET handle; 490 SOCKET handle;
441#endif 491#endif
442} ANFD; 492} ANFD;
443 493
… …
556 struct timeval tv; 606 struct timeval tv;
557 607
558 tv.tv_sec = (time_t)delay; 608 tv.tv_sec = (time_t)delay;
559 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 609 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
560 610
611 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
612 /* somehting nto guaranteed by newer posix versions, but guaranteed */
613 /* by older ones */
561 select (0, 0, 0, 0, &tv); 614 select (0, 0, 0, 0, &tv);
562#endif 615#endif
563 } 616 }
564} 617}
565 618
… …
592array_realloc (int elem, void *base, int *cur, int cnt) 645array_realloc (int elem, void *base, int *cur, int cnt)
593{ 646{
594 *cur = array_nextsize (elem, *cur, cnt); 647 *cur = array_nextsize (elem, *cur, cnt);
595 return ev_realloc (base, elem * *cur); 648 return ev_realloc (base, elem * *cur);
596} 649}
650
651#define array_init_zero(base,count) \
652 memset ((void *)(base), 0, sizeof (*(base)) * (count))
597 653
598#define array_needsize(type,base,cur,cnt,init) \ 654#define array_needsize(type,base,cur,cnt,init) \
599 if (expect_false ((cnt) > (cur))) \ 655 if (expect_false ((cnt) > (cur))) \
600 { \ 656 { \
601 int ocur_ = (cur); \ 657 int ocur_ = (cur); \
… …
645 ev_feed_event (EV_A_ events [i], type); 701 ev_feed_event (EV_A_ events [i], type);
646} 702}
647 703
648/*****************************************************************************/ 704/*****************************************************************************/
649 705
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 706void inline_speed
664fd_event (EV_P_ int fd, int revents) 707fd_event (EV_P_ int fd, int revents)
665{ 708{
666 ANFD *anfd = anfds + fd; 709 ANFD *anfd = anfds + fd;
667 ev_io *w; 710 ev_io *w;
… …
699 events |= (unsigned char)w->events; 742 events |= (unsigned char)w->events;
700 743
701#if EV_SELECT_IS_WINSOCKET 744#if EV_SELECT_IS_WINSOCKET
702 if (events) 745 if (events)
703 { 746 {
704 unsigned long argp; 747 unsigned long arg;
705 #ifdef EV_FD_TO_WIN32_HANDLE 748 #ifdef EV_FD_TO_WIN32_HANDLE
706 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 749 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
707 #else 750 #else
708 anfd->handle = _get_osfhandle (fd); 751 anfd->handle = _get_osfhandle (fd);
709 #endif 752 #endif
710 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 753 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
711 } 754 }
712#endif 755#endif
713 756
714 { 757 {
715 unsigned char o_events = anfd->events; 758 unsigned char o_events = anfd->events;
… …
768{ 811{
769 int fd; 812 int fd;
770 813
771 for (fd = 0; fd < anfdmax; ++fd) 814 for (fd = 0; fd < anfdmax; ++fd)
772 if (anfds [fd].events) 815 if (anfds [fd].events)
773 if (!fd_valid (fd) == -1 && errno == EBADF) 816 if (!fd_valid (fd) && errno == EBADF)
774 fd_kill (EV_A_ fd); 817 fd_kill (EV_A_ fd);
775} 818}
776 819
777/* called on ENOMEM in select/poll to kill some fds and retry */ 820/* called on ENOMEM in select/poll to kill some fds and retry */
778static void noinline 821static void noinline
… …
796 839
797 for (fd = 0; fd < anfdmax; ++fd) 840 for (fd = 0; fd < anfdmax; ++fd)
798 if (anfds [fd].events) 841 if (anfds [fd].events)
799 { 842 {
800 anfds [fd].events = 0; 843 anfds [fd].events = 0;
844 anfds [fd].emask = 0;
801 fd_change (EV_A_ fd, EV_IOFDSET | 1); 845 fd_change (EV_A_ fd, EV_IOFDSET | 1);
802 } 846 }
803} 847}
804 848
805/*****************************************************************************/ 849/*****************************************************************************/
… …
957static ANSIG *signals; 1001static ANSIG *signals;
958static int signalmax; 1002static int signalmax;
959 1003
960static EV_ATOMIC_T gotsig; 1004static EV_ATOMIC_T gotsig;
961 1005
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/*****************************************************************************/ 1006/*****************************************************************************/
975 1007
976void inline_speed 1008void inline_speed
977fd_intern (int fd) 1009fd_intern (int fd)
978{ 1010{
979#ifdef _WIN32 1011#ifdef _WIN32
980 int arg = 1; 1012 unsigned long arg = 1;
981 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1013 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
982#else 1014#else
983 fcntl (fd, F_SETFD, FD_CLOEXEC); 1015 fcntl (fd, F_SETFD, FD_CLOEXEC);
984 fcntl (fd, F_SETFL, O_NONBLOCK); 1016 fcntl (fd, F_SETFL, O_NONBLOCK);
985#endif 1017#endif
… …
999 } 1031 }
1000 else 1032 else
1001#endif 1033#endif
1002 { 1034 {
1003 while (pipe (evpipe)) 1035 while (pipe (evpipe))
1004 syserr ("(libev) error creating signal/async pipe"); 1036 ev_syserr ("(libev) error creating signal/async pipe");
1005 1037
1006 fd_intern (evpipe [0]); 1038 fd_intern (evpipe [0]);
1007 fd_intern (evpipe [1]); 1039 fd_intern (evpipe [1]);
1008 ev_io_set (&pipeev, evpipe [0], EV_READ); 1040 ev_io_set (&pipeev, evpipe [0], EV_READ);
1009 } 1041 }
… …
1499{ 1531{
1500 postfork = 1; /* must be in line with ev_default_fork */ 1532 postfork = 1; /* must be in line with ev_default_fork */
1501} 1533}
1502 1534
1503#if EV_VERIFY 1535#if EV_VERIFY
1504void noinline 1536static void noinline
1505verify_watcher (EV_P_ W w) 1537verify_watcher (EV_P_ W w)
1506{ 1538{
1507 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1539 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1508 1540
1509 if (w->pending) 1541 if (w->pending)
… …
1568 1600
1569 for (i = NUMPRI; i--; ) 1601 for (i = NUMPRI; i--; )
1570 { 1602 {
1571 assert (pendingmax [i] >= pendingcnt [i]); 1603 assert (pendingmax [i] >= pendingcnt [i]);
1572#if EV_IDLE_ENABLE 1604#if EV_IDLE_ENABLE
1605 assert (idleall >= 0);
1573 assert (idlemax [i] >= idlecnt [i]); 1606 assert (idlemax [i] >= idlecnt [i]);
1574 array_verify (EV_A_ (W *)idles [i], idlecnt [i]); 1607 array_verify (EV_A_ (W *)idles [i], idlecnt [i]);
1575#endif 1608#endif
1576 } 1609 }
1577 1610
… …
1639{ 1672{
1640#if EV_MULTIPLICITY 1673#if EV_MULTIPLICITY
1641 struct ev_loop *loop = ev_default_loop_ptr; 1674 struct ev_loop *loop = ev_default_loop_ptr;
1642#endif 1675#endif
1643 1676
1677 ev_default_loop_ptr = 0;
1678
1644#ifndef _WIN32 1679#ifndef _WIN32
1645 ev_ref (EV_A); /* child watcher */ 1680 ev_ref (EV_A); /* child watcher */
1646 ev_signal_stop (EV_A_ &childev); 1681 ev_signal_stop (EV_A_ &childev);
1647#endif 1682#endif
1648 1683
… …
1654{ 1689{
1655#if EV_MULTIPLICITY 1690#if EV_MULTIPLICITY
1656 struct ev_loop *loop = ev_default_loop_ptr; 1691 struct ev_loop *loop = ev_default_loop_ptr;
1657#endif 1692#endif
1658 1693
1659 if (backend)
1660 postfork = 1; /* must be in line with ev_loop_fork */ 1694 postfork = 1; /* must be in line with ev_loop_fork */
1661} 1695}
1662 1696
1663/*****************************************************************************/ 1697/*****************************************************************************/
1664 1698
1665void 1699void
… …
1896ev_unref (EV_P) 1930ev_unref (EV_P)
1897{ 1931{
1898 --activecnt; 1932 --activecnt;
1899} 1933}
1900 1934
1935void
1936ev_now_update (EV_P)
1937{
1938 time_update (EV_A_ 1e100);
1939}
1940
1901static int loop_done; 1941static int loop_done;
1902 1942
1903void 1943void
1904ev_loop (EV_P_ int flags) 1944ev_loop (EV_P_ int flags)
1905{ 1945{
… …
2114 2154
2115 if (expect_false (ev_is_active (w))) 2155 if (expect_false (ev_is_active (w)))
2116 return; 2156 return;
2117 2157
2118 assert (("ev_io_start called with negative fd", fd >= 0)); 2158 assert (("ev_io_start called with negative fd", fd >= 0));
2159 assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE))));
2119 2160
2120 EV_FREQUENT_CHECK; 2161 EV_FREQUENT_CHECK;
2121 2162
2122 ev_start (EV_A_ (W)w, 1); 2163 ev_start (EV_A_ (W)w, 1);
2123 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2164 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2124 wlist_add (&anfds[fd].head, (WL)w); 2165 wlist_add (&anfds[fd].head, (WL)w);
2125 2166
2126 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2167 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
2127 w->events &= ~EV_IOFDSET; 2168 w->events &= ~EV_IOFDSET;
2128 2169
… …
2320 sigset_t full, prev; 2361 sigset_t full, prev;
2321 sigfillset (&full); 2362 sigfillset (&full);
2322 sigprocmask (SIG_SETMASK, &full, &prev); 2363 sigprocmask (SIG_SETMASK, &full, &prev);
2323#endif 2364#endif
2324 2365
2325 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2366 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2326 2367
2327#ifndef _WIN32 2368#ifndef _WIN32
2328 sigprocmask (SIG_SETMASK, &prev, 0); 2369 sigprocmask (SIG_SETMASK, &prev, 0);
2329#endif 2370#endif
2330 } 2371 }
… …
2403# ifdef _WIN32 2444# ifdef _WIN32
2404# undef lstat 2445# undef lstat
2405# define lstat(a,b) _stati64 (a,b) 2446# define lstat(a,b) _stati64 (a,b)
2406# endif 2447# endif
2407 2448
2408#define DEF_STAT_INTERVAL 5.0074891 2449#define DEF_STAT_INTERVAL 5.0074891
2450#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
2409#define MIN_STAT_INTERVAL 0.1074891 2451#define MIN_STAT_INTERVAL 0.1074891
2410 2452
2411static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2453static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2412 2454
2413#if EV_USE_INOTIFY 2455#if EV_USE_INOTIFY
2414# define EV_INOTIFY_BUFSIZE 8192 2456# define EV_INOTIFY_BUFSIZE 8192
… …
2418{ 2460{
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); 2461 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 2462
2421 if (w->wd < 0) 2463 if (w->wd < 0)
2422 { 2464 {
2465 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 */ 2466 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2424 2467
2425 /* monitor some parent directory for speedup hints */ 2468 /* monitor some parent directory for speedup hints */
2426 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2469 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2427 /* but an efficiency issue only */ 2470 /* but an efficiency issue only */
2428 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2471 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2429 { 2472 {
2430 char path [4096]; 2473 char path [4096];
2431 strcpy (path, w->path); 2474 strcpy (path, w->path);
… …
2435 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2478 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2436 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2479 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2437 2480
2438 char *pend = strrchr (path, '/'); 2481 char *pend = strrchr (path, '/');
2439 2482
2440 if (!pend) 2483 if (!pend || pend == path)
2441 break; /* whoops, no '/', complain to your admin */ 2484 break;
2442 2485
2443 *pend = 0; 2486 *pend = 0;
2444 w->wd = inotify_add_watch (fs_fd, path, mask); 2487 w->wd = inotify_add_watch (fs_fd, path, mask);
2445 } 2488 }
2446 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2489 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2447 } 2490 }
2448 } 2491 }
2449 else
2450 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2451 2492
2452 if (w->wd >= 0) 2493 if (w->wd >= 0)
2494 {
2453 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2495 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2496
2497 /* now local changes will be tracked by inotify, but remote changes won't */
2498 /* unless the filesystem it known to be local, we therefore still poll */
2499 /* also do poll on <2.6.25, but with normal frequency */
2500 struct statfs sfs;
2501
2502 if (fs_2625 && !statfs (w->path, &sfs))
2503 if (sfs.f_type == 0x1373 /* devfs */
2504 || sfs.f_type == 0xEF53 /* ext2/3 */
2505 || sfs.f_type == 0x3153464a /* jfs */
2506 || sfs.f_type == 0x52654973 /* reiser3 */
2507 || sfs.f_type == 0x01021994 /* tempfs */
2508 || sfs.f_type == 0x58465342 /* xfs */)
2509 return;
2510
2511 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2512 ev_timer_again (EV_A_ &w->timer);
2513 }
2454} 2514}
2455 2515
2456static void noinline 2516static void noinline
2457infy_del (EV_P_ ev_stat *w) 2517infy_del (EV_P_ ev_stat *w)
2458{ 2518{
… …
2472 2532
2473static void noinline 2533static void noinline
2474infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2534infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2475{ 2535{
2476 if (slot < 0) 2536 if (slot < 0)
2477 /* overflow, need to check for all hahs slots */ 2537 /* overflow, need to check for all hash slots */
2478 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2538 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2479 infy_wd (EV_A_ slot, wd, ev); 2539 infy_wd (EV_A_ slot, wd, ev);
2480 else 2540 else
2481 { 2541 {
2482 WL w_; 2542 WL w_;
… …
2488 2548
2489 if (w->wd == wd || wd == -1) 2549 if (w->wd == wd || wd == -1)
2490 { 2550 {
2491 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2551 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2492 { 2552 {
2553 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2493 w->wd = -1; 2554 w->wd = -1;
2494 infy_add (EV_A_ w); /* re-add, no matter what */ 2555 infy_add (EV_A_ w); /* re-add, no matter what */
2495 } 2556 }
2496 2557
2497 stat_timer_cb (EV_A_ &w->timer, 0); 2558 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2511 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2572 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2512 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2573 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2513} 2574}
2514 2575
2515void inline_size 2576void inline_size
2577check_2625 (EV_P)
2578{
2579 /* kernels < 2.6.25 are borked
2580 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2581 */
2582 struct utsname buf;
2583 int major, minor, micro;
2584
2585 if (uname (&buf))
2586 return;
2587
2588 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2589 return;
2590
2591 if (major < 2
2592 || (major == 2 && minor < 6)
2593 || (major == 2 && minor == 6 && micro < 25))
2594 return;
2595
2596 fs_2625 = 1;
2597}
2598
2599void inline_size
2516infy_init (EV_P) 2600infy_init (EV_P)
2517{ 2601{
2518 if (fs_fd != -2) 2602 if (fs_fd != -2)
2519 return; 2603 return;
2604
2605 fs_fd = -1;
2606
2607 check_2625 (EV_A);
2520 2608
2521 fs_fd = inotify_init (); 2609 fs_fd = inotify_init ();
2522 2610
2523 if (fs_fd >= 0) 2611 if (fs_fd >= 0)
2524 { 2612 {
… …
2552 w->wd = -1; 2640 w->wd = -1;
2553 2641
2554 if (fs_fd >= 0) 2642 if (fs_fd >= 0)
2555 infy_add (EV_A_ w); /* re-add, no matter what */ 2643 infy_add (EV_A_ w); /* re-add, no matter what */
2556 else 2644 else
2557 ev_timer_start (EV_A_ &w->timer); 2645 ev_timer_again (EV_A_ &w->timer);
2558 } 2646 }
2559
2560 } 2647 }
2561} 2648}
2562 2649
2650#endif
2651
2652#ifdef _WIN32
2653# define EV_LSTAT(p,b) _stati64 (p, b)
2654#else
2655# define EV_LSTAT(p,b) lstat (p, b)
2563#endif 2656#endif
2564 2657
2565void 2658void
2566ev_stat_stat (EV_P_ ev_stat *w) 2659ev_stat_stat (EV_P_ ev_stat *w)
2567{ 2660{
… …
2594 || w->prev.st_atime != w->attr.st_atime 2687 || w->prev.st_atime != w->attr.st_atime
2595 || w->prev.st_mtime != w->attr.st_mtime 2688 || w->prev.st_mtime != w->attr.st_mtime
2596 || w->prev.st_ctime != w->attr.st_ctime 2689 || w->prev.st_ctime != w->attr.st_ctime
2597 ) { 2690 ) {
2598 #if EV_USE_INOTIFY 2691 #if EV_USE_INOTIFY
2692 if (fs_fd >= 0)
2693 {
2599 infy_del (EV_A_ w); 2694 infy_del (EV_A_ w);
2600 infy_add (EV_A_ w); 2695 infy_add (EV_A_ w);
2601 ev_stat_stat (EV_A_ w); /* avoid race... */ 2696 ev_stat_stat (EV_A_ w); /* avoid race... */
2697 }
2602 #endif 2698 #endif
2603 2699
2604 ev_feed_event (EV_A_ w, EV_STAT); 2700 ev_feed_event (EV_A_ w, EV_STAT);
2605 } 2701 }
2606} 2702}
… …
2609ev_stat_start (EV_P_ ev_stat *w) 2705ev_stat_start (EV_P_ ev_stat *w)
2610{ 2706{
2611 if (expect_false (ev_is_active (w))) 2707 if (expect_false (ev_is_active (w)))
2612 return; 2708 return;
2613 2709
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); 2710 ev_stat_stat (EV_A_ w);
2619 2711
2712 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2620 if (w->interval < MIN_STAT_INTERVAL) 2713 w->interval = MIN_STAT_INTERVAL;
2621 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2622 2714
2623 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 2715 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)); 2716 ev_set_priority (&w->timer, ev_priority (w));
2625 2717
2626#if EV_USE_INOTIFY 2718#if EV_USE_INOTIFY
2627 infy_init (EV_A); 2719 infy_init (EV_A);
2628 2720
2629 if (fs_fd >= 0) 2721 if (fs_fd >= 0)
2630 infy_add (EV_A_ w); 2722 infy_add (EV_A_ w);
2631 else 2723 else
2632#endif 2724#endif
2633 ev_timer_start (EV_A_ &w->timer); 2725 ev_timer_again (EV_A_ &w->timer);
2634 2726
2635 ev_start (EV_A_ (W)w, 1); 2727 ev_start (EV_A_ (W)w, 1);
2636 2728
2637 EV_FREQUENT_CHECK; 2729 EV_FREQUENT_CHECK;
2638} 2730}
… …
2808 ev_loop (EV_A_ EVLOOP_NONBLOCK); 2900 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2809 } 2901 }
2810 } 2902 }
2811} 2903}
2812 2904
2905static void
2906embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2907{
2908 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2909
2910 {
2911 struct ev_loop *loop = w->other;
2912
2913 ev_loop_fork (EV_A);
2914 }
2915}
2916
2813#if 0 2917#if 0
2814static void 2918static void
2815embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2919embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2816{ 2920{
2817 ev_idle_stop (EV_A_ idle); 2921 ev_idle_stop (EV_A_ idle);
… …
2837 2941
2838 ev_prepare_init (&w->prepare, embed_prepare_cb); 2942 ev_prepare_init (&w->prepare, embed_prepare_cb);
2839 ev_set_priority (&w->prepare, EV_MINPRI); 2943 ev_set_priority (&w->prepare, EV_MINPRI);
2840 ev_prepare_start (EV_A_ &w->prepare); 2944 ev_prepare_start (EV_A_ &w->prepare);
2841 2945
2946 ev_fork_init (&w->fork, embed_fork_cb);
2947 ev_fork_start (EV_A_ &w->fork);
2948
2842 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2949 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2843 2950
2844 ev_start (EV_A_ (W)w, 1); 2951 ev_start (EV_A_ (W)w, 1);
2845 2952
2846 EV_FREQUENT_CHECK; 2953 EV_FREQUENT_CHECK;
… …
2853 if (expect_false (!ev_is_active (w))) 2960 if (expect_false (!ev_is_active (w)))
2854 return; 2961 return;
2855 2962
2856 EV_FREQUENT_CHECK; 2963 EV_FREQUENT_CHECK;
2857 2964
2858 ev_io_stop (EV_A_ &w->io); 2965 ev_io_stop (EV_A_ &w->io);
2859 ev_prepare_stop (EV_A_ &w->prepare); 2966 ev_prepare_stop (EV_A_ &w->prepare);
2860 2967 ev_fork_stop (EV_A_ &w->fork);
2861 ev_stop (EV_A_ (W)w);
2862 2968
2863 EV_FREQUENT_CHECK; 2969 EV_FREQUENT_CHECK;
2864} 2970}
2865#endif 2971#endif
2866 2972
… …
2963once_cb (EV_P_ struct ev_once *once, int revents) 3069once_cb (EV_P_ struct ev_once *once, int revents)
2964{ 3070{
2965 void (*cb)(int revents, void *arg) = once->cb; 3071 void (*cb)(int revents, void *arg) = once->cb;
2966 void *arg = once->arg; 3072 void *arg = once->arg;
2967 3073
2968 ev_io_stop (EV_A_ &once->io); 3074 ev_io_stop (EV_A_ &once->io);
2969 ev_timer_stop (EV_A_ &once->to); 3075 ev_timer_stop (EV_A_ &once->to);
2970 ev_free (once); 3076 ev_free (once);
2971 3077
2972 cb (revents, arg); 3078 cb (revents, arg);
2973} 3079}
2974 3080
2975static void 3081static void
2976once_cb_io (EV_P_ ev_io *w, int revents) 3082once_cb_io (EV_P_ ev_io *w, int revents)
2977{ 3083{
2978 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3084 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3085
3086 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
2979} 3087}
2980 3088
2981static void 3089static void
2982once_cb_to (EV_P_ ev_timer *w, int revents) 3090once_cb_to (EV_P_ ev_timer *w, int revents)
2983{ 3091{
2984 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3092 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3093
3094 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
2985} 3095}
2986 3096
2987void 3097void
2988ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3098ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
2989{ 3099{

Diff Legend

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