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

Comparing libev/ev.c (file contents):
Revision 1.267 by root, Mon Oct 27 11:08:29 2008 UTC vs.
Revision 1.273 by root, Mon Nov 3 14:27:06 2008 UTC

… …
287# endif 287# endif
288#endif 288#endif
289 289
290#if EV_USE_INOTIFY 290#if EV_USE_INOTIFY
291# include <sys/utsname.h> 291# include <sys/utsname.h>
292# include <sys/statfs.h>
292# include <sys/inotify.h> 293# include <sys/inotify.h>
293/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 294/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
294# ifndef IN_DONT_FOLLOW 295# ifndef IN_DONT_FOLLOW
295# undef EV_USE_INOTIFY 296# undef EV_USE_INOTIFY
296# define EV_USE_INOTIFY 0 297# define EV_USE_INOTIFY 0
… …
388{ 389{
389 syserr_cb = cb; 390 syserr_cb = cb;
390} 391}
391 392
392static void noinline 393static void noinline
393syserr (const char *msg) 394ev_syserr (const char *msg)
394{ 395{
395 if (!msg) 396 if (!msg)
396 msg = "(libev) system error"; 397 msg = "(libev) system error";
397 398
398 if (syserr_cb) 399 if (syserr_cb)
… …
450{ 451{
451 WL head; 452 WL head;
452 unsigned char events; 453 unsigned char events;
453 unsigned char reify; 454 unsigned char reify;
454 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 455 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
456 unsigned char unused;
457#if EV_USE_EPOLL
455 unsigned char egen; /* generation counter to counter epoll bugs */ 458 unsigned int egen; /* generation counter to counter epoll bugs */
459#endif
456#if EV_SELECT_IS_WINSOCKET 460#if EV_SELECT_IS_WINSOCKET
457 SOCKET handle; 461 SOCKET handle;
458#endif 462#endif
459} ANFD; 463} ANFD;
460 464
… …
806 810
807 for (fd = 0; fd < anfdmax; ++fd) 811 for (fd = 0; fd < anfdmax; ++fd)
808 if (anfds [fd].events) 812 if (anfds [fd].events)
809 { 813 {
810 anfds [fd].events = 0; 814 anfds [fd].events = 0;
815 anfds [fd].emask = 0;
811 fd_change (EV_A_ fd, EV_IOFDSET | 1); 816 fd_change (EV_A_ fd, EV_IOFDSET | 1);
812 } 817 }
813} 818}
814 819
815/*****************************************************************************/ 820/*****************************************************************************/
… …
997 } 1002 }
998 else 1003 else
999#endif 1004#endif
1000 { 1005 {
1001 while (pipe (evpipe)) 1006 while (pipe (evpipe))
1002 syserr ("(libev) error creating signal/async pipe"); 1007 ev_syserr ("(libev) error creating signal/async pipe");
1003 1008
1004 fd_intern (evpipe [0]); 1009 fd_intern (evpipe [0]);
1005 fd_intern (evpipe [1]); 1010 fd_intern (evpipe [1]);
1006 ev_io_set (&pipeev, evpipe [0], EV_READ); 1011 ev_io_set (&pipeev, evpipe [0], EV_READ);
1007 } 1012 }
… …
1655{ 1660{
1656#if EV_MULTIPLICITY 1661#if EV_MULTIPLICITY
1657 struct ev_loop *loop = ev_default_loop_ptr; 1662 struct ev_loop *loop = ev_default_loop_ptr;
1658#endif 1663#endif
1659 1664
1660 if (backend)
1661 postfork = 1; /* must be in line with ev_loop_fork */ 1665 postfork = 1; /* must be in line with ev_loop_fork */
1662} 1666}
1663 1667
1664/*****************************************************************************/ 1668/*****************************************************************************/
1665 1669
1666void 1670void
… …
2411# ifdef _WIN32 2415# ifdef _WIN32
2412# undef lstat 2416# undef lstat
2413# define lstat(a,b) _stati64 (a,b) 2417# define lstat(a,b) _stati64 (a,b)
2414# endif 2418# endif
2415 2419
2416#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 */
2417#define MIN_STAT_INTERVAL 0.1074891 2422#define MIN_STAT_INTERVAL 0.1074891
2418 2423
2419static 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);
2420 2425
2421#if EV_USE_INOTIFY 2426#if EV_USE_INOTIFY
2422# define EV_INOTIFY_BUFSIZE 8192 2427# define EV_INOTIFY_BUFSIZE 8192
… …
2426{ 2431{
2427 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);
2428 2433
2429 if (w->wd < 0) 2434 if (w->wd < 0)
2430 { 2435 {
2436 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2431 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 */
2432 2438
2433 /* monitor some parent directory for speedup hints */ 2439 /* monitor some parent directory for speedup hints */
2434 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2440 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2435 /* but an efficiency issue only */ 2441 /* but an efficiency issue only */
2436 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2442 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2437 { 2443 {
2438 char path [4096]; 2444 char path [4096];
2439 strcpy (path, w->path); 2445 strcpy (path, w->path);
… …
2453 } 2459 }
2454 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2460 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2455 } 2461 }
2456 } 2462 }
2457 else 2463 else
2458 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */ 2464 {
2459
2460 if (w->wd >= 0)
2461 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 }
2462} 2484}
2463 2485
2464static void noinline 2486static void noinline
2465infy_del (EV_P_ ev_stat *w) 2487infy_del (EV_P_ ev_stat *w)
2466{ 2488{
… …
2519 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)
2520 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2542 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2521} 2543}
2522 2544
2523void inline_size 2545void inline_size
2524infy_init (EV_P) 2546check_2625 (EV_P)
2525{ 2547{
2526 if (fs_fd != -2)
2527 return;
2528
2529 /* kernels < 2.6.25 are borked 2548 /* kernels < 2.6.25 are borked
2530 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 2549 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2531 */ 2550 */
2532 {
2533 struct utsname buf; 2551 struct utsname buf;
2534 int major, minor, micro; 2552 int major, minor, micro;
2535 2553
2536 fs_fd = -1;
2537
2538 if (uname (&buf)) 2554 if (uname (&buf))
2539 return; 2555 return;
2540 2556
2541 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3) 2557 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2542 return; 2558 return;
2543 2559
2544 if (major < 2 2560 if (major < 2
2545 || (major == 2 && minor < 6) 2561 || (major == 2 && minor < 6)
2546 || (major == 2 && minor == 6 && micro < 25)) 2562 || (major == 2 && minor == 6 && micro < 25))
2547 return; 2563 return;
2548 } 2564
2565 fs_2625 = 1;
2566}
2567
2568void inline_size
2569infy_init (EV_P)
2570{
2571 if (fs_fd != -2)
2572 return;
2573
2574 fs_fd = -1;
2575
2576 check_2625 (EV_A);
2549 2577
2550 fs_fd = inotify_init (); 2578 fs_fd = inotify_init ();
2551 2579
2552 if (fs_fd >= 0) 2580 if (fs_fd >= 0)
2553 { 2581 {
… …
2581 w->wd = -1; 2609 w->wd = -1;
2582 2610
2583 if (fs_fd >= 0) 2611 if (fs_fd >= 0)
2584 infy_add (EV_A_ w); /* re-add, no matter what */ 2612 infy_add (EV_A_ w); /* re-add, no matter what */
2585 else 2613 else
2586 ev_timer_start (EV_A_ &w->timer); 2614 ev_timer_again (EV_A_ &w->timer);
2587 } 2615 }
2588 } 2616 }
2589} 2617}
2590 2618
2591#endif 2619#endif
… …
2646ev_stat_start (EV_P_ ev_stat *w) 2674ev_stat_start (EV_P_ ev_stat *w)
2647{ 2675{
2648 if (expect_false (ev_is_active (w))) 2676 if (expect_false (ev_is_active (w)))
2649 return; 2677 return;
2650 2678
2651 /* since we use memcmp, we need to clear any padding data etc. */
2652 memset (&w->prev, 0, sizeof (ev_statdata));
2653 memset (&w->attr, 0, sizeof (ev_statdata));
2654
2655 ev_stat_stat (EV_A_ w); 2679 ev_stat_stat (EV_A_ w);
2656 2680
2681 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2657 if (w->interval < MIN_STAT_INTERVAL) 2682 w->interval = MIN_STAT_INTERVAL;
2658 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2659 2683
2660 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);
2661 ev_set_priority (&w->timer, ev_priority (w)); 2685 ev_set_priority (&w->timer, ev_priority (w));
2662 2686
2663#if EV_USE_INOTIFY 2687#if EV_USE_INOTIFY
2664 infy_init (EV_A); 2688 infy_init (EV_A);
2665 2689
2666 if (fs_fd >= 0) 2690 if (fs_fd >= 0)
2667 infy_add (EV_A_ w); 2691 infy_add (EV_A_ w);
2668 else 2692 else
2669#endif 2693#endif
2670 ev_timer_start (EV_A_ &w->timer); 2694 ev_timer_again (EV_A_ &w->timer);
2671 2695
2672 ev_start (EV_A_ (W)w, 1); 2696 ev_start (EV_A_ (W)w, 1);
2673 2697
2674 EV_FREQUENT_CHECK; 2698 EV_FREQUENT_CHECK;
2675} 2699}

Diff Legend

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