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

Comparing libev/ev.c (file contents):
Revision 1.314 by root, Wed Aug 26 17:31:20 2009 UTC vs.
Revision 1.335 by root, Tue Mar 9 09:02:03 2010 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
110# define EV_USE_EPOLL 0 110# define EV_USE_EPOLL 0
111# endif 111# endif
112# endif 112# endif
113 113
114# ifndef EV_USE_KQUEUE 114# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
116# define EV_USE_KQUEUE 1 116# define EV_USE_KQUEUE 1
117# else 117# else
118# define EV_USE_KQUEUE 0 118# define EV_USE_KQUEUE 0
119# endif 119# endif
120# endif 120# endif
… …
153 153
154#endif 154#endif
155 155
156#include <math.h> 156#include <math.h>
157#include <stdlib.h> 157#include <stdlib.h>
158#include <string.h>
158#include <fcntl.h> 159#include <fcntl.h>
159#include <stddef.h> 160#include <stddef.h>
160 161
161#include <stdio.h> 162#include <stdio.h>
162 163
163#include <assert.h> 164#include <assert.h>
164#include <errno.h> 165#include <errno.h>
165#include <sys/types.h> 166#include <sys/types.h>
166#include <time.h> 167#include <time.h>
168#include <limits.h>
167 169
168#include <signal.h> 170#include <signal.h>
169 171
170#ifdef EV_H 172#ifdef EV_H
171# include EV_H 173# include EV_H
… …
182# define WIN32_LEAN_AND_MEAN 184# define WIN32_LEAN_AND_MEAN
183# include <windows.h> 185# include <windows.h>
184# ifndef EV_SELECT_IS_WINSOCKET 186# ifndef EV_SELECT_IS_WINSOCKET
185# define EV_SELECT_IS_WINSOCKET 1 187# define EV_SELECT_IS_WINSOCKET 1
186# endif 188# endif
189# undef EV_AVOID_STDIO
187#endif 190#endif
188 191
189/* this block tries to deduce configuration from header-defined symbols and defaults */ 192/* this block tries to deduce configuration from header-defined symbols and defaults */
190 193
191/* try to deduce the maximum number of signals on this platform */ 194/* try to deduce the maximum number of signals on this platform */
… …
343# endif 346# endif
344#endif 347#endif
345 348
346/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 349/* this block fixes any misconfiguration where we know we run into trouble otherwise */
347 350
351#ifdef _AIX
352/* AIX has a completely broken poll.h header */
353# undef EV_USE_POLL
354# define EV_USE_POLL 0
355#endif
356
348#ifndef CLOCK_MONOTONIC 357#ifndef CLOCK_MONOTONIC
349# undef EV_USE_MONOTONIC 358# undef EV_USE_MONOTONIC
350# define EV_USE_MONOTONIC 0 359# define EV_USE_MONOTONIC 0
351#endif 360#endif
352 361
… …
395# endif 404# endif
396# endif 405# endif
397# ifdef __cplusplus 406# ifdef __cplusplus
398extern "C" { 407extern "C" {
399# endif 408# endif
400int eventfd (unsigned int initval, int flags); 409int (eventfd) (unsigned int initval, int flags);
401# ifdef __cplusplus 410# ifdef __cplusplus
402} 411}
403# endif 412# endif
404#endif 413#endif
405 414
… …
450 */ 459 */
451#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 460#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
452 461
453#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 462#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
454#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 463#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
455/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
456 464
457#if __GNUC__ >= 4 465#if __GNUC__ >= 4
458# define expect(expr,value) __builtin_expect ((expr),(value)) 466# define expect(expr,value) __builtin_expect ((expr),(value))
459# define noinline __attribute__ ((noinline)) 467# define noinline __attribute__ ((noinline))
460#else 468#else
… …
505 513
506#ifndef EV_FD_TO_WIN32_HANDLE 514#ifndef EV_FD_TO_WIN32_HANDLE
507# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd) 515# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
508#endif 516#endif
509#ifndef EV_WIN32_HANDLE_TO_FD 517#ifndef EV_WIN32_HANDLE_TO_FD
510# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0) 518# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
511#endif 519#endif
512#ifndef EV_WIN32_CLOSE_FD 520#ifndef EV_WIN32_CLOSE_FD
513# define EV_WIN32_CLOSE_FD(fd) close (fd) 521# define EV_WIN32_CLOSE_FD(fd) close (fd)
514#endif 522#endif
515 523
516#ifdef _WIN32 524#ifdef _WIN32
517# include "ev_win32.c" 525# include "ev_win32.c"
518#endif 526#endif
519 527
520/*****************************************************************************/ 528/*****************************************************************************/
529
530#if EV_AVOID_STDIO
531static void noinline
532ev_printerr (const char *msg)
533{
534 write (STDERR_FILENO, msg, strlen (msg));
535}
536#endif
521 537
522static void (*syserr_cb)(const char *msg); 538static void (*syserr_cb)(const char *msg);
523 539
524void 540void
525ev_set_syserr_cb (void (*cb)(const char *msg)) 541ev_set_syserr_cb (void (*cb)(const char *msg))
… …
535 551
536 if (syserr_cb) 552 if (syserr_cb)
537 syserr_cb (msg); 553 syserr_cb (msg);
538 else 554 else
539 { 555 {
556#if EV_AVOID_STDIO
557 const char *err = strerror (errno);
558
559 ev_printerr (msg);
560 ev_printerr (": ");
561 ev_printerr (err);
562 ev_printerr ("\n");
563#else
540 perror (msg); 564 perror (msg);
565#endif
541 abort (); 566 abort ();
542 } 567 }
543} 568}
544 569
545static void * 570static void *
546ev_realloc_emul (void *ptr, long size) 571ev_realloc_emul (void *ptr, long size)
547{ 572{
573#if __GLIBC__
574 return realloc (ptr, size);
575#else
548 /* some systems, notably openbsd and darwin, fail to properly 576 /* some systems, notably openbsd and darwin, fail to properly
549 * implement realloc (x, 0) (as required by both ansi c-98 and 577 * implement realloc (x, 0) (as required by both ansi c-89 and
550 * the single unix specification, so work around them here. 578 * the single unix specification, so work around them here.
551 */ 579 */
552 580
553 if (size) 581 if (size)
554 return realloc (ptr, size); 582 return realloc (ptr, size);
555 583
556 free (ptr); 584 free (ptr);
557 return 0; 585 return 0;
586#endif
558} 587}
559 588
560static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 589static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
561 590
562void 591void
… …
570{ 599{
571 ptr = alloc (ptr, size); 600 ptr = alloc (ptr, size);
572 601
573 if (!ptr && size) 602 if (!ptr && size)
574 { 603 {
604#if EV_AVOID_STDIO
605 ev_printerr ("libev: memory allocation failed, aborting.\n");
606#else
575 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 607 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
608#endif
576 abort (); 609 abort ();
577 } 610 }
578 611
579 return ptr; 612 return ptr;
580} 613}
… …
964/* check whether the given fd is atcually valid, for error recovery */ 997/* check whether the given fd is atcually valid, for error recovery */
965inline_size int 998inline_size int
966fd_valid (int fd) 999fd_valid (int fd)
967{ 1000{
968#ifdef _WIN32 1001#ifdef _WIN32
969 return _get_osfhandle (fd) != -1; 1002 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
970#else 1003#else
971 return fcntl (fd, F_GETFD) != -1; 1004 return fcntl (fd, F_GETFD) != -1;
972#endif 1005#endif
973} 1006}
974 1007
… …
1179inline_speed void 1212inline_speed void
1180fd_intern (int fd) 1213fd_intern (int fd)
1181{ 1214{
1182#ifdef _WIN32 1215#ifdef _WIN32
1183 unsigned long arg = 1; 1216 unsigned long arg = 1;
1184 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1217 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1185#else 1218#else
1186 fcntl (fd, F_SETFD, FD_CLOEXEC); 1219 fcntl (fd, F_SETFD, FD_CLOEXEC);
1187 fcntl (fd, F_SETFL, O_NONBLOCK); 1220 fcntl (fd, F_SETFL, O_NONBLOCK);
1188#endif 1221#endif
1189} 1222}
… …
1294{ 1327{
1295#if EV_MULTIPLICITY 1328#if EV_MULTIPLICITY
1296 EV_P = signals [signum - 1].loop; 1329 EV_P = signals [signum - 1].loop;
1297#endif 1330#endif
1298 1331
1299#if _WIN32 1332#ifdef _WIN32
1300 signal (signum, ev_sighandler); 1333 signal (signum, ev_sighandler);
1301#endif 1334#endif
1302 1335
1303 signals [signum - 1].pending = 1; 1336 signals [signum - 1].pending = 1;
1304 evpipe_write (EV_A_ &sig_pending); 1337 evpipe_write (EV_A_ &sig_pending);
… …
1605#endif 1638#endif
1606#if EV_USE_INOTIFY 1639#if EV_USE_INOTIFY
1607 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1640 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1608#endif 1641#endif
1609#if EV_USE_SIGNALFD 1642#if EV_USE_SIGNALFD
1610 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1643 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1611#endif 1644#endif
1612 1645
1613 if (!(flags & 0x0000ffffU)) 1646 if (!(flags & 0x0000ffffU))
1614 flags |= ev_recommended_backends (); 1647 flags |= ev_recommended_backends ();
1615 1648
… …
1659 } 1692 }
1660 } 1693 }
1661 1694
1662#if EV_USE_SIGNALFD 1695#if EV_USE_SIGNALFD
1663 if (ev_is_active (&sigfd_w)) 1696 if (ev_is_active (&sigfd_w))
1664 {
1665 /*ev_ref (EV_A);*/
1666 /*ev_io_stop (EV_A_ &sigfd_w);*/
1667
1668 close (sigfd); 1697 close (sigfd);
1669 }
1670#endif 1698#endif
1671 1699
1672#if EV_USE_INOTIFY 1700#if EV_USE_INOTIFY
1673 if (fs_fd >= 0) 1701 if (fs_fd >= 0)
1674 close (fs_fd); 1702 close (fs_fd);
… …
2162 ANHE_at_cache (*he); 2190 ANHE_at_cache (*he);
2163 } 2191 }
2164} 2192}
2165 2193
2166/* fetch new monotonic and realtime times from the kernel */ 2194/* fetch new monotonic and realtime times from the kernel */
2167/* also detetc if there was a timejump, and act accordingly */ 2195/* also detect if there was a timejump, and act accordingly */
2168inline_speed void 2196inline_speed void
2169time_update (EV_P_ ev_tstamp max_block) 2197time_update (EV_P_ ev_tstamp max_block)
2170{ 2198{
2171#if EV_USE_MONOTONIC 2199#if EV_USE_MONOTONIC
2172 if (expect_true (have_monotonic)) 2200 if (expect_true (have_monotonic))
… …
2506 2534
2507 if (expect_false (ev_is_active (w))) 2535 if (expect_false (ev_is_active (w)))
2508 return; 2536 return;
2509 2537
2510 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2538 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2511 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2539 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2512 2540
2513 EV_FREQUENT_CHECK; 2541 EV_FREQUENT_CHECK;
2514 2542
2515 ev_start (EV_A_ (W)w, 1); 2543 ev_start (EV_A_ (W)w, 1);
2516 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2544 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2586 timers [active] = timers [timercnt + HEAP0]; 2614 timers [active] = timers [timercnt + HEAP0];
2587 adjustheap (timers, timercnt, active); 2615 adjustheap (timers, timercnt, active);
2588 } 2616 }
2589 } 2617 }
2590 2618
2591 EV_FREQUENT_CHECK;
2592
2593 ev_at (w) -= mn_now; 2619 ev_at (w) -= mn_now;
2594 2620
2595 ev_stop (EV_A_ (W)w); 2621 ev_stop (EV_A_ (W)w);
2622
2623 EV_FREQUENT_CHECK;
2596} 2624}
2597 2625
2598void noinline 2626void noinline
2599ev_timer_again (EV_P_ ev_timer *w) 2627ev_timer_again (EV_P_ ev_timer *w)
2600{ 2628{
… …
2679 periodics [active] = periodics [periodiccnt + HEAP0]; 2707 periodics [active] = periodics [periodiccnt + HEAP0];
2680 adjustheap (periodics, periodiccnt, active); 2708 adjustheap (periodics, periodiccnt, active);
2681 } 2709 }
2682 } 2710 }
2683 2711
2684 EV_FREQUENT_CHECK;
2685
2686 ev_stop (EV_A_ (W)w); 2712 ev_stop (EV_A_ (W)w);
2713
2714 EV_FREQUENT_CHECK;
2687} 2715}
2688 2716
2689void noinline 2717void noinline
2690ev_periodic_again (EV_P_ ev_periodic *w) 2718ev_periodic_again (EV_P_ ev_periodic *w)
2691{ 2719{
… …
2752 if (!((WL)w)->next) 2780 if (!((WL)w)->next)
2753# if EV_USE_SIGNALFD 2781# if EV_USE_SIGNALFD
2754 if (sigfd < 0) /*TODO*/ 2782 if (sigfd < 0) /*TODO*/
2755# endif 2783# endif
2756 { 2784 {
2757# if _WIN32 2785# ifdef _WIN32
2786 evpipe_init (EV_A);
2787
2758 signal (w->signum, ev_sighandler); 2788 signal (w->signum, ev_sighandler);
2759# else 2789# else
2760 struct sigaction sa; 2790 struct sigaction sa;
2761 2791
2762 evpipe_init (EV_A); 2792 evpipe_init (EV_A);
… …
2793 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2823 signals [w->signum - 1].loop = 0; /* unattach from signal */
2794#endif 2824#endif
2795#if EV_USE_SIGNALFD 2825#if EV_USE_SIGNALFD
2796 if (sigfd >= 0) 2826 if (sigfd >= 0)
2797 { 2827 {
2798 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2828 sigset_t ss;
2829
2830 sigemptyset (&ss);
2831 sigaddset (&ss, w->signum);
2799 sigdelset (&sigfd_set, w->signum); 2832 sigdelset (&sigfd_set, w->signum);
2833
2800 signalfd (sigfd, &sigfd_set, 0); 2834 signalfd (sigfd, &sigfd_set, 0);
2801 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2835 sigprocmask (SIG_UNBLOCK, &ss, 0);
2802 /*TODO: maybe unblock signal? */
2803 } 2836 }
2804 else 2837 else
2805#endif 2838#endif
2806 signal (w->signum, SIG_DFL); 2839 signal (w->signum, SIG_DFL);
2807 } 2840 }
… …
2853#define MIN_STAT_INTERVAL 0.1074891 2886#define MIN_STAT_INTERVAL 0.1074891
2854 2887
2855static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2888static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2856 2889
2857#if EV_USE_INOTIFY 2890#if EV_USE_INOTIFY
2858# define EV_INOTIFY_BUFSIZE 8192 2891
2892/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2893# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2859 2894
2860static void noinline 2895static void noinline
2861infy_add (EV_P_ ev_stat *w) 2896infy_add (EV_P_ ev_stat *w)
2862{ 2897{
2863 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); 2898 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);
2864 2899
2865 if (w->wd < 0) 2900 if (w->wd >= 0)
2901 {
2902 struct statfs sfs;
2903
2904 /* now local changes will be tracked by inotify, but remote changes won't */
2905 /* unless the filesystem is known to be local, we therefore still poll */
2906 /* also do poll on <2.6.25, but with normal frequency */
2907
2908 if (!fs_2625)
2909 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2910 else if (!statfs (w->path, &sfs)
2911 && (sfs.f_type == 0x1373 /* devfs */
2912 || sfs.f_type == 0xEF53 /* ext2/3 */
2913 || sfs.f_type == 0x3153464a /* jfs */
2914 || sfs.f_type == 0x52654973 /* reiser3 */
2915 || sfs.f_type == 0x01021994 /* tempfs */
2916 || sfs.f_type == 0x58465342 /* xfs */))
2917 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2918 else
2919 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2866 { 2920 }
2921 else
2922 {
2923 /* can't use inotify, continue to stat */
2867 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2924 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2868 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2869 2925
2870 /* monitor some parent directory for speedup hints */ 2926 /* if path is not there, monitor some parent directory for speedup hints */
2871 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2927 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2872 /* but an efficiency issue only */ 2928 /* but an efficiency issue only */
2873 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2929 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2874 { 2930 {
2875 char path [4096]; 2931 char path [4096];
… …
2891 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2947 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2892 } 2948 }
2893 } 2949 }
2894 2950
2895 if (w->wd >= 0) 2951 if (w->wd >= 0)
2896 {
2897 struct statfs sfs;
2898
2899 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2952 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2900 2953
2901 /* now local changes will be tracked by inotify, but remote changes won't */ 2954 /* now re-arm timer, if required */
2902 /* unless the filesystem it known to be local, we therefore still poll */ 2955 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2903 /* also do poll on <2.6.25, but with normal frequency */
2904
2905 if (fs_2625 && !statfs (w->path, &sfs))
2906 if (sfs.f_type == 0x1373 /* devfs */
2907 || sfs.f_type == 0xEF53 /* ext2/3 */
2908 || sfs.f_type == 0x3153464a /* jfs */
2909 || sfs.f_type == 0x52654973 /* reiser3 */
2910 || sfs.f_type == 0x01021994 /* tempfs */
2911 || sfs.f_type == 0x58465342 /* xfs */)
2912 return;
2913
2914 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2915 ev_timer_again (EV_A_ &w->timer); 2956 ev_timer_again (EV_A_ &w->timer);
2916 } 2957 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2917} 2958}
2918 2959
2919static void noinline 2960static void noinline
2920infy_del (EV_P_ ev_stat *w) 2961infy_del (EV_P_ ev_stat *w)
2921{ 2962{
… …
2966 3007
2967static void 3008static void
2968infy_cb (EV_P_ ev_io *w, int revents) 3009infy_cb (EV_P_ ev_io *w, int revents)
2969{ 3010{
2970 char buf [EV_INOTIFY_BUFSIZE]; 3011 char buf [EV_INOTIFY_BUFSIZE];
2971 struct inotify_event *ev = (struct inotify_event *)buf;
2972 int ofs; 3012 int ofs;
2973 int len = read (fs_fd, buf, sizeof (buf)); 3013 int len = read (fs_fd, buf, sizeof (buf));
2974 3014
2975 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3015 for (ofs = 0; ofs < len; )
3016 {
3017 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2976 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3018 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3019 ofs += sizeof (struct inotify_event) + ev->len;
3020 }
3021}
3022
3023inline_size unsigned int
3024ev_linux_version (void)
3025{
3026 struct utsname buf;
3027 unsigned int v;
3028 int i;
3029 char *p = buf.release;
3030
3031 if (uname (&buf))
3032 return 0;
3033
3034 for (i = 3+1; --i; )
3035 {
3036 unsigned int c = 0;
3037
3038 for (;;)
3039 {
3040 if (*p >= '0' && *p <= '9')
3041 c = c * 10 + *p++ - '0';
3042 else
3043 {
3044 p += *p == '.';
3045 break;
3046 }
3047 }
3048
3049 v = (v << 8) | c;
3050 }
3051
3052 return v;
2977} 3053}
2978 3054
2979inline_size void 3055inline_size void
2980check_2625 (EV_P) 3056ev_check_2625 (EV_P)
2981{ 3057{
2982 /* kernels < 2.6.25 are borked 3058 /* kernels < 2.6.25 are borked
2983 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3059 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2984 */ 3060 */
2985 struct utsname buf; 3061 if (ev_linux_version () < 0x020619)
2986 int major, minor, micro;
2987
2988 if (uname (&buf))
2989 return; 3062 return;
2990 3063
2991 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2992 return;
2993
2994 if (major < 2
2995 || (major == 2 && minor < 6)
2996 || (major == 2 && minor == 6 && micro < 25))
2997 return;
2998
2999 fs_2625 = 1; 3064 fs_2625 = 1;
3065}
3066
3067inline_size int
3068infy_newfd (void)
3069{
3070#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3071 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3072 if (fd >= 0)
3073 return fd;
3074#endif
3075 return inotify_init ();
3000} 3076}
3001 3077
3002inline_size void 3078inline_size void
3003infy_init (EV_P) 3079infy_init (EV_P)
3004{ 3080{
3005 if (fs_fd != -2) 3081 if (fs_fd != -2)
3006 return; 3082 return;
3007 3083
3008 fs_fd = -1; 3084 fs_fd = -1;
3009 3085
3010 check_2625 (EV_A); 3086 ev_check_2625 (EV_A);
3011 3087
3012 fs_fd = inotify_init (); 3088 fs_fd = infy_newfd ();
3013 3089
3014 if (fs_fd >= 0) 3090 if (fs_fd >= 0)
3015 { 3091 {
3092 fd_intern (fs_fd);
3016 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3093 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
3017 ev_set_priority (&fs_w, EV_MAXPRI); 3094 ev_set_priority (&fs_w, EV_MAXPRI);
3018 ev_io_start (EV_A_ &fs_w); 3095 ev_io_start (EV_A_ &fs_w);
3096 ev_unref (EV_A);
3019 } 3097 }
3020} 3098}
3021 3099
3022inline_size void 3100inline_size void
3023infy_fork (EV_P) 3101infy_fork (EV_P)
… …
3025 int slot; 3103 int slot;
3026 3104
3027 if (fs_fd < 0) 3105 if (fs_fd < 0)
3028 return; 3106 return;
3029 3107
3108 ev_ref (EV_A);
3109 ev_io_stop (EV_A_ &fs_w);
3030 close (fs_fd); 3110 close (fs_fd);
3031 fs_fd = inotify_init (); 3111 fs_fd = infy_newfd ();
3112
3113 if (fs_fd >= 0)
3114 {
3115 fd_intern (fs_fd);
3116 ev_io_set (&fs_w, fs_fd, EV_READ);
3117 ev_io_start (EV_A_ &fs_w);
3118 ev_unref (EV_A);
3119 }
3032 3120
3033 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3121 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
3034 { 3122 {
3035 WL w_ = fs_hash [slot].head; 3123 WL w_ = fs_hash [slot].head;
3036 fs_hash [slot].head = 0; 3124 fs_hash [slot].head = 0;
… …
3043 w->wd = -1; 3131 w->wd = -1;
3044 3132
3045 if (fs_fd >= 0) 3133 if (fs_fd >= 0)
3046 infy_add (EV_A_ w); /* re-add, no matter what */ 3134 infy_add (EV_A_ w); /* re-add, no matter what */
3047 else 3135 else
3136 {
3137 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3138 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3048 ev_timer_again (EV_A_ &w->timer); 3139 ev_timer_again (EV_A_ &w->timer);
3140 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3141 }
3049 } 3142 }
3050 } 3143 }
3051} 3144}
3052 3145
3053#endif 3146#endif
… …
3070static void noinline 3163static void noinline
3071stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3164stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3072{ 3165{
3073 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3166 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3074 3167
3075 /* we copy this here each the time so that */ 3168 ev_statdata prev = w->attr;
3076 /* prev has the old value when the callback gets invoked */
3077 w->prev = w->attr;
3078 ev_stat_stat (EV_A_ w); 3169 ev_stat_stat (EV_A_ w);
3079 3170
3080 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3171 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3081 if ( 3172 if (
3082 w->prev.st_dev != w->attr.st_dev 3173 prev.st_dev != w->attr.st_dev
3083 || w->prev.st_ino != w->attr.st_ino 3174 || prev.st_ino != w->attr.st_ino
3084 || w->prev.st_mode != w->attr.st_mode 3175 || prev.st_mode != w->attr.st_mode
3085 || w->prev.st_nlink != w->attr.st_nlink 3176 || prev.st_nlink != w->attr.st_nlink
3086 || w->prev.st_uid != w->attr.st_uid 3177 || prev.st_uid != w->attr.st_uid
3087 || w->prev.st_gid != w->attr.st_gid 3178 || prev.st_gid != w->attr.st_gid
3088 || w->prev.st_rdev != w->attr.st_rdev 3179 || prev.st_rdev != w->attr.st_rdev
3089 || w->prev.st_size != w->attr.st_size 3180 || prev.st_size != w->attr.st_size
3090 || w->prev.st_atime != w->attr.st_atime 3181 || prev.st_atime != w->attr.st_atime
3091 || w->prev.st_mtime != w->attr.st_mtime 3182 || prev.st_mtime != w->attr.st_mtime
3092 || w->prev.st_ctime != w->attr.st_ctime 3183 || prev.st_ctime != w->attr.st_ctime
3093 ) { 3184 ) {
3185 /* we only update w->prev on actual differences */
3186 /* in case we test more often than invoke the callback, */
3187 /* to ensure that prev is always different to attr */
3188 w->prev = prev;
3189
3094 #if EV_USE_INOTIFY 3190 #if EV_USE_INOTIFY
3095 if (fs_fd >= 0) 3191 if (fs_fd >= 0)
3096 { 3192 {
3097 infy_del (EV_A_ w); 3193 infy_del (EV_A_ w);
3098 infy_add (EV_A_ w); 3194 infy_add (EV_A_ w);
… …
3123 3219
3124 if (fs_fd >= 0) 3220 if (fs_fd >= 0)
3125 infy_add (EV_A_ w); 3221 infy_add (EV_A_ w);
3126 else 3222 else
3127#endif 3223#endif
3224 {
3128 ev_timer_again (EV_A_ &w->timer); 3225 ev_timer_again (EV_A_ &w->timer);
3226 ev_unref (EV_A);
3227 }
3129 3228
3130 ev_start (EV_A_ (W)w, 1); 3229 ev_start (EV_A_ (W)w, 1);
3131 3230
3132 EV_FREQUENT_CHECK; 3231 EV_FREQUENT_CHECK;
3133} 3232}
… …
3142 EV_FREQUENT_CHECK; 3241 EV_FREQUENT_CHECK;
3143 3242
3144#if EV_USE_INOTIFY 3243#if EV_USE_INOTIFY
3145 infy_del (EV_A_ w); 3244 infy_del (EV_A_ w);
3146#endif 3245#endif
3246
3247 if (ev_is_active (&w->timer))
3248 {
3249 ev_ref (EV_A);
3147 ev_timer_stop (EV_A_ &w->timer); 3250 ev_timer_stop (EV_A_ &w->timer);
3251 }
3148 3252
3149 ev_stop (EV_A_ (W)w); 3253 ev_stop (EV_A_ (W)w);
3150 3254
3151 EV_FREQUENT_CHECK; 3255 EV_FREQUENT_CHECK;
3152} 3256}
… …
3371 EV_FREQUENT_CHECK; 3475 EV_FREQUENT_CHECK;
3372 3476
3373 ev_io_stop (EV_A_ &w->io); 3477 ev_io_stop (EV_A_ &w->io);
3374 ev_prepare_stop (EV_A_ &w->prepare); 3478 ev_prepare_stop (EV_A_ &w->prepare);
3375 ev_fork_stop (EV_A_ &w->fork); 3479 ev_fork_stop (EV_A_ &w->fork);
3480
3481 ev_stop (EV_A_ (W)w);
3376 3482
3377 EV_FREQUENT_CHECK; 3483 EV_FREQUENT_CHECK;
3378} 3484}
3379#endif 3485#endif
3380 3486

Diff Legend

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