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

Comparing libev/ev.c (file contents):
Revision 1.314 by root, Wed Aug 26 17:31:20 2009 UTC vs.
Revision 1.336 by root, Wed Mar 10 08:19:38 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 */
… …
204#elif defined (MAXSIG) 207#elif defined (MAXSIG)
205# define EV_NSIG (MAXSIG+1) 208# define EV_NSIG (MAXSIG+1)
206#elif defined (MAX_SIG) 209#elif defined (MAX_SIG)
207# define EV_NSIG (MAX_SIG+1) 210# define EV_NSIG (MAX_SIG+1)
208#elif defined (SIGARRAYSIZE) 211#elif defined (SIGARRAYSIZE)
209# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */ 212# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
210#elif defined (_sys_nsig) 213#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 214# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else 215#else
213# error "unable to find value for NSIG, please report" 216# error "unable to find value for NSIG, please report"
214/* to make it compile regardless, just remove the above line */ 217/* to make it compile regardless, just remove the above line, */
218/* but consider reporting it, too! :) */
215# define EV_NSIG 65 219# define EV_NSIG 65
216#endif 220#endif
217 221
218#ifndef EV_USE_CLOCK_SYSCALL 222#ifndef EV_USE_CLOCK_SYSCALL
219# if __linux && __GLIBC__ >= 2 223# if __linux && __GLIBC__ >= 2
… …
343# endif 347# endif
344#endif 348#endif
345 349
346/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 350/* this block fixes any misconfiguration where we know we run into trouble otherwise */
347 351
352#ifdef _AIX
353/* AIX has a completely broken poll.h header */
354# undef EV_USE_POLL
355# define EV_USE_POLL 0
356#endif
357
348#ifndef CLOCK_MONOTONIC 358#ifndef CLOCK_MONOTONIC
349# undef EV_USE_MONOTONIC 359# undef EV_USE_MONOTONIC
350# define EV_USE_MONOTONIC 0 360# define EV_USE_MONOTONIC 0
351#endif 361#endif
352 362
… …
395# endif 405# endif
396# endif 406# endif
397# ifdef __cplusplus 407# ifdef __cplusplus
398extern "C" { 408extern "C" {
399# endif 409# endif
400int eventfd (unsigned int initval, int flags); 410int (eventfd) (unsigned int initval, int flags);
401# ifdef __cplusplus 411# ifdef __cplusplus
402} 412}
403# endif 413# endif
404#endif 414#endif
405 415
… …
450 */ 460 */
451#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 461#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
452 462
453#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 463#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
454#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 464#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
455/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
456 465
457#if __GNUC__ >= 4 466#if __GNUC__ >= 4
458# define expect(expr,value) __builtin_expect ((expr),(value)) 467# define expect(expr,value) __builtin_expect ((expr),(value))
459# define noinline __attribute__ ((noinline)) 468# define noinline __attribute__ ((noinline))
460#else 469#else
… …
505 514
506#ifndef EV_FD_TO_WIN32_HANDLE 515#ifndef EV_FD_TO_WIN32_HANDLE
507# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd) 516# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
508#endif 517#endif
509#ifndef EV_WIN32_HANDLE_TO_FD 518#ifndef EV_WIN32_HANDLE_TO_FD
510# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0) 519# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
511#endif 520#endif
512#ifndef EV_WIN32_CLOSE_FD 521#ifndef EV_WIN32_CLOSE_FD
513# define EV_WIN32_CLOSE_FD(fd) close (fd) 522# define EV_WIN32_CLOSE_FD(fd) close (fd)
514#endif 523#endif
515 524
516#ifdef _WIN32 525#ifdef _WIN32
517# include "ev_win32.c" 526# include "ev_win32.c"
518#endif 527#endif
519 528
520/*****************************************************************************/ 529/*****************************************************************************/
530
531#if EV_AVOID_STDIO
532static void noinline
533ev_printerr (const char *msg)
534{
535 write (STDERR_FILENO, msg, strlen (msg));
536}
537#endif
521 538
522static void (*syserr_cb)(const char *msg); 539static void (*syserr_cb)(const char *msg);
523 540
524void 541void
525ev_set_syserr_cb (void (*cb)(const char *msg)) 542ev_set_syserr_cb (void (*cb)(const char *msg))
… …
535 552
536 if (syserr_cb) 553 if (syserr_cb)
537 syserr_cb (msg); 554 syserr_cb (msg);
538 else 555 else
539 { 556 {
557#if EV_AVOID_STDIO
558 const char *err = strerror (errno);
559
560 ev_printerr (msg);
561 ev_printerr (": ");
562 ev_printerr (err);
563 ev_printerr ("\n");
564#else
540 perror (msg); 565 perror (msg);
566#endif
541 abort (); 567 abort ();
542 } 568 }
543} 569}
544 570
545static void * 571static void *
546ev_realloc_emul (void *ptr, long size) 572ev_realloc_emul (void *ptr, long size)
547{ 573{
574#if __GLIBC__
575 return realloc (ptr, size);
576#else
548 /* some systems, notably openbsd and darwin, fail to properly 577 /* some systems, notably openbsd and darwin, fail to properly
549 * implement realloc (x, 0) (as required by both ansi c-98 and 578 * implement realloc (x, 0) (as required by both ansi c-89 and
550 * the single unix specification, so work around them here. 579 * the single unix specification, so work around them here.
551 */ 580 */
552 581
553 if (size) 582 if (size)
554 return realloc (ptr, size); 583 return realloc (ptr, size);
555 584
556 free (ptr); 585 free (ptr);
557 return 0; 586 return 0;
587#endif
558} 588}
559 589
560static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 590static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
561 591
562void 592void
… …
570{ 600{
571 ptr = alloc (ptr, size); 601 ptr = alloc (ptr, size);
572 602
573 if (!ptr && size) 603 if (!ptr && size)
574 { 604 {
605#if EV_AVOID_STDIO
606 ev_printerr ("libev: memory allocation failed, aborting.\n");
607#else
575 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 608 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
609#endif
576 abort (); 610 abort ();
577 } 611 }
578 612
579 return ptr; 613 return ptr;
580} 614}
… …
959 ev_io_stop (EV_A_ w); 993 ev_io_stop (EV_A_ w);
960 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 994 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
961 } 995 }
962} 996}
963 997
964/* check whether the given fd is atcually valid, for error recovery */ 998/* check whether the given fd is actually valid, for error recovery */
965inline_size int 999inline_size int
966fd_valid (int fd) 1000fd_valid (int fd)
967{ 1001{
968#ifdef _WIN32 1002#ifdef _WIN32
969 return _get_osfhandle (fd) != -1; 1003 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
970#else 1004#else
971 return fcntl (fd, F_GETFD) != -1; 1005 return fcntl (fd, F_GETFD) != -1;
972#endif 1006#endif
973} 1007}
974 1008
… …
1009 { 1043 {
1010 anfds [fd].events = 0; 1044 anfds [fd].events = 0;
1011 anfds [fd].emask = 0; 1045 anfds [fd].emask = 0;
1012 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1046 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
1013 } 1047 }
1048}
1049
1050/* used to prepare libev internal fd's */
1051/* this is not fork-safe */
1052inline_speed void
1053fd_intern (int fd)
1054{
1055#ifdef _WIN32
1056 unsigned long arg = 1;
1057 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1058#else
1059 fcntl (fd, F_SETFD, FD_CLOEXEC);
1060 fcntl (fd, F_SETFL, O_NONBLOCK);
1061#endif
1014} 1062}
1015 1063
1016/*****************************************************************************/ 1064/*****************************************************************************/
1017 1065
1018/* 1066/*
… …
1172 1220
1173static ANSIG signals [EV_NSIG - 1]; 1221static ANSIG signals [EV_NSIG - 1];
1174 1222
1175/*****************************************************************************/ 1223/*****************************************************************************/
1176 1224
1177/* used to prepare libev internal fd's */ 1225#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1178/* this is not fork-safe */
1179inline_speed void
1180fd_intern (int fd)
1181{
1182#ifdef _WIN32
1183 unsigned long arg = 1;
1184 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1185#else
1186 fcntl (fd, F_SETFD, FD_CLOEXEC);
1187 fcntl (fd, F_SETFL, O_NONBLOCK);
1188#endif
1189}
1190 1226
1191static void noinline 1227static void noinline
1192evpipe_init (EV_P) 1228evpipe_init (EV_P)
1193{ 1229{
1194 if (!ev_is_active (&pipe_w)) 1230 if (!ev_is_active (&pipe_w))
1195 { 1231 {
1196#if EV_USE_EVENTFD 1232# if EV_USE_EVENTFD
1197 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1233 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1198 if (evfd < 0 && errno == EINVAL) 1234 if (evfd < 0 && errno == EINVAL)
1199 evfd = eventfd (0, 0); 1235 evfd = eventfd (0, 0);
1200 1236
1201 if (evfd >= 0) 1237 if (evfd >= 0)
… …
1203 evpipe [0] = -1; 1239 evpipe [0] = -1;
1204 fd_intern (evfd); /* doing it twice doesn't hurt */ 1240 fd_intern (evfd); /* doing it twice doesn't hurt */
1205 ev_io_set (&pipe_w, evfd, EV_READ); 1241 ev_io_set (&pipe_w, evfd, EV_READ);
1206 } 1242 }
1207 else 1243 else
1208#endif 1244# endif
1209 { 1245 {
1210 while (pipe (evpipe)) 1246 while (pipe (evpipe))
1211 ev_syserr ("(libev) error creating signal/async pipe"); 1247 ev_syserr ("(libev) error creating signal/async pipe");
1212 1248
1213 fd_intern (evpipe [0]); 1249 fd_intern (evpipe [0]);
… …
1224evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1260evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1225{ 1261{
1226 if (!*flag) 1262 if (!*flag)
1227 { 1263 {
1228 int old_errno = errno; /* save errno because write might clobber it */ 1264 int old_errno = errno; /* save errno because write might clobber it */
1265 char dummy;
1229 1266
1230 *flag = 1; 1267 *flag = 1;
1231 1268
1232#if EV_USE_EVENTFD 1269#if EV_USE_EVENTFD
1233 if (evfd >= 0) 1270 if (evfd >= 0)
… …
1235 uint64_t counter = 1; 1272 uint64_t counter = 1;
1236 write (evfd, &counter, sizeof (uint64_t)); 1273 write (evfd, &counter, sizeof (uint64_t));
1237 } 1274 }
1238 else 1275 else
1239#endif 1276#endif
1240 write (evpipe [1], &old_errno, 1); 1277 write (evpipe [1], &dummy, 1);
1241 1278
1242 errno = old_errno; 1279 errno = old_errno;
1243 } 1280 }
1244} 1281}
1245 1282
… …
1294{ 1331{
1295#if EV_MULTIPLICITY 1332#if EV_MULTIPLICITY
1296 EV_P = signals [signum - 1].loop; 1333 EV_P = signals [signum - 1].loop;
1297#endif 1334#endif
1298 1335
1299#if _WIN32 1336#ifdef _WIN32
1300 signal (signum, ev_sighandler); 1337 signal (signum, ev_sighandler);
1301#endif 1338#endif
1302 1339
1303 signals [signum - 1].pending = 1; 1340 signals [signum - 1].pending = 1;
1304 evpipe_write (EV_A_ &sig_pending); 1341 evpipe_write (EV_A_ &sig_pending);
… …
1346 break; 1383 break;
1347 } 1384 }
1348} 1385}
1349#endif 1386#endif
1350 1387
1388#endif
1389
1351/*****************************************************************************/ 1390/*****************************************************************************/
1352 1391
1392#if EV_CHILD_ENABLE
1353static WL childs [EV_PID_HASHSIZE]; 1393static WL childs [EV_PID_HASHSIZE];
1354
1355#ifndef _WIN32
1356 1394
1357static ev_signal childev; 1395static ev_signal childev;
1358 1396
1359#ifndef WIFCONTINUED 1397#ifndef WIFCONTINUED
1360# define WIFCONTINUED(status) 0 1398# define WIFCONTINUED(status) 0
… …
1605#endif 1643#endif
1606#if EV_USE_INOTIFY 1644#if EV_USE_INOTIFY
1607 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1645 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1608#endif 1646#endif
1609#if EV_USE_SIGNALFD 1647#if EV_USE_SIGNALFD
1610 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1648 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1611#endif 1649#endif
1612 1650
1613 if (!(flags & 0x0000ffffU)) 1651 if (!(flags & 0x0000ffffU))
1614 flags |= ev_recommended_backends (); 1652 flags |= ev_recommended_backends ();
1615 1653
… …
1629 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1667 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1630#endif 1668#endif
1631 1669
1632 ev_prepare_init (&pending_w, pendingcb); 1670 ev_prepare_init (&pending_w, pendingcb);
1633 1671
1672#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1634 ev_init (&pipe_w, pipecb); 1673 ev_init (&pipe_w, pipecb);
1635 ev_set_priority (&pipe_w, EV_MAXPRI); 1674 ev_set_priority (&pipe_w, EV_MAXPRI);
1675#endif
1636 } 1676 }
1637} 1677}
1638 1678
1639/* free up a loop structure */ 1679/* free up a loop structure */
1640static void noinline 1680static void noinline
… …
1659 } 1699 }
1660 } 1700 }
1661 1701
1662#if EV_USE_SIGNALFD 1702#if EV_USE_SIGNALFD
1663 if (ev_is_active (&sigfd_w)) 1703 if (ev_is_active (&sigfd_w))
1664 {
1665 /*ev_ref (EV_A);*/
1666 /*ev_io_stop (EV_A_ &sigfd_w);*/
1667
1668 close (sigfd); 1704 close (sigfd);
1669 }
1670#endif 1705#endif
1671 1706
1672#if EV_USE_INOTIFY 1707#if EV_USE_INOTIFY
1673 if (fs_fd >= 0) 1708 if (fs_fd >= 0)
1674 close (fs_fd); 1709 close (fs_fd);
… …
1895 1930
1896 assert (checkmax >= checkcnt); 1931 assert (checkmax >= checkcnt);
1897 array_verify (EV_A_ (W *)checks, checkcnt); 1932 array_verify (EV_A_ (W *)checks, checkcnt);
1898 1933
1899# if 0 1934# if 0
1935#if EV_CHILD_ENABLE
1900 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1936 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1901 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending) 1937 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1938#endif
1902# endif 1939# endif
1903#endif 1940#endif
1904} 1941}
1905#endif 1942#endif
1906 1943
… …
1922 1959
1923 loop_init (EV_A_ flags); 1960 loop_init (EV_A_ flags);
1924 1961
1925 if (ev_backend (EV_A)) 1962 if (ev_backend (EV_A))
1926 { 1963 {
1927#ifndef _WIN32 1964#if EV_CHILD_ENABLE
1928 ev_signal_init (&childev, childcb, SIGCHLD); 1965 ev_signal_init (&childev, childcb, SIGCHLD);
1929 ev_set_priority (&childev, EV_MAXPRI); 1966 ev_set_priority (&childev, EV_MAXPRI);
1930 ev_signal_start (EV_A_ &childev); 1967 ev_signal_start (EV_A_ &childev);
1931 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1968 ev_unref (EV_A); /* child watcher should not keep loop alive */
1932#endif 1969#endif
… …
1945 EV_P = ev_default_loop_ptr; 1982 EV_P = ev_default_loop_ptr;
1946#endif 1983#endif
1947 1984
1948 ev_default_loop_ptr = 0; 1985 ev_default_loop_ptr = 0;
1949 1986
1950#ifndef _WIN32 1987#if EV_CHILD_ENABLE
1951 ev_ref (EV_A); /* child watcher */ 1988 ev_ref (EV_A); /* child watcher */
1952 ev_signal_stop (EV_A_ &childev); 1989 ev_signal_stop (EV_A_ &childev);
1953#endif 1990#endif
1954 1991
1955 loop_destroy (EV_A); 1992 loop_destroy (EV_A);
… …
2162 ANHE_at_cache (*he); 2199 ANHE_at_cache (*he);
2163 } 2200 }
2164} 2201}
2165 2202
2166/* fetch new monotonic and realtime times from the kernel */ 2203/* fetch new monotonic and realtime times from the kernel */
2167/* also detetc if there was a timejump, and act accordingly */ 2204/* also detect if there was a timejump, and act accordingly */
2168inline_speed void 2205inline_speed void
2169time_update (EV_P_ ev_tstamp max_block) 2206time_update (EV_P_ ev_tstamp max_block)
2170{ 2207{
2171#if EV_USE_MONOTONIC 2208#if EV_USE_MONOTONIC
2172 if (expect_true (have_monotonic)) 2209 if (expect_true (have_monotonic))
… …
2506 2543
2507 if (expect_false (ev_is_active (w))) 2544 if (expect_false (ev_is_active (w)))
2508 return; 2545 return;
2509 2546
2510 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2547 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2511 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2548 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2512 2549
2513 EV_FREQUENT_CHECK; 2550 EV_FREQUENT_CHECK;
2514 2551
2515 ev_start (EV_A_ (W)w, 1); 2552 ev_start (EV_A_ (W)w, 1);
2516 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2553 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2586 timers [active] = timers [timercnt + HEAP0]; 2623 timers [active] = timers [timercnt + HEAP0];
2587 adjustheap (timers, timercnt, active); 2624 adjustheap (timers, timercnt, active);
2588 } 2625 }
2589 } 2626 }
2590 2627
2591 EV_FREQUENT_CHECK;
2592
2593 ev_at (w) -= mn_now; 2628 ev_at (w) -= mn_now;
2594 2629
2595 ev_stop (EV_A_ (W)w); 2630 ev_stop (EV_A_ (W)w);
2631
2632 EV_FREQUENT_CHECK;
2596} 2633}
2597 2634
2598void noinline 2635void noinline
2599ev_timer_again (EV_P_ ev_timer *w) 2636ev_timer_again (EV_P_ ev_timer *w)
2600{ 2637{
… …
2679 periodics [active] = periodics [periodiccnt + HEAP0]; 2716 periodics [active] = periodics [periodiccnt + HEAP0];
2680 adjustheap (periodics, periodiccnt, active); 2717 adjustheap (periodics, periodiccnt, active);
2681 } 2718 }
2682 } 2719 }
2683 2720
2684 EV_FREQUENT_CHECK;
2685
2686 ev_stop (EV_A_ (W)w); 2721 ev_stop (EV_A_ (W)w);
2722
2723 EV_FREQUENT_CHECK;
2687} 2724}
2688 2725
2689void noinline 2726void noinline
2690ev_periodic_again (EV_P_ ev_periodic *w) 2727ev_periodic_again (EV_P_ ev_periodic *w)
2691{ 2728{
… …
2696#endif 2733#endif
2697 2734
2698#ifndef SA_RESTART 2735#ifndef SA_RESTART
2699# define SA_RESTART 0 2736# define SA_RESTART 0
2700#endif 2737#endif
2738
2739#if EV_SIGNAL_ENABLE
2701 2740
2702void noinline 2741void noinline
2703ev_signal_start (EV_P_ ev_signal *w) 2742ev_signal_start (EV_P_ ev_signal *w)
2704{ 2743{
2705 if (expect_false (ev_is_active (w))) 2744 if (expect_false (ev_is_active (w)))
… …
2752 if (!((WL)w)->next) 2791 if (!((WL)w)->next)
2753# if EV_USE_SIGNALFD 2792# if EV_USE_SIGNALFD
2754 if (sigfd < 0) /*TODO*/ 2793 if (sigfd < 0) /*TODO*/
2755# endif 2794# endif
2756 { 2795 {
2757# if _WIN32 2796# ifdef _WIN32
2797 evpipe_init (EV_A);
2798
2758 signal (w->signum, ev_sighandler); 2799 signal (w->signum, ev_sighandler);
2759# else 2800# else
2760 struct sigaction sa; 2801 struct sigaction sa;
2761 2802
2762 evpipe_init (EV_A); 2803 evpipe_init (EV_A);
… …
2793 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2834 signals [w->signum - 1].loop = 0; /* unattach from signal */
2794#endif 2835#endif
2795#if EV_USE_SIGNALFD 2836#if EV_USE_SIGNALFD
2796 if (sigfd >= 0) 2837 if (sigfd >= 0)
2797 { 2838 {
2798 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2839 sigset_t ss;
2840
2841 sigemptyset (&ss);
2842 sigaddset (&ss, w->signum);
2799 sigdelset (&sigfd_set, w->signum); 2843 sigdelset (&sigfd_set, w->signum);
2844
2800 signalfd (sigfd, &sigfd_set, 0); 2845 signalfd (sigfd, &sigfd_set, 0);
2801 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2846 sigprocmask (SIG_UNBLOCK, &ss, 0);
2802 /*TODO: maybe unblock signal? */
2803 } 2847 }
2804 else 2848 else
2805#endif 2849#endif
2806 signal (w->signum, SIG_DFL); 2850 signal (w->signum, SIG_DFL);
2807 } 2851 }
2808 2852
2809 EV_FREQUENT_CHECK; 2853 EV_FREQUENT_CHECK;
2810} 2854}
2855
2856#endif
2857
2858#if EV_CHILD_ENABLE
2811 2859
2812void 2860void
2813ev_child_start (EV_P_ ev_child *w) 2861ev_child_start (EV_P_ ev_child *w)
2814{ 2862{
2815#if EV_MULTIPLICITY 2863#if EV_MULTIPLICITY
… …
2839 ev_stop (EV_A_ (W)w); 2887 ev_stop (EV_A_ (W)w);
2840 2888
2841 EV_FREQUENT_CHECK; 2889 EV_FREQUENT_CHECK;
2842} 2890}
2843 2891
2892#endif
2893
2844#if EV_STAT_ENABLE 2894#if EV_STAT_ENABLE
2845 2895
2846# ifdef _WIN32 2896# ifdef _WIN32
2847# undef lstat 2897# undef lstat
2848# define lstat(a,b) _stati64 (a,b) 2898# define lstat(a,b) _stati64 (a,b)
… …
2853#define MIN_STAT_INTERVAL 0.1074891 2903#define MIN_STAT_INTERVAL 0.1074891
2854 2904
2855static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2905static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2856 2906
2857#if EV_USE_INOTIFY 2907#if EV_USE_INOTIFY
2858# define EV_INOTIFY_BUFSIZE 8192 2908
2909/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2910# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2859 2911
2860static void noinline 2912static void noinline
2861infy_add (EV_P_ ev_stat *w) 2913infy_add (EV_P_ ev_stat *w)
2862{ 2914{
2863 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); 2915 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);
2864 2916
2865 if (w->wd < 0) 2917 if (w->wd >= 0)
2918 {
2919 struct statfs sfs;
2920
2921 /* now local changes will be tracked by inotify, but remote changes won't */
2922 /* unless the filesystem is known to be local, we therefore still poll */
2923 /* also do poll on <2.6.25, but with normal frequency */
2924
2925 if (!fs_2625)
2926 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2927 else if (!statfs (w->path, &sfs)
2928 && (sfs.f_type == 0x1373 /* devfs */
2929 || sfs.f_type == 0xEF53 /* ext2/3 */
2930 || sfs.f_type == 0x3153464a /* jfs */
2931 || sfs.f_type == 0x52654973 /* reiser3 */
2932 || sfs.f_type == 0x01021994 /* tempfs */
2933 || sfs.f_type == 0x58465342 /* xfs */))
2934 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2935 else
2936 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2866 { 2937 }
2938 else
2939 {
2940 /* can't use inotify, continue to stat */
2867 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2941 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2868 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2869 2942
2870 /* monitor some parent directory for speedup hints */ 2943 /* if path is not there, monitor some parent directory for speedup hints */
2871 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2944 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2872 /* but an efficiency issue only */ 2945 /* but an efficiency issue only */
2873 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2946 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2874 { 2947 {
2875 char path [4096]; 2948 char path [4096];
… …
2891 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2964 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2892 } 2965 }
2893 } 2966 }
2894 2967
2895 if (w->wd >= 0) 2968 if (w->wd >= 0)
2896 {
2897 struct statfs sfs;
2898
2899 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2969 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2900 2970
2901 /* now local changes will be tracked by inotify, but remote changes won't */ 2971 /* now re-arm timer, if required */
2902 /* unless the filesystem it known to be local, we therefore still poll */ 2972 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2903 /* also do poll on <2.6.25, but with normal frequency */
2904
2905 if (fs_2625 && !statfs (w->path, &sfs))
2906 if (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 return;
2913
2914 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2915 ev_timer_again (EV_A_ &w->timer); 2973 ev_timer_again (EV_A_ &w->timer);
2916 } 2974 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2917} 2975}
2918 2976
2919static void noinline 2977static void noinline
2920infy_del (EV_P_ ev_stat *w) 2978infy_del (EV_P_ ev_stat *w)
2921{ 2979{
… …
2966 3024
2967static void 3025static void
2968infy_cb (EV_P_ ev_io *w, int revents) 3026infy_cb (EV_P_ ev_io *w, int revents)
2969{ 3027{
2970 char buf [EV_INOTIFY_BUFSIZE]; 3028 char buf [EV_INOTIFY_BUFSIZE];
2971 struct inotify_event *ev = (struct inotify_event *)buf;
2972 int ofs; 3029 int ofs;
2973 int len = read (fs_fd, buf, sizeof (buf)); 3030 int len = read (fs_fd, buf, sizeof (buf));
2974 3031
2975 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3032 for (ofs = 0; ofs < len; )
3033 {
3034 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2976 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3035 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3036 ofs += sizeof (struct inotify_event) + ev->len;
3037 }
3038}
3039
3040inline_size unsigned int
3041ev_linux_version (void)
3042{
3043 struct utsname buf;
3044 unsigned int v;
3045 int i;
3046 char *p = buf.release;
3047
3048 if (uname (&buf))
3049 return 0;
3050
3051 for (i = 3+1; --i; )
3052 {
3053 unsigned int c = 0;
3054
3055 for (;;)
3056 {
3057 if (*p >= '0' && *p <= '9')
3058 c = c * 10 + *p++ - '0';
3059 else
3060 {
3061 p += *p == '.';
3062 break;
3063 }
3064 }
3065
3066 v = (v << 8) | c;
3067 }
3068
3069 return v;
2977} 3070}
2978 3071
2979inline_size void 3072inline_size void
2980check_2625 (EV_P) 3073ev_check_2625 (EV_P)
2981{ 3074{
2982 /* kernels < 2.6.25 are borked 3075 /* kernels < 2.6.25 are borked
2983 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3076 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2984 */ 3077 */
2985 struct utsname buf; 3078 if (ev_linux_version () < 0x020619)
2986 int major, minor, micro;
2987
2988 if (uname (&buf))
2989 return; 3079 return;
2990 3080
2991 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2992 return;
2993
2994 if (major < 2
2995 || (major == 2 && minor < 6)
2996 || (major == 2 && minor == 6 && micro < 25))
2997 return;
2998
2999 fs_2625 = 1; 3081 fs_2625 = 1;
3082}
3083
3084inline_size int
3085infy_newfd (void)
3086{
3087#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3088 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3089 if (fd >= 0)
3090 return fd;
3091#endif
3092 return inotify_init ();
3000} 3093}
3001 3094
3002inline_size void 3095inline_size void
3003infy_init (EV_P) 3096infy_init (EV_P)
3004{ 3097{
3005 if (fs_fd != -2) 3098 if (fs_fd != -2)
3006 return; 3099 return;
3007 3100
3008 fs_fd = -1; 3101 fs_fd = -1;
3009 3102
3010 check_2625 (EV_A); 3103 ev_check_2625 (EV_A);
3011 3104
3012 fs_fd = inotify_init (); 3105 fs_fd = infy_newfd ();
3013 3106
3014 if (fs_fd >= 0) 3107 if (fs_fd >= 0)
3015 { 3108 {
3109 fd_intern (fs_fd);
3016 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3110 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
3017 ev_set_priority (&fs_w, EV_MAXPRI); 3111 ev_set_priority (&fs_w, EV_MAXPRI);
3018 ev_io_start (EV_A_ &fs_w); 3112 ev_io_start (EV_A_ &fs_w);
3113 ev_unref (EV_A);
3019 } 3114 }
3020} 3115}
3021 3116
3022inline_size void 3117inline_size void
3023infy_fork (EV_P) 3118infy_fork (EV_P)
… …
3025 int slot; 3120 int slot;
3026 3121
3027 if (fs_fd < 0) 3122 if (fs_fd < 0)
3028 return; 3123 return;
3029 3124
3125 ev_ref (EV_A);
3126 ev_io_stop (EV_A_ &fs_w);
3030 close (fs_fd); 3127 close (fs_fd);
3031 fs_fd = inotify_init (); 3128 fs_fd = infy_newfd ();
3129
3130 if (fs_fd >= 0)
3131 {
3132 fd_intern (fs_fd);
3133 ev_io_set (&fs_w, fs_fd, EV_READ);
3134 ev_io_start (EV_A_ &fs_w);
3135 ev_unref (EV_A);
3136 }
3032 3137
3033 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3138 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
3034 { 3139 {
3035 WL w_ = fs_hash [slot].head; 3140 WL w_ = fs_hash [slot].head;
3036 fs_hash [slot].head = 0; 3141 fs_hash [slot].head = 0;
… …
3043 w->wd = -1; 3148 w->wd = -1;
3044 3149
3045 if (fs_fd >= 0) 3150 if (fs_fd >= 0)
3046 infy_add (EV_A_ w); /* re-add, no matter what */ 3151 infy_add (EV_A_ w); /* re-add, no matter what */
3047 else 3152 else
3153 {
3154 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3155 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3048 ev_timer_again (EV_A_ &w->timer); 3156 ev_timer_again (EV_A_ &w->timer);
3157 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3158 }
3049 } 3159 }
3050 } 3160 }
3051} 3161}
3052 3162
3053#endif 3163#endif
… …
3070static void noinline 3180static void noinline
3071stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3181stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3072{ 3182{
3073 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3183 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3074 3184
3075 /* we copy this here each the time so that */ 3185 ev_statdata prev = w->attr;
3076 /* prev has the old value when the callback gets invoked */
3077 w->prev = w->attr;
3078 ev_stat_stat (EV_A_ w); 3186 ev_stat_stat (EV_A_ w);
3079 3187
3080 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3188 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3081 if ( 3189 if (
3082 w->prev.st_dev != w->attr.st_dev 3190 prev.st_dev != w->attr.st_dev
3083 || w->prev.st_ino != w->attr.st_ino 3191 || prev.st_ino != w->attr.st_ino
3084 || w->prev.st_mode != w->attr.st_mode 3192 || prev.st_mode != w->attr.st_mode
3085 || w->prev.st_nlink != w->attr.st_nlink 3193 || prev.st_nlink != w->attr.st_nlink
3086 || w->prev.st_uid != w->attr.st_uid 3194 || prev.st_uid != w->attr.st_uid
3087 || w->prev.st_gid != w->attr.st_gid 3195 || prev.st_gid != w->attr.st_gid
3088 || w->prev.st_rdev != w->attr.st_rdev 3196 || prev.st_rdev != w->attr.st_rdev
3089 || w->prev.st_size != w->attr.st_size 3197 || prev.st_size != w->attr.st_size
3090 || w->prev.st_atime != w->attr.st_atime 3198 || prev.st_atime != w->attr.st_atime
3091 || w->prev.st_mtime != w->attr.st_mtime 3199 || prev.st_mtime != w->attr.st_mtime
3092 || w->prev.st_ctime != w->attr.st_ctime 3200 || prev.st_ctime != w->attr.st_ctime
3093 ) { 3201 ) {
3202 /* we only update w->prev on actual differences */
3203 /* in case we test more often than invoke the callback, */
3204 /* to ensure that prev is always different to attr */
3205 w->prev = prev;
3206
3094 #if EV_USE_INOTIFY 3207 #if EV_USE_INOTIFY
3095 if (fs_fd >= 0) 3208 if (fs_fd >= 0)
3096 { 3209 {
3097 infy_del (EV_A_ w); 3210 infy_del (EV_A_ w);
3098 infy_add (EV_A_ w); 3211 infy_add (EV_A_ w);
… …
3123 3236
3124 if (fs_fd >= 0) 3237 if (fs_fd >= 0)
3125 infy_add (EV_A_ w); 3238 infy_add (EV_A_ w);
3126 else 3239 else
3127#endif 3240#endif
3241 {
3128 ev_timer_again (EV_A_ &w->timer); 3242 ev_timer_again (EV_A_ &w->timer);
3243 ev_unref (EV_A);
3244 }
3129 3245
3130 ev_start (EV_A_ (W)w, 1); 3246 ev_start (EV_A_ (W)w, 1);
3131 3247
3132 EV_FREQUENT_CHECK; 3248 EV_FREQUENT_CHECK;
3133} 3249}
… …
3142 EV_FREQUENT_CHECK; 3258 EV_FREQUENT_CHECK;
3143 3259
3144#if EV_USE_INOTIFY 3260#if EV_USE_INOTIFY
3145 infy_del (EV_A_ w); 3261 infy_del (EV_A_ w);
3146#endif 3262#endif
3263
3264 if (ev_is_active (&w->timer))
3265 {
3266 ev_ref (EV_A);
3147 ev_timer_stop (EV_A_ &w->timer); 3267 ev_timer_stop (EV_A_ &w->timer);
3268 }
3148 3269
3149 ev_stop (EV_A_ (W)w); 3270 ev_stop (EV_A_ (W)w);
3150 3271
3151 EV_FREQUENT_CHECK; 3272 EV_FREQUENT_CHECK;
3152} 3273}
… …
3371 EV_FREQUENT_CHECK; 3492 EV_FREQUENT_CHECK;
3372 3493
3373 ev_io_stop (EV_A_ &w->io); 3494 ev_io_stop (EV_A_ &w->io);
3374 ev_prepare_stop (EV_A_ &w->prepare); 3495 ev_prepare_stop (EV_A_ &w->prepare);
3375 ev_fork_stop (EV_A_ &w->fork); 3496 ev_fork_stop (EV_A_ &w->fork);
3497
3498 ev_stop (EV_A_ (W)w);
3376 3499
3377 EV_FREQUENT_CHECK; 3500 EV_FREQUENT_CHECK;
3378} 3501}
3379#endif 3502#endif
3380 3503

Diff Legend

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