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

Comparing libev/ev.c (file contents):
Revision 1.318 by root, Tue Nov 17 00:22:28 2009 UTC vs.
Revision 1.338 by root, Tue Mar 16 00:20: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
182# define WIN32_LEAN_AND_MEAN 184# define WIN32_LEAN_AND_MEAN
183# include <windows.h> 185# include <windows.h>
184# ifndef EV_SELECT_IS_WINSOCKET 186# ifndef EV_SELECT_IS_WINSOCKET
185# define EV_SELECT_IS_WINSOCKET 1 187# define EV_SELECT_IS_WINSOCKET 1
186# endif 188# endif
189# undef EV_AVOID_STDIO
187#endif 190#endif
188 191
189/* this block tries to deduce configuration from header-defined symbols and defaults */ 192/* this block tries to deduce configuration from header-defined symbols and defaults */
190 193
191/* try to deduce the maximum number of signals on this platform */ 194/* try to deduce the maximum number of signals on this platform */
204#elif defined (MAXSIG) 207#elif defined (MAXSIG)
205# define EV_NSIG (MAXSIG+1) 208# define EV_NSIG (MAXSIG+1)
206#elif defined (MAX_SIG) 209#elif defined (MAX_SIG)
207# define EV_NSIG (MAX_SIG+1) 210# define EV_NSIG (MAX_SIG+1)
208#elif defined (SIGARRAYSIZE) 211#elif defined (SIGARRAYSIZE)
209# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */ 212# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
210#elif defined (_sys_nsig) 213#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 214# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else 215#else
213# error "unable to find value for NSIG, please report" 216# error "unable to find value for NSIG, please report"
214/* to make it compile regardless, just remove the above line */ 217/* to make it compile regardless, just remove the above line, */
218/* but consider reporting it, too! :) */
215# define EV_NSIG 65 219# define EV_NSIG 65
216#endif 220#endif
217 221
218#ifndef EV_USE_CLOCK_SYSCALL 222#ifndef EV_USE_CLOCK_SYSCALL
219# if __linux && __GLIBC__ >= 2 223# if __linux && __GLIBC__ >= 2
220# define EV_USE_CLOCK_SYSCALL 1 224# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
221# else 225# else
222# define EV_USE_CLOCK_SYSCALL 0 226# define EV_USE_CLOCK_SYSCALL 0
223# endif 227# endif
224#endif 228#endif
225 229
226#ifndef EV_USE_MONOTONIC 230#ifndef EV_USE_MONOTONIC
227# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 231# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
228# define EV_USE_MONOTONIC 1 232# define EV_USE_MONOTONIC EV_FEATURE_OS
229# else 233# else
230# define EV_USE_MONOTONIC 0 234# define EV_USE_MONOTONIC 0
231# endif 235# endif
232#endif 236#endif
233 237
235# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 239# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
236#endif 240#endif
237 241
238#ifndef EV_USE_NANOSLEEP 242#ifndef EV_USE_NANOSLEEP
239# if _POSIX_C_SOURCE >= 199309L 243# if _POSIX_C_SOURCE >= 199309L
240# define EV_USE_NANOSLEEP 1 244# define EV_USE_NANOSLEEP EV_FEATURE_OS
241# else 245# else
242# define EV_USE_NANOSLEEP 0 246# define EV_USE_NANOSLEEP 0
243# endif 247# endif
244#endif 248#endif
245 249
246#ifndef EV_USE_SELECT 250#ifndef EV_USE_SELECT
247# define EV_USE_SELECT 1 251# define EV_USE_SELECT EV_FEATURE_BACKENDS
248#endif 252#endif
249 253
250#ifndef EV_USE_POLL 254#ifndef EV_USE_POLL
251# ifdef _WIN32 255# ifdef _WIN32
252# define EV_USE_POLL 0 256# define EV_USE_POLL 0
253# else 257# else
254# define EV_USE_POLL 1 258# define EV_USE_POLL EV_FEATURE_BACKENDS
255# endif 259# endif
256#endif 260#endif
257 261
258#ifndef EV_USE_EPOLL 262#ifndef EV_USE_EPOLL
259# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 263# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
260# define EV_USE_EPOLL 1 264# define EV_USE_EPOLL EV_FEATURE_BACKENDS
261# else 265# else
262# define EV_USE_EPOLL 0 266# define EV_USE_EPOLL 0
263# endif 267# endif
264#endif 268#endif
265 269
271# define EV_USE_PORT 0 275# define EV_USE_PORT 0
272#endif 276#endif
273 277
274#ifndef EV_USE_INOTIFY 278#ifndef EV_USE_INOTIFY
275# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 279# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
276# define EV_USE_INOTIFY 1 280# define EV_USE_INOTIFY EV_FEATURE_OS
277# else 281# else
278# define EV_USE_INOTIFY 0 282# define EV_USE_INOTIFY 0
279# endif 283# endif
280#endif 284#endif
281 285
282#ifndef EV_PID_HASHSIZE 286#ifndef EV_PID_HASHSIZE
283# if EV_MINIMAL 287# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
284# define EV_PID_HASHSIZE 1
285# else
286# define EV_PID_HASHSIZE 16
287# endif
288#endif 288#endif
289 289
290#ifndef EV_INOTIFY_HASHSIZE 290#ifndef EV_INOTIFY_HASHSIZE
291# if EV_MINIMAL 291# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
292# define EV_INOTIFY_HASHSIZE 1
293# else
294# define EV_INOTIFY_HASHSIZE 16
295# endif
296#endif 292#endif
297 293
298#ifndef EV_USE_EVENTFD 294#ifndef EV_USE_EVENTFD
299# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 295# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
300# define EV_USE_EVENTFD 1 296# define EV_USE_EVENTFD EV_FEATURE_OS
301# else 297# else
302# define EV_USE_EVENTFD 0 298# define EV_USE_EVENTFD 0
303# endif 299# endif
304#endif 300#endif
305 301
306#ifndef EV_USE_SIGNALFD 302#ifndef EV_USE_SIGNALFD
307# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 303# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
308# define EV_USE_SIGNALFD 1 304# define EV_USE_SIGNALFD EV_FEATURE_OS
309# else 305# else
310# define EV_USE_SIGNALFD 0 306# define EV_USE_SIGNALFD 0
311# endif 307# endif
312#endif 308#endif
313 309
316# define EV_USE_4HEAP 1 312# define EV_USE_4HEAP 1
317# define EV_HEAP_CACHE_AT 1 313# define EV_HEAP_CACHE_AT 1
318#endif 314#endif
319 315
320#ifndef EV_VERIFY 316#ifndef EV_VERIFY
321# define EV_VERIFY !EV_MINIMAL 317# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
322#endif 318#endif
323 319
324#ifndef EV_USE_4HEAP 320#ifndef EV_USE_4HEAP
325# define EV_USE_4HEAP !EV_MINIMAL 321# define EV_USE_4HEAP EV_FEATURE_DATA
326#endif 322#endif
327 323
328#ifndef EV_HEAP_CACHE_AT 324#ifndef EV_HEAP_CACHE_AT
329# define EV_HEAP_CACHE_AT !EV_MINIMAL 325# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
330#endif 326#endif
331 327
332/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 328/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
333/* which makes programs even slower. might work on other unices, too. */ 329/* which makes programs even slower. might work on other unices, too. */
334#if EV_USE_CLOCK_SYSCALL 330#if EV_USE_CLOCK_SYSCALL
343# endif 339# endif
344#endif 340#endif
345 341
346/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 342/* this block fixes any misconfiguration where we know we run into trouble otherwise */
347 343
344#ifdef _AIX
345/* AIX has a completely broken poll.h header */
346# undef EV_USE_POLL
347# define EV_USE_POLL 0
348#endif
349
348#ifndef CLOCK_MONOTONIC 350#ifndef CLOCK_MONOTONIC
349# undef EV_USE_MONOTONIC 351# undef EV_USE_MONOTONIC
350# define EV_USE_MONOTONIC 0 352# define EV_USE_MONOTONIC 0
351#endif 353#endif
352 354
395# endif 397# endif
396# endif 398# endif
397# ifdef __cplusplus 399# ifdef __cplusplus
398extern "C" { 400extern "C" {
399# endif 401# endif
400int eventfd (unsigned int initval, int flags); 402int (eventfd) (unsigned int initval, int flags);
401# ifdef __cplusplus 403# ifdef __cplusplus
402} 404}
403# endif 405# endif
404#endif 406#endif
405 407
466 468
467#define expect_false(expr) expect ((expr) != 0, 0) 469#define expect_false(expr) expect ((expr) != 0, 0)
468#define expect_true(expr) expect ((expr) != 0, 1) 470#define expect_true(expr) expect ((expr) != 0, 1)
469#define inline_size static inline 471#define inline_size static inline
470 472
471#if EV_MINIMAL 473#if EV_FEATURE_CODE
474# define inline_speed static inline
475#else
472# define inline_speed static noinline 476# define inline_speed static noinline
473#else
474# define inline_speed static inline
475#endif 477#endif
476 478
477#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 479#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
478 480
479#if EV_MINPRI == EV_MAXPRI 481#if EV_MINPRI == EV_MAXPRI
504 506
505#ifndef EV_FD_TO_WIN32_HANDLE 507#ifndef EV_FD_TO_WIN32_HANDLE
506# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd) 508# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
507#endif 509#endif
508#ifndef EV_WIN32_HANDLE_TO_FD 510#ifndef EV_WIN32_HANDLE_TO_FD
509# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0) 511# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
510#endif 512#endif
511#ifndef EV_WIN32_CLOSE_FD 513#ifndef EV_WIN32_CLOSE_FD
512# define EV_WIN32_CLOSE_FD(fd) close (fd) 514# define EV_WIN32_CLOSE_FD(fd) close (fd)
513#endif 515#endif
514 516
515#ifdef _WIN32 517#ifdef _WIN32
516# include "ev_win32.c" 518# include "ev_win32.c"
517#endif 519#endif
518 520
519/*****************************************************************************/ 521/*****************************************************************************/
522
523#if EV_AVOID_STDIO
524static void noinline
525ev_printerr (const char *msg)
526{
527 write (STDERR_FILENO, msg, strlen (msg));
528}
529#endif
520 530
521static void (*syserr_cb)(const char *msg); 531static void (*syserr_cb)(const char *msg);
522 532
523void 533void
524ev_set_syserr_cb (void (*cb)(const char *msg)) 534ev_set_syserr_cb (void (*cb)(const char *msg))
534 544
535 if (syserr_cb) 545 if (syserr_cb)
536 syserr_cb (msg); 546 syserr_cb (msg);
537 else 547 else
538 { 548 {
549#if EV_AVOID_STDIO
550 const char *err = strerror (errno);
551
552 ev_printerr (msg);
553 ev_printerr (": ");
554 ev_printerr (err);
555 ev_printerr ("\n");
556#else
539 perror (msg); 557 perror (msg);
558#endif
540 abort (); 559 abort ();
541 } 560 }
542} 561}
543 562
544static void * 563static void *
545ev_realloc_emul (void *ptr, long size) 564ev_realloc_emul (void *ptr, long size)
546{ 565{
566#if __GLIBC__
567 return realloc (ptr, size);
568#else
547 /* some systems, notably openbsd and darwin, fail to properly 569 /* some systems, notably openbsd and darwin, fail to properly
548 * implement realloc (x, 0) (as required by both ansi c-98 and 570 * implement realloc (x, 0) (as required by both ansi c-89 and
549 * the single unix specification, so work around them here. 571 * the single unix specification, so work around them here.
550 */ 572 */
551 573
552 if (size) 574 if (size)
553 return realloc (ptr, size); 575 return realloc (ptr, size);
554 576
555 free (ptr); 577 free (ptr);
556 return 0; 578 return 0;
579#endif
557} 580}
558 581
559static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 582static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
560 583
561void 584void
569{ 592{
570 ptr = alloc (ptr, size); 593 ptr = alloc (ptr, size);
571 594
572 if (!ptr && size) 595 if (!ptr && size)
573 { 596 {
597#if EV_AVOID_STDIO
598 ev_printerr ("libev: memory allocation failed, aborting.\n");
599#else
574 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 600 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
601#endif
575 abort (); 602 abort ();
576 } 603 }
577 604
578 return ptr; 605 return ptr;
579} 606}
661 688
662 static int ev_default_loop_ptr; 689 static int ev_default_loop_ptr;
663 690
664#endif 691#endif
665 692
666#if EV_MINIMAL < 2 693#if EV_FEATURE_API
667# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 694# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
668# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A) 695# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
669# define EV_INVOKE_PENDING invoke_cb (EV_A) 696# define EV_INVOKE_PENDING invoke_cb (EV_A)
670#else 697#else
671# define EV_RELEASE_CB (void)0 698# define EV_RELEASE_CB (void)0
856} 883}
857 884
858/*****************************************************************************/ 885/*****************************************************************************/
859 886
860inline_speed void 887inline_speed void
861fd_event_nc (EV_P_ int fd, int revents) 888fd_event_nocheck (EV_P_ int fd, int revents)
862{ 889{
863 ANFD *anfd = anfds + fd; 890 ANFD *anfd = anfds + fd;
864 ev_io *w; 891 ev_io *w;
865 892
866 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 893 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
878fd_event (EV_P_ int fd, int revents) 905fd_event (EV_P_ int fd, int revents)
879{ 906{
880 ANFD *anfd = anfds + fd; 907 ANFD *anfd = anfds + fd;
881 908
882 if (expect_true (!anfd->reify)) 909 if (expect_true (!anfd->reify))
883 fd_event_nc (EV_A_ fd, revents); 910 fd_event_nocheck (EV_A_ fd, revents);
884} 911}
885 912
886void 913void
887ev_feed_fd_event (EV_P_ int fd, int revents) 914ev_feed_fd_event (EV_P_ int fd, int revents)
888{ 915{
889 if (fd >= 0 && fd < anfdmax) 916 if (fd >= 0 && fd < anfdmax)
890 fd_event_nc (EV_A_ fd, revents); 917 fd_event_nocheck (EV_A_ fd, revents);
891} 918}
892 919
893/* make sure the external fd watch events are in-sync */ 920/* make sure the external fd watch events are in-sync */
894/* with the kernel/libev internal state */ 921/* with the kernel/libev internal state */
895inline_size void 922inline_size void
958 ev_io_stop (EV_A_ w); 985 ev_io_stop (EV_A_ w);
959 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 986 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
960 } 987 }
961} 988}
962 989
963/* check whether the given fd is atcually valid, for error recovery */ 990/* check whether the given fd is actually valid, for error recovery */
964inline_size int 991inline_size int
965fd_valid (int fd) 992fd_valid (int fd)
966{ 993{
967#ifdef _WIN32 994#ifdef _WIN32
968 return _get_osfhandle (fd) != -1; 995 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
969#else 996#else
970 return fcntl (fd, F_GETFD) != -1; 997 return fcntl (fd, F_GETFD) != -1;
971#endif 998#endif
972} 999}
973 1000
1008 { 1035 {
1009 anfds [fd].events = 0; 1036 anfds [fd].events = 0;
1010 anfds [fd].emask = 0; 1037 anfds [fd].emask = 0;
1011 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1038 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
1012 } 1039 }
1040}
1041
1042/* used to prepare libev internal fd's */
1043/* this is not fork-safe */
1044inline_speed void
1045fd_intern (int fd)
1046{
1047#ifdef _WIN32
1048 unsigned long arg = 1;
1049 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1050#else
1051 fcntl (fd, F_SETFD, FD_CLOEXEC);
1052 fcntl (fd, F_SETFL, O_NONBLOCK);
1053#endif
1013} 1054}
1014 1055
1015/*****************************************************************************/ 1056/*****************************************************************************/
1016 1057
1017/* 1058/*
1171 1212
1172static ANSIG signals [EV_NSIG - 1]; 1213static ANSIG signals [EV_NSIG - 1];
1173 1214
1174/*****************************************************************************/ 1215/*****************************************************************************/
1175 1216
1176/* used to prepare libev internal fd's */ 1217#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1177/* this is not fork-safe */
1178inline_speed void
1179fd_intern (int fd)
1180{
1181#ifdef _WIN32
1182 unsigned long arg = 1;
1183 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1184#else
1185 fcntl (fd, F_SETFD, FD_CLOEXEC);
1186 fcntl (fd, F_SETFL, O_NONBLOCK);
1187#endif
1188}
1189 1218
1190static void noinline 1219static void noinline
1191evpipe_init (EV_P) 1220evpipe_init (EV_P)
1192{ 1221{
1193 if (!ev_is_active (&pipe_w)) 1222 if (!ev_is_active (&pipe_w))
1194 { 1223 {
1195#if EV_USE_EVENTFD 1224# if EV_USE_EVENTFD
1196 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1225 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1197 if (evfd < 0 && errno == EINVAL) 1226 if (evfd < 0 && errno == EINVAL)
1198 evfd = eventfd (0, 0); 1227 evfd = eventfd (0, 0);
1199 1228
1200 if (evfd >= 0) 1229 if (evfd >= 0)
1202 evpipe [0] = -1; 1231 evpipe [0] = -1;
1203 fd_intern (evfd); /* doing it twice doesn't hurt */ 1232 fd_intern (evfd); /* doing it twice doesn't hurt */
1204 ev_io_set (&pipe_w, evfd, EV_READ); 1233 ev_io_set (&pipe_w, evfd, EV_READ);
1205 } 1234 }
1206 else 1235 else
1207#endif 1236# endif
1208 { 1237 {
1209 while (pipe (evpipe)) 1238 while (pipe (evpipe))
1210 ev_syserr ("(libev) error creating signal/async pipe"); 1239 ev_syserr ("(libev) error creating signal/async pipe");
1211 1240
1212 fd_intern (evpipe [0]); 1241 fd_intern (evpipe [0]);
1223evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1252evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1224{ 1253{
1225 if (!*flag) 1254 if (!*flag)
1226 { 1255 {
1227 int old_errno = errno; /* save errno because write might clobber it */ 1256 int old_errno = errno; /* save errno because write might clobber it */
1257 char dummy;
1228 1258
1229 *flag = 1; 1259 *flag = 1;
1230 1260
1231#if EV_USE_EVENTFD 1261#if EV_USE_EVENTFD
1232 if (evfd >= 0) 1262 if (evfd >= 0)
1234 uint64_t counter = 1; 1264 uint64_t counter = 1;
1235 write (evfd, &counter, sizeof (uint64_t)); 1265 write (evfd, &counter, sizeof (uint64_t));
1236 } 1266 }
1237 else 1267 else
1238#endif 1268#endif
1239 write (evpipe [1], &old_errno, 1); 1269 write (evpipe [1], &dummy, 1);
1240 1270
1241 errno = old_errno; 1271 errno = old_errno;
1242 } 1272 }
1243} 1273}
1244 1274
1293{ 1323{
1294#if EV_MULTIPLICITY 1324#if EV_MULTIPLICITY
1295 EV_P = signals [signum - 1].loop; 1325 EV_P = signals [signum - 1].loop;
1296#endif 1326#endif
1297 1327
1298#if _WIN32 1328#ifdef _WIN32
1299 signal (signum, ev_sighandler); 1329 signal (signum, ev_sighandler);
1300#endif 1330#endif
1301 1331
1302 signals [signum - 1].pending = 1; 1332 signals [signum - 1].pending = 1;
1303 evpipe_write (EV_A_ &sig_pending); 1333 evpipe_write (EV_A_ &sig_pending);
1345 break; 1375 break;
1346 } 1376 }
1347} 1377}
1348#endif 1378#endif
1349 1379
1380#endif
1381
1350/*****************************************************************************/ 1382/*****************************************************************************/
1351 1383
1384#if EV_CHILD_ENABLE
1352static WL childs [EV_PID_HASHSIZE]; 1385static WL childs [EV_PID_HASHSIZE];
1353
1354#ifndef _WIN32
1355 1386
1356static ev_signal childev; 1387static ev_signal childev;
1357 1388
1358#ifndef WIFCONTINUED 1389#ifndef WIFCONTINUED
1359# define WIFCONTINUED(status) 0 1390# define WIFCONTINUED(status) 0
1364child_reap (EV_P_ int chain, int pid, int status) 1395child_reap (EV_P_ int chain, int pid, int status)
1365{ 1396{
1366 ev_child *w; 1397 ev_child *w;
1367 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1398 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1368 1399
1369 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1400 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1370 { 1401 {
1371 if ((w->pid == pid || !w->pid) 1402 if ((w->pid == pid || !w->pid)
1372 && (!traced || (w->flags & 1))) 1403 && (!traced || (w->flags & 1)))
1373 { 1404 {
1374 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1405 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
1399 /* make sure we are called again until all children have been reaped */ 1430 /* make sure we are called again until all children have been reaped */
1400 /* we need to do it this way so that the callback gets called before we continue */ 1431 /* we need to do it this way so that the callback gets called before we continue */
1401 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1432 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1402 1433
1403 child_reap (EV_A_ pid, pid, status); 1434 child_reap (EV_A_ pid, pid, status);
1404 if (EV_PID_HASHSIZE > 1) 1435 if ((EV_PID_HASHSIZE) > 1)
1405 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1436 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1406} 1437}
1407 1438
1408#endif 1439#endif
1409 1440
1498ev_backend (EV_P) 1529ev_backend (EV_P)
1499{ 1530{
1500 return backend; 1531 return backend;
1501} 1532}
1502 1533
1503#if EV_MINIMAL < 2 1534#if EV_FEATURE_API
1504unsigned int 1535unsigned int
1505ev_loop_count (EV_P) 1536ev_loop_count (EV_P)
1506{ 1537{
1507 return loop_count; 1538 return loop_count;
1508} 1539}
1588 1619
1589 ev_rt_now = ev_time (); 1620 ev_rt_now = ev_time ();
1590 mn_now = get_clock (); 1621 mn_now = get_clock ();
1591 now_floor = mn_now; 1622 now_floor = mn_now;
1592 rtmn_diff = ev_rt_now - mn_now; 1623 rtmn_diff = ev_rt_now - mn_now;
1593#if EV_MINIMAL < 2 1624#if EV_FEATURE_API
1594 invoke_cb = ev_invoke_pending; 1625 invoke_cb = ev_invoke_pending;
1595#endif 1626#endif
1596 1627
1597 io_blocktime = 0.; 1628 io_blocktime = 0.;
1598 timeout_blocktime = 0.; 1629 timeout_blocktime = 0.;
1604#endif 1635#endif
1605#if EV_USE_INOTIFY 1636#if EV_USE_INOTIFY
1606 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1637 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1607#endif 1638#endif
1608#if EV_USE_SIGNALFD 1639#if EV_USE_SIGNALFD
1609 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1640 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1610#endif 1641#endif
1611 1642
1612 if (!(flags & 0x0000ffffU)) 1643 if (!(flags & 0x0000ffffU))
1613 flags |= ev_recommended_backends (); 1644 flags |= ev_recommended_backends ();
1614 1645
1628 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1659 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1629#endif 1660#endif
1630 1661
1631 ev_prepare_init (&pending_w, pendingcb); 1662 ev_prepare_init (&pending_w, pendingcb);
1632 1663
1664#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1633 ev_init (&pipe_w, pipecb); 1665 ev_init (&pipe_w, pipecb);
1634 ev_set_priority (&pipe_w, EV_MAXPRI); 1666 ev_set_priority (&pipe_w, EV_MAXPRI);
1667#endif
1635 } 1668 }
1636} 1669}
1637 1670
1638/* free up a loop structure */ 1671/* free up a loop structure */
1639static void noinline 1672static void noinline
1757 { 1790 {
1758 EV_WIN32_CLOSE_FD (evpipe [0]); 1791 EV_WIN32_CLOSE_FD (evpipe [0]);
1759 EV_WIN32_CLOSE_FD (evpipe [1]); 1792 EV_WIN32_CLOSE_FD (evpipe [1]);
1760 } 1793 }
1761 1794
1795#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1762 evpipe_init (EV_A); 1796 evpipe_init (EV_A);
1763 /* now iterate over everything, in case we missed something */ 1797 /* now iterate over everything, in case we missed something */
1764 pipecb (EV_A_ &pipe_w, EV_READ); 1798 pipecb (EV_A_ &pipe_w, EV_READ);
1799#endif
1765 } 1800 }
1766 1801
1767 postfork = 0; 1802 postfork = 0;
1768} 1803}
1769 1804
1831 verify_watcher (EV_A_ ws [cnt]); 1866 verify_watcher (EV_A_ ws [cnt]);
1832 } 1867 }
1833} 1868}
1834#endif 1869#endif
1835 1870
1836#if EV_MINIMAL < 2 1871#if EV_FEATURE_API
1837void 1872void
1838ev_loop_verify (EV_P) 1873ev_loop_verify (EV_P)
1839{ 1874{
1840#if EV_VERIFY 1875#if EV_VERIFY
1841 int i; 1876 int i;
1882#if EV_ASYNC_ENABLE 1917#if EV_ASYNC_ENABLE
1883 assert (asyncmax >= asynccnt); 1918 assert (asyncmax >= asynccnt);
1884 array_verify (EV_A_ (W *)asyncs, asynccnt); 1919 array_verify (EV_A_ (W *)asyncs, asynccnt);
1885#endif 1920#endif
1886 1921
1922#if EV_PREPARE_ENABLE
1887 assert (preparemax >= preparecnt); 1923 assert (preparemax >= preparecnt);
1888 array_verify (EV_A_ (W *)prepares, preparecnt); 1924 array_verify (EV_A_ (W *)prepares, preparecnt);
1925#endif
1889 1926
1927#if EV_CHECK_ENABLE
1890 assert (checkmax >= checkcnt); 1928 assert (checkmax >= checkcnt);
1891 array_verify (EV_A_ (W *)checks, checkcnt); 1929 array_verify (EV_A_ (W *)checks, checkcnt);
1930#endif
1892 1931
1893# if 0 1932# if 0
1933#if EV_CHILD_ENABLE
1894 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1934 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1895 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending) 1935 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1936#endif
1896# endif 1937# endif
1897#endif 1938#endif
1898} 1939}
1899#endif 1940#endif
1900 1941
1916 1957
1917 loop_init (EV_A_ flags); 1958 loop_init (EV_A_ flags);
1918 1959
1919 if (ev_backend (EV_A)) 1960 if (ev_backend (EV_A))
1920 { 1961 {
1921#ifndef _WIN32 1962#if EV_CHILD_ENABLE
1922 ev_signal_init (&childev, childcb, SIGCHLD); 1963 ev_signal_init (&childev, childcb, SIGCHLD);
1923 ev_set_priority (&childev, EV_MAXPRI); 1964 ev_set_priority (&childev, EV_MAXPRI);
1924 ev_signal_start (EV_A_ &childev); 1965 ev_signal_start (EV_A_ &childev);
1925 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1966 ev_unref (EV_A); /* child watcher should not keep loop alive */
1926#endif 1967#endif
1939 EV_P = ev_default_loop_ptr; 1980 EV_P = ev_default_loop_ptr;
1940#endif 1981#endif
1941 1982
1942 ev_default_loop_ptr = 0; 1983 ev_default_loop_ptr = 0;
1943 1984
1944#ifndef _WIN32 1985#if EV_CHILD_ENABLE
1945 ev_ref (EV_A); /* child watcher */ 1986 ev_ref (EV_A); /* child watcher */
1946 ev_signal_stop (EV_A_ &childev); 1987 ev_signal_stop (EV_A_ &childev);
1947#endif 1988#endif
1948 1989
1949 loop_destroy (EV_A); 1990 loop_destroy (EV_A);
2156 ANHE_at_cache (*he); 2197 ANHE_at_cache (*he);
2157 } 2198 }
2158} 2199}
2159 2200
2160/* fetch new monotonic and realtime times from the kernel */ 2201/* fetch new monotonic and realtime times from the kernel */
2161/* also detetc if there was a timejump, and act accordingly */ 2202/* also detect if there was a timejump, and act accordingly */
2162inline_speed void 2203inline_speed void
2163time_update (EV_P_ ev_tstamp max_block) 2204time_update (EV_P_ ev_tstamp max_block)
2164{ 2205{
2165#if EV_USE_MONOTONIC 2206#if EV_USE_MONOTONIC
2166 if (expect_true (have_monotonic)) 2207 if (expect_true (have_monotonic))
2226} 2267}
2227 2268
2228void 2269void
2229ev_loop (EV_P_ int flags) 2270ev_loop (EV_P_ int flags)
2230{ 2271{
2231#if EV_MINIMAL < 2 2272#if EV_FEATURE_API
2232 ++loop_depth; 2273 ++loop_depth;
2233#endif 2274#endif
2234 2275
2235 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2276 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2236 2277
2261 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2302 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2262 EV_INVOKE_PENDING; 2303 EV_INVOKE_PENDING;
2263 } 2304 }
2264#endif 2305#endif
2265 2306
2307#if EV_PREPARE_ENABLE
2266 /* queue prepare watchers (and execute them) */ 2308 /* queue prepare watchers (and execute them) */
2267 if (expect_false (preparecnt)) 2309 if (expect_false (preparecnt))
2268 { 2310 {
2269 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2311 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2270 EV_INVOKE_PENDING; 2312 EV_INVOKE_PENDING;
2271 } 2313 }
2314#endif
2272 2315
2273 if (expect_false (loop_done)) 2316 if (expect_false (loop_done))
2274 break; 2317 break;
2275 2318
2276 /* we might have forked, so reify kernel state if necessary */ 2319 /* we might have forked, so reify kernel state if necessary */
2327 waittime -= sleeptime; 2370 waittime -= sleeptime;
2328 } 2371 }
2329 } 2372 }
2330 } 2373 }
2331 2374
2332#if EV_MINIMAL < 2 2375#if EV_FEATURE_API
2333 ++loop_count; 2376 ++loop_count;
2334#endif 2377#endif
2335 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2378 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2336 backend_poll (EV_A_ waittime); 2379 backend_poll (EV_A_ waittime);
2337 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2380 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2349#if EV_IDLE_ENABLE 2392#if EV_IDLE_ENABLE
2350 /* queue idle watchers unless other events are pending */ 2393 /* queue idle watchers unless other events are pending */
2351 idle_reify (EV_A); 2394 idle_reify (EV_A);
2352#endif 2395#endif
2353 2396
2397#if EV_CHECK_ENABLE
2354 /* queue check watchers, to be executed first */ 2398 /* queue check watchers, to be executed first */
2355 if (expect_false (checkcnt)) 2399 if (expect_false (checkcnt))
2356 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2400 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2401#endif
2357 2402
2358 EV_INVOKE_PENDING; 2403 EV_INVOKE_PENDING;
2359 } 2404 }
2360 while (expect_true ( 2405 while (expect_true (
2361 activecnt 2406 activecnt
2364 )); 2409 ));
2365 2410
2366 if (loop_done == EVUNLOOP_ONE) 2411 if (loop_done == EVUNLOOP_ONE)
2367 loop_done = EVUNLOOP_CANCEL; 2412 loop_done = EVUNLOOP_CANCEL;
2368 2413
2369#if EV_MINIMAL < 2 2414#if EV_FEATURE_API
2370 --loop_depth; 2415 --loop_depth;
2371#endif 2416#endif
2372} 2417}
2373 2418
2374void 2419void
2500 2545
2501 if (expect_false (ev_is_active (w))) 2546 if (expect_false (ev_is_active (w)))
2502 return; 2547 return;
2503 2548
2504 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2549 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2505 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2550 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2506 2551
2507 EV_FREQUENT_CHECK; 2552 EV_FREQUENT_CHECK;
2508 2553
2509 ev_start (EV_A_ (W)w, 1); 2554 ev_start (EV_A_ (W)w, 1);
2510 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2555 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2580 timers [active] = timers [timercnt + HEAP0]; 2625 timers [active] = timers [timercnt + HEAP0];
2581 adjustheap (timers, timercnt, active); 2626 adjustheap (timers, timercnt, active);
2582 } 2627 }
2583 } 2628 }
2584 2629
2585 EV_FREQUENT_CHECK;
2586
2587 ev_at (w) -= mn_now; 2630 ev_at (w) -= mn_now;
2588 2631
2589 ev_stop (EV_A_ (W)w); 2632 ev_stop (EV_A_ (W)w);
2633
2634 EV_FREQUENT_CHECK;
2590} 2635}
2591 2636
2592void noinline 2637void noinline
2593ev_timer_again (EV_P_ ev_timer *w) 2638ev_timer_again (EV_P_ ev_timer *w)
2594{ 2639{
2673 periodics [active] = periodics [periodiccnt + HEAP0]; 2718 periodics [active] = periodics [periodiccnt + HEAP0];
2674 adjustheap (periodics, periodiccnt, active); 2719 adjustheap (periodics, periodiccnt, active);
2675 } 2720 }
2676 } 2721 }
2677 2722
2678 EV_FREQUENT_CHECK;
2679
2680 ev_stop (EV_A_ (W)w); 2723 ev_stop (EV_A_ (W)w);
2724
2725 EV_FREQUENT_CHECK;
2681} 2726}
2682 2727
2683void noinline 2728void noinline
2684ev_periodic_again (EV_P_ ev_periodic *w) 2729ev_periodic_again (EV_P_ ev_periodic *w)
2685{ 2730{
2690#endif 2735#endif
2691 2736
2692#ifndef SA_RESTART 2737#ifndef SA_RESTART
2693# define SA_RESTART 0 2738# define SA_RESTART 0
2694#endif 2739#endif
2740
2741#if EV_SIGNAL_ENABLE
2695 2742
2696void noinline 2743void noinline
2697ev_signal_start (EV_P_ ev_signal *w) 2744ev_signal_start (EV_P_ ev_signal *w)
2698{ 2745{
2699 if (expect_false (ev_is_active (w))) 2746 if (expect_false (ev_is_active (w)))
2746 if (!((WL)w)->next) 2793 if (!((WL)w)->next)
2747# if EV_USE_SIGNALFD 2794# if EV_USE_SIGNALFD
2748 if (sigfd < 0) /*TODO*/ 2795 if (sigfd < 0) /*TODO*/
2749# endif 2796# endif
2750 { 2797 {
2751# if _WIN32 2798# ifdef _WIN32
2752 evpipe_init (EV_A); 2799 evpipe_init (EV_A);
2753 2800
2754 signal (w->signum, ev_sighandler); 2801 signal (w->signum, ev_sighandler);
2755# else 2802# else
2756 struct sigaction sa; 2803 struct sigaction sa;
2789 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2836 signals [w->signum - 1].loop = 0; /* unattach from signal */
2790#endif 2837#endif
2791#if EV_USE_SIGNALFD 2838#if EV_USE_SIGNALFD
2792 if (sigfd >= 0) 2839 if (sigfd >= 0)
2793 { 2840 {
2794 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2841 sigset_t ss;
2842
2843 sigemptyset (&ss);
2844 sigaddset (&ss, w->signum);
2795 sigdelset (&sigfd_set, w->signum); 2845 sigdelset (&sigfd_set, w->signum);
2846
2796 signalfd (sigfd, &sigfd_set, 0); 2847 signalfd (sigfd, &sigfd_set, 0);
2797 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2848 sigprocmask (SIG_UNBLOCK, &ss, 0);
2798 /*TODO: maybe unblock signal? */
2799 } 2849 }
2800 else 2850 else
2801#endif 2851#endif
2802 signal (w->signum, SIG_DFL); 2852 signal (w->signum, SIG_DFL);
2803 } 2853 }
2804 2854
2805 EV_FREQUENT_CHECK; 2855 EV_FREQUENT_CHECK;
2806} 2856}
2807 2857
2858#endif
2859
2860#if EV_CHILD_ENABLE
2861
2808void 2862void
2809ev_child_start (EV_P_ ev_child *w) 2863ev_child_start (EV_P_ ev_child *w)
2810{ 2864{
2811#if EV_MULTIPLICITY 2865#if EV_MULTIPLICITY
2812 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2866 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2815 return; 2869 return;
2816 2870
2817 EV_FREQUENT_CHECK; 2871 EV_FREQUENT_CHECK;
2818 2872
2819 ev_start (EV_A_ (W)w, 1); 2873 ev_start (EV_A_ (W)w, 1);
2820 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2874 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2821 2875
2822 EV_FREQUENT_CHECK; 2876 EV_FREQUENT_CHECK;
2823} 2877}
2824 2878
2825void 2879void
2829 if (expect_false (!ev_is_active (w))) 2883 if (expect_false (!ev_is_active (w)))
2830 return; 2884 return;
2831 2885
2832 EV_FREQUENT_CHECK; 2886 EV_FREQUENT_CHECK;
2833 2887
2834 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2888 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2835 ev_stop (EV_A_ (W)w); 2889 ev_stop (EV_A_ (W)w);
2836 2890
2837 EV_FREQUENT_CHECK; 2891 EV_FREQUENT_CHECK;
2838} 2892}
2893
2894#endif
2839 2895
2840#if EV_STAT_ENABLE 2896#if EV_STAT_ENABLE
2841 2897
2842# ifdef _WIN32 2898# ifdef _WIN32
2843# undef lstat 2899# undef lstat
2849#define MIN_STAT_INTERVAL 0.1074891 2905#define MIN_STAT_INTERVAL 0.1074891
2850 2906
2851static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2907static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2852 2908
2853#if EV_USE_INOTIFY 2909#if EV_USE_INOTIFY
2854# define EV_INOTIFY_BUFSIZE 8192 2910
2911/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2912# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2855 2913
2856static void noinline 2914static void noinline
2857infy_add (EV_P_ ev_stat *w) 2915infy_add (EV_P_ ev_stat *w)
2858{ 2916{
2859 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); 2917 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);
2908 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2966 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2909 } 2967 }
2910 } 2968 }
2911 2969
2912 if (w->wd >= 0) 2970 if (w->wd >= 0)
2913 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2971 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2914 2972
2915 /* now re-arm timer, if required */ 2973 /* now re-arm timer, if required */
2916 if (ev_is_active (&w->timer)) ev_ref (EV_A); 2974 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2917 ev_timer_again (EV_A_ &w->timer); 2975 ev_timer_again (EV_A_ &w->timer);
2918 if (ev_is_active (&w->timer)) ev_unref (EV_A); 2976 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2926 2984
2927 if (wd < 0) 2985 if (wd < 0)
2928 return; 2986 return;
2929 2987
2930 w->wd = -2; 2988 w->wd = -2;
2931 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 2989 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2932 wlist_del (&fs_hash [slot].head, (WL)w); 2990 wlist_del (&fs_hash [slot].head, (WL)w);
2933 2991
2934 /* remove this watcher, if others are watching it, they will rearm */ 2992 /* remove this watcher, if others are watching it, they will rearm */
2935 inotify_rm_watch (fs_fd, wd); 2993 inotify_rm_watch (fs_fd, wd);
2936} 2994}
2938static void noinline 2996static void noinline
2939infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2997infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2940{ 2998{
2941 if (slot < 0) 2999 if (slot < 0)
2942 /* overflow, need to check for all hash slots */ 3000 /* overflow, need to check for all hash slots */
2943 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3001 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2944 infy_wd (EV_A_ slot, wd, ev); 3002 infy_wd (EV_A_ slot, wd, ev);
2945 else 3003 else
2946 { 3004 {
2947 WL w_; 3005 WL w_;
2948 3006
2949 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3007 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2950 { 3008 {
2951 ev_stat *w = (ev_stat *)w_; 3009 ev_stat *w = (ev_stat *)w_;
2952 w_ = w_->next; /* lets us remove this watcher and all before it */ 3010 w_ = w_->next; /* lets us remove this watcher and all before it */
2953 3011
2954 if (w->wd == wd || wd == -1) 3012 if (w->wd == wd || wd == -1)
2955 { 3013 {
2956 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3014 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2957 { 3015 {
2958 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3016 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2959 w->wd = -1; 3017 w->wd = -1;
2960 infy_add (EV_A_ w); /* re-add, no matter what */ 3018 infy_add (EV_A_ w); /* re-add, no matter what */
2961 } 3019 }
2962 3020
2963 stat_timer_cb (EV_A_ &w->timer, 0); 3021 stat_timer_cb (EV_A_ &w->timer, 0);
2968 3026
2969static void 3027static void
2970infy_cb (EV_P_ ev_io *w, int revents) 3028infy_cb (EV_P_ ev_io *w, int revents)
2971{ 3029{
2972 char buf [EV_INOTIFY_BUFSIZE]; 3030 char buf [EV_INOTIFY_BUFSIZE];
2973 struct inotify_event *ev = (struct inotify_event *)buf;
2974 int ofs; 3031 int ofs;
2975 int len = read (fs_fd, buf, sizeof (buf)); 3032 int len = read (fs_fd, buf, sizeof (buf));
2976 3033
2977 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3034 for (ofs = 0; ofs < len; )
3035 {
3036 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2978 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3037 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3038 ofs += sizeof (struct inotify_event) + ev->len;
3039 }
3040}
3041
3042inline_size unsigned int
3043ev_linux_version (void)
3044{
3045 struct utsname buf;
3046 unsigned int v;
3047 int i;
3048 char *p = buf.release;
3049
3050 if (uname (&buf))
3051 return 0;
3052
3053 for (i = 3+1; --i; )
3054 {
3055 unsigned int c = 0;
3056
3057 for (;;)
3058 {
3059 if (*p >= '0' && *p <= '9')
3060 c = c * 10 + *p++ - '0';
3061 else
3062 {
3063 p += *p == '.';
3064 break;
3065 }
3066 }
3067
3068 v = (v << 8) | c;
3069 }
3070
3071 return v;
2979} 3072}
2980 3073
2981inline_size void 3074inline_size void
2982check_2625 (EV_P) 3075ev_check_2625 (EV_P)
2983{ 3076{
2984 /* kernels < 2.6.25 are borked 3077 /* kernels < 2.6.25 are borked
2985 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3078 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2986 */ 3079 */
2987 struct utsname buf; 3080 if (ev_linux_version () < 0x020619)
2988 int major, minor, micro;
2989
2990 if (uname (&buf))
2991 return;
2992
2993 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2994 return;
2995
2996 if (major < 2
2997 || (major == 2 && minor < 6)
2998 || (major == 2 && minor == 6 && micro < 25))
2999 return; 3081 return;
3000 3082
3001 fs_2625 = 1; 3083 fs_2625 = 1;
3002} 3084}
3003 3085
3018 if (fs_fd != -2) 3100 if (fs_fd != -2)
3019 return; 3101 return;
3020 3102
3021 fs_fd = -1; 3103 fs_fd = -1;
3022 3104
3023 check_2625 (EV_A); 3105 ev_check_2625 (EV_A);
3024 3106
3025 fs_fd = infy_newfd (); 3107 fs_fd = infy_newfd ();
3026 3108
3027 if (fs_fd >= 0) 3109 if (fs_fd >= 0)
3028 { 3110 {
3053 ev_io_set (&fs_w, fs_fd, EV_READ); 3135 ev_io_set (&fs_w, fs_fd, EV_READ);
3054 ev_io_start (EV_A_ &fs_w); 3136 ev_io_start (EV_A_ &fs_w);
3055 ev_unref (EV_A); 3137 ev_unref (EV_A);
3056 } 3138 }
3057 3139
3058 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3140 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3059 { 3141 {
3060 WL w_ = fs_hash [slot].head; 3142 WL w_ = fs_hash [slot].head;
3061 fs_hash [slot].head = 0; 3143 fs_hash [slot].head = 0;
3062 3144
3063 while (w_) 3145 while (w_)
3100static void noinline 3182static void noinline
3101stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3183stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3102{ 3184{
3103 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3185 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3104 3186
3105 /* we copy this here each the time so that */ 3187 ev_statdata prev = w->attr;
3106 /* prev has the old value when the callback gets invoked */
3107 w->prev = w->attr;
3108 ev_stat_stat (EV_A_ w); 3188 ev_stat_stat (EV_A_ w);
3109 3189
3110 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3190 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3111 if ( 3191 if (
3112 w->prev.st_dev != w->attr.st_dev 3192 prev.st_dev != w->attr.st_dev
3113 || w->prev.st_ino != w->attr.st_ino 3193 || prev.st_ino != w->attr.st_ino
3114 || w->prev.st_mode != w->attr.st_mode 3194 || prev.st_mode != w->attr.st_mode
3115 || w->prev.st_nlink != w->attr.st_nlink 3195 || prev.st_nlink != w->attr.st_nlink
3116 || w->prev.st_uid != w->attr.st_uid 3196 || prev.st_uid != w->attr.st_uid
3117 || w->prev.st_gid != w->attr.st_gid 3197 || prev.st_gid != w->attr.st_gid
3118 || w->prev.st_rdev != w->attr.st_rdev 3198 || prev.st_rdev != w->attr.st_rdev
3119 || w->prev.st_size != w->attr.st_size 3199 || prev.st_size != w->attr.st_size
3120 || w->prev.st_atime != w->attr.st_atime 3200 || prev.st_atime != w->attr.st_atime
3121 || w->prev.st_mtime != w->attr.st_mtime 3201 || prev.st_mtime != w->attr.st_mtime
3122 || w->prev.st_ctime != w->attr.st_ctime 3202 || prev.st_ctime != w->attr.st_ctime
3123 ) { 3203 ) {
3204 /* we only update w->prev on actual differences */
3205 /* in case we test more often than invoke the callback, */
3206 /* to ensure that prev is always different to attr */
3207 w->prev = prev;
3208
3124 #if EV_USE_INOTIFY 3209 #if EV_USE_INOTIFY
3125 if (fs_fd >= 0) 3210 if (fs_fd >= 0)
3126 { 3211 {
3127 infy_del (EV_A_ w); 3212 infy_del (EV_A_ w);
3128 infy_add (EV_A_ w); 3213 infy_add (EV_A_ w);
3235 3320
3236 EV_FREQUENT_CHECK; 3321 EV_FREQUENT_CHECK;
3237} 3322}
3238#endif 3323#endif
3239 3324
3325#if EV_PREPARE_ENABLE
3240void 3326void
3241ev_prepare_start (EV_P_ ev_prepare *w) 3327ev_prepare_start (EV_P_ ev_prepare *w)
3242{ 3328{
3243 if (expect_false (ev_is_active (w))) 3329 if (expect_false (ev_is_active (w)))
3244 return; 3330 return;
3270 3356
3271 ev_stop (EV_A_ (W)w); 3357 ev_stop (EV_A_ (W)w);
3272 3358
3273 EV_FREQUENT_CHECK; 3359 EV_FREQUENT_CHECK;
3274} 3360}
3361#endif
3275 3362
3363#if EV_CHECK_ENABLE
3276void 3364void
3277ev_check_start (EV_P_ ev_check *w) 3365ev_check_start (EV_P_ ev_check *w)
3278{ 3366{
3279 if (expect_false (ev_is_active (w))) 3367 if (expect_false (ev_is_active (w)))
3280 return; 3368 return;
3306 3394
3307 ev_stop (EV_A_ (W)w); 3395 ev_stop (EV_A_ (W)w);
3308 3396
3309 EV_FREQUENT_CHECK; 3397 EV_FREQUENT_CHECK;
3310} 3398}
3399#endif
3311 3400
3312#if EV_EMBED_ENABLE 3401#if EV_EMBED_ENABLE
3313void noinline 3402void noinline
3314ev_embed_sweep (EV_P_ ev_embed *w) 3403ev_embed_sweep (EV_P_ ev_embed *w)
3315{ 3404{
3409 EV_FREQUENT_CHECK; 3498 EV_FREQUENT_CHECK;
3410 3499
3411 ev_io_stop (EV_A_ &w->io); 3500 ev_io_stop (EV_A_ &w->io);
3412 ev_prepare_stop (EV_A_ &w->prepare); 3501 ev_prepare_stop (EV_A_ &w->prepare);
3413 ev_fork_stop (EV_A_ &w->fork); 3502 ev_fork_stop (EV_A_ &w->fork);
3503
3504 ev_stop (EV_A_ (W)w);
3414 3505
3415 EV_FREQUENT_CHECK; 3506 EV_FREQUENT_CHECK;
3416} 3507}
3417#endif 3508#endif
3418 3509
3642 if (types & EV_ASYNC) 3733 if (types & EV_ASYNC)
3643 for (i = asynccnt; i--; ) 3734 for (i = asynccnt; i--; )
3644 cb (EV_A_ EV_ASYNC, asyncs [i]); 3735 cb (EV_A_ EV_ASYNC, asyncs [i]);
3645#endif 3736#endif
3646 3737
3738#if EV_PREPARE_ENABLE
3647 if (types & EV_PREPARE) 3739 if (types & EV_PREPARE)
3648 for (i = preparecnt; i--; ) 3740 for (i = preparecnt; i--; )
3649#if EV_EMBED_ENABLE 3741# if EV_EMBED_ENABLE
3650 if (ev_cb (prepares [i]) != embed_prepare_cb) 3742 if (ev_cb (prepares [i]) != embed_prepare_cb)
3651#endif 3743# endif
3652 cb (EV_A_ EV_PREPARE, prepares [i]); 3744 cb (EV_A_ EV_PREPARE, prepares [i]);
3745#endif
3653 3746
3747#if EV_CHECK_ENABLE
3654 if (types & EV_CHECK) 3748 if (types & EV_CHECK)
3655 for (i = checkcnt; i--; ) 3749 for (i = checkcnt; i--; )
3656 cb (EV_A_ EV_CHECK, checks [i]); 3750 cb (EV_A_ EV_CHECK, checks [i]);
3751#endif
3657 3752
3753#if EV_SIGNAL_ENABLE
3658 if (types & EV_SIGNAL) 3754 if (types & EV_SIGNAL)
3659 for (i = 0; i < EV_NSIG - 1; ++i) 3755 for (i = 0; i < EV_NSIG - 1; ++i)
3660 for (wl = signals [i].head; wl; ) 3756 for (wl = signals [i].head; wl; )
3661 { 3757 {
3662 wn = wl->next; 3758 wn = wl->next;
3663 cb (EV_A_ EV_SIGNAL, wl); 3759 cb (EV_A_ EV_SIGNAL, wl);
3664 wl = wn; 3760 wl = wn;
3665 } 3761 }
3762#endif
3666 3763
3764#if EV_CHILD_ENABLE
3667 if (types & EV_CHILD) 3765 if (types & EV_CHILD)
3668 for (i = EV_PID_HASHSIZE; i--; ) 3766 for (i = (EV_PID_HASHSIZE); i--; )
3669 for (wl = childs [i]; wl; ) 3767 for (wl = childs [i]; wl; )
3670 { 3768 {
3671 wn = wl->next; 3769 wn = wl->next;
3672 cb (EV_A_ EV_CHILD, wl); 3770 cb (EV_A_ EV_CHILD, wl);
3673 wl = wn; 3771 wl = wn;
3674 } 3772 }
3773#endif
3675/* EV_STAT 0x00001000 /* stat data changed */ 3774/* EV_STAT 0x00001000 /* stat data changed */
3676/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3775/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3677} 3776}
3678#endif 3777#endif
3679 3778

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines