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

Comparing libev/ev.c (file contents):
Revision 1.268 by root, Mon Oct 27 13:39:18 2008 UTC vs.
Revision 1.274 by root, Thu Nov 20 00:35:10 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
… …
164# endif 176# endif
165#endif 177#endif
166 178
167/* 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 */
168 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
169#ifndef EV_USE_MONOTONIC 189#ifndef EV_USE_MONOTONIC
170# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 190# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
171# define EV_USE_MONOTONIC 1 191# define EV_USE_MONOTONIC 1
172# else 192# else
173# define EV_USE_MONOTONIC 0 193# define EV_USE_MONOTONIC 0
… …
287# endif 307# endif
288#endif 308#endif
289 309
290#if EV_USE_INOTIFY 310#if EV_USE_INOTIFY
291# include <sys/utsname.h> 311# include <sys/utsname.h>
312# include <sys/statfs.h>
292# include <sys/inotify.h> 313# include <sys/inotify.h>
293/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 314/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
294# ifndef IN_DONT_FOLLOW 315# ifndef IN_DONT_FOLLOW
295# undef EV_USE_INOTIFY 316# undef EV_USE_INOTIFY
296# define EV_USE_INOTIFY 0 317# define EV_USE_INOTIFY 0
297# endif 318# endif
298#endif 319#endif
299 320
300#if EV_SELECT_IS_WINSOCKET 321#if EV_SELECT_IS_WINSOCKET
301# 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
302#endif 332#endif
303 333
304#if EV_USE_EVENTFD 334#if EV_USE_EVENTFD
305/* 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 */
306# include <stdint.h> 336# include <stdint.h>
… …
388{ 418{
389 syserr_cb = cb; 419 syserr_cb = cb;
390} 420}
391 421
392static void noinline 422static void noinline
393syserr (const char *msg) 423ev_syserr (const char *msg)
394{ 424{
395 if (!msg) 425 if (!msg)
396 msg = "(libev) system error"; 426 msg = "(libev) system error";
397 427
398 if (syserr_cb) 428 if (syserr_cb)
… …
450{ 480{
451 WL head; 481 WL head;
452 unsigned char events; 482 unsigned char events;
453 unsigned char reify; 483 unsigned char reify;
454 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 484 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
485 unsigned char unused;
486#if EV_USE_EPOLL
455 unsigned char egen; /* generation counter to counter epoll bugs */ 487 unsigned int egen; /* generation counter to counter epoll bugs */
488#endif
456#if EV_SELECT_IS_WINSOCKET 489#if EV_SELECT_IS_WINSOCKET
457 SOCKET handle; 490 SOCKET handle;
458#endif 491#endif
459} ANFD; 492} ANFD;
460 493
… …
998 } 1031 }
999 else 1032 else
1000#endif 1033#endif
1001 { 1034 {
1002 while (pipe (evpipe)) 1035 while (pipe (evpipe))
1003 syserr ("(libev) error creating signal/async pipe"); 1036 ev_syserr ("(libev) error creating signal/async pipe");
1004 1037
1005 fd_intern (evpipe [0]); 1038 fd_intern (evpipe [0]);
1006 fd_intern (evpipe [1]); 1039 fd_intern (evpipe [1]);
1007 ev_io_set (&pipeev, evpipe [0], EV_READ); 1040 ev_io_set (&pipeev, evpipe [0], EV_READ);
1008 } 1041 }
… …
1656{ 1689{
1657#if EV_MULTIPLICITY 1690#if EV_MULTIPLICITY
1658 struct ev_loop *loop = ev_default_loop_ptr; 1691 struct ev_loop *loop = ev_default_loop_ptr;
1659#endif 1692#endif
1660 1693
1661 if (backend)
1662 postfork = 1; /* must be in line with ev_loop_fork */ 1694 postfork = 1; /* must be in line with ev_loop_fork */
1663} 1695}
1664 1696
1665/*****************************************************************************/ 1697/*****************************************************************************/
1666 1698
1667void 1699void
… …
2412# ifdef _WIN32 2444# ifdef _WIN32
2413# undef lstat 2445# undef lstat
2414# define lstat(a,b) _stati64 (a,b) 2446# define lstat(a,b) _stati64 (a,b)
2415# endif 2447# endif
2416 2448
2417#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 */
2418#define MIN_STAT_INTERVAL 0.1074891 2451#define MIN_STAT_INTERVAL 0.1074891
2419 2452
2420static 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);
2421 2454
2422#if EV_USE_INOTIFY 2455#if EV_USE_INOTIFY
2423# define EV_INOTIFY_BUFSIZE 8192 2456# define EV_INOTIFY_BUFSIZE 8192
… …
2427{ 2460{
2428 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);
2429 2462
2430 if (w->wd < 0) 2463 if (w->wd < 0)
2431 { 2464 {
2465 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2432 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 */
2433 2467
2434 /* monitor some parent directory for speedup hints */ 2468 /* monitor some parent directory for speedup hints */
2435 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2469 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2436 /* but an efficiency issue only */ 2470 /* but an efficiency issue only */
2437 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2471 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2438 { 2472 {
2439 char path [4096]; 2473 char path [4096];
2440 strcpy (path, w->path); 2474 strcpy (path, w->path);
… …
2454 } 2488 }
2455 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2489 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2456 } 2490 }
2457 } 2491 }
2458 else 2492 else
2459 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */ 2493 {
2460
2461 if (w->wd >= 0)
2462 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2494 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2495
2496 /* now local changes will be tracked by inotify, but remote changes won't */
2497 /* unless the filesystem it known to be local, we therefore still poll */
2498 /* also do poll on <2.6.25, but with normal frequency */
2499 struct statfs sfs;
2500
2501 if (fs_2625 && !statfs (w->path, &sfs))
2502 if (sfs.f_type == 0x1373 /* devfs */
2503 || sfs.f_type == 0xEF53 /* ext2/3 */
2504 || sfs.f_type == 0x3153464a /* jfs */
2505 || sfs.f_type == 0x52654973 /* reiser3 */
2506 || sfs.f_type == 0x01021994 /* tempfs */
2507 || sfs.f_type == 0x58465342 /* xfs */)
2508 return;
2509
2510 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2511 ev_timer_again (EV_A_ &w->timer);
2512 }
2463} 2513}
2464 2514
2465static void noinline 2515static void noinline
2466infy_del (EV_P_ ev_stat *w) 2516infy_del (EV_P_ ev_stat *w)
2467{ 2517{
… …
2520 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2570 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2521 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2571 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2522} 2572}
2523 2573
2524void inline_size 2574void inline_size
2525infy_init (EV_P) 2575check_2625 (EV_P)
2526{ 2576{
2527 if (fs_fd != -2)
2528 return;
2529
2530 /* kernels < 2.6.25 are borked 2577 /* kernels < 2.6.25 are borked
2531 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 2578 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2532 */ 2579 */
2533 {
2534 struct utsname buf; 2580 struct utsname buf;
2535 int major, minor, micro; 2581 int major, minor, micro;
2536 2582
2537 fs_fd = -1;
2538
2539 if (uname (&buf)) 2583 if (uname (&buf))
2540 return; 2584 return;
2541 2585
2542 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3) 2586 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2543 return; 2587 return;
2544 2588
2545 if (major < 2 2589 if (major < 2
2546 || (major == 2 && minor < 6) 2590 || (major == 2 && minor < 6)
2547 || (major == 2 && minor == 6 && micro < 25)) 2591 || (major == 2 && minor == 6 && micro < 25))
2548 return; 2592 return;
2549 } 2593
2594 fs_2625 = 1;
2595}
2596
2597void inline_size
2598infy_init (EV_P)
2599{
2600 if (fs_fd != -2)
2601 return;
2602
2603 fs_fd = -1;
2604
2605 check_2625 (EV_A);
2550 2606
2551 fs_fd = inotify_init (); 2607 fs_fd = inotify_init ();
2552 2608
2553 if (fs_fd >= 0) 2609 if (fs_fd >= 0)
2554 { 2610 {
… …
2582 w->wd = -1; 2638 w->wd = -1;
2583 2639
2584 if (fs_fd >= 0) 2640 if (fs_fd >= 0)
2585 infy_add (EV_A_ w); /* re-add, no matter what */ 2641 infy_add (EV_A_ w); /* re-add, no matter what */
2586 else 2642 else
2587 ev_timer_start (EV_A_ &w->timer); 2643 ev_timer_again (EV_A_ &w->timer);
2588 } 2644 }
2589 } 2645 }
2590} 2646}
2591 2647
2592#endif 2648#endif
… …
2647ev_stat_start (EV_P_ ev_stat *w) 2703ev_stat_start (EV_P_ ev_stat *w)
2648{ 2704{
2649 if (expect_false (ev_is_active (w))) 2705 if (expect_false (ev_is_active (w)))
2650 return; 2706 return;
2651 2707
2652 /* since we use memcmp, we need to clear any padding data etc. */
2653 memset (&w->prev, 0, sizeof (ev_statdata));
2654 memset (&w->attr, 0, sizeof (ev_statdata));
2655
2656 ev_stat_stat (EV_A_ w); 2708 ev_stat_stat (EV_A_ w);
2657 2709
2710 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2658 if (w->interval < MIN_STAT_INTERVAL) 2711 w->interval = MIN_STAT_INTERVAL;
2659 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2660 2712
2661 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 2713 ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2662 ev_set_priority (&w->timer, ev_priority (w)); 2714 ev_set_priority (&w->timer, ev_priority (w));
2663 2715
2664#if EV_USE_INOTIFY 2716#if EV_USE_INOTIFY
2665 infy_init (EV_A); 2717 infy_init (EV_A);
2666 2718
2667 if (fs_fd >= 0) 2719 if (fs_fd >= 0)
2668 infy_add (EV_A_ w); 2720 infy_add (EV_A_ w);
2669 else 2721 else
2670#endif 2722#endif
2671 ev_timer_start (EV_A_ &w->timer); 2723 ev_timer_again (EV_A_ &w->timer);
2672 2724
2673 ev_start (EV_A_ (W)w, 1); 2725 ev_start (EV_A_ (W)w, 1);
2674 2726
2675 EV_FREQUENT_CHECK; 2727 EV_FREQUENT_CHECK;
2676} 2728}

Diff Legend

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