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

Comparing libev/ev.c (file contents):
Revision 1.325 by root, Sun Jan 24 12:31:55 2010 UTC vs.
Revision 1.341 by root, Tue Mar 16 20:48:29 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 *
79# endif 79# endif
80# endif 80# endif
81 81
82# ifndef EV_USE_NANOSLEEP 82# ifndef EV_USE_NANOSLEEP
83# if HAVE_NANOSLEEP 83# if HAVE_NANOSLEEP
84# define EV_USE_NANOSLEEP 1 84# define EV_USE_NANOSLEEP EV_FEATURE_OS
85# else 85# else
86# define EV_USE_NANOSLEEP 0 86# define EV_USE_NANOSLEEP 0
87# endif 87# endif
88# endif 88# endif
89 89
90# ifndef EV_USE_SELECT 90# ifndef EV_USE_SELECT
91# if HAVE_SELECT && HAVE_SYS_SELECT_H 91# if HAVE_SELECT && HAVE_SYS_SELECT_H
92# define EV_USE_SELECT 1 92# define EV_USE_SELECT EV_FEATURE_BACKENDS
93# else 93# else
94# define EV_USE_SELECT 0 94# define EV_USE_SELECT 0
95# endif 95# endif
96# endif 96# endif
97 97
98# ifndef EV_USE_POLL 98# ifndef EV_USE_POLL
99# if HAVE_POLL && HAVE_POLL_H 99# if HAVE_POLL && HAVE_POLL_H
100# define EV_USE_POLL 1 100# define EV_USE_POLL EV_FEATURE_BACKENDS
101# else 101# else
102# define EV_USE_POLL 0 102# define EV_USE_POLL 0
103# endif 103# endif
104# endif 104# endif
105 105
106# ifndef EV_USE_EPOLL 106# ifndef EV_USE_EPOLL
107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
108# define EV_USE_EPOLL 1 108# define EV_USE_EPOLL EV_FEATURE_BACKENDS
109# else 109# else
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 115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
116# define EV_USE_KQUEUE 1 116# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
117# else 117# else
118# define EV_USE_KQUEUE 0 118# define EV_USE_KQUEUE 0
119# endif 119# endif
120# endif 120# endif
121 121
122# ifndef EV_USE_PORT 122# ifndef EV_USE_PORT
123# if HAVE_PORT_H && HAVE_PORT_CREATE 123# if HAVE_PORT_H && HAVE_PORT_CREATE
124# define EV_USE_PORT 1 124# define EV_USE_PORT EV_FEATURE_BACKENDS
125# else 125# else
126# define EV_USE_PORT 0 126# define EV_USE_PORT 0
127# endif 127# endif
128# endif 128# endif
129 129
130# ifndef EV_USE_INOTIFY 130# ifndef EV_USE_INOTIFY
131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
132# define EV_USE_INOTIFY 1 132# define EV_USE_INOTIFY EV_FEATURE_OS
133# else 133# else
134# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
135# endif 135# endif
136# endif 136# endif
137 137
138# ifndef EV_USE_SIGNALFD 138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H 139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1 140# define EV_USE_SIGNALFD EV_FEATURE_OS
141# else 141# else
142# define EV_USE_SIGNALFD 0 142# define EV_USE_SIGNALFD 0
143# endif 143# endif
144# endif 144# endif
145 145
146# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
147# if HAVE_EVENTFD 147# if HAVE_EVENTFD
148# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD EV_FEATURE_OS
149# else 149# else
150# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
151# endif 151# endif
152# endif 152# endif
153 153
163 163
164#include <assert.h> 164#include <assert.h>
165#include <errno.h> 165#include <errno.h>
166#include <sys/types.h> 166#include <sys/types.h>
167#include <time.h> 167#include <time.h>
168#include <limits.h>
168 169
169#include <signal.h> 170#include <signal.h>
170 171
171#ifdef EV_H 172#ifdef EV_H
172# include EV_H 173# include EV_H
183# define WIN32_LEAN_AND_MEAN 184# define WIN32_LEAN_AND_MEAN
184# include <windows.h> 185# include <windows.h>
185# ifndef EV_SELECT_IS_WINSOCKET 186# ifndef EV_SELECT_IS_WINSOCKET
186# define EV_SELECT_IS_WINSOCKET 1 187# define EV_SELECT_IS_WINSOCKET 1
187# endif 188# endif
189# undef EV_AVOID_STDIO
188#endif 190#endif
189 191
190/* 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 */
191 193
192/* try to deduce the maximum number of signals on this platform */ 194/* try to deduce the maximum number of signals on this platform */
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
221# define EV_USE_CLOCK_SYSCALL 1 224# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
222# else 225# else
223# define EV_USE_CLOCK_SYSCALL 0 226# define EV_USE_CLOCK_SYSCALL 0
224# endif 227# endif
225#endif 228#endif
226 229
227#ifndef EV_USE_MONOTONIC 230#ifndef EV_USE_MONOTONIC
228# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 231# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
229# define EV_USE_MONOTONIC 1 232# define EV_USE_MONOTONIC EV_FEATURE_OS
230# else 233# else
231# define EV_USE_MONOTONIC 0 234# define EV_USE_MONOTONIC 0
232# endif 235# endif
233#endif 236#endif
234 237
236# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 239# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
237#endif 240#endif
238 241
239#ifndef EV_USE_NANOSLEEP 242#ifndef EV_USE_NANOSLEEP
240# if _POSIX_C_SOURCE >= 199309L 243# if _POSIX_C_SOURCE >= 199309L
241# define EV_USE_NANOSLEEP 1 244# define EV_USE_NANOSLEEP EV_FEATURE_OS
242# else 245# else
243# define EV_USE_NANOSLEEP 0 246# define EV_USE_NANOSLEEP 0
244# endif 247# endif
245#endif 248#endif
246 249
247#ifndef EV_USE_SELECT 250#ifndef EV_USE_SELECT
248# define EV_USE_SELECT 1 251# define EV_USE_SELECT EV_FEATURE_BACKENDS
249#endif 252#endif
250 253
251#ifndef EV_USE_POLL 254#ifndef EV_USE_POLL
252# ifdef _WIN32 255# ifdef _WIN32
253# define EV_USE_POLL 0 256# define EV_USE_POLL 0
254# else 257# else
255# define EV_USE_POLL 1 258# define EV_USE_POLL EV_FEATURE_BACKENDS
256# endif 259# endif
257#endif 260#endif
258 261
259#ifndef EV_USE_EPOLL 262#ifndef EV_USE_EPOLL
260# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 263# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
261# define EV_USE_EPOLL 1 264# define EV_USE_EPOLL EV_FEATURE_BACKENDS
262# else 265# else
263# define EV_USE_EPOLL 0 266# define EV_USE_EPOLL 0
264# endif 267# endif
265#endif 268#endif
266 269
272# define EV_USE_PORT 0 275# define EV_USE_PORT 0
273#endif 276#endif
274 277
275#ifndef EV_USE_INOTIFY 278#ifndef EV_USE_INOTIFY
276# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 279# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
277# define EV_USE_INOTIFY 1 280# define EV_USE_INOTIFY EV_FEATURE_OS
278# else 281# else
279# define EV_USE_INOTIFY 0 282# define EV_USE_INOTIFY 0
280# endif 283# endif
281#endif 284#endif
282 285
283#ifndef EV_PID_HASHSIZE 286#ifndef EV_PID_HASHSIZE
284# if EV_MINIMAL 287# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
285# define EV_PID_HASHSIZE 1
286# else
287# define EV_PID_HASHSIZE 16
288# endif
289#endif 288#endif
290 289
291#ifndef EV_INOTIFY_HASHSIZE 290#ifndef EV_INOTIFY_HASHSIZE
292# if EV_MINIMAL 291# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
293# define EV_INOTIFY_HASHSIZE 1
294# else
295# define EV_INOTIFY_HASHSIZE 16
296# endif
297#endif 292#endif
298 293
299#ifndef EV_USE_EVENTFD 294#ifndef EV_USE_EVENTFD
300# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 295# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
301# define EV_USE_EVENTFD 1 296# define EV_USE_EVENTFD EV_FEATURE_OS
302# else 297# else
303# define EV_USE_EVENTFD 0 298# define EV_USE_EVENTFD 0
304# endif 299# endif
305#endif 300#endif
306 301
307#ifndef EV_USE_SIGNALFD 302#ifndef EV_USE_SIGNALFD
308# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 303# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
309# define EV_USE_SIGNALFD 1 304# define EV_USE_SIGNALFD EV_FEATURE_OS
310# else 305# else
311# define EV_USE_SIGNALFD 0 306# define EV_USE_SIGNALFD 0
312# endif 307# endif
313#endif 308#endif
314 309
317# define EV_USE_4HEAP 1 312# define EV_USE_4HEAP 1
318# define EV_HEAP_CACHE_AT 1 313# define EV_HEAP_CACHE_AT 1
319#endif 314#endif
320 315
321#ifndef EV_VERIFY 316#ifndef EV_VERIFY
322# define EV_VERIFY !EV_MINIMAL 317# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
323#endif 318#endif
324 319
325#ifndef EV_USE_4HEAP 320#ifndef EV_USE_4HEAP
326# define EV_USE_4HEAP !EV_MINIMAL 321# define EV_USE_4HEAP EV_FEATURE_DATA
327#endif 322#endif
328 323
329#ifndef EV_HEAP_CACHE_AT 324#ifndef EV_HEAP_CACHE_AT
330# define EV_HEAP_CACHE_AT !EV_MINIMAL 325# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
331#endif 326#endif
332 327
333/* 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, */
334/* which makes programs even slower. might work on other unices, too. */ 329/* which makes programs even slower. might work on other unices, too. */
335#if EV_USE_CLOCK_SYSCALL 330#if EV_USE_CLOCK_SYSCALL
402# endif 397# endif
403# endif 398# endif
404# ifdef __cplusplus 399# ifdef __cplusplus
405extern "C" { 400extern "C" {
406# endif 401# endif
407int eventfd (unsigned int initval, int flags); 402int (eventfd) (unsigned int initval, int flags);
408# ifdef __cplusplus 403# ifdef __cplusplus
409} 404}
410# endif 405# endif
411#endif 406#endif
412 407
440 435
441 436
442/**/ 437/**/
443 438
444#if EV_VERIFY >= 3 439#if EV_VERIFY >= 3
445# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 440# define EV_FREQUENT_CHECK ev_verify (EV_A)
446#else 441#else
447# define EV_FREQUENT_CHECK do { } while (0) 442# define EV_FREQUENT_CHECK do { } while (0)
448#endif 443#endif
449 444
450/* 445/*
473 468
474#define expect_false(expr) expect ((expr) != 0, 0) 469#define expect_false(expr) expect ((expr) != 0, 0)
475#define expect_true(expr) expect ((expr) != 0, 1) 470#define expect_true(expr) expect ((expr) != 0, 1)
476#define inline_size static inline 471#define inline_size static inline
477 472
478#if EV_MINIMAL 473#if EV_FEATURE_CODE
474# define inline_speed static inline
475#else
479# define inline_speed static noinline 476# define inline_speed static noinline
480#else
481# define inline_speed static inline
482#endif 477#endif
483 478
484#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 479#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
485 480
486#if EV_MINPRI == EV_MAXPRI 481#if EV_MINPRI == EV_MAXPRI
523# include "ev_win32.c" 518# include "ev_win32.c"
524#endif 519#endif
525 520
526/*****************************************************************************/ 521/*****************************************************************************/
527 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
530
528static void (*syserr_cb)(const char *msg); 531static void (*syserr_cb)(const char *msg);
529 532
530void 533void
531ev_set_syserr_cb (void (*cb)(const char *msg)) 534ev_set_syserr_cb (void (*cb)(const char *msg))
532{ 535{
541 544
542 if (syserr_cb) 545 if (syserr_cb)
543 syserr_cb (msg); 546 syserr_cb (msg);
544 else 547 else
545 { 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
546 perror (msg); 557 perror (msg);
558#endif
547 abort (); 559 abort ();
548 } 560 }
549} 561}
550 562
551static void * 563static void *
552ev_realloc_emul (void *ptr, long size) 564ev_realloc_emul (void *ptr, long size)
553{ 565{
566#if __GLIBC__
567 return realloc (ptr, size);
568#else
554 /* some systems, notably openbsd and darwin, fail to properly 569 /* some systems, notably openbsd and darwin, fail to properly
555 * 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
556 * the single unix specification, so work around them here. 571 * the single unix specification, so work around them here.
557 */ 572 */
558 573
559 if (size) 574 if (size)
560 return realloc (ptr, size); 575 return realloc (ptr, size);
561 576
562 free (ptr); 577 free (ptr);
563 return 0; 578 return 0;
579#endif
564} 580}
565 581
566static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 582static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
567 583
568void 584void
576{ 592{
577 ptr = alloc (ptr, size); 593 ptr = alloc (ptr, size);
578 594
579 if (!ptr && size) 595 if (!ptr && size)
580 { 596 {
597#if EV_AVOID_STDIO
598 ev_printerr ("libev: memory allocation failed, aborting.\n");
599#else
581 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 600 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
601#endif
582 abort (); 602 abort ();
583 } 603 }
584 604
585 return ptr; 605 return ptr;
586} 606}
668 688
669 static int ev_default_loop_ptr; 689 static int ev_default_loop_ptr;
670 690
671#endif 691#endif
672 692
673#if EV_MINIMAL < 2 693#if EV_FEATURE_API
674# 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)
675# 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)
676# define EV_INVOKE_PENDING invoke_cb (EV_A) 696# define EV_INVOKE_PENDING invoke_cb (EV_A)
677#else 697#else
678# define EV_RELEASE_CB (void)0 698# define EV_RELEASE_CB (void)0
863} 883}
864 884
865/*****************************************************************************/ 885/*****************************************************************************/
866 886
867inline_speed void 887inline_speed void
868fd_event_nc (EV_P_ int fd, int revents) 888fd_event_nocheck (EV_P_ int fd, int revents)
869{ 889{
870 ANFD *anfd = anfds + fd; 890 ANFD *anfd = anfds + fd;
871 ev_io *w; 891 ev_io *w;
872 892
873 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)
885fd_event (EV_P_ int fd, int revents) 905fd_event (EV_P_ int fd, int revents)
886{ 906{
887 ANFD *anfd = anfds + fd; 907 ANFD *anfd = anfds + fd;
888 908
889 if (expect_true (!anfd->reify)) 909 if (expect_true (!anfd->reify))
890 fd_event_nc (EV_A_ fd, revents); 910 fd_event_nocheck (EV_A_ fd, revents);
891} 911}
892 912
893void 913void
894ev_feed_fd_event (EV_P_ int fd, int revents) 914ev_feed_fd_event (EV_P_ int fd, int revents)
895{ 915{
896 if (fd >= 0 && fd < anfdmax) 916 if (fd >= 0 && fd < anfdmax)
897 fd_event_nc (EV_A_ fd, revents); 917 fd_event_nocheck (EV_A_ fd, revents);
898} 918}
899 919
900/* make sure the external fd watch events are in-sync */ 920/* make sure the external fd watch events are in-sync */
901/* with the kernel/libev internal state */ 921/* with the kernel/libev internal state */
902inline_size void 922inline_size void
965 ev_io_stop (EV_A_ w); 985 ev_io_stop (EV_A_ w);
966 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);
967 } 987 }
968} 988}
969 989
970/* check whether the given fd is atcually valid, for error recovery */ 990/* check whether the given fd is actually valid, for error recovery */
971inline_size int 991inline_size int
972fd_valid (int fd) 992fd_valid (int fd)
973{ 993{
974#ifdef _WIN32 994#ifdef _WIN32
975 return EV_FD_TO_WIN32_HANDLE (fd) != -1; 995 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
1015 { 1035 {
1016 anfds [fd].events = 0; 1036 anfds [fd].events = 0;
1017 anfds [fd].emask = 0; 1037 anfds [fd].emask = 0;
1018 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1038 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
1019 } 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
1020} 1054}
1021 1055
1022/*****************************************************************************/ 1056/*****************************************************************************/
1023 1057
1024/* 1058/*
1178 1212
1179static ANSIG signals [EV_NSIG - 1]; 1213static ANSIG signals [EV_NSIG - 1];
1180 1214
1181/*****************************************************************************/ 1215/*****************************************************************************/
1182 1216
1183/* used to prepare libev internal fd's */ 1217#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1184/* this is not fork-safe */
1185inline_speed void
1186fd_intern (int fd)
1187{
1188#ifdef _WIN32
1189 unsigned long arg = 1;
1190 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1191#else
1192 fcntl (fd, F_SETFD, FD_CLOEXEC);
1193 fcntl (fd, F_SETFL, O_NONBLOCK);
1194#endif
1195}
1196 1218
1197static void noinline 1219static void noinline
1198evpipe_init (EV_P) 1220evpipe_init (EV_P)
1199{ 1221{
1200 if (!ev_is_active (&pipe_w)) 1222 if (!ev_is_active (&pipe_w))
1201 { 1223 {
1202#if EV_USE_EVENTFD 1224# if EV_USE_EVENTFD
1203 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1225 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1204 if (evfd < 0 && errno == EINVAL) 1226 if (evfd < 0 && errno == EINVAL)
1205 evfd = eventfd (0, 0); 1227 evfd = eventfd (0, 0);
1206 1228
1207 if (evfd >= 0) 1229 if (evfd >= 0)
1209 evpipe [0] = -1; 1231 evpipe [0] = -1;
1210 fd_intern (evfd); /* doing it twice doesn't hurt */ 1232 fd_intern (evfd); /* doing it twice doesn't hurt */
1211 ev_io_set (&pipe_w, evfd, EV_READ); 1233 ev_io_set (&pipe_w, evfd, EV_READ);
1212 } 1234 }
1213 else 1235 else
1214#endif 1236# endif
1215 { 1237 {
1216 while (pipe (evpipe)) 1238 while (pipe (evpipe))
1217 ev_syserr ("(libev) error creating signal/async pipe"); 1239 ev_syserr ("(libev) error creating signal/async pipe");
1218 1240
1219 fd_intern (evpipe [0]); 1241 fd_intern (evpipe [0]);
1230evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1252evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1231{ 1253{
1232 if (!*flag) 1254 if (!*flag)
1233 { 1255 {
1234 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;
1235 1258
1236 *flag = 1; 1259 *flag = 1;
1237 1260
1238#if EV_USE_EVENTFD 1261#if EV_USE_EVENTFD
1239 if (evfd >= 0) 1262 if (evfd >= 0)
1241 uint64_t counter = 1; 1264 uint64_t counter = 1;
1242 write (evfd, &counter, sizeof (uint64_t)); 1265 write (evfd, &counter, sizeof (uint64_t));
1243 } 1266 }
1244 else 1267 else
1245#endif 1268#endif
1246 write (evpipe [1], &old_errno, 1); 1269 write (evpipe [1], &dummy, 1);
1247 1270
1248 errno = old_errno; 1271 errno = old_errno;
1249 } 1272 }
1250} 1273}
1251 1274
1352 break; 1375 break;
1353 } 1376 }
1354} 1377}
1355#endif 1378#endif
1356 1379
1380#endif
1381
1357/*****************************************************************************/ 1382/*****************************************************************************/
1358 1383
1384#if EV_CHILD_ENABLE
1359static WL childs [EV_PID_HASHSIZE]; 1385static WL childs [EV_PID_HASHSIZE];
1360
1361#ifndef _WIN32
1362 1386
1363static ev_signal childev; 1387static ev_signal childev;
1364 1388
1365#ifndef WIFCONTINUED 1389#ifndef WIFCONTINUED
1366# define WIFCONTINUED(status) 0 1390# define WIFCONTINUED(status) 0
1371child_reap (EV_P_ int chain, int pid, int status) 1395child_reap (EV_P_ int chain, int pid, int status)
1372{ 1396{
1373 ev_child *w; 1397 ev_child *w;
1374 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1398 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1375 1399
1376 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)
1377 { 1401 {
1378 if ((w->pid == pid || !w->pid) 1402 if ((w->pid == pid || !w->pid)
1379 && (!traced || (w->flags & 1))) 1403 && (!traced || (w->flags & 1)))
1380 { 1404 {
1381 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 */
1406 /* 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 */
1407 /* 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 */
1408 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1432 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1409 1433
1410 child_reap (EV_A_ pid, pid, status); 1434 child_reap (EV_A_ pid, pid, status);
1411 if (EV_PID_HASHSIZE > 1) 1435 if ((EV_PID_HASHSIZE) > 1)
1412 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 */
1413} 1437}
1414 1438
1415#endif 1439#endif
1416 1440
1505ev_backend (EV_P) 1529ev_backend (EV_P)
1506{ 1530{
1507 return backend; 1531 return backend;
1508} 1532}
1509 1533
1510#if EV_MINIMAL < 2 1534#if EV_FEATURE_API
1511unsigned int 1535unsigned int
1512ev_loop_count (EV_P) 1536ev_iteration (EV_P)
1513{ 1537{
1514 return loop_count; 1538 return loop_count;
1515} 1539}
1516 1540
1517unsigned int 1541unsigned int
1518ev_loop_depth (EV_P) 1542ev_depth (EV_P)
1519{ 1543{
1520 return loop_depth; 1544 return loop_depth;
1521} 1545}
1522 1546
1523void 1547void
1595 1619
1596 ev_rt_now = ev_time (); 1620 ev_rt_now = ev_time ();
1597 mn_now = get_clock (); 1621 mn_now = get_clock ();
1598 now_floor = mn_now; 1622 now_floor = mn_now;
1599 rtmn_diff = ev_rt_now - mn_now; 1623 rtmn_diff = ev_rt_now - mn_now;
1600#if EV_MINIMAL < 2 1624#if EV_FEATURE_API
1601 invoke_cb = ev_invoke_pending; 1625 invoke_cb = ev_invoke_pending;
1602#endif 1626#endif
1603 1627
1604 io_blocktime = 0.; 1628 io_blocktime = 0.;
1605 timeout_blocktime = 0.; 1629 timeout_blocktime = 0.;
1635 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1659 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1636#endif 1660#endif
1637 1661
1638 ev_prepare_init (&pending_w, pendingcb); 1662 ev_prepare_init (&pending_w, pendingcb);
1639 1663
1664#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1640 ev_init (&pipe_w, pipecb); 1665 ev_init (&pipe_w, pipecb);
1641 ev_set_priority (&pipe_w, EV_MAXPRI); 1666 ev_set_priority (&pipe_w, EV_MAXPRI);
1667#endif
1642 } 1668 }
1643} 1669}
1644 1670
1645/* free up a loop structure */ 1671/* free up a loop structure */
1646static void noinline 1672static void noinline
1764 { 1790 {
1765 EV_WIN32_CLOSE_FD (evpipe [0]); 1791 EV_WIN32_CLOSE_FD (evpipe [0]);
1766 EV_WIN32_CLOSE_FD (evpipe [1]); 1792 EV_WIN32_CLOSE_FD (evpipe [1]);
1767 } 1793 }
1768 1794
1795#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1769 evpipe_init (EV_A); 1796 evpipe_init (EV_A);
1770 /* now iterate over everything, in case we missed something */ 1797 /* now iterate over everything, in case we missed something */
1771 pipecb (EV_A_ &pipe_w, EV_READ); 1798 pipecb (EV_A_ &pipe_w, EV_READ);
1799#endif
1772 } 1800 }
1773 1801
1774 postfork = 0; 1802 postfork = 0;
1775} 1803}
1776 1804
1838 verify_watcher (EV_A_ ws [cnt]); 1866 verify_watcher (EV_A_ ws [cnt]);
1839 } 1867 }
1840} 1868}
1841#endif 1869#endif
1842 1870
1843#if EV_MINIMAL < 2 1871#if EV_FEATURE_API
1844void 1872void
1845ev_loop_verify (EV_P) 1873ev_verify (EV_P)
1846{ 1874{
1847#if EV_VERIFY 1875#if EV_VERIFY
1848 int i; 1876 int i;
1849 WL w; 1877 WL w;
1850 1878
1889#if EV_ASYNC_ENABLE 1917#if EV_ASYNC_ENABLE
1890 assert (asyncmax >= asynccnt); 1918 assert (asyncmax >= asynccnt);
1891 array_verify (EV_A_ (W *)asyncs, asynccnt); 1919 array_verify (EV_A_ (W *)asyncs, asynccnt);
1892#endif 1920#endif
1893 1921
1922#if EV_PREPARE_ENABLE
1894 assert (preparemax >= preparecnt); 1923 assert (preparemax >= preparecnt);
1895 array_verify (EV_A_ (W *)prepares, preparecnt); 1924 array_verify (EV_A_ (W *)prepares, preparecnt);
1925#endif
1896 1926
1927#if EV_CHECK_ENABLE
1897 assert (checkmax >= checkcnt); 1928 assert (checkmax >= checkcnt);
1898 array_verify (EV_A_ (W *)checks, checkcnt); 1929 array_verify (EV_A_ (W *)checks, checkcnt);
1930#endif
1899 1931
1900# if 0 1932# if 0
1933#if EV_CHILD_ENABLE
1901 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)
1902 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending) 1935 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1936#endif
1903# endif 1937# endif
1904#endif 1938#endif
1905} 1939}
1906#endif 1940#endif
1907 1941
1923 1957
1924 loop_init (EV_A_ flags); 1958 loop_init (EV_A_ flags);
1925 1959
1926 if (ev_backend (EV_A)) 1960 if (ev_backend (EV_A))
1927 { 1961 {
1928#ifndef _WIN32 1962#if EV_CHILD_ENABLE
1929 ev_signal_init (&childev, childcb, SIGCHLD); 1963 ev_signal_init (&childev, childcb, SIGCHLD);
1930 ev_set_priority (&childev, EV_MAXPRI); 1964 ev_set_priority (&childev, EV_MAXPRI);
1931 ev_signal_start (EV_A_ &childev); 1965 ev_signal_start (EV_A_ &childev);
1932 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1966 ev_unref (EV_A); /* child watcher should not keep loop alive */
1933#endif 1967#endif
1946 EV_P = ev_default_loop_ptr; 1980 EV_P = ev_default_loop_ptr;
1947#endif 1981#endif
1948 1982
1949 ev_default_loop_ptr = 0; 1983 ev_default_loop_ptr = 0;
1950 1984
1951#ifndef _WIN32 1985#if EV_CHILD_ENABLE
1952 ev_ref (EV_A); /* child watcher */ 1986 ev_ref (EV_A); /* child watcher */
1953 ev_signal_stop (EV_A_ &childev); 1987 ev_signal_stop (EV_A_ &childev);
1954#endif 1988#endif
1955 1989
1956 loop_destroy (EV_A); 1990 loop_destroy (EV_A);
2062 EV_FREQUENT_CHECK; 2096 EV_FREQUENT_CHECK;
2063 feed_reverse (EV_A_ (W)w); 2097 feed_reverse (EV_A_ (W)w);
2064 } 2098 }
2065 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2099 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2066 2100
2067 feed_reverse_done (EV_A_ EV_TIMEOUT); 2101 feed_reverse_done (EV_A_ EV_TIMER);
2068 } 2102 }
2069} 2103}
2070 2104
2071#if EV_PERIODIC_ENABLE 2105#if EV_PERIODIC_ENABLE
2072/* make periodics pending */ 2106/* make periodics pending */
2233} 2267}
2234 2268
2235void 2269void
2236ev_loop (EV_P_ int flags) 2270ev_loop (EV_P_ int flags)
2237{ 2271{
2238#if EV_MINIMAL < 2 2272#if EV_FEATURE_API
2239 ++loop_depth; 2273 ++loop_depth;
2240#endif 2274#endif
2241 2275
2242 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));
2243 2277
2246 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2280 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2247 2281
2248 do 2282 do
2249 { 2283 {
2250#if EV_VERIFY >= 2 2284#if EV_VERIFY >= 2
2251 ev_loop_verify (EV_A); 2285 ev_verify (EV_A);
2252#endif 2286#endif
2253 2287
2254#ifndef _WIN32 2288#ifndef _WIN32
2255 if (expect_false (curpid)) /* penalise the forking check even more */ 2289 if (expect_false (curpid)) /* penalise the forking check even more */
2256 if (expect_false (getpid () != curpid)) 2290 if (expect_false (getpid () != curpid))
2268 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2302 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2269 EV_INVOKE_PENDING; 2303 EV_INVOKE_PENDING;
2270 } 2304 }
2271#endif 2305#endif
2272 2306
2307#if EV_PREPARE_ENABLE
2273 /* queue prepare watchers (and execute them) */ 2308 /* queue prepare watchers (and execute them) */
2274 if (expect_false (preparecnt)) 2309 if (expect_false (preparecnt))
2275 { 2310 {
2276 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2311 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2277 EV_INVOKE_PENDING; 2312 EV_INVOKE_PENDING;
2278 } 2313 }
2314#endif
2279 2315
2280 if (expect_false (loop_done)) 2316 if (expect_false (loop_done))
2281 break; 2317 break;
2282 2318
2283 /* we might have forked, so reify kernel state if necessary */ 2319 /* we might have forked, so reify kernel state if necessary */
2334 waittime -= sleeptime; 2370 waittime -= sleeptime;
2335 } 2371 }
2336 } 2372 }
2337 } 2373 }
2338 2374
2339#if EV_MINIMAL < 2 2375#if EV_FEATURE_API
2340 ++loop_count; 2376 ++loop_count;
2341#endif 2377#endif
2342 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2378 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2343 backend_poll (EV_A_ waittime); 2379 backend_poll (EV_A_ waittime);
2344 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2380 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2356#if EV_IDLE_ENABLE 2392#if EV_IDLE_ENABLE
2357 /* queue idle watchers unless other events are pending */ 2393 /* queue idle watchers unless other events are pending */
2358 idle_reify (EV_A); 2394 idle_reify (EV_A);
2359#endif 2395#endif
2360 2396
2397#if EV_CHECK_ENABLE
2361 /* queue check watchers, to be executed first */ 2398 /* queue check watchers, to be executed first */
2362 if (expect_false (checkcnt)) 2399 if (expect_false (checkcnt))
2363 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2400 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2401#endif
2364 2402
2365 EV_INVOKE_PENDING; 2403 EV_INVOKE_PENDING;
2366 } 2404 }
2367 while (expect_true ( 2405 while (expect_true (
2368 activecnt 2406 activecnt
2371 )); 2409 ));
2372 2410
2373 if (loop_done == EVUNLOOP_ONE) 2411 if (loop_done == EVUNLOOP_ONE)
2374 loop_done = EVUNLOOP_CANCEL; 2412 loop_done = EVUNLOOP_CANCEL;
2375 2413
2376#if EV_MINIMAL < 2 2414#if EV_FEATURE_API
2377 --loop_depth; 2415 --loop_depth;
2378#endif 2416#endif
2379} 2417}
2380 2418
2381void 2419void
2507 2545
2508 if (expect_false (ev_is_active (w))) 2546 if (expect_false (ev_is_active (w)))
2509 return; 2547 return;
2510 2548
2511 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2549 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2512 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))));
2513 2551
2514 EV_FREQUENT_CHECK; 2552 EV_FREQUENT_CHECK;
2515 2553
2516 ev_start (EV_A_ (W)w, 1); 2554 ev_start (EV_A_ (W)w, 1);
2517 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2555 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2587 timers [active] = timers [timercnt + HEAP0]; 2625 timers [active] = timers [timercnt + HEAP0];
2588 adjustheap (timers, timercnt, active); 2626 adjustheap (timers, timercnt, active);
2589 } 2627 }
2590 } 2628 }
2591 2629
2592 EV_FREQUENT_CHECK;
2593
2594 ev_at (w) -= mn_now; 2630 ev_at (w) -= mn_now;
2595 2631
2596 ev_stop (EV_A_ (W)w); 2632 ev_stop (EV_A_ (W)w);
2633
2634 EV_FREQUENT_CHECK;
2597} 2635}
2598 2636
2599void noinline 2637void noinline
2600ev_timer_again (EV_P_ ev_timer *w) 2638ev_timer_again (EV_P_ ev_timer *w)
2601{ 2639{
2680 periodics [active] = periodics [periodiccnt + HEAP0]; 2718 periodics [active] = periodics [periodiccnt + HEAP0];
2681 adjustheap (periodics, periodiccnt, active); 2719 adjustheap (periodics, periodiccnt, active);
2682 } 2720 }
2683 } 2721 }
2684 2722
2685 EV_FREQUENT_CHECK;
2686
2687 ev_stop (EV_A_ (W)w); 2723 ev_stop (EV_A_ (W)w);
2724
2725 EV_FREQUENT_CHECK;
2688} 2726}
2689 2727
2690void noinline 2728void noinline
2691ev_periodic_again (EV_P_ ev_periodic *w) 2729ev_periodic_again (EV_P_ ev_periodic *w)
2692{ 2730{
2697#endif 2735#endif
2698 2736
2699#ifndef SA_RESTART 2737#ifndef SA_RESTART
2700# define SA_RESTART 0 2738# define SA_RESTART 0
2701#endif 2739#endif
2740
2741#if EV_SIGNAL_ENABLE
2702 2742
2703void noinline 2743void noinline
2704ev_signal_start (EV_P_ ev_signal *w) 2744ev_signal_start (EV_P_ ev_signal *w)
2705{ 2745{
2706 if (expect_false (ev_is_active (w))) 2746 if (expect_false (ev_is_active (w)))
2813 } 2853 }
2814 2854
2815 EV_FREQUENT_CHECK; 2855 EV_FREQUENT_CHECK;
2816} 2856}
2817 2857
2858#endif
2859
2860#if EV_CHILD_ENABLE
2861
2818void 2862void
2819ev_child_start (EV_P_ ev_child *w) 2863ev_child_start (EV_P_ ev_child *w)
2820{ 2864{
2821#if EV_MULTIPLICITY 2865#if EV_MULTIPLICITY
2822 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));
2825 return; 2869 return;
2826 2870
2827 EV_FREQUENT_CHECK; 2871 EV_FREQUENT_CHECK;
2828 2872
2829 ev_start (EV_A_ (W)w, 1); 2873 ev_start (EV_A_ (W)w, 1);
2830 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2874 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2831 2875
2832 EV_FREQUENT_CHECK; 2876 EV_FREQUENT_CHECK;
2833} 2877}
2834 2878
2835void 2879void
2839 if (expect_false (!ev_is_active (w))) 2883 if (expect_false (!ev_is_active (w)))
2840 return; 2884 return;
2841 2885
2842 EV_FREQUENT_CHECK; 2886 EV_FREQUENT_CHECK;
2843 2887
2844 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2888 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2845 ev_stop (EV_A_ (W)w); 2889 ev_stop (EV_A_ (W)w);
2846 2890
2847 EV_FREQUENT_CHECK; 2891 EV_FREQUENT_CHECK;
2848} 2892}
2893
2894#endif
2849 2895
2850#if EV_STAT_ENABLE 2896#if EV_STAT_ENABLE
2851 2897
2852# ifdef _WIN32 2898# ifdef _WIN32
2853# undef lstat 2899# undef lstat
2859#define MIN_STAT_INTERVAL 0.1074891 2905#define MIN_STAT_INTERVAL 0.1074891
2860 2906
2861static 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);
2862 2908
2863#if EV_USE_INOTIFY 2909#if EV_USE_INOTIFY
2864# 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)
2865 2913
2866static void noinline 2914static void noinline
2867infy_add (EV_P_ ev_stat *w) 2915infy_add (EV_P_ ev_stat *w)
2868{ 2916{
2869 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);
2918 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2966 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2919 } 2967 }
2920 } 2968 }
2921 2969
2922 if (w->wd >= 0) 2970 if (w->wd >= 0)
2923 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);
2924 2972
2925 /* now re-arm timer, if required */ 2973 /* now re-arm timer, if required */
2926 if (ev_is_active (&w->timer)) ev_ref (EV_A); 2974 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2927 ev_timer_again (EV_A_ &w->timer); 2975 ev_timer_again (EV_A_ &w->timer);
2928 if (ev_is_active (&w->timer)) ev_unref (EV_A); 2976 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2936 2984
2937 if (wd < 0) 2985 if (wd < 0)
2938 return; 2986 return;
2939 2987
2940 w->wd = -2; 2988 w->wd = -2;
2941 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 2989 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2942 wlist_del (&fs_hash [slot].head, (WL)w); 2990 wlist_del (&fs_hash [slot].head, (WL)w);
2943 2991
2944 /* remove this watcher, if others are watching it, they will rearm */ 2992 /* remove this watcher, if others are watching it, they will rearm */
2945 inotify_rm_watch (fs_fd, wd); 2993 inotify_rm_watch (fs_fd, wd);
2946} 2994}
2948static void noinline 2996static void noinline
2949infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2997infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2950{ 2998{
2951 if (slot < 0) 2999 if (slot < 0)
2952 /* overflow, need to check for all hash slots */ 3000 /* overflow, need to check for all hash slots */
2953 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3001 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2954 infy_wd (EV_A_ slot, wd, ev); 3002 infy_wd (EV_A_ slot, wd, ev);
2955 else 3003 else
2956 { 3004 {
2957 WL w_; 3005 WL w_;
2958 3006
2959 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3007 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2960 { 3008 {
2961 ev_stat *w = (ev_stat *)w_; 3009 ev_stat *w = (ev_stat *)w_;
2962 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 */
2963 3011
2964 if (w->wd == wd || wd == -1) 3012 if (w->wd == wd || wd == -1)
2965 { 3013 {
2966 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3014 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2967 { 3015 {
2968 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);
2969 w->wd = -1; 3017 w->wd = -1;
2970 infy_add (EV_A_ w); /* re-add, no matter what */ 3018 infy_add (EV_A_ w); /* re-add, no matter what */
2971 } 3019 }
2972 3020
2973 stat_timer_cb (EV_A_ &w->timer, 0); 3021 stat_timer_cb (EV_A_ &w->timer, 0);
2978 3026
2979static void 3027static void
2980infy_cb (EV_P_ ev_io *w, int revents) 3028infy_cb (EV_P_ ev_io *w, int revents)
2981{ 3029{
2982 char buf [EV_INOTIFY_BUFSIZE]; 3030 char buf [EV_INOTIFY_BUFSIZE];
2983 struct inotify_event *ev = (struct inotify_event *)buf;
2984 int ofs; 3031 int ofs;
2985 int len = read (fs_fd, buf, sizeof (buf)); 3032 int len = read (fs_fd, buf, sizeof (buf));
2986 3033
2987 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);
2988 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;
2989} 3072}
2990 3073
2991inline_size void 3074inline_size void
2992check_2625 (EV_P) 3075ev_check_2625 (EV_P)
2993{ 3076{
2994 /* kernels < 2.6.25 are borked 3077 /* kernels < 2.6.25 are borked
2995 * 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
2996 */ 3079 */
2997 struct utsname buf; 3080 if (ev_linux_version () < 0x020619)
2998 int major, minor, micro;
2999
3000 if (uname (&buf))
3001 return;
3002
3003 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
3004 return;
3005
3006 if (major < 2
3007 || (major == 2 && minor < 6)
3008 || (major == 2 && minor == 6 && micro < 25))
3009 return; 3081 return;
3010 3082
3011 fs_2625 = 1; 3083 fs_2625 = 1;
3012} 3084}
3013 3085
3028 if (fs_fd != -2) 3100 if (fs_fd != -2)
3029 return; 3101 return;
3030 3102
3031 fs_fd = -1; 3103 fs_fd = -1;
3032 3104
3033 check_2625 (EV_A); 3105 ev_check_2625 (EV_A);
3034 3106
3035 fs_fd = infy_newfd (); 3107 fs_fd = infy_newfd ();
3036 3108
3037 if (fs_fd >= 0) 3109 if (fs_fd >= 0)
3038 { 3110 {
3063 ev_io_set (&fs_w, fs_fd, EV_READ); 3135 ev_io_set (&fs_w, fs_fd, EV_READ);
3064 ev_io_start (EV_A_ &fs_w); 3136 ev_io_start (EV_A_ &fs_w);
3065 ev_unref (EV_A); 3137 ev_unref (EV_A);
3066 } 3138 }
3067 3139
3068 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3140 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3069 { 3141 {
3070 WL w_ = fs_hash [slot].head; 3142 WL w_ = fs_hash [slot].head;
3071 fs_hash [slot].head = 0; 3143 fs_hash [slot].head = 0;
3072 3144
3073 while (w_) 3145 while (w_)
3248 3320
3249 EV_FREQUENT_CHECK; 3321 EV_FREQUENT_CHECK;
3250} 3322}
3251#endif 3323#endif
3252 3324
3325#if EV_PREPARE_ENABLE
3253void 3326void
3254ev_prepare_start (EV_P_ ev_prepare *w) 3327ev_prepare_start (EV_P_ ev_prepare *w)
3255{ 3328{
3256 if (expect_false (ev_is_active (w))) 3329 if (expect_false (ev_is_active (w)))
3257 return; 3330 return;
3283 3356
3284 ev_stop (EV_A_ (W)w); 3357 ev_stop (EV_A_ (W)w);
3285 3358
3286 EV_FREQUENT_CHECK; 3359 EV_FREQUENT_CHECK;
3287} 3360}
3361#endif
3288 3362
3363#if EV_CHECK_ENABLE
3289void 3364void
3290ev_check_start (EV_P_ ev_check *w) 3365ev_check_start (EV_P_ ev_check *w)
3291{ 3366{
3292 if (expect_false (ev_is_active (w))) 3367 if (expect_false (ev_is_active (w)))
3293 return; 3368 return;
3319 3394
3320 ev_stop (EV_A_ (W)w); 3395 ev_stop (EV_A_ (W)w);
3321 3396
3322 EV_FREQUENT_CHECK; 3397 EV_FREQUENT_CHECK;
3323} 3398}
3399#endif
3324 3400
3325#if EV_EMBED_ENABLE 3401#if EV_EMBED_ENABLE
3326void noinline 3402void noinline
3327ev_embed_sweep (EV_P_ ev_embed *w) 3403ev_embed_sweep (EV_P_ ev_embed *w)
3328{ 3404{
3423 3499
3424 ev_io_stop (EV_A_ &w->io); 3500 ev_io_stop (EV_A_ &w->io);
3425 ev_prepare_stop (EV_A_ &w->prepare); 3501 ev_prepare_stop (EV_A_ &w->prepare);
3426 ev_fork_stop (EV_A_ &w->fork); 3502 ev_fork_stop (EV_A_ &w->fork);
3427 3503
3504 ev_stop (EV_A_ (W)w);
3505
3428 EV_FREQUENT_CHECK; 3506 EV_FREQUENT_CHECK;
3429} 3507}
3430#endif 3508#endif
3431 3509
3432#if EV_FORK_ENABLE 3510#if EV_FORK_ENABLE
3558{ 3636{
3559 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3637 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3560 3638
3561 if (expect_false (!once)) 3639 if (expect_false (!once))
3562 { 3640 {
3563 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3641 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3564 return; 3642 return;
3565 } 3643 }
3566 3644
3567 once->cb = cb; 3645 once->cb = cb;
3568 once->arg = arg; 3646 once->arg = arg;
3655 if (types & EV_ASYNC) 3733 if (types & EV_ASYNC)
3656 for (i = asynccnt; i--; ) 3734 for (i = asynccnt; i--; )
3657 cb (EV_A_ EV_ASYNC, asyncs [i]); 3735 cb (EV_A_ EV_ASYNC, asyncs [i]);
3658#endif 3736#endif
3659 3737
3738#if EV_PREPARE_ENABLE
3660 if (types & EV_PREPARE) 3739 if (types & EV_PREPARE)
3661 for (i = preparecnt; i--; ) 3740 for (i = preparecnt; i--; )
3662#if EV_EMBED_ENABLE 3741# if EV_EMBED_ENABLE
3663 if (ev_cb (prepares [i]) != embed_prepare_cb) 3742 if (ev_cb (prepares [i]) != embed_prepare_cb)
3664#endif 3743# endif
3665 cb (EV_A_ EV_PREPARE, prepares [i]); 3744 cb (EV_A_ EV_PREPARE, prepares [i]);
3745#endif
3666 3746
3747#if EV_CHECK_ENABLE
3667 if (types & EV_CHECK) 3748 if (types & EV_CHECK)
3668 for (i = checkcnt; i--; ) 3749 for (i = checkcnt; i--; )
3669 cb (EV_A_ EV_CHECK, checks [i]); 3750 cb (EV_A_ EV_CHECK, checks [i]);
3751#endif
3670 3752
3753#if EV_SIGNAL_ENABLE
3671 if (types & EV_SIGNAL) 3754 if (types & EV_SIGNAL)
3672 for (i = 0; i < EV_NSIG - 1; ++i) 3755 for (i = 0; i < EV_NSIG - 1; ++i)
3673 for (wl = signals [i].head; wl; ) 3756 for (wl = signals [i].head; wl; )
3674 { 3757 {
3675 wn = wl->next; 3758 wn = wl->next;
3676 cb (EV_A_ EV_SIGNAL, wl); 3759 cb (EV_A_ EV_SIGNAL, wl);
3677 wl = wn; 3760 wl = wn;
3678 } 3761 }
3762#endif
3679 3763
3764#if EV_CHILD_ENABLE
3680 if (types & EV_CHILD) 3765 if (types & EV_CHILD)
3681 for (i = EV_PID_HASHSIZE; i--; ) 3766 for (i = (EV_PID_HASHSIZE); i--; )
3682 for (wl = childs [i]; wl; ) 3767 for (wl = childs [i]; wl; )
3683 { 3768 {
3684 wn = wl->next; 3769 wn = wl->next;
3685 cb (EV_A_ EV_CHILD, wl); 3770 cb (EV_A_ EV_CHILD, wl);
3686 wl = wn; 3771 wl = wn;
3687 } 3772 }
3773#endif
3688/* EV_STAT 0x00001000 /* stat data changed */ 3774/* EV_STAT 0x00001000 /* stat data changed */
3689/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3775/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3690} 3776}
3691#endif 3777#endif
3692 3778

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines