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

Comparing libev/ev.c (file contents):
Revision 1.283 by root, Wed Apr 15 09:51:19 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
575ev_tstamp inline_size 733inline_size ev_tstamp
576get_clock (void) 734get_clock (void)
577{ 735{
578#if EV_USE_MONOTONIC 736#if EV_USE_MONOTONIC
579 if (expect_true (have_monotonic)) 737 if (expect_true (have_monotonic))
580 { 738 {
… …
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
630int inline_size 788/* find a suitable new size for the given array, */
789/* hopefully by rounding to a ncie-to-malloc size */
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
635 do 795 do
… …
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_);
… …
697 pendings [pri][w_->pending - 1].w = w_; 863 pendings [pri][w_->pending - 1].w = w_;
698 pendings [pri][w_->pending - 1].events = revents; 864 pendings [pri][w_->pending - 1].events = revents;
699 } 865 }
700} 866}
701 867
702void inline_speed 868inline_speed void
869feed_reverse (EV_P_ W w)
870{
871 array_needsize (W, rfeeds, rfeedmax, rfeedcnt + 1, EMPTY2);
872 rfeeds [rfeedcnt++] = w;
873}
874
875inline_size void
876feed_reverse_done (EV_P_ int revents)
877{
878 do
879 ev_feed_event (EV_A_ rfeeds [--rfeedcnt], revents);
880 while (rfeedcnt);
881}
882
883inline_speed void
703queue_events (EV_P_ W *events, int eventcnt, int type) 884queue_events (EV_P_ W *events, int eventcnt, int type)
704{ 885{
705 int i; 886 int i;
706 887
707 for (i = 0; i < eventcnt; ++i) 888 for (i = 0; i < eventcnt; ++i)
708 ev_feed_event (EV_A_ events [i], type); 889 ev_feed_event (EV_A_ events [i], type);
709} 890}
710 891
711/*****************************************************************************/ 892/*****************************************************************************/
712 893
713void inline_speed 894inline_speed void
714fd_event (EV_P_ int fd, int revents) 895fd_event_nc (EV_P_ int fd, int revents)
715{ 896{
716 ANFD *anfd = anfds + fd; 897 ANFD *anfd = anfds + fd;
717 ev_io *w; 898 ev_io *w;
718 899
719 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)
… …
723 if (ev) 904 if (ev)
724 ev_feed_event (EV_A_ (W)w, ev); 905 ev_feed_event (EV_A_ (W)w, ev);
725 } 906 }
726} 907}
727 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
728void 920void
729ev_feed_fd_event (EV_P_ int fd, int revents) 921ev_feed_fd_event (EV_P_ int fd, int revents)
730{ 922{
731 if (fd >= 0 && fd < anfdmax) 923 if (fd >= 0 && fd < anfdmax)
732 fd_event (EV_A_ fd, revents); 924 fd_event_nc (EV_A_ fd, revents);
733} 925}
734 926
735void inline_size 927/* make sure the external fd watch events are in-sync */
928/* with the kernel/libev internal state */
929inline_size void
736fd_reify (EV_P) 930fd_reify (EV_P)
737{ 931{
738 int i; 932 int i;
739 933
740 for (i = 0; i < fdchangecnt; ++i) 934 for (i = 0; i < fdchangecnt; ++i)
… …
750 944
751#if EV_SELECT_IS_WINSOCKET 945#if EV_SELECT_IS_WINSOCKET
752 if (events) 946 if (events)
753 { 947 {
754 unsigned long arg; 948 unsigned long arg;
755 #ifdef EV_FD_TO_WIN32_HANDLE
756 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 949 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
757 #else
758 anfd->handle = _get_osfhandle (fd);
759 #endif
760 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));
761 } 951 }
762#endif 952#endif
763 953
764 { 954 {
… …
774 } 964 }
775 965
776 fdchangecnt = 0; 966 fdchangecnt = 0;
777} 967}
778 968
779void inline_size 969/* something about the given fd changed */
970inline_size void
780fd_change (EV_P_ int fd, int flags) 971fd_change (EV_P_ int fd, int flags)
781{ 972{
782 unsigned char reify = anfds [fd].reify; 973 unsigned char reify = anfds [fd].reify;
783 anfds [fd].reify |= flags; 974 anfds [fd].reify |= flags;
784 975
… …
788 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 979 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
789 fdchanges [fdchangecnt - 1] = fd; 980 fdchanges [fdchangecnt - 1] = fd;
790 } 981 }
791} 982}
792 983
793void inline_speed 984/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
985inline_speed void
794fd_kill (EV_P_ int fd) 986fd_kill (EV_P_ int fd)
795{ 987{
796 ev_io *w; 988 ev_io *w;
797 989
798 while ((w = (ev_io *)anfds [fd].head)) 990 while ((w = (ev_io *)anfds [fd].head))
… …
800 ev_io_stop (EV_A_ w); 992 ev_io_stop (EV_A_ w);
801 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);
802 } 994 }
803} 995}
804 996
805int inline_size 997/* check whether the given fd is atcually valid, for error recovery */
998inline_size int
806fd_valid (int fd) 999fd_valid (int fd)
807{ 1000{
808#ifdef _WIN32 1001#ifdef _WIN32
809 return _get_osfhandle (fd) != -1; 1002 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
810#else 1003#else
811 return fcntl (fd, F_GETFD) != -1; 1004 return fcntl (fd, F_GETFD) != -1;
812#endif 1005#endif
813} 1006}
814 1007
… …
832 1025
833 for (fd = anfdmax; fd--; ) 1026 for (fd = anfdmax; fd--; )
834 if (anfds [fd].events) 1027 if (anfds [fd].events)
835 { 1028 {
836 fd_kill (EV_A_ fd); 1029 fd_kill (EV_A_ fd);
837 return; 1030 break;
838 } 1031 }
839} 1032}
840 1033
841/* 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 */
842static void noinline 1035static void noinline
… …
847 for (fd = 0; fd < anfdmax; ++fd) 1040 for (fd = 0; fd < anfdmax; ++fd)
848 if (anfds [fd].events) 1041 if (anfds [fd].events)
849 { 1042 {
850 anfds [fd].events = 0; 1043 anfds [fd].events = 0;
851 anfds [fd].emask = 0; 1044 anfds [fd].emask = 0;
852 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1045 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
853 } 1046 }
854} 1047}
855 1048
856/*****************************************************************************/ 1049/*****************************************************************************/
857 1050
… …
873#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 1066#define HEAP0 (DHEAP - 1) /* index of first element in heap */
874#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 1067#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
875#define UPHEAP_DONE(p,k) ((p) == (k)) 1068#define UPHEAP_DONE(p,k) ((p) == (k))
876 1069
877/* away from the root */ 1070/* away from the root */
878void inline_speed 1071inline_speed void
879downheap (ANHE *heap, int N, int k) 1072downheap (ANHE *heap, int N, int k)
880{ 1073{
881 ANHE he = heap [k]; 1074 ANHE he = heap [k];
882 ANHE *E = heap + N + HEAP0; 1075 ANHE *E = heap + N + HEAP0;
883 1076
… …
923#define HEAP0 1 1116#define HEAP0 1
924#define HPARENT(k) ((k) >> 1) 1117#define HPARENT(k) ((k) >> 1)
925#define UPHEAP_DONE(p,k) (!(p)) 1118#define UPHEAP_DONE(p,k) (!(p))
926 1119
927/* away from the root */ 1120/* away from the root */
928void inline_speed 1121inline_speed void
929downheap (ANHE *heap, int N, int k) 1122downheap (ANHE *heap, int N, int k)
930{ 1123{
931 ANHE he = heap [k]; 1124 ANHE he = heap [k];
932 1125
933 for (;;) 1126 for (;;)
934 { 1127 {
935 int c = k << 1; 1128 int c = k << 1;
936 1129
937 if (c > N + HEAP0 - 1) 1130 if (c >= N + HEAP0)
938 break; 1131 break;
939 1132
940 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])
941 ? 1 : 0; 1134 ? 1 : 0;
942 1135
… …
953 ev_active (ANHE_w (he)) = k; 1146 ev_active (ANHE_w (he)) = k;
954} 1147}
955#endif 1148#endif
956 1149
957/* towards the root */ 1150/* towards the root */
958void inline_speed 1151inline_speed void
959upheap (ANHE *heap, int k) 1152upheap (ANHE *heap, int k)
960{ 1153{
961 ANHE he = heap [k]; 1154 ANHE he = heap [k];
962 1155
963 for (;;) 1156 for (;;)
… …
974 1167
975 heap [k] = he; 1168 heap [k] = he;
976 ev_active (ANHE_w (he)) = k; 1169 ev_active (ANHE_w (he)) = k;
977} 1170}
978 1171
979void inline_size 1172/* move an element suitably so it is in a correct place */
1173inline_size void
980adjustheap (ANHE *heap, int N, int k) 1174adjustheap (ANHE *heap, int N, int k)
981{ 1175{
982 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)]))
983 upheap (heap, k); 1177 upheap (heap, k);
984 else 1178 else
985 downheap (heap, N, k); 1179 downheap (heap, N, k);
986} 1180}
987 1181
988/* rebuild the heap: this function is used only once and executed rarely */ 1182/* rebuild the heap: this function is used only once and executed rarely */
989void inline_size 1183inline_size void
990reheap (ANHE *heap, int N) 1184reheap (ANHE *heap, int N)
991{ 1185{
992 int i; 1186 int i;
993 1187
994 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 1188 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
… …
997 upheap (heap, i + HEAP0); 1191 upheap (heap, i + HEAP0);
998} 1192}
999 1193
1000/*****************************************************************************/ 1194/*****************************************************************************/
1001 1195
1196/* associate signal watchers to a signal signal */
1002typedef struct 1197typedef struct
1003{ 1198{
1199 EV_ATOMIC_T pending;
1200#if EV_MULTIPLICITY
1201 EV_P;
1202#endif
1004 WL head; 1203 WL head;
1005 EV_ATOMIC_T gotsig;
1006} ANSIG; 1204} ANSIG;
1007 1205
1008static ANSIG *signals; 1206static ANSIG signals [EV_NSIG - 1];
1009static int signalmax;
1010
1011static EV_ATOMIC_T gotsig;
1012 1207
1013/*****************************************************************************/ 1208/*****************************************************************************/
1014 1209
1015void inline_speed 1210/* used to prepare libev internal fd's */
1211/* this is not fork-safe */
1212inline_speed void
1016fd_intern (int fd) 1213fd_intern (int fd)
1017{ 1214{
1018#ifdef _WIN32 1215#ifdef _WIN32
1019 unsigned long arg = 1; 1216 unsigned long arg = 1;
1020 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1217 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1021#else 1218#else
1022 fcntl (fd, F_SETFD, FD_CLOEXEC); 1219 fcntl (fd, F_SETFD, FD_CLOEXEC);
1023 fcntl (fd, F_SETFL, O_NONBLOCK); 1220 fcntl (fd, F_SETFL, O_NONBLOCK);
1024#endif 1221#endif
1025} 1222}
1026 1223
1027static void noinline 1224static void noinline
1028evpipe_init (EV_P) 1225evpipe_init (EV_P)
1029{ 1226{
1030 if (!ev_is_active (&pipeev)) 1227 if (!ev_is_active (&pipe_w))
1031 { 1228 {
1032#if EV_USE_EVENTFD 1229#if EV_USE_EVENTFD
1230 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1231 if (evfd < 0 && errno == EINVAL)
1033 if ((evfd = eventfd (0, 0)) >= 0) 1232 evfd = eventfd (0, 0);
1233
1234 if (evfd >= 0)
1034 { 1235 {
1035 evpipe [0] = -1; 1236 evpipe [0] = -1;
1036 fd_intern (evfd); 1237 fd_intern (evfd); /* doing it twice doesn't hurt */
1037 ev_io_set (&pipeev, evfd, EV_READ); 1238 ev_io_set (&pipe_w, evfd, EV_READ);
1038 } 1239 }
1039 else 1240 else
1040#endif 1241#endif
1041 { 1242 {
1042 while (pipe (evpipe)) 1243 while (pipe (evpipe))
1043 ev_syserr ("(libev) error creating signal/async pipe"); 1244 ev_syserr ("(libev) error creating signal/async pipe");
1044 1245
1045 fd_intern (evpipe [0]); 1246 fd_intern (evpipe [0]);
1046 fd_intern (evpipe [1]); 1247 fd_intern (evpipe [1]);
1047 ev_io_set (&pipeev, evpipe [0], EV_READ); 1248 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1048 } 1249 }
1049 1250
1050 ev_io_start (EV_A_ &pipeev); 1251 ev_io_start (EV_A_ &pipe_w);
1051 ev_unref (EV_A); /* watcher should not keep loop alive */ 1252 ev_unref (EV_A); /* watcher should not keep loop alive */
1052 } 1253 }
1053} 1254}
1054 1255
1055void inline_size 1256inline_size void
1056evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1257evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1057{ 1258{
1058 if (!*flag) 1259 if (!*flag)
1059 { 1260 {
1060 int old_errno = errno; /* save errno because write might clobber it */ 1261 int old_errno = errno; /* save errno because write might clobber it */
… …
1073 1274
1074 errno = old_errno; 1275 errno = old_errno;
1075 } 1276 }
1076} 1277}
1077 1278
1279/* called whenever the libev signal pipe */
1280/* got some events (signal, async) */
1078static void 1281static void
1079pipecb (EV_P_ ev_io *iow, int revents) 1282pipecb (EV_P_ ev_io *iow, int revents)
1080{ 1283{
1284 int i;
1285
1081#if EV_USE_EVENTFD 1286#if EV_USE_EVENTFD
1082 if (evfd >= 0) 1287 if (evfd >= 0)
1083 { 1288 {
1084 uint64_t counter; 1289 uint64_t counter;
1085 read (evfd, &counter, sizeof (uint64_t)); 1290 read (evfd, &counter, sizeof (uint64_t));
… …
1089 { 1294 {
1090 char dummy; 1295 char dummy;
1091 read (evpipe [0], &dummy, 1); 1296 read (evpipe [0], &dummy, 1);
1092 } 1297 }
1093 1298
1094 if (gotsig && ev_is_default_loop (EV_A)) 1299 if (sig_pending)
1095 { 1300 {
1096 int signum; 1301 sig_pending = 0;
1097 gotsig = 0;
1098 1302
1099 for (signum = signalmax; signum--; ) 1303 for (i = EV_NSIG - 1; i--; )
1100 if (signals [signum].gotsig) 1304 if (expect_false (signals [i].pending))
1101 ev_feed_signal_event (EV_A_ signum + 1); 1305 ev_feed_signal_event (EV_A_ i + 1);
1102 } 1306 }
1103 1307
1104#if EV_ASYNC_ENABLE 1308#if EV_ASYNC_ENABLE
1105 if (gotasync) 1309 if (async_pending)
1106 { 1310 {
1107 int i; 1311 async_pending = 0;
1108 gotasync = 0;
1109 1312
1110 for (i = asynccnt; i--; ) 1313 for (i = asynccnt; i--; )
1111 if (asyncs [i]->sent) 1314 if (asyncs [i]->sent)
1112 { 1315 {
1113 asyncs [i]->sent = 0; 1316 asyncs [i]->sent = 0;
… …
1121 1324
1122static void 1325static void
1123ev_sighandler (int signum) 1326ev_sighandler (int signum)
1124{ 1327{
1125#if EV_MULTIPLICITY 1328#if EV_MULTIPLICITY
1126 struct ev_loop *loop = &default_loop_struct; 1329 EV_P = signals [signum - 1].loop;
1127#endif 1330#endif
1128 1331
1129#if _WIN32 1332#ifdef _WIN32
1130 signal (signum, ev_sighandler); 1333 signal (signum, ev_sighandler);
1131#endif 1334#endif
1132 1335
1133 signals [signum - 1].gotsig = 1; 1336 signals [signum - 1].pending = 1;
1134 evpipe_write (EV_A_ &gotsig); 1337 evpipe_write (EV_A_ &sig_pending);
1135} 1338}
1136 1339
1137void noinline 1340void noinline
1138ev_feed_signal_event (EV_P_ int signum) 1341ev_feed_signal_event (EV_P_ int signum)
1139{ 1342{
1140 WL w; 1343 WL w;
1141 1344
1345 if (expect_false (signum <= 0 || signum > EV_NSIG))
1346 return;
1347
1348 --signum;
1349
1142#if EV_MULTIPLICITY 1350#if EV_MULTIPLICITY
1143 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 */
1144#endif 1352 /* or, likely more useful, feeding a signal nobody is waiting for */
1145 1353
1146 --signum; 1354 if (expect_false (signals [signum].loop != EV_A))
1147
1148 if (signum < 0 || signum >= signalmax)
1149 return; 1355 return;
1356#endif
1150 1357
1151 signals [signum].gotsig = 0; 1358 signals [signum].pending = 0;
1152 1359
1153 for (w = signals [signum].head; w; w = w->next) 1360 for (w = signals [signum].head; w; w = w->next)
1154 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1361 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1155} 1362}
1156 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
1157/*****************************************************************************/ 1384/*****************************************************************************/
1158 1385
1159static WL childs [EV_PID_HASHSIZE]; 1386static WL childs [EV_PID_HASHSIZE];
1160 1387
1161#ifndef _WIN32 1388#ifndef _WIN32
… …
1164 1391
1165#ifndef WIFCONTINUED 1392#ifndef WIFCONTINUED
1166# define WIFCONTINUED(status) 0 1393# define WIFCONTINUED(status) 0
1167#endif 1394#endif
1168 1395
1169void inline_speed 1396/* handle a single child status event */
1397inline_speed void
1170child_reap (EV_P_ int chain, int pid, int status) 1398child_reap (EV_P_ int chain, int pid, int status)
1171{ 1399{
1172 ev_child *w; 1400 ev_child *w;
1173 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1401 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1174 1402
… …
1187 1415
1188#ifndef WCONTINUED 1416#ifndef WCONTINUED
1189# define WCONTINUED 0 1417# define WCONTINUED 0
1190#endif 1418#endif
1191 1419
1420/* called on sigchld etc., calls waitpid */
1192static void 1421static void
1193childcb (EV_P_ ev_signal *sw, int revents) 1422childcb (EV_P_ ev_signal *sw, int revents)
1194{ 1423{
1195 int pid, status; 1424 int pid, status;
1196 1425
… …
1303ev_backend (EV_P) 1532ev_backend (EV_P)
1304{ 1533{
1305 return backend; 1534 return backend;
1306} 1535}
1307 1536
1537#if EV_MINIMAL < 2
1308unsigned int 1538unsigned int
1309ev_loop_count (EV_P) 1539ev_loop_count (EV_P)
1310{ 1540{
1311 return loop_count; 1541 return loop_count;
1312} 1542}
1313 1543
1544unsigned int
1545ev_loop_depth (EV_P)
1546{
1547 return loop_depth;
1548}
1549
1314void 1550void
1315ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1551ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1316{ 1552{
1317 io_blocktime = interval; 1553 io_blocktime = interval;
1318} 1554}
… …
1321ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1557ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1322{ 1558{
1323 timeout_blocktime = interval; 1559 timeout_blocktime = interval;
1324} 1560}
1325 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 */
1326static void noinline 1587static void noinline
1327loop_init (EV_P_ unsigned int flags) 1588loop_init (EV_P_ unsigned int flags)
1328{ 1589{
1329 if (!backend) 1590 if (!backend)
1330 { 1591 {
… …
1346 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1607 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1347 have_monotonic = 1; 1608 have_monotonic = 1;
1348 } 1609 }
1349#endif 1610#endif
1350 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
1351 ev_rt_now = ev_time (); 1623 ev_rt_now = ev_time ();
1352 mn_now = get_clock (); 1624 mn_now = get_clock ();
1353 now_floor = mn_now; 1625 now_floor = mn_now;
1354 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
1355 1630
1356 io_blocktime = 0.; 1631 io_blocktime = 0.;
1357 timeout_blocktime = 0.; 1632 timeout_blocktime = 0.;
1358 backend = 0; 1633 backend = 0;
1359 backend_fd = -1; 1634 backend_fd = -1;
1360 gotasync = 0; 1635 sig_pending = 0;
1636#if EV_ASYNC_ENABLE
1637 async_pending = 0;
1638#endif
1361#if EV_USE_INOTIFY 1639#if EV_USE_INOTIFY
1362 fs_fd = -2; 1640 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1363#endif 1641#endif
1364 1642#if EV_USE_SIGNALFD
1365 /* pid check not overridable via env */ 1643 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1366#ifndef _WIN32
1367 if (flags & EVFLAG_FORKCHECK)
1368 curpid = getpid ();
1369#endif 1644#endif
1370
1371 if (!(flags & EVFLAG_NOENV)
1372 && !enable_secure ()
1373 && getenv ("LIBEV_FLAGS"))
1374 flags = atoi (getenv ("LIBEV_FLAGS"));
1375 1645
1376 if (!(flags & 0x0000ffffU)) 1646 if (!(flags & 0x0000ffffU))
1377 flags |= ev_recommended_backends (); 1647 flags |= ev_recommended_backends ();
1378 1648
1379#if EV_USE_PORT 1649#if EV_USE_PORT
… …
1390#endif 1660#endif
1391#if EV_USE_SELECT 1661#if EV_USE_SELECT
1392 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1662 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1393#endif 1663#endif
1394 1664
1665 ev_prepare_init (&pending_w, pendingcb);
1666
1395 ev_init (&pipeev, pipecb); 1667 ev_init (&pipe_w, pipecb);
1396 ev_set_priority (&pipeev, EV_MAXPRI); 1668 ev_set_priority (&pipe_w, EV_MAXPRI);
1397 } 1669 }
1398} 1670}
1399 1671
1672/* free up a loop structure */
1400static void noinline 1673static void noinline
1401loop_destroy (EV_P) 1674loop_destroy (EV_P)
1402{ 1675{
1403 int i; 1676 int i;
1404 1677
1405 if (ev_is_active (&pipeev)) 1678 if (ev_is_active (&pipe_w))
1406 { 1679 {
1407 ev_ref (EV_A); /* signal watcher */ 1680 /*ev_ref (EV_A);*/
1408 ev_io_stop (EV_A_ &pipeev); 1681 /*ev_io_stop (EV_A_ &pipe_w);*/
1409 1682
1410#if EV_USE_EVENTFD 1683#if EV_USE_EVENTFD
1411 if (evfd >= 0) 1684 if (evfd >= 0)
1412 close (evfd); 1685 close (evfd);
1413#endif 1686#endif
1414 1687
1415 if (evpipe [0] >= 0) 1688 if (evpipe [0] >= 0)
1416 { 1689 {
1417 close (evpipe [0]); 1690 EV_WIN32_CLOSE_FD (evpipe [0]);
1418 close (evpipe [1]); 1691 EV_WIN32_CLOSE_FD (evpipe [1]);
1419 } 1692 }
1420 } 1693 }
1694
1695#if EV_USE_SIGNALFD
1696 if (ev_is_active (&sigfd_w))
1697 close (sigfd);
1698#endif
1421 1699
1422#if EV_USE_INOTIFY 1700#if EV_USE_INOTIFY
1423 if (fs_fd >= 0) 1701 if (fs_fd >= 0)
1424 close (fs_fd); 1702 close (fs_fd);
1425#endif 1703#endif
… …
1449#if EV_IDLE_ENABLE 1727#if EV_IDLE_ENABLE
1450 array_free (idle, [i]); 1728 array_free (idle, [i]);
1451#endif 1729#endif
1452 } 1730 }
1453 1731
1454 ev_free (anfds); anfdmax = 0; 1732 ev_free (anfds); anfds = 0; anfdmax = 0;
1455 1733
1456 /* have to use the microsoft-never-gets-it-right macro */ 1734 /* have to use the microsoft-never-gets-it-right macro */
1735 array_free (rfeed, EMPTY);
1457 array_free (fdchange, EMPTY); 1736 array_free (fdchange, EMPTY);
1458 array_free (timer, EMPTY); 1737 array_free (timer, EMPTY);
1459#if EV_PERIODIC_ENABLE 1738#if EV_PERIODIC_ENABLE
1460 array_free (periodic, EMPTY); 1739 array_free (periodic, EMPTY);
1461#endif 1740#endif
… …
1470 1749
1471 backend = 0; 1750 backend = 0;
1472} 1751}
1473 1752
1474#if EV_USE_INOTIFY 1753#if EV_USE_INOTIFY
1475void inline_size infy_fork (EV_P); 1754inline_size void infy_fork (EV_P);
1476#endif 1755#endif
1477 1756
1478void inline_size 1757inline_size void
1479loop_fork (EV_P) 1758loop_fork (EV_P)
1480{ 1759{
1481#if EV_USE_PORT 1760#if EV_USE_PORT
1482 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1761 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1483#endif 1762#endif
… …
1489#endif 1768#endif
1490#if EV_USE_INOTIFY 1769#if EV_USE_INOTIFY
1491 infy_fork (EV_A); 1770 infy_fork (EV_A);
1492#endif 1771#endif
1493 1772
1494 if (ev_is_active (&pipeev)) 1773 if (ev_is_active (&pipe_w))
1495 { 1774 {
1496 /* this "locks" the handlers against writing to the pipe */ 1775 /* this "locks" the handlers against writing to the pipe */
1497 /* while we modify the fd vars */ 1776 /* while we modify the fd vars */
1498 gotsig = 1; 1777 sig_pending = 1;
1499#if EV_ASYNC_ENABLE 1778#if EV_ASYNC_ENABLE
1500 gotasync = 1; 1779 async_pending = 1;
1501#endif 1780#endif
1502 1781
1503 ev_ref (EV_A); 1782 ev_ref (EV_A);
1504 ev_io_stop (EV_A_ &pipeev); 1783 ev_io_stop (EV_A_ &pipe_w);
1505 1784
1506#if EV_USE_EVENTFD 1785#if EV_USE_EVENTFD
1507 if (evfd >= 0) 1786 if (evfd >= 0)
1508 close (evfd); 1787 close (evfd);
1509#endif 1788#endif
1510 1789
1511 if (evpipe [0] >= 0) 1790 if (evpipe [0] >= 0)
1512 { 1791 {
1513 close (evpipe [0]); 1792 EV_WIN32_CLOSE_FD (evpipe [0]);
1514 close (evpipe [1]); 1793 EV_WIN32_CLOSE_FD (evpipe [1]);
1515 } 1794 }
1516 1795
1517 evpipe_init (EV_A); 1796 evpipe_init (EV_A);
1518 /* now iterate over everything, in case we missed something */ 1797 /* now iterate over everything, in case we missed something */
1519 pipecb (EV_A_ &pipeev, EV_READ); 1798 pipecb (EV_A_ &pipe_w, EV_READ);
1520 } 1799 }
1521 1800
1522 postfork = 0; 1801 postfork = 0;
1523} 1802}
1524 1803
1525#if EV_MULTIPLICITY 1804#if EV_MULTIPLICITY
1526 1805
1527struct ev_loop * 1806struct ev_loop *
1528ev_loop_new (unsigned int flags) 1807ev_loop_new (unsigned int flags)
1529{ 1808{
1530 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));
1531 1810
1532 memset (loop, 0, sizeof (struct ev_loop)); 1811 memset (EV_A, 0, sizeof (struct ev_loop));
1533
1534 loop_init (EV_A_ flags); 1812 loop_init (EV_A_ flags);
1535 1813
1536 if (ev_backend (EV_A)) 1814 if (ev_backend (EV_A))
1537 return loop; 1815 return EV_A;
1538 1816
1539 return 0; 1817 return 0;
1540} 1818}
1541 1819
1542void 1820void
… …
1549void 1827void
1550ev_loop_fork (EV_P) 1828ev_loop_fork (EV_P)
1551{ 1829{
1552 postfork = 1; /* must be in line with ev_default_fork */ 1830 postfork = 1; /* must be in line with ev_default_fork */
1553} 1831}
1832#endif /* multiplicity */
1554 1833
1555#if EV_VERIFY 1834#if EV_VERIFY
1556static void noinline 1835static void noinline
1557verify_watcher (EV_P_ W w) 1836verify_watcher (EV_P_ W w)
1558{ 1837{
… …
1586 verify_watcher (EV_A_ ws [cnt]); 1865 verify_watcher (EV_A_ ws [cnt]);
1587 } 1866 }
1588} 1867}
1589#endif 1868#endif
1590 1869
1870#if EV_MINIMAL < 2
1591void 1871void
1592ev_loop_verify (EV_P) 1872ev_loop_verify (EV_P)
1593{ 1873{
1594#if EV_VERIFY 1874#if EV_VERIFY
1595 int i; 1875 int i;
… …
1644 assert (checkmax >= checkcnt); 1924 assert (checkmax >= checkcnt);
1645 array_verify (EV_A_ (W *)checks, checkcnt); 1925 array_verify (EV_A_ (W *)checks, checkcnt);
1646 1926
1647# if 0 1927# if 0
1648 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)
1649 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1929 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1650# endif
1651#endif 1930# endif
1931#endif
1652} 1932}
1653 1933#endif
1654#endif /* multiplicity */
1655 1934
1656#if EV_MULTIPLICITY 1935#if EV_MULTIPLICITY
1657struct ev_loop * 1936struct ev_loop *
1658ev_default_loop_init (unsigned int flags) 1937ev_default_loop_init (unsigned int flags)
1659#else 1938#else
… …
1662#endif 1941#endif
1663{ 1942{
1664 if (!ev_default_loop_ptr) 1943 if (!ev_default_loop_ptr)
1665 { 1944 {
1666#if EV_MULTIPLICITY 1945#if EV_MULTIPLICITY
1667 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1946 EV_P = ev_default_loop_ptr = &default_loop_struct;
1668#else 1947#else
1669 ev_default_loop_ptr = 1; 1948 ev_default_loop_ptr = 1;
1670#endif 1949#endif
1671 1950
1672 loop_init (EV_A_ flags); 1951 loop_init (EV_A_ flags);
… …
1689 1968
1690void 1969void
1691ev_default_destroy (void) 1970ev_default_destroy (void)
1692{ 1971{
1693#if EV_MULTIPLICITY 1972#if EV_MULTIPLICITY
1694 struct ev_loop *loop = ev_default_loop_ptr; 1973 EV_P = ev_default_loop_ptr;
1695#endif 1974#endif
1696 1975
1697 ev_default_loop_ptr = 0; 1976 ev_default_loop_ptr = 0;
1698 1977
1699#ifndef _WIN32 1978#ifndef _WIN32
… …
1706 1985
1707void 1986void
1708ev_default_fork (void) 1987ev_default_fork (void)
1709{ 1988{
1710#if EV_MULTIPLICITY 1989#if EV_MULTIPLICITY
1711 struct ev_loop *loop = ev_default_loop_ptr; 1990 EV_P = ev_default_loop_ptr;
1712#endif 1991#endif
1713 1992
1714 postfork = 1; /* must be in line with ev_loop_fork */ 1993 postfork = 1; /* must be in line with ev_loop_fork */
1715} 1994}
1716 1995
… …
1720ev_invoke (EV_P_ void *w, int revents) 1999ev_invoke (EV_P_ void *w, int revents)
1721{ 2000{
1722 EV_CB_INVOKE ((W)w, revents); 2001 EV_CB_INVOKE ((W)w, revents);
1723} 2002}
1724 2003
1725void inline_speed 2004unsigned int
1726call_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)
1727{ 2018{
1728 int pri; 2019 int pri;
1729 2020
1730 for (pri = NUMPRI; pri--; ) 2021 for (pri = NUMPRI; pri--; )
1731 while (pendingcnt [pri]) 2022 while (pendingcnt [pri])
1732 { 2023 {
1733 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2024 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1734 2025
1735 if (expect_true (p->w))
1736 {
1737 /*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 */
1738 2028
1739 p->w->pending = 0; 2029 p->w->pending = 0;
1740 EV_CB_INVOKE (p->w, p->events); 2030 EV_CB_INVOKE (p->w, p->events);
1741 EV_FREQUENT_CHECK; 2031 EV_FREQUENT_CHECK;
1742 }
1743 } 2032 }
1744} 2033}
1745 2034
1746#if EV_IDLE_ENABLE 2035#if EV_IDLE_ENABLE
1747void inline_size 2036/* make idle watchers pending. this handles the "call-idle */
2037/* only when higher priorities are idle" logic */
2038inline_size void
1748idle_reify (EV_P) 2039idle_reify (EV_P)
1749{ 2040{
1750 if (expect_false (idleall)) 2041 if (expect_false (idleall))
1751 { 2042 {
1752 int pri; 2043 int pri;
… …
1764 } 2055 }
1765 } 2056 }
1766} 2057}
1767#endif 2058#endif
1768 2059
1769void inline_size 2060/* make timers pending */
2061inline_size void
1770timers_reify (EV_P) 2062timers_reify (EV_P)
1771{ 2063{
1772 EV_FREQUENT_CHECK; 2064 EV_FREQUENT_CHECK;
1773 2065
1774 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 2066 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1775 { 2067 {
1776 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 2068 do
1777
1778 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
1779
1780 /* first reschedule or stop timer */
1781 if (w->repeat)
1782 { 2069 {
2070 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
2071
2072 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
2073
2074 /* first reschedule or stop timer */
2075 if (w->repeat)
2076 {
1783 ev_at (w) += w->repeat; 2077 ev_at (w) += w->repeat;
1784 if (ev_at (w) < mn_now) 2078 if (ev_at (w) < mn_now)
1785 ev_at (w) = mn_now; 2079 ev_at (w) = mn_now;
1786 2080
1787 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 2081 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1788 2082
1789 ANHE_at_cache (timers [HEAP0]); 2083 ANHE_at_cache (timers [HEAP0]);
1790 downheap (timers, timercnt, HEAP0); 2084 downheap (timers, timercnt, HEAP0);
2085 }
2086 else
2087 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
2088
2089 EV_FREQUENT_CHECK;
2090 feed_reverse (EV_A_ (W)w);
1791 } 2091 }
1792 else 2092 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1793 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1794 2093
1795 EV_FREQUENT_CHECK;
1796 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 2094 feed_reverse_done (EV_A_ EV_TIMEOUT);
1797 } 2095 }
1798} 2096}
1799 2097
1800#if EV_PERIODIC_ENABLE 2098#if EV_PERIODIC_ENABLE
1801void inline_size 2099/* make periodics pending */
2100inline_size void
1802periodics_reify (EV_P) 2101periodics_reify (EV_P)
1803{ 2102{
1804 EV_FREQUENT_CHECK; 2103 EV_FREQUENT_CHECK;
1805 2104
1806 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2105 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1807 { 2106 {
1808 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2107 int feed_count = 0;
1809 2108
1810 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/ 2109 do
1811
1812 /* first reschedule or stop timer */
1813 if (w->reschedule_cb)
1814 { 2110 {
2111 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2112
2113 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
2114
2115 /* first reschedule or stop timer */
2116 if (w->reschedule_cb)
2117 {
1815 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2118 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1816 2119
1817 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 2120 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1818 2121
1819 ANHE_at_cache (periodics [HEAP0]); 2122 ANHE_at_cache (periodics [HEAP0]);
1820 downheap (periodics, periodiccnt, HEAP0); 2123 downheap (periodics, periodiccnt, HEAP0);
2124 }
2125 else if (w->interval)
2126 {
2127 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2128 /* if next trigger time is not sufficiently in the future, put it there */
2129 /* this might happen because of floating point inexactness */
2130 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2131 {
2132 ev_at (w) += w->interval;
2133
2134 /* if interval is unreasonably low we might still have a time in the past */
2135 /* so correct this. this will make the periodic very inexact, but the user */
2136 /* has effectively asked to get triggered more often than possible */
2137 if (ev_at (w) < ev_rt_now)
2138 ev_at (w) = ev_rt_now;
2139 }
2140
2141 ANHE_at_cache (periodics [HEAP0]);
2142 downheap (periodics, periodiccnt, HEAP0);
2143 }
2144 else
2145 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
2146
2147 EV_FREQUENT_CHECK;
2148 feed_reverse (EV_A_ (W)w);
1821 } 2149 }
1822 else if (w->interval) 2150 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
1823 {
1824 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1825 /* if next trigger time is not sufficiently in the future, put it there */
1826 /* this might happen because of floating point inexactness */
1827 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1828 {
1829 ev_at (w) += w->interval;
1830 2151
1831 /* if interval is unreasonably low we might still have a time in the past */
1832 /* so correct this. this will make the periodic very inexact, but the user */
1833 /* has effectively asked to get triggered more often than possible */
1834 if (ev_at (w) < ev_rt_now)
1835 ev_at (w) = ev_rt_now;
1836 }
1837
1838 ANHE_at_cache (periodics [HEAP0]);
1839 downheap (periodics, periodiccnt, HEAP0);
1840 }
1841 else
1842 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1843
1844 EV_FREQUENT_CHECK;
1845 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 2152 feed_reverse_done (EV_A_ EV_PERIODIC);
1846 } 2153 }
1847} 2154}
1848 2155
2156/* simply recalculate all periodics */
2157/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1849static void noinline 2158static void noinline
1850periodics_reschedule (EV_P) 2159periodics_reschedule (EV_P)
1851{ 2160{
1852 int i; 2161 int i;
1853 2162
… …
1866 2175
1867 reheap (periodics, periodiccnt); 2176 reheap (periodics, periodiccnt);
1868} 2177}
1869#endif 2178#endif
1870 2179
1871void inline_speed 2180/* adjust all timers by a given offset */
2181static void noinline
2182timers_reschedule (EV_P_ ev_tstamp adjust)
2183{
2184 int i;
2185
2186 for (i = 0; i < timercnt; ++i)
2187 {
2188 ANHE *he = timers + i + HEAP0;
2189 ANHE_w (*he)->at += adjust;
2190 ANHE_at_cache (*he);
2191 }
2192}
2193
2194/* fetch new monotonic and realtime times from the kernel */
2195/* also detect if there was a timejump, and act accordingly */
2196inline_speed void
1872time_update (EV_P_ ev_tstamp max_block) 2197time_update (EV_P_ ev_tstamp max_block)
1873{ 2198{
1874 int i;
1875
1876#if EV_USE_MONOTONIC 2199#if EV_USE_MONOTONIC
1877 if (expect_true (have_monotonic)) 2200 if (expect_true (have_monotonic))
1878 { 2201 {
2202 int i;
1879 ev_tstamp odiff = rtmn_diff; 2203 ev_tstamp odiff = rtmn_diff;
1880 2204
1881 mn_now = get_clock (); 2205 mn_now = get_clock ();
1882 2206
1883 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2207 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1909 ev_rt_now = ev_time (); 2233 ev_rt_now = ev_time ();
1910 mn_now = get_clock (); 2234 mn_now = get_clock ();
1911 now_floor = mn_now; 2235 now_floor = mn_now;
1912 } 2236 }
1913 2237
2238 /* no timer adjustment, as the monotonic clock doesn't jump */
2239 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1914# if EV_PERIODIC_ENABLE 2240# if EV_PERIODIC_ENABLE
1915 periodics_reschedule (EV_A); 2241 periodics_reschedule (EV_A);
1916# endif 2242# endif
1917 /* no timer adjustment, as the monotonic clock doesn't jump */
1918 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1919 } 2243 }
1920 else 2244 else
1921#endif 2245#endif
1922 { 2246 {
1923 ev_rt_now = ev_time (); 2247 ev_rt_now = ev_time ();
1924 2248
1925 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 2249 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1926 { 2250 {
2251 /* adjust timers. this is easy, as the offset is the same for all of them */
2252 timers_reschedule (EV_A_ ev_rt_now - mn_now);
1927#if EV_PERIODIC_ENABLE 2253#if EV_PERIODIC_ENABLE
1928 periodics_reschedule (EV_A); 2254 periodics_reschedule (EV_A);
1929#endif 2255#endif
1930 /* adjust timers. this is easy, as the offset is the same for all of them */
1931 for (i = 0; i < timercnt; ++i)
1932 {
1933 ANHE *he = timers + i + HEAP0;
1934 ANHE_w (*he)->at += ev_rt_now - mn_now;
1935 ANHE_at_cache (*he);
1936 }
1937 } 2256 }
1938 2257
1939 mn_now = ev_rt_now; 2258 mn_now = ev_rt_now;
1940 } 2259 }
1941} 2260}
1942 2261
1943void 2262void
1944ev_ref (EV_P)
1945{
1946 ++activecnt;
1947}
1948
1949void
1950ev_unref (EV_P)
1951{
1952 --activecnt;
1953}
1954
1955void
1956ev_now_update (EV_P)
1957{
1958 time_update (EV_A_ 1e100);
1959}
1960
1961static int loop_done;
1962
1963void
1964ev_loop (EV_P_ int flags) 2263ev_loop (EV_P_ int flags)
1965{ 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
1966 loop_done = EVUNLOOP_CANCEL; 2271 loop_done = EVUNLOOP_CANCEL;
1967 2272
1968 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 */
1969 2274
1970 do 2275 do
1971 { 2276 {
1972#if EV_VERIFY >= 2 2277#if EV_VERIFY >= 2
1973 ev_loop_verify (EV_A); 2278 ev_loop_verify (EV_A);
… …
1986 /* we might have forked, so queue fork handlers */ 2291 /* we might have forked, so queue fork handlers */
1987 if (expect_false (postfork)) 2292 if (expect_false (postfork))
1988 if (forkcnt) 2293 if (forkcnt)
1989 { 2294 {
1990 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2295 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1991 call_pending (EV_A); 2296 EV_INVOKE_PENDING;
1992 } 2297 }
1993#endif 2298#endif
1994 2299
1995 /* queue prepare watchers (and execute them) */ 2300 /* queue prepare watchers (and execute them) */
1996 if (expect_false (preparecnt)) 2301 if (expect_false (preparecnt))
1997 { 2302 {
1998 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2303 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1999 call_pending (EV_A); 2304 EV_INVOKE_PENDING;
2000 } 2305 }
2306
2307 if (expect_false (loop_done))
2308 break;
2001 2309
2002 /* we might have forked, so reify kernel state if necessary */ 2310 /* we might have forked, so reify kernel state if necessary */
2003 if (expect_false (postfork)) 2311 if (expect_false (postfork))
2004 loop_fork (EV_A); 2312 loop_fork (EV_A);
2005 2313
… …
2011 ev_tstamp waittime = 0.; 2319 ev_tstamp waittime = 0.;
2012 ev_tstamp sleeptime = 0.; 2320 ev_tstamp sleeptime = 0.;
2013 2321
2014 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2322 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2015 { 2323 {
2324 /* remember old timestamp for io_blocktime calculation */
2325 ev_tstamp prev_mn_now = mn_now;
2326
2016 /* update time to cancel out callback processing overhead */ 2327 /* update time to cancel out callback processing overhead */
2017 time_update (EV_A_ 1e100); 2328 time_update (EV_A_ 1e100);
2018 2329
2019 waittime = MAX_BLOCKTIME; 2330 waittime = MAX_BLOCKTIME;
2020 2331
… …
2030 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;
2031 if (waittime > to) waittime = to; 2342 if (waittime > to) waittime = to;
2032 } 2343 }
2033#endif 2344#endif
2034 2345
2346 /* don't let timeouts decrease the waittime below timeout_blocktime */
2035 if (expect_false (waittime < timeout_blocktime)) 2347 if (expect_false (waittime < timeout_blocktime))
2036 waittime = timeout_blocktime; 2348 waittime = timeout_blocktime;
2037 2349
2038 sleeptime = waittime - backend_fudge; 2350 /* extra check because io_blocktime is commonly 0 */
2039
2040 if (expect_true (sleeptime > io_blocktime)) 2351 if (expect_false (io_blocktime))
2041 sleeptime = io_blocktime;
2042
2043 if (sleeptime)
2044 { 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 {
2045 ev_sleep (sleeptime); 2360 ev_sleep (sleeptime);
2046 waittime -= sleeptime; 2361 waittime -= sleeptime;
2362 }
2047 } 2363 }
2048 } 2364 }
2049 2365
2366#if EV_MINIMAL < 2
2050 ++loop_count; 2367 ++loop_count;
2368#endif
2369 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2051 backend_poll (EV_A_ waittime); 2370 backend_poll (EV_A_ waittime);
2371 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2052 2372
2053 /* update ev_rt_now, do magic */ 2373 /* update ev_rt_now, do magic */
2054 time_update (EV_A_ waittime + sleeptime); 2374 time_update (EV_A_ waittime + sleeptime);
2055 } 2375 }
2056 2376
… …
2067 2387
2068 /* queue check watchers, to be executed first */ 2388 /* queue check watchers, to be executed first */
2069 if (expect_false (checkcnt)) 2389 if (expect_false (checkcnt))
2070 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2390 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2071 2391
2072 call_pending (EV_A); 2392 EV_INVOKE_PENDING;
2073 } 2393 }
2074 while (expect_true ( 2394 while (expect_true (
2075 activecnt 2395 activecnt
2076 && !loop_done 2396 && !loop_done
2077 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2397 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2078 )); 2398 ));
2079 2399
2080 if (loop_done == EVUNLOOP_ONE) 2400 if (loop_done == EVUNLOOP_ONE)
2081 loop_done = EVUNLOOP_CANCEL; 2401 loop_done = EVUNLOOP_CANCEL;
2402
2403#if EV_MINIMAL < 2
2404 --loop_depth;
2405#endif
2082} 2406}
2083 2407
2084void 2408void
2085ev_unloop (EV_P_ int how) 2409ev_unloop (EV_P_ int how)
2086{ 2410{
2087 loop_done = how; 2411 loop_done = how;
2088} 2412}
2089 2413
2414void
2415ev_ref (EV_P)
2416{
2417 ++activecnt;
2418}
2419
2420void
2421ev_unref (EV_P)
2422{
2423 --activecnt;
2424}
2425
2426void
2427ev_now_update (EV_P)
2428{
2429 time_update (EV_A_ 1e100);
2430}
2431
2432void
2433ev_suspend (EV_P)
2434{
2435 ev_now_update (EV_A);
2436}
2437
2438void
2439ev_resume (EV_P)
2440{
2441 ev_tstamp mn_prev = mn_now;
2442
2443 ev_now_update (EV_A);
2444 timers_reschedule (EV_A_ mn_now - mn_prev);
2445#if EV_PERIODIC_ENABLE
2446 /* TODO: really do this? */
2447 periodics_reschedule (EV_A);
2448#endif
2449}
2450
2090/*****************************************************************************/ 2451/*****************************************************************************/
2452/* singly-linked list management, used when the expected list length is short */
2091 2453
2092void inline_size 2454inline_size void
2093wlist_add (WL *head, WL elem) 2455wlist_add (WL *head, WL elem)
2094{ 2456{
2095 elem->next = *head; 2457 elem->next = *head;
2096 *head = elem; 2458 *head = elem;
2097} 2459}
2098 2460
2099void inline_size 2461inline_size void
2100wlist_del (WL *head, WL elem) 2462wlist_del (WL *head, WL elem)
2101{ 2463{
2102 while (*head) 2464 while (*head)
2103 { 2465 {
2104 if (*head == elem) 2466 if (expect_true (*head == elem))
2105 { 2467 {
2106 *head = elem->next; 2468 *head = elem->next;
2107 return; 2469 break;
2108 } 2470 }
2109 2471
2110 head = &(*head)->next; 2472 head = &(*head)->next;
2111 } 2473 }
2112} 2474}
2113 2475
2114void inline_speed 2476/* internal, faster, version of ev_clear_pending */
2477inline_speed void
2115clear_pending (EV_P_ W w) 2478clear_pending (EV_P_ W w)
2116{ 2479{
2117 if (w->pending) 2480 if (w->pending)
2118 { 2481 {
2119 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2482 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2120 w->pending = 0; 2483 w->pending = 0;
2121 } 2484 }
2122} 2485}
2123 2486
2124int 2487int
… …
2128 int pending = w_->pending; 2491 int pending = w_->pending;
2129 2492
2130 if (expect_true (pending)) 2493 if (expect_true (pending))
2131 { 2494 {
2132 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2495 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2496 p->w = (W)&pending_w;
2133 w_->pending = 0; 2497 w_->pending = 0;
2134 p->w = 0;
2135 return p->events; 2498 return p->events;
2136 } 2499 }
2137 else 2500 else
2138 return 0; 2501 return 0;
2139} 2502}
2140 2503
2141void inline_size 2504inline_size void
2142pri_adjust (EV_P_ W w) 2505pri_adjust (EV_P_ W w)
2143{ 2506{
2144 int pri = w->priority; 2507 int pri = ev_priority (w);
2145 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2508 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2146 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2509 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2147 w->priority = pri; 2510 ev_set_priority (w, pri);
2148} 2511}
2149 2512
2150void inline_speed 2513inline_speed void
2151ev_start (EV_P_ W w, int active) 2514ev_start (EV_P_ W w, int active)
2152{ 2515{
2153 pri_adjust (EV_A_ w); 2516 pri_adjust (EV_A_ w);
2154 w->active = active; 2517 w->active = active;
2155 ev_ref (EV_A); 2518 ev_ref (EV_A);
2156} 2519}
2157 2520
2158void inline_size 2521inline_size void
2159ev_stop (EV_P_ W w) 2522ev_stop (EV_P_ W w)
2160{ 2523{
2161 ev_unref (EV_A); 2524 ev_unref (EV_A);
2162 w->active = 0; 2525 w->active = 0;
2163} 2526}
… …
2171 2534
2172 if (expect_false (ev_is_active (w))) 2535 if (expect_false (ev_is_active (w)))
2173 return; 2536 return;
2174 2537
2175 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2538 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2176 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))));
2177 2540
2178 EV_FREQUENT_CHECK; 2541 EV_FREQUENT_CHECK;
2179 2542
2180 ev_start (EV_A_ (W)w, 1); 2543 ev_start (EV_A_ (W)w, 1);
2181 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2544 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2182 wlist_add (&anfds[fd].head, (WL)w); 2545 wlist_add (&anfds[fd].head, (WL)w);
2183 2546
2184 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2547 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2185 w->events &= ~EV__IOFDSET; 2548 w->events &= ~EV__IOFDSET;
2186 2549
2187 EV_FREQUENT_CHECK; 2550 EV_FREQUENT_CHECK;
2188} 2551}
2189 2552
… …
2251 timers [active] = timers [timercnt + HEAP0]; 2614 timers [active] = timers [timercnt + HEAP0];
2252 adjustheap (timers, timercnt, active); 2615 adjustheap (timers, timercnt, active);
2253 } 2616 }
2254 } 2617 }
2255 2618
2256 EV_FREQUENT_CHECK;
2257
2258 ev_at (w) -= mn_now; 2619 ev_at (w) -= mn_now;
2259 2620
2260 ev_stop (EV_A_ (W)w); 2621 ev_stop (EV_A_ (W)w);
2622
2623 EV_FREQUENT_CHECK;
2261} 2624}
2262 2625
2263void noinline 2626void noinline
2264ev_timer_again (EV_P_ ev_timer *w) 2627ev_timer_again (EV_P_ ev_timer *w)
2265{ 2628{
… …
2283 } 2646 }
2284 2647
2285 EV_FREQUENT_CHECK; 2648 EV_FREQUENT_CHECK;
2286} 2649}
2287 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
2288#if EV_PERIODIC_ENABLE 2657#if EV_PERIODIC_ENABLE
2289void noinline 2658void noinline
2290ev_periodic_start (EV_P_ ev_periodic *w) 2659ev_periodic_start (EV_P_ ev_periodic *w)
2291{ 2660{
2292 if (expect_false (ev_is_active (w))) 2661 if (expect_false (ev_is_active (w)))
… …
2338 periodics [active] = periodics [periodiccnt + HEAP0]; 2707 periodics [active] = periodics [periodiccnt + HEAP0];
2339 adjustheap (periodics, periodiccnt, active); 2708 adjustheap (periodics, periodiccnt, active);
2340 } 2709 }
2341 } 2710 }
2342 2711
2343 EV_FREQUENT_CHECK;
2344
2345 ev_stop (EV_A_ (W)w); 2712 ev_stop (EV_A_ (W)w);
2713
2714 EV_FREQUENT_CHECK;
2346} 2715}
2347 2716
2348void noinline 2717void noinline
2349ev_periodic_again (EV_P_ ev_periodic *w) 2718ev_periodic_again (EV_P_ ev_periodic *w)
2350{ 2719{
… …
2359#endif 2728#endif
2360 2729
2361void noinline 2730void noinline
2362ev_signal_start (EV_P_ ev_signal *w) 2731ev_signal_start (EV_P_ ev_signal *w)
2363{ 2732{
2364#if EV_MULTIPLICITY
2365 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2366#endif
2367 if (expect_false (ev_is_active (w))) 2733 if (expect_false (ev_is_active (w)))
2368 return; 2734 return;
2369 2735
2370 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));
2371 2737
2372 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));
2373 2741
2374 EV_FREQUENT_CHECK; 2742 signals [w->signum - 1].loop = EV_A;
2743#endif
2375 2744
2745 EV_FREQUENT_CHECK;
2746
2747#if EV_USE_SIGNALFD
2748 if (sigfd == -2)
2376 { 2749 {
2377#ifndef _WIN32 2750 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2378 sigset_t full, prev; 2751 if (sigfd < 0 && errno == EINVAL)
2379 sigfillset (&full); 2752 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2380 sigprocmask (SIG_SETMASK, &full, &prev);
2381#endif
2382 2753
2383 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 */
2384 2757
2385#ifndef _WIN32 2758 sigemptyset (&sigfd_set);
2386 sigprocmask (SIG_SETMASK, &prev, 0); 2759
2387#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 }
2388 } 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
2389 2776
2390 ev_start (EV_A_ (W)w, 1); 2777 ev_start (EV_A_ (W)w, 1);
2391 wlist_add (&signals [w->signum - 1].head, (WL)w); 2778 wlist_add (&signals [w->signum - 1].head, (WL)w);
2392 2779
2393 if (!((WL)w)->next) 2780 if (!((WL)w)->next)
2781# if EV_USE_SIGNALFD
2782 if (sigfd < 0) /*TODO*/
2783# endif
2394 { 2784 {
2395#if _WIN32 2785# ifdef _WIN32
2786 evpipe_init (EV_A);
2787
2396 signal (w->signum, ev_sighandler); 2788 signal (w->signum, ev_sighandler);
2397#else 2789# else
2398 struct sigaction sa; 2790 struct sigaction sa;
2791
2792 evpipe_init (EV_A);
2793
2399 sa.sa_handler = ev_sighandler; 2794 sa.sa_handler = ev_sighandler;
2400 sigfillset (&sa.sa_mask); 2795 sigfillset (&sa.sa_mask);
2401 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 */
2402 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);
2403#endif 2802#endif
2404 } 2803 }
2405 2804
2406 EV_FREQUENT_CHECK; 2805 EV_FREQUENT_CHECK;
2407} 2806}
2408 2807
2409void noinline 2808void noinline
… …
2417 2816
2418 wlist_del (&signals [w->signum - 1].head, (WL)w); 2817 wlist_del (&signals [w->signum - 1].head, (WL)w);
2419 ev_stop (EV_A_ (W)w); 2818 ev_stop (EV_A_ (W)w);
2420 2819
2421 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
2422 signal (w->signum, SIG_DFL); 2839 signal (w->signum, SIG_DFL);
2840 }
2423 2841
2424 EV_FREQUENT_CHECK; 2842 EV_FREQUENT_CHECK;
2425} 2843}
2426 2844
2427void 2845void
… …
2468#define MIN_STAT_INTERVAL 0.1074891 2886#define MIN_STAT_INTERVAL 0.1074891
2469 2887
2470static 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);
2471 2889
2472#if EV_USE_INOTIFY 2890#if EV_USE_INOTIFY
2473# 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)
2474 2894
2475static void noinline 2895static void noinline
2476infy_add (EV_P_ ev_stat *w) 2896infy_add (EV_P_ ev_stat *w)
2477{ 2897{
2478 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);
2479 2899
2480 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 */
2481 { 2920 }
2921 else
2922 {
2923 /* can't use inotify, continue to stat */
2482 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2924 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2483 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2484 2925
2485 /* monitor some parent directory for speedup hints */ 2926 /* if path is not there, monitor some parent directory for speedup hints */
2486 /* 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, */
2487 /* but an efficiency issue only */ 2928 /* but an efficiency issue only */
2488 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2929 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2489 { 2930 {
2490 char path [4096]; 2931 char path [4096];
… …
2506 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2947 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2507 } 2948 }
2508 } 2949 }
2509 2950
2510 if (w->wd >= 0) 2951 if (w->wd >= 0)
2511 {
2512 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);
2513 2953
2514 /* now local changes will be tracked by inotify, but remote changes won't */ 2954 /* now re-arm timer, if required */
2515 /* unless the filesystem it known to be local, we therefore still poll */ 2955 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2516 /* also do poll on <2.6.25, but with normal frequency */
2517 struct statfs sfs;
2518
2519 if (fs_2625 && !statfs (w->path, &sfs))
2520 if (sfs.f_type == 0x1373 /* devfs */
2521 || sfs.f_type == 0xEF53 /* ext2/3 */
2522 || sfs.f_type == 0x3153464a /* jfs */
2523 || sfs.f_type == 0x52654973 /* reiser3 */
2524 || sfs.f_type == 0x01021994 /* tempfs */
2525 || sfs.f_type == 0x58465342 /* xfs */)
2526 return;
2527
2528 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2529 ev_timer_again (EV_A_ &w->timer); 2956 ev_timer_again (EV_A_ &w->timer);
2530 } 2957 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2531} 2958}
2532 2959
2533static void noinline 2960static void noinline
2534infy_del (EV_P_ ev_stat *w) 2961infy_del (EV_P_ ev_stat *w)
2535{ 2962{
… …
2580 3007
2581static void 3008static void
2582infy_cb (EV_P_ ev_io *w, int revents) 3009infy_cb (EV_P_ ev_io *w, int revents)
2583{ 3010{
2584 char buf [EV_INOTIFY_BUFSIZE]; 3011 char buf [EV_INOTIFY_BUFSIZE];
2585 struct inotify_event *ev = (struct inotify_event *)buf;
2586 int ofs; 3012 int ofs;
2587 int len = read (fs_fd, buf, sizeof (buf)); 3013 int len = read (fs_fd, buf, sizeof (buf));
2588 3014
2589 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);
2590 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 }
2591} 3021}
2592 3022
2593void inline_size 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;
3053}
3054
3055inline_size void
2594check_2625 (EV_P) 3056ev_check_2625 (EV_P)
2595{ 3057{
2596 /* kernels < 2.6.25 are borked 3058 /* kernels < 2.6.25 are borked
2597 * 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
2598 */ 3060 */
2599 struct utsname buf; 3061 if (ev_linux_version () < 0x020619)
2600 int major, minor, micro;
2601
2602 if (uname (&buf))
2603 return; 3062 return;
2604 3063
2605 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2606 return;
2607
2608 if (major < 2
2609 || (major == 2 && minor < 6)
2610 || (major == 2 && minor == 6 && micro < 25))
2611 return;
2612
2613 fs_2625 = 1; 3064 fs_2625 = 1;
2614} 3065}
2615 3066
2616void inline_size 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 ();
3076}
3077
3078inline_size void
2617infy_init (EV_P) 3079infy_init (EV_P)
2618{ 3080{
2619 if (fs_fd != -2) 3081 if (fs_fd != -2)
2620 return; 3082 return;
2621 3083
2622 fs_fd = -1; 3084 fs_fd = -1;
2623 3085
2624 check_2625 (EV_A); 3086 ev_check_2625 (EV_A);
2625 3087
2626 fs_fd = inotify_init (); 3088 fs_fd = infy_newfd ();
2627 3089
2628 if (fs_fd >= 0) 3090 if (fs_fd >= 0)
2629 { 3091 {
3092 fd_intern (fs_fd);
2630 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3093 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2631 ev_set_priority (&fs_w, EV_MAXPRI); 3094 ev_set_priority (&fs_w, EV_MAXPRI);
2632 ev_io_start (EV_A_ &fs_w); 3095 ev_io_start (EV_A_ &fs_w);
3096 ev_unref (EV_A);
2633 } 3097 }
2634} 3098}
2635 3099
2636void inline_size 3100inline_size void
2637infy_fork (EV_P) 3101infy_fork (EV_P)
2638{ 3102{
2639 int slot; 3103 int slot;
2640 3104
2641 if (fs_fd < 0) 3105 if (fs_fd < 0)
2642 return; 3106 return;
2643 3107
3108 ev_ref (EV_A);
3109 ev_io_stop (EV_A_ &fs_w);
2644 close (fs_fd); 3110 close (fs_fd);
2645 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 }
2646 3120
2647 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3121 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2648 { 3122 {
2649 WL w_ = fs_hash [slot].head; 3123 WL w_ = fs_hash [slot].head;
2650 fs_hash [slot].head = 0; 3124 fs_hash [slot].head = 0;
… …
2657 w->wd = -1; 3131 w->wd = -1;
2658 3132
2659 if (fs_fd >= 0) 3133 if (fs_fd >= 0)
2660 infy_add (EV_A_ w); /* re-add, no matter what */ 3134 infy_add (EV_A_ w); /* re-add, no matter what */
2661 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);
2662 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 }
2663 } 3142 }
2664 } 3143 }
2665} 3144}
2666 3145
2667#endif 3146#endif
… …
2684static void noinline 3163static void noinline
2685stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3164stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2686{ 3165{
2687 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3166 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2688 3167
2689 /* we copy this here each the time so that */ 3168 ev_statdata prev = w->attr;
2690 /* prev has the old value when the callback gets invoked */
2691 w->prev = w->attr;
2692 ev_stat_stat (EV_A_ w); 3169 ev_stat_stat (EV_A_ w);
2693 3170
2694 /* 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 */
2695 if ( 3172 if (
2696 w->prev.st_dev != w->attr.st_dev 3173 prev.st_dev != w->attr.st_dev
2697 || w->prev.st_ino != w->attr.st_ino 3174 || prev.st_ino != w->attr.st_ino
2698 || w->prev.st_mode != w->attr.st_mode 3175 || prev.st_mode != w->attr.st_mode
2699 || w->prev.st_nlink != w->attr.st_nlink 3176 || prev.st_nlink != w->attr.st_nlink
2700 || w->prev.st_uid != w->attr.st_uid 3177 || prev.st_uid != w->attr.st_uid
2701 || w->prev.st_gid != w->attr.st_gid 3178 || prev.st_gid != w->attr.st_gid
2702 || w->prev.st_rdev != w->attr.st_rdev 3179 || prev.st_rdev != w->attr.st_rdev
2703 || w->prev.st_size != w->attr.st_size 3180 || prev.st_size != w->attr.st_size
2704 || w->prev.st_atime != w->attr.st_atime 3181 || prev.st_atime != w->attr.st_atime
2705 || w->prev.st_mtime != w->attr.st_mtime 3182 || prev.st_mtime != w->attr.st_mtime
2706 || w->prev.st_ctime != w->attr.st_ctime 3183 || prev.st_ctime != w->attr.st_ctime
2707 ) { 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
2708 #if EV_USE_INOTIFY 3190 #if EV_USE_INOTIFY
2709 if (fs_fd >= 0) 3191 if (fs_fd >= 0)
2710 { 3192 {
2711 infy_del (EV_A_ w); 3193 infy_del (EV_A_ w);
2712 infy_add (EV_A_ w); 3194 infy_add (EV_A_ w);
… …
2737 3219
2738 if (fs_fd >= 0) 3220 if (fs_fd >= 0)
2739 infy_add (EV_A_ w); 3221 infy_add (EV_A_ w);
2740 else 3222 else
2741#endif 3223#endif
3224 {
2742 ev_timer_again (EV_A_ &w->timer); 3225 ev_timer_again (EV_A_ &w->timer);
3226 ev_unref (EV_A);
3227 }
2743 3228
2744 ev_start (EV_A_ (W)w, 1); 3229 ev_start (EV_A_ (W)w, 1);
2745 3230
2746 EV_FREQUENT_CHECK; 3231 EV_FREQUENT_CHECK;
2747} 3232}
… …
2756 EV_FREQUENT_CHECK; 3241 EV_FREQUENT_CHECK;
2757 3242
2758#if EV_USE_INOTIFY 3243#if EV_USE_INOTIFY
2759 infy_del (EV_A_ w); 3244 infy_del (EV_A_ w);
2760#endif 3245#endif
3246
3247 if (ev_is_active (&w->timer))
3248 {
3249 ev_ref (EV_A);
2761 ev_timer_stop (EV_A_ &w->timer); 3250 ev_timer_stop (EV_A_ &w->timer);
3251 }
2762 3252
2763 ev_stop (EV_A_ (W)w); 3253 ev_stop (EV_A_ (W)w);
2764 3254
2765 EV_FREQUENT_CHECK; 3255 EV_FREQUENT_CHECK;
2766} 3256}
… …
2907embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3397embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2908{ 3398{
2909 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3399 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2910 3400
2911 { 3401 {
2912 struct ev_loop *loop = w->other; 3402 EV_P = w->other;
2913 3403
2914 while (fdchangecnt) 3404 while (fdchangecnt)
2915 { 3405 {
2916 fd_reify (EV_A); 3406 fd_reify (EV_A);
2917 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3407 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
2925 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));
2926 3416
2927 ev_embed_stop (EV_A_ w); 3417 ev_embed_stop (EV_A_ w);
2928 3418
2929 { 3419 {
2930 struct ev_loop *loop = w->other; 3420 EV_P = w->other;
2931 3421
2932 ev_loop_fork (EV_A); 3422 ev_loop_fork (EV_A);
2933 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3423 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2934 } 3424 }
2935 3425
… …
2949{ 3439{
2950 if (expect_false (ev_is_active (w))) 3440 if (expect_false (ev_is_active (w)))
2951 return; 3441 return;
2952 3442
2953 { 3443 {
2954 struct ev_loop *loop = w->other; 3444 EV_P = w->other;
2955 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 ()));
2956 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);
2957 } 3447 }
2958 3448
2959 EV_FREQUENT_CHECK; 3449 EV_FREQUENT_CHECK;
… …
2986 3476
2987 ev_io_stop (EV_A_ &w->io); 3477 ev_io_stop (EV_A_ &w->io);
2988 ev_prepare_stop (EV_A_ &w->prepare); 3478 ev_prepare_stop (EV_A_ &w->prepare);
2989 ev_fork_stop (EV_A_ &w->fork); 3479 ev_fork_stop (EV_A_ &w->fork);
2990 3480
3481 ev_stop (EV_A_ (W)w);
3482
2991 EV_FREQUENT_CHECK; 3483 EV_FREQUENT_CHECK;
2992} 3484}
2993#endif 3485#endif
2994 3486
2995#if EV_FORK_ENABLE 3487#if EV_FORK_ENABLE
… …
3071 3563
3072void 3564void
3073ev_async_send (EV_P_ ev_async *w) 3565ev_async_send (EV_P_ ev_async *w)
3074{ 3566{
3075 w->sent = 1; 3567 w->sent = 1;
3076 evpipe_write (EV_A_ &gotasync); 3568 evpipe_write (EV_A_ &async_pending);
3077} 3569}
3078#endif 3570#endif
3079 3571
3080/*****************************************************************************/ 3572/*****************************************************************************/
3081 3573
… …
3145 } 3637 }
3146} 3638}
3147 3639
3148/*****************************************************************************/ 3640/*****************************************************************************/
3149 3641
3150#if 0 3642#if EV_WALK_ENABLE
3151void 3643void
3152ev_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))
3153{ 3645{
3154 int i, j; 3646 int i, j;
3155 ev_watcher_list *wl, *wn; 3647 ev_watcher_list *wl, *wn;
… …
3171#if EV_USE_INOTIFY 3663#if EV_USE_INOTIFY
3172 if (ev_cb ((ev_io *)wl) == infy_cb) 3664 if (ev_cb ((ev_io *)wl) == infy_cb)
3173 ; 3665 ;
3174 else 3666 else
3175#endif 3667#endif
3176 if ((ev_io *)wl != &pipeev) 3668 if ((ev_io *)wl != &pipe_w)
3177 if (types & EV_IO) 3669 if (types & EV_IO)
3178 cb (EV_A_ EV_IO, wl); 3670 cb (EV_A_ EV_IO, wl);
3179 3671
3180 wl = wn; 3672 wl = wn;
3181 } 3673 }
… …
3230 if (types & EV_CHECK) 3722 if (types & EV_CHECK)
3231 for (i = checkcnt; i--; ) 3723 for (i = checkcnt; i--; )
3232 cb (EV_A_ EV_CHECK, checks [i]); 3724 cb (EV_A_ EV_CHECK, checks [i]);
3233 3725
3234 if (types & EV_SIGNAL) 3726 if (types & EV_SIGNAL)
3235 for (i = 0; i < signalmax; ++i) 3727 for (i = 0; i < EV_NSIG - 1; ++i)
3236 for (wl = signals [i].head; wl; ) 3728 for (wl = signals [i].head; wl; )
3237 { 3729 {
3238 wn = wl->next; 3730 wn = wl->next;
3239 cb (EV_A_ EV_SIGNAL, wl); 3731 cb (EV_A_ EV_SIGNAL, wl);
3240 wl = wn; 3732 wl = wn;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines