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

Comparing libev/ev.c (file contents):
Revision 1.296 by root, Thu Jul 9 09:11:20 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
419 509
420#if EV_USE_MONOTONIC 510#if EV_USE_MONOTONIC
421static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 511static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
422#endif 512#endif
423 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
424#ifdef _WIN32 524#ifdef _WIN32
425# include "ev_win32.c" 525# include "ev_win32.c"
426#endif 526#endif
427 527
428/*****************************************************************************/ 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
429 537
430static void (*syserr_cb)(const char *msg); 538static void (*syserr_cb)(const char *msg);
431 539
432void 540void
433ev_set_syserr_cb (void (*cb)(const char *msg)) 541ev_set_syserr_cb (void (*cb)(const char *msg))
443 551
444 if (syserr_cb) 552 if (syserr_cb)
445 syserr_cb (msg); 553 syserr_cb (msg);
446 else 554 else
447 { 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
448 perror (msg); 564 perror (msg);
565#endif
449 abort (); 566 abort ();
450 } 567 }
451} 568}
452 569
453static void * 570static void *
454ev_realloc_emul (void *ptr, long size) 571ev_realloc_emul (void *ptr, long size)
455{ 572{
573#if __GLIBC__
574 return realloc (ptr, size);
575#else
456 /* some systems, notably openbsd and darwin, fail to properly 576 /* some systems, notably openbsd and darwin, fail to properly
457 * 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
458 * the single unix specification, so work around them here. 578 * the single unix specification, so work around them here.
459 */ 579 */
460 580
461 if (size) 581 if (size)
462 return realloc (ptr, size); 582 return realloc (ptr, size);
463 583
464 free (ptr); 584 free (ptr);
465 return 0; 585 return 0;
586#endif
466} 587}
467 588
468static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 589static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
469 590
470void 591void
478{ 599{
479 ptr = alloc (ptr, size); 600 ptr = alloc (ptr, size);
480 601
481 if (!ptr && size) 602 if (!ptr && size)
482 { 603 {
604#if EV_AVOID_STDIO
605 ev_printerr ("libev: memory allocation failed, aborting.\n");
606#else
483 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 607 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
608#endif
484 abort (); 609 abort ();
485 } 610 }
486 611
487 return ptr; 612 return ptr;
488} 613}
490#define ev_malloc(size) ev_realloc (0, (size)) 615#define ev_malloc(size) ev_realloc (0, (size))
491#define ev_free(ptr) ev_realloc ((ptr), 0) 616#define ev_free(ptr) ev_realloc ((ptr), 0)
492 617
493/*****************************************************************************/ 618/*****************************************************************************/
494 619
620/* set in reify when reification needed */
621#define EV_ANFD_REIFY 1
622
495/* file descriptor info structure */ 623/* file descriptor info structure */
496typedef struct 624typedef struct
497{ 625{
498 WL head; 626 WL head;
499 unsigned char events; /* the events watched for */ 627 unsigned char events; /* the events watched for */
500 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) */
501 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 */
502 unsigned char unused; 630 unsigned char unused;
503#if EV_USE_EPOLL 631#if EV_USE_EPOLL
504 unsigned int egen; /* generation counter to counter epoll bugs */ 632 unsigned int egen; /* generation counter to counter epoll bugs */
505#endif 633#endif
567 695
568 static int ev_default_loop_ptr; 696 static int ev_default_loop_ptr;
569 697
570#endif 698#endif
571 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
572/*****************************************************************************/ 712/*****************************************************************************/
573 713
574#ifndef EV_HAVE_EV_TIME 714#ifndef EV_HAVE_EV_TIME
575ev_tstamp 715ev_tstamp
576ev_time (void) 716ev_time (void)
632 772
633 tv.tv_sec = (time_t)delay; 773 tv.tv_sec = (time_t)delay;
634 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 774 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
635 775
636 /* 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 */
637 /* somehting not guaranteed by newer posix versions, but guaranteed */ 777 /* something not guaranteed by newer posix versions, but guaranteed */
638 /* by older ones */ 778 /* by older ones */
639 select (0, 0, 0, 0, &tv); 779 select (0, 0, 0, 0, &tv);
640#endif 780#endif
641 } 781 }
642} 782}
750} 890}
751 891
752/*****************************************************************************/ 892/*****************************************************************************/
753 893
754inline_speed void 894inline_speed void
755fd_event (EV_P_ int fd, int revents) 895fd_event_nc (EV_P_ int fd, int revents)
756{ 896{
757 ANFD *anfd = anfds + fd; 897 ANFD *anfd = anfds + fd;
758 ev_io *w; 898 ev_io *w;
759 899
760 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)
764 if (ev) 904 if (ev)
765 ev_feed_event (EV_A_ (W)w, ev); 905 ev_feed_event (EV_A_ (W)w, ev);
766 } 906 }
767} 907}
768 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
769void 920void
770ev_feed_fd_event (EV_P_ int fd, int revents) 921ev_feed_fd_event (EV_P_ int fd, int revents)
771{ 922{
772 if (fd >= 0 && fd < anfdmax) 923 if (fd >= 0 && fd < anfdmax)
773 fd_event (EV_A_ fd, revents); 924 fd_event_nc (EV_A_ fd, revents);
774} 925}
775 926
776/* make sure the external fd watch events are in-sync */ 927/* make sure the external fd watch events are in-sync */
777/* with the kernel/libev internal state */ 928/* with the kernel/libev internal state */
778inline_size void 929inline_size void
793 944
794#if EV_SELECT_IS_WINSOCKET 945#if EV_SELECT_IS_WINSOCKET
795 if (events) 946 if (events)
796 { 947 {
797 unsigned long arg; 948 unsigned long arg;
798 #ifdef EV_FD_TO_WIN32_HANDLE
799 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 949 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
800 #else
801 anfd->handle = _get_osfhandle (fd);
802 #endif
803 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));
804 } 951 }
805#endif 952#endif
806 953
807 { 954 {
850/* check whether the given fd is atcually valid, for error recovery */ 997/* check whether the given fd is atcually valid, for error recovery */
851inline_size int 998inline_size int
852fd_valid (int fd) 999fd_valid (int fd)
853{ 1000{
854#ifdef _WIN32 1001#ifdef _WIN32
855 return _get_osfhandle (fd) != -1; 1002 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
856#else 1003#else
857 return fcntl (fd, F_GETFD) != -1; 1004 return fcntl (fd, F_GETFD) != -1;
858#endif 1005#endif
859} 1006}
860 1007
878 1025
879 for (fd = anfdmax; fd--; ) 1026 for (fd = anfdmax; fd--; )
880 if (anfds [fd].events) 1027 if (anfds [fd].events)
881 { 1028 {
882 fd_kill (EV_A_ fd); 1029 fd_kill (EV_A_ fd);
883 return; 1030 break;
884 } 1031 }
885} 1032}
886 1033
887/* 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 */
888static void noinline 1035static void noinline
893 for (fd = 0; fd < anfdmax; ++fd) 1040 for (fd = 0; fd < anfdmax; ++fd)
894 if (anfds [fd].events) 1041 if (anfds [fd].events)
895 { 1042 {
896 anfds [fd].events = 0; 1043 anfds [fd].events = 0;
897 anfds [fd].emask = 0; 1044 anfds [fd].emask = 0;
898 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1045 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
899 } 1046 }
900} 1047}
901 1048
902/*****************************************************************************/ 1049/*****************************************************************************/
903 1050
978 1125
979 for (;;) 1126 for (;;)
980 { 1127 {
981 int c = k << 1; 1128 int c = k << 1;
982 1129
983 if (c > N + HEAP0 - 1) 1130 if (c >= N + HEAP0)
984 break; 1131 break;
985 1132
986 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])
987 ? 1 : 0; 1134 ? 1 : 0;
988 1135
1024 1171
1025/* move an element suitably so it is in a correct place */ 1172/* move an element suitably so it is in a correct place */
1026inline_size void 1173inline_size void
1027adjustheap (ANHE *heap, int N, int k) 1174adjustheap (ANHE *heap, int N, int k)
1028{ 1175{
1029 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)]))
1030 upheap (heap, k); 1177 upheap (heap, k);
1031 else 1178 else
1032 downheap (heap, N, k); 1179 downheap (heap, N, k);
1033} 1180}
1034 1181
1047/*****************************************************************************/ 1194/*****************************************************************************/
1048 1195
1049/* associate signal watchers to a signal signal */ 1196/* associate signal watchers to a signal signal */
1050typedef struct 1197typedef struct
1051{ 1198{
1199 EV_ATOMIC_T pending;
1200#if EV_MULTIPLICITY
1201 EV_P;
1202#endif
1052 WL head; 1203 WL head;
1053 EV_ATOMIC_T gotsig;
1054} ANSIG; 1204} ANSIG;
1055 1205
1056static ANSIG *signals; 1206static ANSIG signals [EV_NSIG - 1];
1057static int signalmax;
1058
1059static EV_ATOMIC_T gotsig;
1060 1207
1061/*****************************************************************************/ 1208/*****************************************************************************/
1062 1209
1063/* used to prepare libev internal fd's */ 1210/* used to prepare libev internal fd's */
1064/* this is not fork-safe */ 1211/* this is not fork-safe */
1065inline_speed void 1212inline_speed void
1066fd_intern (int fd) 1213fd_intern (int fd)
1067{ 1214{
1068#ifdef _WIN32 1215#ifdef _WIN32
1069 unsigned long arg = 1; 1216 unsigned long arg = 1;
1070 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1217 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1071#else 1218#else
1072 fcntl (fd, F_SETFD, FD_CLOEXEC); 1219 fcntl (fd, F_SETFD, FD_CLOEXEC);
1073 fcntl (fd, F_SETFL, O_NONBLOCK); 1220 fcntl (fd, F_SETFL, O_NONBLOCK);
1074#endif 1221#endif
1075} 1222}
1078evpipe_init (EV_P) 1225evpipe_init (EV_P)
1079{ 1226{
1080 if (!ev_is_active (&pipe_w)) 1227 if (!ev_is_active (&pipe_w))
1081 { 1228 {
1082#if EV_USE_EVENTFD 1229#if EV_USE_EVENTFD
1230 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1231 if (evfd < 0 && errno == EINVAL)
1083 if ((evfd = eventfd (0, 0)) >= 0) 1232 evfd = eventfd (0, 0);
1233
1234 if (evfd >= 0)
1084 { 1235 {
1085 evpipe [0] = -1; 1236 evpipe [0] = -1;
1086 fd_intern (evfd); 1237 fd_intern (evfd); /* doing it twice doesn't hurt */
1087 ev_io_set (&pipe_w, evfd, EV_READ); 1238 ev_io_set (&pipe_w, evfd, EV_READ);
1088 } 1239 }
1089 else 1240 else
1090#endif 1241#endif
1091 { 1242 {
1128/* called whenever the libev signal pipe */ 1279/* called whenever the libev signal pipe */
1129/* got some events (signal, async) */ 1280/* got some events (signal, async) */
1130static void 1281static void
1131pipecb (EV_P_ ev_io *iow, int revents) 1282pipecb (EV_P_ ev_io *iow, int revents)
1132{ 1283{
1284 int i;
1285
1133#if EV_USE_EVENTFD 1286#if EV_USE_EVENTFD
1134 if (evfd >= 0) 1287 if (evfd >= 0)
1135 { 1288 {
1136 uint64_t counter; 1289 uint64_t counter;
1137 read (evfd, &counter, sizeof (uint64_t)); 1290 read (evfd, &counter, sizeof (uint64_t));
1141 { 1294 {
1142 char dummy; 1295 char dummy;
1143 read (evpipe [0], &dummy, 1); 1296 read (evpipe [0], &dummy, 1);
1144 } 1297 }
1145 1298
1146 if (gotsig && ev_is_default_loop (EV_A)) 1299 if (sig_pending)
1147 { 1300 {
1148 int signum; 1301 sig_pending = 0;
1149 gotsig = 0;
1150 1302
1151 for (signum = signalmax; signum--; ) 1303 for (i = EV_NSIG - 1; i--; )
1152 if (signals [signum].gotsig) 1304 if (expect_false (signals [i].pending))
1153 ev_feed_signal_event (EV_A_ signum + 1); 1305 ev_feed_signal_event (EV_A_ i + 1);
1154 } 1306 }
1155 1307
1156#if EV_ASYNC_ENABLE 1308#if EV_ASYNC_ENABLE
1157 if (gotasync) 1309 if (async_pending)
1158 { 1310 {
1159 int i; 1311 async_pending = 0;
1160 gotasync = 0;
1161 1312
1162 for (i = asynccnt; i--; ) 1313 for (i = asynccnt; i--; )
1163 if (asyncs [i]->sent) 1314 if (asyncs [i]->sent)
1164 { 1315 {
1165 asyncs [i]->sent = 0; 1316 asyncs [i]->sent = 0;
1173 1324
1174static void 1325static void
1175ev_sighandler (int signum) 1326ev_sighandler (int signum)
1176{ 1327{
1177#if EV_MULTIPLICITY 1328#if EV_MULTIPLICITY
1178 struct ev_loop *loop = &default_loop_struct; 1329 EV_P = signals [signum - 1].loop;
1179#endif 1330#endif
1180 1331
1181#if _WIN32 1332#ifdef _WIN32
1182 signal (signum, ev_sighandler); 1333 signal (signum, ev_sighandler);
1183#endif 1334#endif
1184 1335
1185 signals [signum - 1].gotsig = 1; 1336 signals [signum - 1].pending = 1;
1186 evpipe_write (EV_A_ &gotsig); 1337 evpipe_write (EV_A_ &sig_pending);
1187} 1338}
1188 1339
1189void noinline 1340void noinline
1190ev_feed_signal_event (EV_P_ int signum) 1341ev_feed_signal_event (EV_P_ int signum)
1191{ 1342{
1192 WL w; 1343 WL w;
1193 1344
1345 if (expect_false (signum <= 0 || signum > EV_NSIG))
1346 return;
1347
1348 --signum;
1349
1194#if EV_MULTIPLICITY 1350#if EV_MULTIPLICITY
1195 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 */
1196#endif 1352 /* or, likely more useful, feeding a signal nobody is waiting for */
1197 1353
1198 --signum; 1354 if (expect_false (signals [signum].loop != EV_A))
1199
1200 if (signum < 0 || signum >= signalmax)
1201 return; 1355 return;
1356#endif
1202 1357
1203 signals [signum].gotsig = 0; 1358 signals [signum].pending = 0;
1204 1359
1205 for (w = signals [signum].head; w; w = w->next) 1360 for (w = signals [signum].head; w; w = w->next)
1206 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1361 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1207} 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
1208 1383
1209/*****************************************************************************/ 1384/*****************************************************************************/
1210 1385
1211static WL childs [EV_PID_HASHSIZE]; 1386static WL childs [EV_PID_HASHSIZE];
1212 1387
1357ev_backend (EV_P) 1532ev_backend (EV_P)
1358{ 1533{
1359 return backend; 1534 return backend;
1360} 1535}
1361 1536
1537#if EV_MINIMAL < 2
1362unsigned int 1538unsigned int
1363ev_loop_count (EV_P) 1539ev_loop_count (EV_P)
1364{ 1540{
1365 return loop_count; 1541 return loop_count;
1366} 1542}
1380void 1556void
1381ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1557ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1382{ 1558{
1383 timeout_blocktime = interval; 1559 timeout_blocktime = interval;
1384} 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
1385 1585
1386/* initialise a loop structure, must be zero-initialised */ 1586/* initialise a loop structure, must be zero-initialised */
1387static void noinline 1587static void noinline
1388loop_init (EV_P_ unsigned int flags) 1588loop_init (EV_P_ unsigned int flags)
1389{ 1589{
1407 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1607 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1408 have_monotonic = 1; 1608 have_monotonic = 1;
1409 } 1609 }
1410#endif 1610#endif
1411 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
1412 ev_rt_now = ev_time (); 1623 ev_rt_now = ev_time ();
1413 mn_now = get_clock (); 1624 mn_now = get_clock ();
1414 now_floor = mn_now; 1625 now_floor = mn_now;
1415 rtmn_diff = ev_rt_now - mn_now; 1626 rtmn_diff = ev_rt_now - mn_now;
1627#if EV_MINIMAL < 2
1416 invoke_cb = ev_invoke_pending; 1628 invoke_cb = ev_invoke_pending;
1629#endif
1417 1630
1418 io_blocktime = 0.; 1631 io_blocktime = 0.;
1419 timeout_blocktime = 0.; 1632 timeout_blocktime = 0.;
1420 backend = 0; 1633 backend = 0;
1421 backend_fd = -1; 1634 backend_fd = -1;
1422 gotasync = 0; 1635 sig_pending = 0;
1636#if EV_ASYNC_ENABLE
1637 async_pending = 0;
1638#endif
1423#if EV_USE_INOTIFY 1639#if EV_USE_INOTIFY
1424 fs_fd = -2; 1640 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1425#endif 1641#endif
1426 1642#if EV_USE_SIGNALFD
1427 /* pid check not overridable via env */ 1643 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1428#ifndef _WIN32
1429 if (flags & EVFLAG_FORKCHECK)
1430 curpid = getpid ();
1431#endif 1644#endif
1432
1433 if (!(flags & EVFLAG_NOENV)
1434 && !enable_secure ()
1435 && getenv ("LIBEV_FLAGS"))
1436 flags = atoi (getenv ("LIBEV_FLAGS"));
1437 1645
1438 if (!(flags & 0x0000ffffU)) 1646 if (!(flags & 0x0000ffffU))
1439 flags |= ev_recommended_backends (); 1647 flags |= ev_recommended_backends ();
1440 1648
1441#if EV_USE_PORT 1649#if EV_USE_PORT
1467{ 1675{
1468 int i; 1676 int i;
1469 1677
1470 if (ev_is_active (&pipe_w)) 1678 if (ev_is_active (&pipe_w))
1471 { 1679 {
1472 ev_ref (EV_A); /* signal watcher */ 1680 /*ev_ref (EV_A);*/
1473 ev_io_stop (EV_A_ &pipe_w); 1681 /*ev_io_stop (EV_A_ &pipe_w);*/
1474 1682
1475#if EV_USE_EVENTFD 1683#if EV_USE_EVENTFD
1476 if (evfd >= 0) 1684 if (evfd >= 0)
1477 close (evfd); 1685 close (evfd);
1478#endif 1686#endif
1479 1687
1480 if (evpipe [0] >= 0) 1688 if (evpipe [0] >= 0)
1481 { 1689 {
1482 close (evpipe [0]); 1690 EV_WIN32_CLOSE_FD (evpipe [0]);
1483 close (evpipe [1]); 1691 EV_WIN32_CLOSE_FD (evpipe [1]);
1484 } 1692 }
1485 } 1693 }
1694
1695#if EV_USE_SIGNALFD
1696 if (ev_is_active (&sigfd_w))
1697 close (sigfd);
1698#endif
1486 1699
1487#if EV_USE_INOTIFY 1700#if EV_USE_INOTIFY
1488 if (fs_fd >= 0) 1701 if (fs_fd >= 0)
1489 close (fs_fd); 1702 close (fs_fd);
1490#endif 1703#endif
1514#if EV_IDLE_ENABLE 1727#if EV_IDLE_ENABLE
1515 array_free (idle, [i]); 1728 array_free (idle, [i]);
1516#endif 1729#endif
1517 } 1730 }
1518 1731
1519 ev_free (anfds); anfdmax = 0; 1732 ev_free (anfds); anfds = 0; anfdmax = 0;
1520 1733
1521 /* have to use the microsoft-never-gets-it-right macro */ 1734 /* have to use the microsoft-never-gets-it-right macro */
1522 array_free (rfeed, EMPTY); 1735 array_free (rfeed, EMPTY);
1523 array_free (fdchange, EMPTY); 1736 array_free (fdchange, EMPTY);
1524 array_free (timer, EMPTY); 1737 array_free (timer, EMPTY);
1559 1772
1560 if (ev_is_active (&pipe_w)) 1773 if (ev_is_active (&pipe_w))
1561 { 1774 {
1562 /* this "locks" the handlers against writing to the pipe */ 1775 /* this "locks" the handlers against writing to the pipe */
1563 /* while we modify the fd vars */ 1776 /* while we modify the fd vars */
1564 gotsig = 1; 1777 sig_pending = 1;
1565#if EV_ASYNC_ENABLE 1778#if EV_ASYNC_ENABLE
1566 gotasync = 1; 1779 async_pending = 1;
1567#endif 1780#endif
1568 1781
1569 ev_ref (EV_A); 1782 ev_ref (EV_A);
1570 ev_io_stop (EV_A_ &pipe_w); 1783 ev_io_stop (EV_A_ &pipe_w);
1571 1784
1574 close (evfd); 1787 close (evfd);
1575#endif 1788#endif
1576 1789
1577 if (evpipe [0] >= 0) 1790 if (evpipe [0] >= 0)
1578 { 1791 {
1579 close (evpipe [0]); 1792 EV_WIN32_CLOSE_FD (evpipe [0]);
1580 close (evpipe [1]); 1793 EV_WIN32_CLOSE_FD (evpipe [1]);
1581 } 1794 }
1582 1795
1583 evpipe_init (EV_A); 1796 evpipe_init (EV_A);
1584 /* now iterate over everything, in case we missed something */ 1797 /* now iterate over everything, in case we missed something */
1585 pipecb (EV_A_ &pipe_w, EV_READ); 1798 pipecb (EV_A_ &pipe_w, EV_READ);
1591#if EV_MULTIPLICITY 1804#if EV_MULTIPLICITY
1592 1805
1593struct ev_loop * 1806struct ev_loop *
1594ev_loop_new (unsigned int flags) 1807ev_loop_new (unsigned int flags)
1595{ 1808{
1596 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));
1597 1810
1598 memset (loop, 0, sizeof (struct ev_loop)); 1811 memset (EV_A, 0, sizeof (struct ev_loop));
1599
1600 loop_init (EV_A_ flags); 1812 loop_init (EV_A_ flags);
1601 1813
1602 if (ev_backend (EV_A)) 1814 if (ev_backend (EV_A))
1603 return loop; 1815 return EV_A;
1604 1816
1605 return 0; 1817 return 0;
1606} 1818}
1607 1819
1608void 1820void
1615void 1827void
1616ev_loop_fork (EV_P) 1828ev_loop_fork (EV_P)
1617{ 1829{
1618 postfork = 1; /* must be in line with ev_default_fork */ 1830 postfork = 1; /* must be in line with ev_default_fork */
1619} 1831}
1832#endif /* multiplicity */
1620 1833
1621#if EV_VERIFY 1834#if EV_VERIFY
1622static void noinline 1835static void noinline
1623verify_watcher (EV_P_ W w) 1836verify_watcher (EV_P_ W w)
1624{ 1837{
1652 verify_watcher (EV_A_ ws [cnt]); 1865 verify_watcher (EV_A_ ws [cnt]);
1653 } 1866 }
1654} 1867}
1655#endif 1868#endif
1656 1869
1870#if EV_MINIMAL < 2
1657void 1871void
1658ev_loop_verify (EV_P) 1872ev_loop_verify (EV_P)
1659{ 1873{
1660#if EV_VERIFY 1874#if EV_VERIFY
1661 int i; 1875 int i;
1710 assert (checkmax >= checkcnt); 1924 assert (checkmax >= checkcnt);
1711 array_verify (EV_A_ (W *)checks, checkcnt); 1925 array_verify (EV_A_ (W *)checks, checkcnt);
1712 1926
1713# if 0 1927# if 0
1714 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)
1715 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1929 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1716# endif
1717#endif 1930# endif
1931#endif
1718} 1932}
1719 1933#endif
1720#endif /* multiplicity */
1721 1934
1722#if EV_MULTIPLICITY 1935#if EV_MULTIPLICITY
1723struct ev_loop * 1936struct ev_loop *
1724ev_default_loop_init (unsigned int flags) 1937ev_default_loop_init (unsigned int flags)
1725#else 1938#else
1728#endif 1941#endif
1729{ 1942{
1730 if (!ev_default_loop_ptr) 1943 if (!ev_default_loop_ptr)
1731 { 1944 {
1732#if EV_MULTIPLICITY 1945#if EV_MULTIPLICITY
1733 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1946 EV_P = ev_default_loop_ptr = &default_loop_struct;
1734#else 1947#else
1735 ev_default_loop_ptr = 1; 1948 ev_default_loop_ptr = 1;
1736#endif 1949#endif
1737 1950
1738 loop_init (EV_A_ flags); 1951 loop_init (EV_A_ flags);
1755 1968
1756void 1969void
1757ev_default_destroy (void) 1970ev_default_destroy (void)
1758{ 1971{
1759#if EV_MULTIPLICITY 1972#if EV_MULTIPLICITY
1760 struct ev_loop *loop = ev_default_loop_ptr; 1973 EV_P = ev_default_loop_ptr;
1761#endif 1974#endif
1762 1975
1763 ev_default_loop_ptr = 0; 1976 ev_default_loop_ptr = 0;
1764 1977
1765#ifndef _WIN32 1978#ifndef _WIN32
1772 1985
1773void 1986void
1774ev_default_fork (void) 1987ev_default_fork (void)
1775{ 1988{
1776#if EV_MULTIPLICITY 1989#if EV_MULTIPLICITY
1777 struct ev_loop *loop = ev_default_loop_ptr; 1990 EV_P = ev_default_loop_ptr;
1778#endif 1991#endif
1779 1992
1780 postfork = 1; /* must be in line with ev_loop_fork */ 1993 postfork = 1; /* must be in line with ev_loop_fork */
1781} 1994}
1782 1995
1786ev_invoke (EV_P_ void *w, int revents) 1999ev_invoke (EV_P_ void *w, int revents)
1787{ 2000{
1788 EV_CB_INVOKE ((W)w, revents); 2001 EV_CB_INVOKE ((W)w, revents);
1789} 2002}
1790 2003
1791void 2004unsigned int
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
1792ev_invoke_pending (EV_P) 2017ev_invoke_pending (EV_P)
1793{ 2018{
1794 int pri; 2019 int pri;
1795 2020
1796 for (pri = NUMPRI; pri--; ) 2021 for (pri = NUMPRI; pri--; )
1965 ANHE_at_cache (*he); 2190 ANHE_at_cache (*he);
1966 } 2191 }
1967} 2192}
1968 2193
1969/* fetch new monotonic and realtime times from the kernel */ 2194/* fetch new monotonic and realtime times from the kernel */
1970/* also detetc if there was a timejump, and act accordingly */ 2195/* also detect if there was a timejump, and act accordingly */
1971inline_speed void 2196inline_speed void
1972time_update (EV_P_ ev_tstamp max_block) 2197time_update (EV_P_ ev_tstamp max_block)
1973{ 2198{
1974#if EV_USE_MONOTONIC 2199#if EV_USE_MONOTONIC
1975 if (expect_true (have_monotonic)) 2200 if (expect_true (have_monotonic))
2035} 2260}
2036 2261
2037void 2262void
2038ev_loop (EV_P_ int flags) 2263ev_loop (EV_P_ int flags)
2039{ 2264{
2265#if EV_MINIMAL < 2
2040 ++loop_depth; 2266 ++loop_depth;
2267#endif
2268
2269 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2041 2270
2042 loop_done = EVUNLOOP_CANCEL; 2271 loop_done = EVUNLOOP_CANCEL;
2043 2272
2044 invoke_cb (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 */
2045 2274
2046 do 2275 do
2047 { 2276 {
2048#if EV_VERIFY >= 2 2277#if EV_VERIFY >= 2
2049 ev_loop_verify (EV_A); 2278 ev_loop_verify (EV_A);
2062 /* we might have forked, so queue fork handlers */ 2291 /* we might have forked, so queue fork handlers */
2063 if (expect_false (postfork)) 2292 if (expect_false (postfork))
2064 if (forkcnt) 2293 if (forkcnt)
2065 { 2294 {
2066 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2295 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2067 invoke_cb (EV_A); 2296 EV_INVOKE_PENDING;
2068 } 2297 }
2069#endif 2298#endif
2070 2299
2071 /* queue prepare watchers (and execute them) */ 2300 /* queue prepare watchers (and execute them) */
2072 if (expect_false (preparecnt)) 2301 if (expect_false (preparecnt))
2073 { 2302 {
2074 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2303 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2075 invoke_cb (EV_A); 2304 EV_INVOKE_PENDING;
2076 } 2305 }
2306
2307 if (expect_false (loop_done))
2308 break;
2077 2309
2078 /* we might have forked, so reify kernel state if necessary */ 2310 /* we might have forked, so reify kernel state if necessary */
2079 if (expect_false (postfork)) 2311 if (expect_false (postfork))
2080 loop_fork (EV_A); 2312 loop_fork (EV_A);
2081 2313
2129 waittime -= sleeptime; 2361 waittime -= sleeptime;
2130 } 2362 }
2131 } 2363 }
2132 } 2364 }
2133 2365
2366#if EV_MINIMAL < 2
2134 ++loop_count; 2367 ++loop_count;
2368#endif
2369 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2135 backend_poll (EV_A_ waittime); 2370 backend_poll (EV_A_ waittime);
2371 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2136 2372
2137 /* update ev_rt_now, do magic */ 2373 /* update ev_rt_now, do magic */
2138 time_update (EV_A_ waittime + sleeptime); 2374 time_update (EV_A_ waittime + sleeptime);
2139 } 2375 }
2140 2376
2151 2387
2152 /* queue check watchers, to be executed first */ 2388 /* queue check watchers, to be executed first */
2153 if (expect_false (checkcnt)) 2389 if (expect_false (checkcnt))
2154 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2390 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2155 2391
2156 invoke_cb (EV_A); 2392 EV_INVOKE_PENDING;
2157 } 2393 }
2158 while (expect_true ( 2394 while (expect_true (
2159 activecnt 2395 activecnt
2160 && !loop_done 2396 && !loop_done
2161 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2397 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2162 )); 2398 ));
2163 2399
2164 if (loop_done == EVUNLOOP_ONE) 2400 if (loop_done == EVUNLOOP_ONE)
2165 loop_done = EVUNLOOP_CANCEL; 2401 loop_done = EVUNLOOP_CANCEL;
2166 2402
2403#if EV_MINIMAL < 2
2167 --loop_depth; 2404 --loop_depth;
2405#endif
2168} 2406}
2169 2407
2170void 2408void
2171ev_unloop (EV_P_ int how) 2409ev_unloop (EV_P_ int how)
2172{ 2410{
2223inline_size void 2461inline_size void
2224wlist_del (WL *head, WL elem) 2462wlist_del (WL *head, WL elem)
2225{ 2463{
2226 while (*head) 2464 while (*head)
2227 { 2465 {
2228 if (*head == elem) 2466 if (expect_true (*head == elem))
2229 { 2467 {
2230 *head = elem->next; 2468 *head = elem->next;
2231 return; 2469 break;
2232 } 2470 }
2233 2471
2234 head = &(*head)->next; 2472 head = &(*head)->next;
2235 } 2473 }
2236} 2474}
2296 2534
2297 if (expect_false (ev_is_active (w))) 2535 if (expect_false (ev_is_active (w)))
2298 return; 2536 return;
2299 2537
2300 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2538 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2301 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))));
2302 2540
2303 EV_FREQUENT_CHECK; 2541 EV_FREQUENT_CHECK;
2304 2542
2305 ev_start (EV_A_ (W)w, 1); 2543 ev_start (EV_A_ (W)w, 1);
2306 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2544 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2307 wlist_add (&anfds[fd].head, (WL)w); 2545 wlist_add (&anfds[fd].head, (WL)w);
2308 2546
2309 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2547 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2310 w->events &= ~EV__IOFDSET; 2548 w->events &= ~EV__IOFDSET;
2311 2549
2312 EV_FREQUENT_CHECK; 2550 EV_FREQUENT_CHECK;
2313} 2551}
2314 2552
2376 timers [active] = timers [timercnt + HEAP0]; 2614 timers [active] = timers [timercnt + HEAP0];
2377 adjustheap (timers, timercnt, active); 2615 adjustheap (timers, timercnt, active);
2378 } 2616 }
2379 } 2617 }
2380 2618
2381 EV_FREQUENT_CHECK;
2382
2383 ev_at (w) -= mn_now; 2619 ev_at (w) -= mn_now;
2384 2620
2385 ev_stop (EV_A_ (W)w); 2621 ev_stop (EV_A_ (W)w);
2622
2623 EV_FREQUENT_CHECK;
2386} 2624}
2387 2625
2388void noinline 2626void noinline
2389ev_timer_again (EV_P_ ev_timer *w) 2627ev_timer_again (EV_P_ ev_timer *w)
2390{ 2628{
2408 } 2646 }
2409 2647
2410 EV_FREQUENT_CHECK; 2648 EV_FREQUENT_CHECK;
2411} 2649}
2412 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
2413#if EV_PERIODIC_ENABLE 2657#if EV_PERIODIC_ENABLE
2414void noinline 2658void noinline
2415ev_periodic_start (EV_P_ ev_periodic *w) 2659ev_periodic_start (EV_P_ ev_periodic *w)
2416{ 2660{
2417 if (expect_false (ev_is_active (w))) 2661 if (expect_false (ev_is_active (w)))
2463 periodics [active] = periodics [periodiccnt + HEAP0]; 2707 periodics [active] = periodics [periodiccnt + HEAP0];
2464 adjustheap (periodics, periodiccnt, active); 2708 adjustheap (periodics, periodiccnt, active);
2465 } 2709 }
2466 } 2710 }
2467 2711
2468 EV_FREQUENT_CHECK;
2469
2470 ev_stop (EV_A_ (W)w); 2712 ev_stop (EV_A_ (W)w);
2713
2714 EV_FREQUENT_CHECK;
2471} 2715}
2472 2716
2473void noinline 2717void noinline
2474ev_periodic_again (EV_P_ ev_periodic *w) 2718ev_periodic_again (EV_P_ ev_periodic *w)
2475{ 2719{
2484#endif 2728#endif
2485 2729
2486void noinline 2730void noinline
2487ev_signal_start (EV_P_ ev_signal *w) 2731ev_signal_start (EV_P_ ev_signal *w)
2488{ 2732{
2489#if EV_MULTIPLICITY
2490 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2491#endif
2492 if (expect_false (ev_is_active (w))) 2733 if (expect_false (ev_is_active (w)))
2493 return; 2734 return;
2494 2735
2495 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));
2496 2737
2497 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));
2498 2741
2499 EV_FREQUENT_CHECK; 2742 signals [w->signum - 1].loop = EV_A;
2743#endif
2500 2744
2745 EV_FREQUENT_CHECK;
2746
2747#if EV_USE_SIGNALFD
2748 if (sigfd == -2)
2501 { 2749 {
2502#ifndef _WIN32 2750 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2503 sigset_t full, prev; 2751 if (sigfd < 0 && errno == EINVAL)
2504 sigfillset (&full); 2752 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2505 sigprocmask (SIG_SETMASK, &full, &prev);
2506#endif
2507 2753
2508 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 */
2509 2757
2510#ifndef _WIN32 2758 sigemptyset (&sigfd_set);
2511 sigprocmask (SIG_SETMASK, &prev, 0); 2759
2512#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 }
2513 } 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
2514 2776
2515 ev_start (EV_A_ (W)w, 1); 2777 ev_start (EV_A_ (W)w, 1);
2516 wlist_add (&signals [w->signum - 1].head, (WL)w); 2778 wlist_add (&signals [w->signum - 1].head, (WL)w);
2517 2779
2518 if (!((WL)w)->next) 2780 if (!((WL)w)->next)
2781# if EV_USE_SIGNALFD
2782 if (sigfd < 0) /*TODO*/
2783# endif
2519 { 2784 {
2520#if _WIN32 2785# ifdef _WIN32
2786 evpipe_init (EV_A);
2787
2521 signal (w->signum, ev_sighandler); 2788 signal (w->signum, ev_sighandler);
2522#else 2789# else
2523 struct sigaction sa; 2790 struct sigaction sa;
2791
2792 evpipe_init (EV_A);
2793
2524 sa.sa_handler = ev_sighandler; 2794 sa.sa_handler = ev_sighandler;
2525 sigfillset (&sa.sa_mask); 2795 sigfillset (&sa.sa_mask);
2526 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 */
2527 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);
2528#endif 2802#endif
2529 } 2803 }
2530 2804
2531 EV_FREQUENT_CHECK; 2805 EV_FREQUENT_CHECK;
2532} 2806}
2533 2807
2534void noinline 2808void noinline
2542 2816
2543 wlist_del (&signals [w->signum - 1].head, (WL)w); 2817 wlist_del (&signals [w->signum - 1].head, (WL)w);
2544 ev_stop (EV_A_ (W)w); 2818 ev_stop (EV_A_ (W)w);
2545 2819
2546 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
2547 signal (w->signum, SIG_DFL); 2839 signal (w->signum, SIG_DFL);
2840 }
2548 2841
2549 EV_FREQUENT_CHECK; 2842 EV_FREQUENT_CHECK;
2550} 2843}
2551 2844
2552void 2845void
2593#define MIN_STAT_INTERVAL 0.1074891 2886#define MIN_STAT_INTERVAL 0.1074891
2594 2887
2595static 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);
2596 2889
2597#if EV_USE_INOTIFY 2890#if EV_USE_INOTIFY
2598# 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)
2599 2894
2600static void noinline 2895static void noinline
2601infy_add (EV_P_ ev_stat *w) 2896infy_add (EV_P_ ev_stat *w)
2602{ 2897{
2603 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);
2604 2899
2605 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 */
2606 { 2920 }
2921 else
2922 {
2923 /* can't use inotify, continue to stat */
2607 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2924 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2608 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2609 2925
2610 /* monitor some parent directory for speedup hints */ 2926 /* if path is not there, monitor some parent directory for speedup hints */
2611 /* 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, */
2612 /* but an efficiency issue only */ 2928 /* but an efficiency issue only */
2613 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2929 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2614 { 2930 {
2615 char path [4096]; 2931 char path [4096];
2631 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2947 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2632 } 2948 }
2633 } 2949 }
2634 2950
2635 if (w->wd >= 0) 2951 if (w->wd >= 0)
2636 {
2637 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);
2638 2953
2639 /* now local changes will be tracked by inotify, but remote changes won't */ 2954 /* now re-arm timer, if required */
2640 /* unless the filesystem it known to be local, we therefore still poll */ 2955 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2641 /* also do poll on <2.6.25, but with normal frequency */
2642 struct statfs sfs;
2643
2644 if (fs_2625 && !statfs (w->path, &sfs))
2645 if (sfs.f_type == 0x1373 /* devfs */
2646 || sfs.f_type == 0xEF53 /* ext2/3 */
2647 || sfs.f_type == 0x3153464a /* jfs */
2648 || sfs.f_type == 0x52654973 /* reiser3 */
2649 || sfs.f_type == 0x01021994 /* tempfs */
2650 || sfs.f_type == 0x58465342 /* xfs */)
2651 return;
2652
2653 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2654 ev_timer_again (EV_A_ &w->timer); 2956 ev_timer_again (EV_A_ &w->timer);
2655 } 2957 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2656} 2958}
2657 2959
2658static void noinline 2960static void noinline
2659infy_del (EV_P_ ev_stat *w) 2961infy_del (EV_P_ ev_stat *w)
2660{ 2962{
2705 3007
2706static void 3008static void
2707infy_cb (EV_P_ ev_io *w, int revents) 3009infy_cb (EV_P_ ev_io *w, int revents)
2708{ 3010{
2709 char buf [EV_INOTIFY_BUFSIZE]; 3011 char buf [EV_INOTIFY_BUFSIZE];
2710 struct inotify_event *ev = (struct inotify_event *)buf;
2711 int ofs; 3012 int ofs;
2712 int len = read (fs_fd, buf, sizeof (buf)); 3013 int len = read (fs_fd, buf, sizeof (buf));
2713 3014
2714 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);
2715 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;
2716} 3053}
2717 3054
2718inline_size void 3055inline_size void
2719check_2625 (EV_P) 3056ev_check_2625 (EV_P)
2720{ 3057{
2721 /* kernels < 2.6.25 are borked 3058 /* kernels < 2.6.25 are borked
2722 * 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
2723 */ 3060 */
2724 struct utsname buf; 3061 if (ev_linux_version () < 0x020619)
2725 int major, minor, micro;
2726
2727 if (uname (&buf))
2728 return; 3062 return;
2729 3063
2730 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2731 return;
2732
2733 if (major < 2
2734 || (major == 2 && minor < 6)
2735 || (major == 2 && minor == 6 && micro < 25))
2736 return;
2737
2738 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 ();
2739} 3076}
2740 3077
2741inline_size void 3078inline_size void
2742infy_init (EV_P) 3079infy_init (EV_P)
2743{ 3080{
2744 if (fs_fd != -2) 3081 if (fs_fd != -2)
2745 return; 3082 return;
2746 3083
2747 fs_fd = -1; 3084 fs_fd = -1;
2748 3085
2749 check_2625 (EV_A); 3086 ev_check_2625 (EV_A);
2750 3087
2751 fs_fd = inotify_init (); 3088 fs_fd = infy_newfd ();
2752 3089
2753 if (fs_fd >= 0) 3090 if (fs_fd >= 0)
2754 { 3091 {
3092 fd_intern (fs_fd);
2755 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3093 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2756 ev_set_priority (&fs_w, EV_MAXPRI); 3094 ev_set_priority (&fs_w, EV_MAXPRI);
2757 ev_io_start (EV_A_ &fs_w); 3095 ev_io_start (EV_A_ &fs_w);
3096 ev_unref (EV_A);
2758 } 3097 }
2759} 3098}
2760 3099
2761inline_size void 3100inline_size void
2762infy_fork (EV_P) 3101infy_fork (EV_P)
2764 int slot; 3103 int slot;
2765 3104
2766 if (fs_fd < 0) 3105 if (fs_fd < 0)
2767 return; 3106 return;
2768 3107
3108 ev_ref (EV_A);
3109 ev_io_stop (EV_A_ &fs_w);
2769 close (fs_fd); 3110 close (fs_fd);
2770 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 }
2771 3120
2772 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3121 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2773 { 3122 {
2774 WL w_ = fs_hash [slot].head; 3123 WL w_ = fs_hash [slot].head;
2775 fs_hash [slot].head = 0; 3124 fs_hash [slot].head = 0;
2782 w->wd = -1; 3131 w->wd = -1;
2783 3132
2784 if (fs_fd >= 0) 3133 if (fs_fd >= 0)
2785 infy_add (EV_A_ w); /* re-add, no matter what */ 3134 infy_add (EV_A_ w); /* re-add, no matter what */
2786 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);
2787 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 }
2788 } 3142 }
2789 } 3143 }
2790} 3144}
2791 3145
2792#endif 3146#endif
2809static void noinline 3163static void noinline
2810stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3164stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2811{ 3165{
2812 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3166 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2813 3167
2814 /* we copy this here each the time so that */ 3168 ev_statdata prev = w->attr;
2815 /* prev has the old value when the callback gets invoked */
2816 w->prev = w->attr;
2817 ev_stat_stat (EV_A_ w); 3169 ev_stat_stat (EV_A_ w);
2818 3170
2819 /* 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 */
2820 if ( 3172 if (
2821 w->prev.st_dev != w->attr.st_dev 3173 prev.st_dev != w->attr.st_dev
2822 || w->prev.st_ino != w->attr.st_ino 3174 || prev.st_ino != w->attr.st_ino
2823 || w->prev.st_mode != w->attr.st_mode 3175 || prev.st_mode != w->attr.st_mode
2824 || w->prev.st_nlink != w->attr.st_nlink 3176 || prev.st_nlink != w->attr.st_nlink
2825 || w->prev.st_uid != w->attr.st_uid 3177 || prev.st_uid != w->attr.st_uid
2826 || w->prev.st_gid != w->attr.st_gid 3178 || prev.st_gid != w->attr.st_gid
2827 || w->prev.st_rdev != w->attr.st_rdev 3179 || prev.st_rdev != w->attr.st_rdev
2828 || w->prev.st_size != w->attr.st_size 3180 || prev.st_size != w->attr.st_size
2829 || w->prev.st_atime != w->attr.st_atime 3181 || prev.st_atime != w->attr.st_atime
2830 || w->prev.st_mtime != w->attr.st_mtime 3182 || prev.st_mtime != w->attr.st_mtime
2831 || w->prev.st_ctime != w->attr.st_ctime 3183 || prev.st_ctime != w->attr.st_ctime
2832 ) { 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
2833 #if EV_USE_INOTIFY 3190 #if EV_USE_INOTIFY
2834 if (fs_fd >= 0) 3191 if (fs_fd >= 0)
2835 { 3192 {
2836 infy_del (EV_A_ w); 3193 infy_del (EV_A_ w);
2837 infy_add (EV_A_ w); 3194 infy_add (EV_A_ w);
2862 3219
2863 if (fs_fd >= 0) 3220 if (fs_fd >= 0)
2864 infy_add (EV_A_ w); 3221 infy_add (EV_A_ w);
2865 else 3222 else
2866#endif 3223#endif
3224 {
2867 ev_timer_again (EV_A_ &w->timer); 3225 ev_timer_again (EV_A_ &w->timer);
3226 ev_unref (EV_A);
3227 }
2868 3228
2869 ev_start (EV_A_ (W)w, 1); 3229 ev_start (EV_A_ (W)w, 1);
2870 3230
2871 EV_FREQUENT_CHECK; 3231 EV_FREQUENT_CHECK;
2872} 3232}
2881 EV_FREQUENT_CHECK; 3241 EV_FREQUENT_CHECK;
2882 3242
2883#if EV_USE_INOTIFY 3243#if EV_USE_INOTIFY
2884 infy_del (EV_A_ w); 3244 infy_del (EV_A_ w);
2885#endif 3245#endif
3246
3247 if (ev_is_active (&w->timer))
3248 {
3249 ev_ref (EV_A);
2886 ev_timer_stop (EV_A_ &w->timer); 3250 ev_timer_stop (EV_A_ &w->timer);
3251 }
2887 3252
2888 ev_stop (EV_A_ (W)w); 3253 ev_stop (EV_A_ (W)w);
2889 3254
2890 EV_FREQUENT_CHECK; 3255 EV_FREQUENT_CHECK;
2891} 3256}
3032embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3397embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3033{ 3398{
3034 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3399 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3035 3400
3036 { 3401 {
3037 struct ev_loop *loop = w->other; 3402 EV_P = w->other;
3038 3403
3039 while (fdchangecnt) 3404 while (fdchangecnt)
3040 { 3405 {
3041 fd_reify (EV_A); 3406 fd_reify (EV_A);
3042 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3407 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3050 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));
3051 3416
3052 ev_embed_stop (EV_A_ w); 3417 ev_embed_stop (EV_A_ w);
3053 3418
3054 { 3419 {
3055 struct ev_loop *loop = w->other; 3420 EV_P = w->other;
3056 3421
3057 ev_loop_fork (EV_A); 3422 ev_loop_fork (EV_A);
3058 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3423 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3059 } 3424 }
3060 3425
3074{ 3439{
3075 if (expect_false (ev_is_active (w))) 3440 if (expect_false (ev_is_active (w)))
3076 return; 3441 return;
3077 3442
3078 { 3443 {
3079 struct ev_loop *loop = w->other; 3444 EV_P = w->other;
3080 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 ()));
3081 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);
3082 } 3447 }
3083 3448
3084 EV_FREQUENT_CHECK; 3449 EV_FREQUENT_CHECK;
3111 3476
3112 ev_io_stop (EV_A_ &w->io); 3477 ev_io_stop (EV_A_ &w->io);
3113 ev_prepare_stop (EV_A_ &w->prepare); 3478 ev_prepare_stop (EV_A_ &w->prepare);
3114 ev_fork_stop (EV_A_ &w->fork); 3479 ev_fork_stop (EV_A_ &w->fork);
3115 3480
3481 ev_stop (EV_A_ (W)w);
3482
3116 EV_FREQUENT_CHECK; 3483 EV_FREQUENT_CHECK;
3117} 3484}
3118#endif 3485#endif
3119 3486
3120#if EV_FORK_ENABLE 3487#if EV_FORK_ENABLE
3196 3563
3197void 3564void
3198ev_async_send (EV_P_ ev_async *w) 3565ev_async_send (EV_P_ ev_async *w)
3199{ 3566{
3200 w->sent = 1; 3567 w->sent = 1;
3201 evpipe_write (EV_A_ &gotasync); 3568 evpipe_write (EV_A_ &async_pending);
3202} 3569}
3203#endif 3570#endif
3204 3571
3205/*****************************************************************************/ 3572/*****************************************************************************/
3206 3573
3355 if (types & EV_CHECK) 3722 if (types & EV_CHECK)
3356 for (i = checkcnt; i--; ) 3723 for (i = checkcnt; i--; )
3357 cb (EV_A_ EV_CHECK, checks [i]); 3724 cb (EV_A_ EV_CHECK, checks [i]);
3358 3725
3359 if (types & EV_SIGNAL) 3726 if (types & EV_SIGNAL)
3360 for (i = 0; i < signalmax; ++i) 3727 for (i = 0; i < EV_NSIG - 1; ++i)
3361 for (wl = signals [i].head; wl; ) 3728 for (wl = signals [i].head; wl; )
3362 { 3729 {
3363 wn = wl->next; 3730 wn = wl->next;
3364 cb (EV_A_ EV_SIGNAL, wl); 3731 cb (EV_A_ EV_SIGNAL, wl);
3365 wl = wn; 3732 wl = wn;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines