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

Comparing libev/ev.c (file contents):
Revision 1.306 by root, Sun Jul 19 06:35:25 2009 UTC vs.
Revision 1.330 by root, Tue Mar 9 08:46:17 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
… …
187#endif 189#endif
188 190
189/* this block tries to deduce configuration from header-defined symbols and defaults */ 191/* this block tries to deduce configuration from header-defined symbols and defaults */
190 192
191/* try to deduce the maximum number of signals on this platform */ 193/* try to deduce the maximum number of signals on this platform */
192/* one some platforms, NSIG is one too large. we do not bother */
193#if defined (EV_NSIG) 194#if defined (EV_NSIG)
194/* use what's provided */ 195/* use what's provided */
195#elif defined (NSIG) 196#elif defined (NSIG)
196# define EV_NSIG (NSIG) 197# define EV_NSIG (NSIG)
197#elif defined(_NSIG) 198#elif defined(_NSIG)
… …
303# define EV_USE_EVENTFD 0 304# define EV_USE_EVENTFD 0
304# endif 305# endif
305#endif 306#endif
306 307
307#ifndef EV_USE_SIGNALFD 308#ifndef EV_USE_SIGNALFD
308# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 309# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
309# define EV_USE_SIGNALFD 1 310# define EV_USE_SIGNALFD 1
310# else 311# else
311# define EV_USE_SIGNALFD 0 312# define EV_USE_SIGNALFD 0
312# endif 313# endif
313#endif 314#endif
… …
344# endif 345# endif
345#endif 346#endif
346 347
347/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 348/* this block fixes any misconfiguration where we know we run into trouble otherwise */
348 349
350#ifdef _AIX
351/* AIX has a completely broken poll.h header */
352# undef EV_USE_POLL
353# define EV_USE_POLL 0
354#endif
355
349#ifndef CLOCK_MONOTONIC 356#ifndef CLOCK_MONOTONIC
350# undef EV_USE_MONOTONIC 357# undef EV_USE_MONOTONIC
351# define EV_USE_MONOTONIC 0 358# define EV_USE_MONOTONIC 0
352#endif 359#endif
353 360
… …
387# include <stdint.h> 394# include <stdint.h>
388# ifndef EFD_NONBLOCK 395# ifndef EFD_NONBLOCK
389# define EFD_NONBLOCK O_NONBLOCK 396# define EFD_NONBLOCK O_NONBLOCK
390# endif 397# endif
391# ifndef EFD_CLOEXEC 398# ifndef EFD_CLOEXEC
399# ifdef O_CLOEXEC
392# define EFD_CLOEXEC O_CLOEXEC 400# define EFD_CLOEXEC O_CLOEXEC
401# else
402# define EFD_CLOEXEC 02000000
403# endif
393# endif 404# endif
394# ifdef __cplusplus 405# ifdef __cplusplus
395extern "C" { 406extern "C" {
396# endif 407# endif
397int eventfd (unsigned int initval, int flags); 408int (eventfd) (unsigned int initval, int flags);
398# ifdef __cplusplus 409# ifdef __cplusplus
399} 410}
400# endif 411# endif
401#endif 412#endif
402 413
403#if EV_USE_SIGNALFD 414#if EV_USE_SIGNALFD
404# include <sys/signalfd.h> 415/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
416# include <stdint.h>
417# ifndef SFD_NONBLOCK
418# define SFD_NONBLOCK O_NONBLOCK
405#endif 419# endif
420# ifndef SFD_CLOEXEC
421# ifdef O_CLOEXEC
422# define SFD_CLOEXEC O_CLOEXEC
423# else
424# define SFD_CLOEXEC 02000000
425# endif
426# endif
427# ifdef __cplusplus
428extern "C" {
429# endif
430int signalfd (int fd, const sigset_t *mask, int flags);
431
432struct signalfd_siginfo
433{
434 uint32_t ssi_signo;
435 char pad[128 - sizeof (uint32_t)];
436};
437# ifdef __cplusplus
438}
439# endif
440#endif
441
406 442
407/**/ 443/**/
408 444
409#if EV_VERIFY >= 3 445#if EV_VERIFY >= 3
410# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 446# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
… …
422 */ 458 */
423#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 459#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
424 460
425#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 461#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
426#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 462#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
427/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
428 463
429#if __GNUC__ >= 4 464#if __GNUC__ >= 4
430# define expect(expr,value) __builtin_expect ((expr),(value)) 465# define expect(expr,value) __builtin_expect ((expr),(value))
431# define noinline __attribute__ ((noinline)) 466# define noinline __attribute__ ((noinline))
432#else 467#else
… …
473 508
474#if EV_USE_MONOTONIC 509#if EV_USE_MONOTONIC
475static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 510static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
476#endif 511#endif
477 512
513#ifndef EV_FD_TO_WIN32_HANDLE
514# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
515#endif
516#ifndef EV_WIN32_HANDLE_TO_FD
517# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
518#endif
519#ifndef EV_WIN32_CLOSE_FD
520# define EV_WIN32_CLOSE_FD(fd) close (fd)
521#endif
522
478#ifdef _WIN32 523#ifdef _WIN32
479# include "ev_win32.c" 524# include "ev_win32.c"
480#endif 525#endif
481 526
482/*****************************************************************************/ 527/*****************************************************************************/
… …
497 542
498 if (syserr_cb) 543 if (syserr_cb)
499 syserr_cb (msg); 544 syserr_cb (msg);
500 else 545 else
501 { 546 {
547#if EV_AVOID_STDIO
548 write (STDERR_FILENO, msg, strlen (msg));
549 write (STDERR_FILENO, ": ", 2);
550 msg = strerror (errno);
551 write (STDERR_FILENO, msg, strlen (msg));
552 write (STDERR_FILENO, "\n", 1);
553#else
502 perror (msg); 554 perror (msg);
555#endif
503 abort (); 556 abort ();
504 } 557 }
505} 558}
506 559
507static void * 560static void *
… …
532{ 585{
533 ptr = alloc (ptr, size); 586 ptr = alloc (ptr, size);
534 587
535 if (!ptr && size) 588 if (!ptr && size)
536 { 589 {
590#if EV_AVOID_STDIO
591 write (STDERR_FILENO, "libev: memory allocation failed, aborting.",
592 sizeof ("libev: memory allocation failed, aborting.") - 1);
593#else
537 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 594 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
595#endif
538 abort (); 596 abort ();
539 } 597 }
540 598
541 return ptr; 599 return ptr;
542} 600}
… …
873 931
874#if EV_SELECT_IS_WINSOCKET 932#if EV_SELECT_IS_WINSOCKET
875 if (events) 933 if (events)
876 { 934 {
877 unsigned long arg; 935 unsigned long arg;
878 #ifdef EV_FD_TO_WIN32_HANDLE
879 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 936 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
880 #else
881 anfd->handle = _get_osfhandle (fd);
882 #endif
883 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 937 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
884 } 938 }
885#endif 939#endif
886 940
887 { 941 {
… …
930/* check whether the given fd is atcually valid, for error recovery */ 984/* check whether the given fd is atcually valid, for error recovery */
931inline_size int 985inline_size int
932fd_valid (int fd) 986fd_valid (int fd)
933{ 987{
934#ifdef _WIN32 988#ifdef _WIN32
935 return _get_osfhandle (fd) != -1; 989 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
936#else 990#else
937 return fcntl (fd, F_GETFD) != -1; 991 return fcntl (fd, F_GETFD) != -1;
938#endif 992#endif
939} 993}
940 994
… …
958 1012
959 for (fd = anfdmax; fd--; ) 1013 for (fd = anfdmax; fd--; )
960 if (anfds [fd].events) 1014 if (anfds [fd].events)
961 { 1015 {
962 fd_kill (EV_A_ fd); 1016 fd_kill (EV_A_ fd);
963 return; 1017 break;
964 } 1018 }
965} 1019}
966 1020
967/* usually called after fork if backend needs to re-arm all fds from scratch */ 1021/* usually called after fork if backend needs to re-arm all fds from scratch */
968static void noinline 1022static void noinline
… …
1058 1112
1059 for (;;) 1113 for (;;)
1060 { 1114 {
1061 int c = k << 1; 1115 int c = k << 1;
1062 1116
1063 if (c > N + HEAP0 - 1) 1117 if (c >= N + HEAP0)
1064 break; 1118 break;
1065 1119
1066 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1120 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1067 ? 1 : 0; 1121 ? 1 : 0;
1068 1122
… …
1104 1158
1105/* move an element suitably so it is in a correct place */ 1159/* move an element suitably so it is in a correct place */
1106inline_size void 1160inline_size void
1107adjustheap (ANHE *heap, int N, int k) 1161adjustheap (ANHE *heap, int N, int k)
1108{ 1162{
1109 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1163 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1110 upheap (heap, k); 1164 upheap (heap, k);
1111 else 1165 else
1112 downheap (heap, N, k); 1166 downheap (heap, N, k);
1113} 1167}
1114 1168
… …
1127/*****************************************************************************/ 1181/*****************************************************************************/
1128 1182
1129/* associate signal watchers to a signal signal */ 1183/* associate signal watchers to a signal signal */
1130typedef struct 1184typedef struct
1131{ 1185{
1186 EV_ATOMIC_T pending;
1132#if EV_MULTIPLICITY 1187#if EV_MULTIPLICITY
1133 EV_P; 1188 EV_P;
1134#endif 1189#endif
1135 WL head; 1190 WL head;
1136 EV_ATOMIC_T gotsig;
1137} ANSIG; 1191} ANSIG;
1138 1192
1139static ANSIG signals [EV_NSIG - 1]; 1193static ANSIG signals [EV_NSIG - 1];
1140static EV_ATOMIC_T gotsig;
1141 1194
1142/*****************************************************************************/ 1195/*****************************************************************************/
1143 1196
1144/* used to prepare libev internal fd's */ 1197/* used to prepare libev internal fd's */
1145/* this is not fork-safe */ 1198/* this is not fork-safe */
1146inline_speed void 1199inline_speed void
1147fd_intern (int fd) 1200fd_intern (int fd)
1148{ 1201{
1149#ifdef _WIN32 1202#ifdef _WIN32
1150 unsigned long arg = 1; 1203 unsigned long arg = 1;
1151 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1204 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1152#else 1205#else
1153 fcntl (fd, F_SETFD, FD_CLOEXEC); 1206 fcntl (fd, F_SETFD, FD_CLOEXEC);
1154 fcntl (fd, F_SETFL, O_NONBLOCK); 1207 fcntl (fd, F_SETFL, O_NONBLOCK);
1155#endif 1208#endif
1156} 1209}
… …
1213/* called whenever the libev signal pipe */ 1266/* called whenever the libev signal pipe */
1214/* got some events (signal, async) */ 1267/* got some events (signal, async) */
1215static void 1268static void
1216pipecb (EV_P_ ev_io *iow, int revents) 1269pipecb (EV_P_ ev_io *iow, int revents)
1217{ 1270{
1271 int i;
1272
1218#if EV_USE_EVENTFD 1273#if EV_USE_EVENTFD
1219 if (evfd >= 0) 1274 if (evfd >= 0)
1220 { 1275 {
1221 uint64_t counter; 1276 uint64_t counter;
1222 read (evfd, &counter, sizeof (uint64_t)); 1277 read (evfd, &counter, sizeof (uint64_t));
… …
1226 { 1281 {
1227 char dummy; 1282 char dummy;
1228 read (evpipe [0], &dummy, 1); 1283 read (evpipe [0], &dummy, 1);
1229 } 1284 }
1230 1285
1231 if (gotsig && ev_is_default_loop (EV_A)) 1286 if (sig_pending)
1232 { 1287 {
1233 int signum; 1288 sig_pending = 0;
1234 gotsig = 0;
1235 1289
1236 for (signum = EV_NSIG - 1; signum--; ) 1290 for (i = EV_NSIG - 1; i--; )
1237 if (signals [signum].gotsig) 1291 if (expect_false (signals [i].pending))
1238 ev_feed_signal_event (EV_A_ signum + 1); 1292 ev_feed_signal_event (EV_A_ i + 1);
1239 } 1293 }
1240 1294
1241#if EV_ASYNC_ENABLE 1295#if EV_ASYNC_ENABLE
1242 if (gotasync) 1296 if (async_pending)
1243 { 1297 {
1244 int i; 1298 async_pending = 0;
1245 gotasync = 0;
1246 1299
1247 for (i = asynccnt; i--; ) 1300 for (i = asynccnt; i--; )
1248 if (asyncs [i]->sent) 1301 if (asyncs [i]->sent)
1249 { 1302 {
1250 asyncs [i]->sent = 0; 1303 asyncs [i]->sent = 0;
… …
1261{ 1314{
1262#if EV_MULTIPLICITY 1315#if EV_MULTIPLICITY
1263 EV_P = signals [signum - 1].loop; 1316 EV_P = signals [signum - 1].loop;
1264#endif 1317#endif
1265 1318
1266#if _WIN32 1319#ifdef _WIN32
1267 signal (signum, ev_sighandler); 1320 signal (signum, ev_sighandler);
1268#endif 1321#endif
1269 1322
1270 signals [signum - 1].gotsig = 1; 1323 signals [signum - 1].pending = 1;
1271 evpipe_write (EV_A_ &gotsig); 1324 evpipe_write (EV_A_ &sig_pending);
1272} 1325}
1273 1326
1274void noinline 1327void noinline
1275ev_feed_signal_event (EV_P_ int signum) 1328ev_feed_signal_event (EV_P_ int signum)
1276{ 1329{
1277 WL w; 1330 WL w;
1278 1331
1332 if (expect_false (signum <= 0 || signum > EV_NSIG))
1333 return;
1334
1335 --signum;
1336
1279#if EV_MULTIPLICITY 1337#if EV_MULTIPLICITY
1280 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1338 /* it is permissible to try to feed a signal to the wrong loop */
1281#endif 1339 /* or, likely more useful, feeding a signal nobody is waiting for */
1282 1340
1283 if (signum <= 0 || signum > EV_NSIG) 1341 if (expect_false (signals [signum].loop != EV_A))
1284 return; 1342 return;
1343#endif
1285 1344
1286 --signum;
1287
1288 signals [signum].gotsig = 0; 1345 signals [signum].pending = 0;
1289 1346
1290 for (w = signals [signum].head; w; w = w->next) 1347 for (w = signals [signum].head; w; w = w->next)
1291 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1348 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1292} 1349}
1293 1350
… …
1560 1617
1561 io_blocktime = 0.; 1618 io_blocktime = 0.;
1562 timeout_blocktime = 0.; 1619 timeout_blocktime = 0.;
1563 backend = 0; 1620 backend = 0;
1564 backend_fd = -1; 1621 backend_fd = -1;
1565 gotasync = 0; 1622 sig_pending = 0;
1623#if EV_ASYNC_ENABLE
1624 async_pending = 0;
1625#endif
1566#if EV_USE_INOTIFY 1626#if EV_USE_INOTIFY
1567 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1627 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1568#endif 1628#endif
1569#if EV_USE_SIGNALFD 1629#if EV_USE_SIGNALFD
1570 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1630 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1571#endif 1631#endif
1572 1632
1573 if (!(flags & 0x0000ffffU)) 1633 if (!(flags & 0x0000ffffU))
1574 flags |= ev_recommended_backends (); 1634 flags |= ev_recommended_backends ();
1575 1635
… …
1612 close (evfd); 1672 close (evfd);
1613#endif 1673#endif
1614 1674
1615 if (evpipe [0] >= 0) 1675 if (evpipe [0] >= 0)
1616 { 1676 {
1617 close (evpipe [0]); 1677 EV_WIN32_CLOSE_FD (evpipe [0]);
1618 close (evpipe [1]); 1678 EV_WIN32_CLOSE_FD (evpipe [1]);
1619 } 1679 }
1620 } 1680 }
1621 1681
1622#if EV_USE_SIGNALFD 1682#if EV_USE_SIGNALFD
1623 if (ev_is_active (&sigfd_w)) 1683 if (ev_is_active (&sigfd_w))
1624 {
1625 /*ev_ref (EV_A);*/
1626 /*ev_io_stop (EV_A_ &sigfd_w);*/
1627
1628 close (sigfd); 1684 close (sigfd);
1629 }
1630#endif 1685#endif
1631 1686
1632#if EV_USE_INOTIFY 1687#if EV_USE_INOTIFY
1633 if (fs_fd >= 0) 1688 if (fs_fd >= 0)
1634 close (fs_fd); 1689 close (fs_fd);
… …
1704 1759
1705 if (ev_is_active (&pipe_w)) 1760 if (ev_is_active (&pipe_w))
1706 { 1761 {
1707 /* this "locks" the handlers against writing to the pipe */ 1762 /* this "locks" the handlers against writing to the pipe */
1708 /* while we modify the fd vars */ 1763 /* while we modify the fd vars */
1709 gotsig = 1; 1764 sig_pending = 1;
1710#if EV_ASYNC_ENABLE 1765#if EV_ASYNC_ENABLE
1711 gotasync = 1; 1766 async_pending = 1;
1712#endif 1767#endif
1713 1768
1714 ev_ref (EV_A); 1769 ev_ref (EV_A);
1715 ev_io_stop (EV_A_ &pipe_w); 1770 ev_io_stop (EV_A_ &pipe_w);
1716 1771
… …
1719 close (evfd); 1774 close (evfd);
1720#endif 1775#endif
1721 1776
1722 if (evpipe [0] >= 0) 1777 if (evpipe [0] >= 0)
1723 { 1778 {
1724 close (evpipe [0]); 1779 EV_WIN32_CLOSE_FD (evpipe [0]);
1725 close (evpipe [1]); 1780 EV_WIN32_CLOSE_FD (evpipe [1]);
1726 } 1781 }
1727 1782
1728 evpipe_init (EV_A); 1783 evpipe_init (EV_A);
1729 /* now iterate over everything, in case we missed something */ 1784 /* now iterate over everything, in case we missed something */
1730 pipecb (EV_A_ &pipe_w, EV_READ); 1785 pipecb (EV_A_ &pipe_w, EV_READ);
… …
1856 assert (checkmax >= checkcnt); 1911 assert (checkmax >= checkcnt);
1857 array_verify (EV_A_ (W *)checks, checkcnt); 1912 array_verify (EV_A_ (W *)checks, checkcnt);
1858 1913
1859# if 0 1914# if 0
1860 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1915 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1861 for (signum = EV_NSIG; signum--; ) if (signals [signum].gotsig) 1916 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1862# endif 1917# endif
1863#endif 1918#endif
1864} 1919}
1865#endif 1920#endif
1866 1921
… …
2122 ANHE_at_cache (*he); 2177 ANHE_at_cache (*he);
2123 } 2178 }
2124} 2179}
2125 2180
2126/* fetch new monotonic and realtime times from the kernel */ 2181/* fetch new monotonic and realtime times from the kernel */
2127/* also detetc if there was a timejump, and act accordingly */ 2182/* also detect if there was a timejump, and act accordingly */
2128inline_speed void 2183inline_speed void
2129time_update (EV_P_ ev_tstamp max_block) 2184time_update (EV_P_ ev_tstamp max_block)
2130{ 2185{
2131#if EV_USE_MONOTONIC 2186#if EV_USE_MONOTONIC
2132 if (expect_true (have_monotonic)) 2187 if (expect_true (have_monotonic))
… …
2393inline_size void 2448inline_size void
2394wlist_del (WL *head, WL elem) 2449wlist_del (WL *head, WL elem)
2395{ 2450{
2396 while (*head) 2451 while (*head)
2397 { 2452 {
2398 if (*head == elem) 2453 if (expect_true (*head == elem))
2399 { 2454 {
2400 *head = elem->next; 2455 *head = elem->next;
2401 return; 2456 break;
2402 } 2457 }
2403 2458
2404 head = &(*head)->next; 2459 head = &(*head)->next;
2405 } 2460 }
2406} 2461}
… …
2466 2521
2467 if (expect_false (ev_is_active (w))) 2522 if (expect_false (ev_is_active (w)))
2468 return; 2523 return;
2469 2524
2470 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2525 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2471 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2526 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2472 2527
2473 EV_FREQUENT_CHECK; 2528 EV_FREQUENT_CHECK;
2474 2529
2475 ev_start (EV_A_ (W)w, 1); 2530 ev_start (EV_A_ (W)w, 1);
2476 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2531 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2546 timers [active] = timers [timercnt + HEAP0]; 2601 timers [active] = timers [timercnt + HEAP0];
2547 adjustheap (timers, timercnt, active); 2602 adjustheap (timers, timercnt, active);
2548 } 2603 }
2549 } 2604 }
2550 2605
2551 EV_FREQUENT_CHECK;
2552
2553 ev_at (w) -= mn_now; 2606 ev_at (w) -= mn_now;
2554 2607
2555 ev_stop (EV_A_ (W)w); 2608 ev_stop (EV_A_ (W)w);
2609
2610 EV_FREQUENT_CHECK;
2556} 2611}
2557 2612
2558void noinline 2613void noinline
2559ev_timer_again (EV_P_ ev_timer *w) 2614ev_timer_again (EV_P_ ev_timer *w)
2560{ 2615{
… …
2639 periodics [active] = periodics [periodiccnt + HEAP0]; 2694 periodics [active] = periodics [periodiccnt + HEAP0];
2640 adjustheap (periodics, periodiccnt, active); 2695 adjustheap (periodics, periodiccnt, active);
2641 } 2696 }
2642 } 2697 }
2643 2698
2644 EV_FREQUENT_CHECK;
2645
2646 ev_stop (EV_A_ (W)w); 2699 ev_stop (EV_A_ (W)w);
2700
2701 EV_FREQUENT_CHECK;
2647} 2702}
2648 2703
2649void noinline 2704void noinline
2650ev_periodic_again (EV_P_ ev_periodic *w) 2705ev_periodic_again (EV_P_ ev_periodic *w)
2651{ 2706{
… …
2666 return; 2721 return;
2667 2722
2668 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG)); 2723 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2669 2724
2670#if EV_MULTIPLICITY 2725#if EV_MULTIPLICITY
2671 assert (("libev: tried to attach to a signal from two different loops", 2726 assert (("libev: a signal must not be attached to two different loops",
2672 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop)); 2727 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2673 2728
2674 signals [w->signum - 1].loop = EV_A; 2729 signals [w->signum - 1].loop = EV_A;
2675#endif 2730#endif
2676 2731
… …
2712 if (!((WL)w)->next) 2767 if (!((WL)w)->next)
2713# if EV_USE_SIGNALFD 2768# if EV_USE_SIGNALFD
2714 if (sigfd < 0) /*TODO*/ 2769 if (sigfd < 0) /*TODO*/
2715# endif 2770# endif
2716 { 2771 {
2717# if _WIN32 2772# ifdef _WIN32
2773 evpipe_init (EV_A);
2774
2718 signal (w->signum, ev_sighandler); 2775 signal (w->signum, ev_sighandler);
2719# else 2776# else
2720 struct sigaction sa; 2777 struct sigaction sa;
2721 2778
2722 evpipe_init (EV_A); 2779 evpipe_init (EV_A);
… …
2747 wlist_del (&signals [w->signum - 1].head, (WL)w); 2804 wlist_del (&signals [w->signum - 1].head, (WL)w);
2748 ev_stop (EV_A_ (W)w); 2805 ev_stop (EV_A_ (W)w);
2749 2806
2750 if (!signals [w->signum - 1].head) 2807 if (!signals [w->signum - 1].head)
2751 { 2808 {
2752 #if EV_MULTIPLICITY 2809#if EV_MULTIPLICITY
2753 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2810 signals [w->signum - 1].loop = 0; /* unattach from signal */
2754 #endif 2811#endif
2755 #if EV_USE_SIGNALFD 2812#if EV_USE_SIGNALFD
2756 if (sigfd >= 0) 2813 if (sigfd >= 0)
2757 { 2814 {
2758 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2815 sigset_t ss;
2816
2817 sigemptyset (&ss);
2818 sigaddset (&ss, w->signum);
2759 sigdelset (&sigfd_set, w->signum); 2819 sigdelset (&sigfd_set, w->signum);
2820
2760 signalfd (sigfd, &sigfd_set, 0); 2821 signalfd (sigfd, &sigfd_set, 0);
2761 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2822 sigprocmask (SIG_UNBLOCK, &ss, 0);
2762 /*TODO: maybe unblock signal? */
2763 } 2823 }
2764 else 2824 else
2765 #endif 2825#endif
2766 signal (w->signum, SIG_DFL); 2826 signal (w->signum, SIG_DFL);
2767 } 2827 }
2768 2828
2769 EV_FREQUENT_CHECK; 2829 EV_FREQUENT_CHECK;
2770} 2830}
… …
2813#define MIN_STAT_INTERVAL 0.1074891 2873#define MIN_STAT_INTERVAL 0.1074891
2814 2874
2815static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2875static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2816 2876
2817#if EV_USE_INOTIFY 2877#if EV_USE_INOTIFY
2818# define EV_INOTIFY_BUFSIZE 8192 2878
2879/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2880# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2819 2881
2820static void noinline 2882static void noinline
2821infy_add (EV_P_ ev_stat *w) 2883infy_add (EV_P_ ev_stat *w)
2822{ 2884{
2823 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); 2885 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);
2824 2886
2825 if (w->wd < 0) 2887 if (w->wd >= 0)
2888 {
2889 struct statfs sfs;
2890
2891 /* now local changes will be tracked by inotify, but remote changes won't */
2892 /* unless the filesystem is known to be local, we therefore still poll */
2893 /* also do poll on <2.6.25, but with normal frequency */
2894
2895 if (!fs_2625)
2896 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2897 else if (!statfs (w->path, &sfs)
2898 && (sfs.f_type == 0x1373 /* devfs */
2899 || sfs.f_type == 0xEF53 /* ext2/3 */
2900 || sfs.f_type == 0x3153464a /* jfs */
2901 || sfs.f_type == 0x52654973 /* reiser3 */
2902 || sfs.f_type == 0x01021994 /* tempfs */
2903 || sfs.f_type == 0x58465342 /* xfs */))
2904 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2905 else
2906 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2826 { 2907 }
2908 else
2909 {
2910 /* can't use inotify, continue to stat */
2827 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2911 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2828 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2829 2912
2830 /* monitor some parent directory for speedup hints */ 2913 /* if path is not there, monitor some parent directory for speedup hints */
2831 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2914 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2832 /* but an efficiency issue only */ 2915 /* but an efficiency issue only */
2833 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2916 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2834 { 2917 {
2835 char path [4096]; 2918 char path [4096];
… …
2851 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2934 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2852 } 2935 }
2853 } 2936 }
2854 2937
2855 if (w->wd >= 0) 2938 if (w->wd >= 0)
2856 {
2857 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2939 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2858 2940
2859 /* now local changes will be tracked by inotify, but remote changes won't */ 2941 /* now re-arm timer, if required */
2860 /* unless the filesystem it known to be local, we therefore still poll */ 2942 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2861 /* also do poll on <2.6.25, but with normal frequency */
2862 struct statfs sfs;
2863
2864 if (fs_2625 && !statfs (w->path, &sfs))
2865 if (sfs.f_type == 0x1373 /* devfs */
2866 || sfs.f_type == 0xEF53 /* ext2/3 */
2867 || sfs.f_type == 0x3153464a /* jfs */
2868 || sfs.f_type == 0x52654973 /* reiser3 */
2869 || sfs.f_type == 0x01021994 /* tempfs */
2870 || sfs.f_type == 0x58465342 /* xfs */)
2871 return;
2872
2873 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2874 ev_timer_again (EV_A_ &w->timer); 2943 ev_timer_again (EV_A_ &w->timer);
2875 } 2944 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2876} 2945}
2877 2946
2878static void noinline 2947static void noinline
2879infy_del (EV_P_ ev_stat *w) 2948infy_del (EV_P_ ev_stat *w)
2880{ 2949{
… …
2925 2994
2926static void 2995static void
2927infy_cb (EV_P_ ev_io *w, int revents) 2996infy_cb (EV_P_ ev_io *w, int revents)
2928{ 2997{
2929 char buf [EV_INOTIFY_BUFSIZE]; 2998 char buf [EV_INOTIFY_BUFSIZE];
2930 struct inotify_event *ev = (struct inotify_event *)buf;
2931 int ofs; 2999 int ofs;
2932 int len = read (fs_fd, buf, sizeof (buf)); 3000 int len = read (fs_fd, buf, sizeof (buf));
2933 3001
2934 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3002 for (ofs = 0; ofs < len; )
3003 {
3004 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2935 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3005 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3006 ofs += sizeof (struct inotify_event) + ev->len;
3007 }
3008}
3009
3010inline_size unsigned int
3011ev_linux_version (void)
3012{
3013 struct utsname buf;
3014 unsigned int v;
3015 int i;
3016 char *p = buf.release;
3017
3018 if (uname (&buf))
3019 return 0;
3020
3021 for (i = 3+1; --i; )
3022 {
3023 unsigned int c = 0;
3024
3025 for (;;)
3026 {
3027 if (*p >= '0' && *p <= '9')
3028 c = c * 10 + *p++ - '0';
3029 else
3030 {
3031 p += *p == '.';
3032 break;
3033 }
3034 }
3035
3036 v = (v << 8) | c;
3037 }
3038
3039 return v;
2936} 3040}
2937 3041
2938inline_size void 3042inline_size void
2939check_2625 (EV_P) 3043ev_check_2625 (EV_P)
2940{ 3044{
2941 /* kernels < 2.6.25 are borked 3045 /* kernels < 2.6.25 are borked
2942 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3046 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2943 */ 3047 */
2944 struct utsname buf; 3048 if (ev_linux_version () < 0x020619)
2945 int major, minor, micro;
2946
2947 if (uname (&buf))
2948 return; 3049 return;
2949 3050
2950 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2951 return;
2952
2953 if (major < 2
2954 || (major == 2 && minor < 6)
2955 || (major == 2 && minor == 6 && micro < 25))
2956 return;
2957
2958 fs_2625 = 1; 3051 fs_2625 = 1;
3052}
3053
3054inline_size int
3055infy_newfd (void)
3056{
3057#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3058 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3059 if (fd >= 0)
3060 return fd;
3061#endif
3062 return inotify_init ();
2959} 3063}
2960 3064
2961inline_size void 3065inline_size void
2962infy_init (EV_P) 3066infy_init (EV_P)
2963{ 3067{
2964 if (fs_fd != -2) 3068 if (fs_fd != -2)
2965 return; 3069 return;
2966 3070
2967 fs_fd = -1; 3071 fs_fd = -1;
2968 3072
2969 check_2625 (EV_A); 3073 ev_check_2625 (EV_A);
2970 3074
2971 fs_fd = inotify_init (); 3075 fs_fd = infy_newfd ();
2972 3076
2973 if (fs_fd >= 0) 3077 if (fs_fd >= 0)
2974 { 3078 {
3079 fd_intern (fs_fd);
2975 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3080 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2976 ev_set_priority (&fs_w, EV_MAXPRI); 3081 ev_set_priority (&fs_w, EV_MAXPRI);
2977 ev_io_start (EV_A_ &fs_w); 3082 ev_io_start (EV_A_ &fs_w);
3083 ev_unref (EV_A);
2978 } 3084 }
2979} 3085}
2980 3086
2981inline_size void 3087inline_size void
2982infy_fork (EV_P) 3088infy_fork (EV_P)
… …
2984 int slot; 3090 int slot;
2985 3091
2986 if (fs_fd < 0) 3092 if (fs_fd < 0)
2987 return; 3093 return;
2988 3094
3095 ev_ref (EV_A);
3096 ev_io_stop (EV_A_ &fs_w);
2989 close (fs_fd); 3097 close (fs_fd);
2990 fs_fd = inotify_init (); 3098 fs_fd = infy_newfd ();
3099
3100 if (fs_fd >= 0)
3101 {
3102 fd_intern (fs_fd);
3103 ev_io_set (&fs_w, fs_fd, EV_READ);
3104 ev_io_start (EV_A_ &fs_w);
3105 ev_unref (EV_A);
3106 }
2991 3107
2992 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3108 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2993 { 3109 {
2994 WL w_ = fs_hash [slot].head; 3110 WL w_ = fs_hash [slot].head;
2995 fs_hash [slot].head = 0; 3111 fs_hash [slot].head = 0;
… …
3002 w->wd = -1; 3118 w->wd = -1;
3003 3119
3004 if (fs_fd >= 0) 3120 if (fs_fd >= 0)
3005 infy_add (EV_A_ w); /* re-add, no matter what */ 3121 infy_add (EV_A_ w); /* re-add, no matter what */
3006 else 3122 else
3123 {
3124 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3125 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3007 ev_timer_again (EV_A_ &w->timer); 3126 ev_timer_again (EV_A_ &w->timer);
3127 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3128 }
3008 } 3129 }
3009 } 3130 }
3010} 3131}
3011 3132
3012#endif 3133#endif
… …
3029static void noinline 3150static void noinline
3030stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3151stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3031{ 3152{
3032 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3153 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3033 3154
3034 /* we copy this here each the time so that */ 3155 ev_statdata prev = w->attr;
3035 /* prev has the old value when the callback gets invoked */
3036 w->prev = w->attr;
3037 ev_stat_stat (EV_A_ w); 3156 ev_stat_stat (EV_A_ w);
3038 3157
3039 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3158 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3040 if ( 3159 if (
3041 w->prev.st_dev != w->attr.st_dev 3160 prev.st_dev != w->attr.st_dev
3042 || w->prev.st_ino != w->attr.st_ino 3161 || prev.st_ino != w->attr.st_ino
3043 || w->prev.st_mode != w->attr.st_mode 3162 || prev.st_mode != w->attr.st_mode
3044 || w->prev.st_nlink != w->attr.st_nlink 3163 || prev.st_nlink != w->attr.st_nlink
3045 || w->prev.st_uid != w->attr.st_uid 3164 || prev.st_uid != w->attr.st_uid
3046 || w->prev.st_gid != w->attr.st_gid 3165 || prev.st_gid != w->attr.st_gid
3047 || w->prev.st_rdev != w->attr.st_rdev 3166 || prev.st_rdev != w->attr.st_rdev
3048 || w->prev.st_size != w->attr.st_size 3167 || prev.st_size != w->attr.st_size
3049 || w->prev.st_atime != w->attr.st_atime 3168 || prev.st_atime != w->attr.st_atime
3050 || w->prev.st_mtime != w->attr.st_mtime 3169 || prev.st_mtime != w->attr.st_mtime
3051 || w->prev.st_ctime != w->attr.st_ctime 3170 || prev.st_ctime != w->attr.st_ctime
3052 ) { 3171 ) {
3172 /* we only update w->prev on actual differences */
3173 /* in case we test more often than invoke the callback, */
3174 /* to ensure that prev is always different to attr */
3175 w->prev = prev;
3176
3053 #if EV_USE_INOTIFY 3177 #if EV_USE_INOTIFY
3054 if (fs_fd >= 0) 3178 if (fs_fd >= 0)
3055 { 3179 {
3056 infy_del (EV_A_ w); 3180 infy_del (EV_A_ w);
3057 infy_add (EV_A_ w); 3181 infy_add (EV_A_ w);
… …
3082 3206
3083 if (fs_fd >= 0) 3207 if (fs_fd >= 0)
3084 infy_add (EV_A_ w); 3208 infy_add (EV_A_ w);
3085 else 3209 else
3086#endif 3210#endif
3211 {
3087 ev_timer_again (EV_A_ &w->timer); 3212 ev_timer_again (EV_A_ &w->timer);
3213 ev_unref (EV_A);
3214 }
3088 3215
3089 ev_start (EV_A_ (W)w, 1); 3216 ev_start (EV_A_ (W)w, 1);
3090 3217
3091 EV_FREQUENT_CHECK; 3218 EV_FREQUENT_CHECK;
3092} 3219}
… …
3101 EV_FREQUENT_CHECK; 3228 EV_FREQUENT_CHECK;
3102 3229
3103#if EV_USE_INOTIFY 3230#if EV_USE_INOTIFY
3104 infy_del (EV_A_ w); 3231 infy_del (EV_A_ w);
3105#endif 3232#endif
3233
3234 if (ev_is_active (&w->timer))
3235 {
3236 ev_ref (EV_A);
3106 ev_timer_stop (EV_A_ &w->timer); 3237 ev_timer_stop (EV_A_ &w->timer);
3238 }
3107 3239
3108 ev_stop (EV_A_ (W)w); 3240 ev_stop (EV_A_ (W)w);
3109 3241
3110 EV_FREQUENT_CHECK; 3242 EV_FREQUENT_CHECK;
3111} 3243}
… …
3331 3463
3332 ev_io_stop (EV_A_ &w->io); 3464 ev_io_stop (EV_A_ &w->io);
3333 ev_prepare_stop (EV_A_ &w->prepare); 3465 ev_prepare_stop (EV_A_ &w->prepare);
3334 ev_fork_stop (EV_A_ &w->fork); 3466 ev_fork_stop (EV_A_ &w->fork);
3335 3467
3468 ev_stop (EV_A_ (W)w);
3469
3336 EV_FREQUENT_CHECK; 3470 EV_FREQUENT_CHECK;
3337} 3471}
3338#endif 3472#endif
3339 3473
3340#if EV_FORK_ENABLE 3474#if EV_FORK_ENABLE
… …
3416 3550
3417void 3551void
3418ev_async_send (EV_P_ ev_async *w) 3552ev_async_send (EV_P_ ev_async *w)
3419{ 3553{
3420 w->sent = 1; 3554 w->sent = 1;
3421 evpipe_write (EV_A_ &gotasync); 3555 evpipe_write (EV_A_ &async_pending);
3422} 3556}
3423#endif 3557#endif
3424 3558
3425/*****************************************************************************/ 3559/*****************************************************************************/
3426 3560

Diff Legend

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