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.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 */
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)
205#elif defined (MAXSIG) 207#elif defined (MAXSIG)
206# define EV_NSIG (MAXSIG+1) 208# define EV_NSIG (MAXSIG+1)
207#elif defined (MAX_SIG) 209#elif defined (MAX_SIG)
208# define EV_NSIG (MAX_SIG+1) 210# define EV_NSIG (MAX_SIG+1)
209#elif defined (SIGARRAYSIZE) 211#elif defined (SIGARRAYSIZE)
210# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */ 212# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
211#elif defined (_sys_nsig) 213#elif defined (_sys_nsig)
212# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 214# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
213#else 215#else
214# error "unable to find value for NSIG, please report" 216# error "unable to find value for NSIG, please report"
215/* 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! :) */
216# define EV_NSIG 65 219# define EV_NSIG 65
217#endif 220#endif
218 221
219#ifndef EV_USE_CLOCK_SYSCALL 222#ifndef EV_USE_CLOCK_SYSCALL
220# if __linux && __GLIBC__ >= 2 223# if __linux && __GLIBC__ >= 2
303# define EV_USE_EVENTFD 0 306# define EV_USE_EVENTFD 0
304# endif 307# endif
305#endif 308#endif
306 309
307#ifndef EV_USE_SIGNALFD 310#ifndef EV_USE_SIGNALFD
308# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 311# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
309# define EV_USE_SIGNALFD 1 312# define EV_USE_SIGNALFD 1
310# else 313# else
311# define EV_USE_SIGNALFD 0 314# define EV_USE_SIGNALFD 0
312# endif 315# endif
313#endif 316#endif
344# endif 347# endif
345#endif 348#endif
346 349
347/* 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 */
348 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
349#ifndef CLOCK_MONOTONIC 358#ifndef CLOCK_MONOTONIC
350# undef EV_USE_MONOTONIC 359# undef EV_USE_MONOTONIC
351# define EV_USE_MONOTONIC 0 360# define EV_USE_MONOTONIC 0
352#endif 361#endif
353 362
387# include <stdint.h> 396# include <stdint.h>
388# ifndef EFD_NONBLOCK 397# ifndef EFD_NONBLOCK
389# define EFD_NONBLOCK O_NONBLOCK 398# define EFD_NONBLOCK O_NONBLOCK
390# endif 399# endif
391# ifndef EFD_CLOEXEC 400# ifndef EFD_CLOEXEC
401# ifdef O_CLOEXEC
392# define EFD_CLOEXEC O_CLOEXEC 402# define EFD_CLOEXEC O_CLOEXEC
403# else
404# define EFD_CLOEXEC 02000000
405# endif
393# endif 406# endif
394# ifdef __cplusplus 407# ifdef __cplusplus
395extern "C" { 408extern "C" {
396# endif 409# endif
397int eventfd (unsigned int initval, int flags); 410int (eventfd) (unsigned int initval, int flags);
398# ifdef __cplusplus 411# ifdef __cplusplus
399} 412}
400# endif 413# endif
401#endif 414#endif
402 415
403#if EV_USE_SIGNALFD 416#if EV_USE_SIGNALFD
404# include <sys/signalfd.h> 417/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
418# include <stdint.h>
419# ifndef SFD_NONBLOCK
420# define SFD_NONBLOCK O_NONBLOCK
405#endif 421# endif
422# ifndef SFD_CLOEXEC
423# ifdef O_CLOEXEC
424# define SFD_CLOEXEC O_CLOEXEC
425# else
426# define SFD_CLOEXEC 02000000
427# endif
428# endif
429# ifdef __cplusplus
430extern "C" {
431# endif
432int signalfd (int fd, const sigset_t *mask, int flags);
433
434struct signalfd_siginfo
435{
436 uint32_t ssi_signo;
437 char pad[128 - sizeof (uint32_t)];
438};
439# ifdef __cplusplus
440}
441# endif
442#endif
443
406 444
407/**/ 445/**/
408 446
409#if EV_VERIFY >= 3 447#if EV_VERIFY >= 3
410# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 448# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
422 */ 460 */
423#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 461#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
424 462
425#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 463#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
426#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 464#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
427/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
428 465
429#if __GNUC__ >= 4 466#if __GNUC__ >= 4
430# define expect(expr,value) __builtin_expect ((expr),(value)) 467# define expect(expr,value) __builtin_expect ((expr),(value))
431# define noinline __attribute__ ((noinline)) 468# define noinline __attribute__ ((noinline))
432#else 469#else
473 510
474#if EV_USE_MONOTONIC 511#if EV_USE_MONOTONIC
475static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 512static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
476#endif 513#endif
477 514
515#ifndef EV_FD_TO_WIN32_HANDLE
516# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
517#endif
518#ifndef EV_WIN32_HANDLE_TO_FD
519# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
520#endif
521#ifndef EV_WIN32_CLOSE_FD
522# define EV_WIN32_CLOSE_FD(fd) close (fd)
523#endif
524
478#ifdef _WIN32 525#ifdef _WIN32
479# include "ev_win32.c" 526# include "ev_win32.c"
480#endif 527#endif
481 528
482/*****************************************************************************/ 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
483 538
484static void (*syserr_cb)(const char *msg); 539static void (*syserr_cb)(const char *msg);
485 540
486void 541void
487ev_set_syserr_cb (void (*cb)(const char *msg)) 542ev_set_syserr_cb (void (*cb)(const char *msg))
497 552
498 if (syserr_cb) 553 if (syserr_cb)
499 syserr_cb (msg); 554 syserr_cb (msg);
500 else 555 else
501 { 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
502 perror (msg); 565 perror (msg);
566#endif
503 abort (); 567 abort ();
504 } 568 }
505} 569}
506 570
507static void * 571static void *
508ev_realloc_emul (void *ptr, long size) 572ev_realloc_emul (void *ptr, long size)
509{ 573{
574#if __GLIBC__
575 return realloc (ptr, size);
576#else
510 /* some systems, notably openbsd and darwin, fail to properly 577 /* some systems, notably openbsd and darwin, fail to properly
511 * 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
512 * the single unix specification, so work around them here. 579 * the single unix specification, so work around them here.
513 */ 580 */
514 581
515 if (size) 582 if (size)
516 return realloc (ptr, size); 583 return realloc (ptr, size);
517 584
518 free (ptr); 585 free (ptr);
519 return 0; 586 return 0;
587#endif
520} 588}
521 589
522static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 590static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
523 591
524void 592void
532{ 600{
533 ptr = alloc (ptr, size); 601 ptr = alloc (ptr, size);
534 602
535 if (!ptr && size) 603 if (!ptr && size)
536 { 604 {
605#if EV_AVOID_STDIO
606 ev_printerr ("libev: memory allocation failed, aborting.\n");
607#else
537 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 608 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
609#endif
538 abort (); 610 abort ();
539 } 611 }
540 612
541 return ptr; 613 return ptr;
542} 614}
873 945
874#if EV_SELECT_IS_WINSOCKET 946#if EV_SELECT_IS_WINSOCKET
875 if (events) 947 if (events)
876 { 948 {
877 unsigned long arg; 949 unsigned long arg;
878 #ifdef EV_FD_TO_WIN32_HANDLE
879 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 950 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)); 951 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
884 } 952 }
885#endif 953#endif
886 954
887 { 955 {
925 ev_io_stop (EV_A_ w); 993 ev_io_stop (EV_A_ w);
926 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);
927 } 995 }
928} 996}
929 997
930/* check whether the given fd is atcually valid, for error recovery */ 998/* check whether the given fd is actually valid, for error recovery */
931inline_size int 999inline_size int
932fd_valid (int fd) 1000fd_valid (int fd)
933{ 1001{
934#ifdef _WIN32 1002#ifdef _WIN32
935 return _get_osfhandle (fd) != -1; 1003 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
936#else 1004#else
937 return fcntl (fd, F_GETFD) != -1; 1005 return fcntl (fd, F_GETFD) != -1;
938#endif 1006#endif
939} 1007}
940 1008
958 1026
959 for (fd = anfdmax; fd--; ) 1027 for (fd = anfdmax; fd--; )
960 if (anfds [fd].events) 1028 if (anfds [fd].events)
961 { 1029 {
962 fd_kill (EV_A_ fd); 1030 fd_kill (EV_A_ fd);
963 return; 1031 break;
964 } 1032 }
965} 1033}
966 1034
967/* usually called after fork if backend needs to re-arm all fds from scratch */ 1035/* usually called after fork if backend needs to re-arm all fds from scratch */
968static void noinline 1036static void noinline
975 { 1043 {
976 anfds [fd].events = 0; 1044 anfds [fd].events = 0;
977 anfds [fd].emask = 0; 1045 anfds [fd].emask = 0;
978 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1046 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
979 } 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
980} 1062}
981 1063
982/*****************************************************************************/ 1064/*****************************************************************************/
983 1065
984/* 1066/*
1058 1140
1059 for (;;) 1141 for (;;)
1060 { 1142 {
1061 int c = k << 1; 1143 int c = k << 1;
1062 1144
1063 if (c > N + HEAP0 - 1) 1145 if (c >= N + HEAP0)
1064 break; 1146 break;
1065 1147
1066 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1148 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1067 ? 1 : 0; 1149 ? 1 : 0;
1068 1150
1104 1186
1105/* move an element suitably so it is in a correct place */ 1187/* move an element suitably so it is in a correct place */
1106inline_size void 1188inline_size void
1107adjustheap (ANHE *heap, int N, int k) 1189adjustheap (ANHE *heap, int N, int k)
1108{ 1190{
1109 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1191 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1110 upheap (heap, k); 1192 upheap (heap, k);
1111 else 1193 else
1112 downheap (heap, N, k); 1194 downheap (heap, N, k);
1113} 1195}
1114 1196
1127/*****************************************************************************/ 1209/*****************************************************************************/
1128 1210
1129/* associate signal watchers to a signal signal */ 1211/* associate signal watchers to a signal signal */
1130typedef struct 1212typedef struct
1131{ 1213{
1214 EV_ATOMIC_T pending;
1132#if EV_MULTIPLICITY 1215#if EV_MULTIPLICITY
1133 EV_P; 1216 EV_P;
1134#endif 1217#endif
1135 WL head; 1218 WL head;
1136 EV_ATOMIC_T gotsig;
1137} ANSIG; 1219} ANSIG;
1138 1220
1139static ANSIG signals [EV_NSIG - 1]; 1221static ANSIG signals [EV_NSIG - 1];
1140static EV_ATOMIC_T gotsig;
1141 1222
1142/*****************************************************************************/ 1223/*****************************************************************************/
1143 1224
1144/* used to prepare libev internal fd's */ 1225#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1145/* this is not fork-safe */
1146inline_speed void
1147fd_intern (int fd)
1148{
1149#ifdef _WIN32
1150 unsigned long arg = 1;
1151 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1152#else
1153 fcntl (fd, F_SETFD, FD_CLOEXEC);
1154 fcntl (fd, F_SETFL, O_NONBLOCK);
1155#endif
1156}
1157 1226
1158static void noinline 1227static void noinline
1159evpipe_init (EV_P) 1228evpipe_init (EV_P)
1160{ 1229{
1161 if (!ev_is_active (&pipe_w)) 1230 if (!ev_is_active (&pipe_w))
1162 { 1231 {
1163#if EV_USE_EVENTFD 1232# if EV_USE_EVENTFD
1164 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1233 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1165 if (evfd < 0 && errno == EINVAL) 1234 if (evfd < 0 && errno == EINVAL)
1166 evfd = eventfd (0, 0); 1235 evfd = eventfd (0, 0);
1167 1236
1168 if (evfd >= 0) 1237 if (evfd >= 0)
1170 evpipe [0] = -1; 1239 evpipe [0] = -1;
1171 fd_intern (evfd); /* doing it twice doesn't hurt */ 1240 fd_intern (evfd); /* doing it twice doesn't hurt */
1172 ev_io_set (&pipe_w, evfd, EV_READ); 1241 ev_io_set (&pipe_w, evfd, EV_READ);
1173 } 1242 }
1174 else 1243 else
1175#endif 1244# endif
1176 { 1245 {
1177 while (pipe (evpipe)) 1246 while (pipe (evpipe))
1178 ev_syserr ("(libev) error creating signal/async pipe"); 1247 ev_syserr ("(libev) error creating signal/async pipe");
1179 1248
1180 fd_intern (evpipe [0]); 1249 fd_intern (evpipe [0]);
1191evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1260evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1192{ 1261{
1193 if (!*flag) 1262 if (!*flag)
1194 { 1263 {
1195 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;
1196 1266
1197 *flag = 1; 1267 *flag = 1;
1198 1268
1199#if EV_USE_EVENTFD 1269#if EV_USE_EVENTFD
1200 if (evfd >= 0) 1270 if (evfd >= 0)
1202 uint64_t counter = 1; 1272 uint64_t counter = 1;
1203 write (evfd, &counter, sizeof (uint64_t)); 1273 write (evfd, &counter, sizeof (uint64_t));
1204 } 1274 }
1205 else 1275 else
1206#endif 1276#endif
1207 write (evpipe [1], &old_errno, 1); 1277 write (evpipe [1], &dummy, 1);
1208 1278
1209 errno = old_errno; 1279 errno = old_errno;
1210 } 1280 }
1211} 1281}
1212 1282
1213/* called whenever the libev signal pipe */ 1283/* called whenever the libev signal pipe */
1214/* got some events (signal, async) */ 1284/* got some events (signal, async) */
1215static void 1285static void
1216pipecb (EV_P_ ev_io *iow, int revents) 1286pipecb (EV_P_ ev_io *iow, int revents)
1217{ 1287{
1288 int i;
1289
1218#if EV_USE_EVENTFD 1290#if EV_USE_EVENTFD
1219 if (evfd >= 0) 1291 if (evfd >= 0)
1220 { 1292 {
1221 uint64_t counter; 1293 uint64_t counter;
1222 read (evfd, &counter, sizeof (uint64_t)); 1294 read (evfd, &counter, sizeof (uint64_t));
1226 { 1298 {
1227 char dummy; 1299 char dummy;
1228 read (evpipe [0], &dummy, 1); 1300 read (evpipe [0], &dummy, 1);
1229 } 1301 }
1230 1302
1231 if (gotsig && ev_is_default_loop (EV_A)) 1303 if (sig_pending)
1232 { 1304 {
1233 int signum; 1305 sig_pending = 0;
1234 gotsig = 0;
1235 1306
1236 for (signum = EV_NSIG - 1; signum--; ) 1307 for (i = EV_NSIG - 1; i--; )
1237 if (signals [signum].gotsig) 1308 if (expect_false (signals [i].pending))
1238 ev_feed_signal_event (EV_A_ signum + 1); 1309 ev_feed_signal_event (EV_A_ i + 1);
1239 } 1310 }
1240 1311
1241#if EV_ASYNC_ENABLE 1312#if EV_ASYNC_ENABLE
1242 if (gotasync) 1313 if (async_pending)
1243 { 1314 {
1244 int i; 1315 async_pending = 0;
1245 gotasync = 0;
1246 1316
1247 for (i = asynccnt; i--; ) 1317 for (i = asynccnt; i--; )
1248 if (asyncs [i]->sent) 1318 if (asyncs [i]->sent)
1249 { 1319 {
1250 asyncs [i]->sent = 0; 1320 asyncs [i]->sent = 0;
1261{ 1331{
1262#if EV_MULTIPLICITY 1332#if EV_MULTIPLICITY
1263 EV_P = signals [signum - 1].loop; 1333 EV_P = signals [signum - 1].loop;
1264#endif 1334#endif
1265 1335
1266#if _WIN32 1336#ifdef _WIN32
1267 signal (signum, ev_sighandler); 1337 signal (signum, ev_sighandler);
1268#endif 1338#endif
1269 1339
1270 signals [signum - 1].gotsig = 1; 1340 signals [signum - 1].pending = 1;
1271 evpipe_write (EV_A_ &gotsig); 1341 evpipe_write (EV_A_ &sig_pending);
1272} 1342}
1273 1343
1274void noinline 1344void noinline
1275ev_feed_signal_event (EV_P_ int signum) 1345ev_feed_signal_event (EV_P_ int signum)
1276{ 1346{
1277 WL w; 1347 WL w;
1278 1348
1349 if (expect_false (signum <= 0 || signum > EV_NSIG))
1350 return;
1351
1352 --signum;
1353
1279#if EV_MULTIPLICITY 1354#if EV_MULTIPLICITY
1280 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1355 /* it is permissible to try to feed a signal to the wrong loop */
1281#endif 1356 /* or, likely more useful, feeding a signal nobody is waiting for */
1282 1357
1283 if (signum <= 0 || signum > EV_NSIG) 1358 if (expect_false (signals [signum].loop != EV_A))
1284 return; 1359 return;
1360#endif
1285 1361
1286 --signum;
1287
1288 signals [signum].gotsig = 0; 1362 signals [signum].pending = 0;
1289 1363
1290 for (w = signals [signum].head; w; w = w->next) 1364 for (w = signals [signum].head; w; w = w->next)
1291 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1365 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1292} 1366}
1293 1367
1309 break; 1383 break;
1310 } 1384 }
1311} 1385}
1312#endif 1386#endif
1313 1387
1388#endif
1389
1314/*****************************************************************************/ 1390/*****************************************************************************/
1315 1391
1392#if EV_CHILD_ENABLE
1316static WL childs [EV_PID_HASHSIZE]; 1393static WL childs [EV_PID_HASHSIZE];
1317
1318#ifndef _WIN32
1319 1394
1320static ev_signal childev; 1395static ev_signal childev;
1321 1396
1322#ifndef WIFCONTINUED 1397#ifndef WIFCONTINUED
1323# define WIFCONTINUED(status) 0 1398# define WIFCONTINUED(status) 0
1560 1635
1561 io_blocktime = 0.; 1636 io_blocktime = 0.;
1562 timeout_blocktime = 0.; 1637 timeout_blocktime = 0.;
1563 backend = 0; 1638 backend = 0;
1564 backend_fd = -1; 1639 backend_fd = -1;
1565 gotasync = 0; 1640 sig_pending = 0;
1641#if EV_ASYNC_ENABLE
1642 async_pending = 0;
1643#endif
1566#if EV_USE_INOTIFY 1644#if EV_USE_INOTIFY
1567 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1645 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1568#endif 1646#endif
1569#if EV_USE_SIGNALFD 1647#if EV_USE_SIGNALFD
1570 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1648 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1571#endif 1649#endif
1572 1650
1573 if (!(flags & 0x0000ffffU)) 1651 if (!(flags & 0x0000ffffU))
1574 flags |= ev_recommended_backends (); 1652 flags |= ev_recommended_backends ();
1575 1653
1589 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1667 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1590#endif 1668#endif
1591 1669
1592 ev_prepare_init (&pending_w, pendingcb); 1670 ev_prepare_init (&pending_w, pendingcb);
1593 1671
1672#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1594 ev_init (&pipe_w, pipecb); 1673 ev_init (&pipe_w, pipecb);
1595 ev_set_priority (&pipe_w, EV_MAXPRI); 1674 ev_set_priority (&pipe_w, EV_MAXPRI);
1675#endif
1596 } 1676 }
1597} 1677}
1598 1678
1599/* free up a loop structure */ 1679/* free up a loop structure */
1600static void noinline 1680static void noinline
1612 close (evfd); 1692 close (evfd);
1613#endif 1693#endif
1614 1694
1615 if (evpipe [0] >= 0) 1695 if (evpipe [0] >= 0)
1616 { 1696 {
1617 close (evpipe [0]); 1697 EV_WIN32_CLOSE_FD (evpipe [0]);
1618 close (evpipe [1]); 1698 EV_WIN32_CLOSE_FD (evpipe [1]);
1619 } 1699 }
1620 } 1700 }
1621 1701
1622#if EV_USE_SIGNALFD 1702#if EV_USE_SIGNALFD
1623 if (ev_is_active (&sigfd_w)) 1703 if (ev_is_active (&sigfd_w))
1624 {
1625 /*ev_ref (EV_A);*/
1626 /*ev_io_stop (EV_A_ &sigfd_w);*/
1627
1628 close (sigfd); 1704 close (sigfd);
1629 }
1630#endif 1705#endif
1631 1706
1632#if EV_USE_INOTIFY 1707#if EV_USE_INOTIFY
1633 if (fs_fd >= 0) 1708 if (fs_fd >= 0)
1634 close (fs_fd); 1709 close (fs_fd);
1704 1779
1705 if (ev_is_active (&pipe_w)) 1780 if (ev_is_active (&pipe_w))
1706 { 1781 {
1707 /* this "locks" the handlers against writing to the pipe */ 1782 /* this "locks" the handlers against writing to the pipe */
1708 /* while we modify the fd vars */ 1783 /* while we modify the fd vars */
1709 gotsig = 1; 1784 sig_pending = 1;
1710#if EV_ASYNC_ENABLE 1785#if EV_ASYNC_ENABLE
1711 gotasync = 1; 1786 async_pending = 1;
1712#endif 1787#endif
1713 1788
1714 ev_ref (EV_A); 1789 ev_ref (EV_A);
1715 ev_io_stop (EV_A_ &pipe_w); 1790 ev_io_stop (EV_A_ &pipe_w);
1716 1791
1719 close (evfd); 1794 close (evfd);
1720#endif 1795#endif
1721 1796
1722 if (evpipe [0] >= 0) 1797 if (evpipe [0] >= 0)
1723 { 1798 {
1724 close (evpipe [0]); 1799 EV_WIN32_CLOSE_FD (evpipe [0]);
1725 close (evpipe [1]); 1800 EV_WIN32_CLOSE_FD (evpipe [1]);
1726 } 1801 }
1727 1802
1728 evpipe_init (EV_A); 1803 evpipe_init (EV_A);
1729 /* now iterate over everything, in case we missed something */ 1804 /* now iterate over everything, in case we missed something */
1730 pipecb (EV_A_ &pipe_w, EV_READ); 1805 pipecb (EV_A_ &pipe_w, EV_READ);
1855 1930
1856 assert (checkmax >= checkcnt); 1931 assert (checkmax >= checkcnt);
1857 array_verify (EV_A_ (W *)checks, checkcnt); 1932 array_verify (EV_A_ (W *)checks, checkcnt);
1858 1933
1859# if 0 1934# if 0
1935#if EV_CHILD_ENABLE
1860 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)
1861 for (signum = EV_NSIG; signum--; ) if (signals [signum].gotsig) 1937 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1938#endif
1862# endif 1939# endif
1863#endif 1940#endif
1864} 1941}
1865#endif 1942#endif
1866 1943
1882 1959
1883 loop_init (EV_A_ flags); 1960 loop_init (EV_A_ flags);
1884 1961
1885 if (ev_backend (EV_A)) 1962 if (ev_backend (EV_A))
1886 { 1963 {
1887#ifndef _WIN32 1964#if EV_CHILD_ENABLE
1888 ev_signal_init (&childev, childcb, SIGCHLD); 1965 ev_signal_init (&childev, childcb, SIGCHLD);
1889 ev_set_priority (&childev, EV_MAXPRI); 1966 ev_set_priority (&childev, EV_MAXPRI);
1890 ev_signal_start (EV_A_ &childev); 1967 ev_signal_start (EV_A_ &childev);
1891 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1968 ev_unref (EV_A); /* child watcher should not keep loop alive */
1892#endif 1969#endif
1905 EV_P = ev_default_loop_ptr; 1982 EV_P = ev_default_loop_ptr;
1906#endif 1983#endif
1907 1984
1908 ev_default_loop_ptr = 0; 1985 ev_default_loop_ptr = 0;
1909 1986
1910#ifndef _WIN32 1987#if EV_CHILD_ENABLE
1911 ev_ref (EV_A); /* child watcher */ 1988 ev_ref (EV_A); /* child watcher */
1912 ev_signal_stop (EV_A_ &childev); 1989 ev_signal_stop (EV_A_ &childev);
1913#endif 1990#endif
1914 1991
1915 loop_destroy (EV_A); 1992 loop_destroy (EV_A);
2122 ANHE_at_cache (*he); 2199 ANHE_at_cache (*he);
2123 } 2200 }
2124} 2201}
2125 2202
2126/* fetch new monotonic and realtime times from the kernel */ 2203/* fetch new monotonic and realtime times from the kernel */
2127/* also detetc if there was a timejump, and act accordingly */ 2204/* also detect if there was a timejump, and act accordingly */
2128inline_speed void 2205inline_speed void
2129time_update (EV_P_ ev_tstamp max_block) 2206time_update (EV_P_ ev_tstamp max_block)
2130{ 2207{
2131#if EV_USE_MONOTONIC 2208#if EV_USE_MONOTONIC
2132 if (expect_true (have_monotonic)) 2209 if (expect_true (have_monotonic))
2393inline_size void 2470inline_size void
2394wlist_del (WL *head, WL elem) 2471wlist_del (WL *head, WL elem)
2395{ 2472{
2396 while (*head) 2473 while (*head)
2397 { 2474 {
2398 if (*head == elem) 2475 if (expect_true (*head == elem))
2399 { 2476 {
2400 *head = elem->next; 2477 *head = elem->next;
2401 return; 2478 break;
2402 } 2479 }
2403 2480
2404 head = &(*head)->next; 2481 head = &(*head)->next;
2405 } 2482 }
2406} 2483}
2466 2543
2467 if (expect_false (ev_is_active (w))) 2544 if (expect_false (ev_is_active (w)))
2468 return; 2545 return;
2469 2546
2470 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2547 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)))); 2548 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2472 2549
2473 EV_FREQUENT_CHECK; 2550 EV_FREQUENT_CHECK;
2474 2551
2475 ev_start (EV_A_ (W)w, 1); 2552 ev_start (EV_A_ (W)w, 1);
2476 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2553 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2546 timers [active] = timers [timercnt + HEAP0]; 2623 timers [active] = timers [timercnt + HEAP0];
2547 adjustheap (timers, timercnt, active); 2624 adjustheap (timers, timercnt, active);
2548 } 2625 }
2549 } 2626 }
2550 2627
2551 EV_FREQUENT_CHECK;
2552
2553 ev_at (w) -= mn_now; 2628 ev_at (w) -= mn_now;
2554 2629
2555 ev_stop (EV_A_ (W)w); 2630 ev_stop (EV_A_ (W)w);
2631
2632 EV_FREQUENT_CHECK;
2556} 2633}
2557 2634
2558void noinline 2635void noinline
2559ev_timer_again (EV_P_ ev_timer *w) 2636ev_timer_again (EV_P_ ev_timer *w)
2560{ 2637{
2639 periodics [active] = periodics [periodiccnt + HEAP0]; 2716 periodics [active] = periodics [periodiccnt + HEAP0];
2640 adjustheap (periodics, periodiccnt, active); 2717 adjustheap (periodics, periodiccnt, active);
2641 } 2718 }
2642 } 2719 }
2643 2720
2644 EV_FREQUENT_CHECK;
2645
2646 ev_stop (EV_A_ (W)w); 2721 ev_stop (EV_A_ (W)w);
2722
2723 EV_FREQUENT_CHECK;
2647} 2724}
2648 2725
2649void noinline 2726void noinline
2650ev_periodic_again (EV_P_ ev_periodic *w) 2727ev_periodic_again (EV_P_ ev_periodic *w)
2651{ 2728{
2657 2734
2658#ifndef SA_RESTART 2735#ifndef SA_RESTART
2659# define SA_RESTART 0 2736# define SA_RESTART 0
2660#endif 2737#endif
2661 2738
2739#if EV_SIGNAL_ENABLE
2740
2662void noinline 2741void noinline
2663ev_signal_start (EV_P_ ev_signal *w) 2742ev_signal_start (EV_P_ ev_signal *w)
2664{ 2743{
2665 if (expect_false (ev_is_active (w))) 2744 if (expect_false (ev_is_active (w)))
2666 return; 2745 return;
2667 2746
2668 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG)); 2747 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2669 2748
2670#if EV_MULTIPLICITY 2749#if EV_MULTIPLICITY
2671 assert (("libev: tried to attach to a signal from two different loops", 2750 assert (("libev: a signal must not be attached to two different loops",
2672 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop)); 2751 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2673 2752
2674 signals [w->signum - 1].loop = EV_A; 2753 signals [w->signum - 1].loop = EV_A;
2675#endif 2754#endif
2676 2755
2712 if (!((WL)w)->next) 2791 if (!((WL)w)->next)
2713# if EV_USE_SIGNALFD 2792# if EV_USE_SIGNALFD
2714 if (sigfd < 0) /*TODO*/ 2793 if (sigfd < 0) /*TODO*/
2715# endif 2794# endif
2716 { 2795 {
2717# if _WIN32 2796# ifdef _WIN32
2797 evpipe_init (EV_A);
2798
2718 signal (w->signum, ev_sighandler); 2799 signal (w->signum, ev_sighandler);
2719# else 2800# else
2720 struct sigaction sa; 2801 struct sigaction sa;
2721 2802
2722 evpipe_init (EV_A); 2803 evpipe_init (EV_A);
2747 wlist_del (&signals [w->signum - 1].head, (WL)w); 2828 wlist_del (&signals [w->signum - 1].head, (WL)w);
2748 ev_stop (EV_A_ (W)w); 2829 ev_stop (EV_A_ (W)w);
2749 2830
2750 if (!signals [w->signum - 1].head) 2831 if (!signals [w->signum - 1].head)
2751 { 2832 {
2752 #if EV_MULTIPLICITY 2833#if EV_MULTIPLICITY
2753 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2834 signals [w->signum - 1].loop = 0; /* unattach from signal */
2754 #endif 2835#endif
2755 #if EV_USE_SIGNALFD 2836#if EV_USE_SIGNALFD
2756 if (sigfd >= 0) 2837 if (sigfd >= 0)
2757 { 2838 {
2758 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2839 sigset_t ss;
2840
2841 sigemptyset (&ss);
2842 sigaddset (&ss, w->signum);
2759 sigdelset (&sigfd_set, w->signum); 2843 sigdelset (&sigfd_set, w->signum);
2844
2760 signalfd (sigfd, &sigfd_set, 0); 2845 signalfd (sigfd, &sigfd_set, 0);
2761 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2846 sigprocmask (SIG_UNBLOCK, &ss, 0);
2762 /*TODO: maybe unblock signal? */
2763 } 2847 }
2764 else 2848 else
2765 #endif 2849#endif
2766 signal (w->signum, SIG_DFL); 2850 signal (w->signum, SIG_DFL);
2767 } 2851 }
2768 2852
2769 EV_FREQUENT_CHECK; 2853 EV_FREQUENT_CHECK;
2770} 2854}
2855
2856#endif
2857
2858#if EV_CHILD_ENABLE
2771 2859
2772void 2860void
2773ev_child_start (EV_P_ ev_child *w) 2861ev_child_start (EV_P_ ev_child *w)
2774{ 2862{
2775#if EV_MULTIPLICITY 2863#if EV_MULTIPLICITY
2799 ev_stop (EV_A_ (W)w); 2887 ev_stop (EV_A_ (W)w);
2800 2888
2801 EV_FREQUENT_CHECK; 2889 EV_FREQUENT_CHECK;
2802} 2890}
2803 2891
2892#endif
2893
2804#if EV_STAT_ENABLE 2894#if EV_STAT_ENABLE
2805 2895
2806# ifdef _WIN32 2896# ifdef _WIN32
2807# undef lstat 2897# undef lstat
2808# define lstat(a,b) _stati64 (a,b) 2898# define lstat(a,b) _stati64 (a,b)
2813#define MIN_STAT_INTERVAL 0.1074891 2903#define MIN_STAT_INTERVAL 0.1074891
2814 2904
2815static 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);
2816 2906
2817#if EV_USE_INOTIFY 2907#if EV_USE_INOTIFY
2818# 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)
2819 2911
2820static void noinline 2912static void noinline
2821infy_add (EV_P_ ev_stat *w) 2913infy_add (EV_P_ ev_stat *w)
2822{ 2914{
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); 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);
2824 2916
2825 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 */
2826 { 2937 }
2938 else
2939 {
2940 /* can't use inotify, continue to stat */
2827 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2941 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 2942
2830 /* monitor some parent directory for speedup hints */ 2943 /* 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, */ 2944 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2832 /* but an efficiency issue only */ 2945 /* but an efficiency issue only */
2833 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2946 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2834 { 2947 {
2835 char path [4096]; 2948 char path [4096];
2851 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2964 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2852 } 2965 }
2853 } 2966 }
2854 2967
2855 if (w->wd >= 0) 2968 if (w->wd >= 0)
2856 {
2857 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);
2858 2970
2859 /* now local changes will be tracked by inotify, but remote changes won't */ 2971 /* now re-arm timer, if required */
2860 /* unless the filesystem it known to be local, we therefore still poll */ 2972 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); 2973 ev_timer_again (EV_A_ &w->timer);
2875 } 2974 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2876} 2975}
2877 2976
2878static void noinline 2977static void noinline
2879infy_del (EV_P_ ev_stat *w) 2978infy_del (EV_P_ ev_stat *w)
2880{ 2979{
2925 3024
2926static void 3025static void
2927infy_cb (EV_P_ ev_io *w, int revents) 3026infy_cb (EV_P_ ev_io *w, int revents)
2928{ 3027{
2929 char buf [EV_INOTIFY_BUFSIZE]; 3028 char buf [EV_INOTIFY_BUFSIZE];
2930 struct inotify_event *ev = (struct inotify_event *)buf;
2931 int ofs; 3029 int ofs;
2932 int len = read (fs_fd, buf, sizeof (buf)); 3030 int len = read (fs_fd, buf, sizeof (buf));
2933 3031
2934 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);
2935 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;
2936} 3070}
2937 3071
2938inline_size void 3072inline_size void
2939check_2625 (EV_P) 3073ev_check_2625 (EV_P)
2940{ 3074{
2941 /* kernels < 2.6.25 are borked 3075 /* kernels < 2.6.25 are borked
2942 * 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
2943 */ 3077 */
2944 struct utsname buf; 3078 if (ev_linux_version () < 0x020619)
2945 int major, minor, micro;
2946
2947 if (uname (&buf))
2948 return; 3079 return;
2949 3080
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; 3081 fs_2625 = 1;
3082}
3083
3084inline_size int
3085infy_newfd (void)
3086{
3087#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3088 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3089 if (fd >= 0)
3090 return fd;
3091#endif
3092 return inotify_init ();
2959} 3093}
2960 3094
2961inline_size void 3095inline_size void
2962infy_init (EV_P) 3096infy_init (EV_P)
2963{ 3097{
2964 if (fs_fd != -2) 3098 if (fs_fd != -2)
2965 return; 3099 return;
2966 3100
2967 fs_fd = -1; 3101 fs_fd = -1;
2968 3102
2969 check_2625 (EV_A); 3103 ev_check_2625 (EV_A);
2970 3104
2971 fs_fd = inotify_init (); 3105 fs_fd = infy_newfd ();
2972 3106
2973 if (fs_fd >= 0) 3107 if (fs_fd >= 0)
2974 { 3108 {
3109 fd_intern (fs_fd);
2975 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3110 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2976 ev_set_priority (&fs_w, EV_MAXPRI); 3111 ev_set_priority (&fs_w, EV_MAXPRI);
2977 ev_io_start (EV_A_ &fs_w); 3112 ev_io_start (EV_A_ &fs_w);
3113 ev_unref (EV_A);
2978 } 3114 }
2979} 3115}
2980 3116
2981inline_size void 3117inline_size void
2982infy_fork (EV_P) 3118infy_fork (EV_P)
2984 int slot; 3120 int slot;
2985 3121
2986 if (fs_fd < 0) 3122 if (fs_fd < 0)
2987 return; 3123 return;
2988 3124
3125 ev_ref (EV_A);
3126 ev_io_stop (EV_A_ &fs_w);
2989 close (fs_fd); 3127 close (fs_fd);
2990 fs_fd = inotify_init (); 3128 fs_fd = infy_newfd ();
3129
3130 if (fs_fd >= 0)
3131 {
3132 fd_intern (fs_fd);
3133 ev_io_set (&fs_w, fs_fd, EV_READ);
3134 ev_io_start (EV_A_ &fs_w);
3135 ev_unref (EV_A);
3136 }
2991 3137
2992 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3138 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2993 { 3139 {
2994 WL w_ = fs_hash [slot].head; 3140 WL w_ = fs_hash [slot].head;
2995 fs_hash [slot].head = 0; 3141 fs_hash [slot].head = 0;
3002 w->wd = -1; 3148 w->wd = -1;
3003 3149
3004 if (fs_fd >= 0) 3150 if (fs_fd >= 0)
3005 infy_add (EV_A_ w); /* re-add, no matter what */ 3151 infy_add (EV_A_ w); /* re-add, no matter what */
3006 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);
3007 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 }
3008 } 3159 }
3009 } 3160 }
3010} 3161}
3011 3162
3012#endif 3163#endif
3029static void noinline 3180static void noinline
3030stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3181stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3031{ 3182{
3032 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3183 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3033 3184
3034 /* we copy this here each the time so that */ 3185 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); 3186 ev_stat_stat (EV_A_ w);
3038 3187
3039 /* 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 */
3040 if ( 3189 if (
3041 w->prev.st_dev != w->attr.st_dev 3190 prev.st_dev != w->attr.st_dev
3042 || w->prev.st_ino != w->attr.st_ino 3191 || prev.st_ino != w->attr.st_ino
3043 || w->prev.st_mode != w->attr.st_mode 3192 || prev.st_mode != w->attr.st_mode
3044 || w->prev.st_nlink != w->attr.st_nlink 3193 || prev.st_nlink != w->attr.st_nlink
3045 || w->prev.st_uid != w->attr.st_uid 3194 || prev.st_uid != w->attr.st_uid
3046 || w->prev.st_gid != w->attr.st_gid 3195 || prev.st_gid != w->attr.st_gid
3047 || w->prev.st_rdev != w->attr.st_rdev 3196 || prev.st_rdev != w->attr.st_rdev
3048 || w->prev.st_size != w->attr.st_size 3197 || prev.st_size != w->attr.st_size
3049 || w->prev.st_atime != w->attr.st_atime 3198 || prev.st_atime != w->attr.st_atime
3050 || w->prev.st_mtime != w->attr.st_mtime 3199 || prev.st_mtime != w->attr.st_mtime
3051 || w->prev.st_ctime != w->attr.st_ctime 3200 || prev.st_ctime != w->attr.st_ctime
3052 ) { 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
3053 #if EV_USE_INOTIFY 3207 #if EV_USE_INOTIFY
3054 if (fs_fd >= 0) 3208 if (fs_fd >= 0)
3055 { 3209 {
3056 infy_del (EV_A_ w); 3210 infy_del (EV_A_ w);
3057 infy_add (EV_A_ w); 3211 infy_add (EV_A_ w);
3082 3236
3083 if (fs_fd >= 0) 3237 if (fs_fd >= 0)
3084 infy_add (EV_A_ w); 3238 infy_add (EV_A_ w);
3085 else 3239 else
3086#endif 3240#endif
3241 {
3087 ev_timer_again (EV_A_ &w->timer); 3242 ev_timer_again (EV_A_ &w->timer);
3243 ev_unref (EV_A);
3244 }
3088 3245
3089 ev_start (EV_A_ (W)w, 1); 3246 ev_start (EV_A_ (W)w, 1);
3090 3247
3091 EV_FREQUENT_CHECK; 3248 EV_FREQUENT_CHECK;
3092} 3249}
3101 EV_FREQUENT_CHECK; 3258 EV_FREQUENT_CHECK;
3102 3259
3103#if EV_USE_INOTIFY 3260#if EV_USE_INOTIFY
3104 infy_del (EV_A_ w); 3261 infy_del (EV_A_ w);
3105#endif 3262#endif
3263
3264 if (ev_is_active (&w->timer))
3265 {
3266 ev_ref (EV_A);
3106 ev_timer_stop (EV_A_ &w->timer); 3267 ev_timer_stop (EV_A_ &w->timer);
3268 }
3107 3269
3108 ev_stop (EV_A_ (W)w); 3270 ev_stop (EV_A_ (W)w);
3109 3271
3110 EV_FREQUENT_CHECK; 3272 EV_FREQUENT_CHECK;
3111} 3273}
3331 3493
3332 ev_io_stop (EV_A_ &w->io); 3494 ev_io_stop (EV_A_ &w->io);
3333 ev_prepare_stop (EV_A_ &w->prepare); 3495 ev_prepare_stop (EV_A_ &w->prepare);
3334 ev_fork_stop (EV_A_ &w->fork); 3496 ev_fork_stop (EV_A_ &w->fork);
3335 3497
3498 ev_stop (EV_A_ (W)w);
3499
3336 EV_FREQUENT_CHECK; 3500 EV_FREQUENT_CHECK;
3337} 3501}
3338#endif 3502#endif
3339 3503
3340#if EV_FORK_ENABLE 3504#if EV_FORK_ENABLE
3416 3580
3417void 3581void
3418ev_async_send (EV_P_ ev_async *w) 3582ev_async_send (EV_P_ ev_async *w)
3419{ 3583{
3420 w->sent = 1; 3584 w->sent = 1;
3421 evpipe_write (EV_A_ &gotasync); 3585 evpipe_write (EV_A_ &async_pending);
3422} 3586}
3423#endif 3587#endif
3424 3588
3425/*****************************************************************************/ 3589/*****************************************************************************/
3426 3590

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines