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

Comparing libev/ev.c (file contents):
Revision 1.314 by root, Wed Aug 26 17:31:20 2009 UTC vs.
Revision 1.343 by root, Fri Apr 2 21:03:46 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 *
77# ifndef EV_USE_REALTIME 77# ifndef EV_USE_REALTIME
78# define EV_USE_REALTIME 0 78# define EV_USE_REALTIME 0
79# endif 79# endif
80# endif 80# endif
81 81
82# if HAVE_NANOSLEEP
82# ifndef EV_USE_NANOSLEEP 83# ifndef EV_USE_NANOSLEEP
83# if HAVE_NANOSLEEP
84# define EV_USE_NANOSLEEP 1 84# define EV_USE_NANOSLEEP EV_FEATURE_OS
85# endif
85# else 86# else
87# undef EV_USE_NANOSLEEP
86# define EV_USE_NANOSLEEP 0 88# define EV_USE_NANOSLEEP 0
89# endif
90
91# if HAVE_SELECT && HAVE_SYS_SELECT_H
92# ifndef EV_USE_SELECT
93# define EV_USE_SELECT EV_FEATURE_BACKENDS
87# endif 94# endif
88# endif
89
90# ifndef EV_USE_SELECT
91# if HAVE_SELECT && HAVE_SYS_SELECT_H
92# define EV_USE_SELECT 1
93# else 95# else
96# undef EV_USE_SELECT
94# define EV_USE_SELECT 0 97# define EV_USE_SELECT 0
98# endif
99
100# if HAVE_POLL && HAVE_POLL_H
101# ifndef EV_USE_POLL
102# define EV_USE_POLL EV_FEATURE_BACKENDS
95# endif 103# endif
96# endif
97
98# ifndef EV_USE_POLL
99# if HAVE_POLL && HAVE_POLL_H
100# define EV_USE_POLL 1
101# else 104# else
105# undef EV_USE_POLL
102# define EV_USE_POLL 0 106# define EV_USE_POLL 0
107# endif
108
109# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
110# ifndef EV_USE_EPOLL
111# define EV_USE_EPOLL EV_FEATURE_BACKENDS
103# endif 112# endif
113# else
114# undef EV_USE_EPOLL
115# define EV_USE_EPOLL 0
104# endif 116# endif
105 117
118# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
106# ifndef EV_USE_EPOLL 119# ifndef EV_USE_KQUEUE
107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 120# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
108# define EV_USE_EPOLL 1
109# else
110# define EV_USE_EPOLL 0
111# endif 121# endif
122# else
123# undef EV_USE_KQUEUE
124# define EV_USE_KQUEUE 0
112# endif 125# endif
113 126
114# ifndef EV_USE_KQUEUE 127# if HAVE_PORT_H && HAVE_PORT_CREATE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 128# ifndef EV_USE_PORT
116# define EV_USE_KQUEUE 1 129# define EV_USE_PORT EV_FEATURE_BACKENDS
117# else
118# define EV_USE_KQUEUE 0
119# endif 130# endif
120# endif
121
122# ifndef EV_USE_PORT
123# if HAVE_PORT_H && HAVE_PORT_CREATE
124# define EV_USE_PORT 1
125# else 131# else
132# undef EV_USE_PORT
126# define EV_USE_PORT 0 133# define EV_USE_PORT 0
134# endif
135
136# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
137# ifndef EV_USE_INOTIFY
138# define EV_USE_INOTIFY EV_FEATURE_OS
127# endif 139# endif
128# endif
129
130# ifndef EV_USE_INOTIFY
131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
132# define EV_USE_INOTIFY 1
133# else 140# else
141# undef EV_USE_INOTIFY
134# define EV_USE_INOTIFY 0 142# define EV_USE_INOTIFY 0
143# endif
144
145# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
146# ifndef EV_USE_SIGNALFD
147# define EV_USE_SIGNALFD EV_FEATURE_OS
135# endif 148# endif
136# endif
137
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1
141# else 149# else
150# undef EV_USE_SIGNALFD
142# define EV_USE_SIGNALFD 0 151# define EV_USE_SIGNALFD 0
152# endif
153
154# if HAVE_EVENTFD
155# ifndef EV_USE_EVENTFD
156# define EV_USE_EVENTFD EV_FEATURE_OS
143# endif 157# endif
144# endif
145
146# ifndef EV_USE_EVENTFD
147# if HAVE_EVENTFD
148# define EV_USE_EVENTFD 1
149# else 158# else
159# undef EV_USE_EVENTFD
150# define EV_USE_EVENTFD 0 160# define EV_USE_EVENTFD 0
151# endif
152# endif 161# endif
153 162
154#endif 163#endif
155 164
156#include <math.h> 165#include <math.h>
157#include <stdlib.h> 166#include <stdlib.h>
167#include <string.h>
158#include <fcntl.h> 168#include <fcntl.h>
159#include <stddef.h> 169#include <stddef.h>
160 170
161#include <stdio.h> 171#include <stdio.h>
162 172
163#include <assert.h> 173#include <assert.h>
164#include <errno.h> 174#include <errno.h>
165#include <sys/types.h> 175#include <sys/types.h>
166#include <time.h> 176#include <time.h>
177#include <limits.h>
167 178
168#include <signal.h> 179#include <signal.h>
169 180
170#ifdef EV_H 181#ifdef EV_H
171# include EV_H 182# include EV_H
182# define WIN32_LEAN_AND_MEAN 193# define WIN32_LEAN_AND_MEAN
183# include <windows.h> 194# include <windows.h>
184# ifndef EV_SELECT_IS_WINSOCKET 195# ifndef EV_SELECT_IS_WINSOCKET
185# define EV_SELECT_IS_WINSOCKET 1 196# define EV_SELECT_IS_WINSOCKET 1
186# endif 197# endif
198# undef EV_AVOID_STDIO
187#endif 199#endif
188 200
189/* this block tries to deduce configuration from header-defined symbols and defaults */ 201/* this block tries to deduce configuration from header-defined symbols and defaults */
190 202
191/* try to deduce the maximum number of signals on this platform */ 203/* try to deduce the maximum number of signals on this platform */
204#elif defined (MAXSIG) 216#elif defined (MAXSIG)
205# define EV_NSIG (MAXSIG+1) 217# define EV_NSIG (MAXSIG+1)
206#elif defined (MAX_SIG) 218#elif defined (MAX_SIG)
207# define EV_NSIG (MAX_SIG+1) 219# define EV_NSIG (MAX_SIG+1)
208#elif defined (SIGARRAYSIZE) 220#elif defined (SIGARRAYSIZE)
209# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */ 221# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
210#elif defined (_sys_nsig) 222#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 223# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else 224#else
213# error "unable to find value for NSIG, please report" 225# error "unable to find value for NSIG, please report"
214/* to make it compile regardless, just remove the above line */ 226/* to make it compile regardless, just remove the above line, */
227/* but consider reporting it, too! :) */
215# define EV_NSIG 65 228# define EV_NSIG 65
216#endif 229#endif
217 230
218#ifndef EV_USE_CLOCK_SYSCALL 231#ifndef EV_USE_CLOCK_SYSCALL
219# if __linux && __GLIBC__ >= 2 232# if __linux && __GLIBC__ >= 2
220# define EV_USE_CLOCK_SYSCALL 1 233# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
221# else 234# else
222# define EV_USE_CLOCK_SYSCALL 0 235# define EV_USE_CLOCK_SYSCALL 0
223# endif 236# endif
224#endif 237#endif
225 238
226#ifndef EV_USE_MONOTONIC 239#ifndef EV_USE_MONOTONIC
227# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 240# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
228# define EV_USE_MONOTONIC 1 241# define EV_USE_MONOTONIC EV_FEATURE_OS
229# else 242# else
230# define EV_USE_MONOTONIC 0 243# define EV_USE_MONOTONIC 0
231# endif 244# endif
232#endif 245#endif
233 246
235# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 248# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
236#endif 249#endif
237 250
238#ifndef EV_USE_NANOSLEEP 251#ifndef EV_USE_NANOSLEEP
239# if _POSIX_C_SOURCE >= 199309L 252# if _POSIX_C_SOURCE >= 199309L
240# define EV_USE_NANOSLEEP 1 253# define EV_USE_NANOSLEEP EV_FEATURE_OS
241# else 254# else
242# define EV_USE_NANOSLEEP 0 255# define EV_USE_NANOSLEEP 0
243# endif 256# endif
244#endif 257#endif
245 258
246#ifndef EV_USE_SELECT 259#ifndef EV_USE_SELECT
247# define EV_USE_SELECT 1 260# define EV_USE_SELECT EV_FEATURE_BACKENDS
248#endif 261#endif
249 262
250#ifndef EV_USE_POLL 263#ifndef EV_USE_POLL
251# ifdef _WIN32 264# ifdef _WIN32
252# define EV_USE_POLL 0 265# define EV_USE_POLL 0
253# else 266# else
254# define EV_USE_POLL 1 267# define EV_USE_POLL EV_FEATURE_BACKENDS
255# endif 268# endif
256#endif 269#endif
257 270
258#ifndef EV_USE_EPOLL 271#ifndef EV_USE_EPOLL
259# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 272# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
260# define EV_USE_EPOLL 1 273# define EV_USE_EPOLL EV_FEATURE_BACKENDS
261# else 274# else
262# define EV_USE_EPOLL 0 275# define EV_USE_EPOLL 0
263# endif 276# endif
264#endif 277#endif
265 278
271# define EV_USE_PORT 0 284# define EV_USE_PORT 0
272#endif 285#endif
273 286
274#ifndef EV_USE_INOTIFY 287#ifndef EV_USE_INOTIFY
275# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 288# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
276# define EV_USE_INOTIFY 1 289# define EV_USE_INOTIFY EV_FEATURE_OS
277# else 290# else
278# define EV_USE_INOTIFY 0 291# define EV_USE_INOTIFY 0
279# endif 292# endif
280#endif 293#endif
281 294
282#ifndef EV_PID_HASHSIZE 295#ifndef EV_PID_HASHSIZE
283# if EV_MINIMAL 296# 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 297#endif
289 298
290#ifndef EV_INOTIFY_HASHSIZE 299#ifndef EV_INOTIFY_HASHSIZE
291# if EV_MINIMAL 300# 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 301#endif
297 302
298#ifndef EV_USE_EVENTFD 303#ifndef EV_USE_EVENTFD
299# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 304# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
300# define EV_USE_EVENTFD 1 305# define EV_USE_EVENTFD EV_FEATURE_OS
301# else 306# else
302# define EV_USE_EVENTFD 0 307# define EV_USE_EVENTFD 0
303# endif 308# endif
304#endif 309#endif
305 310
306#ifndef EV_USE_SIGNALFD 311#ifndef EV_USE_SIGNALFD
307# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 312# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
308# define EV_USE_SIGNALFD 1 313# define EV_USE_SIGNALFD EV_FEATURE_OS
309# else 314# else
310# define EV_USE_SIGNALFD 0 315# define EV_USE_SIGNALFD 0
311# endif 316# endif
312#endif 317#endif
313 318
316# define EV_USE_4HEAP 1 321# define EV_USE_4HEAP 1
317# define EV_HEAP_CACHE_AT 1 322# define EV_HEAP_CACHE_AT 1
318#endif 323#endif
319 324
320#ifndef EV_VERIFY 325#ifndef EV_VERIFY
321# define EV_VERIFY !EV_MINIMAL 326# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
322#endif 327#endif
323 328
324#ifndef EV_USE_4HEAP 329#ifndef EV_USE_4HEAP
325# define EV_USE_4HEAP !EV_MINIMAL 330# define EV_USE_4HEAP EV_FEATURE_DATA
326#endif 331#endif
327 332
328#ifndef EV_HEAP_CACHE_AT 333#ifndef EV_HEAP_CACHE_AT
329# define EV_HEAP_CACHE_AT !EV_MINIMAL 334# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
330#endif 335#endif
331 336
332/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 337/* 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. */ 338/* which makes programs even slower. might work on other unices, too. */
334#if EV_USE_CLOCK_SYSCALL 339#if EV_USE_CLOCK_SYSCALL
343# endif 348# endif
344#endif 349#endif
345 350
346/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 351/* this block fixes any misconfiguration where we know we run into trouble otherwise */
347 352
353#ifdef _AIX
354/* AIX has a completely broken poll.h header */
355# undef EV_USE_POLL
356# define EV_USE_POLL 0
357#endif
358
348#ifndef CLOCK_MONOTONIC 359#ifndef CLOCK_MONOTONIC
349# undef EV_USE_MONOTONIC 360# undef EV_USE_MONOTONIC
350# define EV_USE_MONOTONIC 0 361# define EV_USE_MONOTONIC 0
351#endif 362#endif
352 363
395# endif 406# endif
396# endif 407# endif
397# ifdef __cplusplus 408# ifdef __cplusplus
398extern "C" { 409extern "C" {
399# endif 410# endif
400int eventfd (unsigned int initval, int flags); 411int (eventfd) (unsigned int initval, int flags);
401# ifdef __cplusplus 412# ifdef __cplusplus
402} 413}
403# endif 414# endif
404#endif 415#endif
405 416
433 444
434 445
435/**/ 446/**/
436 447
437#if EV_VERIFY >= 3 448#if EV_VERIFY >= 3
438# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 449# define EV_FREQUENT_CHECK ev_verify (EV_A)
439#else 450#else
440# define EV_FREQUENT_CHECK do { } while (0) 451# define EV_FREQUENT_CHECK do { } while (0)
441#endif 452#endif
442 453
443/* 454/*
450 */ 461 */
451#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 462#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
452 463
453#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 464#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
454#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 465#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
455/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
456 466
457#if __GNUC__ >= 4 467#if __GNUC__ >= 4
458# define expect(expr,value) __builtin_expect ((expr),(value)) 468# define expect(expr,value) __builtin_expect ((expr),(value))
459# define noinline __attribute__ ((noinline)) 469# define noinline __attribute__ ((noinline))
460#else 470#else
467 477
468#define expect_false(expr) expect ((expr) != 0, 0) 478#define expect_false(expr) expect ((expr) != 0, 0)
469#define expect_true(expr) expect ((expr) != 0, 1) 479#define expect_true(expr) expect ((expr) != 0, 1)
470#define inline_size static inline 480#define inline_size static inline
471 481
472#if EV_MINIMAL 482#if EV_FEATURE_CODE
483# define inline_speed static inline
484#else
473# define inline_speed static noinline 485# define inline_speed static noinline
474#else
475# define inline_speed static inline
476#endif 486#endif
477 487
478#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 488#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
479 489
480#if EV_MINPRI == EV_MAXPRI 490#if EV_MINPRI == EV_MAXPRI
505 515
506#ifndef EV_FD_TO_WIN32_HANDLE 516#ifndef EV_FD_TO_WIN32_HANDLE
507# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd) 517# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
508#endif 518#endif
509#ifndef EV_WIN32_HANDLE_TO_FD 519#ifndef EV_WIN32_HANDLE_TO_FD
510# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0) 520# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
511#endif 521#endif
512#ifndef EV_WIN32_CLOSE_FD 522#ifndef EV_WIN32_CLOSE_FD
513# define EV_WIN32_CLOSE_FD(fd) close (fd) 523# define EV_WIN32_CLOSE_FD(fd) close (fd)
514#endif 524#endif
515 525
516#ifdef _WIN32 526#ifdef _WIN32
517# include "ev_win32.c" 527# include "ev_win32.c"
518#endif 528#endif
519 529
520/*****************************************************************************/ 530/*****************************************************************************/
531
532#if EV_AVOID_STDIO
533static void noinline
534ev_printerr (const char *msg)
535{
536 write (STDERR_FILENO, msg, strlen (msg));
537}
538#endif
521 539
522static void (*syserr_cb)(const char *msg); 540static void (*syserr_cb)(const char *msg);
523 541
524void 542void
525ev_set_syserr_cb (void (*cb)(const char *msg)) 543ev_set_syserr_cb (void (*cb)(const char *msg))
535 553
536 if (syserr_cb) 554 if (syserr_cb)
537 syserr_cb (msg); 555 syserr_cb (msg);
538 else 556 else
539 { 557 {
558#if EV_AVOID_STDIO
559 const char *err = strerror (errno);
560
561 ev_printerr (msg);
562 ev_printerr (": ");
563 ev_printerr (err);
564 ev_printerr ("\n");
565#else
540 perror (msg); 566 perror (msg);
567#endif
541 abort (); 568 abort ();
542 } 569 }
543} 570}
544 571
545static void * 572static void *
546ev_realloc_emul (void *ptr, long size) 573ev_realloc_emul (void *ptr, long size)
547{ 574{
575#if __GLIBC__
576 return realloc (ptr, size);
577#else
548 /* some systems, notably openbsd and darwin, fail to properly 578 /* some systems, notably openbsd and darwin, fail to properly
549 * implement realloc (x, 0) (as required by both ansi c-98 and 579 * implement realloc (x, 0) (as required by both ansi c-89 and
550 * the single unix specification, so work around them here. 580 * the single unix specification, so work around them here.
551 */ 581 */
552 582
553 if (size) 583 if (size)
554 return realloc (ptr, size); 584 return realloc (ptr, size);
555 585
556 free (ptr); 586 free (ptr);
557 return 0; 587 return 0;
588#endif
558} 589}
559 590
560static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 591static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
561 592
562void 593void
570{ 601{
571 ptr = alloc (ptr, size); 602 ptr = alloc (ptr, size);
572 603
573 if (!ptr && size) 604 if (!ptr && size)
574 { 605 {
606#if EV_AVOID_STDIO
607 ev_printerr ("libev: memory allocation failed, aborting.\n");
608#else
575 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 609 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
610#endif
576 abort (); 611 abort ();
577 } 612 }
578 613
579 return ptr; 614 return ptr;
580} 615}
662 697
663 static int ev_default_loop_ptr; 698 static int ev_default_loop_ptr;
664 699
665#endif 700#endif
666 701
667#if EV_MINIMAL < 2 702#if EV_FEATURE_API
668# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 703# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
669# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A) 704# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
670# define EV_INVOKE_PENDING invoke_cb (EV_A) 705# define EV_INVOKE_PENDING invoke_cb (EV_A)
671#else 706#else
672# define EV_RELEASE_CB (void)0 707# define EV_RELEASE_CB (void)0
857} 892}
858 893
859/*****************************************************************************/ 894/*****************************************************************************/
860 895
861inline_speed void 896inline_speed void
862fd_event_nc (EV_P_ int fd, int revents) 897fd_event_nocheck (EV_P_ int fd, int revents)
863{ 898{
864 ANFD *anfd = anfds + fd; 899 ANFD *anfd = anfds + fd;
865 ev_io *w; 900 ev_io *w;
866 901
867 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 902 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
879fd_event (EV_P_ int fd, int revents) 914fd_event (EV_P_ int fd, int revents)
880{ 915{
881 ANFD *anfd = anfds + fd; 916 ANFD *anfd = anfds + fd;
882 917
883 if (expect_true (!anfd->reify)) 918 if (expect_true (!anfd->reify))
884 fd_event_nc (EV_A_ fd, revents); 919 fd_event_nocheck (EV_A_ fd, revents);
885} 920}
886 921
887void 922void
888ev_feed_fd_event (EV_P_ int fd, int revents) 923ev_feed_fd_event (EV_P_ int fd, int revents)
889{ 924{
890 if (fd >= 0 && fd < anfdmax) 925 if (fd >= 0 && fd < anfdmax)
891 fd_event_nc (EV_A_ fd, revents); 926 fd_event_nocheck (EV_A_ fd, revents);
892} 927}
893 928
894/* make sure the external fd watch events are in-sync */ 929/* make sure the external fd watch events are in-sync */
895/* with the kernel/libev internal state */ 930/* with the kernel/libev internal state */
896inline_size void 931inline_size void
959 ev_io_stop (EV_A_ w); 994 ev_io_stop (EV_A_ w);
960 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 995 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
961 } 996 }
962} 997}
963 998
964/* check whether the given fd is atcually valid, for error recovery */ 999/* check whether the given fd is actually valid, for error recovery */
965inline_size int 1000inline_size int
966fd_valid (int fd) 1001fd_valid (int fd)
967{ 1002{
968#ifdef _WIN32 1003#ifdef _WIN32
969 return _get_osfhandle (fd) != -1; 1004 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
970#else 1005#else
971 return fcntl (fd, F_GETFD) != -1; 1006 return fcntl (fd, F_GETFD) != -1;
972#endif 1007#endif
973} 1008}
974 1009
1009 { 1044 {
1010 anfds [fd].events = 0; 1045 anfds [fd].events = 0;
1011 anfds [fd].emask = 0; 1046 anfds [fd].emask = 0;
1012 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1047 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
1013 } 1048 }
1049}
1050
1051/* used to prepare libev internal fd's */
1052/* this is not fork-safe */
1053inline_speed void
1054fd_intern (int fd)
1055{
1056#ifdef _WIN32
1057 unsigned long arg = 1;
1058 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1059#else
1060 fcntl (fd, F_SETFD, FD_CLOEXEC);
1061 fcntl (fd, F_SETFL, O_NONBLOCK);
1062#endif
1014} 1063}
1015 1064
1016/*****************************************************************************/ 1065/*****************************************************************************/
1017 1066
1018/* 1067/*
1172 1221
1173static ANSIG signals [EV_NSIG - 1]; 1222static ANSIG signals [EV_NSIG - 1];
1174 1223
1175/*****************************************************************************/ 1224/*****************************************************************************/
1176 1225
1177/* used to prepare libev internal fd's */ 1226#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1178/* this is not fork-safe */
1179inline_speed void
1180fd_intern (int fd)
1181{
1182#ifdef _WIN32
1183 unsigned long arg = 1;
1184 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1185#else
1186 fcntl (fd, F_SETFD, FD_CLOEXEC);
1187 fcntl (fd, F_SETFL, O_NONBLOCK);
1188#endif
1189}
1190 1227
1191static void noinline 1228static void noinline
1192evpipe_init (EV_P) 1229evpipe_init (EV_P)
1193{ 1230{
1194 if (!ev_is_active (&pipe_w)) 1231 if (!ev_is_active (&pipe_w))
1195 { 1232 {
1196#if EV_USE_EVENTFD 1233# if EV_USE_EVENTFD
1197 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1234 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1198 if (evfd < 0 && errno == EINVAL) 1235 if (evfd < 0 && errno == EINVAL)
1199 evfd = eventfd (0, 0); 1236 evfd = eventfd (0, 0);
1200 1237
1201 if (evfd >= 0) 1238 if (evfd >= 0)
1203 evpipe [0] = -1; 1240 evpipe [0] = -1;
1204 fd_intern (evfd); /* doing it twice doesn't hurt */ 1241 fd_intern (evfd); /* doing it twice doesn't hurt */
1205 ev_io_set (&pipe_w, evfd, EV_READ); 1242 ev_io_set (&pipe_w, evfd, EV_READ);
1206 } 1243 }
1207 else 1244 else
1208#endif 1245# endif
1209 { 1246 {
1210 while (pipe (evpipe)) 1247 while (pipe (evpipe))
1211 ev_syserr ("(libev) error creating signal/async pipe"); 1248 ev_syserr ("(libev) error creating signal/async pipe");
1212 1249
1213 fd_intern (evpipe [0]); 1250 fd_intern (evpipe [0]);
1224evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1261evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1225{ 1262{
1226 if (!*flag) 1263 if (!*flag)
1227 { 1264 {
1228 int old_errno = errno; /* save errno because write might clobber it */ 1265 int old_errno = errno; /* save errno because write might clobber it */
1266 char dummy;
1229 1267
1230 *flag = 1; 1268 *flag = 1;
1231 1269
1232#if EV_USE_EVENTFD 1270#if EV_USE_EVENTFD
1233 if (evfd >= 0) 1271 if (evfd >= 0)
1235 uint64_t counter = 1; 1273 uint64_t counter = 1;
1236 write (evfd, &counter, sizeof (uint64_t)); 1274 write (evfd, &counter, sizeof (uint64_t));
1237 } 1275 }
1238 else 1276 else
1239#endif 1277#endif
1240 write (evpipe [1], &old_errno, 1); 1278 write (evpipe [1], &dummy, 1);
1241 1279
1242 errno = old_errno; 1280 errno = old_errno;
1243 } 1281 }
1244} 1282}
1245 1283
1294{ 1332{
1295#if EV_MULTIPLICITY 1333#if EV_MULTIPLICITY
1296 EV_P = signals [signum - 1].loop; 1334 EV_P = signals [signum - 1].loop;
1297#endif 1335#endif
1298 1336
1299#if _WIN32 1337#ifdef _WIN32
1300 signal (signum, ev_sighandler); 1338 signal (signum, ev_sighandler);
1301#endif 1339#endif
1302 1340
1303 signals [signum - 1].pending = 1; 1341 signals [signum - 1].pending = 1;
1304 evpipe_write (EV_A_ &sig_pending); 1342 evpipe_write (EV_A_ &sig_pending);
1346 break; 1384 break;
1347 } 1385 }
1348} 1386}
1349#endif 1387#endif
1350 1388
1389#endif
1390
1351/*****************************************************************************/ 1391/*****************************************************************************/
1352 1392
1393#if EV_CHILD_ENABLE
1353static WL childs [EV_PID_HASHSIZE]; 1394static WL childs [EV_PID_HASHSIZE];
1354
1355#ifndef _WIN32
1356 1395
1357static ev_signal childev; 1396static ev_signal childev;
1358 1397
1359#ifndef WIFCONTINUED 1398#ifndef WIFCONTINUED
1360# define WIFCONTINUED(status) 0 1399# define WIFCONTINUED(status) 0
1365child_reap (EV_P_ int chain, int pid, int status) 1404child_reap (EV_P_ int chain, int pid, int status)
1366{ 1405{
1367 ev_child *w; 1406 ev_child *w;
1368 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1407 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1369 1408
1370 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1409 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1371 { 1410 {
1372 if ((w->pid == pid || !w->pid) 1411 if ((w->pid == pid || !w->pid)
1373 && (!traced || (w->flags & 1))) 1412 && (!traced || (w->flags & 1)))
1374 { 1413 {
1375 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1414 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
1400 /* make sure we are called again until all children have been reaped */ 1439 /* make sure we are called again until all children have been reaped */
1401 /* we need to do it this way so that the callback gets called before we continue */ 1440 /* we need to do it this way so that the callback gets called before we continue */
1402 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1441 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1403 1442
1404 child_reap (EV_A_ pid, pid, status); 1443 child_reap (EV_A_ pid, pid, status);
1405 if (EV_PID_HASHSIZE > 1) 1444 if ((EV_PID_HASHSIZE) > 1)
1406 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1445 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1407} 1446}
1408 1447
1409#endif 1448#endif
1410 1449
1477#ifdef __APPLE__ 1516#ifdef __APPLE__
1478 /* only select works correctly on that "unix-certified" platform */ 1517 /* only select works correctly on that "unix-certified" platform */
1479 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1518 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1480 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1519 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1481#endif 1520#endif
1521#ifdef __FreeBSD__
1522 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1523#endif
1482 1524
1483 return flags; 1525 return flags;
1484} 1526}
1485 1527
1486unsigned int 1528unsigned int
1499ev_backend (EV_P) 1541ev_backend (EV_P)
1500{ 1542{
1501 return backend; 1543 return backend;
1502} 1544}
1503 1545
1504#if EV_MINIMAL < 2 1546#if EV_FEATURE_API
1505unsigned int 1547unsigned int
1506ev_loop_count (EV_P) 1548ev_iteration (EV_P)
1507{ 1549{
1508 return loop_count; 1550 return loop_count;
1509} 1551}
1510 1552
1511unsigned int 1553unsigned int
1512ev_loop_depth (EV_P) 1554ev_depth (EV_P)
1513{ 1555{
1514 return loop_depth; 1556 return loop_depth;
1515} 1557}
1516 1558
1517void 1559void
1589 1631
1590 ev_rt_now = ev_time (); 1632 ev_rt_now = ev_time ();
1591 mn_now = get_clock (); 1633 mn_now = get_clock ();
1592 now_floor = mn_now; 1634 now_floor = mn_now;
1593 rtmn_diff = ev_rt_now - mn_now; 1635 rtmn_diff = ev_rt_now - mn_now;
1594#if EV_MINIMAL < 2 1636#if EV_FEATURE_API
1595 invoke_cb = ev_invoke_pending; 1637 invoke_cb = ev_invoke_pending;
1596#endif 1638#endif
1597 1639
1598 io_blocktime = 0.; 1640 io_blocktime = 0.;
1599 timeout_blocktime = 0.; 1641 timeout_blocktime = 0.;
1605#endif 1647#endif
1606#if EV_USE_INOTIFY 1648#if EV_USE_INOTIFY
1607 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1649 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1608#endif 1650#endif
1609#if EV_USE_SIGNALFD 1651#if EV_USE_SIGNALFD
1610 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1652 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1611#endif 1653#endif
1612 1654
1613 if (!(flags & 0x0000ffffU)) 1655 if (!(flags & 0x0000ffffU))
1614 flags |= ev_recommended_backends (); 1656 flags |= ev_recommended_backends ();
1615 1657
1629 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1671 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1630#endif 1672#endif
1631 1673
1632 ev_prepare_init (&pending_w, pendingcb); 1674 ev_prepare_init (&pending_w, pendingcb);
1633 1675
1676#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1634 ev_init (&pipe_w, pipecb); 1677 ev_init (&pipe_w, pipecb);
1635 ev_set_priority (&pipe_w, EV_MAXPRI); 1678 ev_set_priority (&pipe_w, EV_MAXPRI);
1679#endif
1636 } 1680 }
1637} 1681}
1638 1682
1639/* free up a loop structure */ 1683/* free up a loop structure */
1640static void noinline 1684static void noinline
1659 } 1703 }
1660 } 1704 }
1661 1705
1662#if EV_USE_SIGNALFD 1706#if EV_USE_SIGNALFD
1663 if (ev_is_active (&sigfd_w)) 1707 if (ev_is_active (&sigfd_w))
1664 {
1665 /*ev_ref (EV_A);*/
1666 /*ev_io_stop (EV_A_ &sigfd_w);*/
1667
1668 close (sigfd); 1708 close (sigfd);
1669 }
1670#endif 1709#endif
1671 1710
1672#if EV_USE_INOTIFY 1711#if EV_USE_INOTIFY
1673 if (fs_fd >= 0) 1712 if (fs_fd >= 0)
1674 close (fs_fd); 1713 close (fs_fd);
1763 { 1802 {
1764 EV_WIN32_CLOSE_FD (evpipe [0]); 1803 EV_WIN32_CLOSE_FD (evpipe [0]);
1765 EV_WIN32_CLOSE_FD (evpipe [1]); 1804 EV_WIN32_CLOSE_FD (evpipe [1]);
1766 } 1805 }
1767 1806
1807#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1768 evpipe_init (EV_A); 1808 evpipe_init (EV_A);
1769 /* now iterate over everything, in case we missed something */ 1809 /* now iterate over everything, in case we missed something */
1770 pipecb (EV_A_ &pipe_w, EV_READ); 1810 pipecb (EV_A_ &pipe_w, EV_READ);
1811#endif
1771 } 1812 }
1772 1813
1773 postfork = 0; 1814 postfork = 0;
1774} 1815}
1775 1816
1837 verify_watcher (EV_A_ ws [cnt]); 1878 verify_watcher (EV_A_ ws [cnt]);
1838 } 1879 }
1839} 1880}
1840#endif 1881#endif
1841 1882
1842#if EV_MINIMAL < 2 1883#if EV_FEATURE_API
1843void 1884void
1844ev_loop_verify (EV_P) 1885ev_verify (EV_P)
1845{ 1886{
1846#if EV_VERIFY 1887#if EV_VERIFY
1847 int i; 1888 int i;
1848 WL w; 1889 WL w;
1849 1890
1888#if EV_ASYNC_ENABLE 1929#if EV_ASYNC_ENABLE
1889 assert (asyncmax >= asynccnt); 1930 assert (asyncmax >= asynccnt);
1890 array_verify (EV_A_ (W *)asyncs, asynccnt); 1931 array_verify (EV_A_ (W *)asyncs, asynccnt);
1891#endif 1932#endif
1892 1933
1934#if EV_PREPARE_ENABLE
1893 assert (preparemax >= preparecnt); 1935 assert (preparemax >= preparecnt);
1894 array_verify (EV_A_ (W *)prepares, preparecnt); 1936 array_verify (EV_A_ (W *)prepares, preparecnt);
1937#endif
1895 1938
1939#if EV_CHECK_ENABLE
1896 assert (checkmax >= checkcnt); 1940 assert (checkmax >= checkcnt);
1897 array_verify (EV_A_ (W *)checks, checkcnt); 1941 array_verify (EV_A_ (W *)checks, checkcnt);
1942#endif
1898 1943
1899# if 0 1944# if 0
1945#if EV_CHILD_ENABLE
1900 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1946 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1901 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending) 1947 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1948#endif
1902# endif 1949# endif
1903#endif 1950#endif
1904} 1951}
1905#endif 1952#endif
1906 1953
1922 1969
1923 loop_init (EV_A_ flags); 1970 loop_init (EV_A_ flags);
1924 1971
1925 if (ev_backend (EV_A)) 1972 if (ev_backend (EV_A))
1926 { 1973 {
1927#ifndef _WIN32 1974#if EV_CHILD_ENABLE
1928 ev_signal_init (&childev, childcb, SIGCHLD); 1975 ev_signal_init (&childev, childcb, SIGCHLD);
1929 ev_set_priority (&childev, EV_MAXPRI); 1976 ev_set_priority (&childev, EV_MAXPRI);
1930 ev_signal_start (EV_A_ &childev); 1977 ev_signal_start (EV_A_ &childev);
1931 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1978 ev_unref (EV_A); /* child watcher should not keep loop alive */
1932#endif 1979#endif
1945 EV_P = ev_default_loop_ptr; 1992 EV_P = ev_default_loop_ptr;
1946#endif 1993#endif
1947 1994
1948 ev_default_loop_ptr = 0; 1995 ev_default_loop_ptr = 0;
1949 1996
1950#ifndef _WIN32 1997#if EV_CHILD_ENABLE
1951 ev_ref (EV_A); /* child watcher */ 1998 ev_ref (EV_A); /* child watcher */
1952 ev_signal_stop (EV_A_ &childev); 1999 ev_signal_stop (EV_A_ &childev);
1953#endif 2000#endif
1954 2001
1955 loop_destroy (EV_A); 2002 loop_destroy (EV_A);
2061 EV_FREQUENT_CHECK; 2108 EV_FREQUENT_CHECK;
2062 feed_reverse (EV_A_ (W)w); 2109 feed_reverse (EV_A_ (W)w);
2063 } 2110 }
2064 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2111 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2065 2112
2066 feed_reverse_done (EV_A_ EV_TIMEOUT); 2113 feed_reverse_done (EV_A_ EV_TIMER);
2067 } 2114 }
2068} 2115}
2069 2116
2070#if EV_PERIODIC_ENABLE 2117#if EV_PERIODIC_ENABLE
2071/* make periodics pending */ 2118/* make periodics pending */
2162 ANHE_at_cache (*he); 2209 ANHE_at_cache (*he);
2163 } 2210 }
2164} 2211}
2165 2212
2166/* fetch new monotonic and realtime times from the kernel */ 2213/* fetch new monotonic and realtime times from the kernel */
2167/* also detetc if there was a timejump, and act accordingly */ 2214/* also detect if there was a timejump, and act accordingly */
2168inline_speed void 2215inline_speed void
2169time_update (EV_P_ ev_tstamp max_block) 2216time_update (EV_P_ ev_tstamp max_block)
2170{ 2217{
2171#if EV_USE_MONOTONIC 2218#if EV_USE_MONOTONIC
2172 if (expect_true (have_monotonic)) 2219 if (expect_true (have_monotonic))
2232} 2279}
2233 2280
2234void 2281void
2235ev_loop (EV_P_ int flags) 2282ev_loop (EV_P_ int flags)
2236{ 2283{
2237#if EV_MINIMAL < 2 2284#if EV_FEATURE_API
2238 ++loop_depth; 2285 ++loop_depth;
2239#endif 2286#endif
2240 2287
2241 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2288 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2242 2289
2245 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2292 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2246 2293
2247 do 2294 do
2248 { 2295 {
2249#if EV_VERIFY >= 2 2296#if EV_VERIFY >= 2
2250 ev_loop_verify (EV_A); 2297 ev_verify (EV_A);
2251#endif 2298#endif
2252 2299
2253#ifndef _WIN32 2300#ifndef _WIN32
2254 if (expect_false (curpid)) /* penalise the forking check even more */ 2301 if (expect_false (curpid)) /* penalise the forking check even more */
2255 if (expect_false (getpid () != curpid)) 2302 if (expect_false (getpid () != curpid))
2267 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2314 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2268 EV_INVOKE_PENDING; 2315 EV_INVOKE_PENDING;
2269 } 2316 }
2270#endif 2317#endif
2271 2318
2319#if EV_PREPARE_ENABLE
2272 /* queue prepare watchers (and execute them) */ 2320 /* queue prepare watchers (and execute them) */
2273 if (expect_false (preparecnt)) 2321 if (expect_false (preparecnt))
2274 { 2322 {
2275 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2323 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2276 EV_INVOKE_PENDING; 2324 EV_INVOKE_PENDING;
2277 } 2325 }
2326#endif
2278 2327
2279 if (expect_false (loop_done)) 2328 if (expect_false (loop_done))
2280 break; 2329 break;
2281 2330
2282 /* we might have forked, so reify kernel state if necessary */ 2331 /* we might have forked, so reify kernel state if necessary */
2333 waittime -= sleeptime; 2382 waittime -= sleeptime;
2334 } 2383 }
2335 } 2384 }
2336 } 2385 }
2337 2386
2338#if EV_MINIMAL < 2 2387#if EV_FEATURE_API
2339 ++loop_count; 2388 ++loop_count;
2340#endif 2389#endif
2341 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2390 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2342 backend_poll (EV_A_ waittime); 2391 backend_poll (EV_A_ waittime);
2343 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2392 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2355#if EV_IDLE_ENABLE 2404#if EV_IDLE_ENABLE
2356 /* queue idle watchers unless other events are pending */ 2405 /* queue idle watchers unless other events are pending */
2357 idle_reify (EV_A); 2406 idle_reify (EV_A);
2358#endif 2407#endif
2359 2408
2409#if EV_CHECK_ENABLE
2360 /* queue check watchers, to be executed first */ 2410 /* queue check watchers, to be executed first */
2361 if (expect_false (checkcnt)) 2411 if (expect_false (checkcnt))
2362 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2412 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2413#endif
2363 2414
2364 EV_INVOKE_PENDING; 2415 EV_INVOKE_PENDING;
2365 } 2416 }
2366 while (expect_true ( 2417 while (expect_true (
2367 activecnt 2418 activecnt
2370 )); 2421 ));
2371 2422
2372 if (loop_done == EVUNLOOP_ONE) 2423 if (loop_done == EVUNLOOP_ONE)
2373 loop_done = EVUNLOOP_CANCEL; 2424 loop_done = EVUNLOOP_CANCEL;
2374 2425
2375#if EV_MINIMAL < 2 2426#if EV_FEATURE_API
2376 --loop_depth; 2427 --loop_depth;
2377#endif 2428#endif
2378} 2429}
2379 2430
2380void 2431void
2506 2557
2507 if (expect_false (ev_is_active (w))) 2558 if (expect_false (ev_is_active (w)))
2508 return; 2559 return;
2509 2560
2510 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2561 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2511 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2562 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2512 2563
2513 EV_FREQUENT_CHECK; 2564 EV_FREQUENT_CHECK;
2514 2565
2515 ev_start (EV_A_ (W)w, 1); 2566 ev_start (EV_A_ (W)w, 1);
2516 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2567 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2586 timers [active] = timers [timercnt + HEAP0]; 2637 timers [active] = timers [timercnt + HEAP0];
2587 adjustheap (timers, timercnt, active); 2638 adjustheap (timers, timercnt, active);
2588 } 2639 }
2589 } 2640 }
2590 2641
2591 EV_FREQUENT_CHECK;
2592
2593 ev_at (w) -= mn_now; 2642 ev_at (w) -= mn_now;
2594 2643
2595 ev_stop (EV_A_ (W)w); 2644 ev_stop (EV_A_ (W)w);
2645
2646 EV_FREQUENT_CHECK;
2596} 2647}
2597 2648
2598void noinline 2649void noinline
2599ev_timer_again (EV_P_ ev_timer *w) 2650ev_timer_again (EV_P_ ev_timer *w)
2600{ 2651{
2679 periodics [active] = periodics [periodiccnt + HEAP0]; 2730 periodics [active] = periodics [periodiccnt + HEAP0];
2680 adjustheap (periodics, periodiccnt, active); 2731 adjustheap (periodics, periodiccnt, active);
2681 } 2732 }
2682 } 2733 }
2683 2734
2684 EV_FREQUENT_CHECK;
2685
2686 ev_stop (EV_A_ (W)w); 2735 ev_stop (EV_A_ (W)w);
2736
2737 EV_FREQUENT_CHECK;
2687} 2738}
2688 2739
2689void noinline 2740void noinline
2690ev_periodic_again (EV_P_ ev_periodic *w) 2741ev_periodic_again (EV_P_ ev_periodic *w)
2691{ 2742{
2696#endif 2747#endif
2697 2748
2698#ifndef SA_RESTART 2749#ifndef SA_RESTART
2699# define SA_RESTART 0 2750# define SA_RESTART 0
2700#endif 2751#endif
2752
2753#if EV_SIGNAL_ENABLE
2701 2754
2702void noinline 2755void noinline
2703ev_signal_start (EV_P_ ev_signal *w) 2756ev_signal_start (EV_P_ ev_signal *w)
2704{ 2757{
2705 if (expect_false (ev_is_active (w))) 2758 if (expect_false (ev_is_active (w)))
2752 if (!((WL)w)->next) 2805 if (!((WL)w)->next)
2753# if EV_USE_SIGNALFD 2806# if EV_USE_SIGNALFD
2754 if (sigfd < 0) /*TODO*/ 2807 if (sigfd < 0) /*TODO*/
2755# endif 2808# endif
2756 { 2809 {
2757# if _WIN32 2810# ifdef _WIN32
2811 evpipe_init (EV_A);
2812
2758 signal (w->signum, ev_sighandler); 2813 signal (w->signum, ev_sighandler);
2759# else 2814# else
2760 struct sigaction sa; 2815 struct sigaction sa;
2761 2816
2762 evpipe_init (EV_A); 2817 evpipe_init (EV_A);
2793 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2848 signals [w->signum - 1].loop = 0; /* unattach from signal */
2794#endif 2849#endif
2795#if EV_USE_SIGNALFD 2850#if EV_USE_SIGNALFD
2796 if (sigfd >= 0) 2851 if (sigfd >= 0)
2797 { 2852 {
2798 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2853 sigset_t ss;
2854
2855 sigemptyset (&ss);
2856 sigaddset (&ss, w->signum);
2799 sigdelset (&sigfd_set, w->signum); 2857 sigdelset (&sigfd_set, w->signum);
2858
2800 signalfd (sigfd, &sigfd_set, 0); 2859 signalfd (sigfd, &sigfd_set, 0);
2801 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2860 sigprocmask (SIG_UNBLOCK, &ss, 0);
2802 /*TODO: maybe unblock signal? */
2803 } 2861 }
2804 else 2862 else
2805#endif 2863#endif
2806 signal (w->signum, SIG_DFL); 2864 signal (w->signum, SIG_DFL);
2807 } 2865 }
2808 2866
2809 EV_FREQUENT_CHECK; 2867 EV_FREQUENT_CHECK;
2810} 2868}
2811 2869
2870#endif
2871
2872#if EV_CHILD_ENABLE
2873
2812void 2874void
2813ev_child_start (EV_P_ ev_child *w) 2875ev_child_start (EV_P_ ev_child *w)
2814{ 2876{
2815#if EV_MULTIPLICITY 2877#if EV_MULTIPLICITY
2816 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2878 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2819 return; 2881 return;
2820 2882
2821 EV_FREQUENT_CHECK; 2883 EV_FREQUENT_CHECK;
2822 2884
2823 ev_start (EV_A_ (W)w, 1); 2885 ev_start (EV_A_ (W)w, 1);
2824 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2886 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2825 2887
2826 EV_FREQUENT_CHECK; 2888 EV_FREQUENT_CHECK;
2827} 2889}
2828 2890
2829void 2891void
2833 if (expect_false (!ev_is_active (w))) 2895 if (expect_false (!ev_is_active (w)))
2834 return; 2896 return;
2835 2897
2836 EV_FREQUENT_CHECK; 2898 EV_FREQUENT_CHECK;
2837 2899
2838 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2900 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2839 ev_stop (EV_A_ (W)w); 2901 ev_stop (EV_A_ (W)w);
2840 2902
2841 EV_FREQUENT_CHECK; 2903 EV_FREQUENT_CHECK;
2842} 2904}
2905
2906#endif
2843 2907
2844#if EV_STAT_ENABLE 2908#if EV_STAT_ENABLE
2845 2909
2846# ifdef _WIN32 2910# ifdef _WIN32
2847# undef lstat 2911# undef lstat
2853#define MIN_STAT_INTERVAL 0.1074891 2917#define MIN_STAT_INTERVAL 0.1074891
2854 2918
2855static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2919static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2856 2920
2857#if EV_USE_INOTIFY 2921#if EV_USE_INOTIFY
2858# define EV_INOTIFY_BUFSIZE 8192 2922
2923/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2924# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2859 2925
2860static void noinline 2926static void noinline
2861infy_add (EV_P_ ev_stat *w) 2927infy_add (EV_P_ ev_stat *w)
2862{ 2928{
2863 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); 2929 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);
2864 2930
2865 if (w->wd < 0) 2931 if (w->wd >= 0)
2932 {
2933 struct statfs sfs;
2934
2935 /* now local changes will be tracked by inotify, but remote changes won't */
2936 /* unless the filesystem is known to be local, we therefore still poll */
2937 /* also do poll on <2.6.25, but with normal frequency */
2938
2939 if (!fs_2625)
2940 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2941 else if (!statfs (w->path, &sfs)
2942 && (sfs.f_type == 0x1373 /* devfs */
2943 || sfs.f_type == 0xEF53 /* ext2/3 */
2944 || sfs.f_type == 0x3153464a /* jfs */
2945 || sfs.f_type == 0x52654973 /* reiser3 */
2946 || sfs.f_type == 0x01021994 /* tempfs */
2947 || sfs.f_type == 0x58465342 /* xfs */))
2948 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2949 else
2950 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2866 { 2951 }
2952 else
2953 {
2954 /* can't use inotify, continue to stat */
2867 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2955 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2868 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2869 2956
2870 /* monitor some parent directory for speedup hints */ 2957 /* if path is not there, monitor some parent directory for speedup hints */
2871 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2958 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2872 /* but an efficiency issue only */ 2959 /* but an efficiency issue only */
2873 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2960 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2874 { 2961 {
2875 char path [4096]; 2962 char path [4096];
2891 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2978 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2892 } 2979 }
2893 } 2980 }
2894 2981
2895 if (w->wd >= 0) 2982 if (w->wd >= 0)
2896 {
2897 struct statfs sfs;
2898
2899 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2983 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2900 2984
2901 /* now local changes will be tracked by inotify, but remote changes won't */ 2985 /* now re-arm timer, if required */
2902 /* unless the filesystem it known to be local, we therefore still poll */ 2986 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2903 /* also do poll on <2.6.25, but with normal frequency */
2904
2905 if (fs_2625 && !statfs (w->path, &sfs))
2906 if (sfs.f_type == 0x1373 /* devfs */
2907 || sfs.f_type == 0xEF53 /* ext2/3 */
2908 || sfs.f_type == 0x3153464a /* jfs */
2909 || sfs.f_type == 0x52654973 /* reiser3 */
2910 || sfs.f_type == 0x01021994 /* tempfs */
2911 || sfs.f_type == 0x58465342 /* xfs */)
2912 return;
2913
2914 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2915 ev_timer_again (EV_A_ &w->timer); 2987 ev_timer_again (EV_A_ &w->timer);
2916 } 2988 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2917} 2989}
2918 2990
2919static void noinline 2991static void noinline
2920infy_del (EV_P_ ev_stat *w) 2992infy_del (EV_P_ ev_stat *w)
2921{ 2993{
2924 2996
2925 if (wd < 0) 2997 if (wd < 0)
2926 return; 2998 return;
2927 2999
2928 w->wd = -2; 3000 w->wd = -2;
2929 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3001 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2930 wlist_del (&fs_hash [slot].head, (WL)w); 3002 wlist_del (&fs_hash [slot].head, (WL)w);
2931 3003
2932 /* remove this watcher, if others are watching it, they will rearm */ 3004 /* remove this watcher, if others are watching it, they will rearm */
2933 inotify_rm_watch (fs_fd, wd); 3005 inotify_rm_watch (fs_fd, wd);
2934} 3006}
2936static void noinline 3008static void noinline
2937infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3009infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2938{ 3010{
2939 if (slot < 0) 3011 if (slot < 0)
2940 /* overflow, need to check for all hash slots */ 3012 /* overflow, need to check for all hash slots */
2941 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3013 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2942 infy_wd (EV_A_ slot, wd, ev); 3014 infy_wd (EV_A_ slot, wd, ev);
2943 else 3015 else
2944 { 3016 {
2945 WL w_; 3017 WL w_;
2946 3018
2947 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3019 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2948 { 3020 {
2949 ev_stat *w = (ev_stat *)w_; 3021 ev_stat *w = (ev_stat *)w_;
2950 w_ = w_->next; /* lets us remove this watcher and all before it */ 3022 w_ = w_->next; /* lets us remove this watcher and all before it */
2951 3023
2952 if (w->wd == wd || wd == -1) 3024 if (w->wd == wd || wd == -1)
2953 { 3025 {
2954 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3026 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2955 { 3027 {
2956 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3028 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2957 w->wd = -1; 3029 w->wd = -1;
2958 infy_add (EV_A_ w); /* re-add, no matter what */ 3030 infy_add (EV_A_ w); /* re-add, no matter what */
2959 } 3031 }
2960 3032
2961 stat_timer_cb (EV_A_ &w->timer, 0); 3033 stat_timer_cb (EV_A_ &w->timer, 0);
2966 3038
2967static void 3039static void
2968infy_cb (EV_P_ ev_io *w, int revents) 3040infy_cb (EV_P_ ev_io *w, int revents)
2969{ 3041{
2970 char buf [EV_INOTIFY_BUFSIZE]; 3042 char buf [EV_INOTIFY_BUFSIZE];
2971 struct inotify_event *ev = (struct inotify_event *)buf;
2972 int ofs; 3043 int ofs;
2973 int len = read (fs_fd, buf, sizeof (buf)); 3044 int len = read (fs_fd, buf, sizeof (buf));
2974 3045
2975 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3046 for (ofs = 0; ofs < len; )
3047 {
3048 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2976 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3049 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3050 ofs += sizeof (struct inotify_event) + ev->len;
3051 }
3052}
3053
3054inline_size unsigned int
3055ev_linux_version (void)
3056{
3057 struct utsname buf;
3058 unsigned int v;
3059 int i;
3060 char *p = buf.release;
3061
3062 if (uname (&buf))
3063 return 0;
3064
3065 for (i = 3+1; --i; )
3066 {
3067 unsigned int c = 0;
3068
3069 for (;;)
3070 {
3071 if (*p >= '0' && *p <= '9')
3072 c = c * 10 + *p++ - '0';
3073 else
3074 {
3075 p += *p == '.';
3076 break;
3077 }
3078 }
3079
3080 v = (v << 8) | c;
3081 }
3082
3083 return v;
2977} 3084}
2978 3085
2979inline_size void 3086inline_size void
2980check_2625 (EV_P) 3087ev_check_2625 (EV_P)
2981{ 3088{
2982 /* kernels < 2.6.25 are borked 3089 /* kernels < 2.6.25 are borked
2983 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3090 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2984 */ 3091 */
2985 struct utsname buf; 3092 if (ev_linux_version () < 0x020619)
2986 int major, minor, micro;
2987
2988 if (uname (&buf))
2989 return; 3093 return;
2990 3094
2991 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2992 return;
2993
2994 if (major < 2
2995 || (major == 2 && minor < 6)
2996 || (major == 2 && minor == 6 && micro < 25))
2997 return;
2998
2999 fs_2625 = 1; 3095 fs_2625 = 1;
3096}
3097
3098inline_size int
3099infy_newfd (void)
3100{
3101#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3102 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3103 if (fd >= 0)
3104 return fd;
3105#endif
3106 return inotify_init ();
3000} 3107}
3001 3108
3002inline_size void 3109inline_size void
3003infy_init (EV_P) 3110infy_init (EV_P)
3004{ 3111{
3005 if (fs_fd != -2) 3112 if (fs_fd != -2)
3006 return; 3113 return;
3007 3114
3008 fs_fd = -1; 3115 fs_fd = -1;
3009 3116
3010 check_2625 (EV_A); 3117 ev_check_2625 (EV_A);
3011 3118
3012 fs_fd = inotify_init (); 3119 fs_fd = infy_newfd ();
3013 3120
3014 if (fs_fd >= 0) 3121 if (fs_fd >= 0)
3015 { 3122 {
3123 fd_intern (fs_fd);
3016 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3124 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
3017 ev_set_priority (&fs_w, EV_MAXPRI); 3125 ev_set_priority (&fs_w, EV_MAXPRI);
3018 ev_io_start (EV_A_ &fs_w); 3126 ev_io_start (EV_A_ &fs_w);
3127 ev_unref (EV_A);
3019 } 3128 }
3020} 3129}
3021 3130
3022inline_size void 3131inline_size void
3023infy_fork (EV_P) 3132infy_fork (EV_P)
3025 int slot; 3134 int slot;
3026 3135
3027 if (fs_fd < 0) 3136 if (fs_fd < 0)
3028 return; 3137 return;
3029 3138
3139 ev_ref (EV_A);
3140 ev_io_stop (EV_A_ &fs_w);
3030 close (fs_fd); 3141 close (fs_fd);
3031 fs_fd = inotify_init (); 3142 fs_fd = infy_newfd ();
3032 3143
3144 if (fs_fd >= 0)
3145 {
3146 fd_intern (fs_fd);
3147 ev_io_set (&fs_w, fs_fd, EV_READ);
3148 ev_io_start (EV_A_ &fs_w);
3149 ev_unref (EV_A);
3150 }
3151
3033 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3152 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3034 { 3153 {
3035 WL w_ = fs_hash [slot].head; 3154 WL w_ = fs_hash [slot].head;
3036 fs_hash [slot].head = 0; 3155 fs_hash [slot].head = 0;
3037 3156
3038 while (w_) 3157 while (w_)
3043 w->wd = -1; 3162 w->wd = -1;
3044 3163
3045 if (fs_fd >= 0) 3164 if (fs_fd >= 0)
3046 infy_add (EV_A_ w); /* re-add, no matter what */ 3165 infy_add (EV_A_ w); /* re-add, no matter what */
3047 else 3166 else
3167 {
3168 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3169 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3048 ev_timer_again (EV_A_ &w->timer); 3170 ev_timer_again (EV_A_ &w->timer);
3171 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3172 }
3049 } 3173 }
3050 } 3174 }
3051} 3175}
3052 3176
3053#endif 3177#endif
3070static void noinline 3194static void noinline
3071stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3195stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3072{ 3196{
3073 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3197 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3074 3198
3075 /* we copy this here each the time so that */ 3199 ev_statdata prev = w->attr;
3076 /* prev has the old value when the callback gets invoked */
3077 w->prev = w->attr;
3078 ev_stat_stat (EV_A_ w); 3200 ev_stat_stat (EV_A_ w);
3079 3201
3080 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3202 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3081 if ( 3203 if (
3082 w->prev.st_dev != w->attr.st_dev 3204 prev.st_dev != w->attr.st_dev
3083 || w->prev.st_ino != w->attr.st_ino 3205 || prev.st_ino != w->attr.st_ino
3084 || w->prev.st_mode != w->attr.st_mode 3206 || prev.st_mode != w->attr.st_mode
3085 || w->prev.st_nlink != w->attr.st_nlink 3207 || prev.st_nlink != w->attr.st_nlink
3086 || w->prev.st_uid != w->attr.st_uid 3208 || prev.st_uid != w->attr.st_uid
3087 || w->prev.st_gid != w->attr.st_gid 3209 || prev.st_gid != w->attr.st_gid
3088 || w->prev.st_rdev != w->attr.st_rdev 3210 || prev.st_rdev != w->attr.st_rdev
3089 || w->prev.st_size != w->attr.st_size 3211 || prev.st_size != w->attr.st_size
3090 || w->prev.st_atime != w->attr.st_atime 3212 || prev.st_atime != w->attr.st_atime
3091 || w->prev.st_mtime != w->attr.st_mtime 3213 || prev.st_mtime != w->attr.st_mtime
3092 || w->prev.st_ctime != w->attr.st_ctime 3214 || prev.st_ctime != w->attr.st_ctime
3093 ) { 3215 ) {
3216 /* we only update w->prev on actual differences */
3217 /* in case we test more often than invoke the callback, */
3218 /* to ensure that prev is always different to attr */
3219 w->prev = prev;
3220
3094 #if EV_USE_INOTIFY 3221 #if EV_USE_INOTIFY
3095 if (fs_fd >= 0) 3222 if (fs_fd >= 0)
3096 { 3223 {
3097 infy_del (EV_A_ w); 3224 infy_del (EV_A_ w);
3098 infy_add (EV_A_ w); 3225 infy_add (EV_A_ w);
3123 3250
3124 if (fs_fd >= 0) 3251 if (fs_fd >= 0)
3125 infy_add (EV_A_ w); 3252 infy_add (EV_A_ w);
3126 else 3253 else
3127#endif 3254#endif
3255 {
3128 ev_timer_again (EV_A_ &w->timer); 3256 ev_timer_again (EV_A_ &w->timer);
3257 ev_unref (EV_A);
3258 }
3129 3259
3130 ev_start (EV_A_ (W)w, 1); 3260 ev_start (EV_A_ (W)w, 1);
3131 3261
3132 EV_FREQUENT_CHECK; 3262 EV_FREQUENT_CHECK;
3133} 3263}
3142 EV_FREQUENT_CHECK; 3272 EV_FREQUENT_CHECK;
3143 3273
3144#if EV_USE_INOTIFY 3274#if EV_USE_INOTIFY
3145 infy_del (EV_A_ w); 3275 infy_del (EV_A_ w);
3146#endif 3276#endif
3277
3278 if (ev_is_active (&w->timer))
3279 {
3280 ev_ref (EV_A);
3147 ev_timer_stop (EV_A_ &w->timer); 3281 ev_timer_stop (EV_A_ &w->timer);
3282 }
3148 3283
3149 ev_stop (EV_A_ (W)w); 3284 ev_stop (EV_A_ (W)w);
3150 3285
3151 EV_FREQUENT_CHECK; 3286 EV_FREQUENT_CHECK;
3152} 3287}
3197 3332
3198 EV_FREQUENT_CHECK; 3333 EV_FREQUENT_CHECK;
3199} 3334}
3200#endif 3335#endif
3201 3336
3337#if EV_PREPARE_ENABLE
3202void 3338void
3203ev_prepare_start (EV_P_ ev_prepare *w) 3339ev_prepare_start (EV_P_ ev_prepare *w)
3204{ 3340{
3205 if (expect_false (ev_is_active (w))) 3341 if (expect_false (ev_is_active (w)))
3206 return; 3342 return;
3232 3368
3233 ev_stop (EV_A_ (W)w); 3369 ev_stop (EV_A_ (W)w);
3234 3370
3235 EV_FREQUENT_CHECK; 3371 EV_FREQUENT_CHECK;
3236} 3372}
3373#endif
3237 3374
3375#if EV_CHECK_ENABLE
3238void 3376void
3239ev_check_start (EV_P_ ev_check *w) 3377ev_check_start (EV_P_ ev_check *w)
3240{ 3378{
3241 if (expect_false (ev_is_active (w))) 3379 if (expect_false (ev_is_active (w)))
3242 return; 3380 return;
3268 3406
3269 ev_stop (EV_A_ (W)w); 3407 ev_stop (EV_A_ (W)w);
3270 3408
3271 EV_FREQUENT_CHECK; 3409 EV_FREQUENT_CHECK;
3272} 3410}
3411#endif
3273 3412
3274#if EV_EMBED_ENABLE 3413#if EV_EMBED_ENABLE
3275void noinline 3414void noinline
3276ev_embed_sweep (EV_P_ ev_embed *w) 3415ev_embed_sweep (EV_P_ ev_embed *w)
3277{ 3416{
3372 3511
3373 ev_io_stop (EV_A_ &w->io); 3512 ev_io_stop (EV_A_ &w->io);
3374 ev_prepare_stop (EV_A_ &w->prepare); 3513 ev_prepare_stop (EV_A_ &w->prepare);
3375 ev_fork_stop (EV_A_ &w->fork); 3514 ev_fork_stop (EV_A_ &w->fork);
3376 3515
3516 ev_stop (EV_A_ (W)w);
3517
3377 EV_FREQUENT_CHECK; 3518 EV_FREQUENT_CHECK;
3378} 3519}
3379#endif 3520#endif
3380 3521
3381#if EV_FORK_ENABLE 3522#if EV_FORK_ENABLE
3507{ 3648{
3508 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3649 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3509 3650
3510 if (expect_false (!once)) 3651 if (expect_false (!once))
3511 { 3652 {
3512 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3653 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3513 return; 3654 return;
3514 } 3655 }
3515 3656
3516 once->cb = cb; 3657 once->cb = cb;
3517 once->arg = arg; 3658 once->arg = arg;
3604 if (types & EV_ASYNC) 3745 if (types & EV_ASYNC)
3605 for (i = asynccnt; i--; ) 3746 for (i = asynccnt; i--; )
3606 cb (EV_A_ EV_ASYNC, asyncs [i]); 3747 cb (EV_A_ EV_ASYNC, asyncs [i]);
3607#endif 3748#endif
3608 3749
3750#if EV_PREPARE_ENABLE
3609 if (types & EV_PREPARE) 3751 if (types & EV_PREPARE)
3610 for (i = preparecnt; i--; ) 3752 for (i = preparecnt; i--; )
3611#if EV_EMBED_ENABLE 3753# if EV_EMBED_ENABLE
3612 if (ev_cb (prepares [i]) != embed_prepare_cb) 3754 if (ev_cb (prepares [i]) != embed_prepare_cb)
3613#endif 3755# endif
3614 cb (EV_A_ EV_PREPARE, prepares [i]); 3756 cb (EV_A_ EV_PREPARE, prepares [i]);
3757#endif
3615 3758
3759#if EV_CHECK_ENABLE
3616 if (types & EV_CHECK) 3760 if (types & EV_CHECK)
3617 for (i = checkcnt; i--; ) 3761 for (i = checkcnt; i--; )
3618 cb (EV_A_ EV_CHECK, checks [i]); 3762 cb (EV_A_ EV_CHECK, checks [i]);
3763#endif
3619 3764
3765#if EV_SIGNAL_ENABLE
3620 if (types & EV_SIGNAL) 3766 if (types & EV_SIGNAL)
3621 for (i = 0; i < EV_NSIG - 1; ++i) 3767 for (i = 0; i < EV_NSIG - 1; ++i)
3622 for (wl = signals [i].head; wl; ) 3768 for (wl = signals [i].head; wl; )
3623 { 3769 {
3624 wn = wl->next; 3770 wn = wl->next;
3625 cb (EV_A_ EV_SIGNAL, wl); 3771 cb (EV_A_ EV_SIGNAL, wl);
3626 wl = wn; 3772 wl = wn;
3627 } 3773 }
3774#endif
3628 3775
3776#if EV_CHILD_ENABLE
3629 if (types & EV_CHILD) 3777 if (types & EV_CHILD)
3630 for (i = EV_PID_HASHSIZE; i--; ) 3778 for (i = (EV_PID_HASHSIZE); i--; )
3631 for (wl = childs [i]; wl; ) 3779 for (wl = childs [i]; wl; )
3632 { 3780 {
3633 wn = wl->next; 3781 wn = wl->next;
3634 cb (EV_A_ EV_CHILD, wl); 3782 cb (EV_A_ EV_CHILD, wl);
3635 wl = wn; 3783 wl = wn;
3636 } 3784 }
3785#endif
3637/* EV_STAT 0x00001000 /* stat data changed */ 3786/* EV_STAT 0x00001000 /* stat data changed */
3638/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3787/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3639} 3788}
3640#endif 3789#endif
3641 3790

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines