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.276 by root, Sun Dec 14 13:03:54 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
… …
806 839
807 for (fd = 0; fd < anfdmax; ++fd) 840 for (fd = 0; fd < anfdmax; ++fd)
808 if (anfds [fd].events) 841 if (anfds [fd].events)
809 { 842 {
810 anfds [fd].events = 0; 843 anfds [fd].events = 0;
844 anfds [fd].emask = 0;
811 fd_change (EV_A_ fd, EV_IOFDSET | 1); 845 fd_change (EV_A_ fd, EV_IOFDSET | 1);
812 } 846 }
813} 847}
814 848
815/*****************************************************************************/ 849/*****************************************************************************/
… …
997 } 1031 }
998 else 1032 else
999#endif 1033#endif
1000 { 1034 {
1001 while (pipe (evpipe)) 1035 while (pipe (evpipe))
1002 syserr ("(libev) error creating signal/async pipe"); 1036 ev_syserr ("(libev) error creating signal/async pipe");
1003 1037
1004 fd_intern (evpipe [0]); 1038 fd_intern (evpipe [0]);
1005 fd_intern (evpipe [1]); 1039 fd_intern (evpipe [1]);
1006 ev_io_set (&pipeev, evpipe [0], EV_READ); 1040 ev_io_set (&pipeev, evpipe [0], EV_READ);
1007 } 1041 }
… …
1236 /* kqueue is borked on everything but netbsd apparently */ 1270 /* kqueue is borked on everything but netbsd apparently */
1237 /* it usually doesn't work correctly on anything but sockets and pipes */ 1271 /* it usually doesn't work correctly on anything but sockets and pipes */
1238 flags &= ~EVBACKEND_KQUEUE; 1272 flags &= ~EVBACKEND_KQUEUE;
1239#endif 1273#endif
1240#ifdef __APPLE__ 1274#ifdef __APPLE__
1241 // flags &= ~EVBACKEND_KQUEUE; for documentation 1275 // flags &= ~EVBACKEND_KQUEUE & ~EVBACKEND_POLL; for documentation
1242 flags &= ~EVBACKEND_POLL; 1276 flags &= ~EVBACKEND_SELECT;
1243#endif 1277#endif
1244 1278
1245 return flags; 1279 return flags;
1246} 1280}
1247 1281
… …
1655{ 1689{
1656#if EV_MULTIPLICITY 1690#if EV_MULTIPLICITY
1657 struct ev_loop *loop = ev_default_loop_ptr; 1691 struct ev_loop *loop = ev_default_loop_ptr;
1658#endif 1692#endif
1659 1693
1660 if (backend)
1661 postfork = 1; /* must be in line with ev_loop_fork */ 1694 postfork = 1; /* must be in line with ev_loop_fork */
1662} 1695}
1663 1696
1664/*****************************************************************************/ 1697/*****************************************************************************/
1665 1698
1666void 1699void
… …
2411# ifdef _WIN32 2444# ifdef _WIN32
2412# undef lstat 2445# undef lstat
2413# define lstat(a,b) _stati64 (a,b) 2446# define lstat(a,b) _stati64 (a,b)
2414# endif 2447# endif
2415 2448
2416#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 */
2417#define MIN_STAT_INTERVAL 0.1074891 2451#define MIN_STAT_INTERVAL 0.1074891
2418 2452
2419static 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);
2420 2454
2421#if EV_USE_INOTIFY 2455#if EV_USE_INOTIFY
2422# define EV_INOTIFY_BUFSIZE 8192 2456# define EV_INOTIFY_BUFSIZE 8192
… …
2426{ 2460{
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); 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);
2428 2462
2429 if (w->wd < 0) 2463 if (w->wd < 0)
2430 { 2464 {
2465 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 */ 2466 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2432 2467
2433 /* monitor some parent directory for speedup hints */ 2468 /* monitor some parent directory for speedup hints */
2434 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2469 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2435 /* but an efficiency issue only */ 2470 /* but an efficiency issue only */
2436 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2471 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2437 { 2472 {
2438 char path [4096]; 2473 char path [4096];
2439 strcpy (path, w->path); 2474 strcpy (path, w->path);
… …
2443 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2478 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2444 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2479 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2445 2480
2446 char *pend = strrchr (path, '/'); 2481 char *pend = strrchr (path, '/');
2447 2482
2448 if (!pend) 2483 if (!pend || pend == path)
2449 break; /* whoops, no '/', complain to your admin */ 2484 break;
2450 2485
2451 *pend = 0; 2486 *pend = 0;
2452 w->wd = inotify_add_watch (fs_fd, path, mask); 2487 w->wd = inotify_add_watch (fs_fd, path, mask);
2453 } 2488 }
2454 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2489 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2455 } 2490 }
2456 } 2491 }
2457 else
2458 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2459 2492
2460 if (w->wd >= 0) 2493 if (w->wd >= 0)
2494 {
2461 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 }
2462} 2514}
2463 2515
2464static void noinline 2516static void noinline
2465infy_del (EV_P_ ev_stat *w) 2517infy_del (EV_P_ ev_stat *w)
2466{ 2518{
… …
2496 2548
2497 if (w->wd == wd || wd == -1) 2549 if (w->wd == wd || wd == -1)
2498 { 2550 {
2499 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2551 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2500 { 2552 {
2553 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2501 w->wd = -1; 2554 w->wd = -1;
2502 infy_add (EV_A_ w); /* re-add, no matter what */ 2555 infy_add (EV_A_ w); /* re-add, no matter what */
2503 } 2556 }
2504 2557
2505 stat_timer_cb (EV_A_ &w->timer, 0); 2558 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2519 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)
2520 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2573 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2521} 2574}
2522 2575
2523void inline_size 2576void inline_size
2524infy_init (EV_P) 2577check_2625 (EV_P)
2525{ 2578{
2526 if (fs_fd != -2)
2527 return;
2528
2529 /* kernels < 2.6.25 are borked 2579 /* kernels < 2.6.25 are borked
2530 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 2580 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2531 */ 2581 */
2532 {
2533 struct utsname buf; 2582 struct utsname buf;
2534 int major, minor, micro; 2583 int major, minor, micro;
2535 2584
2536 fs_fd = -1;
2537
2538 if (uname (&buf)) 2585 if (uname (&buf))
2539 return; 2586 return;
2540 2587
2541 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3) 2588 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2542 return; 2589 return;
2543 2590
2544 if (major < 2 2591 if (major < 2
2545 || (major == 2 && minor < 6) 2592 || (major == 2 && minor < 6)
2546 || (major == 2 && minor == 6 && micro < 25)) 2593 || (major == 2 && minor == 6 && micro < 25))
2547 return; 2594 return;
2548 } 2595
2596 fs_2625 = 1;
2597}
2598
2599void inline_size
2600infy_init (EV_P)
2601{
2602 if (fs_fd != -2)
2603 return;
2604
2605 fs_fd = -1;
2606
2607 check_2625 (EV_A);
2549 2608
2550 fs_fd = inotify_init (); 2609 fs_fd = inotify_init ();
2551 2610
2552 if (fs_fd >= 0) 2611 if (fs_fd >= 0)
2553 { 2612 {
… …
2581 w->wd = -1; 2640 w->wd = -1;
2582 2641
2583 if (fs_fd >= 0) 2642 if (fs_fd >= 0)
2584 infy_add (EV_A_ w); /* re-add, no matter what */ 2643 infy_add (EV_A_ w); /* re-add, no matter what */
2585 else 2644 else
2586 ev_timer_start (EV_A_ &w->timer); 2645 ev_timer_again (EV_A_ &w->timer);
2587 } 2646 }
2588 } 2647 }
2589} 2648}
2590 2649
2591#endif 2650#endif
… …
2646ev_stat_start (EV_P_ ev_stat *w) 2705ev_stat_start (EV_P_ ev_stat *w)
2647{ 2706{
2648 if (expect_false (ev_is_active (w))) 2707 if (expect_false (ev_is_active (w)))
2649 return; 2708 return;
2650 2709
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); 2710 ev_stat_stat (EV_A_ w);
2656 2711
2712 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2657 if (w->interval < MIN_STAT_INTERVAL) 2713 w->interval = MIN_STAT_INTERVAL;
2658 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2659 2714
2660 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);
2661 ev_set_priority (&w->timer, ev_priority (w)); 2716 ev_set_priority (&w->timer, ev_priority (w));
2662 2717
2663#if EV_USE_INOTIFY 2718#if EV_USE_INOTIFY
2664 infy_init (EV_A); 2719 infy_init (EV_A);
2665 2720
2666 if (fs_fd >= 0) 2721 if (fs_fd >= 0)
2667 infy_add (EV_A_ w); 2722 infy_add (EV_A_ w);
2668 else 2723 else
2669#endif 2724#endif
2670 ev_timer_start (EV_A_ &w->timer); 2725 ev_timer_again (EV_A_ &w->timer);
2671 2726
2672 ev_start (EV_A_ (W)w, 1); 2727 ev_start (EV_A_ (W)w, 1);
2673 2728
2674 EV_FREQUENT_CHECK; 2729 EV_FREQUENT_CHECK;
2675} 2730}

Diff Legend

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