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

Comparing libev/ev.c (file contents):
Revision 1.268 by root, Mon Oct 27 13:39:18 2008 UTC vs.
Revision 1.320 by root, Fri Dec 4 20:25:06 2009 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009 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 *
… …
47# include EV_CONFIG_H 47# include EV_CONFIG_H
48# else 48# else
49# include "config.h" 49# include "config.h"
50# endif 50# endif
51 51
52# if HAVE_CLOCK_SYSCALL
53# ifndef EV_USE_CLOCK_SYSCALL
54# define EV_USE_CLOCK_SYSCALL 1
55# ifndef EV_USE_REALTIME
56# define EV_USE_REALTIME 0
57# endif
58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1
60# endif
61# endif
62# elif !defined(EV_USE_CLOCK_SYSCALL)
63# define EV_USE_CLOCK_SYSCALL 0
64# endif
65
52# if HAVE_CLOCK_GETTIME 66# if HAVE_CLOCK_GETTIME
53# ifndef EV_USE_MONOTONIC 67# ifndef EV_USE_MONOTONIC
54# define EV_USE_MONOTONIC 1 68# define EV_USE_MONOTONIC 1
55# endif 69# endif
56# ifndef EV_USE_REALTIME 70# ifndef EV_USE_REALTIME
57# define EV_USE_REALTIME 1 71# define EV_USE_REALTIME 0
58# endif 72# endif
59# else 73# else
60# ifndef EV_USE_MONOTONIC 74# ifndef EV_USE_MONOTONIC
61# define EV_USE_MONOTONIC 0 75# define EV_USE_MONOTONIC 0
62# endif 76# endif
… …
119# else 133# else
120# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
121# endif 135# endif
122# endif 136# endif
123 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
124# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
125# if HAVE_EVENTFD 147# if HAVE_EVENTFD
126# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD 1
127# else 149# else
128# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
… …
131 153
132#endif 154#endif
133 155
134#include <math.h> 156#include <math.h>
135#include <stdlib.h> 157#include <stdlib.h>
158#include <string.h>
136#include <fcntl.h> 159#include <fcntl.h>
137#include <stddef.h> 160#include <stddef.h>
138 161
139#include <stdio.h> 162#include <stdio.h>
140 163
… …
164# endif 187# endif
165#endif 188#endif
166 189
167/* this block tries to deduce configuration from header-defined symbols and defaults */ 190/* this block tries to deduce configuration from header-defined symbols and defaults */
168 191
192/* try to deduce the maximum number of signals on this platform */
193#if defined (EV_NSIG)
194/* use what's provided */
195#elif defined (NSIG)
196# define EV_NSIG (NSIG)
197#elif defined(_NSIG)
198# define EV_NSIG (_NSIG)
199#elif defined (SIGMAX)
200# define EV_NSIG (SIGMAX+1)
201#elif defined (SIG_MAX)
202# define EV_NSIG (SIG_MAX+1)
203#elif defined (_SIG_MAX)
204# define EV_NSIG (_SIG_MAX+1)
205#elif defined (MAXSIG)
206# define EV_NSIG (MAXSIG+1)
207#elif defined (MAX_SIG)
208# define EV_NSIG (MAX_SIG+1)
209#elif defined (SIGARRAYSIZE)
210# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
211#elif defined (_sys_nsig)
212# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
213#else
214# error "unable to find value for NSIG, please report"
215/* to make it compile regardless, just remove the above line */
216# define EV_NSIG 65
217#endif
218
219#ifndef EV_USE_CLOCK_SYSCALL
220# if __linux && __GLIBC__ >= 2
221# define EV_USE_CLOCK_SYSCALL 1
222# else
223# define EV_USE_CLOCK_SYSCALL 0
224# endif
225#endif
226
169#ifndef EV_USE_MONOTONIC 227#ifndef EV_USE_MONOTONIC
170# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 228# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
171# define EV_USE_MONOTONIC 1 229# define EV_USE_MONOTONIC 1
172# else 230# else
173# define EV_USE_MONOTONIC 0 231# define EV_USE_MONOTONIC 0
174# endif 232# endif
175#endif 233#endif
176 234
177#ifndef EV_USE_REALTIME 235#ifndef EV_USE_REALTIME
178# define EV_USE_REALTIME 0 236# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
179#endif 237#endif
180 238
181#ifndef EV_USE_NANOSLEEP 239#ifndef EV_USE_NANOSLEEP
182# if _POSIX_C_SOURCE >= 199309L 240# if _POSIX_C_SOURCE >= 199309L
183# define EV_USE_NANOSLEEP 1 241# define EV_USE_NANOSLEEP 1
… …
244# else 302# else
245# define EV_USE_EVENTFD 0 303# define EV_USE_EVENTFD 0
246# endif 304# endif
247#endif 305#endif
248 306
307#ifndef EV_USE_SIGNALFD
308# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
309# define EV_USE_SIGNALFD 1
310# else
311# define EV_USE_SIGNALFD 0
312# endif
313#endif
314
249#if 0 /* debugging */ 315#if 0 /* debugging */
250# define EV_VERIFY 3 316# define EV_VERIFY 3
251# define EV_USE_4HEAP 1 317# define EV_USE_4HEAP 1
252# define EV_HEAP_CACHE_AT 1 318# define EV_HEAP_CACHE_AT 1
253#endif 319#endif
… …
262 328
263#ifndef EV_HEAP_CACHE_AT 329#ifndef EV_HEAP_CACHE_AT
264# define EV_HEAP_CACHE_AT !EV_MINIMAL 330# define EV_HEAP_CACHE_AT !EV_MINIMAL
265#endif 331#endif
266 332
333/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
334/* which makes programs even slower. might work on other unices, too. */
335#if EV_USE_CLOCK_SYSCALL
336# include <syscall.h>
337# ifdef SYS_clock_gettime
338# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
339# undef EV_USE_MONOTONIC
340# define EV_USE_MONOTONIC 1
341# else
342# undef EV_USE_CLOCK_SYSCALL
343# define EV_USE_CLOCK_SYSCALL 0
344# endif
345#endif
346
267/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 347/* this block fixes any misconfiguration where we know we run into trouble otherwise */
268 348
269#ifndef CLOCK_MONOTONIC 349#ifndef CLOCK_MONOTONIC
270# undef EV_USE_MONOTONIC 350# undef EV_USE_MONOTONIC
271# define EV_USE_MONOTONIC 0 351# define EV_USE_MONOTONIC 0
… …
287# endif 367# endif
288#endif 368#endif
289 369
290#if EV_USE_INOTIFY 370#if EV_USE_INOTIFY
291# include <sys/utsname.h> 371# include <sys/utsname.h>
372# include <sys/statfs.h>
292# include <sys/inotify.h> 373# include <sys/inotify.h>
293/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 374/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
294# ifndef IN_DONT_FOLLOW 375# ifndef IN_DONT_FOLLOW
295# undef EV_USE_INOTIFY 376# undef EV_USE_INOTIFY
296# define EV_USE_INOTIFY 0 377# define EV_USE_INOTIFY 0
… …
302#endif 383#endif
303 384
304#if EV_USE_EVENTFD 385#if EV_USE_EVENTFD
305/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 386/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
306# include <stdint.h> 387# include <stdint.h>
388# ifndef EFD_NONBLOCK
389# define EFD_NONBLOCK O_NONBLOCK
390# endif
391# ifndef EFD_CLOEXEC
392# ifdef O_CLOEXEC
393# define EFD_CLOEXEC O_CLOEXEC
394# else
395# define EFD_CLOEXEC 02000000
396# endif
397# endif
307# ifdef __cplusplus 398# ifdef __cplusplus
308extern "C" { 399extern "C" {
309# endif 400# endif
310int eventfd (unsigned int initval, int flags); 401int eventfd (unsigned int initval, int flags);
311# ifdef __cplusplus 402# ifdef __cplusplus
312} 403}
313# endif 404# endif
314#endif 405#endif
406
407#if EV_USE_SIGNALFD
408/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
409# include <stdint.h>
410# ifndef SFD_NONBLOCK
411# define SFD_NONBLOCK O_NONBLOCK
412# endif
413# ifndef SFD_CLOEXEC
414# ifdef O_CLOEXEC
415# define SFD_CLOEXEC O_CLOEXEC
416# else
417# define SFD_CLOEXEC 02000000
418# endif
419# endif
420# ifdef __cplusplus
421extern "C" {
422# endif
423int signalfd (int fd, const sigset_t *mask, int flags);
424
425struct signalfd_siginfo
426{
427 uint32_t ssi_signo;
428 char pad[128 - sizeof (uint32_t)];
429};
430# ifdef __cplusplus
431}
432# endif
433#endif
434
315 435
316/**/ 436/**/
317 437
318#if EV_VERIFY >= 3 438#if EV_VERIFY >= 3
319# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 439# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
… …
331 */ 451 */
332#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 452#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
333 453
334#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 454#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
335#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 455#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
336/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
337 456
338#if __GNUC__ >= 4 457#if __GNUC__ >= 4
339# define expect(expr,value) __builtin_expect ((expr),(value)) 458# define expect(expr,value) __builtin_expect ((expr),(value))
340# define noinline __attribute__ ((noinline)) 459# define noinline __attribute__ ((noinline))
341#else 460#else
… …
354# define inline_speed static noinline 473# define inline_speed static noinline
355#else 474#else
356# define inline_speed static inline 475# define inline_speed static inline
357#endif 476#endif
358 477
359#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 478#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
479
480#if EV_MINPRI == EV_MAXPRI
481# define ABSPRI(w) (((W)w), 0)
482#else
360#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 483# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
484#endif
361 485
362#define EMPTY /* required for microsofts broken pseudo-c compiler */ 486#define EMPTY /* required for microsofts broken pseudo-c compiler */
363#define EMPTY2(a,b) /* used to suppress some warnings */ 487#define EMPTY2(a,b) /* used to suppress some warnings */
364 488
365typedef ev_watcher *W; 489typedef ev_watcher *W;
… …
367typedef ev_watcher_time *WT; 491typedef ev_watcher_time *WT;
368 492
369#define ev_active(w) ((W)(w))->active 493#define ev_active(w) ((W)(w))->active
370#define ev_at(w) ((WT)(w))->at 494#define ev_at(w) ((WT)(w))->at
371 495
372#if EV_USE_MONOTONIC 496#if EV_USE_REALTIME
373/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 497/* sig_atomic_t is used to avoid per-thread variables or locking but still */
374/* giving it a reasonably high chance of working on typical architetcures */ 498/* giving it a reasonably high chance of working on typical architetcures */
499static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
500#endif
501
502#if EV_USE_MONOTONIC
375static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 503static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
504#endif
505
506#ifndef EV_FD_TO_WIN32_HANDLE
507# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
508#endif
509#ifndef EV_WIN32_HANDLE_TO_FD
510# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0)
511#endif
512#ifndef EV_WIN32_CLOSE_FD
513# define EV_WIN32_CLOSE_FD(fd) close (fd)
376#endif 514#endif
377 515
378#ifdef _WIN32 516#ifdef _WIN32
379# include "ev_win32.c" 517# include "ev_win32.c"
380#endif 518#endif
… …
388{ 526{
389 syserr_cb = cb; 527 syserr_cb = cb;
390} 528}
391 529
392static void noinline 530static void noinline
393syserr (const char *msg) 531ev_syserr (const char *msg)
394{ 532{
395 if (!msg) 533 if (!msg)
396 msg = "(libev) system error"; 534 msg = "(libev) system error";
397 535
398 if (syserr_cb) 536 if (syserr_cb)
… …
444#define ev_malloc(size) ev_realloc (0, (size)) 582#define ev_malloc(size) ev_realloc (0, (size))
445#define ev_free(ptr) ev_realloc ((ptr), 0) 583#define ev_free(ptr) ev_realloc ((ptr), 0)
446 584
447/*****************************************************************************/ 585/*****************************************************************************/
448 586
587/* set in reify when reification needed */
588#define EV_ANFD_REIFY 1
589
590/* file descriptor info structure */
449typedef struct 591typedef struct
450{ 592{
451 WL head; 593 WL head;
452 unsigned char events; 594 unsigned char events; /* the events watched for */
453 unsigned char reify; 595 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
454 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 596 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
597 unsigned char unused;
598#if EV_USE_EPOLL
455 unsigned char egen; /* generation counter to counter epoll bugs */ 599 unsigned int egen; /* generation counter to counter epoll bugs */
600#endif
456#if EV_SELECT_IS_WINSOCKET 601#if EV_SELECT_IS_WINSOCKET
457 SOCKET handle; 602 SOCKET handle;
458#endif 603#endif
459} ANFD; 604} ANFD;
460 605
606/* stores the pending event set for a given watcher */
461typedef struct 607typedef struct
462{ 608{
463 W w; 609 W w;
464 int events; 610 int events; /* the pending event set for the given watcher */
465} ANPENDING; 611} ANPENDING;
466 612
467#if EV_USE_INOTIFY 613#if EV_USE_INOTIFY
468/* hash table entry per inotify-id */ 614/* hash table entry per inotify-id */
469typedef struct 615typedef struct
… …
472} ANFS; 618} ANFS;
473#endif 619#endif
474 620
475/* Heap Entry */ 621/* Heap Entry */
476#if EV_HEAP_CACHE_AT 622#if EV_HEAP_CACHE_AT
623 /* a heap element */
477 typedef struct { 624 typedef struct {
478 ev_tstamp at; 625 ev_tstamp at;
479 WT w; 626 WT w;
480 } ANHE; 627 } ANHE;
481 628
482 #define ANHE_w(he) (he).w /* access watcher, read-write */ 629 #define ANHE_w(he) (he).w /* access watcher, read-write */
483 #define ANHE_at(he) (he).at /* access cached at, read-only */ 630 #define ANHE_at(he) (he).at /* access cached at, read-only */
484 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */ 631 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
485#else 632#else
633 /* a heap element */
486 typedef WT ANHE; 634 typedef WT ANHE;
487 635
488 #define ANHE_w(he) (he) 636 #define ANHE_w(he) (he)
489 #define ANHE_at(he) (he)->at 637 #define ANHE_at(he) (he)->at
490 #define ANHE_at_cache(he) 638 #define ANHE_at_cache(he)
… …
514 662
515 static int ev_default_loop_ptr; 663 static int ev_default_loop_ptr;
516 664
517#endif 665#endif
518 666
667#if EV_MINIMAL < 2
668# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
669# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
670# define EV_INVOKE_PENDING invoke_cb (EV_A)
671#else
672# define EV_RELEASE_CB (void)0
673# define EV_ACQUIRE_CB (void)0
674# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
675#endif
676
677#define EVUNLOOP_RECURSE 0x80
678
519/*****************************************************************************/ 679/*****************************************************************************/
520 680
681#ifndef EV_HAVE_EV_TIME
521ev_tstamp 682ev_tstamp
522ev_time (void) 683ev_time (void)
523{ 684{
524#if EV_USE_REALTIME 685#if EV_USE_REALTIME
686 if (expect_true (have_realtime))
687 {
525 struct timespec ts; 688 struct timespec ts;
526 clock_gettime (CLOCK_REALTIME, &ts); 689 clock_gettime (CLOCK_REALTIME, &ts);
527 return ts.tv_sec + ts.tv_nsec * 1e-9; 690 return ts.tv_sec + ts.tv_nsec * 1e-9;
528#else 691 }
692#endif
693
529 struct timeval tv; 694 struct timeval tv;
530 gettimeofday (&tv, 0); 695 gettimeofday (&tv, 0);
531 return tv.tv_sec + tv.tv_usec * 1e-6; 696 return tv.tv_sec + tv.tv_usec * 1e-6;
532#endif
533} 697}
698#endif
534 699
535ev_tstamp inline_size 700inline_size ev_tstamp
536get_clock (void) 701get_clock (void)
537{ 702{
538#if EV_USE_MONOTONIC 703#if EV_USE_MONOTONIC
539 if (expect_true (have_monotonic)) 704 if (expect_true (have_monotonic))
540 { 705 {
… …
574 739
575 tv.tv_sec = (time_t)delay; 740 tv.tv_sec = (time_t)delay;
576 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 741 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
577 742
578 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 743 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
579 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 744 /* something not guaranteed by newer posix versions, but guaranteed */
580 /* by older ones */ 745 /* by older ones */
581 select (0, 0, 0, 0, &tv); 746 select (0, 0, 0, 0, &tv);
582#endif 747#endif
583 } 748 }
584} 749}
585 750
586/*****************************************************************************/ 751/*****************************************************************************/
587 752
588#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 753#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
589 754
590int inline_size 755/* find a suitable new size for the given array, */
756/* hopefully by rounding to a ncie-to-malloc size */
757inline_size int
591array_nextsize (int elem, int cur, int cnt) 758array_nextsize (int elem, int cur, int cnt)
592{ 759{
593 int ncur = cur + 1; 760 int ncur = cur + 1;
594 761
595 do 762 do
… …
636 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 803 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
637 } 804 }
638#endif 805#endif
639 806
640#define array_free(stem, idx) \ 807#define array_free(stem, idx) \
641 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 808 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
642 809
643/*****************************************************************************/ 810/*****************************************************************************/
811
812/* dummy callback for pending events */
813static void noinline
814pendingcb (EV_P_ ev_prepare *w, int revents)
815{
816}
644 817
645void noinline 818void noinline
646ev_feed_event (EV_P_ void *w, int revents) 819ev_feed_event (EV_P_ void *w, int revents)
647{ 820{
648 W w_ = (W)w; 821 W w_ = (W)w;
… …
657 pendings [pri][w_->pending - 1].w = w_; 830 pendings [pri][w_->pending - 1].w = w_;
658 pendings [pri][w_->pending - 1].events = revents; 831 pendings [pri][w_->pending - 1].events = revents;
659 } 832 }
660} 833}
661 834
662void inline_speed 835inline_speed void
836feed_reverse (EV_P_ W w)
837{
838 array_needsize (W, rfeeds, rfeedmax, rfeedcnt + 1, EMPTY2);
839 rfeeds [rfeedcnt++] = w;
840}
841
842inline_size void
843feed_reverse_done (EV_P_ int revents)
844{
845 do
846 ev_feed_event (EV_A_ rfeeds [--rfeedcnt], revents);
847 while (rfeedcnt);
848}
849
850inline_speed void
663queue_events (EV_P_ W *events, int eventcnt, int type) 851queue_events (EV_P_ W *events, int eventcnt, int type)
664{ 852{
665 int i; 853 int i;
666 854
667 for (i = 0; i < eventcnt; ++i) 855 for (i = 0; i < eventcnt; ++i)
668 ev_feed_event (EV_A_ events [i], type); 856 ev_feed_event (EV_A_ events [i], type);
669} 857}
670 858
671/*****************************************************************************/ 859/*****************************************************************************/
672 860
673void inline_speed 861inline_speed void
674fd_event (EV_P_ int fd, int revents) 862fd_event_nc (EV_P_ int fd, int revents)
675{ 863{
676 ANFD *anfd = anfds + fd; 864 ANFD *anfd = anfds + fd;
677 ev_io *w; 865 ev_io *w;
678 866
679 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 867 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
683 if (ev) 871 if (ev)
684 ev_feed_event (EV_A_ (W)w, ev); 872 ev_feed_event (EV_A_ (W)w, ev);
685 } 873 }
686} 874}
687 875
876/* do not submit kernel events for fds that have reify set */
877/* because that means they changed while we were polling for new events */
878inline_speed void
879fd_event (EV_P_ int fd, int revents)
880{
881 ANFD *anfd = anfds + fd;
882
883 if (expect_true (!anfd->reify))
884 fd_event_nc (EV_A_ fd, revents);
885}
886
688void 887void
689ev_feed_fd_event (EV_P_ int fd, int revents) 888ev_feed_fd_event (EV_P_ int fd, int revents)
690{ 889{
691 if (fd >= 0 && fd < anfdmax) 890 if (fd >= 0 && fd < anfdmax)
692 fd_event (EV_A_ fd, revents); 891 fd_event_nc (EV_A_ fd, revents);
693} 892}
694 893
695void inline_size 894/* make sure the external fd watch events are in-sync */
895/* with the kernel/libev internal state */
896inline_size void
696fd_reify (EV_P) 897fd_reify (EV_P)
697{ 898{
698 int i; 899 int i;
699 900
700 for (i = 0; i < fdchangecnt; ++i) 901 for (i = 0; i < fdchangecnt; ++i)
… …
710 911
711#if EV_SELECT_IS_WINSOCKET 912#if EV_SELECT_IS_WINSOCKET
712 if (events) 913 if (events)
713 { 914 {
714 unsigned long arg; 915 unsigned long arg;
715 #ifdef EV_FD_TO_WIN32_HANDLE
716 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 916 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
717 #else
718 anfd->handle = _get_osfhandle (fd);
719 #endif
720 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 917 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
721 } 918 }
722#endif 919#endif
723 920
724 { 921 {
725 unsigned char o_events = anfd->events; 922 unsigned char o_events = anfd->events;
726 unsigned char o_reify = anfd->reify; 923 unsigned char o_reify = anfd->reify;
727 924
728 anfd->reify = 0; 925 anfd->reify = 0;
729 anfd->events = events; 926 anfd->events = events;
730 927
731 if (o_events != events || o_reify & EV_IOFDSET) 928 if (o_events != events || o_reify & EV__IOFDSET)
732 backend_modify (EV_A_ fd, o_events, events); 929 backend_modify (EV_A_ fd, o_events, events);
733 } 930 }
734 } 931 }
735 932
736 fdchangecnt = 0; 933 fdchangecnt = 0;
737} 934}
738 935
739void inline_size 936/* something about the given fd changed */
937inline_size void
740fd_change (EV_P_ int fd, int flags) 938fd_change (EV_P_ int fd, int flags)
741{ 939{
742 unsigned char reify = anfds [fd].reify; 940 unsigned char reify = anfds [fd].reify;
743 anfds [fd].reify |= flags; 941 anfds [fd].reify |= flags;
744 942
… …
748 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 946 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
749 fdchanges [fdchangecnt - 1] = fd; 947 fdchanges [fdchangecnt - 1] = fd;
750 } 948 }
751} 949}
752 950
753void inline_speed 951/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
952inline_speed void
754fd_kill (EV_P_ int fd) 953fd_kill (EV_P_ int fd)
755{ 954{
756 ev_io *w; 955 ev_io *w;
757 956
758 while ((w = (ev_io *)anfds [fd].head)) 957 while ((w = (ev_io *)anfds [fd].head))
… …
760 ev_io_stop (EV_A_ w); 959 ev_io_stop (EV_A_ w);
761 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 960 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
762 } 961 }
763} 962}
764 963
765int inline_size 964/* check whether the given fd is atcually valid, for error recovery */
965inline_size int
766fd_valid (int fd) 966fd_valid (int fd)
767{ 967{
768#ifdef _WIN32 968#ifdef _WIN32
769 return _get_osfhandle (fd) != -1; 969 return _get_osfhandle (fd) != -1;
770#else 970#else
… …
792 992
793 for (fd = anfdmax; fd--; ) 993 for (fd = anfdmax; fd--; )
794 if (anfds [fd].events) 994 if (anfds [fd].events)
795 { 995 {
796 fd_kill (EV_A_ fd); 996 fd_kill (EV_A_ fd);
797 return; 997 break;
798 } 998 }
799} 999}
800 1000
801/* usually called after fork if backend needs to re-arm all fds from scratch */ 1001/* usually called after fork if backend needs to re-arm all fds from scratch */
802static void noinline 1002static void noinline
… …
807 for (fd = 0; fd < anfdmax; ++fd) 1007 for (fd = 0; fd < anfdmax; ++fd)
808 if (anfds [fd].events) 1008 if (anfds [fd].events)
809 { 1009 {
810 anfds [fd].events = 0; 1010 anfds [fd].events = 0;
811 anfds [fd].emask = 0; 1011 anfds [fd].emask = 0;
812 fd_change (EV_A_ fd, EV_IOFDSET | 1); 1012 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
813 } 1013 }
814} 1014}
815 1015
816/*****************************************************************************/ 1016/*****************************************************************************/
817 1017
… …
833#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 1033#define HEAP0 (DHEAP - 1) /* index of first element in heap */
834#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 1034#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
835#define UPHEAP_DONE(p,k) ((p) == (k)) 1035#define UPHEAP_DONE(p,k) ((p) == (k))
836 1036
837/* away from the root */ 1037/* away from the root */
838void inline_speed 1038inline_speed void
839downheap (ANHE *heap, int N, int k) 1039downheap (ANHE *heap, int N, int k)
840{ 1040{
841 ANHE he = heap [k]; 1041 ANHE he = heap [k];
842 ANHE *E = heap + N + HEAP0; 1042 ANHE *E = heap + N + HEAP0;
843 1043
… …
883#define HEAP0 1 1083#define HEAP0 1
884#define HPARENT(k) ((k) >> 1) 1084#define HPARENT(k) ((k) >> 1)
885#define UPHEAP_DONE(p,k) (!(p)) 1085#define UPHEAP_DONE(p,k) (!(p))
886 1086
887/* away from the root */ 1087/* away from the root */
888void inline_speed 1088inline_speed void
889downheap (ANHE *heap, int N, int k) 1089downheap (ANHE *heap, int N, int k)
890{ 1090{
891 ANHE he = heap [k]; 1091 ANHE he = heap [k];
892 1092
893 for (;;) 1093 for (;;)
894 { 1094 {
895 int c = k << 1; 1095 int c = k << 1;
896 1096
897 if (c > N + HEAP0 - 1) 1097 if (c >= N + HEAP0)
898 break; 1098 break;
899 1099
900 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1100 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
901 ? 1 : 0; 1101 ? 1 : 0;
902 1102
… …
913 ev_active (ANHE_w (he)) = k; 1113 ev_active (ANHE_w (he)) = k;
914} 1114}
915#endif 1115#endif
916 1116
917/* towards the root */ 1117/* towards the root */
918void inline_speed 1118inline_speed void
919upheap (ANHE *heap, int k) 1119upheap (ANHE *heap, int k)
920{ 1120{
921 ANHE he = heap [k]; 1121 ANHE he = heap [k];
922 1122
923 for (;;) 1123 for (;;)
… …
934 1134
935 heap [k] = he; 1135 heap [k] = he;
936 ev_active (ANHE_w (he)) = k; 1136 ev_active (ANHE_w (he)) = k;
937} 1137}
938 1138
939void inline_size 1139/* move an element suitably so it is in a correct place */
1140inline_size void
940adjustheap (ANHE *heap, int N, int k) 1141adjustheap (ANHE *heap, int N, int k)
941{ 1142{
942 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1143 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
943 upheap (heap, k); 1144 upheap (heap, k);
944 else 1145 else
945 downheap (heap, N, k); 1146 downheap (heap, N, k);
946} 1147}
947 1148
948/* rebuild the heap: this function is used only once and executed rarely */ 1149/* rebuild the heap: this function is used only once and executed rarely */
949void inline_size 1150inline_size void
950reheap (ANHE *heap, int N) 1151reheap (ANHE *heap, int N)
951{ 1152{
952 int i; 1153 int i;
953 1154
954 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 1155 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
… …
957 upheap (heap, i + HEAP0); 1158 upheap (heap, i + HEAP0);
958} 1159}
959 1160
960/*****************************************************************************/ 1161/*****************************************************************************/
961 1162
1163/* associate signal watchers to a signal signal */
962typedef struct 1164typedef struct
963{ 1165{
1166 EV_ATOMIC_T pending;
1167#if EV_MULTIPLICITY
1168 EV_P;
1169#endif
964 WL head; 1170 WL head;
965 EV_ATOMIC_T gotsig;
966} ANSIG; 1171} ANSIG;
967 1172
968static ANSIG *signals; 1173static ANSIG signals [EV_NSIG - 1];
969static int signalmax;
970
971static EV_ATOMIC_T gotsig;
972 1174
973/*****************************************************************************/ 1175/*****************************************************************************/
974 1176
975void inline_speed 1177/* used to prepare libev internal fd's */
1178/* this is not fork-safe */
1179inline_speed void
976fd_intern (int fd) 1180fd_intern (int fd)
977{ 1181{
978#ifdef _WIN32 1182#ifdef _WIN32
979 unsigned long arg = 1; 1183 unsigned long arg = 1;
980 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1184 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
985} 1189}
986 1190
987static void noinline 1191static void noinline
988evpipe_init (EV_P) 1192evpipe_init (EV_P)
989{ 1193{
990 if (!ev_is_active (&pipeev)) 1194 if (!ev_is_active (&pipe_w))
991 { 1195 {
992#if EV_USE_EVENTFD 1196#if EV_USE_EVENTFD
1197 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1198 if (evfd < 0 && errno == EINVAL)
993 if ((evfd = eventfd (0, 0)) >= 0) 1199 evfd = eventfd (0, 0);
1200
1201 if (evfd >= 0)
994 { 1202 {
995 evpipe [0] = -1; 1203 evpipe [0] = -1;
996 fd_intern (evfd); 1204 fd_intern (evfd); /* doing it twice doesn't hurt */
997 ev_io_set (&pipeev, evfd, EV_READ); 1205 ev_io_set (&pipe_w, evfd, EV_READ);
998 } 1206 }
999 else 1207 else
1000#endif 1208#endif
1001 { 1209 {
1002 while (pipe (evpipe)) 1210 while (pipe (evpipe))
1003 syserr ("(libev) error creating signal/async pipe"); 1211 ev_syserr ("(libev) error creating signal/async pipe");
1004 1212
1005 fd_intern (evpipe [0]); 1213 fd_intern (evpipe [0]);
1006 fd_intern (evpipe [1]); 1214 fd_intern (evpipe [1]);
1007 ev_io_set (&pipeev, evpipe [0], EV_READ); 1215 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1008 } 1216 }
1009 1217
1010 ev_io_start (EV_A_ &pipeev); 1218 ev_io_start (EV_A_ &pipe_w);
1011 ev_unref (EV_A); /* watcher should not keep loop alive */ 1219 ev_unref (EV_A); /* watcher should not keep loop alive */
1012 } 1220 }
1013} 1221}
1014 1222
1015void inline_size 1223inline_size void
1016evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1224evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1017{ 1225{
1018 if (!*flag) 1226 if (!*flag)
1019 { 1227 {
1020 int old_errno = errno; /* save errno because write might clobber it */ 1228 int old_errno = errno; /* save errno because write might clobber it */
… …
1033 1241
1034 errno = old_errno; 1242 errno = old_errno;
1035 } 1243 }
1036} 1244}
1037 1245
1246/* called whenever the libev signal pipe */
1247/* got some events (signal, async) */
1038static void 1248static void
1039pipecb (EV_P_ ev_io *iow, int revents) 1249pipecb (EV_P_ ev_io *iow, int revents)
1040{ 1250{
1251 int i;
1252
1041#if EV_USE_EVENTFD 1253#if EV_USE_EVENTFD
1042 if (evfd >= 0) 1254 if (evfd >= 0)
1043 { 1255 {
1044 uint64_t counter; 1256 uint64_t counter;
1045 read (evfd, &counter, sizeof (uint64_t)); 1257 read (evfd, &counter, sizeof (uint64_t));
… …
1049 { 1261 {
1050 char dummy; 1262 char dummy;
1051 read (evpipe [0], &dummy, 1); 1263 read (evpipe [0], &dummy, 1);
1052 } 1264 }
1053 1265
1054 if (gotsig && ev_is_default_loop (EV_A)) 1266 if (sig_pending)
1055 { 1267 {
1056 int signum; 1268 sig_pending = 0;
1057 gotsig = 0;
1058 1269
1059 for (signum = signalmax; signum--; ) 1270 for (i = EV_NSIG - 1; i--; )
1060 if (signals [signum].gotsig) 1271 if (expect_false (signals [i].pending))
1061 ev_feed_signal_event (EV_A_ signum + 1); 1272 ev_feed_signal_event (EV_A_ i + 1);
1062 } 1273 }
1063 1274
1064#if EV_ASYNC_ENABLE 1275#if EV_ASYNC_ENABLE
1065 if (gotasync) 1276 if (async_pending)
1066 { 1277 {
1067 int i; 1278 async_pending = 0;
1068 gotasync = 0;
1069 1279
1070 for (i = asynccnt; i--; ) 1280 for (i = asynccnt; i--; )
1071 if (asyncs [i]->sent) 1281 if (asyncs [i]->sent)
1072 { 1282 {
1073 asyncs [i]->sent = 0; 1283 asyncs [i]->sent = 0;
… …
1081 1291
1082static void 1292static void
1083ev_sighandler (int signum) 1293ev_sighandler (int signum)
1084{ 1294{
1085#if EV_MULTIPLICITY 1295#if EV_MULTIPLICITY
1086 struct ev_loop *loop = &default_loop_struct; 1296 EV_P = signals [signum - 1].loop;
1087#endif 1297#endif
1088 1298
1089#if _WIN32 1299#if _WIN32
1090 signal (signum, ev_sighandler); 1300 signal (signum, ev_sighandler);
1091#endif 1301#endif
1092 1302
1093 signals [signum - 1].gotsig = 1; 1303 signals [signum - 1].pending = 1;
1094 evpipe_write (EV_A_ &gotsig); 1304 evpipe_write (EV_A_ &sig_pending);
1095} 1305}
1096 1306
1097void noinline 1307void noinline
1098ev_feed_signal_event (EV_P_ int signum) 1308ev_feed_signal_event (EV_P_ int signum)
1099{ 1309{
1100 WL w; 1310 WL w;
1101 1311
1312 if (expect_false (signum <= 0 || signum > EV_NSIG))
1313 return;
1314
1315 --signum;
1316
1102#if EV_MULTIPLICITY 1317#if EV_MULTIPLICITY
1103 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1318 /* it is permissible to try to feed a signal to the wrong loop */
1104#endif 1319 /* or, likely more useful, feeding a signal nobody is waiting for */
1105 1320
1106 --signum; 1321 if (expect_false (signals [signum].loop != EV_A))
1107
1108 if (signum < 0 || signum >= signalmax)
1109 return; 1322 return;
1323#endif
1110 1324
1111 signals [signum].gotsig = 0; 1325 signals [signum].pending = 0;
1112 1326
1113 for (w = signals [signum].head; w; w = w->next) 1327 for (w = signals [signum].head; w; w = w->next)
1114 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1328 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1115} 1329}
1116 1330
1331#if EV_USE_SIGNALFD
1332static void
1333sigfdcb (EV_P_ ev_io *iow, int revents)
1334{
1335 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1336
1337 for (;;)
1338 {
1339 ssize_t res = read (sigfd, si, sizeof (si));
1340
1341 /* not ISO-C, as res might be -1, but works with SuS */
1342 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1343 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1344
1345 if (res < (ssize_t)sizeof (si))
1346 break;
1347 }
1348}
1349#endif
1350
1117/*****************************************************************************/ 1351/*****************************************************************************/
1118 1352
1119static WL childs [EV_PID_HASHSIZE]; 1353static WL childs [EV_PID_HASHSIZE];
1120 1354
1121#ifndef _WIN32 1355#ifndef _WIN32
… …
1124 1358
1125#ifndef WIFCONTINUED 1359#ifndef WIFCONTINUED
1126# define WIFCONTINUED(status) 0 1360# define WIFCONTINUED(status) 0
1127#endif 1361#endif
1128 1362
1129void inline_speed 1363/* handle a single child status event */
1364inline_speed void
1130child_reap (EV_P_ int chain, int pid, int status) 1365child_reap (EV_P_ int chain, int pid, int status)
1131{ 1366{
1132 ev_child *w; 1367 ev_child *w;
1133 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1368 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1134 1369
… …
1147 1382
1148#ifndef WCONTINUED 1383#ifndef WCONTINUED
1149# define WCONTINUED 0 1384# define WCONTINUED 0
1150#endif 1385#endif
1151 1386
1387/* called on sigchld etc., calls waitpid */
1152static void 1388static void
1153childcb (EV_P_ ev_signal *sw, int revents) 1389childcb (EV_P_ ev_signal *sw, int revents)
1154{ 1390{
1155 int pid, status; 1391 int pid, status;
1156 1392
… …
1237 /* kqueue is borked on everything but netbsd apparently */ 1473 /* kqueue is borked on everything but netbsd apparently */
1238 /* it usually doesn't work correctly on anything but sockets and pipes */ 1474 /* it usually doesn't work correctly on anything but sockets and pipes */
1239 flags &= ~EVBACKEND_KQUEUE; 1475 flags &= ~EVBACKEND_KQUEUE;
1240#endif 1476#endif
1241#ifdef __APPLE__ 1477#ifdef __APPLE__
1242 // flags &= ~EVBACKEND_KQUEUE; for documentation 1478 /* only select works correctly on that "unix-certified" platform */
1243 flags &= ~EVBACKEND_POLL; 1479 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1480 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1244#endif 1481#endif
1245 1482
1246 return flags; 1483 return flags;
1247} 1484}
1248 1485
… …
1262ev_backend (EV_P) 1499ev_backend (EV_P)
1263{ 1500{
1264 return backend; 1501 return backend;
1265} 1502}
1266 1503
1504#if EV_MINIMAL < 2
1267unsigned int 1505unsigned int
1268ev_loop_count (EV_P) 1506ev_loop_count (EV_P)
1269{ 1507{
1270 return loop_count; 1508 return loop_count;
1271} 1509}
1272 1510
1511unsigned int
1512ev_loop_depth (EV_P)
1513{
1514 return loop_depth;
1515}
1516
1273void 1517void
1274ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1518ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1275{ 1519{
1276 io_blocktime = interval; 1520 io_blocktime = interval;
1277} 1521}
… …
1280ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1524ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1281{ 1525{
1282 timeout_blocktime = interval; 1526 timeout_blocktime = interval;
1283} 1527}
1284 1528
1529void
1530ev_set_userdata (EV_P_ void *data)
1531{
1532 userdata = data;
1533}
1534
1535void *
1536ev_userdata (EV_P)
1537{
1538 return userdata;
1539}
1540
1541void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1542{
1543 invoke_cb = invoke_pending_cb;
1544}
1545
1546void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1547{
1548 release_cb = release;
1549 acquire_cb = acquire;
1550}
1551#endif
1552
1553/* initialise a loop structure, must be zero-initialised */
1285static void noinline 1554static void noinline
1286loop_init (EV_P_ unsigned int flags) 1555loop_init (EV_P_ unsigned int flags)
1287{ 1556{
1288 if (!backend) 1557 if (!backend)
1289 { 1558 {
1559#if EV_USE_REALTIME
1560 if (!have_realtime)
1561 {
1562 struct timespec ts;
1563
1564 if (!clock_gettime (CLOCK_REALTIME, &ts))
1565 have_realtime = 1;
1566 }
1567#endif
1568
1290#if EV_USE_MONOTONIC 1569#if EV_USE_MONOTONIC
1570 if (!have_monotonic)
1291 { 1571 {
1292 struct timespec ts; 1572 struct timespec ts;
1573
1293 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1574 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1294 have_monotonic = 1; 1575 have_monotonic = 1;
1295 } 1576 }
1296#endif 1577#endif
1578
1579 /* pid check not overridable via env */
1580#ifndef _WIN32
1581 if (flags & EVFLAG_FORKCHECK)
1582 curpid = getpid ();
1583#endif
1584
1585 if (!(flags & EVFLAG_NOENV)
1586 && !enable_secure ()
1587 && getenv ("LIBEV_FLAGS"))
1588 flags = atoi (getenv ("LIBEV_FLAGS"));
1297 1589
1298 ev_rt_now = ev_time (); 1590 ev_rt_now = ev_time ();
1299 mn_now = get_clock (); 1591 mn_now = get_clock ();
1300 now_floor = mn_now; 1592 now_floor = mn_now;
1301 rtmn_diff = ev_rt_now - mn_now; 1593 rtmn_diff = ev_rt_now - mn_now;
1594#if EV_MINIMAL < 2
1595 invoke_cb = ev_invoke_pending;
1596#endif
1302 1597
1303 io_blocktime = 0.; 1598 io_blocktime = 0.;
1304 timeout_blocktime = 0.; 1599 timeout_blocktime = 0.;
1305 backend = 0; 1600 backend = 0;
1306 backend_fd = -1; 1601 backend_fd = -1;
1307 gotasync = 0; 1602 sig_pending = 0;
1603#if EV_ASYNC_ENABLE
1604 async_pending = 0;
1605#endif
1308#if EV_USE_INOTIFY 1606#if EV_USE_INOTIFY
1309 fs_fd = -2; 1607 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1310#endif 1608#endif
1311 1609#if EV_USE_SIGNALFD
1312 /* pid check not overridable via env */ 1610 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1313#ifndef _WIN32
1314 if (flags & EVFLAG_FORKCHECK)
1315 curpid = getpid ();
1316#endif 1611#endif
1317
1318 if (!(flags & EVFLAG_NOENV)
1319 && !enable_secure ()
1320 && getenv ("LIBEV_FLAGS"))
1321 flags = atoi (getenv ("LIBEV_FLAGS"));
1322 1612
1323 if (!(flags & 0x0000ffffU)) 1613 if (!(flags & 0x0000ffffU))
1324 flags |= ev_recommended_backends (); 1614 flags |= ev_recommended_backends ();
1325 1615
1326#if EV_USE_PORT 1616#if EV_USE_PORT
… …
1337#endif 1627#endif
1338#if EV_USE_SELECT 1628#if EV_USE_SELECT
1339 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1629 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1340#endif 1630#endif
1341 1631
1632 ev_prepare_init (&pending_w, pendingcb);
1633
1342 ev_init (&pipeev, pipecb); 1634 ev_init (&pipe_w, pipecb);
1343 ev_set_priority (&pipeev, EV_MAXPRI); 1635 ev_set_priority (&pipe_w, EV_MAXPRI);
1344 } 1636 }
1345} 1637}
1346 1638
1639/* free up a loop structure */
1347static void noinline 1640static void noinline
1348loop_destroy (EV_P) 1641loop_destroy (EV_P)
1349{ 1642{
1350 int i; 1643 int i;
1351 1644
1352 if (ev_is_active (&pipeev)) 1645 if (ev_is_active (&pipe_w))
1353 { 1646 {
1354 ev_ref (EV_A); /* signal watcher */ 1647 /*ev_ref (EV_A);*/
1355 ev_io_stop (EV_A_ &pipeev); 1648 /*ev_io_stop (EV_A_ &pipe_w);*/
1356 1649
1357#if EV_USE_EVENTFD 1650#if EV_USE_EVENTFD
1358 if (evfd >= 0) 1651 if (evfd >= 0)
1359 close (evfd); 1652 close (evfd);
1360#endif 1653#endif
1361 1654
1362 if (evpipe [0] >= 0) 1655 if (evpipe [0] >= 0)
1363 { 1656 {
1364 close (evpipe [0]); 1657 EV_WIN32_CLOSE_FD (evpipe [0]);
1365 close (evpipe [1]); 1658 EV_WIN32_CLOSE_FD (evpipe [1]);
1366 } 1659 }
1367 } 1660 }
1661
1662#if EV_USE_SIGNALFD
1663 if (ev_is_active (&sigfd_w))
1664 close (sigfd);
1665#endif
1368 1666
1369#if EV_USE_INOTIFY 1667#if EV_USE_INOTIFY
1370 if (fs_fd >= 0) 1668 if (fs_fd >= 0)
1371 close (fs_fd); 1669 close (fs_fd);
1372#endif 1670#endif
… …
1396#if EV_IDLE_ENABLE 1694#if EV_IDLE_ENABLE
1397 array_free (idle, [i]); 1695 array_free (idle, [i]);
1398#endif 1696#endif
1399 } 1697 }
1400 1698
1401 ev_free (anfds); anfdmax = 0; 1699 ev_free (anfds); anfds = 0; anfdmax = 0;
1402 1700
1403 /* have to use the microsoft-never-gets-it-right macro */ 1701 /* have to use the microsoft-never-gets-it-right macro */
1702 array_free (rfeed, EMPTY);
1404 array_free (fdchange, EMPTY); 1703 array_free (fdchange, EMPTY);
1405 array_free (timer, EMPTY); 1704 array_free (timer, EMPTY);
1406#if EV_PERIODIC_ENABLE 1705#if EV_PERIODIC_ENABLE
1407 array_free (periodic, EMPTY); 1706 array_free (periodic, EMPTY);
1408#endif 1707#endif
… …
1417 1716
1418 backend = 0; 1717 backend = 0;
1419} 1718}
1420 1719
1421#if EV_USE_INOTIFY 1720#if EV_USE_INOTIFY
1422void inline_size infy_fork (EV_P); 1721inline_size void infy_fork (EV_P);
1423#endif 1722#endif
1424 1723
1425void inline_size 1724inline_size void
1426loop_fork (EV_P) 1725loop_fork (EV_P)
1427{ 1726{
1428#if EV_USE_PORT 1727#if EV_USE_PORT
1429 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1728 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1430#endif 1729#endif
… …
1436#endif 1735#endif
1437#if EV_USE_INOTIFY 1736#if EV_USE_INOTIFY
1438 infy_fork (EV_A); 1737 infy_fork (EV_A);
1439#endif 1738#endif
1440 1739
1441 if (ev_is_active (&pipeev)) 1740 if (ev_is_active (&pipe_w))
1442 { 1741 {
1443 /* this "locks" the handlers against writing to the pipe */ 1742 /* this "locks" the handlers against writing to the pipe */
1444 /* while we modify the fd vars */ 1743 /* while we modify the fd vars */
1445 gotsig = 1; 1744 sig_pending = 1;
1446#if EV_ASYNC_ENABLE 1745#if EV_ASYNC_ENABLE
1447 gotasync = 1; 1746 async_pending = 1;
1448#endif 1747#endif
1449 1748
1450 ev_ref (EV_A); 1749 ev_ref (EV_A);
1451 ev_io_stop (EV_A_ &pipeev); 1750 ev_io_stop (EV_A_ &pipe_w);
1452 1751
1453#if EV_USE_EVENTFD 1752#if EV_USE_EVENTFD
1454 if (evfd >= 0) 1753 if (evfd >= 0)
1455 close (evfd); 1754 close (evfd);
1456#endif 1755#endif
1457 1756
1458 if (evpipe [0] >= 0) 1757 if (evpipe [0] >= 0)
1459 { 1758 {
1460 close (evpipe [0]); 1759 EV_WIN32_CLOSE_FD (evpipe [0]);
1461 close (evpipe [1]); 1760 EV_WIN32_CLOSE_FD (evpipe [1]);
1462 } 1761 }
1463 1762
1464 evpipe_init (EV_A); 1763 evpipe_init (EV_A);
1465 /* now iterate over everything, in case we missed something */ 1764 /* now iterate over everything, in case we missed something */
1466 pipecb (EV_A_ &pipeev, EV_READ); 1765 pipecb (EV_A_ &pipe_w, EV_READ);
1467 } 1766 }
1468 1767
1469 postfork = 0; 1768 postfork = 0;
1470} 1769}
1471 1770
1472#if EV_MULTIPLICITY 1771#if EV_MULTIPLICITY
1473 1772
1474struct ev_loop * 1773struct ev_loop *
1475ev_loop_new (unsigned int flags) 1774ev_loop_new (unsigned int flags)
1476{ 1775{
1477 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1776 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1478 1777
1479 memset (loop, 0, sizeof (struct ev_loop)); 1778 memset (EV_A, 0, sizeof (struct ev_loop));
1480
1481 loop_init (EV_A_ flags); 1779 loop_init (EV_A_ flags);
1482 1780
1483 if (ev_backend (EV_A)) 1781 if (ev_backend (EV_A))
1484 return loop; 1782 return EV_A;
1485 1783
1486 return 0; 1784 return 0;
1487} 1785}
1488 1786
1489void 1787void
… …
1496void 1794void
1497ev_loop_fork (EV_P) 1795ev_loop_fork (EV_P)
1498{ 1796{
1499 postfork = 1; /* must be in line with ev_default_fork */ 1797 postfork = 1; /* must be in line with ev_default_fork */
1500} 1798}
1799#endif /* multiplicity */
1501 1800
1502#if EV_VERIFY 1801#if EV_VERIFY
1503static void noinline 1802static void noinline
1504verify_watcher (EV_P_ W w) 1803verify_watcher (EV_P_ W w)
1505{ 1804{
1506 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1805 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1507 1806
1508 if (w->pending) 1807 if (w->pending)
1509 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 1808 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1510} 1809}
1511 1810
1512static void noinline 1811static void noinline
1513verify_heap (EV_P_ ANHE *heap, int N) 1812verify_heap (EV_P_ ANHE *heap, int N)
1514{ 1813{
1515 int i; 1814 int i;
1516 1815
1517 for (i = HEAP0; i < N + HEAP0; ++i) 1816 for (i = HEAP0; i < N + HEAP0; ++i)
1518 { 1817 {
1519 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i)); 1818 assert (("libev: active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1520 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i]))); 1819 assert (("libev: heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1521 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i])))); 1820 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1522 1821
1523 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1822 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1524 } 1823 }
1525} 1824}
1526 1825
1527static void noinline 1826static void noinline
1528array_verify (EV_P_ W *ws, int cnt) 1827array_verify (EV_P_ W *ws, int cnt)
1529{ 1828{
1530 while (cnt--) 1829 while (cnt--)
1531 { 1830 {
1532 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1831 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1533 verify_watcher (EV_A_ ws [cnt]); 1832 verify_watcher (EV_A_ ws [cnt]);
1534 } 1833 }
1535} 1834}
1536#endif 1835#endif
1537 1836
1837#if EV_MINIMAL < 2
1538void 1838void
1539ev_loop_verify (EV_P) 1839ev_loop_verify (EV_P)
1540{ 1840{
1541#if EV_VERIFY 1841#if EV_VERIFY
1542 int i; 1842 int i;
… …
1544 1844
1545 assert (activecnt >= -1); 1845 assert (activecnt >= -1);
1546 1846
1547 assert (fdchangemax >= fdchangecnt); 1847 assert (fdchangemax >= fdchangecnt);
1548 for (i = 0; i < fdchangecnt; ++i) 1848 for (i = 0; i < fdchangecnt; ++i)
1549 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1849 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1550 1850
1551 assert (anfdmax >= 0); 1851 assert (anfdmax >= 0);
1552 for (i = 0; i < anfdmax; ++i) 1852 for (i = 0; i < anfdmax; ++i)
1553 for (w = anfds [i].head; w; w = w->next) 1853 for (w = anfds [i].head; w; w = w->next)
1554 { 1854 {
1555 verify_watcher (EV_A_ (W)w); 1855 verify_watcher (EV_A_ (W)w);
1556 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1856 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1557 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i)); 1857 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1558 } 1858 }
1559 1859
1560 assert (timermax >= timercnt); 1860 assert (timermax >= timercnt);
1561 verify_heap (EV_A_ timers, timercnt); 1861 verify_heap (EV_A_ timers, timercnt);
1562 1862
… …
1591 assert (checkmax >= checkcnt); 1891 assert (checkmax >= checkcnt);
1592 array_verify (EV_A_ (W *)checks, checkcnt); 1892 array_verify (EV_A_ (W *)checks, checkcnt);
1593 1893
1594# if 0 1894# if 0
1595 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1895 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1596 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1896 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1597# endif
1598#endif 1897# endif
1898#endif
1599} 1899}
1600 1900#endif
1601#endif /* multiplicity */
1602 1901
1603#if EV_MULTIPLICITY 1902#if EV_MULTIPLICITY
1604struct ev_loop * 1903struct ev_loop *
1605ev_default_loop_init (unsigned int flags) 1904ev_default_loop_init (unsigned int flags)
1606#else 1905#else
… …
1609#endif 1908#endif
1610{ 1909{
1611 if (!ev_default_loop_ptr) 1910 if (!ev_default_loop_ptr)
1612 { 1911 {
1613#if EV_MULTIPLICITY 1912#if EV_MULTIPLICITY
1614 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1913 EV_P = ev_default_loop_ptr = &default_loop_struct;
1615#else 1914#else
1616 ev_default_loop_ptr = 1; 1915 ev_default_loop_ptr = 1;
1617#endif 1916#endif
1618 1917
1619 loop_init (EV_A_ flags); 1918 loop_init (EV_A_ flags);
… …
1636 1935
1637void 1936void
1638ev_default_destroy (void) 1937ev_default_destroy (void)
1639{ 1938{
1640#if EV_MULTIPLICITY 1939#if EV_MULTIPLICITY
1641 struct ev_loop *loop = ev_default_loop_ptr; 1940 EV_P = ev_default_loop_ptr;
1642#endif 1941#endif
1643 1942
1644 ev_default_loop_ptr = 0; 1943 ev_default_loop_ptr = 0;
1645 1944
1646#ifndef _WIN32 1945#ifndef _WIN32
… …
1653 1952
1654void 1953void
1655ev_default_fork (void) 1954ev_default_fork (void)
1656{ 1955{
1657#if EV_MULTIPLICITY 1956#if EV_MULTIPLICITY
1658 struct ev_loop *loop = ev_default_loop_ptr; 1957 EV_P = ev_default_loop_ptr;
1659#endif 1958#endif
1660 1959
1661 if (backend)
1662 postfork = 1; /* must be in line with ev_loop_fork */ 1960 postfork = 1; /* must be in line with ev_loop_fork */
1663} 1961}
1664 1962
1665/*****************************************************************************/ 1963/*****************************************************************************/
1666 1964
1667void 1965void
1668ev_invoke (EV_P_ void *w, int revents) 1966ev_invoke (EV_P_ void *w, int revents)
1669{ 1967{
1670 EV_CB_INVOKE ((W)w, revents); 1968 EV_CB_INVOKE ((W)w, revents);
1671} 1969}
1672 1970
1673void inline_speed 1971unsigned int
1674call_pending (EV_P) 1972ev_pending_count (EV_P)
1973{
1974 int pri;
1975 unsigned int count = 0;
1976
1977 for (pri = NUMPRI; pri--; )
1978 count += pendingcnt [pri];
1979
1980 return count;
1981}
1982
1983void noinline
1984ev_invoke_pending (EV_P)
1675{ 1985{
1676 int pri; 1986 int pri;
1677 1987
1678 for (pri = NUMPRI; pri--; ) 1988 for (pri = NUMPRI; pri--; )
1679 while (pendingcnt [pri]) 1989 while (pendingcnt [pri])
1680 { 1990 {
1681 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1991 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1682 1992
1683 if (expect_true (p->w))
1684 {
1685 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1993 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1994 /* ^ this is no longer true, as pending_w could be here */
1686 1995
1687 p->w->pending = 0; 1996 p->w->pending = 0;
1688 EV_CB_INVOKE (p->w, p->events); 1997 EV_CB_INVOKE (p->w, p->events);
1689 EV_FREQUENT_CHECK; 1998 EV_FREQUENT_CHECK;
1690 }
1691 } 1999 }
1692} 2000}
1693 2001
1694#if EV_IDLE_ENABLE 2002#if EV_IDLE_ENABLE
1695void inline_size 2003/* make idle watchers pending. this handles the "call-idle */
2004/* only when higher priorities are idle" logic */
2005inline_size void
1696idle_reify (EV_P) 2006idle_reify (EV_P)
1697{ 2007{
1698 if (expect_false (idleall)) 2008 if (expect_false (idleall))
1699 { 2009 {
1700 int pri; 2010 int pri;
… …
1712 } 2022 }
1713 } 2023 }
1714} 2024}
1715#endif 2025#endif
1716 2026
1717void inline_size 2027/* make timers pending */
2028inline_size void
1718timers_reify (EV_P) 2029timers_reify (EV_P)
1719{ 2030{
1720 EV_FREQUENT_CHECK; 2031 EV_FREQUENT_CHECK;
1721 2032
1722 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 2033 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1723 { 2034 {
1724 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 2035 do
1725
1726 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1727
1728 /* first reschedule or stop timer */
1729 if (w->repeat)
1730 { 2036 {
2037 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
2038
2039 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
2040
2041 /* first reschedule or stop timer */
2042 if (w->repeat)
2043 {
1731 ev_at (w) += w->repeat; 2044 ev_at (w) += w->repeat;
1732 if (ev_at (w) < mn_now) 2045 if (ev_at (w) < mn_now)
1733 ev_at (w) = mn_now; 2046 ev_at (w) = mn_now;
1734 2047
1735 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 2048 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1736 2049
1737 ANHE_at_cache (timers [HEAP0]); 2050 ANHE_at_cache (timers [HEAP0]);
1738 downheap (timers, timercnt, HEAP0); 2051 downheap (timers, timercnt, HEAP0);
2052 }
2053 else
2054 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
2055
2056 EV_FREQUENT_CHECK;
2057 feed_reverse (EV_A_ (W)w);
1739 } 2058 }
1740 else 2059 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1741 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1742 2060
1743 EV_FREQUENT_CHECK;
1744 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 2061 feed_reverse_done (EV_A_ EV_TIMEOUT);
1745 } 2062 }
1746} 2063}
1747 2064
1748#if EV_PERIODIC_ENABLE 2065#if EV_PERIODIC_ENABLE
1749void inline_size 2066/* make periodics pending */
2067inline_size void
1750periodics_reify (EV_P) 2068periodics_reify (EV_P)
1751{ 2069{
1752 EV_FREQUENT_CHECK; 2070 EV_FREQUENT_CHECK;
1753 2071
1754 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2072 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1755 { 2073 {
1756 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2074 int feed_count = 0;
1757 2075
1758 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 2076 do
1759
1760 /* first reschedule or stop timer */
1761 if (w->reschedule_cb)
1762 { 2077 {
2078 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2079
2080 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
2081
2082 /* first reschedule or stop timer */
2083 if (w->reschedule_cb)
2084 {
1763 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2085 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1764 2086
1765 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 2087 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1766 2088
1767 ANHE_at_cache (periodics [HEAP0]); 2089 ANHE_at_cache (periodics [HEAP0]);
1768 downheap (periodics, periodiccnt, HEAP0); 2090 downheap (periodics, periodiccnt, HEAP0);
2091 }
2092 else if (w->interval)
2093 {
2094 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2095 /* if next trigger time is not sufficiently in the future, put it there */
2096 /* this might happen because of floating point inexactness */
2097 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2098 {
2099 ev_at (w) += w->interval;
2100
2101 /* if interval is unreasonably low we might still have a time in the past */
2102 /* so correct this. this will make the periodic very inexact, but the user */
2103 /* has effectively asked to get triggered more often than possible */
2104 if (ev_at (w) < ev_rt_now)
2105 ev_at (w) = ev_rt_now;
2106 }
2107
2108 ANHE_at_cache (periodics [HEAP0]);
2109 downheap (periodics, periodiccnt, HEAP0);
2110 }
2111 else
2112 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
2113
2114 EV_FREQUENT_CHECK;
2115 feed_reverse (EV_A_ (W)w);
1769 } 2116 }
1770 else if (w->interval) 2117 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
1771 {
1772 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1773 /* if next trigger time is not sufficiently in the future, put it there */
1774 /* this might happen because of floating point inexactness */
1775 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1776 {
1777 ev_at (w) += w->interval;
1778 2118
1779 /* if interval is unreasonably low we might still have a time in the past */
1780 /* so correct this. this will make the periodic very inexact, but the user */
1781 /* has effectively asked to get triggered more often than possible */
1782 if (ev_at (w) < ev_rt_now)
1783 ev_at (w) = ev_rt_now;
1784 }
1785
1786 ANHE_at_cache (periodics [HEAP0]);
1787 downheap (periodics, periodiccnt, HEAP0);
1788 }
1789 else
1790 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1791
1792 EV_FREQUENT_CHECK;
1793 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 2119 feed_reverse_done (EV_A_ EV_PERIODIC);
1794 } 2120 }
1795} 2121}
1796 2122
2123/* simply recalculate all periodics */
2124/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1797static void noinline 2125static void noinline
1798periodics_reschedule (EV_P) 2126periodics_reschedule (EV_P)
1799{ 2127{
1800 int i; 2128 int i;
1801 2129
… …
1814 2142
1815 reheap (periodics, periodiccnt); 2143 reheap (periodics, periodiccnt);
1816} 2144}
1817#endif 2145#endif
1818 2146
1819void inline_speed 2147/* adjust all timers by a given offset */
2148static void noinline
2149timers_reschedule (EV_P_ ev_tstamp adjust)
2150{
2151 int i;
2152
2153 for (i = 0; i < timercnt; ++i)
2154 {
2155 ANHE *he = timers + i + HEAP0;
2156 ANHE_w (*he)->at += adjust;
2157 ANHE_at_cache (*he);
2158 }
2159}
2160
2161/* fetch new monotonic and realtime times from the kernel */
2162/* also detetc if there was a timejump, and act accordingly */
2163inline_speed void
1820time_update (EV_P_ ev_tstamp max_block) 2164time_update (EV_P_ ev_tstamp max_block)
1821{ 2165{
1822 int i;
1823
1824#if EV_USE_MONOTONIC 2166#if EV_USE_MONOTONIC
1825 if (expect_true (have_monotonic)) 2167 if (expect_true (have_monotonic))
1826 { 2168 {
2169 int i;
1827 ev_tstamp odiff = rtmn_diff; 2170 ev_tstamp odiff = rtmn_diff;
1828 2171
1829 mn_now = get_clock (); 2172 mn_now = get_clock ();
1830 2173
1831 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2174 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1857 ev_rt_now = ev_time (); 2200 ev_rt_now = ev_time ();
1858 mn_now = get_clock (); 2201 mn_now = get_clock ();
1859 now_floor = mn_now; 2202 now_floor = mn_now;
1860 } 2203 }
1861 2204
2205 /* no timer adjustment, as the monotonic clock doesn't jump */
2206 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1862# if EV_PERIODIC_ENABLE 2207# if EV_PERIODIC_ENABLE
1863 periodics_reschedule (EV_A); 2208 periodics_reschedule (EV_A);
1864# endif 2209# endif
1865 /* no timer adjustment, as the monotonic clock doesn't jump */
1866 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1867 } 2210 }
1868 else 2211 else
1869#endif 2212#endif
1870 { 2213 {
1871 ev_rt_now = ev_time (); 2214 ev_rt_now = ev_time ();
1872 2215
1873 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 2216 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1874 { 2217 {
2218 /* adjust timers. this is easy, as the offset is the same for all of them */
2219 timers_reschedule (EV_A_ ev_rt_now - mn_now);
1875#if EV_PERIODIC_ENABLE 2220#if EV_PERIODIC_ENABLE
1876 periodics_reschedule (EV_A); 2221 periodics_reschedule (EV_A);
1877#endif 2222#endif
1878 /* adjust timers. this is easy, as the offset is the same for all of them */
1879 for (i = 0; i < timercnt; ++i)
1880 {
1881 ANHE *he = timers + i + HEAP0;
1882 ANHE_w (*he)->at += ev_rt_now - mn_now;
1883 ANHE_at_cache (*he);
1884 }
1885 } 2223 }
1886 2224
1887 mn_now = ev_rt_now; 2225 mn_now = ev_rt_now;
1888 } 2226 }
1889} 2227}
1890 2228
1891void 2229void
1892ev_ref (EV_P)
1893{
1894 ++activecnt;
1895}
1896
1897void
1898ev_unref (EV_P)
1899{
1900 --activecnt;
1901}
1902
1903void
1904ev_now_update (EV_P)
1905{
1906 time_update (EV_A_ 1e100);
1907}
1908
1909static int loop_done;
1910
1911void
1912ev_loop (EV_P_ int flags) 2230ev_loop (EV_P_ int flags)
1913{ 2231{
2232#if EV_MINIMAL < 2
2233 ++loop_depth;
2234#endif
2235
2236 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2237
1914 loop_done = EVUNLOOP_CANCEL; 2238 loop_done = EVUNLOOP_CANCEL;
1915 2239
1916 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2240 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1917 2241
1918 do 2242 do
1919 { 2243 {
1920#if EV_VERIFY >= 2 2244#if EV_VERIFY >= 2
1921 ev_loop_verify (EV_A); 2245 ev_loop_verify (EV_A);
… …
1934 /* we might have forked, so queue fork handlers */ 2258 /* we might have forked, so queue fork handlers */
1935 if (expect_false (postfork)) 2259 if (expect_false (postfork))
1936 if (forkcnt) 2260 if (forkcnt)
1937 { 2261 {
1938 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2262 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1939 call_pending (EV_A); 2263 EV_INVOKE_PENDING;
1940 } 2264 }
1941#endif 2265#endif
1942 2266
1943 /* queue prepare watchers (and execute them) */ 2267 /* queue prepare watchers (and execute them) */
1944 if (expect_false (preparecnt)) 2268 if (expect_false (preparecnt))
1945 { 2269 {
1946 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2270 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1947 call_pending (EV_A); 2271 EV_INVOKE_PENDING;
1948 } 2272 }
1949 2273
1950 if (expect_false (!activecnt)) 2274 if (expect_false (loop_done))
1951 break; 2275 break;
1952 2276
1953 /* we might have forked, so reify kernel state if necessary */ 2277 /* we might have forked, so reify kernel state if necessary */
1954 if (expect_false (postfork)) 2278 if (expect_false (postfork))
1955 loop_fork (EV_A); 2279 loop_fork (EV_A);
… …
1962 ev_tstamp waittime = 0.; 2286 ev_tstamp waittime = 0.;
1963 ev_tstamp sleeptime = 0.; 2287 ev_tstamp sleeptime = 0.;
1964 2288
1965 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2289 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1966 { 2290 {
2291 /* remember old timestamp for io_blocktime calculation */
2292 ev_tstamp prev_mn_now = mn_now;
2293
1967 /* update time to cancel out callback processing overhead */ 2294 /* update time to cancel out callback processing overhead */
1968 time_update (EV_A_ 1e100); 2295 time_update (EV_A_ 1e100);
1969 2296
1970 waittime = MAX_BLOCKTIME; 2297 waittime = MAX_BLOCKTIME;
1971 2298
… …
1981 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2308 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1982 if (waittime > to) waittime = to; 2309 if (waittime > to) waittime = to;
1983 } 2310 }
1984#endif 2311#endif
1985 2312
2313 /* don't let timeouts decrease the waittime below timeout_blocktime */
1986 if (expect_false (waittime < timeout_blocktime)) 2314 if (expect_false (waittime < timeout_blocktime))
1987 waittime = timeout_blocktime; 2315 waittime = timeout_blocktime;
1988 2316
1989 sleeptime = waittime - backend_fudge; 2317 /* extra check because io_blocktime is commonly 0 */
1990
1991 if (expect_true (sleeptime > io_blocktime)) 2318 if (expect_false (io_blocktime))
1992 sleeptime = io_blocktime;
1993
1994 if (sleeptime)
1995 { 2319 {
2320 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2321
2322 if (sleeptime > waittime - backend_fudge)
2323 sleeptime = waittime - backend_fudge;
2324
2325 if (expect_true (sleeptime > 0.))
2326 {
1996 ev_sleep (sleeptime); 2327 ev_sleep (sleeptime);
1997 waittime -= sleeptime; 2328 waittime -= sleeptime;
2329 }
1998 } 2330 }
1999 } 2331 }
2000 2332
2333#if EV_MINIMAL < 2
2001 ++loop_count; 2334 ++loop_count;
2335#endif
2336 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2002 backend_poll (EV_A_ waittime); 2337 backend_poll (EV_A_ waittime);
2338 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2003 2339
2004 /* update ev_rt_now, do magic */ 2340 /* update ev_rt_now, do magic */
2005 time_update (EV_A_ waittime + sleeptime); 2341 time_update (EV_A_ waittime + sleeptime);
2006 } 2342 }
2007 2343
… …
2018 2354
2019 /* queue check watchers, to be executed first */ 2355 /* queue check watchers, to be executed first */
2020 if (expect_false (checkcnt)) 2356 if (expect_false (checkcnt))
2021 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2357 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2022 2358
2023 call_pending (EV_A); 2359 EV_INVOKE_PENDING;
2024 } 2360 }
2025 while (expect_true ( 2361 while (expect_true (
2026 activecnt 2362 activecnt
2027 && !loop_done 2363 && !loop_done
2028 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2364 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2029 )); 2365 ));
2030 2366
2031 if (loop_done == EVUNLOOP_ONE) 2367 if (loop_done == EVUNLOOP_ONE)
2032 loop_done = EVUNLOOP_CANCEL; 2368 loop_done = EVUNLOOP_CANCEL;
2369
2370#if EV_MINIMAL < 2
2371 --loop_depth;
2372#endif
2033} 2373}
2034 2374
2035void 2375void
2036ev_unloop (EV_P_ int how) 2376ev_unloop (EV_P_ int how)
2037{ 2377{
2038 loop_done = how; 2378 loop_done = how;
2039} 2379}
2040 2380
2381void
2382ev_ref (EV_P)
2383{
2384 ++activecnt;
2385}
2386
2387void
2388ev_unref (EV_P)
2389{
2390 --activecnt;
2391}
2392
2393void
2394ev_now_update (EV_P)
2395{
2396 time_update (EV_A_ 1e100);
2397}
2398
2399void
2400ev_suspend (EV_P)
2401{
2402 ev_now_update (EV_A);
2403}
2404
2405void
2406ev_resume (EV_P)
2407{
2408 ev_tstamp mn_prev = mn_now;
2409
2410 ev_now_update (EV_A);
2411 timers_reschedule (EV_A_ mn_now - mn_prev);
2412#if EV_PERIODIC_ENABLE
2413 /* TODO: really do this? */
2414 periodics_reschedule (EV_A);
2415#endif
2416}
2417
2041/*****************************************************************************/ 2418/*****************************************************************************/
2419/* singly-linked list management, used when the expected list length is short */
2042 2420
2043void inline_size 2421inline_size void
2044wlist_add (WL *head, WL elem) 2422wlist_add (WL *head, WL elem)
2045{ 2423{
2046 elem->next = *head; 2424 elem->next = *head;
2047 *head = elem; 2425 *head = elem;
2048} 2426}
2049 2427
2050void inline_size 2428inline_size void
2051wlist_del (WL *head, WL elem) 2429wlist_del (WL *head, WL elem)
2052{ 2430{
2053 while (*head) 2431 while (*head)
2054 { 2432 {
2055 if (*head == elem) 2433 if (expect_true (*head == elem))
2056 { 2434 {
2057 *head = elem->next; 2435 *head = elem->next;
2058 return; 2436 break;
2059 } 2437 }
2060 2438
2061 head = &(*head)->next; 2439 head = &(*head)->next;
2062 } 2440 }
2063} 2441}
2064 2442
2065void inline_speed 2443/* internal, faster, version of ev_clear_pending */
2444inline_speed void
2066clear_pending (EV_P_ W w) 2445clear_pending (EV_P_ W w)
2067{ 2446{
2068 if (w->pending) 2447 if (w->pending)
2069 { 2448 {
2070 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2449 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2071 w->pending = 0; 2450 w->pending = 0;
2072 } 2451 }
2073} 2452}
2074 2453
2075int 2454int
… …
2079 int pending = w_->pending; 2458 int pending = w_->pending;
2080 2459
2081 if (expect_true (pending)) 2460 if (expect_true (pending))
2082 { 2461 {
2083 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2462 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2463 p->w = (W)&pending_w;
2084 w_->pending = 0; 2464 w_->pending = 0;
2085 p->w = 0;
2086 return p->events; 2465 return p->events;
2087 } 2466 }
2088 else 2467 else
2089 return 0; 2468 return 0;
2090} 2469}
2091 2470
2092void inline_size 2471inline_size void
2093pri_adjust (EV_P_ W w) 2472pri_adjust (EV_P_ W w)
2094{ 2473{
2095 int pri = w->priority; 2474 int pri = ev_priority (w);
2096 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2475 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2097 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2476 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2098 w->priority = pri; 2477 ev_set_priority (w, pri);
2099} 2478}
2100 2479
2101void inline_speed 2480inline_speed void
2102ev_start (EV_P_ W w, int active) 2481ev_start (EV_P_ W w, int active)
2103{ 2482{
2104 pri_adjust (EV_A_ w); 2483 pri_adjust (EV_A_ w);
2105 w->active = active; 2484 w->active = active;
2106 ev_ref (EV_A); 2485 ev_ref (EV_A);
2107} 2486}
2108 2487
2109void inline_size 2488inline_size void
2110ev_stop (EV_P_ W w) 2489ev_stop (EV_P_ W w)
2111{ 2490{
2112 ev_unref (EV_A); 2491 ev_unref (EV_A);
2113 w->active = 0; 2492 w->active = 0;
2114} 2493}
… …
2121 int fd = w->fd; 2500 int fd = w->fd;
2122 2501
2123 if (expect_false (ev_is_active (w))) 2502 if (expect_false (ev_is_active (w)))
2124 return; 2503 return;
2125 2504
2126 assert (("ev_io_start called with negative fd", fd >= 0)); 2505 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2127 assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE)))); 2506 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2128 2507
2129 EV_FREQUENT_CHECK; 2508 EV_FREQUENT_CHECK;
2130 2509
2131 ev_start (EV_A_ (W)w, 1); 2510 ev_start (EV_A_ (W)w, 1);
2132 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2511 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2133 wlist_add (&anfds[fd].head, (WL)w); 2512 wlist_add (&anfds[fd].head, (WL)w);
2134 2513
2135 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2514 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2136 w->events &= ~EV_IOFDSET; 2515 w->events &= ~EV__IOFDSET;
2137 2516
2138 EV_FREQUENT_CHECK; 2517 EV_FREQUENT_CHECK;
2139} 2518}
2140 2519
2141void noinline 2520void noinline
… …
2143{ 2522{
2144 clear_pending (EV_A_ (W)w); 2523 clear_pending (EV_A_ (W)w);
2145 if (expect_false (!ev_is_active (w))) 2524 if (expect_false (!ev_is_active (w)))
2146 return; 2525 return;
2147 2526
2148 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2527 assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2149 2528
2150 EV_FREQUENT_CHECK; 2529 EV_FREQUENT_CHECK;
2151 2530
2152 wlist_del (&anfds[w->fd].head, (WL)w); 2531 wlist_del (&anfds[w->fd].head, (WL)w);
2153 ev_stop (EV_A_ (W)w); 2532 ev_stop (EV_A_ (W)w);
… …
2163 if (expect_false (ev_is_active (w))) 2542 if (expect_false (ev_is_active (w)))
2164 return; 2543 return;
2165 2544
2166 ev_at (w) += mn_now; 2545 ev_at (w) += mn_now;
2167 2546
2168 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2547 assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2169 2548
2170 EV_FREQUENT_CHECK; 2549 EV_FREQUENT_CHECK;
2171 2550
2172 ++timercnt; 2551 ++timercnt;
2173 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2552 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2176 ANHE_at_cache (timers [ev_active (w)]); 2555 ANHE_at_cache (timers [ev_active (w)]);
2177 upheap (timers, ev_active (w)); 2556 upheap (timers, ev_active (w));
2178 2557
2179 EV_FREQUENT_CHECK; 2558 EV_FREQUENT_CHECK;
2180 2559
2181 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2560 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2182} 2561}
2183 2562
2184void noinline 2563void noinline
2185ev_timer_stop (EV_P_ ev_timer *w) 2564ev_timer_stop (EV_P_ ev_timer *w)
2186{ 2565{
… …
2191 EV_FREQUENT_CHECK; 2570 EV_FREQUENT_CHECK;
2192 2571
2193 { 2572 {
2194 int active = ev_active (w); 2573 int active = ev_active (w);
2195 2574
2196 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2575 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2197 2576
2198 --timercnt; 2577 --timercnt;
2199 2578
2200 if (expect_true (active < timercnt + HEAP0)) 2579 if (expect_true (active < timercnt + HEAP0))
2201 { 2580 {
… …
2234 } 2613 }
2235 2614
2236 EV_FREQUENT_CHECK; 2615 EV_FREQUENT_CHECK;
2237} 2616}
2238 2617
2618ev_tstamp
2619ev_timer_remaining (EV_P_ ev_timer *w)
2620{
2621 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2622}
2623
2239#if EV_PERIODIC_ENABLE 2624#if EV_PERIODIC_ENABLE
2240void noinline 2625void noinline
2241ev_periodic_start (EV_P_ ev_periodic *w) 2626ev_periodic_start (EV_P_ ev_periodic *w)
2242{ 2627{
2243 if (expect_false (ev_is_active (w))) 2628 if (expect_false (ev_is_active (w)))
… …
2245 2630
2246 if (w->reschedule_cb) 2631 if (w->reschedule_cb)
2247 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2632 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2248 else if (w->interval) 2633 else if (w->interval)
2249 { 2634 {
2250 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2635 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2251 /* this formula differs from the one in periodic_reify because we do not always round up */ 2636 /* this formula differs from the one in periodic_reify because we do not always round up */
2252 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2637 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2253 } 2638 }
2254 else 2639 else
2255 ev_at (w) = w->offset; 2640 ev_at (w) = w->offset;
… …
2263 ANHE_at_cache (periodics [ev_active (w)]); 2648 ANHE_at_cache (periodics [ev_active (w)]);
2264 upheap (periodics, ev_active (w)); 2649 upheap (periodics, ev_active (w));
2265 2650
2266 EV_FREQUENT_CHECK; 2651 EV_FREQUENT_CHECK;
2267 2652
2268 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2653 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2269} 2654}
2270 2655
2271void noinline 2656void noinline
2272ev_periodic_stop (EV_P_ ev_periodic *w) 2657ev_periodic_stop (EV_P_ ev_periodic *w)
2273{ 2658{
… …
2278 EV_FREQUENT_CHECK; 2663 EV_FREQUENT_CHECK;
2279 2664
2280 { 2665 {
2281 int active = ev_active (w); 2666 int active = ev_active (w);
2282 2667
2283 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2668 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2284 2669
2285 --periodiccnt; 2670 --periodiccnt;
2286 2671
2287 if (expect_true (active < periodiccnt + HEAP0)) 2672 if (expect_true (active < periodiccnt + HEAP0))
2288 { 2673 {
… …
2310#endif 2695#endif
2311 2696
2312void noinline 2697void noinline
2313ev_signal_start (EV_P_ ev_signal *w) 2698ev_signal_start (EV_P_ ev_signal *w)
2314{ 2699{
2315#if EV_MULTIPLICITY
2316 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2317#endif
2318 if (expect_false (ev_is_active (w))) 2700 if (expect_false (ev_is_active (w)))
2319 return; 2701 return;
2320 2702
2321 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2703 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2322 2704
2323 evpipe_init (EV_A); 2705#if EV_MULTIPLICITY
2706 assert (("libev: a signal must not be attached to two different loops",
2707 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2324 2708
2325 EV_FREQUENT_CHECK; 2709 signals [w->signum - 1].loop = EV_A;
2710#endif
2326 2711
2712 EV_FREQUENT_CHECK;
2713
2714#if EV_USE_SIGNALFD
2715 if (sigfd == -2)
2327 { 2716 {
2328#ifndef _WIN32 2717 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2329 sigset_t full, prev; 2718 if (sigfd < 0 && errno == EINVAL)
2330 sigfillset (&full); 2719 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2331 sigprocmask (SIG_SETMASK, &full, &prev);
2332#endif
2333 2720
2334 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2721 if (sigfd >= 0)
2722 {
2723 fd_intern (sigfd); /* doing it twice will not hurt */
2335 2724
2336#ifndef _WIN32 2725 sigemptyset (&sigfd_set);
2337 sigprocmask (SIG_SETMASK, &prev, 0); 2726
2338#endif 2727 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2728 ev_set_priority (&sigfd_w, EV_MAXPRI);
2729 ev_io_start (EV_A_ &sigfd_w);
2730 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2731 }
2339 } 2732 }
2733
2734 if (sigfd >= 0)
2735 {
2736 /* TODO: check .head */
2737 sigaddset (&sigfd_set, w->signum);
2738 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2739
2740 signalfd (sigfd, &sigfd_set, 0);
2741 }
2742#endif
2340 2743
2341 ev_start (EV_A_ (W)w, 1); 2744 ev_start (EV_A_ (W)w, 1);
2342 wlist_add (&signals [w->signum - 1].head, (WL)w); 2745 wlist_add (&signals [w->signum - 1].head, (WL)w);
2343 2746
2344 if (!((WL)w)->next) 2747 if (!((WL)w)->next)
2748# if EV_USE_SIGNALFD
2749 if (sigfd < 0) /*TODO*/
2750# endif
2345 { 2751 {
2346#if _WIN32 2752# if _WIN32
2753 evpipe_init (EV_A);
2754
2347 signal (w->signum, ev_sighandler); 2755 signal (w->signum, ev_sighandler);
2348#else 2756# else
2349 struct sigaction sa; 2757 struct sigaction sa;
2758
2759 evpipe_init (EV_A);
2760
2350 sa.sa_handler = ev_sighandler; 2761 sa.sa_handler = ev_sighandler;
2351 sigfillset (&sa.sa_mask); 2762 sigfillset (&sa.sa_mask);
2352 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2763 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2353 sigaction (w->signum, &sa, 0); 2764 sigaction (w->signum, &sa, 0);
2765
2766 sigemptyset (&sa.sa_mask);
2767 sigaddset (&sa.sa_mask, w->signum);
2768 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2354#endif 2769#endif
2355 } 2770 }
2356 2771
2357 EV_FREQUENT_CHECK; 2772 EV_FREQUENT_CHECK;
2358} 2773}
2359 2774
2360void noinline 2775void noinline
… …
2368 2783
2369 wlist_del (&signals [w->signum - 1].head, (WL)w); 2784 wlist_del (&signals [w->signum - 1].head, (WL)w);
2370 ev_stop (EV_A_ (W)w); 2785 ev_stop (EV_A_ (W)w);
2371 2786
2372 if (!signals [w->signum - 1].head) 2787 if (!signals [w->signum - 1].head)
2788 {
2789#if EV_MULTIPLICITY
2790 signals [w->signum - 1].loop = 0; /* unattach from signal */
2791#endif
2792#if EV_USE_SIGNALFD
2793 if (sigfd >= 0)
2794 {
2795 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2796 sigdelset (&sigfd_set, w->signum);
2797 signalfd (sigfd, &sigfd_set, 0);
2798 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2799 /*TODO: maybe unblock signal? */
2800 }
2801 else
2802#endif
2373 signal (w->signum, SIG_DFL); 2803 signal (w->signum, SIG_DFL);
2804 }
2374 2805
2375 EV_FREQUENT_CHECK; 2806 EV_FREQUENT_CHECK;
2376} 2807}
2377 2808
2378void 2809void
2379ev_child_start (EV_P_ ev_child *w) 2810ev_child_start (EV_P_ ev_child *w)
2380{ 2811{
2381#if EV_MULTIPLICITY 2812#if EV_MULTIPLICITY
2382 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2813 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2383#endif 2814#endif
2384 if (expect_false (ev_is_active (w))) 2815 if (expect_false (ev_is_active (w)))
2385 return; 2816 return;
2386 2817
2387 EV_FREQUENT_CHECK; 2818 EV_FREQUENT_CHECK;
… …
2412# ifdef _WIN32 2843# ifdef _WIN32
2413# undef lstat 2844# undef lstat
2414# define lstat(a,b) _stati64 (a,b) 2845# define lstat(a,b) _stati64 (a,b)
2415# endif 2846# endif
2416 2847
2417#define DEF_STAT_INTERVAL 5.0074891 2848#define DEF_STAT_INTERVAL 5.0074891
2849#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
2418#define MIN_STAT_INTERVAL 0.1074891 2850#define MIN_STAT_INTERVAL 0.1074891
2419 2851
2420static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2852static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2421 2853
2422#if EV_USE_INOTIFY 2854#if EV_USE_INOTIFY
2423# define EV_INOTIFY_BUFSIZE 8192 2855# define EV_INOTIFY_BUFSIZE 8192
… …
2425static void noinline 2857static void noinline
2426infy_add (EV_P_ ev_stat *w) 2858infy_add (EV_P_ ev_stat *w)
2427{ 2859{
2428 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); 2860 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);
2429 2861
2430 if (w->wd < 0) 2862 if (w->wd >= 0)
2863 {
2864 struct statfs sfs;
2865
2866 /* now local changes will be tracked by inotify, but remote changes won't */
2867 /* unless the filesystem is known to be local, we therefore still poll */
2868 /* also do poll on <2.6.25, but with normal frequency */
2869
2870 if (!fs_2625)
2871 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2872 else if (!statfs (w->path, &sfs)
2873 && (sfs.f_type == 0x1373 /* devfs */
2874 || sfs.f_type == 0xEF53 /* ext2/3 */
2875 || sfs.f_type == 0x3153464a /* jfs */
2876 || sfs.f_type == 0x52654973 /* reiser3 */
2877 || sfs.f_type == 0x01021994 /* tempfs */
2878 || sfs.f_type == 0x58465342 /* xfs */))
2879 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2880 else
2881 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2431 { 2882 }
2432 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2883 else
2884 {
2885 /* can't use inotify, continue to stat */
2886 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2433 2887
2434 /* monitor some parent directory for speedup hints */ 2888 /* if path is not there, monitor some parent directory for speedup hints */
2435 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2889 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2436 /* but an efficiency issue only */ 2890 /* but an efficiency issue only */
2437 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2891 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2438 { 2892 {
2439 char path [4096]; 2893 char path [4096];
2440 strcpy (path, w->path); 2894 strcpy (path, w->path);
… …
2444 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2898 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2445 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2899 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2446 2900
2447 char *pend = strrchr (path, '/'); 2901 char *pend = strrchr (path, '/');
2448 2902
2449 if (!pend) 2903 if (!pend || pend == path)
2450 break; /* whoops, no '/', complain to your admin */ 2904 break;
2451 2905
2452 *pend = 0; 2906 *pend = 0;
2453 w->wd = inotify_add_watch (fs_fd, path, mask); 2907 w->wd = inotify_add_watch (fs_fd, path, mask);
2454 } 2908 }
2455 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2909 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2456 } 2910 }
2457 } 2911 }
2458 else
2459 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2460 2912
2461 if (w->wd >= 0) 2913 if (w->wd >= 0)
2462 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2914 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2915
2916 /* now re-arm timer, if required */
2917 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2918 ev_timer_again (EV_A_ &w->timer);
2919 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2463} 2920}
2464 2921
2465static void noinline 2922static void noinline
2466infy_del (EV_P_ ev_stat *w) 2923infy_del (EV_P_ ev_stat *w)
2467{ 2924{
… …
2497 2954
2498 if (w->wd == wd || wd == -1) 2955 if (w->wd == wd || wd == -1)
2499 { 2956 {
2500 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2957 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2501 { 2958 {
2959 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2502 w->wd = -1; 2960 w->wd = -1;
2503 infy_add (EV_A_ w); /* re-add, no matter what */ 2961 infy_add (EV_A_ w); /* re-add, no matter what */
2504 } 2962 }
2505 2963
2506 stat_timer_cb (EV_A_ &w->timer, 0); 2964 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2519 2977
2520 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2978 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2521 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2979 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2522} 2980}
2523 2981
2524void inline_size 2982inline_size void
2525infy_init (EV_P) 2983check_2625 (EV_P)
2526{ 2984{
2527 if (fs_fd != -2)
2528 return;
2529
2530 /* kernels < 2.6.25 are borked 2985 /* kernels < 2.6.25 are borked
2531 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 2986 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2532 */ 2987 */
2533 {
2534 struct utsname buf; 2988 struct utsname buf;
2535 int major, minor, micro; 2989 int major, minor, micro;
2536 2990
2537 fs_fd = -1;
2538
2539 if (uname (&buf)) 2991 if (uname (&buf))
2540 return; 2992 return;
2541 2993
2542 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3) 2994 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2543 return; 2995 return;
2544 2996
2545 if (major < 2 2997 if (major < 2
2546 || (major == 2 && minor < 6) 2998 || (major == 2 && minor < 6)
2547 || (major == 2 && minor == 6 && micro < 25)) 2999 || (major == 2 && minor == 6 && micro < 25))
2548 return; 3000 return;
2549 }
2550 3001
3002 fs_2625 = 1;
3003}
3004
3005inline_size int
3006infy_newfd (void)
3007{
3008#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3009 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3010 if (fd >= 0)
3011 return fd;
3012#endif
3013 return inotify_init ();
3014}
3015
3016inline_size void
3017infy_init (EV_P)
3018{
3019 if (fs_fd != -2)
3020 return;
3021
3022 fs_fd = -1;
3023
3024 check_2625 (EV_A);
3025
2551 fs_fd = inotify_init (); 3026 fs_fd = infy_newfd ();
2552 3027
2553 if (fs_fd >= 0) 3028 if (fs_fd >= 0)
2554 { 3029 {
3030 fd_intern (fs_fd);
2555 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3031 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2556 ev_set_priority (&fs_w, EV_MAXPRI); 3032 ev_set_priority (&fs_w, EV_MAXPRI);
2557 ev_io_start (EV_A_ &fs_w); 3033 ev_io_start (EV_A_ &fs_w);
3034 ev_unref (EV_A);
2558 } 3035 }
2559} 3036}
2560 3037
2561void inline_size 3038inline_size void
2562infy_fork (EV_P) 3039infy_fork (EV_P)
2563{ 3040{
2564 int slot; 3041 int slot;
2565 3042
2566 if (fs_fd < 0) 3043 if (fs_fd < 0)
2567 return; 3044 return;
2568 3045
3046 ev_ref (EV_A);
3047 ev_io_stop (EV_A_ &fs_w);
2569 close (fs_fd); 3048 close (fs_fd);
2570 fs_fd = inotify_init (); 3049 fs_fd = infy_newfd ();
3050
3051 if (fs_fd >= 0)
3052 {
3053 fd_intern (fs_fd);
3054 ev_io_set (&fs_w, fs_fd, EV_READ);
3055 ev_io_start (EV_A_ &fs_w);
3056 ev_unref (EV_A);
3057 }
2571 3058
2572 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3059 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2573 { 3060 {
2574 WL w_ = fs_hash [slot].head; 3061 WL w_ = fs_hash [slot].head;
2575 fs_hash [slot].head = 0; 3062 fs_hash [slot].head = 0;
… …
2582 w->wd = -1; 3069 w->wd = -1;
2583 3070
2584 if (fs_fd >= 0) 3071 if (fs_fd >= 0)
2585 infy_add (EV_A_ w); /* re-add, no matter what */ 3072 infy_add (EV_A_ w); /* re-add, no matter what */
2586 else 3073 else
3074 {
3075 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3076 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2587 ev_timer_start (EV_A_ &w->timer); 3077 ev_timer_again (EV_A_ &w->timer);
3078 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3079 }
2588 } 3080 }
2589 } 3081 }
2590} 3082}
2591 3083
2592#endif 3084#endif
… …
2609static void noinline 3101static void noinline
2610stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3102stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2611{ 3103{
2612 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3104 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2613 3105
2614 /* we copy this here each the time so that */ 3106 ev_statdata prev = w->attr;
2615 /* prev has the old value when the callback gets invoked */
2616 w->prev = w->attr;
2617 ev_stat_stat (EV_A_ w); 3107 ev_stat_stat (EV_A_ w);
2618 3108
2619 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3109 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2620 if ( 3110 if (
2621 w->prev.st_dev != w->attr.st_dev 3111 prev.st_dev != w->attr.st_dev
2622 || w->prev.st_ino != w->attr.st_ino 3112 || prev.st_ino != w->attr.st_ino
2623 || w->prev.st_mode != w->attr.st_mode 3113 || prev.st_mode != w->attr.st_mode
2624 || w->prev.st_nlink != w->attr.st_nlink 3114 || prev.st_nlink != w->attr.st_nlink
2625 || w->prev.st_uid != w->attr.st_uid 3115 || prev.st_uid != w->attr.st_uid
2626 || w->prev.st_gid != w->attr.st_gid 3116 || prev.st_gid != w->attr.st_gid
2627 || w->prev.st_rdev != w->attr.st_rdev 3117 || prev.st_rdev != w->attr.st_rdev
2628 || w->prev.st_size != w->attr.st_size 3118 || prev.st_size != w->attr.st_size
2629 || w->prev.st_atime != w->attr.st_atime 3119 || prev.st_atime != w->attr.st_atime
2630 || w->prev.st_mtime != w->attr.st_mtime 3120 || prev.st_mtime != w->attr.st_mtime
2631 || w->prev.st_ctime != w->attr.st_ctime 3121 || prev.st_ctime != w->attr.st_ctime
2632 ) { 3122 ) {
3123 /* we only update w->prev on actual differences */
3124 /* in case we test more often than invoke the callback, */
3125 /* to ensure that prev is always different to attr */
3126 w->prev = prev;
3127
2633 #if EV_USE_INOTIFY 3128 #if EV_USE_INOTIFY
2634 if (fs_fd >= 0) 3129 if (fs_fd >= 0)
2635 { 3130 {
2636 infy_del (EV_A_ w); 3131 infy_del (EV_A_ w);
2637 infy_add (EV_A_ w); 3132 infy_add (EV_A_ w);
… …
2647ev_stat_start (EV_P_ ev_stat *w) 3142ev_stat_start (EV_P_ ev_stat *w)
2648{ 3143{
2649 if (expect_false (ev_is_active (w))) 3144 if (expect_false (ev_is_active (w)))
2650 return; 3145 return;
2651 3146
2652 /* since we use memcmp, we need to clear any padding data etc. */
2653 memset (&w->prev, 0, sizeof (ev_statdata));
2654 memset (&w->attr, 0, sizeof (ev_statdata));
2655
2656 ev_stat_stat (EV_A_ w); 3147 ev_stat_stat (EV_A_ w);
2657 3148
3149 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2658 if (w->interval < MIN_STAT_INTERVAL) 3150 w->interval = MIN_STAT_INTERVAL;
2659 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2660 3151
2661 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 3152 ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2662 ev_set_priority (&w->timer, ev_priority (w)); 3153 ev_set_priority (&w->timer, ev_priority (w));
2663 3154
2664#if EV_USE_INOTIFY 3155#if EV_USE_INOTIFY
2665 infy_init (EV_A); 3156 infy_init (EV_A);
2666 3157
2667 if (fs_fd >= 0) 3158 if (fs_fd >= 0)
2668 infy_add (EV_A_ w); 3159 infy_add (EV_A_ w);
2669 else 3160 else
2670#endif 3161#endif
3162 {
2671 ev_timer_start (EV_A_ &w->timer); 3163 ev_timer_again (EV_A_ &w->timer);
3164 ev_unref (EV_A);
3165 }
2672 3166
2673 ev_start (EV_A_ (W)w, 1); 3167 ev_start (EV_A_ (W)w, 1);
2674 3168
2675 EV_FREQUENT_CHECK; 3169 EV_FREQUENT_CHECK;
2676} 3170}
… …
2685 EV_FREQUENT_CHECK; 3179 EV_FREQUENT_CHECK;
2686 3180
2687#if EV_USE_INOTIFY 3181#if EV_USE_INOTIFY
2688 infy_del (EV_A_ w); 3182 infy_del (EV_A_ w);
2689#endif 3183#endif
3184
3185 if (ev_is_active (&w->timer))
3186 {
3187 ev_ref (EV_A);
2690 ev_timer_stop (EV_A_ &w->timer); 3188 ev_timer_stop (EV_A_ &w->timer);
3189 }
2691 3190
2692 ev_stop (EV_A_ (W)w); 3191 ev_stop (EV_A_ (W)w);
2693 3192
2694 EV_FREQUENT_CHECK; 3193 EV_FREQUENT_CHECK;
2695} 3194}
… …
2836embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3335embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2837{ 3336{
2838 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3337 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2839 3338
2840 { 3339 {
2841 struct ev_loop *loop = w->other; 3340 EV_P = w->other;
2842 3341
2843 while (fdchangecnt) 3342 while (fdchangecnt)
2844 { 3343 {
2845 fd_reify (EV_A); 3344 fd_reify (EV_A);
2846 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3345 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
2851static void 3350static void
2852embed_fork_cb (EV_P_ ev_fork *fork_w, int revents) 3351embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2853{ 3352{
2854 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3353 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2855 3354
3355 ev_embed_stop (EV_A_ w);
3356
2856 { 3357 {
2857 struct ev_loop *loop = w->other; 3358 EV_P = w->other;
2858 3359
2859 ev_loop_fork (EV_A); 3360 ev_loop_fork (EV_A);
3361 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2860 } 3362 }
3363
3364 ev_embed_start (EV_A_ w);
2861} 3365}
2862 3366
2863#if 0 3367#if 0
2864static void 3368static void
2865embed_idle_cb (EV_P_ ev_idle *idle, int revents) 3369embed_idle_cb (EV_P_ ev_idle *idle, int revents)
… …
2873{ 3377{
2874 if (expect_false (ev_is_active (w))) 3378 if (expect_false (ev_is_active (w)))
2875 return; 3379 return;
2876 3380
2877 { 3381 {
2878 struct ev_loop *loop = w->other; 3382 EV_P = w->other;
2879 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3383 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2880 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3384 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2881 } 3385 }
2882 3386
2883 EV_FREQUENT_CHECK; 3387 EV_FREQUENT_CHECK;
2884 3388
… …
2995 3499
2996void 3500void
2997ev_async_send (EV_P_ ev_async *w) 3501ev_async_send (EV_P_ ev_async *w)
2998{ 3502{
2999 w->sent = 1; 3503 w->sent = 1;
3000 evpipe_write (EV_A_ &gotasync); 3504 evpipe_write (EV_A_ &async_pending);
3001} 3505}
3002#endif 3506#endif
3003 3507
3004/*****************************************************************************/ 3508/*****************************************************************************/
3005 3509
… …
3067 ev_timer_set (&once->to, timeout, 0.); 3571 ev_timer_set (&once->to, timeout, 0.);
3068 ev_timer_start (EV_A_ &once->to); 3572 ev_timer_start (EV_A_ &once->to);
3069 } 3573 }
3070} 3574}
3071 3575
3576/*****************************************************************************/
3577
3578#if EV_WALK_ENABLE
3579void
3580ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3581{
3582 int i, j;
3583 ev_watcher_list *wl, *wn;
3584
3585 if (types & (EV_IO | EV_EMBED))
3586 for (i = 0; i < anfdmax; ++i)
3587 for (wl = anfds [i].head; wl; )
3588 {
3589 wn = wl->next;
3590
3591#if EV_EMBED_ENABLE
3592 if (ev_cb ((ev_io *)wl) == embed_io_cb)
3593 {
3594 if (types & EV_EMBED)
3595 cb (EV_A_ EV_EMBED, ((char *)wl) - offsetof (struct ev_embed, io));
3596 }
3597 else
3598#endif
3599#if EV_USE_INOTIFY
3600 if (ev_cb ((ev_io *)wl) == infy_cb)
3601 ;
3602 else
3603#endif
3604 if ((ev_io *)wl != &pipe_w)
3605 if (types & EV_IO)
3606 cb (EV_A_ EV_IO, wl);
3607
3608 wl = wn;
3609 }
3610
3611 if (types & (EV_TIMER | EV_STAT))
3612 for (i = timercnt + HEAP0; i-- > HEAP0; )
3613#if EV_STAT_ENABLE
3614 /*TODO: timer is not always active*/
3615 if (ev_cb ((ev_timer *)ANHE_w (timers [i])) == stat_timer_cb)
3616 {
3617 if (types & EV_STAT)
3618 cb (EV_A_ EV_STAT, ((char *)ANHE_w (timers [i])) - offsetof (struct ev_stat, timer));
3619 }
3620 else
3621#endif
3622 if (types & EV_TIMER)
3623 cb (EV_A_ EV_TIMER, ANHE_w (timers [i]));
3624
3625#if EV_PERIODIC_ENABLE
3626 if (types & EV_PERIODIC)
3627 for (i = periodiccnt + HEAP0; i-- > HEAP0; )
3628 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3629#endif
3630
3631#if EV_IDLE_ENABLE
3632 if (types & EV_IDLE)
3633 for (j = NUMPRI; i--; )
3634 for (i = idlecnt [j]; i--; )
3635 cb (EV_A_ EV_IDLE, idles [j][i]);
3636#endif
3637
3638#if EV_FORK_ENABLE
3639 if (types & EV_FORK)
3640 for (i = forkcnt; i--; )
3641 if (ev_cb (forks [i]) != embed_fork_cb)
3642 cb (EV_A_ EV_FORK, forks [i]);
3643#endif
3644
3645#if EV_ASYNC_ENABLE
3646 if (types & EV_ASYNC)
3647 for (i = asynccnt; i--; )
3648 cb (EV_A_ EV_ASYNC, asyncs [i]);
3649#endif
3650
3651 if (types & EV_PREPARE)
3652 for (i = preparecnt; i--; )
3653#if EV_EMBED_ENABLE
3654 if (ev_cb (prepares [i]) != embed_prepare_cb)
3655#endif
3656 cb (EV_A_ EV_PREPARE, prepares [i]);
3657
3658 if (types & EV_CHECK)
3659 for (i = checkcnt; i--; )
3660 cb (EV_A_ EV_CHECK, checks [i]);
3661
3662 if (types & EV_SIGNAL)
3663 for (i = 0; i < EV_NSIG - 1; ++i)
3664 for (wl = signals [i].head; wl; )
3665 {
3666 wn = wl->next;
3667 cb (EV_A_ EV_SIGNAL, wl);
3668 wl = wn;
3669 }
3670
3671 if (types & EV_CHILD)
3672 for (i = EV_PID_HASHSIZE; i--; )
3673 for (wl = childs [i]; wl; )
3674 {
3675 wn = wl->next;
3676 cb (EV_A_ EV_CHILD, wl);
3677 wl = wn;
3678 }
3679/* EV_STAT 0x00001000 /* stat data changed */
3680/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3681}
3682#endif
3683
3072#if EV_MULTIPLICITY 3684#if EV_MULTIPLICITY
3073 #include "ev_wrap.h" 3685 #include "ev_wrap.h"
3074#endif 3686#endif
3075 3687
3076#ifdef __cplusplus 3688#ifdef __cplusplus

Diff Legend

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