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

Comparing libev/ev.c (file contents):
Revision 1.286 by root, Wed Apr 15 19:37:15 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 *
57# endif 57# endif
58# ifndef EV_USE_MONOTONIC 58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1 59# define EV_USE_MONOTONIC 1
60# endif 60# endif
61# endif 61# endif
62# elif !defined(EV_USE_CLOCK_SYSCALL)
63# define EV_USE_CLOCK_SYSCALL 0
62# endif 64# endif
63 65
64# if HAVE_CLOCK_GETTIME 66# if HAVE_CLOCK_GETTIME
65# ifndef EV_USE_MONOTONIC 67# ifndef EV_USE_MONOTONIC
66# define EV_USE_MONOTONIC 1 68# define EV_USE_MONOTONIC 1
108# define EV_USE_EPOLL 0 110# define EV_USE_EPOLL 0
109# endif 111# endif
110# endif 112# endif
111 113
112# ifndef EV_USE_KQUEUE 114# ifndef EV_USE_KQUEUE
113# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
114# define EV_USE_KQUEUE 1 116# define EV_USE_KQUEUE 1
115# else 117# else
116# define EV_USE_KQUEUE 0 118# define EV_USE_KQUEUE 0
117# endif 119# endif
118# endif 120# endif
131# else 133# else
132# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
133# endif 135# endif
134# endif 136# endif
135 137
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1
141# else
142# define EV_USE_SIGNALFD 0
143# endif
144# endif
145
136# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
137# if HAVE_EVENTFD 147# if HAVE_EVENTFD
138# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD 1
139# else 149# else
140# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
143 153
144#endif 154#endif
145 155
146#include <math.h> 156#include <math.h>
147#include <stdlib.h> 157#include <stdlib.h>
158#include <string.h>
148#include <fcntl.h> 159#include <fcntl.h>
149#include <stddef.h> 160#include <stddef.h>
150 161
151#include <stdio.h> 162#include <stdio.h>
152 163
153#include <assert.h> 164#include <assert.h>
154#include <errno.h> 165#include <errno.h>
155#include <sys/types.h> 166#include <sys/types.h>
156#include <time.h> 167#include <time.h>
168#include <limits.h>
157 169
158#include <signal.h> 170#include <signal.h>
159 171
160#ifdef EV_H 172#ifdef EV_H
161# include EV_H 173# include EV_H
172# define WIN32_LEAN_AND_MEAN 184# define WIN32_LEAN_AND_MEAN
173# include <windows.h> 185# include <windows.h>
174# ifndef EV_SELECT_IS_WINSOCKET 186# ifndef EV_SELECT_IS_WINSOCKET
175# define EV_SELECT_IS_WINSOCKET 1 187# define EV_SELECT_IS_WINSOCKET 1
176# endif 188# endif
189# undef EV_AVOID_STDIO
177#endif 190#endif
178 191
179/* this block tries to deduce configuration from header-defined symbols and defaults */ 192/* this block tries to deduce configuration from header-defined symbols and defaults */
193
194/* try to deduce the maximum number of signals on this platform */
195#if defined (EV_NSIG)
196/* use what's provided */
197#elif defined (NSIG)
198# define EV_NSIG (NSIG)
199#elif defined(_NSIG)
200# define EV_NSIG (_NSIG)
201#elif defined (SIGMAX)
202# define EV_NSIG (SIGMAX+1)
203#elif defined (SIG_MAX)
204# define EV_NSIG (SIG_MAX+1)
205#elif defined (_SIG_MAX)
206# define EV_NSIG (_SIG_MAX+1)
207#elif defined (MAXSIG)
208# define EV_NSIG (MAXSIG+1)
209#elif defined (MAX_SIG)
210# define EV_NSIG (MAX_SIG+1)
211#elif defined (SIGARRAYSIZE)
212# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
213#elif defined (_sys_nsig)
214# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
215#else
216# error "unable to find value for NSIG, please report"
217/* to make it compile regardless, just remove the above line */
218# define EV_NSIG 65
219#endif
180 220
181#ifndef EV_USE_CLOCK_SYSCALL 221#ifndef EV_USE_CLOCK_SYSCALL
182# if __linux && __GLIBC__ >= 2 222# if __linux && __GLIBC__ >= 2
183# define EV_USE_CLOCK_SYSCALL 1 223# define EV_USE_CLOCK_SYSCALL 1
184# else 224# else
264# else 304# else
265# define EV_USE_EVENTFD 0 305# define EV_USE_EVENTFD 0
266# endif 306# endif
267#endif 307#endif
268 308
309#ifndef EV_USE_SIGNALFD
310# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
311# define EV_USE_SIGNALFD 1
312# else
313# define EV_USE_SIGNALFD 0
314# endif
315#endif
316
269#if 0 /* debugging */ 317#if 0 /* debugging */
270# define EV_VERIFY 3 318# define EV_VERIFY 3
271# define EV_USE_4HEAP 1 319# define EV_USE_4HEAP 1
272# define EV_HEAP_CACHE_AT 1 320# define EV_HEAP_CACHE_AT 1
273#endif 321#endif
282 330
283#ifndef EV_HEAP_CACHE_AT 331#ifndef EV_HEAP_CACHE_AT
284# define EV_HEAP_CACHE_AT !EV_MINIMAL 332# define EV_HEAP_CACHE_AT !EV_MINIMAL
285#endif 333#endif
286 334
335/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
336/* which makes programs even slower. might work on other unices, too. */
337#if EV_USE_CLOCK_SYSCALL
338# include <syscall.h>
339# ifdef SYS_clock_gettime
340# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
341# undef EV_USE_MONOTONIC
342# define EV_USE_MONOTONIC 1
343# else
344# undef EV_USE_CLOCK_SYSCALL
345# define EV_USE_CLOCK_SYSCALL 0
346# endif
347#endif
348
287/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 349/* this block fixes any misconfiguration where we know we run into trouble otherwise */
350
351#ifdef _AIX
352/* AIX has a completely broken poll.h header */
353# undef EV_USE_POLL
354# define EV_USE_POLL 0
355#endif
288 356
289#ifndef CLOCK_MONOTONIC 357#ifndef CLOCK_MONOTONIC
290# undef EV_USE_MONOTONIC 358# undef EV_USE_MONOTONIC
291# define EV_USE_MONOTONIC 0 359# define EV_USE_MONOTONIC 0
292#endif 360#endif
320 388
321#if EV_SELECT_IS_WINSOCKET 389#if EV_SELECT_IS_WINSOCKET
322# include <winsock.h> 390# include <winsock.h>
323#endif 391#endif
324 392
325/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
326/* which makes programs even slower. might work on other unices, too. */
327#if EV_USE_CLOCK_SYSCALL
328# include <syscall.h>
329# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
330# undef EV_USE_MONOTONIC
331# define EV_USE_MONOTONIC 1
332#endif
333
334#if EV_USE_EVENTFD 393#if EV_USE_EVENTFD
335/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 394/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
336# include <stdint.h> 395# include <stdint.h>
396# ifndef EFD_NONBLOCK
397# define EFD_NONBLOCK O_NONBLOCK
398# endif
399# ifndef EFD_CLOEXEC
400# ifdef O_CLOEXEC
401# define EFD_CLOEXEC O_CLOEXEC
402# else
403# define EFD_CLOEXEC 02000000
404# endif
405# endif
337# ifdef __cplusplus 406# ifdef __cplusplus
338extern "C" { 407extern "C" {
339# endif 408# endif
340int eventfd (unsigned int initval, int flags); 409int (eventfd) (unsigned int initval, int flags);
341# ifdef __cplusplus 410# ifdef __cplusplus
342} 411}
343# endif 412# endif
344#endif 413#endif
414
415#if EV_USE_SIGNALFD
416/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
417# include <stdint.h>
418# ifndef SFD_NONBLOCK
419# define SFD_NONBLOCK O_NONBLOCK
420# endif
421# ifndef SFD_CLOEXEC
422# ifdef O_CLOEXEC
423# define SFD_CLOEXEC O_CLOEXEC
424# else
425# define SFD_CLOEXEC 02000000
426# endif
427# endif
428# ifdef __cplusplus
429extern "C" {
430# endif
431int signalfd (int fd, const sigset_t *mask, int flags);
432
433struct signalfd_siginfo
434{
435 uint32_t ssi_signo;
436 char pad[128 - sizeof (uint32_t)];
437};
438# ifdef __cplusplus
439}
440# endif
441#endif
442
345 443
346/**/ 444/**/
347 445
348#if EV_VERIFY >= 3 446#if EV_VERIFY >= 3
349# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 447# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
361 */ 459 */
362#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 460#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
363 461
364#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 462#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
365#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 463#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
366/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
367 464
368#if __GNUC__ >= 4 465#if __GNUC__ >= 4
369# define expect(expr,value) __builtin_expect ((expr),(value)) 466# define expect(expr,value) __builtin_expect ((expr),(value))
370# define noinline __attribute__ ((noinline)) 467# define noinline __attribute__ ((noinline))
371#else 468#else
384# define inline_speed static noinline 481# define inline_speed static noinline
385#else 482#else
386# define inline_speed static inline 483# define inline_speed static inline
387#endif 484#endif
388 485
389#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 486#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
487
488#if EV_MINPRI == EV_MAXPRI
489# define ABSPRI(w) (((W)w), 0)
490#else
390#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 491# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
492#endif
391 493
392#define EMPTY /* required for microsofts broken pseudo-c compiler */ 494#define EMPTY /* required for microsofts broken pseudo-c compiler */
393#define EMPTY2(a,b) /* used to suppress some warnings */ 495#define EMPTY2(a,b) /* used to suppress some warnings */
394 496
395typedef ev_watcher *W; 497typedef ev_watcher *W;
407 509
408#if EV_USE_MONOTONIC 510#if EV_USE_MONOTONIC
409static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 511static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
410#endif 512#endif
411 513
514#ifndef EV_FD_TO_WIN32_HANDLE
515# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
516#endif
517#ifndef EV_WIN32_HANDLE_TO_FD
518# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
519#endif
520#ifndef EV_WIN32_CLOSE_FD
521# define EV_WIN32_CLOSE_FD(fd) close (fd)
522#endif
523
412#ifdef _WIN32 524#ifdef _WIN32
413# include "ev_win32.c" 525# include "ev_win32.c"
414#endif 526#endif
415 527
416/*****************************************************************************/ 528/*****************************************************************************/
529
530#if EV_AVOID_STDIO
531static void noinline
532ev_printerr (const char *msg)
533{
534 write (STDERR_FILENO, msg, strlen (msg));
535}
536#endif
417 537
418static void (*syserr_cb)(const char *msg); 538static void (*syserr_cb)(const char *msg);
419 539
420void 540void
421ev_set_syserr_cb (void (*cb)(const char *msg)) 541ev_set_syserr_cb (void (*cb)(const char *msg))
431 551
432 if (syserr_cb) 552 if (syserr_cb)
433 syserr_cb (msg); 553 syserr_cb (msg);
434 else 554 else
435 { 555 {
556#if EV_AVOID_STDIO
557 const char *err = strerror (errno);
558
559 ev_printerr (msg);
560 ev_printerr (": ");
561 ev_printerr (err);
562 ev_printerr ("\n");
563#else
436 perror (msg); 564 perror (msg);
565#endif
437 abort (); 566 abort ();
438 } 567 }
439} 568}
440 569
441static void * 570static void *
442ev_realloc_emul (void *ptr, long size) 571ev_realloc_emul (void *ptr, long size)
443{ 572{
573#if __GLIBC__
574 return realloc (ptr, size);
575#else
444 /* some systems, notably openbsd and darwin, fail to properly 576 /* some systems, notably openbsd and darwin, fail to properly
445 * 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
446 * the single unix specification, so work around them here. 578 * the single unix specification, so work around them here.
447 */ 579 */
448 580
449 if (size) 581 if (size)
450 return realloc (ptr, size); 582 return realloc (ptr, size);
451 583
452 free (ptr); 584 free (ptr);
453 return 0; 585 return 0;
586#endif
454} 587}
455 588
456static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 589static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
457 590
458void 591void
466{ 599{
467 ptr = alloc (ptr, size); 600 ptr = alloc (ptr, size);
468 601
469 if (!ptr && size) 602 if (!ptr && size)
470 { 603 {
604#if EV_AVOID_STDIO
605 ev_printerr ("libev: memory allocation failed, aborting.\n");
606#else
471 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 607 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
608#endif
472 abort (); 609 abort ();
473 } 610 }
474 611
475 return ptr; 612 return ptr;
476} 613}
478#define ev_malloc(size) ev_realloc (0, (size)) 615#define ev_malloc(size) ev_realloc (0, (size))
479#define ev_free(ptr) ev_realloc ((ptr), 0) 616#define ev_free(ptr) ev_realloc ((ptr), 0)
480 617
481/*****************************************************************************/ 618/*****************************************************************************/
482 619
620/* set in reify when reification needed */
621#define EV_ANFD_REIFY 1
622
623/* file descriptor info structure */
483typedef struct 624typedef struct
484{ 625{
485 WL head; 626 WL head;
486 unsigned char events; 627 unsigned char events; /* the events watched for */
487 unsigned char reify; 628 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
488 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 */
489 unsigned char unused; 630 unsigned char unused;
490#if EV_USE_EPOLL 631#if EV_USE_EPOLL
491 unsigned int egen; /* generation counter to counter epoll bugs */ 632 unsigned int egen; /* generation counter to counter epoll bugs */
492#endif 633#endif
493#if EV_SELECT_IS_WINSOCKET 634#if EV_SELECT_IS_WINSOCKET
494 SOCKET handle; 635 SOCKET handle;
495#endif 636#endif
496} ANFD; 637} ANFD;
497 638
639/* stores the pending event set for a given watcher */
498typedef struct 640typedef struct
499{ 641{
500 W w; 642 W w;
501 int events; 643 int events; /* the pending event set for the given watcher */
502} ANPENDING; 644} ANPENDING;
503 645
504#if EV_USE_INOTIFY 646#if EV_USE_INOTIFY
505/* hash table entry per inotify-id */ 647/* hash table entry per inotify-id */
506typedef struct 648typedef struct
509} ANFS; 651} ANFS;
510#endif 652#endif
511 653
512/* Heap Entry */ 654/* Heap Entry */
513#if EV_HEAP_CACHE_AT 655#if EV_HEAP_CACHE_AT
656 /* a heap element */
514 typedef struct { 657 typedef struct {
515 ev_tstamp at; 658 ev_tstamp at;
516 WT w; 659 WT w;
517 } ANHE; 660 } ANHE;
518 661
519 #define ANHE_w(he) (he).w /* access watcher, read-write */ 662 #define ANHE_w(he) (he).w /* access watcher, read-write */
520 #define ANHE_at(he) (he).at /* access cached at, read-only */ 663 #define ANHE_at(he) (he).at /* access cached at, read-only */
521 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */ 664 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
522#else 665#else
666 /* a heap element */
523 typedef WT ANHE; 667 typedef WT ANHE;
524 668
525 #define ANHE_w(he) (he) 669 #define ANHE_w(he) (he)
526 #define ANHE_at(he) (he)->at 670 #define ANHE_at(he) (he)->at
527 #define ANHE_at_cache(he) 671 #define ANHE_at_cache(he)
551 695
552 static int ev_default_loop_ptr; 696 static int ev_default_loop_ptr;
553 697
554#endif 698#endif
555 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
556/*****************************************************************************/ 712/*****************************************************************************/
557 713
714#ifndef EV_HAVE_EV_TIME
558ev_tstamp 715ev_tstamp
559ev_time (void) 716ev_time (void)
560{ 717{
561#if EV_USE_REALTIME 718#if EV_USE_REALTIME
562 if (expect_true (have_realtime)) 719 if (expect_true (have_realtime))
569 726
570 struct timeval tv; 727 struct timeval tv;
571 gettimeofday (&tv, 0); 728 gettimeofday (&tv, 0);
572 return tv.tv_sec + tv.tv_usec * 1e-6; 729 return tv.tv_sec + tv.tv_usec * 1e-6;
573} 730}
731#endif
574 732
575inline_size ev_tstamp 733inline_size ev_tstamp
576get_clock (void) 734get_clock (void)
577{ 735{
578#if EV_USE_MONOTONIC 736#if EV_USE_MONOTONIC
614 772
615 tv.tv_sec = (time_t)delay; 773 tv.tv_sec = (time_t)delay;
616 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 774 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
617 775
618 /* 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 */
619 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 777 /* something not guaranteed by newer posix versions, but guaranteed */
620 /* by older ones */ 778 /* by older ones */
621 select (0, 0, 0, 0, &tv); 779 select (0, 0, 0, 0, &tv);
622#endif 780#endif
623 } 781 }
624} 782}
625 783
626/*****************************************************************************/ 784/*****************************************************************************/
627 785
628#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 786#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
629 787
788/* find a suitable new size for the given array, */
789/* hopefully by rounding to a ncie-to-malloc size */
630inline_size int 790inline_size int
631array_nextsize (int elem, int cur, int cnt) 791array_nextsize (int elem, int cur, int cnt)
632{ 792{
633 int ncur = cur + 1; 793 int ncur = cur + 1;
634 794
680#define array_free(stem, idx) \ 840#define array_free(stem, idx) \
681 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0 841 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
682 842
683/*****************************************************************************/ 843/*****************************************************************************/
684 844
845/* dummy callback for pending events */
846static void noinline
847pendingcb (EV_P_ ev_prepare *w, int revents)
848{
849}
850
685void noinline 851void noinline
686ev_feed_event (EV_P_ void *w, int revents) 852ev_feed_event (EV_P_ void *w, int revents)
687{ 853{
688 W w_ = (W)w; 854 W w_ = (W)w;
689 int pri = ABSPRI (w_); 855 int pri = ABSPRI (w_);
724} 890}
725 891
726/*****************************************************************************/ 892/*****************************************************************************/
727 893
728inline_speed void 894inline_speed void
729fd_event (EV_P_ int fd, int revents) 895fd_event_nc (EV_P_ int fd, int revents)
730{ 896{
731 ANFD *anfd = anfds + fd; 897 ANFD *anfd = anfds + fd;
732 ev_io *w; 898 ev_io *w;
733 899
734 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)
738 if (ev) 904 if (ev)
739 ev_feed_event (EV_A_ (W)w, ev); 905 ev_feed_event (EV_A_ (W)w, ev);
740 } 906 }
741} 907}
742 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
743void 920void
744ev_feed_fd_event (EV_P_ int fd, int revents) 921ev_feed_fd_event (EV_P_ int fd, int revents)
745{ 922{
746 if (fd >= 0 && fd < anfdmax) 923 if (fd >= 0 && fd < anfdmax)
747 fd_event (EV_A_ fd, revents); 924 fd_event_nc (EV_A_ fd, revents);
748} 925}
749 926
927/* make sure the external fd watch events are in-sync */
928/* with the kernel/libev internal state */
750inline_size void 929inline_size void
751fd_reify (EV_P) 930fd_reify (EV_P)
752{ 931{
753 int i; 932 int i;
754 933
765 944
766#if EV_SELECT_IS_WINSOCKET 945#if EV_SELECT_IS_WINSOCKET
767 if (events) 946 if (events)
768 { 947 {
769 unsigned long arg; 948 unsigned long arg;
770 #ifdef EV_FD_TO_WIN32_HANDLE
771 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 949 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
772 #else
773 anfd->handle = _get_osfhandle (fd);
774 #endif
775 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));
776 } 951 }
777#endif 952#endif
778 953
779 { 954 {
789 } 964 }
790 965
791 fdchangecnt = 0; 966 fdchangecnt = 0;
792} 967}
793 968
969/* something about the given fd changed */
794inline_size void 970inline_size void
795fd_change (EV_P_ int fd, int flags) 971fd_change (EV_P_ int fd, int flags)
796{ 972{
797 unsigned char reify = anfds [fd].reify; 973 unsigned char reify = anfds [fd].reify;
798 anfds [fd].reify |= flags; 974 anfds [fd].reify |= flags;
803 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 979 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
804 fdchanges [fdchangecnt - 1] = fd; 980 fdchanges [fdchangecnt - 1] = fd;
805 } 981 }
806} 982}
807 983
984/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
808inline_speed void 985inline_speed void
809fd_kill (EV_P_ int fd) 986fd_kill (EV_P_ int fd)
810{ 987{
811 ev_io *w; 988 ev_io *w;
812 989
815 ev_io_stop (EV_A_ w); 992 ev_io_stop (EV_A_ w);
816 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 993 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
817 } 994 }
818} 995}
819 996
997/* check whether the given fd is atcually valid, for error recovery */
820inline_size int 998inline_size int
821fd_valid (int fd) 999fd_valid (int fd)
822{ 1000{
823#ifdef _WIN32 1001#ifdef _WIN32
824 return _get_osfhandle (fd) != -1; 1002 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
825#else 1003#else
826 return fcntl (fd, F_GETFD) != -1; 1004 return fcntl (fd, F_GETFD) != -1;
827#endif 1005#endif
828} 1006}
829 1007
847 1025
848 for (fd = anfdmax; fd--; ) 1026 for (fd = anfdmax; fd--; )
849 if (anfds [fd].events) 1027 if (anfds [fd].events)
850 { 1028 {
851 fd_kill (EV_A_ fd); 1029 fd_kill (EV_A_ fd);
852 return; 1030 break;
853 } 1031 }
854} 1032}
855 1033
856/* 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 */
857static void noinline 1035static void noinline
862 for (fd = 0; fd < anfdmax; ++fd) 1040 for (fd = 0; fd < anfdmax; ++fd)
863 if (anfds [fd].events) 1041 if (anfds [fd].events)
864 { 1042 {
865 anfds [fd].events = 0; 1043 anfds [fd].events = 0;
866 anfds [fd].emask = 0; 1044 anfds [fd].emask = 0;
867 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1045 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
868 } 1046 }
869} 1047}
870 1048
871/*****************************************************************************/ 1049/*****************************************************************************/
872 1050
947 1125
948 for (;;) 1126 for (;;)
949 { 1127 {
950 int c = k << 1; 1128 int c = k << 1;
951 1129
952 if (c > N + HEAP0 - 1) 1130 if (c >= N + HEAP0)
953 break; 1131 break;
954 1132
955 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])
956 ? 1 : 0; 1134 ? 1 : 0;
957 1135
989 1167
990 heap [k] = he; 1168 heap [k] = he;
991 ev_active (ANHE_w (he)) = k; 1169 ev_active (ANHE_w (he)) = k;
992} 1170}
993 1171
1172/* move an element suitably so it is in a correct place */
994inline_size void 1173inline_size void
995adjustheap (ANHE *heap, int N, int k) 1174adjustheap (ANHE *heap, int N, int k)
996{ 1175{
997 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)]))
998 upheap (heap, k); 1177 upheap (heap, k);
999 else 1178 else
1000 downheap (heap, N, k); 1179 downheap (heap, N, k);
1001} 1180}
1002 1181
1012 upheap (heap, i + HEAP0); 1191 upheap (heap, i + HEAP0);
1013} 1192}
1014 1193
1015/*****************************************************************************/ 1194/*****************************************************************************/
1016 1195
1196/* associate signal watchers to a signal signal */
1017typedef struct 1197typedef struct
1018{ 1198{
1199 EV_ATOMIC_T pending;
1200#if EV_MULTIPLICITY
1201 EV_P;
1202#endif
1019 WL head; 1203 WL head;
1020 EV_ATOMIC_T gotsig;
1021} ANSIG; 1204} ANSIG;
1022 1205
1023static ANSIG *signals; 1206static ANSIG signals [EV_NSIG - 1];
1024static int signalmax;
1025
1026static EV_ATOMIC_T gotsig;
1027 1207
1028/*****************************************************************************/ 1208/*****************************************************************************/
1029 1209
1210/* used to prepare libev internal fd's */
1211/* this is not fork-safe */
1030inline_speed void 1212inline_speed void
1031fd_intern (int fd) 1213fd_intern (int fd)
1032{ 1214{
1033#ifdef _WIN32 1215#ifdef _WIN32
1034 unsigned long arg = 1; 1216 unsigned long arg = 1;
1035 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1217 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1036#else 1218#else
1037 fcntl (fd, F_SETFD, FD_CLOEXEC); 1219 fcntl (fd, F_SETFD, FD_CLOEXEC);
1038 fcntl (fd, F_SETFL, O_NONBLOCK); 1220 fcntl (fd, F_SETFL, O_NONBLOCK);
1039#endif 1221#endif
1040} 1222}
1041 1223
1042static void noinline 1224static void noinline
1043evpipe_init (EV_P) 1225evpipe_init (EV_P)
1044{ 1226{
1045 if (!ev_is_active (&pipeev)) 1227 if (!ev_is_active (&pipe_w))
1046 { 1228 {
1047#if EV_USE_EVENTFD 1229#if EV_USE_EVENTFD
1230 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1231 if (evfd < 0 && errno == EINVAL)
1048 if ((evfd = eventfd (0, 0)) >= 0) 1232 evfd = eventfd (0, 0);
1233
1234 if (evfd >= 0)
1049 { 1235 {
1050 evpipe [0] = -1; 1236 evpipe [0] = -1;
1051 fd_intern (evfd); 1237 fd_intern (evfd); /* doing it twice doesn't hurt */
1052 ev_io_set (&pipeev, evfd, EV_READ); 1238 ev_io_set (&pipe_w, evfd, EV_READ);
1053 } 1239 }
1054 else 1240 else
1055#endif 1241#endif
1056 { 1242 {
1057 while (pipe (evpipe)) 1243 while (pipe (evpipe))
1058 ev_syserr ("(libev) error creating signal/async pipe"); 1244 ev_syserr ("(libev) error creating signal/async pipe");
1059 1245
1060 fd_intern (evpipe [0]); 1246 fd_intern (evpipe [0]);
1061 fd_intern (evpipe [1]); 1247 fd_intern (evpipe [1]);
1062 ev_io_set (&pipeev, evpipe [0], EV_READ); 1248 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1063 } 1249 }
1064 1250
1065 ev_io_start (EV_A_ &pipeev); 1251 ev_io_start (EV_A_ &pipe_w);
1066 ev_unref (EV_A); /* watcher should not keep loop alive */ 1252 ev_unref (EV_A); /* watcher should not keep loop alive */
1067 } 1253 }
1068} 1254}
1069 1255
1070inline_size void 1256inline_size void
1088 1274
1089 errno = old_errno; 1275 errno = old_errno;
1090 } 1276 }
1091} 1277}
1092 1278
1279/* called whenever the libev signal pipe */
1280/* got some events (signal, async) */
1093static void 1281static void
1094pipecb (EV_P_ ev_io *iow, int revents) 1282pipecb (EV_P_ ev_io *iow, int revents)
1095{ 1283{
1284 int i;
1285
1096#if EV_USE_EVENTFD 1286#if EV_USE_EVENTFD
1097 if (evfd >= 0) 1287 if (evfd >= 0)
1098 { 1288 {
1099 uint64_t counter; 1289 uint64_t counter;
1100 read (evfd, &counter, sizeof (uint64_t)); 1290 read (evfd, &counter, sizeof (uint64_t));
1104 { 1294 {
1105 char dummy; 1295 char dummy;
1106 read (evpipe [0], &dummy, 1); 1296 read (evpipe [0], &dummy, 1);
1107 } 1297 }
1108 1298
1109 if (gotsig && ev_is_default_loop (EV_A)) 1299 if (sig_pending)
1110 { 1300 {
1111 int signum; 1301 sig_pending = 0;
1112 gotsig = 0;
1113 1302
1114 for (signum = signalmax; signum--; ) 1303 for (i = EV_NSIG - 1; i--; )
1115 if (signals [signum].gotsig) 1304 if (expect_false (signals [i].pending))
1116 ev_feed_signal_event (EV_A_ signum + 1); 1305 ev_feed_signal_event (EV_A_ i + 1);
1117 } 1306 }
1118 1307
1119#if EV_ASYNC_ENABLE 1308#if EV_ASYNC_ENABLE
1120 if (gotasync) 1309 if (async_pending)
1121 { 1310 {
1122 int i; 1311 async_pending = 0;
1123 gotasync = 0;
1124 1312
1125 for (i = asynccnt; i--; ) 1313 for (i = asynccnt; i--; )
1126 if (asyncs [i]->sent) 1314 if (asyncs [i]->sent)
1127 { 1315 {
1128 asyncs [i]->sent = 0; 1316 asyncs [i]->sent = 0;
1136 1324
1137static void 1325static void
1138ev_sighandler (int signum) 1326ev_sighandler (int signum)
1139{ 1327{
1140#if EV_MULTIPLICITY 1328#if EV_MULTIPLICITY
1141 struct ev_loop *loop = &default_loop_struct; 1329 EV_P = signals [signum - 1].loop;
1142#endif 1330#endif
1143 1331
1144#if _WIN32 1332#ifdef _WIN32
1145 signal (signum, ev_sighandler); 1333 signal (signum, ev_sighandler);
1146#endif 1334#endif
1147 1335
1148 signals [signum - 1].gotsig = 1; 1336 signals [signum - 1].pending = 1;
1149 evpipe_write (EV_A_ &gotsig); 1337 evpipe_write (EV_A_ &sig_pending);
1150} 1338}
1151 1339
1152void noinline 1340void noinline
1153ev_feed_signal_event (EV_P_ int signum) 1341ev_feed_signal_event (EV_P_ int signum)
1154{ 1342{
1155 WL w; 1343 WL w;
1156 1344
1345 if (expect_false (signum <= 0 || signum > EV_NSIG))
1346 return;
1347
1348 --signum;
1349
1157#if EV_MULTIPLICITY 1350#if EV_MULTIPLICITY
1158 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 */
1159#endif 1352 /* or, likely more useful, feeding a signal nobody is waiting for */
1160 1353
1161 --signum; 1354 if (expect_false (signals [signum].loop != EV_A))
1162
1163 if (signum < 0 || signum >= signalmax)
1164 return; 1355 return;
1356#endif
1165 1357
1166 signals [signum].gotsig = 0; 1358 signals [signum].pending = 0;
1167 1359
1168 for (w = signals [signum].head; w; w = w->next) 1360 for (w = signals [signum].head; w; w = w->next)
1169 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1361 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1170} 1362}
1171 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
1383
1172/*****************************************************************************/ 1384/*****************************************************************************/
1173 1385
1174static WL childs [EV_PID_HASHSIZE]; 1386static WL childs [EV_PID_HASHSIZE];
1175 1387
1176#ifndef _WIN32 1388#ifndef _WIN32
1179 1391
1180#ifndef WIFCONTINUED 1392#ifndef WIFCONTINUED
1181# define WIFCONTINUED(status) 0 1393# define WIFCONTINUED(status) 0
1182#endif 1394#endif
1183 1395
1396/* handle a single child status event */
1184inline_speed void 1397inline_speed void
1185child_reap (EV_P_ int chain, int pid, int status) 1398child_reap (EV_P_ int chain, int pid, int status)
1186{ 1399{
1187 ev_child *w; 1400 ev_child *w;
1188 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1401 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1202 1415
1203#ifndef WCONTINUED 1416#ifndef WCONTINUED
1204# define WCONTINUED 0 1417# define WCONTINUED 0
1205#endif 1418#endif
1206 1419
1420/* called on sigchld etc., calls waitpid */
1207static void 1421static void
1208childcb (EV_P_ ev_signal *sw, int revents) 1422childcb (EV_P_ ev_signal *sw, int revents)
1209{ 1423{
1210 int pid, status; 1424 int pid, status;
1211 1425
1318ev_backend (EV_P) 1532ev_backend (EV_P)
1319{ 1533{
1320 return backend; 1534 return backend;
1321} 1535}
1322 1536
1537#if EV_MINIMAL < 2
1323unsigned int 1538unsigned int
1324ev_loop_count (EV_P) 1539ev_loop_count (EV_P)
1325{ 1540{
1326 return loop_count; 1541 return loop_count;
1327} 1542}
1328 1543
1544unsigned int
1545ev_loop_depth (EV_P)
1546{
1547 return loop_depth;
1548}
1549
1329void 1550void
1330ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1551ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1331{ 1552{
1332 io_blocktime = interval; 1553 io_blocktime = interval;
1333} 1554}
1336ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1557ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1337{ 1558{
1338 timeout_blocktime = interval; 1559 timeout_blocktime = interval;
1339} 1560}
1340 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
1585
1586/* initialise a loop structure, must be zero-initialised */
1341static void noinline 1587static void noinline
1342loop_init (EV_P_ unsigned int flags) 1588loop_init (EV_P_ unsigned int flags)
1343{ 1589{
1344 if (!backend) 1590 if (!backend)
1345 { 1591 {
1361 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1607 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1362 have_monotonic = 1; 1608 have_monotonic = 1;
1363 } 1609 }
1364#endif 1610#endif
1365 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
1366 ev_rt_now = ev_time (); 1623 ev_rt_now = ev_time ();
1367 mn_now = get_clock (); 1624 mn_now = get_clock ();
1368 now_floor = mn_now; 1625 now_floor = mn_now;
1369 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
1370 1630
1371 io_blocktime = 0.; 1631 io_blocktime = 0.;
1372 timeout_blocktime = 0.; 1632 timeout_blocktime = 0.;
1373 backend = 0; 1633 backend = 0;
1374 backend_fd = -1; 1634 backend_fd = -1;
1375 gotasync = 0; 1635 sig_pending = 0;
1636#if EV_ASYNC_ENABLE
1637 async_pending = 0;
1638#endif
1376#if EV_USE_INOTIFY 1639#if EV_USE_INOTIFY
1377 fs_fd = -2; 1640 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1378#endif 1641#endif
1379 1642#if EV_USE_SIGNALFD
1380 /* pid check not overridable via env */ 1643 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1381#ifndef _WIN32
1382 if (flags & EVFLAG_FORKCHECK)
1383 curpid = getpid ();
1384#endif 1644#endif
1385
1386 if (!(flags & EVFLAG_NOENV)
1387 && !enable_secure ()
1388 && getenv ("LIBEV_FLAGS"))
1389 flags = atoi (getenv ("LIBEV_FLAGS"));
1390 1645
1391 if (!(flags & 0x0000ffffU)) 1646 if (!(flags & 0x0000ffffU))
1392 flags |= ev_recommended_backends (); 1647 flags |= ev_recommended_backends ();
1393 1648
1394#if EV_USE_PORT 1649#if EV_USE_PORT
1405#endif 1660#endif
1406#if EV_USE_SELECT 1661#if EV_USE_SELECT
1407 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1662 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1408#endif 1663#endif
1409 1664
1665 ev_prepare_init (&pending_w, pendingcb);
1666
1410 ev_init (&pipeev, pipecb); 1667 ev_init (&pipe_w, pipecb);
1411 ev_set_priority (&pipeev, EV_MAXPRI); 1668 ev_set_priority (&pipe_w, EV_MAXPRI);
1412 } 1669 }
1413} 1670}
1414 1671
1672/* free up a loop structure */
1415static void noinline 1673static void noinline
1416loop_destroy (EV_P) 1674loop_destroy (EV_P)
1417{ 1675{
1418 int i; 1676 int i;
1419 1677
1420 if (ev_is_active (&pipeev)) 1678 if (ev_is_active (&pipe_w))
1421 { 1679 {
1422 ev_ref (EV_A); /* signal watcher */ 1680 /*ev_ref (EV_A);*/
1423 ev_io_stop (EV_A_ &pipeev); 1681 /*ev_io_stop (EV_A_ &pipe_w);*/
1424 1682
1425#if EV_USE_EVENTFD 1683#if EV_USE_EVENTFD
1426 if (evfd >= 0) 1684 if (evfd >= 0)
1427 close (evfd); 1685 close (evfd);
1428#endif 1686#endif
1429 1687
1430 if (evpipe [0] >= 0) 1688 if (evpipe [0] >= 0)
1431 { 1689 {
1432 close (evpipe [0]); 1690 EV_WIN32_CLOSE_FD (evpipe [0]);
1433 close (evpipe [1]); 1691 EV_WIN32_CLOSE_FD (evpipe [1]);
1434 } 1692 }
1435 } 1693 }
1694
1695#if EV_USE_SIGNALFD
1696 if (ev_is_active (&sigfd_w))
1697 close (sigfd);
1698#endif
1436 1699
1437#if EV_USE_INOTIFY 1700#if EV_USE_INOTIFY
1438 if (fs_fd >= 0) 1701 if (fs_fd >= 0)
1439 close (fs_fd); 1702 close (fs_fd);
1440#endif 1703#endif
1464#if EV_IDLE_ENABLE 1727#if EV_IDLE_ENABLE
1465 array_free (idle, [i]); 1728 array_free (idle, [i]);
1466#endif 1729#endif
1467 } 1730 }
1468 1731
1469 ev_free (anfds); anfdmax = 0; 1732 ev_free (anfds); anfds = 0; anfdmax = 0;
1470 1733
1471 /* have to use the microsoft-never-gets-it-right macro */ 1734 /* have to use the microsoft-never-gets-it-right macro */
1472 array_free (rfeed, EMPTY); 1735 array_free (rfeed, EMPTY);
1473 array_free (fdchange, EMPTY); 1736 array_free (fdchange, EMPTY);
1474 array_free (timer, EMPTY); 1737 array_free (timer, EMPTY);
1505#endif 1768#endif
1506#if EV_USE_INOTIFY 1769#if EV_USE_INOTIFY
1507 infy_fork (EV_A); 1770 infy_fork (EV_A);
1508#endif 1771#endif
1509 1772
1510 if (ev_is_active (&pipeev)) 1773 if (ev_is_active (&pipe_w))
1511 { 1774 {
1512 /* this "locks" the handlers against writing to the pipe */ 1775 /* this "locks" the handlers against writing to the pipe */
1513 /* while we modify the fd vars */ 1776 /* while we modify the fd vars */
1514 gotsig = 1; 1777 sig_pending = 1;
1515#if EV_ASYNC_ENABLE 1778#if EV_ASYNC_ENABLE
1516 gotasync = 1; 1779 async_pending = 1;
1517#endif 1780#endif
1518 1781
1519 ev_ref (EV_A); 1782 ev_ref (EV_A);
1520 ev_io_stop (EV_A_ &pipeev); 1783 ev_io_stop (EV_A_ &pipe_w);
1521 1784
1522#if EV_USE_EVENTFD 1785#if EV_USE_EVENTFD
1523 if (evfd >= 0) 1786 if (evfd >= 0)
1524 close (evfd); 1787 close (evfd);
1525#endif 1788#endif
1526 1789
1527 if (evpipe [0] >= 0) 1790 if (evpipe [0] >= 0)
1528 { 1791 {
1529 close (evpipe [0]); 1792 EV_WIN32_CLOSE_FD (evpipe [0]);
1530 close (evpipe [1]); 1793 EV_WIN32_CLOSE_FD (evpipe [1]);
1531 } 1794 }
1532 1795
1533 evpipe_init (EV_A); 1796 evpipe_init (EV_A);
1534 /* now iterate over everything, in case we missed something */ 1797 /* now iterate over everything, in case we missed something */
1535 pipecb (EV_A_ &pipeev, EV_READ); 1798 pipecb (EV_A_ &pipe_w, EV_READ);
1536 } 1799 }
1537 1800
1538 postfork = 0; 1801 postfork = 0;
1539} 1802}
1540 1803
1541#if EV_MULTIPLICITY 1804#if EV_MULTIPLICITY
1542 1805
1543struct ev_loop * 1806struct ev_loop *
1544ev_loop_new (unsigned int flags) 1807ev_loop_new (unsigned int flags)
1545{ 1808{
1546 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));
1547 1810
1548 memset (loop, 0, sizeof (struct ev_loop)); 1811 memset (EV_A, 0, sizeof (struct ev_loop));
1549
1550 loop_init (EV_A_ flags); 1812 loop_init (EV_A_ flags);
1551 1813
1552 if (ev_backend (EV_A)) 1814 if (ev_backend (EV_A))
1553 return loop; 1815 return EV_A;
1554 1816
1555 return 0; 1817 return 0;
1556} 1818}
1557 1819
1558void 1820void
1565void 1827void
1566ev_loop_fork (EV_P) 1828ev_loop_fork (EV_P)
1567{ 1829{
1568 postfork = 1; /* must be in line with ev_default_fork */ 1830 postfork = 1; /* must be in line with ev_default_fork */
1569} 1831}
1832#endif /* multiplicity */
1570 1833
1571#if EV_VERIFY 1834#if EV_VERIFY
1572static void noinline 1835static void noinline
1573verify_watcher (EV_P_ W w) 1836verify_watcher (EV_P_ W w)
1574{ 1837{
1602 verify_watcher (EV_A_ ws [cnt]); 1865 verify_watcher (EV_A_ ws [cnt]);
1603 } 1866 }
1604} 1867}
1605#endif 1868#endif
1606 1869
1870#if EV_MINIMAL < 2
1607void 1871void
1608ev_loop_verify (EV_P) 1872ev_loop_verify (EV_P)
1609{ 1873{
1610#if EV_VERIFY 1874#if EV_VERIFY
1611 int i; 1875 int i;
1660 assert (checkmax >= checkcnt); 1924 assert (checkmax >= checkcnt);
1661 array_verify (EV_A_ (W *)checks, checkcnt); 1925 array_verify (EV_A_ (W *)checks, checkcnt);
1662 1926
1663# if 0 1927# if 0
1664 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)
1665 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1929 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1666# endif
1667#endif 1930# endif
1931#endif
1668} 1932}
1669 1933#endif
1670#endif /* multiplicity */
1671 1934
1672#if EV_MULTIPLICITY 1935#if EV_MULTIPLICITY
1673struct ev_loop * 1936struct ev_loop *
1674ev_default_loop_init (unsigned int flags) 1937ev_default_loop_init (unsigned int flags)
1675#else 1938#else
1678#endif 1941#endif
1679{ 1942{
1680 if (!ev_default_loop_ptr) 1943 if (!ev_default_loop_ptr)
1681 { 1944 {
1682#if EV_MULTIPLICITY 1945#if EV_MULTIPLICITY
1683 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1946 EV_P = ev_default_loop_ptr = &default_loop_struct;
1684#else 1947#else
1685 ev_default_loop_ptr = 1; 1948 ev_default_loop_ptr = 1;
1686#endif 1949#endif
1687 1950
1688 loop_init (EV_A_ flags); 1951 loop_init (EV_A_ flags);
1705 1968
1706void 1969void
1707ev_default_destroy (void) 1970ev_default_destroy (void)
1708{ 1971{
1709#if EV_MULTIPLICITY 1972#if EV_MULTIPLICITY
1710 struct ev_loop *loop = ev_default_loop_ptr; 1973 EV_P = ev_default_loop_ptr;
1711#endif 1974#endif
1712 1975
1713 ev_default_loop_ptr = 0; 1976 ev_default_loop_ptr = 0;
1714 1977
1715#ifndef _WIN32 1978#ifndef _WIN32
1722 1985
1723void 1986void
1724ev_default_fork (void) 1987ev_default_fork (void)
1725{ 1988{
1726#if EV_MULTIPLICITY 1989#if EV_MULTIPLICITY
1727 struct ev_loop *loop = ev_default_loop_ptr; 1990 EV_P = ev_default_loop_ptr;
1728#endif 1991#endif
1729 1992
1730 postfork = 1; /* must be in line with ev_loop_fork */ 1993 postfork = 1; /* must be in line with ev_loop_fork */
1731} 1994}
1732 1995
1736ev_invoke (EV_P_ void *w, int revents) 1999ev_invoke (EV_P_ void *w, int revents)
1737{ 2000{
1738 EV_CB_INVOKE ((W)w, revents); 2001 EV_CB_INVOKE ((W)w, revents);
1739} 2002}
1740 2003
1741inline_speed void 2004unsigned int
1742call_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)
1743{ 2018{
1744 int pri; 2019 int pri;
1745 2020
1746 for (pri = NUMPRI; pri--; ) 2021 for (pri = NUMPRI; pri--; )
1747 while (pendingcnt [pri]) 2022 while (pendingcnt [pri])
1748 { 2023 {
1749 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2024 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1750 2025
1751 if (expect_true (p->w))
1752 {
1753 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/ 2026 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
2027 /* ^ this is no longer true, as pending_w could be here */
1754 2028
1755 p->w->pending = 0; 2029 p->w->pending = 0;
1756 EV_CB_INVOKE (p->w, p->events); 2030 EV_CB_INVOKE (p->w, p->events);
1757 EV_FREQUENT_CHECK; 2031 EV_FREQUENT_CHECK;
1758 }
1759 } 2032 }
1760} 2033}
1761 2034
1762#if EV_IDLE_ENABLE 2035#if EV_IDLE_ENABLE
2036/* make idle watchers pending. this handles the "call-idle */
2037/* only when higher priorities are idle" logic */
1763inline_size void 2038inline_size void
1764idle_reify (EV_P) 2039idle_reify (EV_P)
1765{ 2040{
1766 if (expect_false (idleall)) 2041 if (expect_false (idleall))
1767 { 2042 {
1780 } 2055 }
1781 } 2056 }
1782} 2057}
1783#endif 2058#endif
1784 2059
2060/* make timers pending */
1785inline_size void 2061inline_size void
1786timers_reify (EV_P) 2062timers_reify (EV_P)
1787{ 2063{
1788 EV_FREQUENT_CHECK; 2064 EV_FREQUENT_CHECK;
1789 2065
1818 feed_reverse_done (EV_A_ EV_TIMEOUT); 2094 feed_reverse_done (EV_A_ EV_TIMEOUT);
1819 } 2095 }
1820} 2096}
1821 2097
1822#if EV_PERIODIC_ENABLE 2098#if EV_PERIODIC_ENABLE
2099/* make periodics pending */
1823inline_size void 2100inline_size void
1824periodics_reify (EV_P) 2101periodics_reify (EV_P)
1825{ 2102{
1826 EV_FREQUENT_CHECK; 2103 EV_FREQUENT_CHECK;
1827 2104
1874 2151
1875 feed_reverse_done (EV_A_ EV_PERIODIC); 2152 feed_reverse_done (EV_A_ EV_PERIODIC);
1876 } 2153 }
1877} 2154}
1878 2155
2156/* simply recalculate all periodics */
2157/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1879static void noinline 2158static void noinline
1880periodics_reschedule (EV_P) 2159periodics_reschedule (EV_P)
1881{ 2160{
1882 int i; 2161 int i;
1883 2162
1896 2175
1897 reheap (periodics, periodiccnt); 2176 reheap (periodics, periodiccnt);
1898} 2177}
1899#endif 2178#endif
1900 2179
2180/* adjust all timers by a given offset */
1901static void noinline 2181static void noinline
1902timers_reschedule (EV_P_ ev_tstamp adjust) 2182timers_reschedule (EV_P_ ev_tstamp adjust)
1903{ 2183{
1904 int i; 2184 int i;
1905 2185
1909 ANHE_w (*he)->at += adjust; 2189 ANHE_w (*he)->at += adjust;
1910 ANHE_at_cache (*he); 2190 ANHE_at_cache (*he);
1911 } 2191 }
1912} 2192}
1913 2193
2194/* fetch new monotonic and realtime times from the kernel */
2195/* also detect if there was a timejump, and act accordingly */
1914inline_speed void 2196inline_speed void
1915time_update (EV_P_ ev_tstamp max_block) 2197time_update (EV_P_ ev_tstamp max_block)
1916{ 2198{
1917 int i;
1918
1919#if EV_USE_MONOTONIC 2199#if EV_USE_MONOTONIC
1920 if (expect_true (have_monotonic)) 2200 if (expect_true (have_monotonic))
1921 { 2201 {
2202 int i;
1922 ev_tstamp odiff = rtmn_diff; 2203 ev_tstamp odiff = rtmn_diff;
1923 2204
1924 mn_now = get_clock (); 2205 mn_now = get_clock ();
1925 2206
1926 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2207 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1976 2257
1977 mn_now = ev_rt_now; 2258 mn_now = ev_rt_now;
1978 } 2259 }
1979} 2260}
1980 2261
1981static int loop_done;
1982
1983void 2262void
1984ev_loop (EV_P_ int flags) 2263ev_loop (EV_P_ int flags)
1985{ 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
1986 loop_done = EVUNLOOP_CANCEL; 2271 loop_done = EVUNLOOP_CANCEL;
1987 2272
1988 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 */
1989 2274
1990 do 2275 do
1991 { 2276 {
1992#if EV_VERIFY >= 2 2277#if EV_VERIFY >= 2
1993 ev_loop_verify (EV_A); 2278 ev_loop_verify (EV_A);
2006 /* we might have forked, so queue fork handlers */ 2291 /* we might have forked, so queue fork handlers */
2007 if (expect_false (postfork)) 2292 if (expect_false (postfork))
2008 if (forkcnt) 2293 if (forkcnt)
2009 { 2294 {
2010 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2295 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2011 call_pending (EV_A); 2296 EV_INVOKE_PENDING;
2012 } 2297 }
2013#endif 2298#endif
2014 2299
2015 /* queue prepare watchers (and execute them) */ 2300 /* queue prepare watchers (and execute them) */
2016 if (expect_false (preparecnt)) 2301 if (expect_false (preparecnt))
2017 { 2302 {
2018 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2303 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2019 call_pending (EV_A); 2304 EV_INVOKE_PENDING;
2020 } 2305 }
2306
2307 if (expect_false (loop_done))
2308 break;
2021 2309
2022 /* we might have forked, so reify kernel state if necessary */ 2310 /* we might have forked, so reify kernel state if necessary */
2023 if (expect_false (postfork)) 2311 if (expect_false (postfork))
2024 loop_fork (EV_A); 2312 loop_fork (EV_A);
2025 2313
2031 ev_tstamp waittime = 0.; 2319 ev_tstamp waittime = 0.;
2032 ev_tstamp sleeptime = 0.; 2320 ev_tstamp sleeptime = 0.;
2033 2321
2034 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2322 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2035 { 2323 {
2324 /* remember old timestamp for io_blocktime calculation */
2325 ev_tstamp prev_mn_now = mn_now;
2326
2036 /* update time to cancel out callback processing overhead */ 2327 /* update time to cancel out callback processing overhead */
2037 time_update (EV_A_ 1e100); 2328 time_update (EV_A_ 1e100);
2329
2330 waittime = MAX_BLOCKTIME;
2038 2331
2039 if (timercnt) 2332 if (timercnt)
2040 { 2333 {
2041 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2334 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
2042 if (waittime > to) waittime = to; 2335 if (waittime > to) waittime = to;
2048 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;
2049 if (waittime > to) waittime = to; 2342 if (waittime > to) waittime = to;
2050 } 2343 }
2051#endif 2344#endif
2052 2345
2346 /* don't let timeouts decrease the waittime below timeout_blocktime */
2053 if (expect_false (waittime < timeout_blocktime)) 2347 if (expect_false (waittime < timeout_blocktime))
2054 waittime = timeout_blocktime; 2348 waittime = timeout_blocktime;
2055 2349
2056 sleeptime = waittime - backend_fudge; 2350 /* extra check because io_blocktime is commonly 0 */
2057
2058 if (expect_true (sleeptime > io_blocktime)) 2351 if (expect_false (io_blocktime))
2059 sleeptime = io_blocktime;
2060
2061 if (sleeptime)
2062 { 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 {
2063 ev_sleep (sleeptime); 2360 ev_sleep (sleeptime);
2064 waittime -= sleeptime; 2361 waittime -= sleeptime;
2362 }
2065 } 2363 }
2066 } 2364 }
2067 2365
2366#if EV_MINIMAL < 2
2068 ++loop_count; 2367 ++loop_count;
2368#endif
2369 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2069 backend_poll (EV_A_ waittime); 2370 backend_poll (EV_A_ waittime);
2371 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2070 2372
2071 /* update ev_rt_now, do magic */ 2373 /* update ev_rt_now, do magic */
2072 time_update (EV_A_ waittime + sleeptime); 2374 time_update (EV_A_ waittime + sleeptime);
2073 } 2375 }
2074 2376
2085 2387
2086 /* queue check watchers, to be executed first */ 2388 /* queue check watchers, to be executed first */
2087 if (expect_false (checkcnt)) 2389 if (expect_false (checkcnt))
2088 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2390 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2089 2391
2090 call_pending (EV_A); 2392 EV_INVOKE_PENDING;
2091 } 2393 }
2092 while (expect_true ( 2394 while (expect_true (
2093 activecnt 2395 activecnt
2094 && !loop_done 2396 && !loop_done
2095 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2397 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2096 )); 2398 ));
2097 2399
2098 if (loop_done == EVUNLOOP_ONE) 2400 if (loop_done == EVUNLOOP_ONE)
2099 loop_done = EVUNLOOP_CANCEL; 2401 loop_done = EVUNLOOP_CANCEL;
2402
2403#if EV_MINIMAL < 2
2404 --loop_depth;
2405#endif
2100} 2406}
2101 2407
2102void 2408void
2103ev_unloop (EV_P_ int how) 2409ev_unloop (EV_P_ int how)
2104{ 2410{
2135 ev_tstamp mn_prev = mn_now; 2441 ev_tstamp mn_prev = mn_now;
2136 2442
2137 ev_now_update (EV_A); 2443 ev_now_update (EV_A);
2138 timers_reschedule (EV_A_ mn_now - mn_prev); 2444 timers_reschedule (EV_A_ mn_now - mn_prev);
2139#if EV_PERIODIC_ENABLE 2445#if EV_PERIODIC_ENABLE
2446 /* TODO: really do this? */
2140 periodics_reschedule (EV_A); 2447 periodics_reschedule (EV_A);
2141#endif 2448#endif
2142} 2449}
2143 2450
2144/*****************************************************************************/ 2451/*****************************************************************************/
2452/* singly-linked list management, used when the expected list length is short */
2145 2453
2146inline_size void 2454inline_size void
2147wlist_add (WL *head, WL elem) 2455wlist_add (WL *head, WL elem)
2148{ 2456{
2149 elem->next = *head; 2457 elem->next = *head;
2153inline_size void 2461inline_size void
2154wlist_del (WL *head, WL elem) 2462wlist_del (WL *head, WL elem)
2155{ 2463{
2156 while (*head) 2464 while (*head)
2157 { 2465 {
2158 if (*head == elem) 2466 if (expect_true (*head == elem))
2159 { 2467 {
2160 *head = elem->next; 2468 *head = elem->next;
2161 return; 2469 break;
2162 } 2470 }
2163 2471
2164 head = &(*head)->next; 2472 head = &(*head)->next;
2165 } 2473 }
2166} 2474}
2167 2475
2476/* internal, faster, version of ev_clear_pending */
2168inline_speed void 2477inline_speed void
2169clear_pending (EV_P_ W w) 2478clear_pending (EV_P_ W w)
2170{ 2479{
2171 if (w->pending) 2480 if (w->pending)
2172 { 2481 {
2173 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2482 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2174 w->pending = 0; 2483 w->pending = 0;
2175 } 2484 }
2176} 2485}
2177 2486
2178int 2487int
2182 int pending = w_->pending; 2491 int pending = w_->pending;
2183 2492
2184 if (expect_true (pending)) 2493 if (expect_true (pending))
2185 { 2494 {
2186 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2495 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2496 p->w = (W)&pending_w;
2187 w_->pending = 0; 2497 w_->pending = 0;
2188 p->w = 0;
2189 return p->events; 2498 return p->events;
2190 } 2499 }
2191 else 2500 else
2192 return 0; 2501 return 0;
2193} 2502}
2194 2503
2195inline_size void 2504inline_size void
2196pri_adjust (EV_P_ W w) 2505pri_adjust (EV_P_ W w)
2197{ 2506{
2198 int pri = w->priority; 2507 int pri = ev_priority (w);
2199 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2508 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2200 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2509 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2201 w->priority = pri; 2510 ev_set_priority (w, pri);
2202} 2511}
2203 2512
2204inline_speed void 2513inline_speed void
2205ev_start (EV_P_ W w, int active) 2514ev_start (EV_P_ W w, int active)
2206{ 2515{
2225 2534
2226 if (expect_false (ev_is_active (w))) 2535 if (expect_false (ev_is_active (w)))
2227 return; 2536 return;
2228 2537
2229 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2538 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2230 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))));
2231 2540
2232 EV_FREQUENT_CHECK; 2541 EV_FREQUENT_CHECK;
2233 2542
2234 ev_start (EV_A_ (W)w, 1); 2543 ev_start (EV_A_ (W)w, 1);
2235 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2544 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2236 wlist_add (&anfds[fd].head, (WL)w); 2545 wlist_add (&anfds[fd].head, (WL)w);
2237 2546
2238 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2547 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2239 w->events &= ~EV__IOFDSET; 2548 w->events &= ~EV__IOFDSET;
2240 2549
2241 EV_FREQUENT_CHECK; 2550 EV_FREQUENT_CHECK;
2242} 2551}
2243 2552
2305 timers [active] = timers [timercnt + HEAP0]; 2614 timers [active] = timers [timercnt + HEAP0];
2306 adjustheap (timers, timercnt, active); 2615 adjustheap (timers, timercnt, active);
2307 } 2616 }
2308 } 2617 }
2309 2618
2310 EV_FREQUENT_CHECK;
2311
2312 ev_at (w) -= mn_now; 2619 ev_at (w) -= mn_now;
2313 2620
2314 ev_stop (EV_A_ (W)w); 2621 ev_stop (EV_A_ (W)w);
2622
2623 EV_FREQUENT_CHECK;
2315} 2624}
2316 2625
2317void noinline 2626void noinline
2318ev_timer_again (EV_P_ ev_timer *w) 2627ev_timer_again (EV_P_ ev_timer *w)
2319{ 2628{
2337 } 2646 }
2338 2647
2339 EV_FREQUENT_CHECK; 2648 EV_FREQUENT_CHECK;
2340} 2649}
2341 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
2342#if EV_PERIODIC_ENABLE 2657#if EV_PERIODIC_ENABLE
2343void noinline 2658void noinline
2344ev_periodic_start (EV_P_ ev_periodic *w) 2659ev_periodic_start (EV_P_ ev_periodic *w)
2345{ 2660{
2346 if (expect_false (ev_is_active (w))) 2661 if (expect_false (ev_is_active (w)))
2392 periodics [active] = periodics [periodiccnt + HEAP0]; 2707 periodics [active] = periodics [periodiccnt + HEAP0];
2393 adjustheap (periodics, periodiccnt, active); 2708 adjustheap (periodics, periodiccnt, active);
2394 } 2709 }
2395 } 2710 }
2396 2711
2397 EV_FREQUENT_CHECK;
2398
2399 ev_stop (EV_A_ (W)w); 2712 ev_stop (EV_A_ (W)w);
2713
2714 EV_FREQUENT_CHECK;
2400} 2715}
2401 2716
2402void noinline 2717void noinline
2403ev_periodic_again (EV_P_ ev_periodic *w) 2718ev_periodic_again (EV_P_ ev_periodic *w)
2404{ 2719{
2413#endif 2728#endif
2414 2729
2415void noinline 2730void noinline
2416ev_signal_start (EV_P_ ev_signal *w) 2731ev_signal_start (EV_P_ ev_signal *w)
2417{ 2732{
2418#if EV_MULTIPLICITY
2419 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2420#endif
2421 if (expect_false (ev_is_active (w))) 2733 if (expect_false (ev_is_active (w)))
2422 return; 2734 return;
2423 2735
2424 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));
2425 2737
2426 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));
2427 2741
2428 EV_FREQUENT_CHECK; 2742 signals [w->signum - 1].loop = EV_A;
2743#endif
2429 2744
2745 EV_FREQUENT_CHECK;
2746
2747#if EV_USE_SIGNALFD
2748 if (sigfd == -2)
2430 { 2749 {
2431#ifndef _WIN32 2750 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2432 sigset_t full, prev; 2751 if (sigfd < 0 && errno == EINVAL)
2433 sigfillset (&full); 2752 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2434 sigprocmask (SIG_SETMASK, &full, &prev);
2435#endif
2436 2753
2437 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 */
2438 2757
2439#ifndef _WIN32 2758 sigemptyset (&sigfd_set);
2440 sigprocmask (SIG_SETMASK, &prev, 0); 2759
2441#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 }
2442 } 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
2443 2776
2444 ev_start (EV_A_ (W)w, 1); 2777 ev_start (EV_A_ (W)w, 1);
2445 wlist_add (&signals [w->signum - 1].head, (WL)w); 2778 wlist_add (&signals [w->signum - 1].head, (WL)w);
2446 2779
2447 if (!((WL)w)->next) 2780 if (!((WL)w)->next)
2781# if EV_USE_SIGNALFD
2782 if (sigfd < 0) /*TODO*/
2783# endif
2448 { 2784 {
2449#if _WIN32 2785# ifdef _WIN32
2786 evpipe_init (EV_A);
2787
2450 signal (w->signum, ev_sighandler); 2788 signal (w->signum, ev_sighandler);
2451#else 2789# else
2452 struct sigaction sa; 2790 struct sigaction sa;
2791
2792 evpipe_init (EV_A);
2793
2453 sa.sa_handler = ev_sighandler; 2794 sa.sa_handler = ev_sighandler;
2454 sigfillset (&sa.sa_mask); 2795 sigfillset (&sa.sa_mask);
2455 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 */
2456 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);
2457#endif 2802#endif
2458 } 2803 }
2459 2804
2460 EV_FREQUENT_CHECK; 2805 EV_FREQUENT_CHECK;
2461} 2806}
2462 2807
2463void noinline 2808void noinline
2471 2816
2472 wlist_del (&signals [w->signum - 1].head, (WL)w); 2817 wlist_del (&signals [w->signum - 1].head, (WL)w);
2473 ev_stop (EV_A_ (W)w); 2818 ev_stop (EV_A_ (W)w);
2474 2819
2475 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
2476 signal (w->signum, SIG_DFL); 2839 signal (w->signum, SIG_DFL);
2840 }
2477 2841
2478 EV_FREQUENT_CHECK; 2842 EV_FREQUENT_CHECK;
2479} 2843}
2480 2844
2481void 2845void
2522#define MIN_STAT_INTERVAL 0.1074891 2886#define MIN_STAT_INTERVAL 0.1074891
2523 2887
2524static 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);
2525 2889
2526#if EV_USE_INOTIFY 2890#if EV_USE_INOTIFY
2527# 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)
2528 2894
2529static void noinline 2895static void noinline
2530infy_add (EV_P_ ev_stat *w) 2896infy_add (EV_P_ ev_stat *w)
2531{ 2897{
2532 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);
2533 2899
2534 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 */
2535 { 2920 }
2921 else
2922 {
2923 /* can't use inotify, continue to stat */
2536 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2924 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2537 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2538 2925
2539 /* monitor some parent directory for speedup hints */ 2926 /* if path is not there, monitor some parent directory for speedup hints */
2540 /* 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, */
2541 /* but an efficiency issue only */ 2928 /* but an efficiency issue only */
2542 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2929 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2543 { 2930 {
2544 char path [4096]; 2931 char path [4096];
2560 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2947 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2561 } 2948 }
2562 } 2949 }
2563 2950
2564 if (w->wd >= 0) 2951 if (w->wd >= 0)
2565 {
2566 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);
2567 2953
2568 /* now local changes will be tracked by inotify, but remote changes won't */ 2954 /* now re-arm timer, if required */
2569 /* unless the filesystem it known to be local, we therefore still poll */ 2955 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2570 /* also do poll on <2.6.25, but with normal frequency */
2571 struct statfs sfs;
2572
2573 if (fs_2625 && !statfs (w->path, &sfs))
2574 if (sfs.f_type == 0x1373 /* devfs */
2575 || sfs.f_type == 0xEF53 /* ext2/3 */
2576 || sfs.f_type == 0x3153464a /* jfs */
2577 || sfs.f_type == 0x52654973 /* reiser3 */
2578 || sfs.f_type == 0x01021994 /* tempfs */
2579 || sfs.f_type == 0x58465342 /* xfs */)
2580 return;
2581
2582 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2583 ev_timer_again (EV_A_ &w->timer); 2956 ev_timer_again (EV_A_ &w->timer);
2584 } 2957 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2585} 2958}
2586 2959
2587static void noinline 2960static void noinline
2588infy_del (EV_P_ ev_stat *w) 2961infy_del (EV_P_ ev_stat *w)
2589{ 2962{
2634 3007
2635static void 3008static void
2636infy_cb (EV_P_ ev_io *w, int revents) 3009infy_cb (EV_P_ ev_io *w, int revents)
2637{ 3010{
2638 char buf [EV_INOTIFY_BUFSIZE]; 3011 char buf [EV_INOTIFY_BUFSIZE];
2639 struct inotify_event *ev = (struct inotify_event *)buf;
2640 int ofs; 3012 int ofs;
2641 int len = read (fs_fd, buf, sizeof (buf)); 3013 int len = read (fs_fd, buf, sizeof (buf));
2642 3014
2643 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);
2644 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;
2645} 3053}
2646 3054
2647inline_size void 3055inline_size void
2648check_2625 (EV_P) 3056ev_check_2625 (EV_P)
2649{ 3057{
2650 /* kernels < 2.6.25 are borked 3058 /* kernels < 2.6.25 are borked
2651 * 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
2652 */ 3060 */
2653 struct utsname buf; 3061 if (ev_linux_version () < 0x020619)
2654 int major, minor, micro;
2655
2656 if (uname (&buf))
2657 return; 3062 return;
2658 3063
2659 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2660 return;
2661
2662 if (major < 2
2663 || (major == 2 && minor < 6)
2664 || (major == 2 && minor == 6 && micro < 25))
2665 return;
2666
2667 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 ();
2668} 3076}
2669 3077
2670inline_size void 3078inline_size void
2671infy_init (EV_P) 3079infy_init (EV_P)
2672{ 3080{
2673 if (fs_fd != -2) 3081 if (fs_fd != -2)
2674 return; 3082 return;
2675 3083
2676 fs_fd = -1; 3084 fs_fd = -1;
2677 3085
2678 check_2625 (EV_A); 3086 ev_check_2625 (EV_A);
2679 3087
2680 fs_fd = inotify_init (); 3088 fs_fd = infy_newfd ();
2681 3089
2682 if (fs_fd >= 0) 3090 if (fs_fd >= 0)
2683 { 3091 {
3092 fd_intern (fs_fd);
2684 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3093 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2685 ev_set_priority (&fs_w, EV_MAXPRI); 3094 ev_set_priority (&fs_w, EV_MAXPRI);
2686 ev_io_start (EV_A_ &fs_w); 3095 ev_io_start (EV_A_ &fs_w);
3096 ev_unref (EV_A);
2687 } 3097 }
2688} 3098}
2689 3099
2690inline_size void 3100inline_size void
2691infy_fork (EV_P) 3101infy_fork (EV_P)
2693 int slot; 3103 int slot;
2694 3104
2695 if (fs_fd < 0) 3105 if (fs_fd < 0)
2696 return; 3106 return;
2697 3107
3108 ev_ref (EV_A);
3109 ev_io_stop (EV_A_ &fs_w);
2698 close (fs_fd); 3110 close (fs_fd);
2699 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 }
2700 3120
2701 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3121 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2702 { 3122 {
2703 WL w_ = fs_hash [slot].head; 3123 WL w_ = fs_hash [slot].head;
2704 fs_hash [slot].head = 0; 3124 fs_hash [slot].head = 0;
2711 w->wd = -1; 3131 w->wd = -1;
2712 3132
2713 if (fs_fd >= 0) 3133 if (fs_fd >= 0)
2714 infy_add (EV_A_ w); /* re-add, no matter what */ 3134 infy_add (EV_A_ w); /* re-add, no matter what */
2715 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);
2716 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 }
2717 } 3142 }
2718 } 3143 }
2719} 3144}
2720 3145
2721#endif 3146#endif
2738static void noinline 3163static void noinline
2739stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3164stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2740{ 3165{
2741 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3166 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2742 3167
2743 /* we copy this here each the time so that */ 3168 ev_statdata prev = w->attr;
2744 /* prev has the old value when the callback gets invoked */
2745 w->prev = w->attr;
2746 ev_stat_stat (EV_A_ w); 3169 ev_stat_stat (EV_A_ w);
2747 3170
2748 /* 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 */
2749 if ( 3172 if (
2750 w->prev.st_dev != w->attr.st_dev 3173 prev.st_dev != w->attr.st_dev
2751 || w->prev.st_ino != w->attr.st_ino 3174 || prev.st_ino != w->attr.st_ino
2752 || w->prev.st_mode != w->attr.st_mode 3175 || prev.st_mode != w->attr.st_mode
2753 || w->prev.st_nlink != w->attr.st_nlink 3176 || prev.st_nlink != w->attr.st_nlink
2754 || w->prev.st_uid != w->attr.st_uid 3177 || prev.st_uid != w->attr.st_uid
2755 || w->prev.st_gid != w->attr.st_gid 3178 || prev.st_gid != w->attr.st_gid
2756 || w->prev.st_rdev != w->attr.st_rdev 3179 || prev.st_rdev != w->attr.st_rdev
2757 || w->prev.st_size != w->attr.st_size 3180 || prev.st_size != w->attr.st_size
2758 || w->prev.st_atime != w->attr.st_atime 3181 || prev.st_atime != w->attr.st_atime
2759 || w->prev.st_mtime != w->attr.st_mtime 3182 || prev.st_mtime != w->attr.st_mtime
2760 || w->prev.st_ctime != w->attr.st_ctime 3183 || prev.st_ctime != w->attr.st_ctime
2761 ) { 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
2762 #if EV_USE_INOTIFY 3190 #if EV_USE_INOTIFY
2763 if (fs_fd >= 0) 3191 if (fs_fd >= 0)
2764 { 3192 {
2765 infy_del (EV_A_ w); 3193 infy_del (EV_A_ w);
2766 infy_add (EV_A_ w); 3194 infy_add (EV_A_ w);
2791 3219
2792 if (fs_fd >= 0) 3220 if (fs_fd >= 0)
2793 infy_add (EV_A_ w); 3221 infy_add (EV_A_ w);
2794 else 3222 else
2795#endif 3223#endif
3224 {
2796 ev_timer_again (EV_A_ &w->timer); 3225 ev_timer_again (EV_A_ &w->timer);
3226 ev_unref (EV_A);
3227 }
2797 3228
2798 ev_start (EV_A_ (W)w, 1); 3229 ev_start (EV_A_ (W)w, 1);
2799 3230
2800 EV_FREQUENT_CHECK; 3231 EV_FREQUENT_CHECK;
2801} 3232}
2810 EV_FREQUENT_CHECK; 3241 EV_FREQUENT_CHECK;
2811 3242
2812#if EV_USE_INOTIFY 3243#if EV_USE_INOTIFY
2813 infy_del (EV_A_ w); 3244 infy_del (EV_A_ w);
2814#endif 3245#endif
3246
3247 if (ev_is_active (&w->timer))
3248 {
3249 ev_ref (EV_A);
2815 ev_timer_stop (EV_A_ &w->timer); 3250 ev_timer_stop (EV_A_ &w->timer);
3251 }
2816 3252
2817 ev_stop (EV_A_ (W)w); 3253 ev_stop (EV_A_ (W)w);
2818 3254
2819 EV_FREQUENT_CHECK; 3255 EV_FREQUENT_CHECK;
2820} 3256}
2961embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3397embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2962{ 3398{
2963 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3399 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2964 3400
2965 { 3401 {
2966 struct ev_loop *loop = w->other; 3402 EV_P = w->other;
2967 3403
2968 while (fdchangecnt) 3404 while (fdchangecnt)
2969 { 3405 {
2970 fd_reify (EV_A); 3406 fd_reify (EV_A);
2971 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3407 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2979 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));
2980 3416
2981 ev_embed_stop (EV_A_ w); 3417 ev_embed_stop (EV_A_ w);
2982 3418
2983 { 3419 {
2984 struct ev_loop *loop = w->other; 3420 EV_P = w->other;
2985 3421
2986 ev_loop_fork (EV_A); 3422 ev_loop_fork (EV_A);
2987 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3423 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2988 } 3424 }
2989 3425
3003{ 3439{
3004 if (expect_false (ev_is_active (w))) 3440 if (expect_false (ev_is_active (w)))
3005 return; 3441 return;
3006 3442
3007 { 3443 {
3008 struct ev_loop *loop = w->other; 3444 EV_P = w->other;
3009 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 ()));
3010 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);
3011 } 3447 }
3012 3448
3013 EV_FREQUENT_CHECK; 3449 EV_FREQUENT_CHECK;
3040 3476
3041 ev_io_stop (EV_A_ &w->io); 3477 ev_io_stop (EV_A_ &w->io);
3042 ev_prepare_stop (EV_A_ &w->prepare); 3478 ev_prepare_stop (EV_A_ &w->prepare);
3043 ev_fork_stop (EV_A_ &w->fork); 3479 ev_fork_stop (EV_A_ &w->fork);
3044 3480
3481 ev_stop (EV_A_ (W)w);
3482
3045 EV_FREQUENT_CHECK; 3483 EV_FREQUENT_CHECK;
3046} 3484}
3047#endif 3485#endif
3048 3486
3049#if EV_FORK_ENABLE 3487#if EV_FORK_ENABLE
3125 3563
3126void 3564void
3127ev_async_send (EV_P_ ev_async *w) 3565ev_async_send (EV_P_ ev_async *w)
3128{ 3566{
3129 w->sent = 1; 3567 w->sent = 1;
3130 evpipe_write (EV_A_ &gotasync); 3568 evpipe_write (EV_A_ &async_pending);
3131} 3569}
3132#endif 3570#endif
3133 3571
3134/*****************************************************************************/ 3572/*****************************************************************************/
3135 3573
3199 } 3637 }
3200} 3638}
3201 3639
3202/*****************************************************************************/ 3640/*****************************************************************************/
3203 3641
3204#if 0 3642#if EV_WALK_ENABLE
3205void 3643void
3206ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 3644ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3207{ 3645{
3208 int i, j; 3646 int i, j;
3209 ev_watcher_list *wl, *wn; 3647 ev_watcher_list *wl, *wn;
3225#if EV_USE_INOTIFY 3663#if EV_USE_INOTIFY
3226 if (ev_cb ((ev_io *)wl) == infy_cb) 3664 if (ev_cb ((ev_io *)wl) == infy_cb)
3227 ; 3665 ;
3228 else 3666 else
3229#endif 3667#endif
3230 if ((ev_io *)wl != &pipeev) 3668 if ((ev_io *)wl != &pipe_w)
3231 if (types & EV_IO) 3669 if (types & EV_IO)
3232 cb (EV_A_ EV_IO, wl); 3670 cb (EV_A_ EV_IO, wl);
3233 3671
3234 wl = wn; 3672 wl = wn;
3235 } 3673 }
3284 if (types & EV_CHECK) 3722 if (types & EV_CHECK)
3285 for (i = checkcnt; i--; ) 3723 for (i = checkcnt; i--; )
3286 cb (EV_A_ EV_CHECK, checks [i]); 3724 cb (EV_A_ EV_CHECK, checks [i]);
3287 3725
3288 if (types & EV_SIGNAL) 3726 if (types & EV_SIGNAL)
3289 for (i = 0; i < signalmax; ++i) 3727 for (i = 0; i < EV_NSIG - 1; ++i)
3290 for (wl = signals [i].head; wl; ) 3728 for (wl = signals [i].head; wl; )
3291 { 3729 {
3292 wn = wl->next; 3730 wn = wl->next;
3293 cb (EV_A_ EV_SIGNAL, wl); 3731 cb (EV_A_ EV_SIGNAL, wl);
3294 wl = wn; 3732 wl = wn;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines