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

Comparing libev/ev.c (file contents):
Revision 1.291 by root, Mon Jun 29 04:44:18 2009 UTC vs.
Revision 1.334 by root, Tue Mar 9 09:00:59 2010 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
110# define EV_USE_EPOLL 0 110# define EV_USE_EPOLL 0
111# endif 111# endif
112# endif 112# endif
113 113
114# ifndef EV_USE_KQUEUE 114# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
116# define EV_USE_KQUEUE 1 116# define EV_USE_KQUEUE 1
117# else 117# else
118# define EV_USE_KQUEUE 0 118# define EV_USE_KQUEUE 0
119# endif 119# endif
120# endif 120# endif
133# else 133# else
134# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
135# endif 135# endif
136# endif 136# endif
137 137
138# ifndef EV_USE_SIGNALFD
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
138# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
139# if HAVE_EVENTFD 147# if HAVE_EVENTFD
140# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD 1
141# else 149# else
142# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
145 153
146#endif 154#endif
147 155
148#include <math.h> 156#include <math.h>
149#include <stdlib.h> 157#include <stdlib.h>
158#include <string.h>
150#include <fcntl.h> 159#include <fcntl.h>
151#include <stddef.h> 160#include <stddef.h>
152 161
153#include <stdio.h> 162#include <stdio.h>
154 163
155#include <assert.h> 164#include <assert.h>
156#include <errno.h> 165#include <errno.h>
157#include <sys/types.h> 166#include <sys/types.h>
158#include <time.h> 167#include <time.h>
168#include <limits.h>
159 169
160#include <signal.h> 170#include <signal.h>
161 171
162#ifdef EV_H 172#ifdef EV_H
163# include EV_H 173# include EV_H
174# define WIN32_LEAN_AND_MEAN 184# define WIN32_LEAN_AND_MEAN
175# include <windows.h> 185# include <windows.h>
176# ifndef EV_SELECT_IS_WINSOCKET 186# ifndef EV_SELECT_IS_WINSOCKET
177# define EV_SELECT_IS_WINSOCKET 1 187# define EV_SELECT_IS_WINSOCKET 1
178# endif 188# endif
189# undef EV_AVOID_STDIO
179#endif 190#endif
180 191
181/* 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
182 220
183#ifndef EV_USE_CLOCK_SYSCALL 221#ifndef EV_USE_CLOCK_SYSCALL
184# if __linux && __GLIBC__ >= 2 222# if __linux && __GLIBC__ >= 2
185# define EV_USE_CLOCK_SYSCALL 1 223# define EV_USE_CLOCK_SYSCALL 1
186# else 224# else
263#ifndef EV_USE_EVENTFD 301#ifndef EV_USE_EVENTFD
264# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 302# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
265# define EV_USE_EVENTFD 1 303# define EV_USE_EVENTFD 1
266# else 304# else
267# define EV_USE_EVENTFD 0 305# define EV_USE_EVENTFD 0
306# endif
307#endif
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
268# endif 314# endif
269#endif 315#endif
270 316
271#if 0 /* debugging */ 317#if 0 /* debugging */
272# define EV_VERIFY 3 318# define EV_VERIFY 3
300# endif 346# endif
301#endif 347#endif
302 348
303/* 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 */
304 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
356
305#ifndef CLOCK_MONOTONIC 357#ifndef CLOCK_MONOTONIC
306# undef EV_USE_MONOTONIC 358# undef EV_USE_MONOTONIC
307# define EV_USE_MONOTONIC 0 359# define EV_USE_MONOTONIC 0
308#endif 360#endif
309 361
339#endif 391#endif
340 392
341#if EV_USE_EVENTFD 393#if EV_USE_EVENTFD
342/* 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 */
343# 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
344# ifdef __cplusplus 406# ifdef __cplusplus
345extern "C" { 407extern "C" {
346# endif 408# endif
347int eventfd (unsigned int initval, int flags); 409int (eventfd) (unsigned int initval, int flags);
348# ifdef __cplusplus 410# ifdef __cplusplus
349} 411}
350# endif 412# endif
351#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
352 443
353/**/ 444/**/
354 445
355#if EV_VERIFY >= 3 446#if EV_VERIFY >= 3
356# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 447# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
368 */ 459 */
369#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 460#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
370 461
371#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) */
372#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) */
373/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
374 464
375#if __GNUC__ >= 4 465#if __GNUC__ >= 4
376# define expect(expr,value) __builtin_expect ((expr),(value)) 466# define expect(expr,value) __builtin_expect ((expr),(value))
377# define noinline __attribute__ ((noinline)) 467# define noinline __attribute__ ((noinline))
378#else 468#else
391# define inline_speed static noinline 481# define inline_speed static noinline
392#else 482#else
393# define inline_speed static inline 483# define inline_speed static inline
394#endif 484#endif
395 485
396#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
397#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 491# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
492#endif
398 493
399#define EMPTY /* required for microsofts broken pseudo-c compiler */ 494#define EMPTY /* required for microsofts broken pseudo-c compiler */
400#define EMPTY2(a,b) /* used to suppress some warnings */ 495#define EMPTY2(a,b) /* used to suppress some warnings */
401 496
402typedef ev_watcher *W; 497typedef ev_watcher *W;
414 509
415#if EV_USE_MONOTONIC 510#if EV_USE_MONOTONIC
416static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 511static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
417#endif 512#endif
418 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
419#ifdef _WIN32 524#ifdef _WIN32
420# include "ev_win32.c" 525# include "ev_win32.c"
421#endif 526#endif
422 527
423/*****************************************************************************/ 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
424 537
425static void (*syserr_cb)(const char *msg); 538static void (*syserr_cb)(const char *msg);
426 539
427void 540void
428ev_set_syserr_cb (void (*cb)(const char *msg)) 541ev_set_syserr_cb (void (*cb)(const char *msg))
438 551
439 if (syserr_cb) 552 if (syserr_cb)
440 syserr_cb (msg); 553 syserr_cb (msg);
441 else 554 else
442 { 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
443 perror (msg); 564 perror (msg);
565#endif
444 abort (); 566 abort ();
445 } 567 }
446} 568}
447 569
448static void * 570static void *
449ev_realloc_emul (void *ptr, long size) 571ev_realloc_emul (void *ptr, long size)
450{ 572{
573#if __GLIBC__
574 return realloc (ptr, size);
575#else
451 /* some systems, notably openbsd and darwin, fail to properly 576 /* some systems, notably openbsd and darwin, fail to properly
452 * implement realloc (x, 0) (as required by both ansi c-98 and 577 * implement realloc (x, 0) (as required by both ansi c-98 and
453 * the single unix specification, so work around them here. 578 * the single unix specification, so work around them here.
454 */ 579 */
455 580
456 if (size) 581 if (size)
457 return realloc (ptr, size); 582 return realloc (ptr, size);
458 583
459 free (ptr); 584 free (ptr);
460 return 0; 585 return 0;
586#endif
461} 587}
462 588
463static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 589static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
464 590
465void 591void
473{ 599{
474 ptr = alloc (ptr, size); 600 ptr = alloc (ptr, size);
475 601
476 if (!ptr && size) 602 if (!ptr && size)
477 { 603 {
604#if EV_AVOID_STDIO
605 ev_printerr ("libev: memory allocation failed, aborting.\n");
606#else
478 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 607 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
608#endif
479 abort (); 609 abort ();
480 } 610 }
481 611
482 return ptr; 612 return ptr;
483} 613}
485#define ev_malloc(size) ev_realloc (0, (size)) 615#define ev_malloc(size) ev_realloc (0, (size))
486#define ev_free(ptr) ev_realloc ((ptr), 0) 616#define ev_free(ptr) ev_realloc ((ptr), 0)
487 617
488/*****************************************************************************/ 618/*****************************************************************************/
489 619
620/* set in reify when reification needed */
621#define EV_ANFD_REIFY 1
622
490/* file descriptor info structure */ 623/* file descriptor info structure */
491typedef struct 624typedef struct
492{ 625{
493 WL head; 626 WL head;
494 unsigned char events; /* the events watched for */ 627 unsigned char events; /* the events watched for */
495 unsigned char reify; /* flag set when this ANFD needs reification */ 628 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
496 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 629 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
497 unsigned char unused; 630 unsigned char unused;
498#if EV_USE_EPOLL 631#if EV_USE_EPOLL
499 unsigned int egen; /* generation counter to counter epoll bugs */ 632 unsigned int egen; /* generation counter to counter epoll bugs */
500#endif 633#endif
562 695
563 static int ev_default_loop_ptr; 696 static int ev_default_loop_ptr;
564 697
565#endif 698#endif
566 699
700#if EV_MINIMAL < 2
701# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
702# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
703# define EV_INVOKE_PENDING invoke_cb (EV_A)
704#else
705# define EV_RELEASE_CB (void)0
706# define EV_ACQUIRE_CB (void)0
707# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
708#endif
709
710#define EVUNLOOP_RECURSE 0x80
711
567/*****************************************************************************/ 712/*****************************************************************************/
568 713
714#ifndef EV_HAVE_EV_TIME
569ev_tstamp 715ev_tstamp
570ev_time (void) 716ev_time (void)
571{ 717{
572#if EV_USE_REALTIME 718#if EV_USE_REALTIME
573 if (expect_true (have_realtime)) 719 if (expect_true (have_realtime))
580 726
581 struct timeval tv; 727 struct timeval tv;
582 gettimeofday (&tv, 0); 728 gettimeofday (&tv, 0);
583 return tv.tv_sec + tv.tv_usec * 1e-6; 729 return tv.tv_sec + tv.tv_usec * 1e-6;
584} 730}
731#endif
585 732
586inline_size ev_tstamp 733inline_size ev_tstamp
587get_clock (void) 734get_clock (void)
588{ 735{
589#if EV_USE_MONOTONIC 736#if EV_USE_MONOTONIC
625 772
626 tv.tv_sec = (time_t)delay; 773 tv.tv_sec = (time_t)delay;
627 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 774 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
628 775
629 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 776 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
630 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 777 /* something not guaranteed by newer posix versions, but guaranteed */
631 /* by older ones */ 778 /* by older ones */
632 select (0, 0, 0, 0, &tv); 779 select (0, 0, 0, 0, &tv);
633#endif 780#endif
634 } 781 }
635} 782}
743} 890}
744 891
745/*****************************************************************************/ 892/*****************************************************************************/
746 893
747inline_speed void 894inline_speed void
748fd_event (EV_P_ int fd, int revents) 895fd_event_nc (EV_P_ int fd, int revents)
749{ 896{
750 ANFD *anfd = anfds + fd; 897 ANFD *anfd = anfds + fd;
751 ev_io *w; 898 ev_io *w;
752 899
753 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 900 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
757 if (ev) 904 if (ev)
758 ev_feed_event (EV_A_ (W)w, ev); 905 ev_feed_event (EV_A_ (W)w, ev);
759 } 906 }
760} 907}
761 908
909/* do not submit kernel events for fds that have reify set */
910/* because that means they changed while we were polling for new events */
911inline_speed void
912fd_event (EV_P_ int fd, int revents)
913{
914 ANFD *anfd = anfds + fd;
915
916 if (expect_true (!anfd->reify))
917 fd_event_nc (EV_A_ fd, revents);
918}
919
762void 920void
763ev_feed_fd_event (EV_P_ int fd, int revents) 921ev_feed_fd_event (EV_P_ int fd, int revents)
764{ 922{
765 if (fd >= 0 && fd < anfdmax) 923 if (fd >= 0 && fd < anfdmax)
766 fd_event (EV_A_ fd, revents); 924 fd_event_nc (EV_A_ fd, revents);
767} 925}
768 926
769/* make sure the external fd watch events are in-sync */ 927/* make sure the external fd watch events are in-sync */
770/* with the kernel/libev internal state */ 928/* with the kernel/libev internal state */
771inline_size void 929inline_size void
786 944
787#if EV_SELECT_IS_WINSOCKET 945#if EV_SELECT_IS_WINSOCKET
788 if (events) 946 if (events)
789 { 947 {
790 unsigned long arg; 948 unsigned long arg;
791 #ifdef EV_FD_TO_WIN32_HANDLE
792 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 949 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
793 #else
794 anfd->handle = _get_osfhandle (fd);
795 #endif
796 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 950 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
797 } 951 }
798#endif 952#endif
799 953
800 { 954 {
843/* check whether the given fd is atcually valid, for error recovery */ 997/* check whether the given fd is atcually valid, for error recovery */
844inline_size int 998inline_size int
845fd_valid (int fd) 999fd_valid (int fd)
846{ 1000{
847#ifdef _WIN32 1001#ifdef _WIN32
848 return _get_osfhandle (fd) != -1; 1002 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
849#else 1003#else
850 return fcntl (fd, F_GETFD) != -1; 1004 return fcntl (fd, F_GETFD) != -1;
851#endif 1005#endif
852} 1006}
853 1007
871 1025
872 for (fd = anfdmax; fd--; ) 1026 for (fd = anfdmax; fd--; )
873 if (anfds [fd].events) 1027 if (anfds [fd].events)
874 { 1028 {
875 fd_kill (EV_A_ fd); 1029 fd_kill (EV_A_ fd);
876 return; 1030 break;
877 } 1031 }
878} 1032}
879 1033
880/* usually called after fork if backend needs to re-arm all fds from scratch */ 1034/* usually called after fork if backend needs to re-arm all fds from scratch */
881static void noinline 1035static void noinline
886 for (fd = 0; fd < anfdmax; ++fd) 1040 for (fd = 0; fd < anfdmax; ++fd)
887 if (anfds [fd].events) 1041 if (anfds [fd].events)
888 { 1042 {
889 anfds [fd].events = 0; 1043 anfds [fd].events = 0;
890 anfds [fd].emask = 0; 1044 anfds [fd].emask = 0;
891 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1045 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
892 } 1046 }
893} 1047}
894 1048
895/*****************************************************************************/ 1049/*****************************************************************************/
896 1050
971 1125
972 for (;;) 1126 for (;;)
973 { 1127 {
974 int c = k << 1; 1128 int c = k << 1;
975 1129
976 if (c > N + HEAP0 - 1) 1130 if (c >= N + HEAP0)
977 break; 1131 break;
978 1132
979 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1133 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
980 ? 1 : 0; 1134 ? 1 : 0;
981 1135
1017 1171
1018/* move an element suitably so it is in a correct place */ 1172/* move an element suitably so it is in a correct place */
1019inline_size void 1173inline_size void
1020adjustheap (ANHE *heap, int N, int k) 1174adjustheap (ANHE *heap, int N, int k)
1021{ 1175{
1022 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1176 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1023 upheap (heap, k); 1177 upheap (heap, k);
1024 else 1178 else
1025 downheap (heap, N, k); 1179 downheap (heap, N, k);
1026} 1180}
1027 1181
1040/*****************************************************************************/ 1194/*****************************************************************************/
1041 1195
1042/* associate signal watchers to a signal signal */ 1196/* associate signal watchers to a signal signal */
1043typedef struct 1197typedef struct
1044{ 1198{
1199 EV_ATOMIC_T pending;
1200#if EV_MULTIPLICITY
1201 EV_P;
1202#endif
1045 WL head; 1203 WL head;
1046 EV_ATOMIC_T gotsig;
1047} ANSIG; 1204} ANSIG;
1048 1205
1049static ANSIG *signals; 1206static ANSIG signals [EV_NSIG - 1];
1050static int signalmax;
1051
1052static EV_ATOMIC_T gotsig;
1053 1207
1054/*****************************************************************************/ 1208/*****************************************************************************/
1055 1209
1056/* used to prepare libev internal fd's */ 1210/* used to prepare libev internal fd's */
1057/* this is not fork-safe */ 1211/* this is not fork-safe */
1058inline_speed void 1212inline_speed void
1059fd_intern (int fd) 1213fd_intern (int fd)
1060{ 1214{
1061#ifdef _WIN32 1215#ifdef _WIN32
1062 unsigned long arg = 1; 1216 unsigned long arg = 1;
1063 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1217 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1064#else 1218#else
1065 fcntl (fd, F_SETFD, FD_CLOEXEC); 1219 fcntl (fd, F_SETFD, FD_CLOEXEC);
1066 fcntl (fd, F_SETFL, O_NONBLOCK); 1220 fcntl (fd, F_SETFL, O_NONBLOCK);
1067#endif 1221#endif
1068} 1222}
1071evpipe_init (EV_P) 1225evpipe_init (EV_P)
1072{ 1226{
1073 if (!ev_is_active (&pipe_w)) 1227 if (!ev_is_active (&pipe_w))
1074 { 1228 {
1075#if EV_USE_EVENTFD 1229#if EV_USE_EVENTFD
1230 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1231 if (evfd < 0 && errno == EINVAL)
1076 if ((evfd = eventfd (0, 0)) >= 0) 1232 evfd = eventfd (0, 0);
1233
1234 if (evfd >= 0)
1077 { 1235 {
1078 evpipe [0] = -1; 1236 evpipe [0] = -1;
1079 fd_intern (evfd); 1237 fd_intern (evfd); /* doing it twice doesn't hurt */
1080 ev_io_set (&pipe_w, evfd, EV_READ); 1238 ev_io_set (&pipe_w, evfd, EV_READ);
1081 } 1239 }
1082 else 1240 else
1083#endif 1241#endif
1084 { 1242 {
1121/* called whenever the libev signal pipe */ 1279/* called whenever the libev signal pipe */
1122/* got some events (signal, async) */ 1280/* got some events (signal, async) */
1123static void 1281static void
1124pipecb (EV_P_ ev_io *iow, int revents) 1282pipecb (EV_P_ ev_io *iow, int revents)
1125{ 1283{
1284 int i;
1285
1126#if EV_USE_EVENTFD 1286#if EV_USE_EVENTFD
1127 if (evfd >= 0) 1287 if (evfd >= 0)
1128 { 1288 {
1129 uint64_t counter; 1289 uint64_t counter;
1130 read (evfd, &counter, sizeof (uint64_t)); 1290 read (evfd, &counter, sizeof (uint64_t));
1134 { 1294 {
1135 char dummy; 1295 char dummy;
1136 read (evpipe [0], &dummy, 1); 1296 read (evpipe [0], &dummy, 1);
1137 } 1297 }
1138 1298
1139 if (gotsig && ev_is_default_loop (EV_A)) 1299 if (sig_pending)
1140 { 1300 {
1141 int signum; 1301 sig_pending = 0;
1142 gotsig = 0;
1143 1302
1144 for (signum = signalmax; signum--; ) 1303 for (i = EV_NSIG - 1; i--; )
1145 if (signals [signum].gotsig) 1304 if (expect_false (signals [i].pending))
1146 ev_feed_signal_event (EV_A_ signum + 1); 1305 ev_feed_signal_event (EV_A_ i + 1);
1147 } 1306 }
1148 1307
1149#if EV_ASYNC_ENABLE 1308#if EV_ASYNC_ENABLE
1150 if (gotasync) 1309 if (async_pending)
1151 { 1310 {
1152 int i; 1311 async_pending = 0;
1153 gotasync = 0;
1154 1312
1155 for (i = asynccnt; i--; ) 1313 for (i = asynccnt; i--; )
1156 if (asyncs [i]->sent) 1314 if (asyncs [i]->sent)
1157 { 1315 {
1158 asyncs [i]->sent = 0; 1316 asyncs [i]->sent = 0;
1166 1324
1167static void 1325static void
1168ev_sighandler (int signum) 1326ev_sighandler (int signum)
1169{ 1327{
1170#if EV_MULTIPLICITY 1328#if EV_MULTIPLICITY
1171 struct ev_loop *loop = &default_loop_struct; 1329 EV_P = signals [signum - 1].loop;
1172#endif 1330#endif
1173 1331
1174#if _WIN32 1332#ifdef _WIN32
1175 signal (signum, ev_sighandler); 1333 signal (signum, ev_sighandler);
1176#endif 1334#endif
1177 1335
1178 signals [signum - 1].gotsig = 1; 1336 signals [signum - 1].pending = 1;
1179 evpipe_write (EV_A_ &gotsig); 1337 evpipe_write (EV_A_ &sig_pending);
1180} 1338}
1181 1339
1182void noinline 1340void noinline
1183ev_feed_signal_event (EV_P_ int signum) 1341ev_feed_signal_event (EV_P_ int signum)
1184{ 1342{
1185 WL w; 1343 WL w;
1186 1344
1345 if (expect_false (signum <= 0 || signum > EV_NSIG))
1346 return;
1347
1348 --signum;
1349
1187#if EV_MULTIPLICITY 1350#if EV_MULTIPLICITY
1188 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1351 /* it is permissible to try to feed a signal to the wrong loop */
1189#endif 1352 /* or, likely more useful, feeding a signal nobody is waiting for */
1190 1353
1191 --signum; 1354 if (expect_false (signals [signum].loop != EV_A))
1192
1193 if (signum < 0 || signum >= signalmax)
1194 return; 1355 return;
1356#endif
1195 1357
1196 signals [signum].gotsig = 0; 1358 signals [signum].pending = 0;
1197 1359
1198 for (w = signals [signum].head; w; w = w->next) 1360 for (w = signals [signum].head; w; w = w->next)
1199 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1361 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1200} 1362}
1363
1364#if EV_USE_SIGNALFD
1365static void
1366sigfdcb (EV_P_ ev_io *iow, int revents)
1367{
1368 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1369
1370 for (;;)
1371 {
1372 ssize_t res = read (sigfd, si, sizeof (si));
1373
1374 /* not ISO-C, as res might be -1, but works with SuS */
1375 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1376 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1377
1378 if (res < (ssize_t)sizeof (si))
1379 break;
1380 }
1381}
1382#endif
1201 1383
1202/*****************************************************************************/ 1384/*****************************************************************************/
1203 1385
1204static WL childs [EV_PID_HASHSIZE]; 1386static WL childs [EV_PID_HASHSIZE];
1205 1387
1350ev_backend (EV_P) 1532ev_backend (EV_P)
1351{ 1533{
1352 return backend; 1534 return backend;
1353} 1535}
1354 1536
1537#if EV_MINIMAL < 2
1355unsigned int 1538unsigned int
1356ev_loop_count (EV_P) 1539ev_loop_count (EV_P)
1357{ 1540{
1358 return loop_count; 1541 return loop_count;
1359} 1542}
1360 1543
1544unsigned int
1545ev_loop_depth (EV_P)
1546{
1547 return loop_depth;
1548}
1549
1361void 1550void
1362ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1551ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1363{ 1552{
1364 io_blocktime = interval; 1553 io_blocktime = interval;
1365} 1554}
1367void 1556void
1368ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1557ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1369{ 1558{
1370 timeout_blocktime = interval; 1559 timeout_blocktime = interval;
1371} 1560}
1561
1562void
1563ev_set_userdata (EV_P_ void *data)
1564{
1565 userdata = data;
1566}
1567
1568void *
1569ev_userdata (EV_P)
1570{
1571 return userdata;
1572}
1573
1574void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1575{
1576 invoke_cb = invoke_pending_cb;
1577}
1578
1579void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1580{
1581 release_cb = release;
1582 acquire_cb = acquire;
1583}
1584#endif
1372 1585
1373/* initialise a loop structure, must be zero-initialised */ 1586/* initialise a loop structure, must be zero-initialised */
1374static void noinline 1587static void noinline
1375loop_init (EV_P_ unsigned int flags) 1588loop_init (EV_P_ unsigned int flags)
1376{ 1589{
1394 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1607 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1395 have_monotonic = 1; 1608 have_monotonic = 1;
1396 } 1609 }
1397#endif 1610#endif
1398 1611
1612 /* pid check not overridable via env */
1613#ifndef _WIN32
1614 if (flags & EVFLAG_FORKCHECK)
1615 curpid = getpid ();
1616#endif
1617
1618 if (!(flags & EVFLAG_NOENV)
1619 && !enable_secure ()
1620 && getenv ("LIBEV_FLAGS"))
1621 flags = atoi (getenv ("LIBEV_FLAGS"));
1622
1399 ev_rt_now = ev_time (); 1623 ev_rt_now = ev_time ();
1400 mn_now = get_clock (); 1624 mn_now = get_clock ();
1401 now_floor = mn_now; 1625 now_floor = mn_now;
1402 rtmn_diff = ev_rt_now - mn_now; 1626 rtmn_diff = ev_rt_now - mn_now;
1627#if EV_MINIMAL < 2
1628 invoke_cb = ev_invoke_pending;
1629#endif
1403 1630
1404 io_blocktime = 0.; 1631 io_blocktime = 0.;
1405 timeout_blocktime = 0.; 1632 timeout_blocktime = 0.;
1406 backend = 0; 1633 backend = 0;
1407 backend_fd = -1; 1634 backend_fd = -1;
1408 gotasync = 0; 1635 sig_pending = 0;
1636#if EV_ASYNC_ENABLE
1637 async_pending = 0;
1638#endif
1409#if EV_USE_INOTIFY 1639#if EV_USE_INOTIFY
1410 fs_fd = -2; 1640 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1411#endif 1641#endif
1412 1642#if EV_USE_SIGNALFD
1413 /* pid check not overridable via env */ 1643 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1414#ifndef _WIN32
1415 if (flags & EVFLAG_FORKCHECK)
1416 curpid = getpid ();
1417#endif 1644#endif
1418
1419 if (!(flags & EVFLAG_NOENV)
1420 && !enable_secure ()
1421 && getenv ("LIBEV_FLAGS"))
1422 flags = atoi (getenv ("LIBEV_FLAGS"));
1423 1645
1424 if (!(flags & 0x0000ffffU)) 1646 if (!(flags & 0x0000ffffU))
1425 flags |= ev_recommended_backends (); 1647 flags |= ev_recommended_backends ();
1426 1648
1427#if EV_USE_PORT 1649#if EV_USE_PORT
1453{ 1675{
1454 int i; 1676 int i;
1455 1677
1456 if (ev_is_active (&pipe_w)) 1678 if (ev_is_active (&pipe_w))
1457 { 1679 {
1458 ev_ref (EV_A); /* signal watcher */ 1680 /*ev_ref (EV_A);*/
1459 ev_io_stop (EV_A_ &pipe_w); 1681 /*ev_io_stop (EV_A_ &pipe_w);*/
1460 1682
1461#if EV_USE_EVENTFD 1683#if EV_USE_EVENTFD
1462 if (evfd >= 0) 1684 if (evfd >= 0)
1463 close (evfd); 1685 close (evfd);
1464#endif 1686#endif
1465 1687
1466 if (evpipe [0] >= 0) 1688 if (evpipe [0] >= 0)
1467 { 1689 {
1468 close (evpipe [0]); 1690 EV_WIN32_CLOSE_FD (evpipe [0]);
1469 close (evpipe [1]); 1691 EV_WIN32_CLOSE_FD (evpipe [1]);
1470 } 1692 }
1471 } 1693 }
1694
1695#if EV_USE_SIGNALFD
1696 if (ev_is_active (&sigfd_w))
1697 close (sigfd);
1698#endif
1472 1699
1473#if EV_USE_INOTIFY 1700#if EV_USE_INOTIFY
1474 if (fs_fd >= 0) 1701 if (fs_fd >= 0)
1475 close (fs_fd); 1702 close (fs_fd);
1476#endif 1703#endif
1500#if EV_IDLE_ENABLE 1727#if EV_IDLE_ENABLE
1501 array_free (idle, [i]); 1728 array_free (idle, [i]);
1502#endif 1729#endif
1503 } 1730 }
1504 1731
1505 ev_free (anfds); anfdmax = 0; 1732 ev_free (anfds); anfds = 0; anfdmax = 0;
1506 1733
1507 /* have to use the microsoft-never-gets-it-right macro */ 1734 /* have to use the microsoft-never-gets-it-right macro */
1508 array_free (rfeed, EMPTY); 1735 array_free (rfeed, EMPTY);
1509 array_free (fdchange, EMPTY); 1736 array_free (fdchange, EMPTY);
1510 array_free (timer, EMPTY); 1737 array_free (timer, EMPTY);
1545 1772
1546 if (ev_is_active (&pipe_w)) 1773 if (ev_is_active (&pipe_w))
1547 { 1774 {
1548 /* this "locks" the handlers against writing to the pipe */ 1775 /* this "locks" the handlers against writing to the pipe */
1549 /* while we modify the fd vars */ 1776 /* while we modify the fd vars */
1550 gotsig = 1; 1777 sig_pending = 1;
1551#if EV_ASYNC_ENABLE 1778#if EV_ASYNC_ENABLE
1552 gotasync = 1; 1779 async_pending = 1;
1553#endif 1780#endif
1554 1781
1555 ev_ref (EV_A); 1782 ev_ref (EV_A);
1556 ev_io_stop (EV_A_ &pipe_w); 1783 ev_io_stop (EV_A_ &pipe_w);
1557 1784
1560 close (evfd); 1787 close (evfd);
1561#endif 1788#endif
1562 1789
1563 if (evpipe [0] >= 0) 1790 if (evpipe [0] >= 0)
1564 { 1791 {
1565 close (evpipe [0]); 1792 EV_WIN32_CLOSE_FD (evpipe [0]);
1566 close (evpipe [1]); 1793 EV_WIN32_CLOSE_FD (evpipe [1]);
1567 } 1794 }
1568 1795
1569 evpipe_init (EV_A); 1796 evpipe_init (EV_A);
1570 /* now iterate over everything, in case we missed something */ 1797 /* now iterate over everything, in case we missed something */
1571 pipecb (EV_A_ &pipe_w, EV_READ); 1798 pipecb (EV_A_ &pipe_w, EV_READ);
1577#if EV_MULTIPLICITY 1804#if EV_MULTIPLICITY
1578 1805
1579struct ev_loop * 1806struct ev_loop *
1580ev_loop_new (unsigned int flags) 1807ev_loop_new (unsigned int flags)
1581{ 1808{
1582 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1809 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1583 1810
1584 memset (loop, 0, sizeof (struct ev_loop)); 1811 memset (EV_A, 0, sizeof (struct ev_loop));
1585
1586 loop_init (EV_A_ flags); 1812 loop_init (EV_A_ flags);
1587 1813
1588 if (ev_backend (EV_A)) 1814 if (ev_backend (EV_A))
1589 return loop; 1815 return EV_A;
1590 1816
1591 return 0; 1817 return 0;
1592} 1818}
1593 1819
1594void 1820void
1601void 1827void
1602ev_loop_fork (EV_P) 1828ev_loop_fork (EV_P)
1603{ 1829{
1604 postfork = 1; /* must be in line with ev_default_fork */ 1830 postfork = 1; /* must be in line with ev_default_fork */
1605} 1831}
1832#endif /* multiplicity */
1606 1833
1607#if EV_VERIFY 1834#if EV_VERIFY
1608static void noinline 1835static void noinline
1609verify_watcher (EV_P_ W w) 1836verify_watcher (EV_P_ W w)
1610{ 1837{
1638 verify_watcher (EV_A_ ws [cnt]); 1865 verify_watcher (EV_A_ ws [cnt]);
1639 } 1866 }
1640} 1867}
1641#endif 1868#endif
1642 1869
1870#if EV_MINIMAL < 2
1643void 1871void
1644ev_loop_verify (EV_P) 1872ev_loop_verify (EV_P)
1645{ 1873{
1646#if EV_VERIFY 1874#if EV_VERIFY
1647 int i; 1875 int i;
1696 assert (checkmax >= checkcnt); 1924 assert (checkmax >= checkcnt);
1697 array_verify (EV_A_ (W *)checks, checkcnt); 1925 array_verify (EV_A_ (W *)checks, checkcnt);
1698 1926
1699# if 0 1927# if 0
1700 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1928 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1701 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1929 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1702# endif
1703#endif 1930# endif
1931#endif
1704} 1932}
1705 1933#endif
1706#endif /* multiplicity */
1707 1934
1708#if EV_MULTIPLICITY 1935#if EV_MULTIPLICITY
1709struct ev_loop * 1936struct ev_loop *
1710ev_default_loop_init (unsigned int flags) 1937ev_default_loop_init (unsigned int flags)
1711#else 1938#else
1714#endif 1941#endif
1715{ 1942{
1716 if (!ev_default_loop_ptr) 1943 if (!ev_default_loop_ptr)
1717 { 1944 {
1718#if EV_MULTIPLICITY 1945#if EV_MULTIPLICITY
1719 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1946 EV_P = ev_default_loop_ptr = &default_loop_struct;
1720#else 1947#else
1721 ev_default_loop_ptr = 1; 1948 ev_default_loop_ptr = 1;
1722#endif 1949#endif
1723 1950
1724 loop_init (EV_A_ flags); 1951 loop_init (EV_A_ flags);
1741 1968
1742void 1969void
1743ev_default_destroy (void) 1970ev_default_destroy (void)
1744{ 1971{
1745#if EV_MULTIPLICITY 1972#if EV_MULTIPLICITY
1746 struct ev_loop *loop = ev_default_loop_ptr; 1973 EV_P = ev_default_loop_ptr;
1747#endif 1974#endif
1748 1975
1749 ev_default_loop_ptr = 0; 1976 ev_default_loop_ptr = 0;
1750 1977
1751#ifndef _WIN32 1978#ifndef _WIN32
1758 1985
1759void 1986void
1760ev_default_fork (void) 1987ev_default_fork (void)
1761{ 1988{
1762#if EV_MULTIPLICITY 1989#if EV_MULTIPLICITY
1763 struct ev_loop *loop = ev_default_loop_ptr; 1990 EV_P = ev_default_loop_ptr;
1764#endif 1991#endif
1765 1992
1766 postfork = 1; /* must be in line with ev_loop_fork */ 1993 postfork = 1; /* must be in line with ev_loop_fork */
1767} 1994}
1768 1995
1772ev_invoke (EV_P_ void *w, int revents) 1999ev_invoke (EV_P_ void *w, int revents)
1773{ 2000{
1774 EV_CB_INVOKE ((W)w, revents); 2001 EV_CB_INVOKE ((W)w, revents);
1775} 2002}
1776 2003
1777inline_speed void 2004unsigned int
1778call_pending (EV_P) 2005ev_pending_count (EV_P)
2006{
2007 int pri;
2008 unsigned int count = 0;
2009
2010 for (pri = NUMPRI; pri--; )
2011 count += pendingcnt [pri];
2012
2013 return count;
2014}
2015
2016void noinline
2017ev_invoke_pending (EV_P)
1779{ 2018{
1780 int pri; 2019 int pri;
1781 2020
1782 for (pri = NUMPRI; pri--; ) 2021 for (pri = NUMPRI; pri--; )
1783 while (pendingcnt [pri]) 2022 while (pendingcnt [pri])
1951 ANHE_at_cache (*he); 2190 ANHE_at_cache (*he);
1952 } 2191 }
1953} 2192}
1954 2193
1955/* fetch new monotonic and realtime times from the kernel */ 2194/* fetch new monotonic and realtime times from the kernel */
1956/* also detetc if there was a timejump, and act accordingly */ 2195/* also detect if there was a timejump, and act accordingly */
1957inline_speed void 2196inline_speed void
1958time_update (EV_P_ ev_tstamp max_block) 2197time_update (EV_P_ ev_tstamp max_block)
1959{ 2198{
1960#if EV_USE_MONOTONIC 2199#if EV_USE_MONOTONIC
1961 if (expect_true (have_monotonic)) 2200 if (expect_true (have_monotonic))
2018 2257
2019 mn_now = ev_rt_now; 2258 mn_now = ev_rt_now;
2020 } 2259 }
2021} 2260}
2022 2261
2023static int loop_done;
2024
2025void 2262void
2026ev_loop (EV_P_ int flags) 2263ev_loop (EV_P_ int flags)
2027{ 2264{
2265#if EV_MINIMAL < 2
2266 ++loop_depth;
2267#endif
2268
2269 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2270
2028 loop_done = EVUNLOOP_CANCEL; 2271 loop_done = EVUNLOOP_CANCEL;
2029 2272
2030 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2273 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2031 2274
2032 do 2275 do
2033 { 2276 {
2034#if EV_VERIFY >= 2 2277#if EV_VERIFY >= 2
2035 ev_loop_verify (EV_A); 2278 ev_loop_verify (EV_A);
2048 /* we might have forked, so queue fork handlers */ 2291 /* we might have forked, so queue fork handlers */
2049 if (expect_false (postfork)) 2292 if (expect_false (postfork))
2050 if (forkcnt) 2293 if (forkcnt)
2051 { 2294 {
2052 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2295 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2053 call_pending (EV_A); 2296 EV_INVOKE_PENDING;
2054 } 2297 }
2055#endif 2298#endif
2056 2299
2057 /* queue prepare watchers (and execute them) */ 2300 /* queue prepare watchers (and execute them) */
2058 if (expect_false (preparecnt)) 2301 if (expect_false (preparecnt))
2059 { 2302 {
2060 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2303 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2061 call_pending (EV_A); 2304 EV_INVOKE_PENDING;
2062 } 2305 }
2306
2307 if (expect_false (loop_done))
2308 break;
2063 2309
2064 /* we might have forked, so reify kernel state if necessary */ 2310 /* we might have forked, so reify kernel state if necessary */
2065 if (expect_false (postfork)) 2311 if (expect_false (postfork))
2066 loop_fork (EV_A); 2312 loop_fork (EV_A);
2067 2313
2073 ev_tstamp waittime = 0.; 2319 ev_tstamp waittime = 0.;
2074 ev_tstamp sleeptime = 0.; 2320 ev_tstamp sleeptime = 0.;
2075 2321
2076 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2322 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2077 { 2323 {
2324 /* remember old timestamp for io_blocktime calculation */
2325 ev_tstamp prev_mn_now = mn_now;
2326
2078 /* update time to cancel out callback processing overhead */ 2327 /* update time to cancel out callback processing overhead */
2079 time_update (EV_A_ 1e100); 2328 time_update (EV_A_ 1e100);
2080 2329
2081 waittime = MAX_BLOCKTIME; 2330 waittime = MAX_BLOCKTIME;
2082 2331
2092 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2341 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2093 if (waittime > to) waittime = to; 2342 if (waittime > to) waittime = to;
2094 } 2343 }
2095#endif 2344#endif
2096 2345
2346 /* don't let timeouts decrease the waittime below timeout_blocktime */
2097 if (expect_false (waittime < timeout_blocktime)) 2347 if (expect_false (waittime < timeout_blocktime))
2098 waittime = timeout_blocktime; 2348 waittime = timeout_blocktime;
2099 2349
2100 sleeptime = waittime - backend_fudge; 2350 /* extra check because io_blocktime is commonly 0 */
2101
2102 if (expect_true (sleeptime > io_blocktime)) 2351 if (expect_false (io_blocktime))
2103 sleeptime = io_blocktime;
2104
2105 if (sleeptime)
2106 { 2352 {
2353 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2354
2355 if (sleeptime > waittime - backend_fudge)
2356 sleeptime = waittime - backend_fudge;
2357
2358 if (expect_true (sleeptime > 0.))
2359 {
2107 ev_sleep (sleeptime); 2360 ev_sleep (sleeptime);
2108 waittime -= sleeptime; 2361 waittime -= sleeptime;
2362 }
2109 } 2363 }
2110 } 2364 }
2111 2365
2366#if EV_MINIMAL < 2
2112 ++loop_count; 2367 ++loop_count;
2368#endif
2369 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2113 backend_poll (EV_A_ waittime); 2370 backend_poll (EV_A_ waittime);
2371 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2114 2372
2115 /* update ev_rt_now, do magic */ 2373 /* update ev_rt_now, do magic */
2116 time_update (EV_A_ waittime + sleeptime); 2374 time_update (EV_A_ waittime + sleeptime);
2117 } 2375 }
2118 2376
2129 2387
2130 /* queue check watchers, to be executed first */ 2388 /* queue check watchers, to be executed first */
2131 if (expect_false (checkcnt)) 2389 if (expect_false (checkcnt))
2132 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2390 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2133 2391
2134 call_pending (EV_A); 2392 EV_INVOKE_PENDING;
2135 } 2393 }
2136 while (expect_true ( 2394 while (expect_true (
2137 activecnt 2395 activecnt
2138 && !loop_done 2396 && !loop_done
2139 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2397 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2140 )); 2398 ));
2141 2399
2142 if (loop_done == EVUNLOOP_ONE) 2400 if (loop_done == EVUNLOOP_ONE)
2143 loop_done = EVUNLOOP_CANCEL; 2401 loop_done = EVUNLOOP_CANCEL;
2402
2403#if EV_MINIMAL < 2
2404 --loop_depth;
2405#endif
2144} 2406}
2145 2407
2146void 2408void
2147ev_unloop (EV_P_ int how) 2409ev_unloop (EV_P_ int how)
2148{ 2410{
2199inline_size void 2461inline_size void
2200wlist_del (WL *head, WL elem) 2462wlist_del (WL *head, WL elem)
2201{ 2463{
2202 while (*head) 2464 while (*head)
2203 { 2465 {
2204 if (*head == elem) 2466 if (expect_true (*head == elem))
2205 { 2467 {
2206 *head = elem->next; 2468 *head = elem->next;
2207 return; 2469 break;
2208 } 2470 }
2209 2471
2210 head = &(*head)->next; 2472 head = &(*head)->next;
2211 } 2473 }
2212} 2474}
2240} 2502}
2241 2503
2242inline_size void 2504inline_size void
2243pri_adjust (EV_P_ W w) 2505pri_adjust (EV_P_ W w)
2244{ 2506{
2245 int pri = w->priority; 2507 int pri = ev_priority (w);
2246 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2508 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2247 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2509 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2248 w->priority = pri; 2510 ev_set_priority (w, pri);
2249} 2511}
2250 2512
2251inline_speed void 2513inline_speed void
2252ev_start (EV_P_ W w, int active) 2514ev_start (EV_P_ W w, int active)
2253{ 2515{
2272 2534
2273 if (expect_false (ev_is_active (w))) 2535 if (expect_false (ev_is_active (w)))
2274 return; 2536 return;
2275 2537
2276 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2538 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2277 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2539 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2278 2540
2279 EV_FREQUENT_CHECK; 2541 EV_FREQUENT_CHECK;
2280 2542
2281 ev_start (EV_A_ (W)w, 1); 2543 ev_start (EV_A_ (W)w, 1);
2282 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2544 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2283 wlist_add (&anfds[fd].head, (WL)w); 2545 wlist_add (&anfds[fd].head, (WL)w);
2284 2546
2285 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2547 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2286 w->events &= ~EV__IOFDSET; 2548 w->events &= ~EV__IOFDSET;
2287 2549
2288 EV_FREQUENT_CHECK; 2550 EV_FREQUENT_CHECK;
2289} 2551}
2290 2552
2352 timers [active] = timers [timercnt + HEAP0]; 2614 timers [active] = timers [timercnt + HEAP0];
2353 adjustheap (timers, timercnt, active); 2615 adjustheap (timers, timercnt, active);
2354 } 2616 }
2355 } 2617 }
2356 2618
2357 EV_FREQUENT_CHECK;
2358
2359 ev_at (w) -= mn_now; 2619 ev_at (w) -= mn_now;
2360 2620
2361 ev_stop (EV_A_ (W)w); 2621 ev_stop (EV_A_ (W)w);
2622
2623 EV_FREQUENT_CHECK;
2362} 2624}
2363 2625
2364void noinline 2626void noinline
2365ev_timer_again (EV_P_ ev_timer *w) 2627ev_timer_again (EV_P_ ev_timer *w)
2366{ 2628{
2384 } 2646 }
2385 2647
2386 EV_FREQUENT_CHECK; 2648 EV_FREQUENT_CHECK;
2387} 2649}
2388 2650
2651ev_tstamp
2652ev_timer_remaining (EV_P_ ev_timer *w)
2653{
2654 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2655}
2656
2389#if EV_PERIODIC_ENABLE 2657#if EV_PERIODIC_ENABLE
2390void noinline 2658void noinline
2391ev_periodic_start (EV_P_ ev_periodic *w) 2659ev_periodic_start (EV_P_ ev_periodic *w)
2392{ 2660{
2393 if (expect_false (ev_is_active (w))) 2661 if (expect_false (ev_is_active (w)))
2439 periodics [active] = periodics [periodiccnt + HEAP0]; 2707 periodics [active] = periodics [periodiccnt + HEAP0];
2440 adjustheap (periodics, periodiccnt, active); 2708 adjustheap (periodics, periodiccnt, active);
2441 } 2709 }
2442 } 2710 }
2443 2711
2444 EV_FREQUENT_CHECK;
2445
2446 ev_stop (EV_A_ (W)w); 2712 ev_stop (EV_A_ (W)w);
2713
2714 EV_FREQUENT_CHECK;
2447} 2715}
2448 2716
2449void noinline 2717void noinline
2450ev_periodic_again (EV_P_ ev_periodic *w) 2718ev_periodic_again (EV_P_ ev_periodic *w)
2451{ 2719{
2460#endif 2728#endif
2461 2729
2462void noinline 2730void noinline
2463ev_signal_start (EV_P_ ev_signal *w) 2731ev_signal_start (EV_P_ ev_signal *w)
2464{ 2732{
2465#if EV_MULTIPLICITY
2466 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2467#endif
2468 if (expect_false (ev_is_active (w))) 2733 if (expect_false (ev_is_active (w)))
2469 return; 2734 return;
2470 2735
2471 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2736 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2472 2737
2473 evpipe_init (EV_A); 2738#if EV_MULTIPLICITY
2739 assert (("libev: a signal must not be attached to two different loops",
2740 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2474 2741
2475 EV_FREQUENT_CHECK; 2742 signals [w->signum - 1].loop = EV_A;
2743#endif
2476 2744
2745 EV_FREQUENT_CHECK;
2746
2747#if EV_USE_SIGNALFD
2748 if (sigfd == -2)
2477 { 2749 {
2478#ifndef _WIN32 2750 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2479 sigset_t full, prev; 2751 if (sigfd < 0 && errno == EINVAL)
2480 sigfillset (&full); 2752 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2481 sigprocmask (SIG_SETMASK, &full, &prev);
2482#endif
2483 2753
2484 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2754 if (sigfd >= 0)
2755 {
2756 fd_intern (sigfd); /* doing it twice will not hurt */
2485 2757
2486#ifndef _WIN32 2758 sigemptyset (&sigfd_set);
2487 sigprocmask (SIG_SETMASK, &prev, 0); 2759
2488#endif 2760 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2761 ev_set_priority (&sigfd_w, EV_MAXPRI);
2762 ev_io_start (EV_A_ &sigfd_w);
2763 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2764 }
2489 } 2765 }
2766
2767 if (sigfd >= 0)
2768 {
2769 /* TODO: check .head */
2770 sigaddset (&sigfd_set, w->signum);
2771 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2772
2773 signalfd (sigfd, &sigfd_set, 0);
2774 }
2775#endif
2490 2776
2491 ev_start (EV_A_ (W)w, 1); 2777 ev_start (EV_A_ (W)w, 1);
2492 wlist_add (&signals [w->signum - 1].head, (WL)w); 2778 wlist_add (&signals [w->signum - 1].head, (WL)w);
2493 2779
2494 if (!((WL)w)->next) 2780 if (!((WL)w)->next)
2781# if EV_USE_SIGNALFD
2782 if (sigfd < 0) /*TODO*/
2783# endif
2495 { 2784 {
2496#if _WIN32 2785# ifdef _WIN32
2786 evpipe_init (EV_A);
2787
2497 signal (w->signum, ev_sighandler); 2788 signal (w->signum, ev_sighandler);
2498#else 2789# else
2499 struct sigaction sa; 2790 struct sigaction sa;
2791
2792 evpipe_init (EV_A);
2793
2500 sa.sa_handler = ev_sighandler; 2794 sa.sa_handler = ev_sighandler;
2501 sigfillset (&sa.sa_mask); 2795 sigfillset (&sa.sa_mask);
2502 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2796 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2503 sigaction (w->signum, &sa, 0); 2797 sigaction (w->signum, &sa, 0);
2798
2799 sigemptyset (&sa.sa_mask);
2800 sigaddset (&sa.sa_mask, w->signum);
2801 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2504#endif 2802#endif
2505 } 2803 }
2506 2804
2507 EV_FREQUENT_CHECK; 2805 EV_FREQUENT_CHECK;
2508} 2806}
2509 2807
2510void noinline 2808void noinline
2518 2816
2519 wlist_del (&signals [w->signum - 1].head, (WL)w); 2817 wlist_del (&signals [w->signum - 1].head, (WL)w);
2520 ev_stop (EV_A_ (W)w); 2818 ev_stop (EV_A_ (W)w);
2521 2819
2522 if (!signals [w->signum - 1].head) 2820 if (!signals [w->signum - 1].head)
2821 {
2822#if EV_MULTIPLICITY
2823 signals [w->signum - 1].loop = 0; /* unattach from signal */
2824#endif
2825#if EV_USE_SIGNALFD
2826 if (sigfd >= 0)
2827 {
2828 sigset_t ss;
2829
2830 sigemptyset (&ss);
2831 sigaddset (&ss, w->signum);
2832 sigdelset (&sigfd_set, w->signum);
2833
2834 signalfd (sigfd, &sigfd_set, 0);
2835 sigprocmask (SIG_UNBLOCK, &ss, 0);
2836 }
2837 else
2838#endif
2523 signal (w->signum, SIG_DFL); 2839 signal (w->signum, SIG_DFL);
2840 }
2524 2841
2525 EV_FREQUENT_CHECK; 2842 EV_FREQUENT_CHECK;
2526} 2843}
2527 2844
2528void 2845void
2569#define MIN_STAT_INTERVAL 0.1074891 2886#define MIN_STAT_INTERVAL 0.1074891
2570 2887
2571static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2888static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2572 2889
2573#if EV_USE_INOTIFY 2890#if EV_USE_INOTIFY
2574# define EV_INOTIFY_BUFSIZE 8192 2891
2892/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2893# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2575 2894
2576static void noinline 2895static void noinline
2577infy_add (EV_P_ ev_stat *w) 2896infy_add (EV_P_ ev_stat *w)
2578{ 2897{
2579 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); 2898 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);
2580 2899
2581 if (w->wd < 0) 2900 if (w->wd >= 0)
2901 {
2902 struct statfs sfs;
2903
2904 /* now local changes will be tracked by inotify, but remote changes won't */
2905 /* unless the filesystem is known to be local, we therefore still poll */
2906 /* also do poll on <2.6.25, but with normal frequency */
2907
2908 if (!fs_2625)
2909 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2910 else if (!statfs (w->path, &sfs)
2911 && (sfs.f_type == 0x1373 /* devfs */
2912 || sfs.f_type == 0xEF53 /* ext2/3 */
2913 || sfs.f_type == 0x3153464a /* jfs */
2914 || sfs.f_type == 0x52654973 /* reiser3 */
2915 || sfs.f_type == 0x01021994 /* tempfs */
2916 || sfs.f_type == 0x58465342 /* xfs */))
2917 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2918 else
2919 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2582 { 2920 }
2921 else
2922 {
2923 /* can't use inotify, continue to stat */
2583 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2924 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2584 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2585 2925
2586 /* monitor some parent directory for speedup hints */ 2926 /* if path is not there, monitor some parent directory for speedup hints */
2587 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2927 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2588 /* but an efficiency issue only */ 2928 /* but an efficiency issue only */
2589 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2929 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2590 { 2930 {
2591 char path [4096]; 2931 char path [4096];
2607 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2947 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2608 } 2948 }
2609 } 2949 }
2610 2950
2611 if (w->wd >= 0) 2951 if (w->wd >= 0)
2612 {
2613 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2952 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2614 2953
2615 /* now local changes will be tracked by inotify, but remote changes won't */ 2954 /* now re-arm timer, if required */
2616 /* unless the filesystem it known to be local, we therefore still poll */ 2955 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2617 /* also do poll on <2.6.25, but with normal frequency */
2618 struct statfs sfs;
2619
2620 if (fs_2625 && !statfs (w->path, &sfs))
2621 if (sfs.f_type == 0x1373 /* devfs */
2622 || sfs.f_type == 0xEF53 /* ext2/3 */
2623 || sfs.f_type == 0x3153464a /* jfs */
2624 || sfs.f_type == 0x52654973 /* reiser3 */
2625 || sfs.f_type == 0x01021994 /* tempfs */
2626 || sfs.f_type == 0x58465342 /* xfs */)
2627 return;
2628
2629 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2630 ev_timer_again (EV_A_ &w->timer); 2956 ev_timer_again (EV_A_ &w->timer);
2631 } 2957 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2632} 2958}
2633 2959
2634static void noinline 2960static void noinline
2635infy_del (EV_P_ ev_stat *w) 2961infy_del (EV_P_ ev_stat *w)
2636{ 2962{
2681 3007
2682static void 3008static void
2683infy_cb (EV_P_ ev_io *w, int revents) 3009infy_cb (EV_P_ ev_io *w, int revents)
2684{ 3010{
2685 char buf [EV_INOTIFY_BUFSIZE]; 3011 char buf [EV_INOTIFY_BUFSIZE];
2686 struct inotify_event *ev = (struct inotify_event *)buf;
2687 int ofs; 3012 int ofs;
2688 int len = read (fs_fd, buf, sizeof (buf)); 3013 int len = read (fs_fd, buf, sizeof (buf));
2689 3014
2690 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3015 for (ofs = 0; ofs < len; )
3016 {
3017 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2691 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3018 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3019 ofs += sizeof (struct inotify_event) + ev->len;
3020 }
3021}
3022
3023inline_size unsigned int
3024ev_linux_version (void)
3025{
3026 struct utsname buf;
3027 unsigned int v;
3028 int i;
3029 char *p = buf.release;
3030
3031 if (uname (&buf))
3032 return 0;
3033
3034 for (i = 3+1; --i; )
3035 {
3036 unsigned int c = 0;
3037
3038 for (;;)
3039 {
3040 if (*p >= '0' && *p <= '9')
3041 c = c * 10 + *p++ - '0';
3042 else
3043 {
3044 p += *p == '.';
3045 break;
3046 }
3047 }
3048
3049 v = (v << 8) | c;
3050 }
3051
3052 return v;
2692} 3053}
2693 3054
2694inline_size void 3055inline_size void
2695check_2625 (EV_P) 3056ev_check_2625 (EV_P)
2696{ 3057{
2697 /* kernels < 2.6.25 are borked 3058 /* kernels < 2.6.25 are borked
2698 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3059 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2699 */ 3060 */
2700 struct utsname buf; 3061 if (ev_linux_version () < 0x020619)
2701 int major, minor, micro;
2702
2703 if (uname (&buf))
2704 return; 3062 return;
2705 3063
2706 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2707 return;
2708
2709 if (major < 2
2710 || (major == 2 && minor < 6)
2711 || (major == 2 && minor == 6 && micro < 25))
2712 return;
2713
2714 fs_2625 = 1; 3064 fs_2625 = 1;
3065}
3066
3067inline_size int
3068infy_newfd (void)
3069{
3070#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3071 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3072 if (fd >= 0)
3073 return fd;
3074#endif
3075 return inotify_init ();
2715} 3076}
2716 3077
2717inline_size void 3078inline_size void
2718infy_init (EV_P) 3079infy_init (EV_P)
2719{ 3080{
2720 if (fs_fd != -2) 3081 if (fs_fd != -2)
2721 return; 3082 return;
2722 3083
2723 fs_fd = -1; 3084 fs_fd = -1;
2724 3085
2725 check_2625 (EV_A); 3086 ev_check_2625 (EV_A);
2726 3087
2727 fs_fd = inotify_init (); 3088 fs_fd = infy_newfd ();
2728 3089
2729 if (fs_fd >= 0) 3090 if (fs_fd >= 0)
2730 { 3091 {
3092 fd_intern (fs_fd);
2731 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3093 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2732 ev_set_priority (&fs_w, EV_MAXPRI); 3094 ev_set_priority (&fs_w, EV_MAXPRI);
2733 ev_io_start (EV_A_ &fs_w); 3095 ev_io_start (EV_A_ &fs_w);
3096 ev_unref (EV_A);
2734 } 3097 }
2735} 3098}
2736 3099
2737inline_size void 3100inline_size void
2738infy_fork (EV_P) 3101infy_fork (EV_P)
2740 int slot; 3103 int slot;
2741 3104
2742 if (fs_fd < 0) 3105 if (fs_fd < 0)
2743 return; 3106 return;
2744 3107
3108 ev_ref (EV_A);
3109 ev_io_stop (EV_A_ &fs_w);
2745 close (fs_fd); 3110 close (fs_fd);
2746 fs_fd = inotify_init (); 3111 fs_fd = infy_newfd ();
3112
3113 if (fs_fd >= 0)
3114 {
3115 fd_intern (fs_fd);
3116 ev_io_set (&fs_w, fs_fd, EV_READ);
3117 ev_io_start (EV_A_ &fs_w);
3118 ev_unref (EV_A);
3119 }
2747 3120
2748 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3121 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2749 { 3122 {
2750 WL w_ = fs_hash [slot].head; 3123 WL w_ = fs_hash [slot].head;
2751 fs_hash [slot].head = 0; 3124 fs_hash [slot].head = 0;
2758 w->wd = -1; 3131 w->wd = -1;
2759 3132
2760 if (fs_fd >= 0) 3133 if (fs_fd >= 0)
2761 infy_add (EV_A_ w); /* re-add, no matter what */ 3134 infy_add (EV_A_ w); /* re-add, no matter what */
2762 else 3135 else
3136 {
3137 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3138 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2763 ev_timer_again (EV_A_ &w->timer); 3139 ev_timer_again (EV_A_ &w->timer);
3140 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3141 }
2764 } 3142 }
2765 } 3143 }
2766} 3144}
2767 3145
2768#endif 3146#endif
2785static void noinline 3163static void noinline
2786stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3164stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2787{ 3165{
2788 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3166 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2789 3167
2790 /* we copy this here each the time so that */ 3168 ev_statdata prev = w->attr;
2791 /* prev has the old value when the callback gets invoked */
2792 w->prev = w->attr;
2793 ev_stat_stat (EV_A_ w); 3169 ev_stat_stat (EV_A_ w);
2794 3170
2795 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3171 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2796 if ( 3172 if (
2797 w->prev.st_dev != w->attr.st_dev 3173 prev.st_dev != w->attr.st_dev
2798 || w->prev.st_ino != w->attr.st_ino 3174 || prev.st_ino != w->attr.st_ino
2799 || w->prev.st_mode != w->attr.st_mode 3175 || prev.st_mode != w->attr.st_mode
2800 || w->prev.st_nlink != w->attr.st_nlink 3176 || prev.st_nlink != w->attr.st_nlink
2801 || w->prev.st_uid != w->attr.st_uid 3177 || prev.st_uid != w->attr.st_uid
2802 || w->prev.st_gid != w->attr.st_gid 3178 || prev.st_gid != w->attr.st_gid
2803 || w->prev.st_rdev != w->attr.st_rdev 3179 || prev.st_rdev != w->attr.st_rdev
2804 || w->prev.st_size != w->attr.st_size 3180 || prev.st_size != w->attr.st_size
2805 || w->prev.st_atime != w->attr.st_atime 3181 || prev.st_atime != w->attr.st_atime
2806 || w->prev.st_mtime != w->attr.st_mtime 3182 || prev.st_mtime != w->attr.st_mtime
2807 || w->prev.st_ctime != w->attr.st_ctime 3183 || prev.st_ctime != w->attr.st_ctime
2808 ) { 3184 ) {
3185 /* we only update w->prev on actual differences */
3186 /* in case we test more often than invoke the callback, */
3187 /* to ensure that prev is always different to attr */
3188 w->prev = prev;
3189
2809 #if EV_USE_INOTIFY 3190 #if EV_USE_INOTIFY
2810 if (fs_fd >= 0) 3191 if (fs_fd >= 0)
2811 { 3192 {
2812 infy_del (EV_A_ w); 3193 infy_del (EV_A_ w);
2813 infy_add (EV_A_ w); 3194 infy_add (EV_A_ w);
2838 3219
2839 if (fs_fd >= 0) 3220 if (fs_fd >= 0)
2840 infy_add (EV_A_ w); 3221 infy_add (EV_A_ w);
2841 else 3222 else
2842#endif 3223#endif
3224 {
2843 ev_timer_again (EV_A_ &w->timer); 3225 ev_timer_again (EV_A_ &w->timer);
3226 ev_unref (EV_A);
3227 }
2844 3228
2845 ev_start (EV_A_ (W)w, 1); 3229 ev_start (EV_A_ (W)w, 1);
2846 3230
2847 EV_FREQUENT_CHECK; 3231 EV_FREQUENT_CHECK;
2848} 3232}
2857 EV_FREQUENT_CHECK; 3241 EV_FREQUENT_CHECK;
2858 3242
2859#if EV_USE_INOTIFY 3243#if EV_USE_INOTIFY
2860 infy_del (EV_A_ w); 3244 infy_del (EV_A_ w);
2861#endif 3245#endif
3246
3247 if (ev_is_active (&w->timer))
3248 {
3249 ev_ref (EV_A);
2862 ev_timer_stop (EV_A_ &w->timer); 3250 ev_timer_stop (EV_A_ &w->timer);
3251 }
2863 3252
2864 ev_stop (EV_A_ (W)w); 3253 ev_stop (EV_A_ (W)w);
2865 3254
2866 EV_FREQUENT_CHECK; 3255 EV_FREQUENT_CHECK;
2867} 3256}
3008embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3397embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3009{ 3398{
3010 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3399 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3011 3400
3012 { 3401 {
3013 struct ev_loop *loop = w->other; 3402 EV_P = w->other;
3014 3403
3015 while (fdchangecnt) 3404 while (fdchangecnt)
3016 { 3405 {
3017 fd_reify (EV_A); 3406 fd_reify (EV_A);
3018 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3407 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3026 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3415 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3027 3416
3028 ev_embed_stop (EV_A_ w); 3417 ev_embed_stop (EV_A_ w);
3029 3418
3030 { 3419 {
3031 struct ev_loop *loop = w->other; 3420 EV_P = w->other;
3032 3421
3033 ev_loop_fork (EV_A); 3422 ev_loop_fork (EV_A);
3034 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3423 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3035 } 3424 }
3036 3425
3050{ 3439{
3051 if (expect_false (ev_is_active (w))) 3440 if (expect_false (ev_is_active (w)))
3052 return; 3441 return;
3053 3442
3054 { 3443 {
3055 struct ev_loop *loop = w->other; 3444 EV_P = w->other;
3056 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3445 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3057 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3446 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3058 } 3447 }
3059 3448
3060 EV_FREQUENT_CHECK; 3449 EV_FREQUENT_CHECK;
3087 3476
3088 ev_io_stop (EV_A_ &w->io); 3477 ev_io_stop (EV_A_ &w->io);
3089 ev_prepare_stop (EV_A_ &w->prepare); 3478 ev_prepare_stop (EV_A_ &w->prepare);
3090 ev_fork_stop (EV_A_ &w->fork); 3479 ev_fork_stop (EV_A_ &w->fork);
3091 3480
3481 ev_stop (EV_A_ (W)w);
3482
3092 EV_FREQUENT_CHECK; 3483 EV_FREQUENT_CHECK;
3093} 3484}
3094#endif 3485#endif
3095 3486
3096#if EV_FORK_ENABLE 3487#if EV_FORK_ENABLE
3172 3563
3173void 3564void
3174ev_async_send (EV_P_ ev_async *w) 3565ev_async_send (EV_P_ ev_async *w)
3175{ 3566{
3176 w->sent = 1; 3567 w->sent = 1;
3177 evpipe_write (EV_A_ &gotasync); 3568 evpipe_write (EV_A_ &async_pending);
3178} 3569}
3179#endif 3570#endif
3180 3571
3181/*****************************************************************************/ 3572/*****************************************************************************/
3182 3573
3331 if (types & EV_CHECK) 3722 if (types & EV_CHECK)
3332 for (i = checkcnt; i--; ) 3723 for (i = checkcnt; i--; )
3333 cb (EV_A_ EV_CHECK, checks [i]); 3724 cb (EV_A_ EV_CHECK, checks [i]);
3334 3725
3335 if (types & EV_SIGNAL) 3726 if (types & EV_SIGNAL)
3336 for (i = 0; i < signalmax; ++i) 3727 for (i = 0; i < EV_NSIG - 1; ++i)
3337 for (wl = signals [i].head; wl; ) 3728 for (wl = signals [i].head; wl; )
3338 { 3729 {
3339 wn = wl->next; 3730 wn = wl->next;
3340 cb (EV_A_ EV_SIGNAL, wl); 3731 cb (EV_A_ EV_SIGNAL, wl);
3341 wl = wn; 3732 wl = wn;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines