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.333 by root, Tue Mar 9 08:58:22 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 */
192/* one some platforms, NSIG is one too large. we do not bother */
193#if defined (EV_NSIG) 195#if defined (EV_NSIG)
194/* use what's provided */ 196/* use what's provided */
195#elif defined (NSIG) 197#elif defined (NSIG)
196# define EV_NSIG (NSIG) 198# define EV_NSIG (NSIG)
197#elif defined(_NSIG) 199#elif defined(_NSIG)
… …
303# define EV_USE_EVENTFD 0 305# define EV_USE_EVENTFD 0
304# endif 306# endif
305#endif 307#endif
306 308
307#ifndef EV_USE_SIGNALFD 309#ifndef EV_USE_SIGNALFD
308# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 310# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
309# define EV_USE_SIGNALFD 1 311# define EV_USE_SIGNALFD 1
310# else 312# else
311# define EV_USE_SIGNALFD 0 313# define EV_USE_SIGNALFD 0
312# endif 314# endif
313#endif 315#endif
… …
344# endif 346# endif
345#endif 347#endif
346 348
347/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 349/* this block fixes any misconfiguration where we know we run into trouble otherwise */
348 350
351#ifdef _AIX
352/* AIX has a completely broken poll.h header */
353# undef EV_USE_POLL
354# define EV_USE_POLL 0
355#endif
356
349#ifndef CLOCK_MONOTONIC 357#ifndef CLOCK_MONOTONIC
350# undef EV_USE_MONOTONIC 358# undef EV_USE_MONOTONIC
351# define EV_USE_MONOTONIC 0 359# define EV_USE_MONOTONIC 0
352#endif 360#endif
353 361
… …
387# include <stdint.h> 395# include <stdint.h>
388# ifndef EFD_NONBLOCK 396# ifndef EFD_NONBLOCK
389# define EFD_NONBLOCK O_NONBLOCK 397# define EFD_NONBLOCK O_NONBLOCK
390# endif 398# endif
391# ifndef EFD_CLOEXEC 399# ifndef EFD_CLOEXEC
400# ifdef O_CLOEXEC
392# define EFD_CLOEXEC O_CLOEXEC 401# define EFD_CLOEXEC O_CLOEXEC
402# else
403# define EFD_CLOEXEC 02000000
404# endif
393# endif 405# endif
394# ifdef __cplusplus 406# ifdef __cplusplus
395extern "C" { 407extern "C" {
396# endif 408# endif
397int eventfd (unsigned int initval, int flags); 409int (eventfd) (unsigned int initval, int flags);
398# ifdef __cplusplus 410# ifdef __cplusplus
399} 411}
400# endif 412# endif
401#endif 413#endif
402 414
403#if EV_USE_SIGNALFD 415#if EV_USE_SIGNALFD
404# include <sys/signalfd.h> 416/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
417# include <stdint.h>
418# ifndef SFD_NONBLOCK
419# define SFD_NONBLOCK O_NONBLOCK
405#endif 420# endif
421# ifndef SFD_CLOEXEC
422# ifdef O_CLOEXEC
423# define SFD_CLOEXEC O_CLOEXEC
424# else
425# define SFD_CLOEXEC 02000000
426# endif
427# endif
428# ifdef __cplusplus
429extern "C" {
430# endif
431int signalfd (int fd, const sigset_t *mask, int flags);
432
433struct signalfd_siginfo
434{
435 uint32_t ssi_signo;
436 char pad[128 - sizeof (uint32_t)];
437};
438# ifdef __cplusplus
439}
440# endif
441#endif
442
406 443
407/**/ 444/**/
408 445
409#if EV_VERIFY >= 3 446#if EV_VERIFY >= 3
410# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 447# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
… …
422 */ 459 */
423#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 460#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
424 461
425#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 462#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) */ 463#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 464
429#if __GNUC__ >= 4 465#if __GNUC__ >= 4
430# define expect(expr,value) __builtin_expect ((expr),(value)) 466# define expect(expr,value) __builtin_expect ((expr),(value))
431# define noinline __attribute__ ((noinline)) 467# define noinline __attribute__ ((noinline))
432#else 468#else
… …
473 509
474#if EV_USE_MONOTONIC 510#if EV_USE_MONOTONIC
475static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 511static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
476#endif 512#endif
477 513
514#ifndef EV_FD_TO_WIN32_HANDLE
515# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
516#endif
517#ifndef EV_WIN32_HANDLE_TO_FD
518# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
519#endif
520#ifndef EV_WIN32_CLOSE_FD
521# define EV_WIN32_CLOSE_FD(fd) close (fd)
522#endif
523
478#ifdef _WIN32 524#ifdef _WIN32
479# include "ev_win32.c" 525# include "ev_win32.c"
480#endif 526#endif
481 527
482/*****************************************************************************/ 528/*****************************************************************************/
529
530#if EV_AVOID_STDIO
531static void noinline
532ev_printerr (const char *msg)
533{
534 write (STDERR_FILENO, msg, strlen (msg));
535}
536#endif
483 537
484static void (*syserr_cb)(const char *msg); 538static void (*syserr_cb)(const char *msg);
485 539
486void 540void
487ev_set_syserr_cb (void (*cb)(const char *msg)) 541ev_set_syserr_cb (void (*cb)(const char *msg))
… …
497 551
498 if (syserr_cb) 552 if (syserr_cb)
499 syserr_cb (msg); 553 syserr_cb (msg);
500 else 554 else
501 { 555 {
556#if EV_AVOID_STDIO
557 const char *err = strerror (errno);
558
559 ev_printerr (msg);
560 ev_printerr (": ");
561 ev_printerr (err);
562 ev_printerr ("\n");
563#else
502 perror (msg); 564 perror (msg);
565#endif
503 abort (); 566 abort ();
504 } 567 }
505} 568}
506 569
507static void * 570static void *
… …
532{ 595{
533 ptr = alloc (ptr, size); 596 ptr = alloc (ptr, size);
534 597
535 if (!ptr && size) 598 if (!ptr && size)
536 { 599 {
600#if EV_AVOID_STDIO
601 ev_printerr ("libev: memory allocation failed, aborting.\n");
602#else
537 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 603 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
604#endif
538 abort (); 605 abort ();
539 } 606 }
540 607
541 return ptr; 608 return ptr;
542} 609}
… …
873 940
874#if EV_SELECT_IS_WINSOCKET 941#if EV_SELECT_IS_WINSOCKET
875 if (events) 942 if (events)
876 { 943 {
877 unsigned long arg; 944 unsigned long arg;
878 #ifdef EV_FD_TO_WIN32_HANDLE
879 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 945 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)); 946 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
884 } 947 }
885#endif 948#endif
886 949
887 { 950 {
… …
930/* check whether the given fd is atcually valid, for error recovery */ 993/* check whether the given fd is atcually valid, for error recovery */
931inline_size int 994inline_size int
932fd_valid (int fd) 995fd_valid (int fd)
933{ 996{
934#ifdef _WIN32 997#ifdef _WIN32
935 return _get_osfhandle (fd) != -1; 998 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
936#else 999#else
937 return fcntl (fd, F_GETFD) != -1; 1000 return fcntl (fd, F_GETFD) != -1;
938#endif 1001#endif
939} 1002}
940 1003
… …
958 1021
959 for (fd = anfdmax; fd--; ) 1022 for (fd = anfdmax; fd--; )
960 if (anfds [fd].events) 1023 if (anfds [fd].events)
961 { 1024 {
962 fd_kill (EV_A_ fd); 1025 fd_kill (EV_A_ fd);
963 return; 1026 break;
964 } 1027 }
965} 1028}
966 1029
967/* usually called after fork if backend needs to re-arm all fds from scratch */ 1030/* usually called after fork if backend needs to re-arm all fds from scratch */
968static void noinline 1031static void noinline
… …
1058 1121
1059 for (;;) 1122 for (;;)
1060 { 1123 {
1061 int c = k << 1; 1124 int c = k << 1;
1062 1125
1063 if (c > N + HEAP0 - 1) 1126 if (c >= N + HEAP0)
1064 break; 1127 break;
1065 1128
1066 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1129 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1067 ? 1 : 0; 1130 ? 1 : 0;
1068 1131
… …
1104 1167
1105/* move an element suitably so it is in a correct place */ 1168/* move an element suitably so it is in a correct place */
1106inline_size void 1169inline_size void
1107adjustheap (ANHE *heap, int N, int k) 1170adjustheap (ANHE *heap, int N, int k)
1108{ 1171{
1109 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1172 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1110 upheap (heap, k); 1173 upheap (heap, k);
1111 else 1174 else
1112 downheap (heap, N, k); 1175 downheap (heap, N, k);
1113} 1176}
1114 1177
… …
1127/*****************************************************************************/ 1190/*****************************************************************************/
1128 1191
1129/* associate signal watchers to a signal signal */ 1192/* associate signal watchers to a signal signal */
1130typedef struct 1193typedef struct
1131{ 1194{
1195 EV_ATOMIC_T pending;
1132#if EV_MULTIPLICITY 1196#if EV_MULTIPLICITY
1133 EV_P; 1197 EV_P;
1134#endif 1198#endif
1135 WL head; 1199 WL head;
1136 EV_ATOMIC_T gotsig;
1137} ANSIG; 1200} ANSIG;
1138 1201
1139static ANSIG signals [EV_NSIG - 1]; 1202static ANSIG signals [EV_NSIG - 1];
1140static EV_ATOMIC_T gotsig;
1141 1203
1142/*****************************************************************************/ 1204/*****************************************************************************/
1143 1205
1144/* used to prepare libev internal fd's */ 1206/* used to prepare libev internal fd's */
1145/* this is not fork-safe */ 1207/* this is not fork-safe */
1146inline_speed void 1208inline_speed void
1147fd_intern (int fd) 1209fd_intern (int fd)
1148{ 1210{
1149#ifdef _WIN32 1211#ifdef _WIN32
1150 unsigned long arg = 1; 1212 unsigned long arg = 1;
1151 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1213 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1152#else 1214#else
1153 fcntl (fd, F_SETFD, FD_CLOEXEC); 1215 fcntl (fd, F_SETFD, FD_CLOEXEC);
1154 fcntl (fd, F_SETFL, O_NONBLOCK); 1216 fcntl (fd, F_SETFL, O_NONBLOCK);
1155#endif 1217#endif
1156} 1218}
… …
1213/* called whenever the libev signal pipe */ 1275/* called whenever the libev signal pipe */
1214/* got some events (signal, async) */ 1276/* got some events (signal, async) */
1215static void 1277static void
1216pipecb (EV_P_ ev_io *iow, int revents) 1278pipecb (EV_P_ ev_io *iow, int revents)
1217{ 1279{
1280 int i;
1281
1218#if EV_USE_EVENTFD 1282#if EV_USE_EVENTFD
1219 if (evfd >= 0) 1283 if (evfd >= 0)
1220 { 1284 {
1221 uint64_t counter; 1285 uint64_t counter;
1222 read (evfd, &counter, sizeof (uint64_t)); 1286 read (evfd, &counter, sizeof (uint64_t));
… …
1226 { 1290 {
1227 char dummy; 1291 char dummy;
1228 read (evpipe [0], &dummy, 1); 1292 read (evpipe [0], &dummy, 1);
1229 } 1293 }
1230 1294
1231 if (gotsig && ev_is_default_loop (EV_A)) 1295 if (sig_pending)
1232 { 1296 {
1233 int signum; 1297 sig_pending = 0;
1234 gotsig = 0;
1235 1298
1236 for (signum = EV_NSIG - 1; signum--; ) 1299 for (i = EV_NSIG - 1; i--; )
1237 if (signals [signum].gotsig) 1300 if (expect_false (signals [i].pending))
1238 ev_feed_signal_event (EV_A_ signum + 1); 1301 ev_feed_signal_event (EV_A_ i + 1);
1239 } 1302 }
1240 1303
1241#if EV_ASYNC_ENABLE 1304#if EV_ASYNC_ENABLE
1242 if (gotasync) 1305 if (async_pending)
1243 { 1306 {
1244 int i; 1307 async_pending = 0;
1245 gotasync = 0;
1246 1308
1247 for (i = asynccnt; i--; ) 1309 for (i = asynccnt; i--; )
1248 if (asyncs [i]->sent) 1310 if (asyncs [i]->sent)
1249 { 1311 {
1250 asyncs [i]->sent = 0; 1312 asyncs [i]->sent = 0;
… …
1261{ 1323{
1262#if EV_MULTIPLICITY 1324#if EV_MULTIPLICITY
1263 EV_P = signals [signum - 1].loop; 1325 EV_P = signals [signum - 1].loop;
1264#endif 1326#endif
1265 1327
1266#if _WIN32 1328#ifdef _WIN32
1267 signal (signum, ev_sighandler); 1329 signal (signum, ev_sighandler);
1268#endif 1330#endif
1269 1331
1270 signals [signum - 1].gotsig = 1; 1332 signals [signum - 1].pending = 1;
1271 evpipe_write (EV_A_ &gotsig); 1333 evpipe_write (EV_A_ &sig_pending);
1272} 1334}
1273 1335
1274void noinline 1336void noinline
1275ev_feed_signal_event (EV_P_ int signum) 1337ev_feed_signal_event (EV_P_ int signum)
1276{ 1338{
1277 WL w; 1339 WL w;
1278 1340
1341 if (expect_false (signum <= 0 || signum > EV_NSIG))
1342 return;
1343
1344 --signum;
1345
1279#if EV_MULTIPLICITY 1346#if EV_MULTIPLICITY
1280 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1347 /* it is permissible to try to feed a signal to the wrong loop */
1281#endif 1348 /* or, likely more useful, feeding a signal nobody is waiting for */
1282 1349
1283 if (signum <= 0 || signum > EV_NSIG) 1350 if (expect_false (signals [signum].loop != EV_A))
1284 return; 1351 return;
1352#endif
1285 1353
1286 --signum;
1287
1288 signals [signum].gotsig = 0; 1354 signals [signum].pending = 0;
1289 1355
1290 for (w = signals [signum].head; w; w = w->next) 1356 for (w = signals [signum].head; w; w = w->next)
1291 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1357 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1292} 1358}
1293 1359
… …
1560 1626
1561 io_blocktime = 0.; 1627 io_blocktime = 0.;
1562 timeout_blocktime = 0.; 1628 timeout_blocktime = 0.;
1563 backend = 0; 1629 backend = 0;
1564 backend_fd = -1; 1630 backend_fd = -1;
1565 gotasync = 0; 1631 sig_pending = 0;
1632#if EV_ASYNC_ENABLE
1633 async_pending = 0;
1634#endif
1566#if EV_USE_INOTIFY 1635#if EV_USE_INOTIFY
1567 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1636 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1568#endif 1637#endif
1569#if EV_USE_SIGNALFD 1638#if EV_USE_SIGNALFD
1570 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1639 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1571#endif 1640#endif
1572 1641
1573 if (!(flags & 0x0000ffffU)) 1642 if (!(flags & 0x0000ffffU))
1574 flags |= ev_recommended_backends (); 1643 flags |= ev_recommended_backends ();
1575 1644
… …
1612 close (evfd); 1681 close (evfd);
1613#endif 1682#endif
1614 1683
1615 if (evpipe [0] >= 0) 1684 if (evpipe [0] >= 0)
1616 { 1685 {
1617 close (evpipe [0]); 1686 EV_WIN32_CLOSE_FD (evpipe [0]);
1618 close (evpipe [1]); 1687 EV_WIN32_CLOSE_FD (evpipe [1]);
1619 } 1688 }
1620 } 1689 }
1621 1690
1622#if EV_USE_SIGNALFD 1691#if EV_USE_SIGNALFD
1623 if (ev_is_active (&sigfd_w)) 1692 if (ev_is_active (&sigfd_w))
1624 {
1625 /*ev_ref (EV_A);*/
1626 /*ev_io_stop (EV_A_ &sigfd_w);*/
1627
1628 close (sigfd); 1693 close (sigfd);
1629 }
1630#endif 1694#endif
1631 1695
1632#if EV_USE_INOTIFY 1696#if EV_USE_INOTIFY
1633 if (fs_fd >= 0) 1697 if (fs_fd >= 0)
1634 close (fs_fd); 1698 close (fs_fd);
… …
1704 1768
1705 if (ev_is_active (&pipe_w)) 1769 if (ev_is_active (&pipe_w))
1706 { 1770 {
1707 /* this "locks" the handlers against writing to the pipe */ 1771 /* this "locks" the handlers against writing to the pipe */
1708 /* while we modify the fd vars */ 1772 /* while we modify the fd vars */
1709 gotsig = 1; 1773 sig_pending = 1;
1710#if EV_ASYNC_ENABLE 1774#if EV_ASYNC_ENABLE
1711 gotasync = 1; 1775 async_pending = 1;
1712#endif 1776#endif
1713 1777
1714 ev_ref (EV_A); 1778 ev_ref (EV_A);
1715 ev_io_stop (EV_A_ &pipe_w); 1779 ev_io_stop (EV_A_ &pipe_w);
1716 1780
… …
1719 close (evfd); 1783 close (evfd);
1720#endif 1784#endif
1721 1785
1722 if (evpipe [0] >= 0) 1786 if (evpipe [0] >= 0)
1723 { 1787 {
1724 close (evpipe [0]); 1788 EV_WIN32_CLOSE_FD (evpipe [0]);
1725 close (evpipe [1]); 1789 EV_WIN32_CLOSE_FD (evpipe [1]);
1726 } 1790 }
1727 1791
1728 evpipe_init (EV_A); 1792 evpipe_init (EV_A);
1729 /* now iterate over everything, in case we missed something */ 1793 /* now iterate over everything, in case we missed something */
1730 pipecb (EV_A_ &pipe_w, EV_READ); 1794 pipecb (EV_A_ &pipe_w, EV_READ);
… …
1856 assert (checkmax >= checkcnt); 1920 assert (checkmax >= checkcnt);
1857 array_verify (EV_A_ (W *)checks, checkcnt); 1921 array_verify (EV_A_ (W *)checks, checkcnt);
1858 1922
1859# if 0 1923# if 0
1860 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1924 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) 1925 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1862# endif 1926# endif
1863#endif 1927#endif
1864} 1928}
1865#endif 1929#endif
1866 1930
… …
2122 ANHE_at_cache (*he); 2186 ANHE_at_cache (*he);
2123 } 2187 }
2124} 2188}
2125 2189
2126/* fetch new monotonic and realtime times from the kernel */ 2190/* fetch new monotonic and realtime times from the kernel */
2127/* also detetc if there was a timejump, and act accordingly */ 2191/* also detect if there was a timejump, and act accordingly */
2128inline_speed void 2192inline_speed void
2129time_update (EV_P_ ev_tstamp max_block) 2193time_update (EV_P_ ev_tstamp max_block)
2130{ 2194{
2131#if EV_USE_MONOTONIC 2195#if EV_USE_MONOTONIC
2132 if (expect_true (have_monotonic)) 2196 if (expect_true (have_monotonic))
… …
2393inline_size void 2457inline_size void
2394wlist_del (WL *head, WL elem) 2458wlist_del (WL *head, WL elem)
2395{ 2459{
2396 while (*head) 2460 while (*head)
2397 { 2461 {
2398 if (*head == elem) 2462 if (expect_true (*head == elem))
2399 { 2463 {
2400 *head = elem->next; 2464 *head = elem->next;
2401 return; 2465 break;
2402 } 2466 }
2403 2467
2404 head = &(*head)->next; 2468 head = &(*head)->next;
2405 } 2469 }
2406} 2470}
… …
2466 2530
2467 if (expect_false (ev_is_active (w))) 2531 if (expect_false (ev_is_active (w)))
2468 return; 2532 return;
2469 2533
2470 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2534 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)))); 2535 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2472 2536
2473 EV_FREQUENT_CHECK; 2537 EV_FREQUENT_CHECK;
2474 2538
2475 ev_start (EV_A_ (W)w, 1); 2539 ev_start (EV_A_ (W)w, 1);
2476 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2540 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2546 timers [active] = timers [timercnt + HEAP0]; 2610 timers [active] = timers [timercnt + HEAP0];
2547 adjustheap (timers, timercnt, active); 2611 adjustheap (timers, timercnt, active);
2548 } 2612 }
2549 } 2613 }
2550 2614
2551 EV_FREQUENT_CHECK;
2552
2553 ev_at (w) -= mn_now; 2615 ev_at (w) -= mn_now;
2554 2616
2555 ev_stop (EV_A_ (W)w); 2617 ev_stop (EV_A_ (W)w);
2618
2619 EV_FREQUENT_CHECK;
2556} 2620}
2557 2621
2558void noinline 2622void noinline
2559ev_timer_again (EV_P_ ev_timer *w) 2623ev_timer_again (EV_P_ ev_timer *w)
2560{ 2624{
… …
2639 periodics [active] = periodics [periodiccnt + HEAP0]; 2703 periodics [active] = periodics [periodiccnt + HEAP0];
2640 adjustheap (periodics, periodiccnt, active); 2704 adjustheap (periodics, periodiccnt, active);
2641 } 2705 }
2642 } 2706 }
2643 2707
2644 EV_FREQUENT_CHECK;
2645
2646 ev_stop (EV_A_ (W)w); 2708 ev_stop (EV_A_ (W)w);
2709
2710 EV_FREQUENT_CHECK;
2647} 2711}
2648 2712
2649void noinline 2713void noinline
2650ev_periodic_again (EV_P_ ev_periodic *w) 2714ev_periodic_again (EV_P_ ev_periodic *w)
2651{ 2715{
… …
2666 return; 2730 return;
2667 2731
2668 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG)); 2732 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2669 2733
2670#if EV_MULTIPLICITY 2734#if EV_MULTIPLICITY
2671 assert (("libev: tried to attach to a signal from two different loops", 2735 assert (("libev: a signal must not be attached to two different loops",
2672 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop)); 2736 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2673 2737
2674 signals [w->signum - 1].loop = EV_A; 2738 signals [w->signum - 1].loop = EV_A;
2675#endif 2739#endif
2676 2740
… …
2712 if (!((WL)w)->next) 2776 if (!((WL)w)->next)
2713# if EV_USE_SIGNALFD 2777# if EV_USE_SIGNALFD
2714 if (sigfd < 0) /*TODO*/ 2778 if (sigfd < 0) /*TODO*/
2715# endif 2779# endif
2716 { 2780 {
2717# if _WIN32 2781# ifdef _WIN32
2782 evpipe_init (EV_A);
2783
2718 signal (w->signum, ev_sighandler); 2784 signal (w->signum, ev_sighandler);
2719# else 2785# else
2720 struct sigaction sa; 2786 struct sigaction sa;
2721 2787
2722 evpipe_init (EV_A); 2788 evpipe_init (EV_A);
… …
2747 wlist_del (&signals [w->signum - 1].head, (WL)w); 2813 wlist_del (&signals [w->signum - 1].head, (WL)w);
2748 ev_stop (EV_A_ (W)w); 2814 ev_stop (EV_A_ (W)w);
2749 2815
2750 if (!signals [w->signum - 1].head) 2816 if (!signals [w->signum - 1].head)
2751 { 2817 {
2752 #if EV_MULTIPLICITY 2818#if EV_MULTIPLICITY
2753 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2819 signals [w->signum - 1].loop = 0; /* unattach from signal */
2754 #endif 2820#endif
2755 #if EV_USE_SIGNALFD 2821#if EV_USE_SIGNALFD
2756 if (sigfd >= 0) 2822 if (sigfd >= 0)
2757 { 2823 {
2758 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2824 sigset_t ss;
2825
2826 sigemptyset (&ss);
2827 sigaddset (&ss, w->signum);
2759 sigdelset (&sigfd_set, w->signum); 2828 sigdelset (&sigfd_set, w->signum);
2829
2760 signalfd (sigfd, &sigfd_set, 0); 2830 signalfd (sigfd, &sigfd_set, 0);
2761 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2831 sigprocmask (SIG_UNBLOCK, &ss, 0);
2762 /*TODO: maybe unblock signal? */
2763 } 2832 }
2764 else 2833 else
2765 #endif 2834#endif
2766 signal (w->signum, SIG_DFL); 2835 signal (w->signum, SIG_DFL);
2767 } 2836 }
2768 2837
2769 EV_FREQUENT_CHECK; 2838 EV_FREQUENT_CHECK;
2770} 2839}
… …
2813#define MIN_STAT_INTERVAL 0.1074891 2882#define MIN_STAT_INTERVAL 0.1074891
2814 2883
2815static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2884static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2816 2885
2817#if EV_USE_INOTIFY 2886#if EV_USE_INOTIFY
2818# define EV_INOTIFY_BUFSIZE 8192 2887
2888/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2889# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2819 2890
2820static void noinline 2891static void noinline
2821infy_add (EV_P_ ev_stat *w) 2892infy_add (EV_P_ ev_stat *w)
2822{ 2893{
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); 2894 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 2895
2825 if (w->wd < 0) 2896 if (w->wd >= 0)
2897 {
2898 struct statfs sfs;
2899
2900 /* now local changes will be tracked by inotify, but remote changes won't */
2901 /* unless the filesystem is known to be local, we therefore still poll */
2902 /* also do poll on <2.6.25, but with normal frequency */
2903
2904 if (!fs_2625)
2905 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2906 else if (!statfs (w->path, &sfs)
2907 && (sfs.f_type == 0x1373 /* devfs */
2908 || sfs.f_type == 0xEF53 /* ext2/3 */
2909 || sfs.f_type == 0x3153464a /* jfs */
2910 || sfs.f_type == 0x52654973 /* reiser3 */
2911 || sfs.f_type == 0x01021994 /* tempfs */
2912 || sfs.f_type == 0x58465342 /* xfs */))
2913 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2914 else
2915 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2826 { 2916 }
2917 else
2918 {
2919 /* can't use inotify, continue to stat */
2827 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2920 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 2921
2830 /* monitor some parent directory for speedup hints */ 2922 /* 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, */ 2923 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2832 /* but an efficiency issue only */ 2924 /* but an efficiency issue only */
2833 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2925 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2834 { 2926 {
2835 char path [4096]; 2927 char path [4096];
… …
2851 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2943 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2852 } 2944 }
2853 } 2945 }
2854 2946
2855 if (w->wd >= 0) 2947 if (w->wd >= 0)
2856 {
2857 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2948 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2858 2949
2859 /* now local changes will be tracked by inotify, but remote changes won't */ 2950 /* now re-arm timer, if required */
2860 /* unless the filesystem it known to be local, we therefore still poll */ 2951 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); 2952 ev_timer_again (EV_A_ &w->timer);
2875 } 2953 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2876} 2954}
2877 2955
2878static void noinline 2956static void noinline
2879infy_del (EV_P_ ev_stat *w) 2957infy_del (EV_P_ ev_stat *w)
2880{ 2958{
… …
2925 3003
2926static void 3004static void
2927infy_cb (EV_P_ ev_io *w, int revents) 3005infy_cb (EV_P_ ev_io *w, int revents)
2928{ 3006{
2929 char buf [EV_INOTIFY_BUFSIZE]; 3007 char buf [EV_INOTIFY_BUFSIZE];
2930 struct inotify_event *ev = (struct inotify_event *)buf;
2931 int ofs; 3008 int ofs;
2932 int len = read (fs_fd, buf, sizeof (buf)); 3009 int len = read (fs_fd, buf, sizeof (buf));
2933 3010
2934 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3011 for (ofs = 0; ofs < len; )
3012 {
3013 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2935 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3014 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3015 ofs += sizeof (struct inotify_event) + ev->len;
3016 }
3017}
3018
3019inline_size unsigned int
3020ev_linux_version (void)
3021{
3022 struct utsname buf;
3023 unsigned int v;
3024 int i;
3025 char *p = buf.release;
3026
3027 if (uname (&buf))
3028 return 0;
3029
3030 for (i = 3+1; --i; )
3031 {
3032 unsigned int c = 0;
3033
3034 for (;;)
3035 {
3036 if (*p >= '0' && *p <= '9')
3037 c = c * 10 + *p++ - '0';
3038 else
3039 {
3040 p += *p == '.';
3041 break;
3042 }
3043 }
3044
3045 v = (v << 8) | c;
3046 }
3047
3048 return v;
2936} 3049}
2937 3050
2938inline_size void 3051inline_size void
2939check_2625 (EV_P) 3052ev_check_2625 (EV_P)
2940{ 3053{
2941 /* kernels < 2.6.25 are borked 3054 /* kernels < 2.6.25 are borked
2942 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3055 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2943 */ 3056 */
2944 struct utsname buf; 3057 if (ev_linux_version () < 0x020619)
2945 int major, minor, micro;
2946
2947 if (uname (&buf))
2948 return; 3058 return;
2949 3059
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; 3060 fs_2625 = 1;
3061}
3062
3063inline_size int
3064infy_newfd (void)
3065{
3066#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3067 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3068 if (fd >= 0)
3069 return fd;
3070#endif
3071 return inotify_init ();
2959} 3072}
2960 3073
2961inline_size void 3074inline_size void
2962infy_init (EV_P) 3075infy_init (EV_P)
2963{ 3076{
2964 if (fs_fd != -2) 3077 if (fs_fd != -2)
2965 return; 3078 return;
2966 3079
2967 fs_fd = -1; 3080 fs_fd = -1;
2968 3081
2969 check_2625 (EV_A); 3082 ev_check_2625 (EV_A);
2970 3083
2971 fs_fd = inotify_init (); 3084 fs_fd = infy_newfd ();
2972 3085
2973 if (fs_fd >= 0) 3086 if (fs_fd >= 0)
2974 { 3087 {
3088 fd_intern (fs_fd);
2975 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3089 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2976 ev_set_priority (&fs_w, EV_MAXPRI); 3090 ev_set_priority (&fs_w, EV_MAXPRI);
2977 ev_io_start (EV_A_ &fs_w); 3091 ev_io_start (EV_A_ &fs_w);
3092 ev_unref (EV_A);
2978 } 3093 }
2979} 3094}
2980 3095
2981inline_size void 3096inline_size void
2982infy_fork (EV_P) 3097infy_fork (EV_P)
… …
2984 int slot; 3099 int slot;
2985 3100
2986 if (fs_fd < 0) 3101 if (fs_fd < 0)
2987 return; 3102 return;
2988 3103
3104 ev_ref (EV_A);
3105 ev_io_stop (EV_A_ &fs_w);
2989 close (fs_fd); 3106 close (fs_fd);
2990 fs_fd = inotify_init (); 3107 fs_fd = infy_newfd ();
3108
3109 if (fs_fd >= 0)
3110 {
3111 fd_intern (fs_fd);
3112 ev_io_set (&fs_w, fs_fd, EV_READ);
3113 ev_io_start (EV_A_ &fs_w);
3114 ev_unref (EV_A);
3115 }
2991 3116
2992 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3117 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2993 { 3118 {
2994 WL w_ = fs_hash [slot].head; 3119 WL w_ = fs_hash [slot].head;
2995 fs_hash [slot].head = 0; 3120 fs_hash [slot].head = 0;
… …
3002 w->wd = -1; 3127 w->wd = -1;
3003 3128
3004 if (fs_fd >= 0) 3129 if (fs_fd >= 0)
3005 infy_add (EV_A_ w); /* re-add, no matter what */ 3130 infy_add (EV_A_ w); /* re-add, no matter what */
3006 else 3131 else
3132 {
3133 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3134 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3007 ev_timer_again (EV_A_ &w->timer); 3135 ev_timer_again (EV_A_ &w->timer);
3136 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3137 }
3008 } 3138 }
3009 } 3139 }
3010} 3140}
3011 3141
3012#endif 3142#endif
… …
3029static void noinline 3159static void noinline
3030stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3160stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3031{ 3161{
3032 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3162 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3033 3163
3034 /* we copy this here each the time so that */ 3164 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); 3165 ev_stat_stat (EV_A_ w);
3038 3166
3039 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3167 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3040 if ( 3168 if (
3041 w->prev.st_dev != w->attr.st_dev 3169 prev.st_dev != w->attr.st_dev
3042 || w->prev.st_ino != w->attr.st_ino 3170 || prev.st_ino != w->attr.st_ino
3043 || w->prev.st_mode != w->attr.st_mode 3171 || prev.st_mode != w->attr.st_mode
3044 || w->prev.st_nlink != w->attr.st_nlink 3172 || prev.st_nlink != w->attr.st_nlink
3045 || w->prev.st_uid != w->attr.st_uid 3173 || prev.st_uid != w->attr.st_uid
3046 || w->prev.st_gid != w->attr.st_gid 3174 || prev.st_gid != w->attr.st_gid
3047 || w->prev.st_rdev != w->attr.st_rdev 3175 || prev.st_rdev != w->attr.st_rdev
3048 || w->prev.st_size != w->attr.st_size 3176 || prev.st_size != w->attr.st_size
3049 || w->prev.st_atime != w->attr.st_atime 3177 || prev.st_atime != w->attr.st_atime
3050 || w->prev.st_mtime != w->attr.st_mtime 3178 || prev.st_mtime != w->attr.st_mtime
3051 || w->prev.st_ctime != w->attr.st_ctime 3179 || prev.st_ctime != w->attr.st_ctime
3052 ) { 3180 ) {
3181 /* we only update w->prev on actual differences */
3182 /* in case we test more often than invoke the callback, */
3183 /* to ensure that prev is always different to attr */
3184 w->prev = prev;
3185
3053 #if EV_USE_INOTIFY 3186 #if EV_USE_INOTIFY
3054 if (fs_fd >= 0) 3187 if (fs_fd >= 0)
3055 { 3188 {
3056 infy_del (EV_A_ w); 3189 infy_del (EV_A_ w);
3057 infy_add (EV_A_ w); 3190 infy_add (EV_A_ w);
… …
3082 3215
3083 if (fs_fd >= 0) 3216 if (fs_fd >= 0)
3084 infy_add (EV_A_ w); 3217 infy_add (EV_A_ w);
3085 else 3218 else
3086#endif 3219#endif
3220 {
3087 ev_timer_again (EV_A_ &w->timer); 3221 ev_timer_again (EV_A_ &w->timer);
3222 ev_unref (EV_A);
3223 }
3088 3224
3089 ev_start (EV_A_ (W)w, 1); 3225 ev_start (EV_A_ (W)w, 1);
3090 3226
3091 EV_FREQUENT_CHECK; 3227 EV_FREQUENT_CHECK;
3092} 3228}
… …
3101 EV_FREQUENT_CHECK; 3237 EV_FREQUENT_CHECK;
3102 3238
3103#if EV_USE_INOTIFY 3239#if EV_USE_INOTIFY
3104 infy_del (EV_A_ w); 3240 infy_del (EV_A_ w);
3105#endif 3241#endif
3242
3243 if (ev_is_active (&w->timer))
3244 {
3245 ev_ref (EV_A);
3106 ev_timer_stop (EV_A_ &w->timer); 3246 ev_timer_stop (EV_A_ &w->timer);
3247 }
3107 3248
3108 ev_stop (EV_A_ (W)w); 3249 ev_stop (EV_A_ (W)w);
3109 3250
3110 EV_FREQUENT_CHECK; 3251 EV_FREQUENT_CHECK;
3111} 3252}
… …
3331 3472
3332 ev_io_stop (EV_A_ &w->io); 3473 ev_io_stop (EV_A_ &w->io);
3333 ev_prepare_stop (EV_A_ &w->prepare); 3474 ev_prepare_stop (EV_A_ &w->prepare);
3334 ev_fork_stop (EV_A_ &w->fork); 3475 ev_fork_stop (EV_A_ &w->fork);
3335 3476
3477 ev_stop (EV_A_ (W)w);
3478
3336 EV_FREQUENT_CHECK; 3479 EV_FREQUENT_CHECK;
3337} 3480}
3338#endif 3481#endif
3339 3482
3340#if EV_FORK_ENABLE 3483#if EV_FORK_ENABLE
… …
3416 3559
3417void 3560void
3418ev_async_send (EV_P_ ev_async *w) 3561ev_async_send (EV_P_ ev_async *w)
3419{ 3562{
3420 w->sent = 1; 3563 w->sent = 1;
3421 evpipe_write (EV_A_ &gotasync); 3564 evpipe_write (EV_A_ &async_pending);
3422} 3565}
3423#endif 3566#endif
3424 3567
3425/*****************************************************************************/ 3568/*****************************************************************************/
3426 3569

Diff Legend

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