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

Comparing libev/ev.c (file contents):
Revision 1.316 by root, Fri Sep 18 21:02:12 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
… …
504 514
505#ifndef EV_FD_TO_WIN32_HANDLE 515#ifndef EV_FD_TO_WIN32_HANDLE
506# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd) 516# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
507#endif 517#endif
508#ifndef EV_WIN32_HANDLE_TO_FD 518#ifndef EV_WIN32_HANDLE_TO_FD
509# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0) 519# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
510#endif 520#endif
511#ifndef EV_WIN32_CLOSE_FD 521#ifndef EV_WIN32_CLOSE_FD
512# define EV_WIN32_CLOSE_FD(fd) close (fd) 522# define EV_WIN32_CLOSE_FD(fd) close (fd)
513#endif 523#endif
514 524
515#ifdef _WIN32 525#ifdef _WIN32
516# include "ev_win32.c" 526# include "ev_win32.c"
517#endif 527#endif
518 528
519/*****************************************************************************/ 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
520 538
521static void (*syserr_cb)(const char *msg); 539static void (*syserr_cb)(const char *msg);
522 540
523void 541void
524ev_set_syserr_cb (void (*cb)(const char *msg)) 542ev_set_syserr_cb (void (*cb)(const char *msg))
… …
534 552
535 if (syserr_cb) 553 if (syserr_cb)
536 syserr_cb (msg); 554 syserr_cb (msg);
537 else 555 else
538 { 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
539 perror (msg); 565 perror (msg);
566#endif
540 abort (); 567 abort ();
541 } 568 }
542} 569}
543 570
544static void * 571static void *
545ev_realloc_emul (void *ptr, long size) 572ev_realloc_emul (void *ptr, long size)
546{ 573{
574#if __GLIBC__
575 return realloc (ptr, size);
576#else
547 /* some systems, notably openbsd and darwin, fail to properly 577 /* some systems, notably openbsd and darwin, fail to properly
548 * 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
549 * the single unix specification, so work around them here. 579 * the single unix specification, so work around them here.
550 */ 580 */
551 581
552 if (size) 582 if (size)
553 return realloc (ptr, size); 583 return realloc (ptr, size);
554 584
555 free (ptr); 585 free (ptr);
556 return 0; 586 return 0;
587#endif
557} 588}
558 589
559static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 590static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
560 591
561void 592void
… …
569{ 600{
570 ptr = alloc (ptr, size); 601 ptr = alloc (ptr, size);
571 602
572 if (!ptr && size) 603 if (!ptr && size)
573 { 604 {
605#if EV_AVOID_STDIO
606 ev_printerr ("libev: memory allocation failed, aborting.\n");
607#else
574 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 608 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
609#endif
575 abort (); 610 abort ();
576 } 611 }
577 612
578 return ptr; 613 return ptr;
579} 614}
… …
958 ev_io_stop (EV_A_ w); 993 ev_io_stop (EV_A_ w);
959 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);
960 } 995 }
961} 996}
962 997
963/* check whether the given fd is atcually valid, for error recovery */ 998/* check whether the given fd is actually valid, for error recovery */
964inline_size int 999inline_size int
965fd_valid (int fd) 1000fd_valid (int fd)
966{ 1001{
967#ifdef _WIN32 1002#ifdef _WIN32
968 return _get_osfhandle (fd) != -1; 1003 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
969#else 1004#else
970 return fcntl (fd, F_GETFD) != -1; 1005 return fcntl (fd, F_GETFD) != -1;
971#endif 1006#endif
972} 1007}
973 1008
… …
1008 { 1043 {
1009 anfds [fd].events = 0; 1044 anfds [fd].events = 0;
1010 anfds [fd].emask = 0; 1045 anfds [fd].emask = 0;
1011 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1046 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
1012 } 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
1013} 1062}
1014 1063
1015/*****************************************************************************/ 1064/*****************************************************************************/
1016 1065
1017/* 1066/*
… …
1171 1220
1172static ANSIG signals [EV_NSIG - 1]; 1221static ANSIG signals [EV_NSIG - 1];
1173 1222
1174/*****************************************************************************/ 1223/*****************************************************************************/
1175 1224
1176/* used to prepare libev internal fd's */ 1225#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1177/* this is not fork-safe */
1178inline_speed void
1179fd_intern (int fd)
1180{
1181#ifdef _WIN32
1182 unsigned long arg = 1;
1183 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1184#else
1185 fcntl (fd, F_SETFD, FD_CLOEXEC);
1186 fcntl (fd, F_SETFL, O_NONBLOCK);
1187#endif
1188}
1189 1226
1190static void noinline 1227static void noinline
1191evpipe_init (EV_P) 1228evpipe_init (EV_P)
1192{ 1229{
1193 if (!ev_is_active (&pipe_w)) 1230 if (!ev_is_active (&pipe_w))
1194 { 1231 {
1195#if EV_USE_EVENTFD 1232# if EV_USE_EVENTFD
1196 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1233 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1197 if (evfd < 0 && errno == EINVAL) 1234 if (evfd < 0 && errno == EINVAL)
1198 evfd = eventfd (0, 0); 1235 evfd = eventfd (0, 0);
1199 1236
1200 if (evfd >= 0) 1237 if (evfd >= 0)
… …
1202 evpipe [0] = -1; 1239 evpipe [0] = -1;
1203 fd_intern (evfd); /* doing it twice doesn't hurt */ 1240 fd_intern (evfd); /* doing it twice doesn't hurt */
1204 ev_io_set (&pipe_w, evfd, EV_READ); 1241 ev_io_set (&pipe_w, evfd, EV_READ);
1205 } 1242 }
1206 else 1243 else
1207#endif 1244# endif
1208 { 1245 {
1209 while (pipe (evpipe)) 1246 while (pipe (evpipe))
1210 ev_syserr ("(libev) error creating signal/async pipe"); 1247 ev_syserr ("(libev) error creating signal/async pipe");
1211 1248
1212 fd_intern (evpipe [0]); 1249 fd_intern (evpipe [0]);
… …
1223evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1260evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1224{ 1261{
1225 if (!*flag) 1262 if (!*flag)
1226 { 1263 {
1227 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;
1228 1266
1229 *flag = 1; 1267 *flag = 1;
1230 1268
1231#if EV_USE_EVENTFD 1269#if EV_USE_EVENTFD
1232 if (evfd >= 0) 1270 if (evfd >= 0)
… …
1234 uint64_t counter = 1; 1272 uint64_t counter = 1;
1235 write (evfd, &counter, sizeof (uint64_t)); 1273 write (evfd, &counter, sizeof (uint64_t));
1236 } 1274 }
1237 else 1275 else
1238#endif 1276#endif
1239 write (evpipe [1], &old_errno, 1); 1277 write (evpipe [1], &dummy, 1);
1240 1278
1241 errno = old_errno; 1279 errno = old_errno;
1242 } 1280 }
1243} 1281}
1244 1282
… …
1293{ 1331{
1294#if EV_MULTIPLICITY 1332#if EV_MULTIPLICITY
1295 EV_P = signals [signum - 1].loop; 1333 EV_P = signals [signum - 1].loop;
1296#endif 1334#endif
1297 1335
1298#if _WIN32 1336#ifdef _WIN32
1299 signal (signum, ev_sighandler); 1337 signal (signum, ev_sighandler);
1300#endif 1338#endif
1301 1339
1302 signals [signum - 1].pending = 1; 1340 signals [signum - 1].pending = 1;
1303 evpipe_write (EV_A_ &sig_pending); 1341 evpipe_write (EV_A_ &sig_pending);
… …
1345 break; 1383 break;
1346 } 1384 }
1347} 1385}
1348#endif 1386#endif
1349 1387
1388#endif
1389
1350/*****************************************************************************/ 1390/*****************************************************************************/
1351 1391
1392#if EV_CHILD_ENABLE
1352static WL childs [EV_PID_HASHSIZE]; 1393static WL childs [EV_PID_HASHSIZE];
1353
1354#ifndef _WIN32
1355 1394
1356static ev_signal childev; 1395static ev_signal childev;
1357 1396
1358#ifndef WIFCONTINUED 1397#ifndef WIFCONTINUED
1359# define WIFCONTINUED(status) 0 1398# define WIFCONTINUED(status) 0
… …
1604#endif 1643#endif
1605#if EV_USE_INOTIFY 1644#if EV_USE_INOTIFY
1606 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1645 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1607#endif 1646#endif
1608#if EV_USE_SIGNALFD 1647#if EV_USE_SIGNALFD
1609 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1648 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1610#endif 1649#endif
1611 1650
1612 if (!(flags & 0x0000ffffU)) 1651 if (!(flags & 0x0000ffffU))
1613 flags |= ev_recommended_backends (); 1652 flags |= ev_recommended_backends ();
1614 1653
… …
1628 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1667 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1629#endif 1668#endif
1630 1669
1631 ev_prepare_init (&pending_w, pendingcb); 1670 ev_prepare_init (&pending_w, pendingcb);
1632 1671
1672#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1633 ev_init (&pipe_w, pipecb); 1673 ev_init (&pipe_w, pipecb);
1634 ev_set_priority (&pipe_w, EV_MAXPRI); 1674 ev_set_priority (&pipe_w, EV_MAXPRI);
1675#endif
1635 } 1676 }
1636} 1677}
1637 1678
1638/* free up a loop structure */ 1679/* free up a loop structure */
1639static void noinline 1680static void noinline
… …
1658 } 1699 }
1659 } 1700 }
1660 1701
1661#if EV_USE_SIGNALFD 1702#if EV_USE_SIGNALFD
1662 if (ev_is_active (&sigfd_w)) 1703 if (ev_is_active (&sigfd_w))
1663 {
1664 /*ev_ref (EV_A);*/
1665 /*ev_io_stop (EV_A_ &sigfd_w);*/
1666
1667 close (sigfd); 1704 close (sigfd);
1668 }
1669#endif 1705#endif
1670 1706
1671#if EV_USE_INOTIFY 1707#if EV_USE_INOTIFY
1672 if (fs_fd >= 0) 1708 if (fs_fd >= 0)
1673 close (fs_fd); 1709 close (fs_fd);
… …
1894 1930
1895 assert (checkmax >= checkcnt); 1931 assert (checkmax >= checkcnt);
1896 array_verify (EV_A_ (W *)checks, checkcnt); 1932 array_verify (EV_A_ (W *)checks, checkcnt);
1897 1933
1898# if 0 1934# if 0
1935#if EV_CHILD_ENABLE
1899 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)
1900 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending) 1937 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1938#endif
1901# endif 1939# endif
1902#endif 1940#endif
1903} 1941}
1904#endif 1942#endif
1905 1943
… …
1921 1959
1922 loop_init (EV_A_ flags); 1960 loop_init (EV_A_ flags);
1923 1961
1924 if (ev_backend (EV_A)) 1962 if (ev_backend (EV_A))
1925 { 1963 {
1926#ifndef _WIN32 1964#if EV_CHILD_ENABLE
1927 ev_signal_init (&childev, childcb, SIGCHLD); 1965 ev_signal_init (&childev, childcb, SIGCHLD);
1928 ev_set_priority (&childev, EV_MAXPRI); 1966 ev_set_priority (&childev, EV_MAXPRI);
1929 ev_signal_start (EV_A_ &childev); 1967 ev_signal_start (EV_A_ &childev);
1930 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1968 ev_unref (EV_A); /* child watcher should not keep loop alive */
1931#endif 1969#endif
… …
1944 EV_P = ev_default_loop_ptr; 1982 EV_P = ev_default_loop_ptr;
1945#endif 1983#endif
1946 1984
1947 ev_default_loop_ptr = 0; 1985 ev_default_loop_ptr = 0;
1948 1986
1949#ifndef _WIN32 1987#if EV_CHILD_ENABLE
1950 ev_ref (EV_A); /* child watcher */ 1988 ev_ref (EV_A); /* child watcher */
1951 ev_signal_stop (EV_A_ &childev); 1989 ev_signal_stop (EV_A_ &childev);
1952#endif 1990#endif
1953 1991
1954 loop_destroy (EV_A); 1992 loop_destroy (EV_A);
… …
2161 ANHE_at_cache (*he); 2199 ANHE_at_cache (*he);
2162 } 2200 }
2163} 2201}
2164 2202
2165/* fetch new monotonic and realtime times from the kernel */ 2203/* fetch new monotonic and realtime times from the kernel */
2166/* also detetc if there was a timejump, and act accordingly */ 2204/* also detect if there was a timejump, and act accordingly */
2167inline_speed void 2205inline_speed void
2168time_update (EV_P_ ev_tstamp max_block) 2206time_update (EV_P_ ev_tstamp max_block)
2169{ 2207{
2170#if EV_USE_MONOTONIC 2208#if EV_USE_MONOTONIC
2171 if (expect_true (have_monotonic)) 2209 if (expect_true (have_monotonic))
… …
2505 2543
2506 if (expect_false (ev_is_active (w))) 2544 if (expect_false (ev_is_active (w)))
2507 return; 2545 return;
2508 2546
2509 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2547 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2510 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))));
2511 2549
2512 EV_FREQUENT_CHECK; 2550 EV_FREQUENT_CHECK;
2513 2551
2514 ev_start (EV_A_ (W)w, 1); 2552 ev_start (EV_A_ (W)w, 1);
2515 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2553 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2585 timers [active] = timers [timercnt + HEAP0]; 2623 timers [active] = timers [timercnt + HEAP0];
2586 adjustheap (timers, timercnt, active); 2624 adjustheap (timers, timercnt, active);
2587 } 2625 }
2588 } 2626 }
2589 2627
2590 EV_FREQUENT_CHECK;
2591
2592 ev_at (w) -= mn_now; 2628 ev_at (w) -= mn_now;
2593 2629
2594 ev_stop (EV_A_ (W)w); 2630 ev_stop (EV_A_ (W)w);
2631
2632 EV_FREQUENT_CHECK;
2595} 2633}
2596 2634
2597void noinline 2635void noinline
2598ev_timer_again (EV_P_ ev_timer *w) 2636ev_timer_again (EV_P_ ev_timer *w)
2599{ 2637{
… …
2678 periodics [active] = periodics [periodiccnt + HEAP0]; 2716 periodics [active] = periodics [periodiccnt + HEAP0];
2679 adjustheap (periodics, periodiccnt, active); 2717 adjustheap (periodics, periodiccnt, active);
2680 } 2718 }
2681 } 2719 }
2682 2720
2683 EV_FREQUENT_CHECK;
2684
2685 ev_stop (EV_A_ (W)w); 2721 ev_stop (EV_A_ (W)w);
2722
2723 EV_FREQUENT_CHECK;
2686} 2724}
2687 2725
2688void noinline 2726void noinline
2689ev_periodic_again (EV_P_ ev_periodic *w) 2727ev_periodic_again (EV_P_ ev_periodic *w)
2690{ 2728{
… …
2695#endif 2733#endif
2696 2734
2697#ifndef SA_RESTART 2735#ifndef SA_RESTART
2698# define SA_RESTART 0 2736# define SA_RESTART 0
2699#endif 2737#endif
2738
2739#if EV_SIGNAL_ENABLE
2700 2740
2701void noinline 2741void noinline
2702ev_signal_start (EV_P_ ev_signal *w) 2742ev_signal_start (EV_P_ ev_signal *w)
2703{ 2743{
2704 if (expect_false (ev_is_active (w))) 2744 if (expect_false (ev_is_active (w)))
… …
2751 if (!((WL)w)->next) 2791 if (!((WL)w)->next)
2752# if EV_USE_SIGNALFD 2792# if EV_USE_SIGNALFD
2753 if (sigfd < 0) /*TODO*/ 2793 if (sigfd < 0) /*TODO*/
2754# endif 2794# endif
2755 { 2795 {
2756# if _WIN32 2796# ifdef _WIN32
2797 evpipe_init (EV_A);
2798
2757 signal (w->signum, ev_sighandler); 2799 signal (w->signum, ev_sighandler);
2758# else 2800# else
2759 struct sigaction sa; 2801 struct sigaction sa;
2760 2802
2761 evpipe_init (EV_A); 2803 evpipe_init (EV_A);
… …
2792 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2834 signals [w->signum - 1].loop = 0; /* unattach from signal */
2793#endif 2835#endif
2794#if EV_USE_SIGNALFD 2836#if EV_USE_SIGNALFD
2795 if (sigfd >= 0) 2837 if (sigfd >= 0)
2796 { 2838 {
2797 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2839 sigset_t ss;
2840
2841 sigemptyset (&ss);
2842 sigaddset (&ss, w->signum);
2798 sigdelset (&sigfd_set, w->signum); 2843 sigdelset (&sigfd_set, w->signum);
2844
2799 signalfd (sigfd, &sigfd_set, 0); 2845 signalfd (sigfd, &sigfd_set, 0);
2800 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2846 sigprocmask (SIG_UNBLOCK, &ss, 0);
2801 /*TODO: maybe unblock signal? */
2802 } 2847 }
2803 else 2848 else
2804#endif 2849#endif
2805 signal (w->signum, SIG_DFL); 2850 signal (w->signum, SIG_DFL);
2806 } 2851 }
2807 2852
2808 EV_FREQUENT_CHECK; 2853 EV_FREQUENT_CHECK;
2809} 2854}
2855
2856#endif
2857
2858#if EV_CHILD_ENABLE
2810 2859
2811void 2860void
2812ev_child_start (EV_P_ ev_child *w) 2861ev_child_start (EV_P_ ev_child *w)
2813{ 2862{
2814#if EV_MULTIPLICITY 2863#if EV_MULTIPLICITY
… …
2838 ev_stop (EV_A_ (W)w); 2887 ev_stop (EV_A_ (W)w);
2839 2888
2840 EV_FREQUENT_CHECK; 2889 EV_FREQUENT_CHECK;
2841} 2890}
2842 2891
2892#endif
2893
2843#if EV_STAT_ENABLE 2894#if EV_STAT_ENABLE
2844 2895
2845# ifdef _WIN32 2896# ifdef _WIN32
2846# undef lstat 2897# undef lstat
2847# define lstat(a,b) _stati64 (a,b) 2898# define lstat(a,b) _stati64 (a,b)
… …
2852#define MIN_STAT_INTERVAL 0.1074891 2903#define MIN_STAT_INTERVAL 0.1074891
2853 2904
2854static 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);
2855 2906
2856#if EV_USE_INOTIFY 2907#if EV_USE_INOTIFY
2857# 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)
2858 2911
2859static void noinline 2912static void noinline
2860infy_add (EV_P_ ev_stat *w) 2913infy_add (EV_P_ ev_stat *w)
2861{ 2914{
2862 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);
2863 2916
2864 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 */
2865 { 2937 }
2938 else
2939 {
2940 /* can't use inotify, continue to stat */
2866 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2941 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2867 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2868 2942
2869 /* monitor some parent directory for speedup hints */ 2943 /* if path is not there, monitor some parent directory for speedup hints */
2870 /* 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, */
2871 /* but an efficiency issue only */ 2945 /* but an efficiency issue only */
2872 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2946 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2873 { 2947 {
2874 char path [4096]; 2948 char path [4096];
… …
2890 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2964 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2891 } 2965 }
2892 } 2966 }
2893 2967
2894 if (w->wd >= 0) 2968 if (w->wd >= 0)
2895 {
2896 struct statfs sfs;
2897
2898 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);
2899 2970
2900 /* now local changes will be tracked by inotify, but remote changes won't */ 2971 /* now re-arm timer, if required */
2901 /* unless the filesystem it known to be local, we therefore still poll */ 2972 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2902 /* also do poll on <2.6.25, but with normal frequency */
2903
2904 if (fs_2625 && !statfs (w->path, &sfs))
2905 if (sfs.f_type == 0x1373 /* devfs */
2906 || sfs.f_type == 0xEF53 /* ext2/3 */
2907 || sfs.f_type == 0x3153464a /* jfs */
2908 || sfs.f_type == 0x52654973 /* reiser3 */
2909 || sfs.f_type == 0x01021994 /* tempfs */
2910 || sfs.f_type == 0x58465342 /* xfs */)
2911 return;
2912
2913 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2914 ev_timer_again (EV_A_ &w->timer); 2973 ev_timer_again (EV_A_ &w->timer);
2915 } 2974 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2916} 2975}
2917 2976
2918static void noinline 2977static void noinline
2919infy_del (EV_P_ ev_stat *w) 2978infy_del (EV_P_ ev_stat *w)
2920{ 2979{
… …
2965 3024
2966static void 3025static void
2967infy_cb (EV_P_ ev_io *w, int revents) 3026infy_cb (EV_P_ ev_io *w, int revents)
2968{ 3027{
2969 char buf [EV_INOTIFY_BUFSIZE]; 3028 char buf [EV_INOTIFY_BUFSIZE];
2970 struct inotify_event *ev = (struct inotify_event *)buf;
2971 int ofs; 3029 int ofs;
2972 int len = read (fs_fd, buf, sizeof (buf)); 3030 int len = read (fs_fd, buf, sizeof (buf));
2973 3031
2974 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);
2975 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;
2976} 3070}
2977 3071
2978inline_size void 3072inline_size void
2979check_2625 (EV_P) 3073ev_check_2625 (EV_P)
2980{ 3074{
2981 /* kernels < 2.6.25 are borked 3075 /* kernels < 2.6.25 are borked
2982 * 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
2983 */ 3077 */
2984 struct utsname buf; 3078 if (ev_linux_version () < 0x020619)
2985 int major, minor, micro;
2986
2987 if (uname (&buf))
2988 return;
2989
2990 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2991 return;
2992
2993 if (major < 2
2994 || (major == 2 && minor < 6)
2995 || (major == 2 && minor == 6 && micro < 25))
2996 return; 3079 return;
2997 3080
2998 fs_2625 = 1; 3081 fs_2625 = 1;
2999} 3082}
3000 3083
… …
3015 if (fs_fd != -2) 3098 if (fs_fd != -2)
3016 return; 3099 return;
3017 3100
3018 fs_fd = -1; 3101 fs_fd = -1;
3019 3102
3020 check_2625 (EV_A); 3103 ev_check_2625 (EV_A);
3021 3104
3022 fs_fd = infy_newfd (); 3105 fs_fd = infy_newfd ();
3023 3106
3024 if (fs_fd >= 0) 3107 if (fs_fd >= 0)
3025 { 3108 {
3026 fd_intern (fs_fd); 3109 fd_intern (fs_fd);
3027 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3110 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
3028 ev_set_priority (&fs_w, EV_MAXPRI); 3111 ev_set_priority (&fs_w, EV_MAXPRI);
3029 ev_io_start (EV_A_ &fs_w); 3112 ev_io_start (EV_A_ &fs_w);
3113 ev_unref (EV_A);
3030 } 3114 }
3031} 3115}
3032 3116
3033inline_size void 3117inline_size void
3034infy_fork (EV_P) 3118infy_fork (EV_P)
… …
3036 int slot; 3120 int slot;
3037 3121
3038 if (fs_fd < 0) 3122 if (fs_fd < 0)
3039 return; 3123 return;
3040 3124
3125 ev_ref (EV_A);
3041 ev_io_stop (EV_A_ &fs_w); 3126 ev_io_stop (EV_A_ &fs_w);
3042 close (fs_fd); 3127 close (fs_fd);
3043 fs_fd = infy_newfd (); 3128 fs_fd = infy_newfd ();
3044 3129
3045 if (fs_fd >= 0) 3130 if (fs_fd >= 0)
3046 { 3131 {
3047 fd_intern (fs_fd); 3132 fd_intern (fs_fd);
3048 ev_io_set (&fs_w, fs_fd, EV_READ); 3133 ev_io_set (&fs_w, fs_fd, EV_READ);
3049 ev_io_start (EV_A_ &fs_w); 3134 ev_io_start (EV_A_ &fs_w);
3135 ev_unref (EV_A);
3050 } 3136 }
3051 3137
3052 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3138 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
3053 { 3139 {
3054 WL w_ = fs_hash [slot].head; 3140 WL w_ = fs_hash [slot].head;
… …
3062 w->wd = -1; 3148 w->wd = -1;
3063 3149
3064 if (fs_fd >= 0) 3150 if (fs_fd >= 0)
3065 infy_add (EV_A_ w); /* re-add, no matter what */ 3151 infy_add (EV_A_ w); /* re-add, no matter what */
3066 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);
3067 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 }
3068 } 3159 }
3069 } 3160 }
3070} 3161}
3071 3162
3072#endif 3163#endif
… …
3089static void noinline 3180static void noinline
3090stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3181stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3091{ 3182{
3092 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3183 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3093 3184
3094 /* we copy this here each the time so that */ 3185 ev_statdata prev = w->attr;
3095 /* prev has the old value when the callback gets invoked */
3096 w->prev = w->attr;
3097 ev_stat_stat (EV_A_ w); 3186 ev_stat_stat (EV_A_ w);
3098 3187
3099 /* 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 */
3100 if ( 3189 if (
3101 w->prev.st_dev != w->attr.st_dev 3190 prev.st_dev != w->attr.st_dev
3102 || w->prev.st_ino != w->attr.st_ino 3191 || prev.st_ino != w->attr.st_ino
3103 || w->prev.st_mode != w->attr.st_mode 3192 || prev.st_mode != w->attr.st_mode
3104 || w->prev.st_nlink != w->attr.st_nlink 3193 || prev.st_nlink != w->attr.st_nlink
3105 || w->prev.st_uid != w->attr.st_uid 3194 || prev.st_uid != w->attr.st_uid
3106 || w->prev.st_gid != w->attr.st_gid 3195 || prev.st_gid != w->attr.st_gid
3107 || w->prev.st_rdev != w->attr.st_rdev 3196 || prev.st_rdev != w->attr.st_rdev
3108 || w->prev.st_size != w->attr.st_size 3197 || prev.st_size != w->attr.st_size
3109 || w->prev.st_atime != w->attr.st_atime 3198 || prev.st_atime != w->attr.st_atime
3110 || w->prev.st_mtime != w->attr.st_mtime 3199 || prev.st_mtime != w->attr.st_mtime
3111 || w->prev.st_ctime != w->attr.st_ctime 3200 || prev.st_ctime != w->attr.st_ctime
3112 ) { 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
3113 #if EV_USE_INOTIFY 3207 #if EV_USE_INOTIFY
3114 if (fs_fd >= 0) 3208 if (fs_fd >= 0)
3115 { 3209 {
3116 infy_del (EV_A_ w); 3210 infy_del (EV_A_ w);
3117 infy_add (EV_A_ w); 3211 infy_add (EV_A_ w);
… …
3142 3236
3143 if (fs_fd >= 0) 3237 if (fs_fd >= 0)
3144 infy_add (EV_A_ w); 3238 infy_add (EV_A_ w);
3145 else 3239 else
3146#endif 3240#endif
3241 {
3147 ev_timer_again (EV_A_ &w->timer); 3242 ev_timer_again (EV_A_ &w->timer);
3243 ev_unref (EV_A);
3244 }
3148 3245
3149 ev_start (EV_A_ (W)w, 1); 3246 ev_start (EV_A_ (W)w, 1);
3150 3247
3151 EV_FREQUENT_CHECK; 3248 EV_FREQUENT_CHECK;
3152} 3249}
… …
3161 EV_FREQUENT_CHECK; 3258 EV_FREQUENT_CHECK;
3162 3259
3163#if EV_USE_INOTIFY 3260#if EV_USE_INOTIFY
3164 infy_del (EV_A_ w); 3261 infy_del (EV_A_ w);
3165#endif 3262#endif
3263
3264 if (ev_is_active (&w->timer))
3265 {
3266 ev_ref (EV_A);
3166 ev_timer_stop (EV_A_ &w->timer); 3267 ev_timer_stop (EV_A_ &w->timer);
3268 }
3167 3269
3168 ev_stop (EV_A_ (W)w); 3270 ev_stop (EV_A_ (W)w);
3169 3271
3170 EV_FREQUENT_CHECK; 3272 EV_FREQUENT_CHECK;
3171} 3273}
… …
3390 EV_FREQUENT_CHECK; 3492 EV_FREQUENT_CHECK;
3391 3493
3392 ev_io_stop (EV_A_ &w->io); 3494 ev_io_stop (EV_A_ &w->io);
3393 ev_prepare_stop (EV_A_ &w->prepare); 3495 ev_prepare_stop (EV_A_ &w->prepare);
3394 ev_fork_stop (EV_A_ &w->fork); 3496 ev_fork_stop (EV_A_ &w->fork);
3497
3498 ev_stop (EV_A_ (W)w);
3395 3499
3396 EV_FREQUENT_CHECK; 3500 EV_FREQUENT_CHECK;
3397} 3501}
3398#endif 3502#endif
3399 3503

Diff Legend

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