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

Comparing libev/ev.c (file contents):
Revision 1.264 by root, Mon Oct 13 23:20:12 2008 UTC vs.
Revision 1.271 by root, Mon Nov 3 12:13:15 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)
… …
449typedef struct 450typedef struct
450{ 451{
451 WL head; 452 WL head;
452 unsigned char events; 453 unsigned char events;
453 unsigned char reify; 454 unsigned char reify;
455 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
456 unsigned char unused;
457#if EV_USE_EPOLL
458 unsigned int egen; /* generation counter to counter epoll bugs */
459#endif
454#if EV_SELECT_IS_WINSOCKET 460#if EV_SELECT_IS_WINSOCKET
455 SOCKET handle; 461 SOCKET handle;
456#endif 462#endif
457} ANFD; 463} ANFD;
458 464
… …
611{ 617{
612 *cur = array_nextsize (elem, *cur, cnt); 618 *cur = array_nextsize (elem, *cur, cnt);
613 return ev_realloc (base, elem * *cur); 619 return ev_realloc (base, elem * *cur);
614} 620}
615 621
622#define array_init_zero(base,count) \
623 memset ((void *)(base), 0, sizeof (*(base)) * (count))
624
616#define array_needsize(type,base,cur,cnt,init) \ 625#define array_needsize(type,base,cur,cnt,init) \
617 if (expect_false ((cnt) > (cur))) \ 626 if (expect_false ((cnt) > (cur))) \
618 { \ 627 { \
619 int ocur_ = (cur); \ 628 int ocur_ = (cur); \
620 (base) = (type *)array_realloc \ 629 (base) = (type *)array_realloc \
… …
662 for (i = 0; i < eventcnt; ++i) 671 for (i = 0; i < eventcnt; ++i)
663 ev_feed_event (EV_A_ events [i], type); 672 ev_feed_event (EV_A_ events [i], type);
664} 673}
665 674
666/*****************************************************************************/ 675/*****************************************************************************/
667
668void inline_size
669anfds_init (ANFD *base, int count)
670{
671 while (count--)
672 {
673 base->head = 0;
674 base->events = EV_NONE;
675 base->reify = 0;
676
677 ++base;
678 }
679}
680 676
681void inline_speed 677void inline_speed
682fd_event (EV_P_ int fd, int revents) 678fd_event (EV_P_ int fd, int revents)
683{ 679{
684 ANFD *anfd = anfds + fd; 680 ANFD *anfd = anfds + fd;
… …
814 810
815 for (fd = 0; fd < anfdmax; ++fd) 811 for (fd = 0; fd < anfdmax; ++fd)
816 if (anfds [fd].events) 812 if (anfds [fd].events)
817 { 813 {
818 anfds [fd].events = 0; 814 anfds [fd].events = 0;
815 anfds [fd].emask = 0;
819 fd_change (EV_A_ fd, EV_IOFDSET | 1); 816 fd_change (EV_A_ fd, EV_IOFDSET | 1);
820 } 817 }
821} 818}
822 819
823/*****************************************************************************/ 820/*****************************************************************************/
… …
975static ANSIG *signals; 972static ANSIG *signals;
976static int signalmax; 973static int signalmax;
977 974
978static EV_ATOMIC_T gotsig; 975static EV_ATOMIC_T gotsig;
979 976
980void inline_size
981signals_init (ANSIG *base, int count)
982{
983 while (count--)
984 {
985 base->head = 0;
986 base->gotsig = 0;
987
988 ++base;
989 }
990}
991
992/*****************************************************************************/ 977/*****************************************************************************/
993 978
994void inline_speed 979void inline_speed
995fd_intern (int fd) 980fd_intern (int fd)
996{ 981{
… …
1017 } 1002 }
1018 else 1003 else
1019#endif 1004#endif
1020 { 1005 {
1021 while (pipe (evpipe)) 1006 while (pipe (evpipe))
1022 syserr ("(libev) error creating signal/async pipe"); 1007 ev_syserr ("(libev) error creating signal/async pipe");
1023 1008
1024 fd_intern (evpipe [0]); 1009 fd_intern (evpipe [0]);
1025 fd_intern (evpipe [1]); 1010 fd_intern (evpipe [1]);
1026 ev_io_set (&pipeev, evpipe [0], EV_READ); 1011 ev_io_set (&pipeev, evpipe [0], EV_READ);
1027 } 1012 }
… …
1658{ 1643{
1659#if EV_MULTIPLICITY 1644#if EV_MULTIPLICITY
1660 struct ev_loop *loop = ev_default_loop_ptr; 1645 struct ev_loop *loop = ev_default_loop_ptr;
1661#endif 1646#endif
1662 1647
1648 ev_default_loop_ptr = 0;
1649
1663#ifndef _WIN32 1650#ifndef _WIN32
1664 ev_ref (EV_A); /* child watcher */ 1651 ev_ref (EV_A); /* child watcher */
1665 ev_signal_stop (EV_A_ &childev); 1652 ev_signal_stop (EV_A_ &childev);
1666#endif 1653#endif
1667 1654
… …
1673{ 1660{
1674#if EV_MULTIPLICITY 1661#if EV_MULTIPLICITY
1675 struct ev_loop *loop = ev_default_loop_ptr; 1662 struct ev_loop *loop = ev_default_loop_ptr;
1676#endif 1663#endif
1677 1664
1678 if (backend)
1679 postfork = 1; /* must be in line with ev_loop_fork */ 1665 postfork = 1; /* must be in line with ev_loop_fork */
1680} 1666}
1681 1667
1682/*****************************************************************************/ 1668/*****************************************************************************/
1683 1669
1684void 1670void
… …
2139 2125
2140 if (expect_false (ev_is_active (w))) 2126 if (expect_false (ev_is_active (w)))
2141 return; 2127 return;
2142 2128
2143 assert (("ev_io_start called with negative fd", fd >= 0)); 2129 assert (("ev_io_start called with negative fd", fd >= 0));
2130 assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE))));
2144 2131
2145 EV_FREQUENT_CHECK; 2132 EV_FREQUENT_CHECK;
2146 2133
2147 ev_start (EV_A_ (W)w, 1); 2134 ev_start (EV_A_ (W)w, 1);
2148 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2135 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2149 wlist_add (&anfds[fd].head, (WL)w); 2136 wlist_add (&anfds[fd].head, (WL)w);
2150 2137
2151 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2138 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
2152 w->events &= ~EV_IOFDSET; 2139 w->events &= ~EV_IOFDSET;
2153 2140
… …
2345 sigset_t full, prev; 2332 sigset_t full, prev;
2346 sigfillset (&full); 2333 sigfillset (&full);
2347 sigprocmask (SIG_SETMASK, &full, &prev); 2334 sigprocmask (SIG_SETMASK, &full, &prev);
2348#endif 2335#endif
2349 2336
2350 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2337 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2351 2338
2352#ifndef _WIN32 2339#ifndef _WIN32
2353 sigprocmask (SIG_SETMASK, &prev, 0); 2340 sigprocmask (SIG_SETMASK, &prev, 0);
2354#endif 2341#endif
2355 } 2342 }
… …
2446 if (w->wd < 0) 2433 if (w->wd < 0)
2447 { 2434 {
2448 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2435 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2449 2436
2450 /* monitor some parent directory for speedup hints */ 2437 /* monitor some parent directory for speedup hints */
2451 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2438 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2452 /* but an efficiency issue only */ 2439 /* but an efficiency issue only */
2453 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2440 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2454 { 2441 {
2455 char path [4096]; 2442 char path [4096];
2456 strcpy (path, w->path); 2443 strcpy (path, w->path);
… …
2470 } 2457 }
2471 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2458 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2472 } 2459 }
2473 } 2460 }
2474 else 2461 else
2462 todo, on nfs etc., we need to poll every 60s or so
2475 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */ 2463 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2476 2464
2477 if (w->wd >= 0) 2465 if (w->wd >= 0)
2478 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2466 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2479} 2467}

Diff Legend

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