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

Comparing libev/ev.c (file contents):
Revision 1.289 by root, Sat Jun 6 11:13:16 2009 UTC vs.
Revision 1.332 by root, Tue Mar 9 08:58:17 2010 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
57# endif 57# endif
58# ifndef EV_USE_MONOTONIC 58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1 59# define EV_USE_MONOTONIC 1
60# endif 60# endif
61# endif 61# endif
62# elif !defined(EV_USE_CLOCK_SYSCALL)
63# define EV_USE_CLOCK_SYSCALL 0
62# endif 64# endif
63 65
64# if HAVE_CLOCK_GETTIME 66# if HAVE_CLOCK_GETTIME
65# ifndef EV_USE_MONOTONIC 67# ifndef EV_USE_MONOTONIC
66# define EV_USE_MONOTONIC 1 68# define EV_USE_MONOTONIC 1
108# define EV_USE_EPOLL 0 110# define EV_USE_EPOLL 0
109# endif 111# endif
110# endif 112# endif
111 113
112# ifndef EV_USE_KQUEUE 114# ifndef EV_USE_KQUEUE
113# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
114# define EV_USE_KQUEUE 1 116# define EV_USE_KQUEUE 1
115# else 117# else
116# define EV_USE_KQUEUE 0 118# define EV_USE_KQUEUE 0
117# endif 119# endif
118# endif 120# endif
131# else 133# else
132# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
133# endif 135# endif
134# endif 136# endif
135 137
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1
141# else
142# define EV_USE_SIGNALFD 0
143# endif
144# endif
145
136# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
137# if HAVE_EVENTFD 147# if HAVE_EVENTFD
138# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD 1
139# else 149# else
140# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
143 153
144#endif 154#endif
145 155
146#include <math.h> 156#include <math.h>
147#include <stdlib.h> 157#include <stdlib.h>
158#include <string.h>
148#include <fcntl.h> 159#include <fcntl.h>
149#include <stddef.h> 160#include <stddef.h>
150 161
151#include <stdio.h> 162#include <stdio.h>
152 163
153#include <assert.h> 164#include <assert.h>
154#include <errno.h> 165#include <errno.h>
155#include <sys/types.h> 166#include <sys/types.h>
156#include <time.h> 167#include <time.h>
168#include <limits.h>
157 169
158#include <signal.h> 170#include <signal.h>
159 171
160#ifdef EV_H 172#ifdef EV_H
161# include EV_H 173# include EV_H
172# define WIN32_LEAN_AND_MEAN 184# define WIN32_LEAN_AND_MEAN
173# include <windows.h> 185# include <windows.h>
174# ifndef EV_SELECT_IS_WINSOCKET 186# ifndef EV_SELECT_IS_WINSOCKET
175# define EV_SELECT_IS_WINSOCKET 1 187# define EV_SELECT_IS_WINSOCKET 1
176# endif 188# endif
189# undef EV_AVOID_STDIO
177#endif 190#endif
178 191
179/* 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 */
193
194/* try to deduce the maximum number of signals on this platform */
195#if defined (EV_NSIG)
196/* use what's provided */
197#elif defined (NSIG)
198# define EV_NSIG (NSIG)
199#elif defined(_NSIG)
200# define EV_NSIG (_NSIG)
201#elif defined (SIGMAX)
202# define EV_NSIG (SIGMAX+1)
203#elif defined (SIG_MAX)
204# define EV_NSIG (SIG_MAX+1)
205#elif defined (_SIG_MAX)
206# define EV_NSIG (_SIG_MAX+1)
207#elif defined (MAXSIG)
208# define EV_NSIG (MAXSIG+1)
209#elif defined (MAX_SIG)
210# define EV_NSIG (MAX_SIG+1)
211#elif defined (SIGARRAYSIZE)
212# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
213#elif defined (_sys_nsig)
214# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
215#else
216# error "unable to find value for NSIG, please report"
217/* to make it compile regardless, just remove the above line */
218# define EV_NSIG 65
219#endif
180 220
181#ifndef EV_USE_CLOCK_SYSCALL 221#ifndef EV_USE_CLOCK_SYSCALL
182# if __linux && __GLIBC__ >= 2 222# if __linux && __GLIBC__ >= 2
183# define EV_USE_CLOCK_SYSCALL 1 223# define EV_USE_CLOCK_SYSCALL 1
184# else 224# else
264# else 304# else
265# define EV_USE_EVENTFD 0 305# define EV_USE_EVENTFD 0
266# endif 306# endif
267#endif 307#endif
268 308
309#ifndef EV_USE_SIGNALFD
310# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
311# define EV_USE_SIGNALFD 1
312# else
313# define EV_USE_SIGNALFD 0
314# endif
315#endif
316
269#if 0 /* debugging */ 317#if 0 /* debugging */
270# define EV_VERIFY 3 318# define EV_VERIFY 3
271# define EV_USE_4HEAP 1 319# define EV_USE_4HEAP 1
272# define EV_HEAP_CACHE_AT 1 320# define EV_HEAP_CACHE_AT 1
273#endif 321#endif
282 330
283#ifndef EV_HEAP_CACHE_AT 331#ifndef EV_HEAP_CACHE_AT
284# define EV_HEAP_CACHE_AT !EV_MINIMAL 332# define EV_HEAP_CACHE_AT !EV_MINIMAL
285#endif 333#endif
286 334
335/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
336/* which makes programs even slower. might work on other unices, too. */
337#if EV_USE_CLOCK_SYSCALL
338# include <syscall.h>
339# ifdef SYS_clock_gettime
340# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
341# undef EV_USE_MONOTONIC
342# define EV_USE_MONOTONIC 1
343# else
344# undef EV_USE_CLOCK_SYSCALL
345# define EV_USE_CLOCK_SYSCALL 0
346# endif
347#endif
348
287/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 349/* this block fixes any misconfiguration where we know we run into trouble otherwise */
350
351#ifdef _AIX
352/* AIX has a completely broken poll.h header */
353# undef EV_USE_POLL
354# define EV_USE_POLL 0
355#endif
288 356
289#ifndef CLOCK_MONOTONIC 357#ifndef CLOCK_MONOTONIC
290# undef EV_USE_MONOTONIC 358# undef EV_USE_MONOTONIC
291# define EV_USE_MONOTONIC 0 359# define EV_USE_MONOTONIC 0
292#endif 360#endif
320 388
321#if EV_SELECT_IS_WINSOCKET 389#if EV_SELECT_IS_WINSOCKET
322# include <winsock.h> 390# include <winsock.h>
323#endif 391#endif
324 392
325/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
326/* which makes programs even slower. might work on other unices, too. */
327#if EV_USE_CLOCK_SYSCALL
328# include <syscall.h>
329# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
330# undef EV_USE_MONOTONIC
331# define EV_USE_MONOTONIC 1
332#endif
333
334#if EV_USE_EVENTFD 393#if EV_USE_EVENTFD
335/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 394/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
336# include <stdint.h> 395# include <stdint.h>
396# ifndef EFD_NONBLOCK
397# define EFD_NONBLOCK O_NONBLOCK
398# endif
399# ifndef EFD_CLOEXEC
400# ifdef O_CLOEXEC
401# define EFD_CLOEXEC O_CLOEXEC
402# else
403# define EFD_CLOEXEC 02000000
404# endif
405# endif
337# ifdef __cplusplus 406# ifdef __cplusplus
338extern "C" { 407extern "C" {
339# endif 408# endif
340int eventfd (unsigned int initval, int flags); 409int (eventfd) (unsigned int initval, int flags);
341# ifdef __cplusplus 410# ifdef __cplusplus
342} 411}
343# endif 412# endif
344#endif 413#endif
414
415#if EV_USE_SIGNALFD
416/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
417# include <stdint.h>
418# ifndef SFD_NONBLOCK
419# define SFD_NONBLOCK O_NONBLOCK
420# endif
421# ifndef SFD_CLOEXEC
422# ifdef O_CLOEXEC
423# define SFD_CLOEXEC O_CLOEXEC
424# else
425# define SFD_CLOEXEC 02000000
426# endif
427# endif
428# ifdef __cplusplus
429extern "C" {
430# endif
431int signalfd (int fd, const sigset_t *mask, int flags);
432
433struct signalfd_siginfo
434{
435 uint32_t ssi_signo;
436 char pad[128 - sizeof (uint32_t)];
437};
438# ifdef __cplusplus
439}
440# endif
441#endif
442
345 443
346/**/ 444/**/
347 445
348#if EV_VERIFY >= 3 446#if EV_VERIFY >= 3
349# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 447# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
361 */ 459 */
362#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 460#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
363 461
364#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 462#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
365#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 463#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
366/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
367 464
368#if __GNUC__ >= 4 465#if __GNUC__ >= 4
369# define expect(expr,value) __builtin_expect ((expr),(value)) 466# define expect(expr,value) __builtin_expect ((expr),(value))
370# define noinline __attribute__ ((noinline)) 467# define noinline __attribute__ ((noinline))
371#else 468#else
384# define inline_speed static noinline 481# define inline_speed static noinline
385#else 482#else
386# define inline_speed static inline 483# define inline_speed static inline
387#endif 484#endif
388 485
389#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 486#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
487
488#if EV_MINPRI == EV_MAXPRI
489# define ABSPRI(w) (((W)w), 0)
490#else
390#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 491# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
492#endif
391 493
392#define EMPTY /* required for microsofts broken pseudo-c compiler */ 494#define EMPTY /* required for microsofts broken pseudo-c compiler */
393#define EMPTY2(a,b) /* used to suppress some warnings */ 495#define EMPTY2(a,b) /* used to suppress some warnings */
394 496
395typedef ev_watcher *W; 497typedef ev_watcher *W;
407 509
408#if EV_USE_MONOTONIC 510#if EV_USE_MONOTONIC
409static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 511static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
410#endif 512#endif
411 513
514#ifndef EV_FD_TO_WIN32_HANDLE
515# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
516#endif
517#ifndef EV_WIN32_HANDLE_TO_FD
518# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
519#endif
520#ifndef EV_WIN32_CLOSE_FD
521# define EV_WIN32_CLOSE_FD(fd) close (fd)
522#endif
523
412#ifdef _WIN32 524#ifdef _WIN32
413# include "ev_win32.c" 525# include "ev_win32.c"
414#endif 526#endif
415 527
416/*****************************************************************************/ 528/*****************************************************************************/
529
530#if EV_AVOID_STDIO
531static void noinline
532ev_printerr (const char *msg)
533{
534 write (STDERR_FILENO, msg, strlen (msg));
535}
536#endif
417 537
418static void (*syserr_cb)(const char *msg); 538static void (*syserr_cb)(const char *msg);
419 539
420void 540void
421ev_set_syserr_cb (void (*cb)(const char *msg)) 541ev_set_syserr_cb (void (*cb)(const char *msg))
431 551
432 if (syserr_cb) 552 if (syserr_cb)
433 syserr_cb (msg); 553 syserr_cb (msg);
434 else 554 else
435 { 555 {
556#if EV_AVOID_STDIO
557 const char *err = strerror (errno);
558
559 ev_printerr (msg);
560 ev_printerr (": ");
561 ev_printerr (err);
562 ev_printerr ("\n");
563#else
436 perror (msg); 564 perror (msg);
565#endif
437 abort (); 566 abort ();
438 } 567 }
439} 568}
440 569
441static void * 570static void *
443{ 572{
444 /* some systems, notably openbsd and darwin, fail to properly 573 /* some systems, notably openbsd and darwin, fail to properly
445 * implement realloc (x, 0) (as required by both ansi c-98 and 574 * implement realloc (x, 0) (as required by both ansi c-98 and
446 * the single unix specification, so work around them here. 575 * the single unix specification, so work around them here.
447 */ 576 */
448
449 if (size) 577 if (size)
450 return realloc (ptr, size); 578 return realloc (ptr, size);
451 579
452 free (ptr); 580 free (ptr);
453 return 0; 581 return 0;
466{ 594{
467 ptr = alloc (ptr, size); 595 ptr = alloc (ptr, size);
468 596
469 if (!ptr && size) 597 if (!ptr && size)
470 { 598 {
599#if EV_AVOID_STDIO
600 ev_printerr ("libev: memory allocation failed, aborting.\n");
601#else
471 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 602 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
603#endif
472 abort (); 604 abort ();
473 } 605 }
474 606
475 return ptr; 607 return ptr;
476} 608}
478#define ev_malloc(size) ev_realloc (0, (size)) 610#define ev_malloc(size) ev_realloc (0, (size))
479#define ev_free(ptr) ev_realloc ((ptr), 0) 611#define ev_free(ptr) ev_realloc ((ptr), 0)
480 612
481/*****************************************************************************/ 613/*****************************************************************************/
482 614
615/* set in reify when reification needed */
616#define EV_ANFD_REIFY 1
617
483/* file descriptor info structure */ 618/* file descriptor info structure */
484typedef struct 619typedef struct
485{ 620{
486 WL head; 621 WL head;
487 unsigned char events; /* the events watched for */ 622 unsigned char events; /* the events watched for */
488 unsigned char reify; /* flag set when this ANFD needs reification */ 623 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
489 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 624 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
490 unsigned char unused; 625 unsigned char unused;
491#if EV_USE_EPOLL 626#if EV_USE_EPOLL
492 unsigned int egen; /* generation counter to counter epoll bugs */ 627 unsigned int egen; /* generation counter to counter epoll bugs */
493#endif 628#endif
555 690
556 static int ev_default_loop_ptr; 691 static int ev_default_loop_ptr;
557 692
558#endif 693#endif
559 694
695#if EV_MINIMAL < 2
696# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
697# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
698# define EV_INVOKE_PENDING invoke_cb (EV_A)
699#else
700# define EV_RELEASE_CB (void)0
701# define EV_ACQUIRE_CB (void)0
702# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
703#endif
704
705#define EVUNLOOP_RECURSE 0x80
706
560/*****************************************************************************/ 707/*****************************************************************************/
561 708
709#ifndef EV_HAVE_EV_TIME
562ev_tstamp 710ev_tstamp
563ev_time (void) 711ev_time (void)
564{ 712{
565#if EV_USE_REALTIME 713#if EV_USE_REALTIME
566 if (expect_true (have_realtime)) 714 if (expect_true (have_realtime))
573 721
574 struct timeval tv; 722 struct timeval tv;
575 gettimeofday (&tv, 0); 723 gettimeofday (&tv, 0);
576 return tv.tv_sec + tv.tv_usec * 1e-6; 724 return tv.tv_sec + tv.tv_usec * 1e-6;
577} 725}
726#endif
578 727
579inline_size ev_tstamp 728inline_size ev_tstamp
580get_clock (void) 729get_clock (void)
581{ 730{
582#if EV_USE_MONOTONIC 731#if EV_USE_MONOTONIC
618 767
619 tv.tv_sec = (time_t)delay; 768 tv.tv_sec = (time_t)delay;
620 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 769 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
621 770
622 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 771 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
623 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 772 /* something not guaranteed by newer posix versions, but guaranteed */
624 /* by older ones */ 773 /* by older ones */
625 select (0, 0, 0, 0, &tv); 774 select (0, 0, 0, 0, &tv);
626#endif 775#endif
627 } 776 }
628} 777}
736} 885}
737 886
738/*****************************************************************************/ 887/*****************************************************************************/
739 888
740inline_speed void 889inline_speed void
741fd_event (EV_P_ int fd, int revents) 890fd_event_nc (EV_P_ int fd, int revents)
742{ 891{
743 ANFD *anfd = anfds + fd; 892 ANFD *anfd = anfds + fd;
744 ev_io *w; 893 ev_io *w;
745 894
746 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 895 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
750 if (ev) 899 if (ev)
751 ev_feed_event (EV_A_ (W)w, ev); 900 ev_feed_event (EV_A_ (W)w, ev);
752 } 901 }
753} 902}
754 903
904/* do not submit kernel events for fds that have reify set */
905/* because that means they changed while we were polling for new events */
906inline_speed void
907fd_event (EV_P_ int fd, int revents)
908{
909 ANFD *anfd = anfds + fd;
910
911 if (expect_true (!anfd->reify))
912 fd_event_nc (EV_A_ fd, revents);
913}
914
755void 915void
756ev_feed_fd_event (EV_P_ int fd, int revents) 916ev_feed_fd_event (EV_P_ int fd, int revents)
757{ 917{
758 if (fd >= 0 && fd < anfdmax) 918 if (fd >= 0 && fd < anfdmax)
759 fd_event (EV_A_ fd, revents); 919 fd_event_nc (EV_A_ fd, revents);
760} 920}
761 921
762/* make sure the external fd watch events are in-sync */ 922/* make sure the external fd watch events are in-sync */
763/* with the kernel/libev internal state */ 923/* with the kernel/libev internal state */
764inline_size void 924inline_size void
779 939
780#if EV_SELECT_IS_WINSOCKET 940#if EV_SELECT_IS_WINSOCKET
781 if (events) 941 if (events)
782 { 942 {
783 unsigned long arg; 943 unsigned long arg;
784 #ifdef EV_FD_TO_WIN32_HANDLE
785 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 944 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
786 #else
787 anfd->handle = _get_osfhandle (fd);
788 #endif
789 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 945 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
790 } 946 }
791#endif 947#endif
792 948
793 { 949 {
836/* check whether the given fd is atcually valid, for error recovery */ 992/* check whether the given fd is atcually valid, for error recovery */
837inline_size int 993inline_size int
838fd_valid (int fd) 994fd_valid (int fd)
839{ 995{
840#ifdef _WIN32 996#ifdef _WIN32
841 return _get_osfhandle (fd) != -1; 997 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
842#else 998#else
843 return fcntl (fd, F_GETFD) != -1; 999 return fcntl (fd, F_GETFD) != -1;
844#endif 1000#endif
845} 1001}
846 1002
864 1020
865 for (fd = anfdmax; fd--; ) 1021 for (fd = anfdmax; fd--; )
866 if (anfds [fd].events) 1022 if (anfds [fd].events)
867 { 1023 {
868 fd_kill (EV_A_ fd); 1024 fd_kill (EV_A_ fd);
869 return; 1025 break;
870 } 1026 }
871} 1027}
872 1028
873/* usually called after fork if backend needs to re-arm all fds from scratch */ 1029/* usually called after fork if backend needs to re-arm all fds from scratch */
874static void noinline 1030static void noinline
879 for (fd = 0; fd < anfdmax; ++fd) 1035 for (fd = 0; fd < anfdmax; ++fd)
880 if (anfds [fd].events) 1036 if (anfds [fd].events)
881 { 1037 {
882 anfds [fd].events = 0; 1038 anfds [fd].events = 0;
883 anfds [fd].emask = 0; 1039 anfds [fd].emask = 0;
884 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1040 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
885 } 1041 }
886} 1042}
887 1043
888/*****************************************************************************/ 1044/*****************************************************************************/
889 1045
964 1120
965 for (;;) 1121 for (;;)
966 { 1122 {
967 int c = k << 1; 1123 int c = k << 1;
968 1124
969 if (c > N + HEAP0 - 1) 1125 if (c >= N + HEAP0)
970 break; 1126 break;
971 1127
972 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1128 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
973 ? 1 : 0; 1129 ? 1 : 0;
974 1130
1010 1166
1011/* move an element suitably so it is in a correct place */ 1167/* move an element suitably so it is in a correct place */
1012inline_size void 1168inline_size void
1013adjustheap (ANHE *heap, int N, int k) 1169adjustheap (ANHE *heap, int N, int k)
1014{ 1170{
1015 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1171 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1016 upheap (heap, k); 1172 upheap (heap, k);
1017 else 1173 else
1018 downheap (heap, N, k); 1174 downheap (heap, N, k);
1019} 1175}
1020 1176
1033/*****************************************************************************/ 1189/*****************************************************************************/
1034 1190
1035/* associate signal watchers to a signal signal */ 1191/* associate signal watchers to a signal signal */
1036typedef struct 1192typedef struct
1037{ 1193{
1194 EV_ATOMIC_T pending;
1195#if EV_MULTIPLICITY
1196 EV_P;
1197#endif
1038 WL head; 1198 WL head;
1039 EV_ATOMIC_T gotsig;
1040} ANSIG; 1199} ANSIG;
1041 1200
1042static ANSIG *signals; 1201static ANSIG signals [EV_NSIG - 1];
1043static int signalmax;
1044
1045static EV_ATOMIC_T gotsig;
1046 1202
1047/*****************************************************************************/ 1203/*****************************************************************************/
1048 1204
1049/* used to prepare libev internal fd's */ 1205/* used to prepare libev internal fd's */
1050/* this is not fork-safe */ 1206/* this is not fork-safe */
1051inline_speed void 1207inline_speed void
1052fd_intern (int fd) 1208fd_intern (int fd)
1053{ 1209{
1054#ifdef _WIN32 1210#ifdef _WIN32
1055 unsigned long arg = 1; 1211 unsigned long arg = 1;
1056 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1212 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1057#else 1213#else
1058 fcntl (fd, F_SETFD, FD_CLOEXEC); 1214 fcntl (fd, F_SETFD, FD_CLOEXEC);
1059 fcntl (fd, F_SETFL, O_NONBLOCK); 1215 fcntl (fd, F_SETFL, O_NONBLOCK);
1060#endif 1216#endif
1061} 1217}
1064evpipe_init (EV_P) 1220evpipe_init (EV_P)
1065{ 1221{
1066 if (!ev_is_active (&pipe_w)) 1222 if (!ev_is_active (&pipe_w))
1067 { 1223 {
1068#if EV_USE_EVENTFD 1224#if EV_USE_EVENTFD
1225 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1226 if (evfd < 0 && errno == EINVAL)
1069 if ((evfd = eventfd (0, 0)) >= 0) 1227 evfd = eventfd (0, 0);
1228
1229 if (evfd >= 0)
1070 { 1230 {
1071 evpipe [0] = -1; 1231 evpipe [0] = -1;
1072 fd_intern (evfd); 1232 fd_intern (evfd); /* doing it twice doesn't hurt */
1073 ev_io_set (&pipe_w, evfd, EV_READ); 1233 ev_io_set (&pipe_w, evfd, EV_READ);
1074 } 1234 }
1075 else 1235 else
1076#endif 1236#endif
1077 { 1237 {
1114/* called whenever the libev signal pipe */ 1274/* called whenever the libev signal pipe */
1115/* got some events (signal, async) */ 1275/* got some events (signal, async) */
1116static void 1276static void
1117pipecb (EV_P_ ev_io *iow, int revents) 1277pipecb (EV_P_ ev_io *iow, int revents)
1118{ 1278{
1279 int i;
1280
1119#if EV_USE_EVENTFD 1281#if EV_USE_EVENTFD
1120 if (evfd >= 0) 1282 if (evfd >= 0)
1121 { 1283 {
1122 uint64_t counter; 1284 uint64_t counter;
1123 read (evfd, &counter, sizeof (uint64_t)); 1285 read (evfd, &counter, sizeof (uint64_t));
1127 { 1289 {
1128 char dummy; 1290 char dummy;
1129 read (evpipe [0], &dummy, 1); 1291 read (evpipe [0], &dummy, 1);
1130 } 1292 }
1131 1293
1132 if (gotsig && ev_is_default_loop (EV_A)) 1294 if (sig_pending)
1133 { 1295 {
1134 int signum; 1296 sig_pending = 0;
1135 gotsig = 0;
1136 1297
1137 for (signum = signalmax; signum--; ) 1298 for (i = EV_NSIG - 1; i--; )
1138 if (signals [signum].gotsig) 1299 if (expect_false (signals [i].pending))
1139 ev_feed_signal_event (EV_A_ signum + 1); 1300 ev_feed_signal_event (EV_A_ i + 1);
1140 } 1301 }
1141 1302
1142#if EV_ASYNC_ENABLE 1303#if EV_ASYNC_ENABLE
1143 if (gotasync) 1304 if (async_pending)
1144 { 1305 {
1145 int i; 1306 async_pending = 0;
1146 gotasync = 0;
1147 1307
1148 for (i = asynccnt; i--; ) 1308 for (i = asynccnt; i--; )
1149 if (asyncs [i]->sent) 1309 if (asyncs [i]->sent)
1150 { 1310 {
1151 asyncs [i]->sent = 0; 1311 asyncs [i]->sent = 0;
1159 1319
1160static void 1320static void
1161ev_sighandler (int signum) 1321ev_sighandler (int signum)
1162{ 1322{
1163#if EV_MULTIPLICITY 1323#if EV_MULTIPLICITY
1164 struct ev_loop *loop = &default_loop_struct; 1324 EV_P = signals [signum - 1].loop;
1165#endif 1325#endif
1166 1326
1167#if _WIN32 1327#ifdef _WIN32
1168 signal (signum, ev_sighandler); 1328 signal (signum, ev_sighandler);
1169#endif 1329#endif
1170 1330
1171 signals [signum - 1].gotsig = 1; 1331 signals [signum - 1].pending = 1;
1172 evpipe_write (EV_A_ &gotsig); 1332 evpipe_write (EV_A_ &sig_pending);
1173} 1333}
1174 1334
1175void noinline 1335void noinline
1176ev_feed_signal_event (EV_P_ int signum) 1336ev_feed_signal_event (EV_P_ int signum)
1177{ 1337{
1178 WL w; 1338 WL w;
1179 1339
1340 if (expect_false (signum <= 0 || signum > EV_NSIG))
1341 return;
1342
1343 --signum;
1344
1180#if EV_MULTIPLICITY 1345#if EV_MULTIPLICITY
1181 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1346 /* it is permissible to try to feed a signal to the wrong loop */
1182#endif 1347 /* or, likely more useful, feeding a signal nobody is waiting for */
1183 1348
1184 --signum; 1349 if (expect_false (signals [signum].loop != EV_A))
1185
1186 if (signum < 0 || signum >= signalmax)
1187 return; 1350 return;
1351#endif
1188 1352
1189 signals [signum].gotsig = 0; 1353 signals [signum].pending = 0;
1190 1354
1191 for (w = signals [signum].head; w; w = w->next) 1355 for (w = signals [signum].head; w; w = w->next)
1192 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1356 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1193} 1357}
1358
1359#if EV_USE_SIGNALFD
1360static void
1361sigfdcb (EV_P_ ev_io *iow, int revents)
1362{
1363 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1364
1365 for (;;)
1366 {
1367 ssize_t res = read (sigfd, si, sizeof (si));
1368
1369 /* not ISO-C, as res might be -1, but works with SuS */
1370 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1371 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1372
1373 if (res < (ssize_t)sizeof (si))
1374 break;
1375 }
1376}
1377#endif
1194 1378
1195/*****************************************************************************/ 1379/*****************************************************************************/
1196 1380
1197static WL childs [EV_PID_HASHSIZE]; 1381static WL childs [EV_PID_HASHSIZE];
1198 1382
1343ev_backend (EV_P) 1527ev_backend (EV_P)
1344{ 1528{
1345 return backend; 1529 return backend;
1346} 1530}
1347 1531
1532#if EV_MINIMAL < 2
1348unsigned int 1533unsigned int
1349ev_loop_count (EV_P) 1534ev_loop_count (EV_P)
1350{ 1535{
1351 return loop_count; 1536 return loop_count;
1352} 1537}
1353 1538
1539unsigned int
1540ev_loop_depth (EV_P)
1541{
1542 return loop_depth;
1543}
1544
1354void 1545void
1355ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1546ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1356{ 1547{
1357 io_blocktime = interval; 1548 io_blocktime = interval;
1358} 1549}
1360void 1551void
1361ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1552ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1362{ 1553{
1363 timeout_blocktime = interval; 1554 timeout_blocktime = interval;
1364} 1555}
1556
1557void
1558ev_set_userdata (EV_P_ void *data)
1559{
1560 userdata = data;
1561}
1562
1563void *
1564ev_userdata (EV_P)
1565{
1566 return userdata;
1567}
1568
1569void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1570{
1571 invoke_cb = invoke_pending_cb;
1572}
1573
1574void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1575{
1576 release_cb = release;
1577 acquire_cb = acquire;
1578}
1579#endif
1365 1580
1366/* initialise a loop structure, must be zero-initialised */ 1581/* initialise a loop structure, must be zero-initialised */
1367static void noinline 1582static void noinline
1368loop_init (EV_P_ unsigned int flags) 1583loop_init (EV_P_ unsigned int flags)
1369{ 1584{
1387 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1602 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1388 have_monotonic = 1; 1603 have_monotonic = 1;
1389 } 1604 }
1390#endif 1605#endif
1391 1606
1607 /* pid check not overridable via env */
1608#ifndef _WIN32
1609 if (flags & EVFLAG_FORKCHECK)
1610 curpid = getpid ();
1611#endif
1612
1613 if (!(flags & EVFLAG_NOENV)
1614 && !enable_secure ()
1615 && getenv ("LIBEV_FLAGS"))
1616 flags = atoi (getenv ("LIBEV_FLAGS"));
1617
1392 ev_rt_now = ev_time (); 1618 ev_rt_now = ev_time ();
1393 mn_now = get_clock (); 1619 mn_now = get_clock ();
1394 now_floor = mn_now; 1620 now_floor = mn_now;
1395 rtmn_diff = ev_rt_now - mn_now; 1621 rtmn_diff = ev_rt_now - mn_now;
1622#if EV_MINIMAL < 2
1623 invoke_cb = ev_invoke_pending;
1624#endif
1396 1625
1397 io_blocktime = 0.; 1626 io_blocktime = 0.;
1398 timeout_blocktime = 0.; 1627 timeout_blocktime = 0.;
1399 backend = 0; 1628 backend = 0;
1400 backend_fd = -1; 1629 backend_fd = -1;
1401 gotasync = 0; 1630 sig_pending = 0;
1631#if EV_ASYNC_ENABLE
1632 async_pending = 0;
1633#endif
1402#if EV_USE_INOTIFY 1634#if EV_USE_INOTIFY
1403 fs_fd = -2; 1635 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1404#endif 1636#endif
1405 1637#if EV_USE_SIGNALFD
1406 /* pid check not overridable via env */ 1638 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1407#ifndef _WIN32
1408 if (flags & EVFLAG_FORKCHECK)
1409 curpid = getpid ();
1410#endif 1639#endif
1411
1412 if (!(flags & EVFLAG_NOENV)
1413 && !enable_secure ()
1414 && getenv ("LIBEV_FLAGS"))
1415 flags = atoi (getenv ("LIBEV_FLAGS"));
1416 1640
1417 if (!(flags & 0x0000ffffU)) 1641 if (!(flags & 0x0000ffffU))
1418 flags |= ev_recommended_backends (); 1642 flags |= ev_recommended_backends ();
1419 1643
1420#if EV_USE_PORT 1644#if EV_USE_PORT
1446{ 1670{
1447 int i; 1671 int i;
1448 1672
1449 if (ev_is_active (&pipe_w)) 1673 if (ev_is_active (&pipe_w))
1450 { 1674 {
1451 ev_ref (EV_A); /* signal watcher */ 1675 /*ev_ref (EV_A);*/
1452 ev_io_stop (EV_A_ &pipe_w); 1676 /*ev_io_stop (EV_A_ &pipe_w);*/
1453 1677
1454#if EV_USE_EVENTFD 1678#if EV_USE_EVENTFD
1455 if (evfd >= 0) 1679 if (evfd >= 0)
1456 close (evfd); 1680 close (evfd);
1457#endif 1681#endif
1458 1682
1459 if (evpipe [0] >= 0) 1683 if (evpipe [0] >= 0)
1460 { 1684 {
1461 close (evpipe [0]); 1685 EV_WIN32_CLOSE_FD (evpipe [0]);
1462 close (evpipe [1]); 1686 EV_WIN32_CLOSE_FD (evpipe [1]);
1463 } 1687 }
1464 } 1688 }
1689
1690#if EV_USE_SIGNALFD
1691 if (ev_is_active (&sigfd_w))
1692 close (sigfd);
1693#endif
1465 1694
1466#if EV_USE_INOTIFY 1695#if EV_USE_INOTIFY
1467 if (fs_fd >= 0) 1696 if (fs_fd >= 0)
1468 close (fs_fd); 1697 close (fs_fd);
1469#endif 1698#endif
1493#if EV_IDLE_ENABLE 1722#if EV_IDLE_ENABLE
1494 array_free (idle, [i]); 1723 array_free (idle, [i]);
1495#endif 1724#endif
1496 } 1725 }
1497 1726
1498 ev_free (anfds); anfdmax = 0; 1727 ev_free (anfds); anfds = 0; anfdmax = 0;
1499 1728
1500 /* have to use the microsoft-never-gets-it-right macro */ 1729 /* have to use the microsoft-never-gets-it-right macro */
1501 array_free (rfeed, EMPTY); 1730 array_free (rfeed, EMPTY);
1502 array_free (fdchange, EMPTY); 1731 array_free (fdchange, EMPTY);
1503 array_free (timer, EMPTY); 1732 array_free (timer, EMPTY);
1538 1767
1539 if (ev_is_active (&pipe_w)) 1768 if (ev_is_active (&pipe_w))
1540 { 1769 {
1541 /* this "locks" the handlers against writing to the pipe */ 1770 /* this "locks" the handlers against writing to the pipe */
1542 /* while we modify the fd vars */ 1771 /* while we modify the fd vars */
1543 gotsig = 1; 1772 sig_pending = 1;
1544#if EV_ASYNC_ENABLE 1773#if EV_ASYNC_ENABLE
1545 gotasync = 1; 1774 async_pending = 1;
1546#endif 1775#endif
1547 1776
1548 ev_ref (EV_A); 1777 ev_ref (EV_A);
1549 ev_io_stop (EV_A_ &pipe_w); 1778 ev_io_stop (EV_A_ &pipe_w);
1550 1779
1553 close (evfd); 1782 close (evfd);
1554#endif 1783#endif
1555 1784
1556 if (evpipe [0] >= 0) 1785 if (evpipe [0] >= 0)
1557 { 1786 {
1558 close (evpipe [0]); 1787 EV_WIN32_CLOSE_FD (evpipe [0]);
1559 close (evpipe [1]); 1788 EV_WIN32_CLOSE_FD (evpipe [1]);
1560 } 1789 }
1561 1790
1562 evpipe_init (EV_A); 1791 evpipe_init (EV_A);
1563 /* now iterate over everything, in case we missed something */ 1792 /* now iterate over everything, in case we missed something */
1564 pipecb (EV_A_ &pipe_w, EV_READ); 1793 pipecb (EV_A_ &pipe_w, EV_READ);
1570#if EV_MULTIPLICITY 1799#if EV_MULTIPLICITY
1571 1800
1572struct ev_loop * 1801struct ev_loop *
1573ev_loop_new (unsigned int flags) 1802ev_loop_new (unsigned int flags)
1574{ 1803{
1575 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1804 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1576 1805
1577 memset (loop, 0, sizeof (struct ev_loop)); 1806 memset (EV_A, 0, sizeof (struct ev_loop));
1578
1579 loop_init (EV_A_ flags); 1807 loop_init (EV_A_ flags);
1580 1808
1581 if (ev_backend (EV_A)) 1809 if (ev_backend (EV_A))
1582 return loop; 1810 return EV_A;
1583 1811
1584 return 0; 1812 return 0;
1585} 1813}
1586 1814
1587void 1815void
1594void 1822void
1595ev_loop_fork (EV_P) 1823ev_loop_fork (EV_P)
1596{ 1824{
1597 postfork = 1; /* must be in line with ev_default_fork */ 1825 postfork = 1; /* must be in line with ev_default_fork */
1598} 1826}
1827#endif /* multiplicity */
1599 1828
1600#if EV_VERIFY 1829#if EV_VERIFY
1601static void noinline 1830static void noinline
1602verify_watcher (EV_P_ W w) 1831verify_watcher (EV_P_ W w)
1603{ 1832{
1631 verify_watcher (EV_A_ ws [cnt]); 1860 verify_watcher (EV_A_ ws [cnt]);
1632 } 1861 }
1633} 1862}
1634#endif 1863#endif
1635 1864
1865#if EV_MINIMAL < 2
1636void 1866void
1637ev_loop_verify (EV_P) 1867ev_loop_verify (EV_P)
1638{ 1868{
1639#if EV_VERIFY 1869#if EV_VERIFY
1640 int i; 1870 int i;
1689 assert (checkmax >= checkcnt); 1919 assert (checkmax >= checkcnt);
1690 array_verify (EV_A_ (W *)checks, checkcnt); 1920 array_verify (EV_A_ (W *)checks, checkcnt);
1691 1921
1692# if 0 1922# if 0
1693 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1923 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1694 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1924 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1695# endif
1696#endif 1925# endif
1926#endif
1697} 1927}
1698 1928#endif
1699#endif /* multiplicity */
1700 1929
1701#if EV_MULTIPLICITY 1930#if EV_MULTIPLICITY
1702struct ev_loop * 1931struct ev_loop *
1703ev_default_loop_init (unsigned int flags) 1932ev_default_loop_init (unsigned int flags)
1704#else 1933#else
1707#endif 1936#endif
1708{ 1937{
1709 if (!ev_default_loop_ptr) 1938 if (!ev_default_loop_ptr)
1710 { 1939 {
1711#if EV_MULTIPLICITY 1940#if EV_MULTIPLICITY
1712 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1941 EV_P = ev_default_loop_ptr = &default_loop_struct;
1713#else 1942#else
1714 ev_default_loop_ptr = 1; 1943 ev_default_loop_ptr = 1;
1715#endif 1944#endif
1716 1945
1717 loop_init (EV_A_ flags); 1946 loop_init (EV_A_ flags);
1734 1963
1735void 1964void
1736ev_default_destroy (void) 1965ev_default_destroy (void)
1737{ 1966{
1738#if EV_MULTIPLICITY 1967#if EV_MULTIPLICITY
1739 struct ev_loop *loop = ev_default_loop_ptr; 1968 EV_P = ev_default_loop_ptr;
1740#endif 1969#endif
1741 1970
1742 ev_default_loop_ptr = 0; 1971 ev_default_loop_ptr = 0;
1743 1972
1744#ifndef _WIN32 1973#ifndef _WIN32
1751 1980
1752void 1981void
1753ev_default_fork (void) 1982ev_default_fork (void)
1754{ 1983{
1755#if EV_MULTIPLICITY 1984#if EV_MULTIPLICITY
1756 struct ev_loop *loop = ev_default_loop_ptr; 1985 EV_P = ev_default_loop_ptr;
1757#endif 1986#endif
1758 1987
1759 postfork = 1; /* must be in line with ev_loop_fork */ 1988 postfork = 1; /* must be in line with ev_loop_fork */
1760} 1989}
1761 1990
1765ev_invoke (EV_P_ void *w, int revents) 1994ev_invoke (EV_P_ void *w, int revents)
1766{ 1995{
1767 EV_CB_INVOKE ((W)w, revents); 1996 EV_CB_INVOKE ((W)w, revents);
1768} 1997}
1769 1998
1770inline_speed void 1999unsigned int
1771call_pending (EV_P) 2000ev_pending_count (EV_P)
2001{
2002 int pri;
2003 unsigned int count = 0;
2004
2005 for (pri = NUMPRI; pri--; )
2006 count += pendingcnt [pri];
2007
2008 return count;
2009}
2010
2011void noinline
2012ev_invoke_pending (EV_P)
1772{ 2013{
1773 int pri; 2014 int pri;
1774 2015
1775 for (pri = NUMPRI; pri--; ) 2016 for (pri = NUMPRI; pri--; )
1776 while (pendingcnt [pri]) 2017 while (pendingcnt [pri])
1944 ANHE_at_cache (*he); 2185 ANHE_at_cache (*he);
1945 } 2186 }
1946} 2187}
1947 2188
1948/* fetch new monotonic and realtime times from the kernel */ 2189/* fetch new monotonic and realtime times from the kernel */
1949/* also detetc if there was a timejump, and act accordingly */ 2190/* also detect if there was a timejump, and act accordingly */
1950inline_speed void 2191inline_speed void
1951time_update (EV_P_ ev_tstamp max_block) 2192time_update (EV_P_ ev_tstamp max_block)
1952{ 2193{
1953#if EV_USE_MONOTONIC 2194#if EV_USE_MONOTONIC
1954 if (expect_true (have_monotonic)) 2195 if (expect_true (have_monotonic))
2011 2252
2012 mn_now = ev_rt_now; 2253 mn_now = ev_rt_now;
2013 } 2254 }
2014} 2255}
2015 2256
2016static int loop_done;
2017
2018void 2257void
2019ev_loop (EV_P_ int flags) 2258ev_loop (EV_P_ int flags)
2020{ 2259{
2260#if EV_MINIMAL < 2
2261 ++loop_depth;
2262#endif
2263
2264 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2265
2021 loop_done = EVUNLOOP_CANCEL; 2266 loop_done = EVUNLOOP_CANCEL;
2022 2267
2023 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2268 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2024 2269
2025 do 2270 do
2026 { 2271 {
2027#if EV_VERIFY >= 2 2272#if EV_VERIFY >= 2
2028 ev_loop_verify (EV_A); 2273 ev_loop_verify (EV_A);
2041 /* we might have forked, so queue fork handlers */ 2286 /* we might have forked, so queue fork handlers */
2042 if (expect_false (postfork)) 2287 if (expect_false (postfork))
2043 if (forkcnt) 2288 if (forkcnt)
2044 { 2289 {
2045 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2290 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2046 call_pending (EV_A); 2291 EV_INVOKE_PENDING;
2047 } 2292 }
2048#endif 2293#endif
2049 2294
2050 /* queue prepare watchers (and execute them) */ 2295 /* queue prepare watchers (and execute them) */
2051 if (expect_false (preparecnt)) 2296 if (expect_false (preparecnt))
2052 { 2297 {
2053 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2298 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2054 call_pending (EV_A); 2299 EV_INVOKE_PENDING;
2055 } 2300 }
2301
2302 if (expect_false (loop_done))
2303 break;
2056 2304
2057 /* we might have forked, so reify kernel state if necessary */ 2305 /* we might have forked, so reify kernel state if necessary */
2058 if (expect_false (postfork)) 2306 if (expect_false (postfork))
2059 loop_fork (EV_A); 2307 loop_fork (EV_A);
2060 2308
2066 ev_tstamp waittime = 0.; 2314 ev_tstamp waittime = 0.;
2067 ev_tstamp sleeptime = 0.; 2315 ev_tstamp sleeptime = 0.;
2068 2316
2069 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2317 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2070 { 2318 {
2319 /* remember old timestamp for io_blocktime calculation */
2320 ev_tstamp prev_mn_now = mn_now;
2321
2071 /* update time to cancel out callback processing overhead */ 2322 /* update time to cancel out callback processing overhead */
2072 time_update (EV_A_ 1e100); 2323 time_update (EV_A_ 1e100);
2073 2324
2074 waittime = MAX_BLOCKTIME; 2325 waittime = MAX_BLOCKTIME;
2075 2326
2085 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2336 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2086 if (waittime > to) waittime = to; 2337 if (waittime > to) waittime = to;
2087 } 2338 }
2088#endif 2339#endif
2089 2340
2341 /* don't let timeouts decrease the waittime below timeout_blocktime */
2090 if (expect_false (waittime < timeout_blocktime)) 2342 if (expect_false (waittime < timeout_blocktime))
2091 waittime = timeout_blocktime; 2343 waittime = timeout_blocktime;
2092 2344
2093 sleeptime = waittime - backend_fudge; 2345 /* extra check because io_blocktime is commonly 0 */
2094
2095 if (expect_true (sleeptime > io_blocktime)) 2346 if (expect_false (io_blocktime))
2096 sleeptime = io_blocktime;
2097
2098 if (sleeptime)
2099 { 2347 {
2348 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2349
2350 if (sleeptime > waittime - backend_fudge)
2351 sleeptime = waittime - backend_fudge;
2352
2353 if (expect_true (sleeptime > 0.))
2354 {
2100 ev_sleep (sleeptime); 2355 ev_sleep (sleeptime);
2101 waittime -= sleeptime; 2356 waittime -= sleeptime;
2357 }
2102 } 2358 }
2103 } 2359 }
2104 2360
2361#if EV_MINIMAL < 2
2105 ++loop_count; 2362 ++loop_count;
2363#endif
2364 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2106 backend_poll (EV_A_ waittime); 2365 backend_poll (EV_A_ waittime);
2366 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2107 2367
2108 /* update ev_rt_now, do magic */ 2368 /* update ev_rt_now, do magic */
2109 time_update (EV_A_ waittime + sleeptime); 2369 time_update (EV_A_ waittime + sleeptime);
2110 } 2370 }
2111 2371
2122 2382
2123 /* queue check watchers, to be executed first */ 2383 /* queue check watchers, to be executed first */
2124 if (expect_false (checkcnt)) 2384 if (expect_false (checkcnt))
2125 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2385 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2126 2386
2127 call_pending (EV_A); 2387 EV_INVOKE_PENDING;
2128 } 2388 }
2129 while (expect_true ( 2389 while (expect_true (
2130 activecnt 2390 activecnt
2131 && !loop_done 2391 && !loop_done
2132 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2392 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2133 )); 2393 ));
2134 2394
2135 if (loop_done == EVUNLOOP_ONE) 2395 if (loop_done == EVUNLOOP_ONE)
2136 loop_done = EVUNLOOP_CANCEL; 2396 loop_done = EVUNLOOP_CANCEL;
2397
2398#if EV_MINIMAL < 2
2399 --loop_depth;
2400#endif
2137} 2401}
2138 2402
2139void 2403void
2140ev_unloop (EV_P_ int how) 2404ev_unloop (EV_P_ int how)
2141{ 2405{
2192inline_size void 2456inline_size void
2193wlist_del (WL *head, WL elem) 2457wlist_del (WL *head, WL elem)
2194{ 2458{
2195 while (*head) 2459 while (*head)
2196 { 2460 {
2197 if (*head == elem) 2461 if (expect_true (*head == elem))
2198 { 2462 {
2199 *head = elem->next; 2463 *head = elem->next;
2200 return; 2464 break;
2201 } 2465 }
2202 2466
2203 head = &(*head)->next; 2467 head = &(*head)->next;
2204 } 2468 }
2205} 2469}
2233} 2497}
2234 2498
2235inline_size void 2499inline_size void
2236pri_adjust (EV_P_ W w) 2500pri_adjust (EV_P_ W w)
2237{ 2501{
2238 int pri = w->priority; 2502 int pri = ev_priority (w);
2239 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2503 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2240 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2504 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2241 w->priority = pri; 2505 ev_set_priority (w, pri);
2242} 2506}
2243 2507
2244inline_speed void 2508inline_speed void
2245ev_start (EV_P_ W w, int active) 2509ev_start (EV_P_ W w, int active)
2246{ 2510{
2265 2529
2266 if (expect_false (ev_is_active (w))) 2530 if (expect_false (ev_is_active (w)))
2267 return; 2531 return;
2268 2532
2269 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2533 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2270 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2534 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2271 2535
2272 EV_FREQUENT_CHECK; 2536 EV_FREQUENT_CHECK;
2273 2537
2274 ev_start (EV_A_ (W)w, 1); 2538 ev_start (EV_A_ (W)w, 1);
2275 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2539 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2276 wlist_add (&anfds[fd].head, (WL)w); 2540 wlist_add (&anfds[fd].head, (WL)w);
2277 2541
2278 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2542 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2279 w->events &= ~EV__IOFDSET; 2543 w->events &= ~EV__IOFDSET;
2280 2544
2281 EV_FREQUENT_CHECK; 2545 EV_FREQUENT_CHECK;
2282} 2546}
2283 2547
2345 timers [active] = timers [timercnt + HEAP0]; 2609 timers [active] = timers [timercnt + HEAP0];
2346 adjustheap (timers, timercnt, active); 2610 adjustheap (timers, timercnt, active);
2347 } 2611 }
2348 } 2612 }
2349 2613
2350 EV_FREQUENT_CHECK;
2351
2352 ev_at (w) -= mn_now; 2614 ev_at (w) -= mn_now;
2353 2615
2354 ev_stop (EV_A_ (W)w); 2616 ev_stop (EV_A_ (W)w);
2617
2618 EV_FREQUENT_CHECK;
2355} 2619}
2356 2620
2357void noinline 2621void noinline
2358ev_timer_again (EV_P_ ev_timer *w) 2622ev_timer_again (EV_P_ ev_timer *w)
2359{ 2623{
2377 } 2641 }
2378 2642
2379 EV_FREQUENT_CHECK; 2643 EV_FREQUENT_CHECK;
2380} 2644}
2381 2645
2646ev_tstamp
2647ev_timer_remaining (EV_P_ ev_timer *w)
2648{
2649 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2650}
2651
2382#if EV_PERIODIC_ENABLE 2652#if EV_PERIODIC_ENABLE
2383void noinline 2653void noinline
2384ev_periodic_start (EV_P_ ev_periodic *w) 2654ev_periodic_start (EV_P_ ev_periodic *w)
2385{ 2655{
2386 if (expect_false (ev_is_active (w))) 2656 if (expect_false (ev_is_active (w)))
2432 periodics [active] = periodics [periodiccnt + HEAP0]; 2702 periodics [active] = periodics [periodiccnt + HEAP0];
2433 adjustheap (periodics, periodiccnt, active); 2703 adjustheap (periodics, periodiccnt, active);
2434 } 2704 }
2435 } 2705 }
2436 2706
2437 EV_FREQUENT_CHECK;
2438
2439 ev_stop (EV_A_ (W)w); 2707 ev_stop (EV_A_ (W)w);
2708
2709 EV_FREQUENT_CHECK;
2440} 2710}
2441 2711
2442void noinline 2712void noinline
2443ev_periodic_again (EV_P_ ev_periodic *w) 2713ev_periodic_again (EV_P_ ev_periodic *w)
2444{ 2714{
2453#endif 2723#endif
2454 2724
2455void noinline 2725void noinline
2456ev_signal_start (EV_P_ ev_signal *w) 2726ev_signal_start (EV_P_ ev_signal *w)
2457{ 2727{
2458#if EV_MULTIPLICITY
2459 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2460#endif
2461 if (expect_false (ev_is_active (w))) 2728 if (expect_false (ev_is_active (w)))
2462 return; 2729 return;
2463 2730
2464 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2731 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2465 2732
2466 evpipe_init (EV_A); 2733#if EV_MULTIPLICITY
2734 assert (("libev: a signal must not be attached to two different loops",
2735 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2467 2736
2468 EV_FREQUENT_CHECK; 2737 signals [w->signum - 1].loop = EV_A;
2738#endif
2469 2739
2740 EV_FREQUENT_CHECK;
2741
2742#if EV_USE_SIGNALFD
2743 if (sigfd == -2)
2470 { 2744 {
2471#ifndef _WIN32 2745 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2472 sigset_t full, prev; 2746 if (sigfd < 0 && errno == EINVAL)
2473 sigfillset (&full); 2747 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2474 sigprocmask (SIG_SETMASK, &full, &prev);
2475#endif
2476 2748
2477 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2749 if (sigfd >= 0)
2750 {
2751 fd_intern (sigfd); /* doing it twice will not hurt */
2478 2752
2479#ifndef _WIN32 2753 sigemptyset (&sigfd_set);
2480 sigprocmask (SIG_SETMASK, &prev, 0); 2754
2481#endif 2755 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2756 ev_set_priority (&sigfd_w, EV_MAXPRI);
2757 ev_io_start (EV_A_ &sigfd_w);
2758 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2759 }
2482 } 2760 }
2761
2762 if (sigfd >= 0)
2763 {
2764 /* TODO: check .head */
2765 sigaddset (&sigfd_set, w->signum);
2766 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2767
2768 signalfd (sigfd, &sigfd_set, 0);
2769 }
2770#endif
2483 2771
2484 ev_start (EV_A_ (W)w, 1); 2772 ev_start (EV_A_ (W)w, 1);
2485 wlist_add (&signals [w->signum - 1].head, (WL)w); 2773 wlist_add (&signals [w->signum - 1].head, (WL)w);
2486 2774
2487 if (!((WL)w)->next) 2775 if (!((WL)w)->next)
2776# if EV_USE_SIGNALFD
2777 if (sigfd < 0) /*TODO*/
2778# endif
2488 { 2779 {
2489#if _WIN32 2780# ifdef _WIN32
2781 evpipe_init (EV_A);
2782
2490 signal (w->signum, ev_sighandler); 2783 signal (w->signum, ev_sighandler);
2491#else 2784# else
2492 struct sigaction sa; 2785 struct sigaction sa;
2786
2787 evpipe_init (EV_A);
2788
2493 sa.sa_handler = ev_sighandler; 2789 sa.sa_handler = ev_sighandler;
2494 sigfillset (&sa.sa_mask); 2790 sigfillset (&sa.sa_mask);
2495 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2791 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2496 sigaction (w->signum, &sa, 0); 2792 sigaction (w->signum, &sa, 0);
2793
2794 sigemptyset (&sa.sa_mask);
2795 sigaddset (&sa.sa_mask, w->signum);
2796 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2497#endif 2797#endif
2498 } 2798 }
2499 2799
2500 EV_FREQUENT_CHECK; 2800 EV_FREQUENT_CHECK;
2501} 2801}
2502 2802
2503void noinline 2803void noinline
2511 2811
2512 wlist_del (&signals [w->signum - 1].head, (WL)w); 2812 wlist_del (&signals [w->signum - 1].head, (WL)w);
2513 ev_stop (EV_A_ (W)w); 2813 ev_stop (EV_A_ (W)w);
2514 2814
2515 if (!signals [w->signum - 1].head) 2815 if (!signals [w->signum - 1].head)
2816 {
2817#if EV_MULTIPLICITY
2818 signals [w->signum - 1].loop = 0; /* unattach from signal */
2819#endif
2820#if EV_USE_SIGNALFD
2821 if (sigfd >= 0)
2822 {
2823 sigset_t ss;
2824
2825 sigemptyset (&ss);
2826 sigaddset (&ss, w->signum);
2827 sigdelset (&sigfd_set, w->signum);
2828
2829 signalfd (sigfd, &sigfd_set, 0);
2830 sigprocmask (SIG_UNBLOCK, &ss, 0);
2831 }
2832 else
2833#endif
2516 signal (w->signum, SIG_DFL); 2834 signal (w->signum, SIG_DFL);
2835 }
2517 2836
2518 EV_FREQUENT_CHECK; 2837 EV_FREQUENT_CHECK;
2519} 2838}
2520 2839
2521void 2840void
2562#define MIN_STAT_INTERVAL 0.1074891 2881#define MIN_STAT_INTERVAL 0.1074891
2563 2882
2564static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2883static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2565 2884
2566#if EV_USE_INOTIFY 2885#if EV_USE_INOTIFY
2567# define EV_INOTIFY_BUFSIZE 8192 2886
2887/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2888# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2568 2889
2569static void noinline 2890static void noinline
2570infy_add (EV_P_ ev_stat *w) 2891infy_add (EV_P_ ev_stat *w)
2571{ 2892{
2572 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); 2893 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);
2573 2894
2574 if (w->wd < 0) 2895 if (w->wd >= 0)
2896 {
2897 struct statfs sfs;
2898
2899 /* now local changes will be tracked by inotify, but remote changes won't */
2900 /* unless the filesystem is known to be local, we therefore still poll */
2901 /* also do poll on <2.6.25, but with normal frequency */
2902
2903 if (!fs_2625)
2904 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2905 else if (!statfs (w->path, &sfs)
2906 && (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 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2913 else
2914 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2575 { 2915 }
2916 else
2917 {
2918 /* can't use inotify, continue to stat */
2576 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2919 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2577 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2578 2920
2579 /* monitor some parent directory for speedup hints */ 2921 /* if path is not there, monitor some parent directory for speedup hints */
2580 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2922 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2581 /* but an efficiency issue only */ 2923 /* but an efficiency issue only */
2582 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2924 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2583 { 2925 {
2584 char path [4096]; 2926 char path [4096];
2600 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2942 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2601 } 2943 }
2602 } 2944 }
2603 2945
2604 if (w->wd >= 0) 2946 if (w->wd >= 0)
2605 {
2606 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2947 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2607 2948
2608 /* now local changes will be tracked by inotify, but remote changes won't */ 2949 /* now re-arm timer, if required */
2609 /* unless the filesystem it known to be local, we therefore still poll */ 2950 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2610 /* also do poll on <2.6.25, but with normal frequency */
2611 struct statfs sfs;
2612
2613 if (fs_2625 && !statfs (w->path, &sfs))
2614 if (sfs.f_type == 0x1373 /* devfs */
2615 || sfs.f_type == 0xEF53 /* ext2/3 */
2616 || sfs.f_type == 0x3153464a /* jfs */
2617 || sfs.f_type == 0x52654973 /* reiser3 */
2618 || sfs.f_type == 0x01021994 /* tempfs */
2619 || sfs.f_type == 0x58465342 /* xfs */)
2620 return;
2621
2622 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2623 ev_timer_again (EV_A_ &w->timer); 2951 ev_timer_again (EV_A_ &w->timer);
2624 } 2952 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2625} 2953}
2626 2954
2627static void noinline 2955static void noinline
2628infy_del (EV_P_ ev_stat *w) 2956infy_del (EV_P_ ev_stat *w)
2629{ 2957{
2674 3002
2675static void 3003static void
2676infy_cb (EV_P_ ev_io *w, int revents) 3004infy_cb (EV_P_ ev_io *w, int revents)
2677{ 3005{
2678 char buf [EV_INOTIFY_BUFSIZE]; 3006 char buf [EV_INOTIFY_BUFSIZE];
2679 struct inotify_event *ev = (struct inotify_event *)buf;
2680 int ofs; 3007 int ofs;
2681 int len = read (fs_fd, buf, sizeof (buf)); 3008 int len = read (fs_fd, buf, sizeof (buf));
2682 3009
2683 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3010 for (ofs = 0; ofs < len; )
3011 {
3012 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2684 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3013 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3014 ofs += sizeof (struct inotify_event) + ev->len;
3015 }
3016}
3017
3018inline_size unsigned int
3019ev_linux_version (void)
3020{
3021 struct utsname buf;
3022 unsigned int v;
3023 int i;
3024 char *p = buf.release;
3025
3026 if (uname (&buf))
3027 return 0;
3028
3029 for (i = 3+1; --i; )
3030 {
3031 unsigned int c = 0;
3032
3033 for (;;)
3034 {
3035 if (*p >= '0' && *p <= '9')
3036 c = c * 10 + *p++ - '0';
3037 else
3038 {
3039 p += *p == '.';
3040 break;
3041 }
3042 }
3043
3044 v = (v << 8) | c;
3045 }
3046
3047 return v;
2685} 3048}
2686 3049
2687inline_size void 3050inline_size void
2688check_2625 (EV_P) 3051ev_check_2625 (EV_P)
2689{ 3052{
2690 /* kernels < 2.6.25 are borked 3053 /* kernels < 2.6.25 are borked
2691 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3054 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2692 */ 3055 */
2693 struct utsname buf; 3056 if (ev_linux_version () < 0x020619)
2694 int major, minor, micro;
2695
2696 if (uname (&buf))
2697 return; 3057 return;
2698 3058
2699 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2700 return;
2701
2702 if (major < 2
2703 || (major == 2 && minor < 6)
2704 || (major == 2 && minor == 6 && micro < 25))
2705 return;
2706
2707 fs_2625 = 1; 3059 fs_2625 = 1;
3060}
3061
3062inline_size int
3063infy_newfd (void)
3064{
3065#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3066 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3067 if (fd >= 0)
3068 return fd;
3069#endif
3070 return inotify_init ();
2708} 3071}
2709 3072
2710inline_size void 3073inline_size void
2711infy_init (EV_P) 3074infy_init (EV_P)
2712{ 3075{
2713 if (fs_fd != -2) 3076 if (fs_fd != -2)
2714 return; 3077 return;
2715 3078
2716 fs_fd = -1; 3079 fs_fd = -1;
2717 3080
2718 check_2625 (EV_A); 3081 ev_check_2625 (EV_A);
2719 3082
2720 fs_fd = inotify_init (); 3083 fs_fd = infy_newfd ();
2721 3084
2722 if (fs_fd >= 0) 3085 if (fs_fd >= 0)
2723 { 3086 {
3087 fd_intern (fs_fd);
2724 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3088 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2725 ev_set_priority (&fs_w, EV_MAXPRI); 3089 ev_set_priority (&fs_w, EV_MAXPRI);
2726 ev_io_start (EV_A_ &fs_w); 3090 ev_io_start (EV_A_ &fs_w);
3091 ev_unref (EV_A);
2727 } 3092 }
2728} 3093}
2729 3094
2730inline_size void 3095inline_size void
2731infy_fork (EV_P) 3096infy_fork (EV_P)
2733 int slot; 3098 int slot;
2734 3099
2735 if (fs_fd < 0) 3100 if (fs_fd < 0)
2736 return; 3101 return;
2737 3102
3103 ev_ref (EV_A);
3104 ev_io_stop (EV_A_ &fs_w);
2738 close (fs_fd); 3105 close (fs_fd);
2739 fs_fd = inotify_init (); 3106 fs_fd = infy_newfd ();
3107
3108 if (fs_fd >= 0)
3109 {
3110 fd_intern (fs_fd);
3111 ev_io_set (&fs_w, fs_fd, EV_READ);
3112 ev_io_start (EV_A_ &fs_w);
3113 ev_unref (EV_A);
3114 }
2740 3115
2741 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3116 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2742 { 3117 {
2743 WL w_ = fs_hash [slot].head; 3118 WL w_ = fs_hash [slot].head;
2744 fs_hash [slot].head = 0; 3119 fs_hash [slot].head = 0;
2751 w->wd = -1; 3126 w->wd = -1;
2752 3127
2753 if (fs_fd >= 0) 3128 if (fs_fd >= 0)
2754 infy_add (EV_A_ w); /* re-add, no matter what */ 3129 infy_add (EV_A_ w); /* re-add, no matter what */
2755 else 3130 else
3131 {
3132 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3133 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2756 ev_timer_again (EV_A_ &w->timer); 3134 ev_timer_again (EV_A_ &w->timer);
3135 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3136 }
2757 } 3137 }
2758 } 3138 }
2759} 3139}
2760 3140
2761#endif 3141#endif
2778static void noinline 3158static void noinline
2779stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3159stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2780{ 3160{
2781 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3161 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2782 3162
2783 /* we copy this here each the time so that */ 3163 ev_statdata prev = w->attr;
2784 /* prev has the old value when the callback gets invoked */
2785 w->prev = w->attr;
2786 ev_stat_stat (EV_A_ w); 3164 ev_stat_stat (EV_A_ w);
2787 3165
2788 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3166 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2789 if ( 3167 if (
2790 w->prev.st_dev != w->attr.st_dev 3168 prev.st_dev != w->attr.st_dev
2791 || w->prev.st_ino != w->attr.st_ino 3169 || prev.st_ino != w->attr.st_ino
2792 || w->prev.st_mode != w->attr.st_mode 3170 || prev.st_mode != w->attr.st_mode
2793 || w->prev.st_nlink != w->attr.st_nlink 3171 || prev.st_nlink != w->attr.st_nlink
2794 || w->prev.st_uid != w->attr.st_uid 3172 || prev.st_uid != w->attr.st_uid
2795 || w->prev.st_gid != w->attr.st_gid 3173 || prev.st_gid != w->attr.st_gid
2796 || w->prev.st_rdev != w->attr.st_rdev 3174 || prev.st_rdev != w->attr.st_rdev
2797 || w->prev.st_size != w->attr.st_size 3175 || prev.st_size != w->attr.st_size
2798 || w->prev.st_atime != w->attr.st_atime 3176 || prev.st_atime != w->attr.st_atime
2799 || w->prev.st_mtime != w->attr.st_mtime 3177 || prev.st_mtime != w->attr.st_mtime
2800 || w->prev.st_ctime != w->attr.st_ctime 3178 || prev.st_ctime != w->attr.st_ctime
2801 ) { 3179 ) {
3180 /* we only update w->prev on actual differences */
3181 /* in case we test more often than invoke the callback, */
3182 /* to ensure that prev is always different to attr */
3183 w->prev = prev;
3184
2802 #if EV_USE_INOTIFY 3185 #if EV_USE_INOTIFY
2803 if (fs_fd >= 0) 3186 if (fs_fd >= 0)
2804 { 3187 {
2805 infy_del (EV_A_ w); 3188 infy_del (EV_A_ w);
2806 infy_add (EV_A_ w); 3189 infy_add (EV_A_ w);
2831 3214
2832 if (fs_fd >= 0) 3215 if (fs_fd >= 0)
2833 infy_add (EV_A_ w); 3216 infy_add (EV_A_ w);
2834 else 3217 else
2835#endif 3218#endif
3219 {
2836 ev_timer_again (EV_A_ &w->timer); 3220 ev_timer_again (EV_A_ &w->timer);
3221 ev_unref (EV_A);
3222 }
2837 3223
2838 ev_start (EV_A_ (W)w, 1); 3224 ev_start (EV_A_ (W)w, 1);
2839 3225
2840 EV_FREQUENT_CHECK; 3226 EV_FREQUENT_CHECK;
2841} 3227}
2850 EV_FREQUENT_CHECK; 3236 EV_FREQUENT_CHECK;
2851 3237
2852#if EV_USE_INOTIFY 3238#if EV_USE_INOTIFY
2853 infy_del (EV_A_ w); 3239 infy_del (EV_A_ w);
2854#endif 3240#endif
3241
3242 if (ev_is_active (&w->timer))
3243 {
3244 ev_ref (EV_A);
2855 ev_timer_stop (EV_A_ &w->timer); 3245 ev_timer_stop (EV_A_ &w->timer);
3246 }
2856 3247
2857 ev_stop (EV_A_ (W)w); 3248 ev_stop (EV_A_ (W)w);
2858 3249
2859 EV_FREQUENT_CHECK; 3250 EV_FREQUENT_CHECK;
2860} 3251}
3001embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3392embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3002{ 3393{
3003 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3394 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3004 3395
3005 { 3396 {
3006 struct ev_loop *loop = w->other; 3397 EV_P = w->other;
3007 3398
3008 while (fdchangecnt) 3399 while (fdchangecnt)
3009 { 3400 {
3010 fd_reify (EV_A); 3401 fd_reify (EV_A);
3011 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3402 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3019 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3410 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3020 3411
3021 ev_embed_stop (EV_A_ w); 3412 ev_embed_stop (EV_A_ w);
3022 3413
3023 { 3414 {
3024 struct ev_loop *loop = w->other; 3415 EV_P = w->other;
3025 3416
3026 ev_loop_fork (EV_A); 3417 ev_loop_fork (EV_A);
3027 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3418 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3028 } 3419 }
3029 3420
3043{ 3434{
3044 if (expect_false (ev_is_active (w))) 3435 if (expect_false (ev_is_active (w)))
3045 return; 3436 return;
3046 3437
3047 { 3438 {
3048 struct ev_loop *loop = w->other; 3439 EV_P = w->other;
3049 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3440 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3050 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3441 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3051 } 3442 }
3052 3443
3053 EV_FREQUENT_CHECK; 3444 EV_FREQUENT_CHECK;
3080 3471
3081 ev_io_stop (EV_A_ &w->io); 3472 ev_io_stop (EV_A_ &w->io);
3082 ev_prepare_stop (EV_A_ &w->prepare); 3473 ev_prepare_stop (EV_A_ &w->prepare);
3083 ev_fork_stop (EV_A_ &w->fork); 3474 ev_fork_stop (EV_A_ &w->fork);
3084 3475
3476 ev_stop (EV_A_ (W)w);
3477
3085 EV_FREQUENT_CHECK; 3478 EV_FREQUENT_CHECK;
3086} 3479}
3087#endif 3480#endif
3088 3481
3089#if EV_FORK_ENABLE 3482#if EV_FORK_ENABLE
3165 3558
3166void 3559void
3167ev_async_send (EV_P_ ev_async *w) 3560ev_async_send (EV_P_ ev_async *w)
3168{ 3561{
3169 w->sent = 1; 3562 w->sent = 1;
3170 evpipe_write (EV_A_ &gotasync); 3563 evpipe_write (EV_A_ &async_pending);
3171} 3564}
3172#endif 3565#endif
3173 3566
3174/*****************************************************************************/ 3567/*****************************************************************************/
3175 3568
3324 if (types & EV_CHECK) 3717 if (types & EV_CHECK)
3325 for (i = checkcnt; i--; ) 3718 for (i = checkcnt; i--; )
3326 cb (EV_A_ EV_CHECK, checks [i]); 3719 cb (EV_A_ EV_CHECK, checks [i]);
3327 3720
3328 if (types & EV_SIGNAL) 3721 if (types & EV_SIGNAL)
3329 for (i = 0; i < signalmax; ++i) 3722 for (i = 0; i < EV_NSIG - 1; ++i)
3330 for (wl = signals [i].head; wl; ) 3723 for (wl = signals [i].head; wl; )
3331 { 3724 {
3332 wn = wl->next; 3725 wn = wl->next;
3333 cb (EV_A_ EV_SIGNAL, wl); 3726 cb (EV_A_ EV_SIGNAL, wl);
3334 wl = wn; 3727 wl = wn;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines