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.333 by root, Tue Mar 9 08:58:22 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 *
… …
466{ 595{
467 ptr = alloc (ptr, size); 596 ptr = alloc (ptr, size);
468 597
469 if (!ptr && size) 598 if (!ptr && size)
470 { 599 {
600#if EV_AVOID_STDIO
601 ev_printerr ("libev: memory allocation failed, aborting.\n");
602#else
471 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 603 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
604#endif
472 abort (); 605 abort ();
473 } 606 }
474 607
475 return ptr; 608 return ptr;
476} 609}
… …
478#define ev_malloc(size) ev_realloc (0, (size)) 611#define ev_malloc(size) ev_realloc (0, (size))
479#define ev_free(ptr) ev_realloc ((ptr), 0) 612#define ev_free(ptr) ev_realloc ((ptr), 0)
480 613
481/*****************************************************************************/ 614/*****************************************************************************/
482 615
616/* set in reify when reification needed */
617#define EV_ANFD_REIFY 1
618
619/* file descriptor info structure */
483typedef struct 620typedef struct
484{ 621{
485 WL head; 622 WL head;
486 unsigned char events; 623 unsigned char events; /* the events watched for */
487 unsigned char reify; 624 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 */ 625 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
489 unsigned char unused; 626 unsigned char unused;
490#if EV_USE_EPOLL 627#if EV_USE_EPOLL
491 unsigned int egen; /* generation counter to counter epoll bugs */ 628 unsigned int egen; /* generation counter to counter epoll bugs */
492#endif 629#endif
493#if EV_SELECT_IS_WINSOCKET 630#if EV_SELECT_IS_WINSOCKET
494 SOCKET handle; 631 SOCKET handle;
495#endif 632#endif
496} ANFD; 633} ANFD;
497 634
635/* stores the pending event set for a given watcher */
498typedef struct 636typedef struct
499{ 637{
500 W w; 638 W w;
501 int events; 639 int events; /* the pending event set for the given watcher */
502} ANPENDING; 640} ANPENDING;
503 641
504#if EV_USE_INOTIFY 642#if EV_USE_INOTIFY
505/* hash table entry per inotify-id */ 643/* hash table entry per inotify-id */
506typedef struct 644typedef struct
… …
509} ANFS; 647} ANFS;
510#endif 648#endif
511 649
512/* Heap Entry */ 650/* Heap Entry */
513#if EV_HEAP_CACHE_AT 651#if EV_HEAP_CACHE_AT
652 /* a heap element */
514 typedef struct { 653 typedef struct {
515 ev_tstamp at; 654 ev_tstamp at;
516 WT w; 655 WT w;
517 } ANHE; 656 } ANHE;
518 657
519 #define ANHE_w(he) (he).w /* access watcher, read-write */ 658 #define ANHE_w(he) (he).w /* access watcher, read-write */
520 #define ANHE_at(he) (he).at /* access cached at, read-only */ 659 #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 */ 660 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
522#else 661#else
662 /* a heap element */
523 typedef WT ANHE; 663 typedef WT ANHE;
524 664
525 #define ANHE_w(he) (he) 665 #define ANHE_w(he) (he)
526 #define ANHE_at(he) (he)->at 666 #define ANHE_at(he) (he)->at
527 #define ANHE_at_cache(he) 667 #define ANHE_at_cache(he)
… …
551 691
552 static int ev_default_loop_ptr; 692 static int ev_default_loop_ptr;
553 693
554#endif 694#endif
555 695
696#if EV_MINIMAL < 2
697# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
698# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
699# define EV_INVOKE_PENDING invoke_cb (EV_A)
700#else
701# define EV_RELEASE_CB (void)0
702# define EV_ACQUIRE_CB (void)0
703# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
704#endif
705
706#define EVUNLOOP_RECURSE 0x80
707
556/*****************************************************************************/ 708/*****************************************************************************/
557 709
710#ifndef EV_HAVE_EV_TIME
558ev_tstamp 711ev_tstamp
559ev_time (void) 712ev_time (void)
560{ 713{
561#if EV_USE_REALTIME 714#if EV_USE_REALTIME
562 if (expect_true (have_realtime)) 715 if (expect_true (have_realtime))
… …
569 722
570 struct timeval tv; 723 struct timeval tv;
571 gettimeofday (&tv, 0); 724 gettimeofday (&tv, 0);
572 return tv.tv_sec + tv.tv_usec * 1e-6; 725 return tv.tv_sec + tv.tv_usec * 1e-6;
573} 726}
727#endif
574 728
575ev_tstamp inline_size 729inline_size ev_tstamp
576get_clock (void) 730get_clock (void)
577{ 731{
578#if EV_USE_MONOTONIC 732#if EV_USE_MONOTONIC
579 if (expect_true (have_monotonic)) 733 if (expect_true (have_monotonic))
580 { 734 {
… …
614 768
615 tv.tv_sec = (time_t)delay; 769 tv.tv_sec = (time_t)delay;
616 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 770 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
617 771
618 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 772 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
619 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 773 /* something not guaranteed by newer posix versions, but guaranteed */
620 /* by older ones */ 774 /* by older ones */
621 select (0, 0, 0, 0, &tv); 775 select (0, 0, 0, 0, &tv);
622#endif 776#endif
623 } 777 }
624} 778}
625 779
626/*****************************************************************************/ 780/*****************************************************************************/
627 781
628#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 782#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
629 783
630int inline_size 784/* find a suitable new size for the given array, */
785/* hopefully by rounding to a ncie-to-malloc size */
786inline_size int
631array_nextsize (int elem, int cur, int cnt) 787array_nextsize (int elem, int cur, int cnt)
632{ 788{
633 int ncur = cur + 1; 789 int ncur = cur + 1;
634 790
635 do 791 do
… …
680#define array_free(stem, idx) \ 836#define array_free(stem, idx) \
681 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0 837 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
682 838
683/*****************************************************************************/ 839/*****************************************************************************/
684 840
841/* dummy callback for pending events */
842static void noinline
843pendingcb (EV_P_ ev_prepare *w, int revents)
844{
845}
846
685void noinline 847void noinline
686ev_feed_event (EV_P_ void *w, int revents) 848ev_feed_event (EV_P_ void *w, int revents)
687{ 849{
688 W w_ = (W)w; 850 W w_ = (W)w;
689 int pri = ABSPRI (w_); 851 int pri = ABSPRI (w_);
… …
697 pendings [pri][w_->pending - 1].w = w_; 859 pendings [pri][w_->pending - 1].w = w_;
698 pendings [pri][w_->pending - 1].events = revents; 860 pendings [pri][w_->pending - 1].events = revents;
699 } 861 }
700} 862}
701 863
702void inline_speed 864inline_speed void
865feed_reverse (EV_P_ W w)
866{
867 array_needsize (W, rfeeds, rfeedmax, rfeedcnt + 1, EMPTY2);
868 rfeeds [rfeedcnt++] = w;
869}
870
871inline_size void
872feed_reverse_done (EV_P_ int revents)
873{
874 do
875 ev_feed_event (EV_A_ rfeeds [--rfeedcnt], revents);
876 while (rfeedcnt);
877}
878
879inline_speed void
703queue_events (EV_P_ W *events, int eventcnt, int type) 880queue_events (EV_P_ W *events, int eventcnt, int type)
704{ 881{
705 int i; 882 int i;
706 883
707 for (i = 0; i < eventcnt; ++i) 884 for (i = 0; i < eventcnt; ++i)
708 ev_feed_event (EV_A_ events [i], type); 885 ev_feed_event (EV_A_ events [i], type);
709} 886}
710 887
711/*****************************************************************************/ 888/*****************************************************************************/
712 889
713void inline_speed 890inline_speed void
714fd_event (EV_P_ int fd, int revents) 891fd_event_nc (EV_P_ int fd, int revents)
715{ 892{
716 ANFD *anfd = anfds + fd; 893 ANFD *anfd = anfds + fd;
717 ev_io *w; 894 ev_io *w;
718 895
719 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 896 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
723 if (ev) 900 if (ev)
724 ev_feed_event (EV_A_ (W)w, ev); 901 ev_feed_event (EV_A_ (W)w, ev);
725 } 902 }
726} 903}
727 904
905/* do not submit kernel events for fds that have reify set */
906/* because that means they changed while we were polling for new events */
907inline_speed void
908fd_event (EV_P_ int fd, int revents)
909{
910 ANFD *anfd = anfds + fd;
911
912 if (expect_true (!anfd->reify))
913 fd_event_nc (EV_A_ fd, revents);
914}
915
728void 916void
729ev_feed_fd_event (EV_P_ int fd, int revents) 917ev_feed_fd_event (EV_P_ int fd, int revents)
730{ 918{
731 if (fd >= 0 && fd < anfdmax) 919 if (fd >= 0 && fd < anfdmax)
732 fd_event (EV_A_ fd, revents); 920 fd_event_nc (EV_A_ fd, revents);
733} 921}
734 922
735void inline_size 923/* make sure the external fd watch events are in-sync */
924/* with the kernel/libev internal state */
925inline_size void
736fd_reify (EV_P) 926fd_reify (EV_P)
737{ 927{
738 int i; 928 int i;
739 929
740 for (i = 0; i < fdchangecnt; ++i) 930 for (i = 0; i < fdchangecnt; ++i)
… …
750 940
751#if EV_SELECT_IS_WINSOCKET 941#if EV_SELECT_IS_WINSOCKET
752 if (events) 942 if (events)
753 { 943 {
754 unsigned long arg; 944 unsigned long arg;
755 #ifdef EV_FD_TO_WIN32_HANDLE
756 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 945 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)); 946 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
761 } 947 }
762#endif 948#endif
763 949
764 { 950 {
… …
774 } 960 }
775 961
776 fdchangecnt = 0; 962 fdchangecnt = 0;
777} 963}
778 964
779void inline_size 965/* something about the given fd changed */
966inline_size void
780fd_change (EV_P_ int fd, int flags) 967fd_change (EV_P_ int fd, int flags)
781{ 968{
782 unsigned char reify = anfds [fd].reify; 969 unsigned char reify = anfds [fd].reify;
783 anfds [fd].reify |= flags; 970 anfds [fd].reify |= flags;
784 971
… …
788 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 975 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
789 fdchanges [fdchangecnt - 1] = fd; 976 fdchanges [fdchangecnt - 1] = fd;
790 } 977 }
791} 978}
792 979
793void inline_speed 980/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
981inline_speed void
794fd_kill (EV_P_ int fd) 982fd_kill (EV_P_ int fd)
795{ 983{
796 ev_io *w; 984 ev_io *w;
797 985
798 while ((w = (ev_io *)anfds [fd].head)) 986 while ((w = (ev_io *)anfds [fd].head))
… …
800 ev_io_stop (EV_A_ w); 988 ev_io_stop (EV_A_ w);
801 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 989 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
802 } 990 }
803} 991}
804 992
805int inline_size 993/* check whether the given fd is atcually valid, for error recovery */
994inline_size int
806fd_valid (int fd) 995fd_valid (int fd)
807{ 996{
808#ifdef _WIN32 997#ifdef _WIN32
809 return _get_osfhandle (fd) != -1; 998 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
810#else 999#else
811 return fcntl (fd, F_GETFD) != -1; 1000 return fcntl (fd, F_GETFD) != -1;
812#endif 1001#endif
813} 1002}
814 1003
… …
832 1021
833 for (fd = anfdmax; fd--; ) 1022 for (fd = anfdmax; fd--; )
834 if (anfds [fd].events) 1023 if (anfds [fd].events)
835 { 1024 {
836 fd_kill (EV_A_ fd); 1025 fd_kill (EV_A_ fd);
837 return; 1026 break;
838 } 1027 }
839} 1028}
840 1029
841/* usually called after fork if backend needs to re-arm all fds from scratch */ 1030/* usually called after fork if backend needs to re-arm all fds from scratch */
842static void noinline 1031static void noinline
… …
847 for (fd = 0; fd < anfdmax; ++fd) 1036 for (fd = 0; fd < anfdmax; ++fd)
848 if (anfds [fd].events) 1037 if (anfds [fd].events)
849 { 1038 {
850 anfds [fd].events = 0; 1039 anfds [fd].events = 0;
851 anfds [fd].emask = 0; 1040 anfds [fd].emask = 0;
852 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1041 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
853 } 1042 }
854} 1043}
855 1044
856/*****************************************************************************/ 1045/*****************************************************************************/
857 1046
… …
873#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 1062#define HEAP0 (DHEAP - 1) /* index of first element in heap */
874#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 1063#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
875#define UPHEAP_DONE(p,k) ((p) == (k)) 1064#define UPHEAP_DONE(p,k) ((p) == (k))
876 1065
877/* away from the root */ 1066/* away from the root */
878void inline_speed 1067inline_speed void
879downheap (ANHE *heap, int N, int k) 1068downheap (ANHE *heap, int N, int k)
880{ 1069{
881 ANHE he = heap [k]; 1070 ANHE he = heap [k];
882 ANHE *E = heap + N + HEAP0; 1071 ANHE *E = heap + N + HEAP0;
883 1072
… …
923#define HEAP0 1 1112#define HEAP0 1
924#define HPARENT(k) ((k) >> 1) 1113#define HPARENT(k) ((k) >> 1)
925#define UPHEAP_DONE(p,k) (!(p)) 1114#define UPHEAP_DONE(p,k) (!(p))
926 1115
927/* away from the root */ 1116/* away from the root */
928void inline_speed 1117inline_speed void
929downheap (ANHE *heap, int N, int k) 1118downheap (ANHE *heap, int N, int k)
930{ 1119{
931 ANHE he = heap [k]; 1120 ANHE he = heap [k];
932 1121
933 for (;;) 1122 for (;;)
934 { 1123 {
935 int c = k << 1; 1124 int c = k << 1;
936 1125
937 if (c > N + HEAP0 - 1) 1126 if (c >= N + HEAP0)
938 break; 1127 break;
939 1128
940 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1129 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
941 ? 1 : 0; 1130 ? 1 : 0;
942 1131
… …
953 ev_active (ANHE_w (he)) = k; 1142 ev_active (ANHE_w (he)) = k;
954} 1143}
955#endif 1144#endif
956 1145
957/* towards the root */ 1146/* towards the root */
958void inline_speed 1147inline_speed void
959upheap (ANHE *heap, int k) 1148upheap (ANHE *heap, int k)
960{ 1149{
961 ANHE he = heap [k]; 1150 ANHE he = heap [k];
962 1151
963 for (;;) 1152 for (;;)
… …
974 1163
975 heap [k] = he; 1164 heap [k] = he;
976 ev_active (ANHE_w (he)) = k; 1165 ev_active (ANHE_w (he)) = k;
977} 1166}
978 1167
979void inline_size 1168/* move an element suitably so it is in a correct place */
1169inline_size void
980adjustheap (ANHE *heap, int N, int k) 1170adjustheap (ANHE *heap, int N, int k)
981{ 1171{
982 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1172 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
983 upheap (heap, k); 1173 upheap (heap, k);
984 else 1174 else
985 downheap (heap, N, k); 1175 downheap (heap, N, k);
986} 1176}
987 1177
988/* rebuild the heap: this function is used only once and executed rarely */ 1178/* rebuild the heap: this function is used only once and executed rarely */
989void inline_size 1179inline_size void
990reheap (ANHE *heap, int N) 1180reheap (ANHE *heap, int N)
991{ 1181{
992 int i; 1182 int i;
993 1183
994 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 1184 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
… …
997 upheap (heap, i + HEAP0); 1187 upheap (heap, i + HEAP0);
998} 1188}
999 1189
1000/*****************************************************************************/ 1190/*****************************************************************************/
1001 1191
1192/* associate signal watchers to a signal signal */
1002typedef struct 1193typedef struct
1003{ 1194{
1195 EV_ATOMIC_T pending;
1196#if EV_MULTIPLICITY
1197 EV_P;
1198#endif
1004 WL head; 1199 WL head;
1005 EV_ATOMIC_T gotsig;
1006} ANSIG; 1200} ANSIG;
1007 1201
1008static ANSIG *signals; 1202static ANSIG signals [EV_NSIG - 1];
1009static int signalmax;
1010
1011static EV_ATOMIC_T gotsig;
1012 1203
1013/*****************************************************************************/ 1204/*****************************************************************************/
1014 1205
1015void inline_speed 1206/* used to prepare libev internal fd's */
1207/* this is not fork-safe */
1208inline_speed void
1016fd_intern (int fd) 1209fd_intern (int fd)
1017{ 1210{
1018#ifdef _WIN32 1211#ifdef _WIN32
1019 unsigned long arg = 1; 1212 unsigned long arg = 1;
1020 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1213 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1021#else 1214#else
1022 fcntl (fd, F_SETFD, FD_CLOEXEC); 1215 fcntl (fd, F_SETFD, FD_CLOEXEC);
1023 fcntl (fd, F_SETFL, O_NONBLOCK); 1216 fcntl (fd, F_SETFL, O_NONBLOCK);
1024#endif 1217#endif
1025} 1218}
1026 1219
1027static void noinline 1220static void noinline
1028evpipe_init (EV_P) 1221evpipe_init (EV_P)
1029{ 1222{
1030 if (!ev_is_active (&pipeev)) 1223 if (!ev_is_active (&pipe_w))
1031 { 1224 {
1032#if EV_USE_EVENTFD 1225#if EV_USE_EVENTFD
1226 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1227 if (evfd < 0 && errno == EINVAL)
1033 if ((evfd = eventfd (0, 0)) >= 0) 1228 evfd = eventfd (0, 0);
1229
1230 if (evfd >= 0)
1034 { 1231 {
1035 evpipe [0] = -1; 1232 evpipe [0] = -1;
1036 fd_intern (evfd); 1233 fd_intern (evfd); /* doing it twice doesn't hurt */
1037 ev_io_set (&pipeev, evfd, EV_READ); 1234 ev_io_set (&pipe_w, evfd, EV_READ);
1038 } 1235 }
1039 else 1236 else
1040#endif 1237#endif
1041 { 1238 {
1042 while (pipe (evpipe)) 1239 while (pipe (evpipe))
1043 ev_syserr ("(libev) error creating signal/async pipe"); 1240 ev_syserr ("(libev) error creating signal/async pipe");
1044 1241
1045 fd_intern (evpipe [0]); 1242 fd_intern (evpipe [0]);
1046 fd_intern (evpipe [1]); 1243 fd_intern (evpipe [1]);
1047 ev_io_set (&pipeev, evpipe [0], EV_READ); 1244 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1048 } 1245 }
1049 1246
1050 ev_io_start (EV_A_ &pipeev); 1247 ev_io_start (EV_A_ &pipe_w);
1051 ev_unref (EV_A); /* watcher should not keep loop alive */ 1248 ev_unref (EV_A); /* watcher should not keep loop alive */
1052 } 1249 }
1053} 1250}
1054 1251
1055void inline_size 1252inline_size void
1056evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1253evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1057{ 1254{
1058 if (!*flag) 1255 if (!*flag)
1059 { 1256 {
1060 int old_errno = errno; /* save errno because write might clobber it */ 1257 int old_errno = errno; /* save errno because write might clobber it */
… …
1073 1270
1074 errno = old_errno; 1271 errno = old_errno;
1075 } 1272 }
1076} 1273}
1077 1274
1275/* called whenever the libev signal pipe */
1276/* got some events (signal, async) */
1078static void 1277static void
1079pipecb (EV_P_ ev_io *iow, int revents) 1278pipecb (EV_P_ ev_io *iow, int revents)
1080{ 1279{
1280 int i;
1281
1081#if EV_USE_EVENTFD 1282#if EV_USE_EVENTFD
1082 if (evfd >= 0) 1283 if (evfd >= 0)
1083 { 1284 {
1084 uint64_t counter; 1285 uint64_t counter;
1085 read (evfd, &counter, sizeof (uint64_t)); 1286 read (evfd, &counter, sizeof (uint64_t));
… …
1089 { 1290 {
1090 char dummy; 1291 char dummy;
1091 read (evpipe [0], &dummy, 1); 1292 read (evpipe [0], &dummy, 1);
1092 } 1293 }
1093 1294
1094 if (gotsig && ev_is_default_loop (EV_A)) 1295 if (sig_pending)
1095 { 1296 {
1096 int signum; 1297 sig_pending = 0;
1097 gotsig = 0;
1098 1298
1099 for (signum = signalmax; signum--; ) 1299 for (i = EV_NSIG - 1; i--; )
1100 if (signals [signum].gotsig) 1300 if (expect_false (signals [i].pending))
1101 ev_feed_signal_event (EV_A_ signum + 1); 1301 ev_feed_signal_event (EV_A_ i + 1);
1102 } 1302 }
1103 1303
1104#if EV_ASYNC_ENABLE 1304#if EV_ASYNC_ENABLE
1105 if (gotasync) 1305 if (async_pending)
1106 { 1306 {
1107 int i; 1307 async_pending = 0;
1108 gotasync = 0;
1109 1308
1110 for (i = asynccnt; i--; ) 1309 for (i = asynccnt; i--; )
1111 if (asyncs [i]->sent) 1310 if (asyncs [i]->sent)
1112 { 1311 {
1113 asyncs [i]->sent = 0; 1312 asyncs [i]->sent = 0;
… …
1121 1320
1122static void 1321static void
1123ev_sighandler (int signum) 1322ev_sighandler (int signum)
1124{ 1323{
1125#if EV_MULTIPLICITY 1324#if EV_MULTIPLICITY
1126 struct ev_loop *loop = &default_loop_struct; 1325 EV_P = signals [signum - 1].loop;
1127#endif 1326#endif
1128 1327
1129#if _WIN32 1328#ifdef _WIN32
1130 signal (signum, ev_sighandler); 1329 signal (signum, ev_sighandler);
1131#endif 1330#endif
1132 1331
1133 signals [signum - 1].gotsig = 1; 1332 signals [signum - 1].pending = 1;
1134 evpipe_write (EV_A_ &gotsig); 1333 evpipe_write (EV_A_ &sig_pending);
1135} 1334}
1136 1335
1137void noinline 1336void noinline
1138ev_feed_signal_event (EV_P_ int signum) 1337ev_feed_signal_event (EV_P_ int signum)
1139{ 1338{
1140 WL w; 1339 WL w;
1141 1340
1341 if (expect_false (signum <= 0 || signum > EV_NSIG))
1342 return;
1343
1344 --signum;
1345
1142#if EV_MULTIPLICITY 1346#if EV_MULTIPLICITY
1143 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1347 /* it is permissible to try to feed a signal to the wrong loop */
1144#endif 1348 /* or, likely more useful, feeding a signal nobody is waiting for */
1145 1349
1146 --signum; 1350 if (expect_false (signals [signum].loop != EV_A))
1147
1148 if (signum < 0 || signum >= signalmax)
1149 return; 1351 return;
1352#endif
1150 1353
1151 signals [signum].gotsig = 0; 1354 signals [signum].pending = 0;
1152 1355
1153 for (w = signals [signum].head; w; w = w->next) 1356 for (w = signals [signum].head; w; w = w->next)
1154 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1357 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1155} 1358}
1156 1359
1360#if EV_USE_SIGNALFD
1361static void
1362sigfdcb (EV_P_ ev_io *iow, int revents)
1363{
1364 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1365
1366 for (;;)
1367 {
1368 ssize_t res = read (sigfd, si, sizeof (si));
1369
1370 /* not ISO-C, as res might be -1, but works with SuS */
1371 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1372 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1373
1374 if (res < (ssize_t)sizeof (si))
1375 break;
1376 }
1377}
1378#endif
1379
1157/*****************************************************************************/ 1380/*****************************************************************************/
1158 1381
1159static WL childs [EV_PID_HASHSIZE]; 1382static WL childs [EV_PID_HASHSIZE];
1160 1383
1161#ifndef _WIN32 1384#ifndef _WIN32
… …
1164 1387
1165#ifndef WIFCONTINUED 1388#ifndef WIFCONTINUED
1166# define WIFCONTINUED(status) 0 1389# define WIFCONTINUED(status) 0
1167#endif 1390#endif
1168 1391
1169void inline_speed 1392/* handle a single child status event */
1393inline_speed void
1170child_reap (EV_P_ int chain, int pid, int status) 1394child_reap (EV_P_ int chain, int pid, int status)
1171{ 1395{
1172 ev_child *w; 1396 ev_child *w;
1173 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1397 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1174 1398
… …
1187 1411
1188#ifndef WCONTINUED 1412#ifndef WCONTINUED
1189# define WCONTINUED 0 1413# define WCONTINUED 0
1190#endif 1414#endif
1191 1415
1416/* called on sigchld etc., calls waitpid */
1192static void 1417static void
1193childcb (EV_P_ ev_signal *sw, int revents) 1418childcb (EV_P_ ev_signal *sw, int revents)
1194{ 1419{
1195 int pid, status; 1420 int pid, status;
1196 1421
… …
1303ev_backend (EV_P) 1528ev_backend (EV_P)
1304{ 1529{
1305 return backend; 1530 return backend;
1306} 1531}
1307 1532
1533#if EV_MINIMAL < 2
1308unsigned int 1534unsigned int
1309ev_loop_count (EV_P) 1535ev_loop_count (EV_P)
1310{ 1536{
1311 return loop_count; 1537 return loop_count;
1312} 1538}
1313 1539
1540unsigned int
1541ev_loop_depth (EV_P)
1542{
1543 return loop_depth;
1544}
1545
1314void 1546void
1315ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1547ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1316{ 1548{
1317 io_blocktime = interval; 1549 io_blocktime = interval;
1318} 1550}
… …
1321ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1553ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1322{ 1554{
1323 timeout_blocktime = interval; 1555 timeout_blocktime = interval;
1324} 1556}
1325 1557
1558void
1559ev_set_userdata (EV_P_ void *data)
1560{
1561 userdata = data;
1562}
1563
1564void *
1565ev_userdata (EV_P)
1566{
1567 return userdata;
1568}
1569
1570void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1571{
1572 invoke_cb = invoke_pending_cb;
1573}
1574
1575void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1576{
1577 release_cb = release;
1578 acquire_cb = acquire;
1579}
1580#endif
1581
1582/* initialise a loop structure, must be zero-initialised */
1326static void noinline 1583static void noinline
1327loop_init (EV_P_ unsigned int flags) 1584loop_init (EV_P_ unsigned int flags)
1328{ 1585{
1329 if (!backend) 1586 if (!backend)
1330 { 1587 {
… …
1346 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1603 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1347 have_monotonic = 1; 1604 have_monotonic = 1;
1348 } 1605 }
1349#endif 1606#endif
1350 1607
1608 /* pid check not overridable via env */
1609#ifndef _WIN32
1610 if (flags & EVFLAG_FORKCHECK)
1611 curpid = getpid ();
1612#endif
1613
1614 if (!(flags & EVFLAG_NOENV)
1615 && !enable_secure ()
1616 && getenv ("LIBEV_FLAGS"))
1617 flags = atoi (getenv ("LIBEV_FLAGS"));
1618
1351 ev_rt_now = ev_time (); 1619 ev_rt_now = ev_time ();
1352 mn_now = get_clock (); 1620 mn_now = get_clock ();
1353 now_floor = mn_now; 1621 now_floor = mn_now;
1354 rtmn_diff = ev_rt_now - mn_now; 1622 rtmn_diff = ev_rt_now - mn_now;
1623#if EV_MINIMAL < 2
1624 invoke_cb = ev_invoke_pending;
1625#endif
1355 1626
1356 io_blocktime = 0.; 1627 io_blocktime = 0.;
1357 timeout_blocktime = 0.; 1628 timeout_blocktime = 0.;
1358 backend = 0; 1629 backend = 0;
1359 backend_fd = -1; 1630 backend_fd = -1;
1360 gotasync = 0; 1631 sig_pending = 0;
1632#if EV_ASYNC_ENABLE
1633 async_pending = 0;
1634#endif
1361#if EV_USE_INOTIFY 1635#if EV_USE_INOTIFY
1362 fs_fd = -2; 1636 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1363#endif 1637#endif
1364 1638#if EV_USE_SIGNALFD
1365 /* pid check not overridable via env */ 1639 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1366#ifndef _WIN32
1367 if (flags & EVFLAG_FORKCHECK)
1368 curpid = getpid ();
1369#endif 1640#endif
1370
1371 if (!(flags & EVFLAG_NOENV)
1372 && !enable_secure ()
1373 && getenv ("LIBEV_FLAGS"))
1374 flags = atoi (getenv ("LIBEV_FLAGS"));
1375 1641
1376 if (!(flags & 0x0000ffffU)) 1642 if (!(flags & 0x0000ffffU))
1377 flags |= ev_recommended_backends (); 1643 flags |= ev_recommended_backends ();
1378 1644
1379#if EV_USE_PORT 1645#if EV_USE_PORT
… …
1390#endif 1656#endif
1391#if EV_USE_SELECT 1657#if EV_USE_SELECT
1392 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1658 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1393#endif 1659#endif
1394 1660
1661 ev_prepare_init (&pending_w, pendingcb);
1662
1395 ev_init (&pipeev, pipecb); 1663 ev_init (&pipe_w, pipecb);
1396 ev_set_priority (&pipeev, EV_MAXPRI); 1664 ev_set_priority (&pipe_w, EV_MAXPRI);
1397 } 1665 }
1398} 1666}
1399 1667
1668/* free up a loop structure */
1400static void noinline 1669static void noinline
1401loop_destroy (EV_P) 1670loop_destroy (EV_P)
1402{ 1671{
1403 int i; 1672 int i;
1404 1673
1405 if (ev_is_active (&pipeev)) 1674 if (ev_is_active (&pipe_w))
1406 { 1675 {
1407 ev_ref (EV_A); /* signal watcher */ 1676 /*ev_ref (EV_A);*/
1408 ev_io_stop (EV_A_ &pipeev); 1677 /*ev_io_stop (EV_A_ &pipe_w);*/
1409 1678
1410#if EV_USE_EVENTFD 1679#if EV_USE_EVENTFD
1411 if (evfd >= 0) 1680 if (evfd >= 0)
1412 close (evfd); 1681 close (evfd);
1413#endif 1682#endif
1414 1683
1415 if (evpipe [0] >= 0) 1684 if (evpipe [0] >= 0)
1416 { 1685 {
1417 close (evpipe [0]); 1686 EV_WIN32_CLOSE_FD (evpipe [0]);
1418 close (evpipe [1]); 1687 EV_WIN32_CLOSE_FD (evpipe [1]);
1419 } 1688 }
1420 } 1689 }
1690
1691#if EV_USE_SIGNALFD
1692 if (ev_is_active (&sigfd_w))
1693 close (sigfd);
1694#endif
1421 1695
1422#if EV_USE_INOTIFY 1696#if EV_USE_INOTIFY
1423 if (fs_fd >= 0) 1697 if (fs_fd >= 0)
1424 close (fs_fd); 1698 close (fs_fd);
1425#endif 1699#endif
… …
1449#if EV_IDLE_ENABLE 1723#if EV_IDLE_ENABLE
1450 array_free (idle, [i]); 1724 array_free (idle, [i]);
1451#endif 1725#endif
1452 } 1726 }
1453 1727
1454 ev_free (anfds); anfdmax = 0; 1728 ev_free (anfds); anfds = 0; anfdmax = 0;
1455 1729
1456 /* have to use the microsoft-never-gets-it-right macro */ 1730 /* have to use the microsoft-never-gets-it-right macro */
1731 array_free (rfeed, EMPTY);
1457 array_free (fdchange, EMPTY); 1732 array_free (fdchange, EMPTY);
1458 array_free (timer, EMPTY); 1733 array_free (timer, EMPTY);
1459#if EV_PERIODIC_ENABLE 1734#if EV_PERIODIC_ENABLE
1460 array_free (periodic, EMPTY); 1735 array_free (periodic, EMPTY);
1461#endif 1736#endif
… …
1470 1745
1471 backend = 0; 1746 backend = 0;
1472} 1747}
1473 1748
1474#if EV_USE_INOTIFY 1749#if EV_USE_INOTIFY
1475void inline_size infy_fork (EV_P); 1750inline_size void infy_fork (EV_P);
1476#endif 1751#endif
1477 1752
1478void inline_size 1753inline_size void
1479loop_fork (EV_P) 1754loop_fork (EV_P)
1480{ 1755{
1481#if EV_USE_PORT 1756#if EV_USE_PORT
1482 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1757 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1483#endif 1758#endif
… …
1489#endif 1764#endif
1490#if EV_USE_INOTIFY 1765#if EV_USE_INOTIFY
1491 infy_fork (EV_A); 1766 infy_fork (EV_A);
1492#endif 1767#endif
1493 1768
1494 if (ev_is_active (&pipeev)) 1769 if (ev_is_active (&pipe_w))
1495 { 1770 {
1496 /* this "locks" the handlers against writing to the pipe */ 1771 /* this "locks" the handlers against writing to the pipe */
1497 /* while we modify the fd vars */ 1772 /* while we modify the fd vars */
1498 gotsig = 1; 1773 sig_pending = 1;
1499#if EV_ASYNC_ENABLE 1774#if EV_ASYNC_ENABLE
1500 gotasync = 1; 1775 async_pending = 1;
1501#endif 1776#endif
1502 1777
1503 ev_ref (EV_A); 1778 ev_ref (EV_A);
1504 ev_io_stop (EV_A_ &pipeev); 1779 ev_io_stop (EV_A_ &pipe_w);
1505 1780
1506#if EV_USE_EVENTFD 1781#if EV_USE_EVENTFD
1507 if (evfd >= 0) 1782 if (evfd >= 0)
1508 close (evfd); 1783 close (evfd);
1509#endif 1784#endif
1510 1785
1511 if (evpipe [0] >= 0) 1786 if (evpipe [0] >= 0)
1512 { 1787 {
1513 close (evpipe [0]); 1788 EV_WIN32_CLOSE_FD (evpipe [0]);
1514 close (evpipe [1]); 1789 EV_WIN32_CLOSE_FD (evpipe [1]);
1515 } 1790 }
1516 1791
1517 evpipe_init (EV_A); 1792 evpipe_init (EV_A);
1518 /* now iterate over everything, in case we missed something */ 1793 /* now iterate over everything, in case we missed something */
1519 pipecb (EV_A_ &pipeev, EV_READ); 1794 pipecb (EV_A_ &pipe_w, EV_READ);
1520 } 1795 }
1521 1796
1522 postfork = 0; 1797 postfork = 0;
1523} 1798}
1524 1799
1525#if EV_MULTIPLICITY 1800#if EV_MULTIPLICITY
1526 1801
1527struct ev_loop * 1802struct ev_loop *
1528ev_loop_new (unsigned int flags) 1803ev_loop_new (unsigned int flags)
1529{ 1804{
1530 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1805 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1531 1806
1532 memset (loop, 0, sizeof (struct ev_loop)); 1807 memset (EV_A, 0, sizeof (struct ev_loop));
1533
1534 loop_init (EV_A_ flags); 1808 loop_init (EV_A_ flags);
1535 1809
1536 if (ev_backend (EV_A)) 1810 if (ev_backend (EV_A))
1537 return loop; 1811 return EV_A;
1538 1812
1539 return 0; 1813 return 0;
1540} 1814}
1541 1815
1542void 1816void
… …
1549void 1823void
1550ev_loop_fork (EV_P) 1824ev_loop_fork (EV_P)
1551{ 1825{
1552 postfork = 1; /* must be in line with ev_default_fork */ 1826 postfork = 1; /* must be in line with ev_default_fork */
1553} 1827}
1828#endif /* multiplicity */
1554 1829
1555#if EV_VERIFY 1830#if EV_VERIFY
1556static void noinline 1831static void noinline
1557verify_watcher (EV_P_ W w) 1832verify_watcher (EV_P_ W w)
1558{ 1833{
… …
1586 verify_watcher (EV_A_ ws [cnt]); 1861 verify_watcher (EV_A_ ws [cnt]);
1587 } 1862 }
1588} 1863}
1589#endif 1864#endif
1590 1865
1866#if EV_MINIMAL < 2
1591void 1867void
1592ev_loop_verify (EV_P) 1868ev_loop_verify (EV_P)
1593{ 1869{
1594#if EV_VERIFY 1870#if EV_VERIFY
1595 int i; 1871 int i;
… …
1644 assert (checkmax >= checkcnt); 1920 assert (checkmax >= checkcnt);
1645 array_verify (EV_A_ (W *)checks, checkcnt); 1921 array_verify (EV_A_ (W *)checks, checkcnt);
1646 1922
1647# if 0 1923# if 0
1648 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1924 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) 1925 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1650# endif
1651#endif 1926# endif
1927#endif
1652} 1928}
1653 1929#endif
1654#endif /* multiplicity */
1655 1930
1656#if EV_MULTIPLICITY 1931#if EV_MULTIPLICITY
1657struct ev_loop * 1932struct ev_loop *
1658ev_default_loop_init (unsigned int flags) 1933ev_default_loop_init (unsigned int flags)
1659#else 1934#else
… …
1662#endif 1937#endif
1663{ 1938{
1664 if (!ev_default_loop_ptr) 1939 if (!ev_default_loop_ptr)
1665 { 1940 {
1666#if EV_MULTIPLICITY 1941#if EV_MULTIPLICITY
1667 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1942 EV_P = ev_default_loop_ptr = &default_loop_struct;
1668#else 1943#else
1669 ev_default_loop_ptr = 1; 1944 ev_default_loop_ptr = 1;
1670#endif 1945#endif
1671 1946
1672 loop_init (EV_A_ flags); 1947 loop_init (EV_A_ flags);
… …
1689 1964
1690void 1965void
1691ev_default_destroy (void) 1966ev_default_destroy (void)
1692{ 1967{
1693#if EV_MULTIPLICITY 1968#if EV_MULTIPLICITY
1694 struct ev_loop *loop = ev_default_loop_ptr; 1969 EV_P = ev_default_loop_ptr;
1695#endif 1970#endif
1696 1971
1697 ev_default_loop_ptr = 0; 1972 ev_default_loop_ptr = 0;
1698 1973
1699#ifndef _WIN32 1974#ifndef _WIN32
… …
1706 1981
1707void 1982void
1708ev_default_fork (void) 1983ev_default_fork (void)
1709{ 1984{
1710#if EV_MULTIPLICITY 1985#if EV_MULTIPLICITY
1711 struct ev_loop *loop = ev_default_loop_ptr; 1986 EV_P = ev_default_loop_ptr;
1712#endif 1987#endif
1713 1988
1714 postfork = 1; /* must be in line with ev_loop_fork */ 1989 postfork = 1; /* must be in line with ev_loop_fork */
1715} 1990}
1716 1991
… …
1720ev_invoke (EV_P_ void *w, int revents) 1995ev_invoke (EV_P_ void *w, int revents)
1721{ 1996{
1722 EV_CB_INVOKE ((W)w, revents); 1997 EV_CB_INVOKE ((W)w, revents);
1723} 1998}
1724 1999
1725void inline_speed 2000unsigned int
1726call_pending (EV_P) 2001ev_pending_count (EV_P)
2002{
2003 int pri;
2004 unsigned int count = 0;
2005
2006 for (pri = NUMPRI; pri--; )
2007 count += pendingcnt [pri];
2008
2009 return count;
2010}
2011
2012void noinline
2013ev_invoke_pending (EV_P)
1727{ 2014{
1728 int pri; 2015 int pri;
1729 2016
1730 for (pri = NUMPRI; pri--; ) 2017 for (pri = NUMPRI; pri--; )
1731 while (pendingcnt [pri]) 2018 while (pendingcnt [pri])
1732 { 2019 {
1733 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2020 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1734 2021
1735 if (expect_true (p->w))
1736 {
1737 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/ 2022 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
2023 /* ^ this is no longer true, as pending_w could be here */
1738 2024
1739 p->w->pending = 0; 2025 p->w->pending = 0;
1740 EV_CB_INVOKE (p->w, p->events); 2026 EV_CB_INVOKE (p->w, p->events);
1741 EV_FREQUENT_CHECK; 2027 EV_FREQUENT_CHECK;
1742 }
1743 } 2028 }
1744} 2029}
1745 2030
1746#if EV_IDLE_ENABLE 2031#if EV_IDLE_ENABLE
1747void inline_size 2032/* make idle watchers pending. this handles the "call-idle */
2033/* only when higher priorities are idle" logic */
2034inline_size void
1748idle_reify (EV_P) 2035idle_reify (EV_P)
1749{ 2036{
1750 if (expect_false (idleall)) 2037 if (expect_false (idleall))
1751 { 2038 {
1752 int pri; 2039 int pri;
… …
1764 } 2051 }
1765 } 2052 }
1766} 2053}
1767#endif 2054#endif
1768 2055
1769void inline_size 2056/* make timers pending */
2057inline_size void
1770timers_reify (EV_P) 2058timers_reify (EV_P)
1771{ 2059{
1772 EV_FREQUENT_CHECK; 2060 EV_FREQUENT_CHECK;
1773 2061
1774 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 2062 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1775 { 2063 {
1776 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 2064 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 { 2065 {
2066 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
2067
2068 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
2069
2070 /* first reschedule or stop timer */
2071 if (w->repeat)
2072 {
1783 ev_at (w) += w->repeat; 2073 ev_at (w) += w->repeat;
1784 if (ev_at (w) < mn_now) 2074 if (ev_at (w) < mn_now)
1785 ev_at (w) = mn_now; 2075 ev_at (w) = mn_now;
1786 2076
1787 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 2077 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1788 2078
1789 ANHE_at_cache (timers [HEAP0]); 2079 ANHE_at_cache (timers [HEAP0]);
1790 downheap (timers, timercnt, HEAP0); 2080 downheap (timers, timercnt, HEAP0);
2081 }
2082 else
2083 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
2084
2085 EV_FREQUENT_CHECK;
2086 feed_reverse (EV_A_ (W)w);
1791 } 2087 }
1792 else 2088 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1793 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1794 2089
1795 EV_FREQUENT_CHECK;
1796 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 2090 feed_reverse_done (EV_A_ EV_TIMEOUT);
1797 } 2091 }
1798} 2092}
1799 2093
1800#if EV_PERIODIC_ENABLE 2094#if EV_PERIODIC_ENABLE
1801void inline_size 2095/* make periodics pending */
2096inline_size void
1802periodics_reify (EV_P) 2097periodics_reify (EV_P)
1803{ 2098{
1804 EV_FREQUENT_CHECK; 2099 EV_FREQUENT_CHECK;
1805 2100
1806 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2101 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1807 { 2102 {
1808 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2103 int feed_count = 0;
1809 2104
1810 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/ 2105 do
1811
1812 /* first reschedule or stop timer */
1813 if (w->reschedule_cb)
1814 { 2106 {
2107 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2108
2109 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
2110
2111 /* first reschedule or stop timer */
2112 if (w->reschedule_cb)
2113 {
1815 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2114 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1816 2115
1817 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 2116 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1818 2117
1819 ANHE_at_cache (periodics [HEAP0]); 2118 ANHE_at_cache (periodics [HEAP0]);
1820 downheap (periodics, periodiccnt, HEAP0); 2119 downheap (periodics, periodiccnt, HEAP0);
2120 }
2121 else if (w->interval)
2122 {
2123 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2124 /* if next trigger time is not sufficiently in the future, put it there */
2125 /* this might happen because of floating point inexactness */
2126 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2127 {
2128 ev_at (w) += w->interval;
2129
2130 /* if interval is unreasonably low we might still have a time in the past */
2131 /* so correct this. this will make the periodic very inexact, but the user */
2132 /* has effectively asked to get triggered more often than possible */
2133 if (ev_at (w) < ev_rt_now)
2134 ev_at (w) = ev_rt_now;
2135 }
2136
2137 ANHE_at_cache (periodics [HEAP0]);
2138 downheap (periodics, periodiccnt, HEAP0);
2139 }
2140 else
2141 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
2142
2143 EV_FREQUENT_CHECK;
2144 feed_reverse (EV_A_ (W)w);
1821 } 2145 }
1822 else if (w->interval) 2146 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 2147
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); 2148 feed_reverse_done (EV_A_ EV_PERIODIC);
1846 } 2149 }
1847} 2150}
1848 2151
2152/* simply recalculate all periodics */
2153/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1849static void noinline 2154static void noinline
1850periodics_reschedule (EV_P) 2155periodics_reschedule (EV_P)
1851{ 2156{
1852 int i; 2157 int i;
1853 2158
… …
1866 2171
1867 reheap (periodics, periodiccnt); 2172 reheap (periodics, periodiccnt);
1868} 2173}
1869#endif 2174#endif
1870 2175
1871void inline_speed 2176/* adjust all timers by a given offset */
2177static void noinline
2178timers_reschedule (EV_P_ ev_tstamp adjust)
2179{
2180 int i;
2181
2182 for (i = 0; i < timercnt; ++i)
2183 {
2184 ANHE *he = timers + i + HEAP0;
2185 ANHE_w (*he)->at += adjust;
2186 ANHE_at_cache (*he);
2187 }
2188}
2189
2190/* fetch new monotonic and realtime times from the kernel */
2191/* also detect if there was a timejump, and act accordingly */
2192inline_speed void
1872time_update (EV_P_ ev_tstamp max_block) 2193time_update (EV_P_ ev_tstamp max_block)
1873{ 2194{
1874 int i;
1875
1876#if EV_USE_MONOTONIC 2195#if EV_USE_MONOTONIC
1877 if (expect_true (have_monotonic)) 2196 if (expect_true (have_monotonic))
1878 { 2197 {
2198 int i;
1879 ev_tstamp odiff = rtmn_diff; 2199 ev_tstamp odiff = rtmn_diff;
1880 2200
1881 mn_now = get_clock (); 2201 mn_now = get_clock ();
1882 2202
1883 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2203 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1909 ev_rt_now = ev_time (); 2229 ev_rt_now = ev_time ();
1910 mn_now = get_clock (); 2230 mn_now = get_clock ();
1911 now_floor = mn_now; 2231 now_floor = mn_now;
1912 } 2232 }
1913 2233
2234 /* no timer adjustment, as the monotonic clock doesn't jump */
2235 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1914# if EV_PERIODIC_ENABLE 2236# if EV_PERIODIC_ENABLE
1915 periodics_reschedule (EV_A); 2237 periodics_reschedule (EV_A);
1916# endif 2238# endif
1917 /* no timer adjustment, as the monotonic clock doesn't jump */
1918 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1919 } 2239 }
1920 else 2240 else
1921#endif 2241#endif
1922 { 2242 {
1923 ev_rt_now = ev_time (); 2243 ev_rt_now = ev_time ();
1924 2244
1925 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 2245 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1926 { 2246 {
2247 /* adjust timers. this is easy, as the offset is the same for all of them */
2248 timers_reschedule (EV_A_ ev_rt_now - mn_now);
1927#if EV_PERIODIC_ENABLE 2249#if EV_PERIODIC_ENABLE
1928 periodics_reschedule (EV_A); 2250 periodics_reschedule (EV_A);
1929#endif 2251#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 } 2252 }
1938 2253
1939 mn_now = ev_rt_now; 2254 mn_now = ev_rt_now;
1940 } 2255 }
1941} 2256}
1942 2257
1943void 2258void
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) 2259ev_loop (EV_P_ int flags)
1965{ 2260{
2261#if EV_MINIMAL < 2
2262 ++loop_depth;
2263#endif
2264
2265 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2266
1966 loop_done = EVUNLOOP_CANCEL; 2267 loop_done = EVUNLOOP_CANCEL;
1967 2268
1968 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2269 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1969 2270
1970 do 2271 do
1971 { 2272 {
1972#if EV_VERIFY >= 2 2273#if EV_VERIFY >= 2
1973 ev_loop_verify (EV_A); 2274 ev_loop_verify (EV_A);
… …
1986 /* we might have forked, so queue fork handlers */ 2287 /* we might have forked, so queue fork handlers */
1987 if (expect_false (postfork)) 2288 if (expect_false (postfork))
1988 if (forkcnt) 2289 if (forkcnt)
1989 { 2290 {
1990 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2291 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1991 call_pending (EV_A); 2292 EV_INVOKE_PENDING;
1992 } 2293 }
1993#endif 2294#endif
1994 2295
1995 /* queue prepare watchers (and execute them) */ 2296 /* queue prepare watchers (and execute them) */
1996 if (expect_false (preparecnt)) 2297 if (expect_false (preparecnt))
1997 { 2298 {
1998 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2299 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1999 call_pending (EV_A); 2300 EV_INVOKE_PENDING;
2000 } 2301 }
2302
2303 if (expect_false (loop_done))
2304 break;
2001 2305
2002 /* we might have forked, so reify kernel state if necessary */ 2306 /* we might have forked, so reify kernel state if necessary */
2003 if (expect_false (postfork)) 2307 if (expect_false (postfork))
2004 loop_fork (EV_A); 2308 loop_fork (EV_A);
2005 2309
… …
2011 ev_tstamp waittime = 0.; 2315 ev_tstamp waittime = 0.;
2012 ev_tstamp sleeptime = 0.; 2316 ev_tstamp sleeptime = 0.;
2013 2317
2014 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2318 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2015 { 2319 {
2320 /* remember old timestamp for io_blocktime calculation */
2321 ev_tstamp prev_mn_now = mn_now;
2322
2016 /* update time to cancel out callback processing overhead */ 2323 /* update time to cancel out callback processing overhead */
2017 time_update (EV_A_ 1e100); 2324 time_update (EV_A_ 1e100);
2018 2325
2019 waittime = MAX_BLOCKTIME; 2326 waittime = MAX_BLOCKTIME;
2020 2327
… …
2030 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2337 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2031 if (waittime > to) waittime = to; 2338 if (waittime > to) waittime = to;
2032 } 2339 }
2033#endif 2340#endif
2034 2341
2342 /* don't let timeouts decrease the waittime below timeout_blocktime */
2035 if (expect_false (waittime < timeout_blocktime)) 2343 if (expect_false (waittime < timeout_blocktime))
2036 waittime = timeout_blocktime; 2344 waittime = timeout_blocktime;
2037 2345
2038 sleeptime = waittime - backend_fudge; 2346 /* extra check because io_blocktime is commonly 0 */
2039
2040 if (expect_true (sleeptime > io_blocktime)) 2347 if (expect_false (io_blocktime))
2041 sleeptime = io_blocktime;
2042
2043 if (sleeptime)
2044 { 2348 {
2349 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2350
2351 if (sleeptime > waittime - backend_fudge)
2352 sleeptime = waittime - backend_fudge;
2353
2354 if (expect_true (sleeptime > 0.))
2355 {
2045 ev_sleep (sleeptime); 2356 ev_sleep (sleeptime);
2046 waittime -= sleeptime; 2357 waittime -= sleeptime;
2358 }
2047 } 2359 }
2048 } 2360 }
2049 2361
2362#if EV_MINIMAL < 2
2050 ++loop_count; 2363 ++loop_count;
2364#endif
2365 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2051 backend_poll (EV_A_ waittime); 2366 backend_poll (EV_A_ waittime);
2367 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2052 2368
2053 /* update ev_rt_now, do magic */ 2369 /* update ev_rt_now, do magic */
2054 time_update (EV_A_ waittime + sleeptime); 2370 time_update (EV_A_ waittime + sleeptime);
2055 } 2371 }
2056 2372
… …
2067 2383
2068 /* queue check watchers, to be executed first */ 2384 /* queue check watchers, to be executed first */
2069 if (expect_false (checkcnt)) 2385 if (expect_false (checkcnt))
2070 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2386 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2071 2387
2072 call_pending (EV_A); 2388 EV_INVOKE_PENDING;
2073 } 2389 }
2074 while (expect_true ( 2390 while (expect_true (
2075 activecnt 2391 activecnt
2076 && !loop_done 2392 && !loop_done
2077 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2393 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2078 )); 2394 ));
2079 2395
2080 if (loop_done == EVUNLOOP_ONE) 2396 if (loop_done == EVUNLOOP_ONE)
2081 loop_done = EVUNLOOP_CANCEL; 2397 loop_done = EVUNLOOP_CANCEL;
2398
2399#if EV_MINIMAL < 2
2400 --loop_depth;
2401#endif
2082} 2402}
2083 2403
2084void 2404void
2085ev_unloop (EV_P_ int how) 2405ev_unloop (EV_P_ int how)
2086{ 2406{
2087 loop_done = how; 2407 loop_done = how;
2088} 2408}
2089 2409
2410void
2411ev_ref (EV_P)
2412{
2413 ++activecnt;
2414}
2415
2416void
2417ev_unref (EV_P)
2418{
2419 --activecnt;
2420}
2421
2422void
2423ev_now_update (EV_P)
2424{
2425 time_update (EV_A_ 1e100);
2426}
2427
2428void
2429ev_suspend (EV_P)
2430{
2431 ev_now_update (EV_A);
2432}
2433
2434void
2435ev_resume (EV_P)
2436{
2437 ev_tstamp mn_prev = mn_now;
2438
2439 ev_now_update (EV_A);
2440 timers_reschedule (EV_A_ mn_now - mn_prev);
2441#if EV_PERIODIC_ENABLE
2442 /* TODO: really do this? */
2443 periodics_reschedule (EV_A);
2444#endif
2445}
2446
2090/*****************************************************************************/ 2447/*****************************************************************************/
2448/* singly-linked list management, used when the expected list length is short */
2091 2449
2092void inline_size 2450inline_size void
2093wlist_add (WL *head, WL elem) 2451wlist_add (WL *head, WL elem)
2094{ 2452{
2095 elem->next = *head; 2453 elem->next = *head;
2096 *head = elem; 2454 *head = elem;
2097} 2455}
2098 2456
2099void inline_size 2457inline_size void
2100wlist_del (WL *head, WL elem) 2458wlist_del (WL *head, WL elem)
2101{ 2459{
2102 while (*head) 2460 while (*head)
2103 { 2461 {
2104 if (*head == elem) 2462 if (expect_true (*head == elem))
2105 { 2463 {
2106 *head = elem->next; 2464 *head = elem->next;
2107 return; 2465 break;
2108 } 2466 }
2109 2467
2110 head = &(*head)->next; 2468 head = &(*head)->next;
2111 } 2469 }
2112} 2470}
2113 2471
2114void inline_speed 2472/* internal, faster, version of ev_clear_pending */
2473inline_speed void
2115clear_pending (EV_P_ W w) 2474clear_pending (EV_P_ W w)
2116{ 2475{
2117 if (w->pending) 2476 if (w->pending)
2118 { 2477 {
2119 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2478 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2120 w->pending = 0; 2479 w->pending = 0;
2121 } 2480 }
2122} 2481}
2123 2482
2124int 2483int
… …
2128 int pending = w_->pending; 2487 int pending = w_->pending;
2129 2488
2130 if (expect_true (pending)) 2489 if (expect_true (pending))
2131 { 2490 {
2132 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2491 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2492 p->w = (W)&pending_w;
2133 w_->pending = 0; 2493 w_->pending = 0;
2134 p->w = 0;
2135 return p->events; 2494 return p->events;
2136 } 2495 }
2137 else 2496 else
2138 return 0; 2497 return 0;
2139} 2498}
2140 2499
2141void inline_size 2500inline_size void
2142pri_adjust (EV_P_ W w) 2501pri_adjust (EV_P_ W w)
2143{ 2502{
2144 int pri = w->priority; 2503 int pri = ev_priority (w);
2145 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2504 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2146 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2505 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2147 w->priority = pri; 2506 ev_set_priority (w, pri);
2148} 2507}
2149 2508
2150void inline_speed 2509inline_speed void
2151ev_start (EV_P_ W w, int active) 2510ev_start (EV_P_ W w, int active)
2152{ 2511{
2153 pri_adjust (EV_A_ w); 2512 pri_adjust (EV_A_ w);
2154 w->active = active; 2513 w->active = active;
2155 ev_ref (EV_A); 2514 ev_ref (EV_A);
2156} 2515}
2157 2516
2158void inline_size 2517inline_size void
2159ev_stop (EV_P_ W w) 2518ev_stop (EV_P_ W w)
2160{ 2519{
2161 ev_unref (EV_A); 2520 ev_unref (EV_A);
2162 w->active = 0; 2521 w->active = 0;
2163} 2522}
… …
2171 2530
2172 if (expect_false (ev_is_active (w))) 2531 if (expect_false (ev_is_active (w)))
2173 return; 2532 return;
2174 2533
2175 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2534 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)))); 2535 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2177 2536
2178 EV_FREQUENT_CHECK; 2537 EV_FREQUENT_CHECK;
2179 2538
2180 ev_start (EV_A_ (W)w, 1); 2539 ev_start (EV_A_ (W)w, 1);
2181 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2540 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2182 wlist_add (&anfds[fd].head, (WL)w); 2541 wlist_add (&anfds[fd].head, (WL)w);
2183 2542
2184 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2543 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2185 w->events &= ~EV__IOFDSET; 2544 w->events &= ~EV__IOFDSET;
2186 2545
2187 EV_FREQUENT_CHECK; 2546 EV_FREQUENT_CHECK;
2188} 2547}
2189 2548
… …
2251 timers [active] = timers [timercnt + HEAP0]; 2610 timers [active] = timers [timercnt + HEAP0];
2252 adjustheap (timers, timercnt, active); 2611 adjustheap (timers, timercnt, active);
2253 } 2612 }
2254 } 2613 }
2255 2614
2256 EV_FREQUENT_CHECK;
2257
2258 ev_at (w) -= mn_now; 2615 ev_at (w) -= mn_now;
2259 2616
2260 ev_stop (EV_A_ (W)w); 2617 ev_stop (EV_A_ (W)w);
2618
2619 EV_FREQUENT_CHECK;
2261} 2620}
2262 2621
2263void noinline 2622void noinline
2264ev_timer_again (EV_P_ ev_timer *w) 2623ev_timer_again (EV_P_ ev_timer *w)
2265{ 2624{
… …
2283 } 2642 }
2284 2643
2285 EV_FREQUENT_CHECK; 2644 EV_FREQUENT_CHECK;
2286} 2645}
2287 2646
2647ev_tstamp
2648ev_timer_remaining (EV_P_ ev_timer *w)
2649{
2650 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2651}
2652
2288#if EV_PERIODIC_ENABLE 2653#if EV_PERIODIC_ENABLE
2289void noinline 2654void noinline
2290ev_periodic_start (EV_P_ ev_periodic *w) 2655ev_periodic_start (EV_P_ ev_periodic *w)
2291{ 2656{
2292 if (expect_false (ev_is_active (w))) 2657 if (expect_false (ev_is_active (w)))
… …
2338 periodics [active] = periodics [periodiccnt + HEAP0]; 2703 periodics [active] = periodics [periodiccnt + HEAP0];
2339 adjustheap (periodics, periodiccnt, active); 2704 adjustheap (periodics, periodiccnt, active);
2340 } 2705 }
2341 } 2706 }
2342 2707
2343 EV_FREQUENT_CHECK;
2344
2345 ev_stop (EV_A_ (W)w); 2708 ev_stop (EV_A_ (W)w);
2709
2710 EV_FREQUENT_CHECK;
2346} 2711}
2347 2712
2348void noinline 2713void noinline
2349ev_periodic_again (EV_P_ ev_periodic *w) 2714ev_periodic_again (EV_P_ ev_periodic *w)
2350{ 2715{
… …
2359#endif 2724#endif
2360 2725
2361void noinline 2726void noinline
2362ev_signal_start (EV_P_ ev_signal *w) 2727ev_signal_start (EV_P_ ev_signal *w)
2363{ 2728{
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))) 2729 if (expect_false (ev_is_active (w)))
2368 return; 2730 return;
2369 2731
2370 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2732 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2371 2733
2372 evpipe_init (EV_A); 2734#if EV_MULTIPLICITY
2735 assert (("libev: a signal must not be attached to two different loops",
2736 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2373 2737
2374 EV_FREQUENT_CHECK; 2738 signals [w->signum - 1].loop = EV_A;
2739#endif
2375 2740
2741 EV_FREQUENT_CHECK;
2742
2743#if EV_USE_SIGNALFD
2744 if (sigfd == -2)
2376 { 2745 {
2377#ifndef _WIN32 2746 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2378 sigset_t full, prev; 2747 if (sigfd < 0 && errno == EINVAL)
2379 sigfillset (&full); 2748 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2380 sigprocmask (SIG_SETMASK, &full, &prev);
2381#endif
2382 2749
2383 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2750 if (sigfd >= 0)
2751 {
2752 fd_intern (sigfd); /* doing it twice will not hurt */
2384 2753
2385#ifndef _WIN32 2754 sigemptyset (&sigfd_set);
2386 sigprocmask (SIG_SETMASK, &prev, 0); 2755
2387#endif 2756 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2757 ev_set_priority (&sigfd_w, EV_MAXPRI);
2758 ev_io_start (EV_A_ &sigfd_w);
2759 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2760 }
2388 } 2761 }
2762
2763 if (sigfd >= 0)
2764 {
2765 /* TODO: check .head */
2766 sigaddset (&sigfd_set, w->signum);
2767 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2768
2769 signalfd (sigfd, &sigfd_set, 0);
2770 }
2771#endif
2389 2772
2390 ev_start (EV_A_ (W)w, 1); 2773 ev_start (EV_A_ (W)w, 1);
2391 wlist_add (&signals [w->signum - 1].head, (WL)w); 2774 wlist_add (&signals [w->signum - 1].head, (WL)w);
2392 2775
2393 if (!((WL)w)->next) 2776 if (!((WL)w)->next)
2777# if EV_USE_SIGNALFD
2778 if (sigfd < 0) /*TODO*/
2779# endif
2394 { 2780 {
2395#if _WIN32 2781# ifdef _WIN32
2782 evpipe_init (EV_A);
2783
2396 signal (w->signum, ev_sighandler); 2784 signal (w->signum, ev_sighandler);
2397#else 2785# else
2398 struct sigaction sa; 2786 struct sigaction sa;
2787
2788 evpipe_init (EV_A);
2789
2399 sa.sa_handler = ev_sighandler; 2790 sa.sa_handler = ev_sighandler;
2400 sigfillset (&sa.sa_mask); 2791 sigfillset (&sa.sa_mask);
2401 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2792 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2402 sigaction (w->signum, &sa, 0); 2793 sigaction (w->signum, &sa, 0);
2794
2795 sigemptyset (&sa.sa_mask);
2796 sigaddset (&sa.sa_mask, w->signum);
2797 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2403#endif 2798#endif
2404 } 2799 }
2405 2800
2406 EV_FREQUENT_CHECK; 2801 EV_FREQUENT_CHECK;
2407} 2802}
2408 2803
2409void noinline 2804void noinline
… …
2417 2812
2418 wlist_del (&signals [w->signum - 1].head, (WL)w); 2813 wlist_del (&signals [w->signum - 1].head, (WL)w);
2419 ev_stop (EV_A_ (W)w); 2814 ev_stop (EV_A_ (W)w);
2420 2815
2421 if (!signals [w->signum - 1].head) 2816 if (!signals [w->signum - 1].head)
2817 {
2818#if EV_MULTIPLICITY
2819 signals [w->signum - 1].loop = 0; /* unattach from signal */
2820#endif
2821#if EV_USE_SIGNALFD
2822 if (sigfd >= 0)
2823 {
2824 sigset_t ss;
2825
2826 sigemptyset (&ss);
2827 sigaddset (&ss, w->signum);
2828 sigdelset (&sigfd_set, w->signum);
2829
2830 signalfd (sigfd, &sigfd_set, 0);
2831 sigprocmask (SIG_UNBLOCK, &ss, 0);
2832 }
2833 else
2834#endif
2422 signal (w->signum, SIG_DFL); 2835 signal (w->signum, SIG_DFL);
2836 }
2423 2837
2424 EV_FREQUENT_CHECK; 2838 EV_FREQUENT_CHECK;
2425} 2839}
2426 2840
2427void 2841void
… …
2468#define MIN_STAT_INTERVAL 0.1074891 2882#define MIN_STAT_INTERVAL 0.1074891
2469 2883
2470static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2884static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2471 2885
2472#if EV_USE_INOTIFY 2886#if EV_USE_INOTIFY
2473# define EV_INOTIFY_BUFSIZE 8192 2887
2888/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2889# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2474 2890
2475static void noinline 2891static void noinline
2476infy_add (EV_P_ ev_stat *w) 2892infy_add (EV_P_ ev_stat *w)
2477{ 2893{
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); 2894 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 2895
2480 if (w->wd < 0) 2896 if (w->wd >= 0)
2897 {
2898 struct statfs sfs;
2899
2900 /* now local changes will be tracked by inotify, but remote changes won't */
2901 /* unless the filesystem is known to be local, we therefore still poll */
2902 /* also do poll on <2.6.25, but with normal frequency */
2903
2904 if (!fs_2625)
2905 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2906 else if (!statfs (w->path, &sfs)
2907 && (sfs.f_type == 0x1373 /* devfs */
2908 || sfs.f_type == 0xEF53 /* ext2/3 */
2909 || sfs.f_type == 0x3153464a /* jfs */
2910 || sfs.f_type == 0x52654973 /* reiser3 */
2911 || sfs.f_type == 0x01021994 /* tempfs */
2912 || sfs.f_type == 0x58465342 /* xfs */))
2913 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2914 else
2915 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2481 { 2916 }
2917 else
2918 {
2919 /* can't use inotify, continue to stat */
2482 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2920 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 2921
2485 /* monitor some parent directory for speedup hints */ 2922 /* 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, */ 2923 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2487 /* but an efficiency issue only */ 2924 /* but an efficiency issue only */
2488 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2925 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2489 { 2926 {
2490 char path [4096]; 2927 char path [4096];
… …
2506 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2943 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2507 } 2944 }
2508 } 2945 }
2509 2946
2510 if (w->wd >= 0) 2947 if (w->wd >= 0)
2511 {
2512 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2948 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2513 2949
2514 /* now local changes will be tracked by inotify, but remote changes won't */ 2950 /* now re-arm timer, if required */
2515 /* unless the filesystem it known to be local, we therefore still poll */ 2951 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); 2952 ev_timer_again (EV_A_ &w->timer);
2530 } 2953 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2531} 2954}
2532 2955
2533static void noinline 2956static void noinline
2534infy_del (EV_P_ ev_stat *w) 2957infy_del (EV_P_ ev_stat *w)
2535{ 2958{
… …
2580 3003
2581static void 3004static void
2582infy_cb (EV_P_ ev_io *w, int revents) 3005infy_cb (EV_P_ ev_io *w, int revents)
2583{ 3006{
2584 char buf [EV_INOTIFY_BUFSIZE]; 3007 char buf [EV_INOTIFY_BUFSIZE];
2585 struct inotify_event *ev = (struct inotify_event *)buf;
2586 int ofs; 3008 int ofs;
2587 int len = read (fs_fd, buf, sizeof (buf)); 3009 int len = read (fs_fd, buf, sizeof (buf));
2588 3010
2589 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3011 for (ofs = 0; ofs < len; )
3012 {
3013 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2590 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3014 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3015 ofs += sizeof (struct inotify_event) + ev->len;
3016 }
2591} 3017}
2592 3018
2593void inline_size 3019inline_size unsigned int
3020ev_linux_version (void)
3021{
3022 struct utsname buf;
3023 unsigned int v;
3024 int i;
3025 char *p = buf.release;
3026
3027 if (uname (&buf))
3028 return 0;
3029
3030 for (i = 3+1; --i; )
3031 {
3032 unsigned int c = 0;
3033
3034 for (;;)
3035 {
3036 if (*p >= '0' && *p <= '9')
3037 c = c * 10 + *p++ - '0';
3038 else
3039 {
3040 p += *p == '.';
3041 break;
3042 }
3043 }
3044
3045 v = (v << 8) | c;
3046 }
3047
3048 return v;
3049}
3050
3051inline_size void
2594check_2625 (EV_P) 3052ev_check_2625 (EV_P)
2595{ 3053{
2596 /* kernels < 2.6.25 are borked 3054 /* kernels < 2.6.25 are borked
2597 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3055 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2598 */ 3056 */
2599 struct utsname buf; 3057 if (ev_linux_version () < 0x020619)
2600 int major, minor, micro;
2601
2602 if (uname (&buf))
2603 return; 3058 return;
2604 3059
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; 3060 fs_2625 = 1;
2614} 3061}
2615 3062
2616void inline_size 3063inline_size int
3064infy_newfd (void)
3065{
3066#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3067 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3068 if (fd >= 0)
3069 return fd;
3070#endif
3071 return inotify_init ();
3072}
3073
3074inline_size void
2617infy_init (EV_P) 3075infy_init (EV_P)
2618{ 3076{
2619 if (fs_fd != -2) 3077 if (fs_fd != -2)
2620 return; 3078 return;
2621 3079
2622 fs_fd = -1; 3080 fs_fd = -1;
2623 3081
2624 check_2625 (EV_A); 3082 ev_check_2625 (EV_A);
2625 3083
2626 fs_fd = inotify_init (); 3084 fs_fd = infy_newfd ();
2627 3085
2628 if (fs_fd >= 0) 3086 if (fs_fd >= 0)
2629 { 3087 {
3088 fd_intern (fs_fd);
2630 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3089 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2631 ev_set_priority (&fs_w, EV_MAXPRI); 3090 ev_set_priority (&fs_w, EV_MAXPRI);
2632 ev_io_start (EV_A_ &fs_w); 3091 ev_io_start (EV_A_ &fs_w);
3092 ev_unref (EV_A);
2633 } 3093 }
2634} 3094}
2635 3095
2636void inline_size 3096inline_size void
2637infy_fork (EV_P) 3097infy_fork (EV_P)
2638{ 3098{
2639 int slot; 3099 int slot;
2640 3100
2641 if (fs_fd < 0) 3101 if (fs_fd < 0)
2642 return; 3102 return;
2643 3103
3104 ev_ref (EV_A);
3105 ev_io_stop (EV_A_ &fs_w);
2644 close (fs_fd); 3106 close (fs_fd);
2645 fs_fd = inotify_init (); 3107 fs_fd = infy_newfd ();
3108
3109 if (fs_fd >= 0)
3110 {
3111 fd_intern (fs_fd);
3112 ev_io_set (&fs_w, fs_fd, EV_READ);
3113 ev_io_start (EV_A_ &fs_w);
3114 ev_unref (EV_A);
3115 }
2646 3116
2647 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3117 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2648 { 3118 {
2649 WL w_ = fs_hash [slot].head; 3119 WL w_ = fs_hash [slot].head;
2650 fs_hash [slot].head = 0; 3120 fs_hash [slot].head = 0;
… …
2657 w->wd = -1; 3127 w->wd = -1;
2658 3128
2659 if (fs_fd >= 0) 3129 if (fs_fd >= 0)
2660 infy_add (EV_A_ w); /* re-add, no matter what */ 3130 infy_add (EV_A_ w); /* re-add, no matter what */
2661 else 3131 else
3132 {
3133 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3134 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2662 ev_timer_again (EV_A_ &w->timer); 3135 ev_timer_again (EV_A_ &w->timer);
3136 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3137 }
2663 } 3138 }
2664 } 3139 }
2665} 3140}
2666 3141
2667#endif 3142#endif
… …
2684static void noinline 3159static void noinline
2685stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3160stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2686{ 3161{
2687 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3162 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2688 3163
2689 /* we copy this here each the time so that */ 3164 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); 3165 ev_stat_stat (EV_A_ w);
2693 3166
2694 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3167 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2695 if ( 3168 if (
2696 w->prev.st_dev != w->attr.st_dev 3169 prev.st_dev != w->attr.st_dev
2697 || w->prev.st_ino != w->attr.st_ino 3170 || prev.st_ino != w->attr.st_ino
2698 || w->prev.st_mode != w->attr.st_mode 3171 || prev.st_mode != w->attr.st_mode
2699 || w->prev.st_nlink != w->attr.st_nlink 3172 || prev.st_nlink != w->attr.st_nlink
2700 || w->prev.st_uid != w->attr.st_uid 3173 || prev.st_uid != w->attr.st_uid
2701 || w->prev.st_gid != w->attr.st_gid 3174 || prev.st_gid != w->attr.st_gid
2702 || w->prev.st_rdev != w->attr.st_rdev 3175 || prev.st_rdev != w->attr.st_rdev
2703 || w->prev.st_size != w->attr.st_size 3176 || prev.st_size != w->attr.st_size
2704 || w->prev.st_atime != w->attr.st_atime 3177 || prev.st_atime != w->attr.st_atime
2705 || w->prev.st_mtime != w->attr.st_mtime 3178 || prev.st_mtime != w->attr.st_mtime
2706 || w->prev.st_ctime != w->attr.st_ctime 3179 || prev.st_ctime != w->attr.st_ctime
2707 ) { 3180 ) {
3181 /* we only update w->prev on actual differences */
3182 /* in case we test more often than invoke the callback, */
3183 /* to ensure that prev is always different to attr */
3184 w->prev = prev;
3185
2708 #if EV_USE_INOTIFY 3186 #if EV_USE_INOTIFY
2709 if (fs_fd >= 0) 3187 if (fs_fd >= 0)
2710 { 3188 {
2711 infy_del (EV_A_ w); 3189 infy_del (EV_A_ w);
2712 infy_add (EV_A_ w); 3190 infy_add (EV_A_ w);
… …
2737 3215
2738 if (fs_fd >= 0) 3216 if (fs_fd >= 0)
2739 infy_add (EV_A_ w); 3217 infy_add (EV_A_ w);
2740 else 3218 else
2741#endif 3219#endif
3220 {
2742 ev_timer_again (EV_A_ &w->timer); 3221 ev_timer_again (EV_A_ &w->timer);
3222 ev_unref (EV_A);
3223 }
2743 3224
2744 ev_start (EV_A_ (W)w, 1); 3225 ev_start (EV_A_ (W)w, 1);
2745 3226
2746 EV_FREQUENT_CHECK; 3227 EV_FREQUENT_CHECK;
2747} 3228}
… …
2756 EV_FREQUENT_CHECK; 3237 EV_FREQUENT_CHECK;
2757 3238
2758#if EV_USE_INOTIFY 3239#if EV_USE_INOTIFY
2759 infy_del (EV_A_ w); 3240 infy_del (EV_A_ w);
2760#endif 3241#endif
3242
3243 if (ev_is_active (&w->timer))
3244 {
3245 ev_ref (EV_A);
2761 ev_timer_stop (EV_A_ &w->timer); 3246 ev_timer_stop (EV_A_ &w->timer);
3247 }
2762 3248
2763 ev_stop (EV_A_ (W)w); 3249 ev_stop (EV_A_ (W)w);
2764 3250
2765 EV_FREQUENT_CHECK; 3251 EV_FREQUENT_CHECK;
2766} 3252}
… …
2907embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3393embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2908{ 3394{
2909 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3395 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2910 3396
2911 { 3397 {
2912 struct ev_loop *loop = w->other; 3398 EV_P = w->other;
2913 3399
2914 while (fdchangecnt) 3400 while (fdchangecnt)
2915 { 3401 {
2916 fd_reify (EV_A); 3402 fd_reify (EV_A);
2917 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3403 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
2925 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3411 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2926 3412
2927 ev_embed_stop (EV_A_ w); 3413 ev_embed_stop (EV_A_ w);
2928 3414
2929 { 3415 {
2930 struct ev_loop *loop = w->other; 3416 EV_P = w->other;
2931 3417
2932 ev_loop_fork (EV_A); 3418 ev_loop_fork (EV_A);
2933 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3419 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2934 } 3420 }
2935 3421
… …
2949{ 3435{
2950 if (expect_false (ev_is_active (w))) 3436 if (expect_false (ev_is_active (w)))
2951 return; 3437 return;
2952 3438
2953 { 3439 {
2954 struct ev_loop *loop = w->other; 3440 EV_P = w->other;
2955 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3441 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); 3442 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2957 } 3443 }
2958 3444
2959 EV_FREQUENT_CHECK; 3445 EV_FREQUENT_CHECK;
… …
2986 3472
2987 ev_io_stop (EV_A_ &w->io); 3473 ev_io_stop (EV_A_ &w->io);
2988 ev_prepare_stop (EV_A_ &w->prepare); 3474 ev_prepare_stop (EV_A_ &w->prepare);
2989 ev_fork_stop (EV_A_ &w->fork); 3475 ev_fork_stop (EV_A_ &w->fork);
2990 3476
3477 ev_stop (EV_A_ (W)w);
3478
2991 EV_FREQUENT_CHECK; 3479 EV_FREQUENT_CHECK;
2992} 3480}
2993#endif 3481#endif
2994 3482
2995#if EV_FORK_ENABLE 3483#if EV_FORK_ENABLE
… …
3071 3559
3072void 3560void
3073ev_async_send (EV_P_ ev_async *w) 3561ev_async_send (EV_P_ ev_async *w)
3074{ 3562{
3075 w->sent = 1; 3563 w->sent = 1;
3076 evpipe_write (EV_A_ &gotasync); 3564 evpipe_write (EV_A_ &async_pending);
3077} 3565}
3078#endif 3566#endif
3079 3567
3080/*****************************************************************************/ 3568/*****************************************************************************/
3081 3569
… …
3145 } 3633 }
3146} 3634}
3147 3635
3148/*****************************************************************************/ 3636/*****************************************************************************/
3149 3637
3150#if 0 3638#if EV_WALK_ENABLE
3151void 3639void
3152ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 3640ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3153{ 3641{
3154 int i, j; 3642 int i, j;
3155 ev_watcher_list *wl, *wn; 3643 ev_watcher_list *wl, *wn;
… …
3171#if EV_USE_INOTIFY 3659#if EV_USE_INOTIFY
3172 if (ev_cb ((ev_io *)wl) == infy_cb) 3660 if (ev_cb ((ev_io *)wl) == infy_cb)
3173 ; 3661 ;
3174 else 3662 else
3175#endif 3663#endif
3176 if ((ev_io *)wl != &pipeev) 3664 if ((ev_io *)wl != &pipe_w)
3177 if (types & EV_IO) 3665 if (types & EV_IO)
3178 cb (EV_A_ EV_IO, wl); 3666 cb (EV_A_ EV_IO, wl);
3179 3667
3180 wl = wn; 3668 wl = wn;
3181 } 3669 }
… …
3230 if (types & EV_CHECK) 3718 if (types & EV_CHECK)
3231 for (i = checkcnt; i--; ) 3719 for (i = checkcnt; i--; )
3232 cb (EV_A_ EV_CHECK, checks [i]); 3720 cb (EV_A_ EV_CHECK, checks [i]);
3233 3721
3234 if (types & EV_SIGNAL) 3722 if (types & EV_SIGNAL)
3235 for (i = 0; i < signalmax; ++i) 3723 for (i = 0; i < EV_NSIG - 1; ++i)
3236 for (wl = signals [i].head; wl; ) 3724 for (wl = signals [i].head; wl; )
3237 { 3725 {
3238 wn = wl->next; 3726 wn = wl->next;
3239 cb (EV_A_ EV_SIGNAL, wl); 3727 cb (EV_A_ EV_SIGNAL, wl);
3240 wl = wn; 3728 wl = wn;

Diff Legend

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