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

Comparing libev/ev.c (file contents):
Revision 1.313 by root, Wed Aug 19 23:44:51 2009 UTC vs.
Revision 1.332 by root, Tue Mar 9 08:58:17 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 */
… …
302# define EV_USE_EVENTFD 0 305# define EV_USE_EVENTFD 0
303# endif 306# endif
304#endif 307#endif
305 308
306#ifndef EV_USE_SIGNALFD 309#ifndef EV_USE_SIGNALFD
307# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 310# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
308# define EV_USE_SIGNALFD 1 311# define EV_USE_SIGNALFD 1
309# else 312# else
310# define EV_USE_SIGNALFD 0 313# define EV_USE_SIGNALFD 0
311# endif 314# endif
312#endif 315#endif
… …
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
406#if EV_USE_SIGNALFD 415#if EV_USE_SIGNALFD
407# include <sys/signalfd.h> 416/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
417# include <stdint.h>
418# ifndef SFD_NONBLOCK
419# define SFD_NONBLOCK O_NONBLOCK
408#endif 420# endif
421# ifndef SFD_CLOEXEC
422# ifdef O_CLOEXEC
423# define SFD_CLOEXEC O_CLOEXEC
424# else
425# define SFD_CLOEXEC 02000000
426# endif
427# endif
428# ifdef __cplusplus
429extern "C" {
430# endif
431int signalfd (int fd, const sigset_t *mask, int flags);
432
433struct signalfd_siginfo
434{
435 uint32_t ssi_signo;
436 char pad[128 - sizeof (uint32_t)];
437};
438# ifdef __cplusplus
439}
440# endif
441#endif
442
409 443
410/**/ 444/**/
411 445
412#if EV_VERIFY >= 3 446#if EV_VERIFY >= 3
413# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 447# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
… …
425 */ 459 */
426#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 460#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
427 461
428#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) */
429#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) */
430/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
431 464
432#if __GNUC__ >= 4 465#if __GNUC__ >= 4
433# define expect(expr,value) __builtin_expect ((expr),(value)) 466# define expect(expr,value) __builtin_expect ((expr),(value))
434# define noinline __attribute__ ((noinline)) 467# define noinline __attribute__ ((noinline))
435#else 468#else
… …
480 513
481#ifndef EV_FD_TO_WIN32_HANDLE 514#ifndef EV_FD_TO_WIN32_HANDLE
482# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd) 515# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
483#endif 516#endif
484#ifndef EV_WIN32_HANDLE_TO_FD 517#ifndef EV_WIN32_HANDLE_TO_FD
485# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0) 518# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
486#endif 519#endif
487#ifndef EV_WIN32_CLOSE_FD 520#ifndef EV_WIN32_CLOSE_FD
488# define EV_WIN32_CLOSE_FD(fd) close (fd) 521# define EV_WIN32_CLOSE_FD(fd) close (fd)
489#endif 522#endif
490 523
491#ifdef _WIN32 524#ifdef _WIN32
492# include "ev_win32.c" 525# include "ev_win32.c"
493#endif 526#endif
494 527
495/*****************************************************************************/ 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
496 537
497static void (*syserr_cb)(const char *msg); 538static void (*syserr_cb)(const char *msg);
498 539
499void 540void
500ev_set_syserr_cb (void (*cb)(const char *msg)) 541ev_set_syserr_cb (void (*cb)(const char *msg))
… …
510 551
511 if (syserr_cb) 552 if (syserr_cb)
512 syserr_cb (msg); 553 syserr_cb (msg);
513 else 554 else
514 { 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
515 perror (msg); 564 perror (msg);
565#endif
516 abort (); 566 abort ();
517 } 567 }
518} 568}
519 569
520static void * 570static void *
… …
522{ 572{
523 /* some systems, notably openbsd and darwin, fail to properly 573 /* some systems, notably openbsd and darwin, fail to properly
524 * implement realloc (x, 0) (as required by both ansi c-98 and 574 * implement realloc (x, 0) (as required by both ansi c-98 and
525 * the single unix specification, so work around them here. 575 * the single unix specification, so work around them here.
526 */ 576 */
527
528 if (size) 577 if (size)
529 return realloc (ptr, size); 578 return realloc (ptr, size);
530 579
531 free (ptr); 580 free (ptr);
532 return 0; 581 return 0;
… …
545{ 594{
546 ptr = alloc (ptr, size); 595 ptr = alloc (ptr, size);
547 596
548 if (!ptr && size) 597 if (!ptr && size)
549 { 598 {
599#if EV_AVOID_STDIO
600 ev_printerr ("libev: memory allocation failed, aborting.\n");
601#else
550 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 602 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
603#endif
551 abort (); 604 abort ();
552 } 605 }
553 606
554 return ptr; 607 return ptr;
555} 608}
… …
939/* check whether the given fd is atcually valid, for error recovery */ 992/* check whether the given fd is atcually valid, for error recovery */
940inline_size int 993inline_size int
941fd_valid (int fd) 994fd_valid (int fd)
942{ 995{
943#ifdef _WIN32 996#ifdef _WIN32
944 return _get_osfhandle (fd) != -1; 997 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
945#else 998#else
946 return fcntl (fd, F_GETFD) != -1; 999 return fcntl (fd, F_GETFD) != -1;
947#endif 1000#endif
948} 1001}
949 1002
… …
1154inline_speed void 1207inline_speed void
1155fd_intern (int fd) 1208fd_intern (int fd)
1156{ 1209{
1157#ifdef _WIN32 1210#ifdef _WIN32
1158 unsigned long arg = 1; 1211 unsigned long arg = 1;
1159 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1212 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1160#else 1213#else
1161 fcntl (fd, F_SETFD, FD_CLOEXEC); 1214 fcntl (fd, F_SETFD, FD_CLOEXEC);
1162 fcntl (fd, F_SETFL, O_NONBLOCK); 1215 fcntl (fd, F_SETFL, O_NONBLOCK);
1163#endif 1216#endif
1164} 1217}
… …
1269{ 1322{
1270#if EV_MULTIPLICITY 1323#if EV_MULTIPLICITY
1271 EV_P = signals [signum - 1].loop; 1324 EV_P = signals [signum - 1].loop;
1272#endif 1325#endif
1273 1326
1274#if _WIN32 1327#ifdef _WIN32
1275 signal (signum, ev_sighandler); 1328 signal (signum, ev_sighandler);
1276#endif 1329#endif
1277 1330
1278 signals [signum - 1].pending = 1; 1331 signals [signum - 1].pending = 1;
1279 evpipe_write (EV_A_ &sig_pending); 1332 evpipe_write (EV_A_ &sig_pending);
… …
1580#endif 1633#endif
1581#if EV_USE_INOTIFY 1634#if EV_USE_INOTIFY
1582 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1635 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1583#endif 1636#endif
1584#if EV_USE_SIGNALFD 1637#if EV_USE_SIGNALFD
1585 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1638 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1586#endif 1639#endif
1587 1640
1588 if (!(flags & 0x0000ffffU)) 1641 if (!(flags & 0x0000ffffU))
1589 flags |= ev_recommended_backends (); 1642 flags |= ev_recommended_backends ();
1590 1643
… …
1634 } 1687 }
1635 } 1688 }
1636 1689
1637#if EV_USE_SIGNALFD 1690#if EV_USE_SIGNALFD
1638 if (ev_is_active (&sigfd_w)) 1691 if (ev_is_active (&sigfd_w))
1639 {
1640 /*ev_ref (EV_A);*/
1641 /*ev_io_stop (EV_A_ &sigfd_w);*/
1642
1643 close (sigfd); 1692 close (sigfd);
1644 }
1645#endif 1693#endif
1646 1694
1647#if EV_USE_INOTIFY 1695#if EV_USE_INOTIFY
1648 if (fs_fd >= 0) 1696 if (fs_fd >= 0)
1649 close (fs_fd); 1697 close (fs_fd);
… …
2137 ANHE_at_cache (*he); 2185 ANHE_at_cache (*he);
2138 } 2186 }
2139} 2187}
2140 2188
2141/* fetch new monotonic and realtime times from the kernel */ 2189/* fetch new monotonic and realtime times from the kernel */
2142/* also detetc if there was a timejump, and act accordingly */ 2190/* also detect if there was a timejump, and act accordingly */
2143inline_speed void 2191inline_speed void
2144time_update (EV_P_ ev_tstamp max_block) 2192time_update (EV_P_ ev_tstamp max_block)
2145{ 2193{
2146#if EV_USE_MONOTONIC 2194#if EV_USE_MONOTONIC
2147 if (expect_true (have_monotonic)) 2195 if (expect_true (have_monotonic))
… …
2481 2529
2482 if (expect_false (ev_is_active (w))) 2530 if (expect_false (ev_is_active (w)))
2483 return; 2531 return;
2484 2532
2485 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2533 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2486 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2534 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2487 2535
2488 EV_FREQUENT_CHECK; 2536 EV_FREQUENT_CHECK;
2489 2537
2490 ev_start (EV_A_ (W)w, 1); 2538 ev_start (EV_A_ (W)w, 1);
2491 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2539 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2561 timers [active] = timers [timercnt + HEAP0]; 2609 timers [active] = timers [timercnt + HEAP0];
2562 adjustheap (timers, timercnt, active); 2610 adjustheap (timers, timercnt, active);
2563 } 2611 }
2564 } 2612 }
2565 2613
2566 EV_FREQUENT_CHECK;
2567
2568 ev_at (w) -= mn_now; 2614 ev_at (w) -= mn_now;
2569 2615
2570 ev_stop (EV_A_ (W)w); 2616 ev_stop (EV_A_ (W)w);
2617
2618 EV_FREQUENT_CHECK;
2571} 2619}
2572 2620
2573void noinline 2621void noinline
2574ev_timer_again (EV_P_ ev_timer *w) 2622ev_timer_again (EV_P_ ev_timer *w)
2575{ 2623{
… …
2654 periodics [active] = periodics [periodiccnt + HEAP0]; 2702 periodics [active] = periodics [periodiccnt + HEAP0];
2655 adjustheap (periodics, periodiccnt, active); 2703 adjustheap (periodics, periodiccnt, active);
2656 } 2704 }
2657 } 2705 }
2658 2706
2659 EV_FREQUENT_CHECK;
2660
2661 ev_stop (EV_A_ (W)w); 2707 ev_stop (EV_A_ (W)w);
2708
2709 EV_FREQUENT_CHECK;
2662} 2710}
2663 2711
2664void noinline 2712void noinline
2665ev_periodic_again (EV_P_ ev_periodic *w) 2713ev_periodic_again (EV_P_ ev_periodic *w)
2666{ 2714{
… …
2727 if (!((WL)w)->next) 2775 if (!((WL)w)->next)
2728# if EV_USE_SIGNALFD 2776# if EV_USE_SIGNALFD
2729 if (sigfd < 0) /*TODO*/ 2777 if (sigfd < 0) /*TODO*/
2730# endif 2778# endif
2731 { 2779 {
2732# if _WIN32 2780# ifdef _WIN32
2781 evpipe_init (EV_A);
2782
2733 signal (w->signum, ev_sighandler); 2783 signal (w->signum, ev_sighandler);
2734# else 2784# else
2735 struct sigaction sa; 2785 struct sigaction sa;
2736 2786
2737 evpipe_init (EV_A); 2787 evpipe_init (EV_A);
… …
2768 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2818 signals [w->signum - 1].loop = 0; /* unattach from signal */
2769#endif 2819#endif
2770#if EV_USE_SIGNALFD 2820#if EV_USE_SIGNALFD
2771 if (sigfd >= 0) 2821 if (sigfd >= 0)
2772 { 2822 {
2773 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2823 sigset_t ss;
2824
2825 sigemptyset (&ss);
2826 sigaddset (&ss, w->signum);
2774 sigdelset (&sigfd_set, w->signum); 2827 sigdelset (&sigfd_set, w->signum);
2828
2775 signalfd (sigfd, &sigfd_set, 0); 2829 signalfd (sigfd, &sigfd_set, 0);
2776 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2830 sigprocmask (SIG_UNBLOCK, &ss, 0);
2777 /*TODO: maybe unblock signal? */
2778 } 2831 }
2779 else 2832 else
2780#endif 2833#endif
2781 signal (w->signum, SIG_DFL); 2834 signal (w->signum, SIG_DFL);
2782 } 2835 }
… …
2828#define MIN_STAT_INTERVAL 0.1074891 2881#define MIN_STAT_INTERVAL 0.1074891
2829 2882
2830static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2883static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2831 2884
2832#if EV_USE_INOTIFY 2885#if EV_USE_INOTIFY
2833# define EV_INOTIFY_BUFSIZE 8192 2886
2887/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2888# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2834 2889
2835static void noinline 2890static void noinline
2836infy_add (EV_P_ ev_stat *w) 2891infy_add (EV_P_ ev_stat *w)
2837{ 2892{
2838 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); 2893 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);
2839 2894
2840 if (w->wd < 0) 2895 if (w->wd >= 0)
2896 {
2897 struct statfs sfs;
2898
2899 /* now local changes will be tracked by inotify, but remote changes won't */
2900 /* unless the filesystem is known to be local, we therefore still poll */
2901 /* also do poll on <2.6.25, but with normal frequency */
2902
2903 if (!fs_2625)
2904 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2905 else if (!statfs (w->path, &sfs)
2906 && (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 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2913 else
2914 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2841 { 2915 }
2916 else
2917 {
2918 /* can't use inotify, continue to stat */
2842 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2919 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2843 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2844 2920
2845 /* monitor some parent directory for speedup hints */ 2921 /* if path is not there, monitor some parent directory for speedup hints */
2846 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2922 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2847 /* but an efficiency issue only */ 2923 /* but an efficiency issue only */
2848 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2924 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2849 { 2925 {
2850 char path [4096]; 2926 char path [4096];
… …
2866 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2942 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2867 } 2943 }
2868 } 2944 }
2869 2945
2870 if (w->wd >= 0) 2946 if (w->wd >= 0)
2871 {
2872 struct statfs sfs;
2873
2874 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2947 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2875 2948
2876 /* now local changes will be tracked by inotify, but remote changes won't */ 2949 /* now re-arm timer, if required */
2877 /* unless the filesystem it known to be local, we therefore still poll */ 2950 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2878 /* also do poll on <2.6.25, but with normal frequency */
2879
2880 if (fs_2625 && !statfs (w->path, &sfs))
2881 if (sfs.f_type == 0x1373 /* devfs */
2882 || sfs.f_type == 0xEF53 /* ext2/3 */
2883 || sfs.f_type == 0x3153464a /* jfs */
2884 || sfs.f_type == 0x52654973 /* reiser3 */
2885 || sfs.f_type == 0x01021994 /* tempfs */
2886 || sfs.f_type == 0x58465342 /* xfs */)
2887 return;
2888
2889 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2890 ev_timer_again (EV_A_ &w->timer); 2951 ev_timer_again (EV_A_ &w->timer);
2891 } 2952 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2892} 2953}
2893 2954
2894static void noinline 2955static void noinline
2895infy_del (EV_P_ ev_stat *w) 2956infy_del (EV_P_ ev_stat *w)
2896{ 2957{
… …
2941 3002
2942static void 3003static void
2943infy_cb (EV_P_ ev_io *w, int revents) 3004infy_cb (EV_P_ ev_io *w, int revents)
2944{ 3005{
2945 char buf [EV_INOTIFY_BUFSIZE]; 3006 char buf [EV_INOTIFY_BUFSIZE];
2946 struct inotify_event *ev = (struct inotify_event *)buf;
2947 int ofs; 3007 int ofs;
2948 int len = read (fs_fd, buf, sizeof (buf)); 3008 int len = read (fs_fd, buf, sizeof (buf));
2949 3009
2950 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3010 for (ofs = 0; ofs < len; )
3011 {
3012 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2951 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3013 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3014 ofs += sizeof (struct inotify_event) + ev->len;
3015 }
3016}
3017
3018inline_size unsigned int
3019ev_linux_version (void)
3020{
3021 struct utsname buf;
3022 unsigned int v;
3023 int i;
3024 char *p = buf.release;
3025
3026 if (uname (&buf))
3027 return 0;
3028
3029 for (i = 3+1; --i; )
3030 {
3031 unsigned int c = 0;
3032
3033 for (;;)
3034 {
3035 if (*p >= '0' && *p <= '9')
3036 c = c * 10 + *p++ - '0';
3037 else
3038 {
3039 p += *p == '.';
3040 break;
3041 }
3042 }
3043
3044 v = (v << 8) | c;
3045 }
3046
3047 return v;
2952} 3048}
2953 3049
2954inline_size void 3050inline_size void
2955check_2625 (EV_P) 3051ev_check_2625 (EV_P)
2956{ 3052{
2957 /* kernels < 2.6.25 are borked 3053 /* kernels < 2.6.25 are borked
2958 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3054 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2959 */ 3055 */
2960 struct utsname buf; 3056 if (ev_linux_version () < 0x020619)
2961 int major, minor, micro;
2962
2963 if (uname (&buf))
2964 return; 3057 return;
2965 3058
2966 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2967 return;
2968
2969 if (major < 2
2970 || (major == 2 && minor < 6)
2971 || (major == 2 && minor == 6 && micro < 25))
2972 return;
2973
2974 fs_2625 = 1; 3059 fs_2625 = 1;
3060}
3061
3062inline_size int
3063infy_newfd (void)
3064{
3065#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3066 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3067 if (fd >= 0)
3068 return fd;
3069#endif
3070 return inotify_init ();
2975} 3071}
2976 3072
2977inline_size void 3073inline_size void
2978infy_init (EV_P) 3074infy_init (EV_P)
2979{ 3075{
2980 if (fs_fd != -2) 3076 if (fs_fd != -2)
2981 return; 3077 return;
2982 3078
2983 fs_fd = -1; 3079 fs_fd = -1;
2984 3080
2985 check_2625 (EV_A); 3081 ev_check_2625 (EV_A);
2986 3082
2987 fs_fd = inotify_init (); 3083 fs_fd = infy_newfd ();
2988 3084
2989 if (fs_fd >= 0) 3085 if (fs_fd >= 0)
2990 { 3086 {
3087 fd_intern (fs_fd);
2991 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3088 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2992 ev_set_priority (&fs_w, EV_MAXPRI); 3089 ev_set_priority (&fs_w, EV_MAXPRI);
2993 ev_io_start (EV_A_ &fs_w); 3090 ev_io_start (EV_A_ &fs_w);
3091 ev_unref (EV_A);
2994 } 3092 }
2995} 3093}
2996 3094
2997inline_size void 3095inline_size void
2998infy_fork (EV_P) 3096infy_fork (EV_P)
… …
3000 int slot; 3098 int slot;
3001 3099
3002 if (fs_fd < 0) 3100 if (fs_fd < 0)
3003 return; 3101 return;
3004 3102
3103 ev_ref (EV_A);
3104 ev_io_stop (EV_A_ &fs_w);
3005 close (fs_fd); 3105 close (fs_fd);
3006 fs_fd = inotify_init (); 3106 fs_fd = infy_newfd ();
3107
3108 if (fs_fd >= 0)
3109 {
3110 fd_intern (fs_fd);
3111 ev_io_set (&fs_w, fs_fd, EV_READ);
3112 ev_io_start (EV_A_ &fs_w);
3113 ev_unref (EV_A);
3114 }
3007 3115
3008 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3116 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
3009 { 3117 {
3010 WL w_ = fs_hash [slot].head; 3118 WL w_ = fs_hash [slot].head;
3011 fs_hash [slot].head = 0; 3119 fs_hash [slot].head = 0;
… …
3018 w->wd = -1; 3126 w->wd = -1;
3019 3127
3020 if (fs_fd >= 0) 3128 if (fs_fd >= 0)
3021 infy_add (EV_A_ w); /* re-add, no matter what */ 3129 infy_add (EV_A_ w); /* re-add, no matter what */
3022 else 3130 else
3131 {
3132 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3133 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3023 ev_timer_again (EV_A_ &w->timer); 3134 ev_timer_again (EV_A_ &w->timer);
3135 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3136 }
3024 } 3137 }
3025 } 3138 }
3026} 3139}
3027 3140
3028#endif 3141#endif
… …
3045static void noinline 3158static void noinline
3046stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3159stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3047{ 3160{
3048 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3161 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3049 3162
3050 /* we copy this here each the time so that */ 3163 ev_statdata prev = w->attr;
3051 /* prev has the old value when the callback gets invoked */
3052 w->prev = w->attr;
3053 ev_stat_stat (EV_A_ w); 3164 ev_stat_stat (EV_A_ w);
3054 3165
3055 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3166 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3056 if ( 3167 if (
3057 w->prev.st_dev != w->attr.st_dev 3168 prev.st_dev != w->attr.st_dev
3058 || w->prev.st_ino != w->attr.st_ino 3169 || prev.st_ino != w->attr.st_ino
3059 || w->prev.st_mode != w->attr.st_mode 3170 || prev.st_mode != w->attr.st_mode
3060 || w->prev.st_nlink != w->attr.st_nlink 3171 || prev.st_nlink != w->attr.st_nlink
3061 || w->prev.st_uid != w->attr.st_uid 3172 || prev.st_uid != w->attr.st_uid
3062 || w->prev.st_gid != w->attr.st_gid 3173 || prev.st_gid != w->attr.st_gid
3063 || w->prev.st_rdev != w->attr.st_rdev 3174 || prev.st_rdev != w->attr.st_rdev
3064 || w->prev.st_size != w->attr.st_size 3175 || prev.st_size != w->attr.st_size
3065 || w->prev.st_atime != w->attr.st_atime 3176 || prev.st_atime != w->attr.st_atime
3066 || w->prev.st_mtime != w->attr.st_mtime 3177 || prev.st_mtime != w->attr.st_mtime
3067 || w->prev.st_ctime != w->attr.st_ctime 3178 || prev.st_ctime != w->attr.st_ctime
3068 ) { 3179 ) {
3180 /* we only update w->prev on actual differences */
3181 /* in case we test more often than invoke the callback, */
3182 /* to ensure that prev is always different to attr */
3183 w->prev = prev;
3184
3069 #if EV_USE_INOTIFY 3185 #if EV_USE_INOTIFY
3070 if (fs_fd >= 0) 3186 if (fs_fd >= 0)
3071 { 3187 {
3072 infy_del (EV_A_ w); 3188 infy_del (EV_A_ w);
3073 infy_add (EV_A_ w); 3189 infy_add (EV_A_ w);
… …
3098 3214
3099 if (fs_fd >= 0) 3215 if (fs_fd >= 0)
3100 infy_add (EV_A_ w); 3216 infy_add (EV_A_ w);
3101 else 3217 else
3102#endif 3218#endif
3219 {
3103 ev_timer_again (EV_A_ &w->timer); 3220 ev_timer_again (EV_A_ &w->timer);
3221 ev_unref (EV_A);
3222 }
3104 3223
3105 ev_start (EV_A_ (W)w, 1); 3224 ev_start (EV_A_ (W)w, 1);
3106 3225
3107 EV_FREQUENT_CHECK; 3226 EV_FREQUENT_CHECK;
3108} 3227}
… …
3117 EV_FREQUENT_CHECK; 3236 EV_FREQUENT_CHECK;
3118 3237
3119#if EV_USE_INOTIFY 3238#if EV_USE_INOTIFY
3120 infy_del (EV_A_ w); 3239 infy_del (EV_A_ w);
3121#endif 3240#endif
3241
3242 if (ev_is_active (&w->timer))
3243 {
3244 ev_ref (EV_A);
3122 ev_timer_stop (EV_A_ &w->timer); 3245 ev_timer_stop (EV_A_ &w->timer);
3246 }
3123 3247
3124 ev_stop (EV_A_ (W)w); 3248 ev_stop (EV_A_ (W)w);
3125 3249
3126 EV_FREQUENT_CHECK; 3250 EV_FREQUENT_CHECK;
3127} 3251}
… …
3346 EV_FREQUENT_CHECK; 3470 EV_FREQUENT_CHECK;
3347 3471
3348 ev_io_stop (EV_A_ &w->io); 3472 ev_io_stop (EV_A_ &w->io);
3349 ev_prepare_stop (EV_A_ &w->prepare); 3473 ev_prepare_stop (EV_A_ &w->prepare);
3350 ev_fork_stop (EV_A_ &w->fork); 3474 ev_fork_stop (EV_A_ &w->fork);
3475
3476 ev_stop (EV_A_ (W)w);
3351 3477
3352 EV_FREQUENT_CHECK; 3478 EV_FREQUENT_CHECK;
3353} 3479}
3354#endif 3480#endif
3355 3481

Diff Legend

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