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

Comparing libev/ev.c (file contents):
Revision 1.252 by root, Thu May 22 03:43:32 2008 UTC vs.
Revision 1.303 by root, Sun Jul 19 01:36:34 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
… …
154#ifndef _WIN32 176#ifndef _WIN32
155# include <sys/time.h> 177# include <sys/time.h>
156# include <sys/wait.h> 178# include <sys/wait.h>
157# include <unistd.h> 179# include <unistd.h>
158#else 180#else
181# include <io.h>
159# define WIN32_LEAN_AND_MEAN 182# define WIN32_LEAN_AND_MEAN
160# include <windows.h> 183# include <windows.h>
161# ifndef EV_SELECT_IS_WINSOCKET 184# ifndef EV_SELECT_IS_WINSOCKET
162# define EV_SELECT_IS_WINSOCKET 1 185# define EV_SELECT_IS_WINSOCKET 1
163# endif 186# endif
164#endif 187#endif
165 188
166/* this block tries to deduce configuration from header-defined symbols and defaults */ 189/* this block tries to deduce configuration from header-defined symbols and defaults */
167 190
191#ifndef EV_USE_CLOCK_SYSCALL
192# if __linux && __GLIBC__ >= 2
193# define EV_USE_CLOCK_SYSCALL 1
194# else
195# define EV_USE_CLOCK_SYSCALL 0
196# endif
197#endif
198
168#ifndef EV_USE_MONOTONIC 199#ifndef EV_USE_MONOTONIC
200# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
201# define EV_USE_MONOTONIC 1
202# else
169# define EV_USE_MONOTONIC 0 203# define EV_USE_MONOTONIC 0
204# endif
170#endif 205#endif
171 206
172#ifndef EV_USE_REALTIME 207#ifndef EV_USE_REALTIME
173# define EV_USE_REALTIME 0 208# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
174#endif 209#endif
175 210
176#ifndef EV_USE_NANOSLEEP 211#ifndef EV_USE_NANOSLEEP
212# if _POSIX_C_SOURCE >= 199309L
213# define EV_USE_NANOSLEEP 1
214# else
177# define EV_USE_NANOSLEEP 0 215# define EV_USE_NANOSLEEP 0
216# endif
178#endif 217#endif
179 218
180#ifndef EV_USE_SELECT 219#ifndef EV_USE_SELECT
181# define EV_USE_SELECT 1 220# define EV_USE_SELECT 1
182#endif 221#endif
… …
235# else 274# else
236# define EV_USE_EVENTFD 0 275# define EV_USE_EVENTFD 0
237# endif 276# endif
238#endif 277#endif
239 278
279#ifndef EV_USE_SIGNALFD
280# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9))
281# define EV_USE_SIGNALFD 1
282# else
283# define EV_USE_SIGNALFD 0
284# endif
285#endif
286
240#if 0 /* debugging */ 287#if 0 /* debugging */
241# define EV_VERIFY 3 288# define EV_VERIFY 3
242# define EV_USE_4HEAP 1 289# define EV_USE_4HEAP 1
243# define EV_HEAP_CACHE_AT 1 290# define EV_HEAP_CACHE_AT 1
244#endif 291#endif
… …
253 300
254#ifndef EV_HEAP_CACHE_AT 301#ifndef EV_HEAP_CACHE_AT
255# define EV_HEAP_CACHE_AT !EV_MINIMAL 302# define EV_HEAP_CACHE_AT !EV_MINIMAL
256#endif 303#endif
257 304
305/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
306/* which makes programs even slower. might work on other unices, too. */
307#if EV_USE_CLOCK_SYSCALL
308# include <syscall.h>
309# ifdef SYS_clock_gettime
310# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
311# undef EV_USE_MONOTONIC
312# define EV_USE_MONOTONIC 1
313# else
314# undef EV_USE_CLOCK_SYSCALL
315# define EV_USE_CLOCK_SYSCALL 0
316# endif
317#endif
318
258/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 319/* this block fixes any misconfiguration where we know we run into trouble otherwise */
259 320
260#ifndef CLOCK_MONOTONIC 321#ifndef CLOCK_MONOTONIC
261# undef EV_USE_MONOTONIC 322# undef EV_USE_MONOTONIC
262# define EV_USE_MONOTONIC 0 323# define EV_USE_MONOTONIC 0
… …
277# include <sys/select.h> 338# include <sys/select.h>
278# endif 339# endif
279#endif 340#endif
280 341
281#if EV_USE_INOTIFY 342#if EV_USE_INOTIFY
343# include <sys/utsname.h>
344# include <sys/statfs.h>
282# include <sys/inotify.h> 345# include <sys/inotify.h>
346/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
347# ifndef IN_DONT_FOLLOW
348# undef EV_USE_INOTIFY
349# define EV_USE_INOTIFY 0
350# endif
283#endif 351#endif
284 352
285#if EV_SELECT_IS_WINSOCKET 353#if EV_SELECT_IS_WINSOCKET
286# include <winsock.h> 354# include <winsock.h>
287#endif 355#endif
288 356
289#if EV_USE_EVENTFD 357#if EV_USE_EVENTFD
290/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 358/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
291# include <stdint.h> 359# include <stdint.h>
360# ifndef EFD_NONBLOCK
361# define EFD_NONBLOCK O_NONBLOCK
362# endif
363# ifndef EFD_CLOEXEC
364# define EFD_CLOEXEC O_CLOEXEC
365# endif
292# ifdef __cplusplus 366# ifdef __cplusplus
293extern "C" { 367extern "C" {
294# endif 368# endif
295int eventfd (unsigned int initval, int flags); 369int eventfd (unsigned int initval, int flags);
296# ifdef __cplusplus 370# ifdef __cplusplus
297} 371}
298# endif 372# endif
373#endif
374
375#if EV_USE_SIGNALFD
376# include <sys/signalfd.h>
299#endif 377#endif
300 378
301/**/ 379/**/
302 380
303#if EV_VERIFY >= 3 381#if EV_VERIFY >= 3
… …
339# define inline_speed static noinline 417# define inline_speed static noinline
340#else 418#else
341# define inline_speed static inline 419# define inline_speed static inline
342#endif 420#endif
343 421
344#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 422#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
423
424#if EV_MINPRI == EV_MAXPRI
425# define ABSPRI(w) (((W)w), 0)
426#else
345#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 427# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
428#endif
346 429
347#define EMPTY /* required for microsofts broken pseudo-c compiler */ 430#define EMPTY /* required for microsofts broken pseudo-c compiler */
348#define EMPTY2(a,b) /* used to suppress some warnings */ 431#define EMPTY2(a,b) /* used to suppress some warnings */
349 432
350typedef ev_watcher *W; 433typedef ev_watcher *W;
… …
352typedef ev_watcher_time *WT; 435typedef ev_watcher_time *WT;
353 436
354#define ev_active(w) ((W)(w))->active 437#define ev_active(w) ((W)(w))->active
355#define ev_at(w) ((WT)(w))->at 438#define ev_at(w) ((WT)(w))->at
356 439
357#if EV_USE_MONOTONIC 440#if EV_USE_REALTIME
358/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 441/* sig_atomic_t is used to avoid per-thread variables or locking but still */
359/* giving it a reasonably high chance of working on typical architetcures */ 442/* giving it a reasonably high chance of working on typical architetcures */
443static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
444#endif
445
446#if EV_USE_MONOTONIC
360static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 447static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
361#endif 448#endif
362 449
363#ifdef _WIN32 450#ifdef _WIN32
364# include "ev_win32.c" 451# include "ev_win32.c"
… …
373{ 460{
374 syserr_cb = cb; 461 syserr_cb = cb;
375} 462}
376 463
377static void noinline 464static void noinline
378syserr (const char *msg) 465ev_syserr (const char *msg)
379{ 466{
380 if (!msg) 467 if (!msg)
381 msg = "(libev) system error"; 468 msg = "(libev) system error";
382 469
383 if (syserr_cb) 470 if (syserr_cb)
… …
429#define ev_malloc(size) ev_realloc (0, (size)) 516#define ev_malloc(size) ev_realloc (0, (size))
430#define ev_free(ptr) ev_realloc ((ptr), 0) 517#define ev_free(ptr) ev_realloc ((ptr), 0)
431 518
432/*****************************************************************************/ 519/*****************************************************************************/
433 520
521/* set in reify when reification needed */
522#define EV_ANFD_REIFY 1
523
524/* file descriptor info structure */
434typedef struct 525typedef struct
435{ 526{
436 WL head; 527 WL head;
437 unsigned char events; 528 unsigned char events; /* the events watched for */
529 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
530 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
438 unsigned char reify; 531 unsigned char unused;
532#if EV_USE_EPOLL
533 unsigned int egen; /* generation counter to counter epoll bugs */
534#endif
439#if EV_SELECT_IS_WINSOCKET 535#if EV_SELECT_IS_WINSOCKET
440 SOCKET handle; 536 SOCKET handle;
441#endif 537#endif
442} ANFD; 538} ANFD;
443 539
540/* stores the pending event set for a given watcher */
444typedef struct 541typedef struct
445{ 542{
446 W w; 543 W w;
447 int events; 544 int events; /* the pending event set for the given watcher */
448} ANPENDING; 545} ANPENDING;
449 546
450#if EV_USE_INOTIFY 547#if EV_USE_INOTIFY
451/* hash table entry per inotify-id */ 548/* hash table entry per inotify-id */
452typedef struct 549typedef struct
… …
455} ANFS; 552} ANFS;
456#endif 553#endif
457 554
458/* Heap Entry */ 555/* Heap Entry */
459#if EV_HEAP_CACHE_AT 556#if EV_HEAP_CACHE_AT
557 /* a heap element */
460 typedef struct { 558 typedef struct {
461 ev_tstamp at; 559 ev_tstamp at;
462 WT w; 560 WT w;
463 } ANHE; 561 } ANHE;
464 562
465 #define ANHE_w(he) (he).w /* access watcher, read-write */ 563 #define ANHE_w(he) (he).w /* access watcher, read-write */
466 #define ANHE_at(he) (he).at /* access cached at, read-only */ 564 #define ANHE_at(he) (he).at /* access cached at, read-only */
467 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */ 565 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
468#else 566#else
567 /* a heap element */
469 typedef WT ANHE; 568 typedef WT ANHE;
470 569
471 #define ANHE_w(he) (he) 570 #define ANHE_w(he) (he)
472 #define ANHE_at(he) (he)->at 571 #define ANHE_at(he) (he)->at
473 #define ANHE_at_cache(he) 572 #define ANHE_at_cache(he)
… …
497 596
498 static int ev_default_loop_ptr; 597 static int ev_default_loop_ptr;
499 598
500#endif 599#endif
501 600
601#if EV_MINIMAL < 2
602# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
603# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
604# define EV_INVOKE_PENDING invoke_cb (EV_A)
605#else
606# define EV_RELEASE_CB (void)0
607# define EV_ACQUIRE_CB (void)0
608# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
609#endif
610
611#define EVUNLOOP_RECURSE 0x80
612
502/*****************************************************************************/ 613/*****************************************************************************/
503 614
615#ifndef EV_HAVE_EV_TIME
504ev_tstamp 616ev_tstamp
505ev_time (void) 617ev_time (void)
506{ 618{
507#if EV_USE_REALTIME 619#if EV_USE_REALTIME
620 if (expect_true (have_realtime))
621 {
508 struct timespec ts; 622 struct timespec ts;
509 clock_gettime (CLOCK_REALTIME, &ts); 623 clock_gettime (CLOCK_REALTIME, &ts);
510 return ts.tv_sec + ts.tv_nsec * 1e-9; 624 return ts.tv_sec + ts.tv_nsec * 1e-9;
511#else 625 }
626#endif
627
512 struct timeval tv; 628 struct timeval tv;
513 gettimeofday (&tv, 0); 629 gettimeofday (&tv, 0);
514 return tv.tv_sec + tv.tv_usec * 1e-6; 630 return tv.tv_sec + tv.tv_usec * 1e-6;
515#endif
516} 631}
632#endif
517 633
518ev_tstamp inline_size 634inline_size ev_tstamp
519get_clock (void) 635get_clock (void)
520{ 636{
521#if EV_USE_MONOTONIC 637#if EV_USE_MONOTONIC
522 if (expect_true (have_monotonic)) 638 if (expect_true (have_monotonic))
523 { 639 {
… …
556 struct timeval tv; 672 struct timeval tv;
557 673
558 tv.tv_sec = (time_t)delay; 674 tv.tv_sec = (time_t)delay;
559 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 675 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
560 676
677 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
678 /* something not guaranteed by newer posix versions, but guaranteed */
679 /* by older ones */
561 select (0, 0, 0, 0, &tv); 680 select (0, 0, 0, 0, &tv);
562#endif 681#endif
563 } 682 }
564} 683}
565 684
566/*****************************************************************************/ 685/*****************************************************************************/
567 686
568#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 687#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
569 688
570int inline_size 689/* find a suitable new size for the given array, */
690/* hopefully by rounding to a ncie-to-malloc size */
691inline_size int
571array_nextsize (int elem, int cur, int cnt) 692array_nextsize (int elem, int cur, int cnt)
572{ 693{
573 int ncur = cur + 1; 694 int ncur = cur + 1;
574 695
575 do 696 do
… …
592array_realloc (int elem, void *base, int *cur, int cnt) 713array_realloc (int elem, void *base, int *cur, int cnt)
593{ 714{
594 *cur = array_nextsize (elem, *cur, cnt); 715 *cur = array_nextsize (elem, *cur, cnt);
595 return ev_realloc (base, elem * *cur); 716 return ev_realloc (base, elem * *cur);
596} 717}
718
719#define array_init_zero(base,count) \
720 memset ((void *)(base), 0, sizeof (*(base)) * (count))
597 721
598#define array_needsize(type,base,cur,cnt,init) \ 722#define array_needsize(type,base,cur,cnt,init) \
599 if (expect_false ((cnt) > (cur))) \ 723 if (expect_false ((cnt) > (cur))) \
600 { \ 724 { \
601 int ocur_ = (cur); \ 725 int ocur_ = (cur); \
… …
613 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 737 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
614 } 738 }
615#endif 739#endif
616 740
617#define array_free(stem, idx) \ 741#define array_free(stem, idx) \
618 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 742 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
619 743
620/*****************************************************************************/ 744/*****************************************************************************/
745
746/* dummy callback for pending events */
747static void noinline
748pendingcb (EV_P_ ev_prepare *w, int revents)
749{
750}
621 751
622void noinline 752void noinline
623ev_feed_event (EV_P_ void *w, int revents) 753ev_feed_event (EV_P_ void *w, int revents)
624{ 754{
625 W w_ = (W)w; 755 W w_ = (W)w;
… …
634 pendings [pri][w_->pending - 1].w = w_; 764 pendings [pri][w_->pending - 1].w = w_;
635 pendings [pri][w_->pending - 1].events = revents; 765 pendings [pri][w_->pending - 1].events = revents;
636 } 766 }
637} 767}
638 768
639void inline_speed 769inline_speed void
770feed_reverse (EV_P_ W w)
771{
772 array_needsize (W, rfeeds, rfeedmax, rfeedcnt + 1, EMPTY2);
773 rfeeds [rfeedcnt++] = w;
774}
775
776inline_size void
777feed_reverse_done (EV_P_ int revents)
778{
779 do
780 ev_feed_event (EV_A_ rfeeds [--rfeedcnt], revents);
781 while (rfeedcnt);
782}
783
784inline_speed void
640queue_events (EV_P_ W *events, int eventcnt, int type) 785queue_events (EV_P_ W *events, int eventcnt, int type)
641{ 786{
642 int i; 787 int i;
643 788
644 for (i = 0; i < eventcnt; ++i) 789 for (i = 0; i < eventcnt; ++i)
645 ev_feed_event (EV_A_ events [i], type); 790 ev_feed_event (EV_A_ events [i], type);
646} 791}
647 792
648/*****************************************************************************/ 793/*****************************************************************************/
649 794
650void inline_size 795inline_speed void
651anfds_init (ANFD *base, int count)
652{
653 while (count--)
654 {
655 base->head = 0;
656 base->events = EV_NONE;
657 base->reify = 0;
658
659 ++base;
660 }
661}
662
663void inline_speed
664fd_event (EV_P_ int fd, int revents) 796fd_event_nc (EV_P_ int fd, int revents)
665{ 797{
666 ANFD *anfd = anfds + fd; 798 ANFD *anfd = anfds + fd;
667 ev_io *w; 799 ev_io *w;
668 800
669 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 801 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
673 if (ev) 805 if (ev)
674 ev_feed_event (EV_A_ (W)w, ev); 806 ev_feed_event (EV_A_ (W)w, ev);
675 } 807 }
676} 808}
677 809
810/* do not submit kernel events for fds that have reify set */
811/* because that means they changed while we were polling for new events */
812inline_speed void
813fd_event (EV_P_ int fd, int revents)
814{
815 ANFD *anfd = anfds + fd;
816
817 if (expect_true (!anfd->reify))
818 fd_event_nc (EV_A_ fd, revents);
819}
820
678void 821void
679ev_feed_fd_event (EV_P_ int fd, int revents) 822ev_feed_fd_event (EV_P_ int fd, int revents)
680{ 823{
681 if (fd >= 0 && fd < anfdmax) 824 if (fd >= 0 && fd < anfdmax)
682 fd_event (EV_A_ fd, revents); 825 fd_event_nc (EV_A_ fd, revents);
683} 826}
684 827
685void inline_size 828/* make sure the external fd watch events are in-sync */
829/* with the kernel/libev internal state */
830inline_size void
686fd_reify (EV_P) 831fd_reify (EV_P)
687{ 832{
688 int i; 833 int i;
689 834
690 for (i = 0; i < fdchangecnt; ++i) 835 for (i = 0; i < fdchangecnt; ++i)
… …
699 events |= (unsigned char)w->events; 844 events |= (unsigned char)w->events;
700 845
701#if EV_SELECT_IS_WINSOCKET 846#if EV_SELECT_IS_WINSOCKET
702 if (events) 847 if (events)
703 { 848 {
704 unsigned long argp; 849 unsigned long arg;
705 #ifdef EV_FD_TO_WIN32_HANDLE 850 #ifdef EV_FD_TO_WIN32_HANDLE
706 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 851 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
707 #else 852 #else
708 anfd->handle = _get_osfhandle (fd); 853 anfd->handle = _get_osfhandle (fd);
709 #endif 854 #endif
710 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 855 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
711 } 856 }
712#endif 857#endif
713 858
714 { 859 {
715 unsigned char o_events = anfd->events; 860 unsigned char o_events = anfd->events;
716 unsigned char o_reify = anfd->reify; 861 unsigned char o_reify = anfd->reify;
717 862
718 anfd->reify = 0; 863 anfd->reify = 0;
719 anfd->events = events; 864 anfd->events = events;
720 865
721 if (o_events != events || o_reify & EV_IOFDSET) 866 if (o_events != events || o_reify & EV__IOFDSET)
722 backend_modify (EV_A_ fd, o_events, events); 867 backend_modify (EV_A_ fd, o_events, events);
723 } 868 }
724 } 869 }
725 870
726 fdchangecnt = 0; 871 fdchangecnt = 0;
727} 872}
728 873
729void inline_size 874/* something about the given fd changed */
875inline_size void
730fd_change (EV_P_ int fd, int flags) 876fd_change (EV_P_ int fd, int flags)
731{ 877{
732 unsigned char reify = anfds [fd].reify; 878 unsigned char reify = anfds [fd].reify;
733 anfds [fd].reify |= flags; 879 anfds [fd].reify |= flags;
734 880
… …
738 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 884 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
739 fdchanges [fdchangecnt - 1] = fd; 885 fdchanges [fdchangecnt - 1] = fd;
740 } 886 }
741} 887}
742 888
743void inline_speed 889/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
890inline_speed void
744fd_kill (EV_P_ int fd) 891fd_kill (EV_P_ int fd)
745{ 892{
746 ev_io *w; 893 ev_io *w;
747 894
748 while ((w = (ev_io *)anfds [fd].head)) 895 while ((w = (ev_io *)anfds [fd].head))
… …
750 ev_io_stop (EV_A_ w); 897 ev_io_stop (EV_A_ w);
751 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 898 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
752 } 899 }
753} 900}
754 901
755int inline_size 902/* check whether the given fd is atcually valid, for error recovery */
903inline_size int
756fd_valid (int fd) 904fd_valid (int fd)
757{ 905{
758#ifdef _WIN32 906#ifdef _WIN32
759 return _get_osfhandle (fd) != -1; 907 return _get_osfhandle (fd) != -1;
760#else 908#else
… …
768{ 916{
769 int fd; 917 int fd;
770 918
771 for (fd = 0; fd < anfdmax; ++fd) 919 for (fd = 0; fd < anfdmax; ++fd)
772 if (anfds [fd].events) 920 if (anfds [fd].events)
773 if (!fd_valid (fd) == -1 && errno == EBADF) 921 if (!fd_valid (fd) && errno == EBADF)
774 fd_kill (EV_A_ fd); 922 fd_kill (EV_A_ fd);
775} 923}
776 924
777/* called on ENOMEM in select/poll to kill some fds and retry */ 925/* called on ENOMEM in select/poll to kill some fds and retry */
778static void noinline 926static void noinline
… …
796 944
797 for (fd = 0; fd < anfdmax; ++fd) 945 for (fd = 0; fd < anfdmax; ++fd)
798 if (anfds [fd].events) 946 if (anfds [fd].events)
799 { 947 {
800 anfds [fd].events = 0; 948 anfds [fd].events = 0;
949 anfds [fd].emask = 0;
801 fd_change (EV_A_ fd, EV_IOFDSET | 1); 950 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
802 } 951 }
803} 952}
804 953
805/*****************************************************************************/ 954/*****************************************************************************/
806 955
… …
822#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 971#define HEAP0 (DHEAP - 1) /* index of first element in heap */
823#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 972#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
824#define UPHEAP_DONE(p,k) ((p) == (k)) 973#define UPHEAP_DONE(p,k) ((p) == (k))
825 974
826/* away from the root */ 975/* away from the root */
827void inline_speed 976inline_speed void
828downheap (ANHE *heap, int N, int k) 977downheap (ANHE *heap, int N, int k)
829{ 978{
830 ANHE he = heap [k]; 979 ANHE he = heap [k];
831 ANHE *E = heap + N + HEAP0; 980 ANHE *E = heap + N + HEAP0;
832 981
… …
872#define HEAP0 1 1021#define HEAP0 1
873#define HPARENT(k) ((k) >> 1) 1022#define HPARENT(k) ((k) >> 1)
874#define UPHEAP_DONE(p,k) (!(p)) 1023#define UPHEAP_DONE(p,k) (!(p))
875 1024
876/* away from the root */ 1025/* away from the root */
877void inline_speed 1026inline_speed void
878downheap (ANHE *heap, int N, int k) 1027downheap (ANHE *heap, int N, int k)
879{ 1028{
880 ANHE he = heap [k]; 1029 ANHE he = heap [k];
881 1030
882 for (;;) 1031 for (;;)
… …
902 ev_active (ANHE_w (he)) = k; 1051 ev_active (ANHE_w (he)) = k;
903} 1052}
904#endif 1053#endif
905 1054
906/* towards the root */ 1055/* towards the root */
907void inline_speed 1056inline_speed void
908upheap (ANHE *heap, int k) 1057upheap (ANHE *heap, int k)
909{ 1058{
910 ANHE he = heap [k]; 1059 ANHE he = heap [k];
911 1060
912 for (;;) 1061 for (;;)
… …
923 1072
924 heap [k] = he; 1073 heap [k] = he;
925 ev_active (ANHE_w (he)) = k; 1074 ev_active (ANHE_w (he)) = k;
926} 1075}
927 1076
928void inline_size 1077/* move an element suitably so it is in a correct place */
1078inline_size void
929adjustheap (ANHE *heap, int N, int k) 1079adjustheap (ANHE *heap, int N, int k)
930{ 1080{
931 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1081 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
932 upheap (heap, k); 1082 upheap (heap, k);
933 else 1083 else
934 downheap (heap, N, k); 1084 downheap (heap, N, k);
935} 1085}
936 1086
937/* rebuild the heap: this function is used only once and executed rarely */ 1087/* rebuild the heap: this function is used only once and executed rarely */
938void inline_size 1088inline_size void
939reheap (ANHE *heap, int N) 1089reheap (ANHE *heap, int N)
940{ 1090{
941 int i; 1091 int i;
942 1092
943 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 1093 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
… …
946 upheap (heap, i + HEAP0); 1096 upheap (heap, i + HEAP0);
947} 1097}
948 1098
949/*****************************************************************************/ 1099/*****************************************************************************/
950 1100
1101/* associate signal watchers to a signal signal */
951typedef struct 1102typedef struct
952{ 1103{
953 WL head; 1104 WL head;
954 EV_ATOMIC_T gotsig; 1105 EV_ATOMIC_T gotsig;
955} ANSIG; 1106} ANSIG;
… …
957static ANSIG *signals; 1108static ANSIG *signals;
958static int signalmax; 1109static int signalmax;
959 1110
960static EV_ATOMIC_T gotsig; 1111static EV_ATOMIC_T gotsig;
961 1112
962void inline_size
963signals_init (ANSIG *base, int count)
964{
965 while (count--)
966 {
967 base->head = 0;
968 base->gotsig = 0;
969
970 ++base;
971 }
972}
973
974/*****************************************************************************/ 1113/*****************************************************************************/
975 1114
976void inline_speed 1115/* used to prepare libev internal fd's */
1116/* this is not fork-safe */
1117inline_speed void
977fd_intern (int fd) 1118fd_intern (int fd)
978{ 1119{
979#ifdef _WIN32 1120#ifdef _WIN32
980 int arg = 1; 1121 unsigned long arg = 1;
981 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1122 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
982#else 1123#else
983 fcntl (fd, F_SETFD, FD_CLOEXEC); 1124 fcntl (fd, F_SETFD, FD_CLOEXEC);
984 fcntl (fd, F_SETFL, O_NONBLOCK); 1125 fcntl (fd, F_SETFL, O_NONBLOCK);
985#endif 1126#endif
986} 1127}
987 1128
988static void noinline 1129static void noinline
989evpipe_init (EV_P) 1130evpipe_init (EV_P)
990{ 1131{
991 if (!ev_is_active (&pipeev)) 1132 if (!ev_is_active (&pipe_w))
992 { 1133 {
993#if EV_USE_EVENTFD 1134#if EV_USE_EVENTFD
1135 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1136 if (evfd < 0 && errno == EINVAL)
994 if ((evfd = eventfd (0, 0)) >= 0) 1137 evfd = eventfd (0, 0);
1138
1139 if (evfd >= 0)
995 { 1140 {
996 evpipe [0] = -1; 1141 evpipe [0] = -1;
997 fd_intern (evfd); 1142 fd_intern (evfd); /* doing it twice doesn't hurt */
998 ev_io_set (&pipeev, evfd, EV_READ); 1143 ev_io_set (&pipe_w, evfd, EV_READ);
999 } 1144 }
1000 else 1145 else
1001#endif 1146#endif
1002 { 1147 {
1003 while (pipe (evpipe)) 1148 while (pipe (evpipe))
1004 syserr ("(libev) error creating signal/async pipe"); 1149 ev_syserr ("(libev) error creating signal/async pipe");
1005 1150
1006 fd_intern (evpipe [0]); 1151 fd_intern (evpipe [0]);
1007 fd_intern (evpipe [1]); 1152 fd_intern (evpipe [1]);
1008 ev_io_set (&pipeev, evpipe [0], EV_READ); 1153 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1009 } 1154 }
1010 1155
1011 ev_io_start (EV_A_ &pipeev); 1156 ev_io_start (EV_A_ &pipe_w);
1012 ev_unref (EV_A); /* watcher should not keep loop alive */ 1157 ev_unref (EV_A); /* watcher should not keep loop alive */
1013 } 1158 }
1014} 1159}
1015 1160
1016void inline_size 1161inline_size void
1017evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1162evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1018{ 1163{
1019 if (!*flag) 1164 if (!*flag)
1020 { 1165 {
1021 int old_errno = errno; /* save errno because write might clobber it */ 1166 int old_errno = errno; /* save errno because write might clobber it */
… …
1034 1179
1035 errno = old_errno; 1180 errno = old_errno;
1036 } 1181 }
1037} 1182}
1038 1183
1184/* called whenever the libev signal pipe */
1185/* got some events (signal, async) */
1039static void 1186static void
1040pipecb (EV_P_ ev_io *iow, int revents) 1187pipecb (EV_P_ ev_io *iow, int revents)
1041{ 1188{
1042#if EV_USE_EVENTFD 1189#if EV_USE_EVENTFD
1043 if (evfd >= 0) 1190 if (evfd >= 0)
… …
1099ev_feed_signal_event (EV_P_ int signum) 1246ev_feed_signal_event (EV_P_ int signum)
1100{ 1247{
1101 WL w; 1248 WL w;
1102 1249
1103#if EV_MULTIPLICITY 1250#if EV_MULTIPLICITY
1104 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1251 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
1105#endif 1252#endif
1106 1253
1107 --signum; 1254 --signum;
1108 1255
1109 if (signum < 0 || signum >= signalmax) 1256 if (signum < 0 || signum >= signalmax)
… …
1113 1260
1114 for (w = signals [signum].head; w; w = w->next) 1261 for (w = signals [signum].head; w; w = w->next)
1115 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1262 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1116} 1263}
1117 1264
1265#if EV_USE_SIGNALFD
1266static void
1267sigfdcb (EV_P_ ev_io *iow, int revents)
1268{
1269 struct signalfd_siginfo si[4], *sip;
1270
1271 for (;;)
1272 {
1273 ssize_t res = read (sigfd, si, sizeof (si));
1274
1275 /* not ISO-C, as res might be -1, but works with SuS */
1276 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1277 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1278
1279 if (res < (ssize_t)sizeof (si))
1280 break;
1281 }
1282}
1283#endif
1284
1118/*****************************************************************************/ 1285/*****************************************************************************/
1119 1286
1120static WL childs [EV_PID_HASHSIZE]; 1287static WL childs [EV_PID_HASHSIZE];
1121 1288
1122#ifndef _WIN32 1289#ifndef _WIN32
… …
1125 1292
1126#ifndef WIFCONTINUED 1293#ifndef WIFCONTINUED
1127# define WIFCONTINUED(status) 0 1294# define WIFCONTINUED(status) 0
1128#endif 1295#endif
1129 1296
1130void inline_speed 1297/* handle a single child status event */
1298inline_speed void
1131child_reap (EV_P_ int chain, int pid, int status) 1299child_reap (EV_P_ int chain, int pid, int status)
1132{ 1300{
1133 ev_child *w; 1301 ev_child *w;
1134 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1302 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1135 1303
… …
1148 1316
1149#ifndef WCONTINUED 1317#ifndef WCONTINUED
1150# define WCONTINUED 0 1318# define WCONTINUED 0
1151#endif 1319#endif
1152 1320
1321/* called on sigchld etc., calls waitpid */
1153static void 1322static void
1154childcb (EV_P_ ev_signal *sw, int revents) 1323childcb (EV_P_ ev_signal *sw, int revents)
1155{ 1324{
1156 int pid, status; 1325 int pid, status;
1157 1326
… …
1238 /* kqueue is borked on everything but netbsd apparently */ 1407 /* kqueue is borked on everything but netbsd apparently */
1239 /* it usually doesn't work correctly on anything but sockets and pipes */ 1408 /* it usually doesn't work correctly on anything but sockets and pipes */
1240 flags &= ~EVBACKEND_KQUEUE; 1409 flags &= ~EVBACKEND_KQUEUE;
1241#endif 1410#endif
1242#ifdef __APPLE__ 1411#ifdef __APPLE__
1243 // flags &= ~EVBACKEND_KQUEUE; for documentation 1412 /* only select works correctly on that "unix-certified" platform */
1244 flags &= ~EVBACKEND_POLL; 1413 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1414 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1245#endif 1415#endif
1246 1416
1247 return flags; 1417 return flags;
1248} 1418}
1249 1419
… …
1263ev_backend (EV_P) 1433ev_backend (EV_P)
1264{ 1434{
1265 return backend; 1435 return backend;
1266} 1436}
1267 1437
1438#if EV_MINIMAL < 2
1268unsigned int 1439unsigned int
1269ev_loop_count (EV_P) 1440ev_loop_count (EV_P)
1270{ 1441{
1271 return loop_count; 1442 return loop_count;
1272} 1443}
1273 1444
1445unsigned int
1446ev_loop_depth (EV_P)
1447{
1448 return loop_depth;
1449}
1450
1274void 1451void
1275ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1452ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1276{ 1453{
1277 io_blocktime = interval; 1454 io_blocktime = interval;
1278} 1455}
… …
1281ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1458ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1282{ 1459{
1283 timeout_blocktime = interval; 1460 timeout_blocktime = interval;
1284} 1461}
1285 1462
1463void
1464ev_set_userdata (EV_P_ void *data)
1465{
1466 userdata = data;
1467}
1468
1469void *
1470ev_userdata (EV_P)
1471{
1472 return userdata;
1473}
1474
1475void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1476{
1477 invoke_cb = invoke_pending_cb;
1478}
1479
1480void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1481{
1482 release_cb = release;
1483 acquire_cb = acquire;
1484}
1485#endif
1486
1487/* initialise a loop structure, must be zero-initialised */
1286static void noinline 1488static void noinline
1287loop_init (EV_P_ unsigned int flags) 1489loop_init (EV_P_ unsigned int flags)
1288{ 1490{
1289 if (!backend) 1491 if (!backend)
1290 { 1492 {
1493#if EV_USE_REALTIME
1494 if (!have_realtime)
1495 {
1496 struct timespec ts;
1497
1498 if (!clock_gettime (CLOCK_REALTIME, &ts))
1499 have_realtime = 1;
1500 }
1501#endif
1502
1291#if EV_USE_MONOTONIC 1503#if EV_USE_MONOTONIC
1504 if (!have_monotonic)
1292 { 1505 {
1293 struct timespec ts; 1506 struct timespec ts;
1507
1294 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1508 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1295 have_monotonic = 1; 1509 have_monotonic = 1;
1296 } 1510 }
1297#endif 1511#endif
1298 1512
1299 ev_rt_now = ev_time (); 1513 ev_rt_now = ev_time ();
1300 mn_now = get_clock (); 1514 mn_now = get_clock ();
1301 now_floor = mn_now; 1515 now_floor = mn_now;
1302 rtmn_diff = ev_rt_now - mn_now; 1516 rtmn_diff = ev_rt_now - mn_now;
1517#if EV_MINIMAL < 2
1518 invoke_cb = ev_invoke_pending;
1519#endif
1303 1520
1304 io_blocktime = 0.; 1521 io_blocktime = 0.;
1305 timeout_blocktime = 0.; 1522 timeout_blocktime = 0.;
1306 backend = 0; 1523 backend = 0;
1307 backend_fd = -1; 1524 backend_fd = -1;
1308 gotasync = 0; 1525 gotasync = 0;
1309#if EV_USE_INOTIFY 1526#if EV_USE_INOTIFY
1310 fs_fd = -2; 1527 fs_fd = -2;
1311#endif 1528#endif
1529#if EV_USE_SIGNALFD
1530 sigfd = -2;
1531#endif
1312 1532
1313 /* pid check not overridable via env */ 1533 /* pid check not overridable via env */
1314#ifndef _WIN32 1534#ifndef _WIN32
1315 if (flags & EVFLAG_FORKCHECK) 1535 if (flags & EVFLAG_FORKCHECK)
1316 curpid = getpid (); 1536 curpid = getpid ();
… …
1338#endif 1558#endif
1339#if EV_USE_SELECT 1559#if EV_USE_SELECT
1340 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1560 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1341#endif 1561#endif
1342 1562
1563 ev_prepare_init (&pending_w, pendingcb);
1564
1343 ev_init (&pipeev, pipecb); 1565 ev_init (&pipe_w, pipecb);
1344 ev_set_priority (&pipeev, EV_MAXPRI); 1566 ev_set_priority (&pipe_w, EV_MAXPRI);
1345 } 1567 }
1346} 1568}
1347 1569
1570/* free up a loop structure */
1348static void noinline 1571static void noinline
1349loop_destroy (EV_P) 1572loop_destroy (EV_P)
1350{ 1573{
1351 int i; 1574 int i;
1352 1575
1353 if (ev_is_active (&pipeev)) 1576 if (ev_is_active (&pipe_w))
1354 { 1577 {
1355 ev_ref (EV_A); /* signal watcher */ 1578 /*ev_ref (EV_A);*/
1356 ev_io_stop (EV_A_ &pipeev); 1579 /*ev_io_stop (EV_A_ &pipe_w);*/
1357 1580
1358#if EV_USE_EVENTFD 1581#if EV_USE_EVENTFD
1359 if (evfd >= 0) 1582 if (evfd >= 0)
1360 close (evfd); 1583 close (evfd);
1361#endif 1584#endif
… …
1365 close (evpipe [0]); 1588 close (evpipe [0]);
1366 close (evpipe [1]); 1589 close (evpipe [1]);
1367 } 1590 }
1368 } 1591 }
1369 1592
1593#if EV_USE_SIGNALFD
1594 if (ev_is_active (&sigfd_w))
1595 {
1596 /*ev_ref (EV_A);*/
1597 /*ev_io_stop (EV_A_ &sigfd_w);*/
1598
1599 close (sigfd);
1600 }
1601#endif
1602
1370#if EV_USE_INOTIFY 1603#if EV_USE_INOTIFY
1371 if (fs_fd >= 0) 1604 if (fs_fd >= 0)
1372 close (fs_fd); 1605 close (fs_fd);
1373#endif 1606#endif
1374 1607
… …
1400 } 1633 }
1401 1634
1402 ev_free (anfds); anfdmax = 0; 1635 ev_free (anfds); anfdmax = 0;
1403 1636
1404 /* have to use the microsoft-never-gets-it-right macro */ 1637 /* have to use the microsoft-never-gets-it-right macro */
1638 array_free (rfeed, EMPTY);
1405 array_free (fdchange, EMPTY); 1639 array_free (fdchange, EMPTY);
1406 array_free (timer, EMPTY); 1640 array_free (timer, EMPTY);
1407#if EV_PERIODIC_ENABLE 1641#if EV_PERIODIC_ENABLE
1408 array_free (periodic, EMPTY); 1642 array_free (periodic, EMPTY);
1409#endif 1643#endif
… …
1418 1652
1419 backend = 0; 1653 backend = 0;
1420} 1654}
1421 1655
1422#if EV_USE_INOTIFY 1656#if EV_USE_INOTIFY
1423void inline_size infy_fork (EV_P); 1657inline_size void infy_fork (EV_P);
1424#endif 1658#endif
1425 1659
1426void inline_size 1660inline_size void
1427loop_fork (EV_P) 1661loop_fork (EV_P)
1428{ 1662{
1429#if EV_USE_PORT 1663#if EV_USE_PORT
1430 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1664 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1431#endif 1665#endif
… …
1437#endif 1671#endif
1438#if EV_USE_INOTIFY 1672#if EV_USE_INOTIFY
1439 infy_fork (EV_A); 1673 infy_fork (EV_A);
1440#endif 1674#endif
1441 1675
1442 if (ev_is_active (&pipeev)) 1676 if (ev_is_active (&pipe_w))
1443 { 1677 {
1444 /* this "locks" the handlers against writing to the pipe */ 1678 /* this "locks" the handlers against writing to the pipe */
1445 /* while we modify the fd vars */ 1679 /* while we modify the fd vars */
1446 gotsig = 1; 1680 gotsig = 1;
1447#if EV_ASYNC_ENABLE 1681#if EV_ASYNC_ENABLE
1448 gotasync = 1; 1682 gotasync = 1;
1449#endif 1683#endif
1450 1684
1451 ev_ref (EV_A); 1685 ev_ref (EV_A);
1452 ev_io_stop (EV_A_ &pipeev); 1686 ev_io_stop (EV_A_ &pipe_w);
1453 1687
1454#if EV_USE_EVENTFD 1688#if EV_USE_EVENTFD
1455 if (evfd >= 0) 1689 if (evfd >= 0)
1456 close (evfd); 1690 close (evfd);
1457#endif 1691#endif
… …
1462 close (evpipe [1]); 1696 close (evpipe [1]);
1463 } 1697 }
1464 1698
1465 evpipe_init (EV_A); 1699 evpipe_init (EV_A);
1466 /* now iterate over everything, in case we missed something */ 1700 /* now iterate over everything, in case we missed something */
1467 pipecb (EV_A_ &pipeev, EV_READ); 1701 pipecb (EV_A_ &pipe_w, EV_READ);
1468 } 1702 }
1469 1703
1470 postfork = 0; 1704 postfork = 0;
1471} 1705}
1472 1706
… …
1476ev_loop_new (unsigned int flags) 1710ev_loop_new (unsigned int flags)
1477{ 1711{
1478 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1712 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1479 1713
1480 memset (loop, 0, sizeof (struct ev_loop)); 1714 memset (loop, 0, sizeof (struct ev_loop));
1481
1482 loop_init (EV_A_ flags); 1715 loop_init (EV_A_ flags);
1483 1716
1484 if (ev_backend (EV_A)) 1717 if (ev_backend (EV_A))
1485 return loop; 1718 return loop;
1486 1719
… …
1497void 1730void
1498ev_loop_fork (EV_P) 1731ev_loop_fork (EV_P)
1499{ 1732{
1500 postfork = 1; /* must be in line with ev_default_fork */ 1733 postfork = 1; /* must be in line with ev_default_fork */
1501} 1734}
1735#endif /* multiplicity */
1502 1736
1503#if EV_VERIFY 1737#if EV_VERIFY
1504void noinline 1738static void noinline
1505verify_watcher (EV_P_ W w) 1739verify_watcher (EV_P_ W w)
1506{ 1740{
1507 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1741 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1508 1742
1509 if (w->pending) 1743 if (w->pending)
1510 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 1744 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1511} 1745}
1512 1746
1513static void noinline 1747static void noinline
1514verify_heap (EV_P_ ANHE *heap, int N) 1748verify_heap (EV_P_ ANHE *heap, int N)
1515{ 1749{
1516 int i; 1750 int i;
1517 1751
1518 for (i = HEAP0; i < N + HEAP0; ++i) 1752 for (i = HEAP0; i < N + HEAP0; ++i)
1519 { 1753 {
1520 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i)); 1754 assert (("libev: active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1521 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i]))); 1755 assert (("libev: heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1522 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i])))); 1756 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1523 1757
1524 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1758 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1525 } 1759 }
1526} 1760}
1527 1761
1528static void noinline 1762static void noinline
1529array_verify (EV_P_ W *ws, int cnt) 1763array_verify (EV_P_ W *ws, int cnt)
1530{ 1764{
1531 while (cnt--) 1765 while (cnt--)
1532 { 1766 {
1533 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1767 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1534 verify_watcher (EV_A_ ws [cnt]); 1768 verify_watcher (EV_A_ ws [cnt]);
1535 } 1769 }
1536} 1770}
1537#endif 1771#endif
1538 1772
1773#if EV_MINIMAL < 2
1539void 1774void
1540ev_loop_verify (EV_P) 1775ev_loop_verify (EV_P)
1541{ 1776{
1542#if EV_VERIFY 1777#if EV_VERIFY
1543 int i; 1778 int i;
… …
1545 1780
1546 assert (activecnt >= -1); 1781 assert (activecnt >= -1);
1547 1782
1548 assert (fdchangemax >= fdchangecnt); 1783 assert (fdchangemax >= fdchangecnt);
1549 for (i = 0; i < fdchangecnt; ++i) 1784 for (i = 0; i < fdchangecnt; ++i)
1550 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1785 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1551 1786
1552 assert (anfdmax >= 0); 1787 assert (anfdmax >= 0);
1553 for (i = 0; i < anfdmax; ++i) 1788 for (i = 0; i < anfdmax; ++i)
1554 for (w = anfds [i].head; w; w = w->next) 1789 for (w = anfds [i].head; w; w = w->next)
1555 { 1790 {
1556 verify_watcher (EV_A_ (W)w); 1791 verify_watcher (EV_A_ (W)w);
1557 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1792 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1558 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i)); 1793 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1559 } 1794 }
1560 1795
1561 assert (timermax >= timercnt); 1796 assert (timermax >= timercnt);
1562 verify_heap (EV_A_ timers, timercnt); 1797 verify_heap (EV_A_ timers, timercnt);
1563 1798
… …
1596 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1831 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1597 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1832 for (signum = signalmax; signum--; ) if (signals [signum].gotsig)
1598# endif 1833# endif
1599#endif 1834#endif
1600} 1835}
1601 1836#endif
1602#endif /* multiplicity */
1603 1837
1604#if EV_MULTIPLICITY 1838#if EV_MULTIPLICITY
1605struct ev_loop * 1839struct ev_loop *
1606ev_default_loop_init (unsigned int flags) 1840ev_default_loop_init (unsigned int flags)
1607#else 1841#else
… …
1640{ 1874{
1641#if EV_MULTIPLICITY 1875#if EV_MULTIPLICITY
1642 struct ev_loop *loop = ev_default_loop_ptr; 1876 struct ev_loop *loop = ev_default_loop_ptr;
1643#endif 1877#endif
1644 1878
1879 ev_default_loop_ptr = 0;
1880
1645#ifndef _WIN32 1881#ifndef _WIN32
1646 ev_ref (EV_A); /* child watcher */ 1882 ev_ref (EV_A); /* child watcher */
1647 ev_signal_stop (EV_A_ &childev); 1883 ev_signal_stop (EV_A_ &childev);
1648#endif 1884#endif
1649 1885
… …
1655{ 1891{
1656#if EV_MULTIPLICITY 1892#if EV_MULTIPLICITY
1657 struct ev_loop *loop = ev_default_loop_ptr; 1893 struct ev_loop *loop = ev_default_loop_ptr;
1658#endif 1894#endif
1659 1895
1660 if (backend)
1661 postfork = 1; /* must be in line with ev_loop_fork */ 1896 postfork = 1; /* must be in line with ev_loop_fork */
1662} 1897}
1663 1898
1664/*****************************************************************************/ 1899/*****************************************************************************/
1665 1900
1666void 1901void
1667ev_invoke (EV_P_ void *w, int revents) 1902ev_invoke (EV_P_ void *w, int revents)
1668{ 1903{
1669 EV_CB_INVOKE ((W)w, revents); 1904 EV_CB_INVOKE ((W)w, revents);
1670} 1905}
1671 1906
1672void inline_speed 1907unsigned int
1673call_pending (EV_P) 1908ev_pending_count (EV_P)
1909{
1910 int pri;
1911 unsigned int count = 0;
1912
1913 for (pri = NUMPRI; pri--; )
1914 count += pendingcnt [pri];
1915
1916 return count;
1917}
1918
1919void noinline
1920ev_invoke_pending (EV_P)
1674{ 1921{
1675 int pri; 1922 int pri;
1676 1923
1677 for (pri = NUMPRI; pri--; ) 1924 for (pri = NUMPRI; pri--; )
1678 while (pendingcnt [pri]) 1925 while (pendingcnt [pri])
1679 { 1926 {
1680 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1927 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1681 1928
1682 if (expect_true (p->w))
1683 {
1684 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1929 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1930 /* ^ this is no longer true, as pending_w could be here */
1685 1931
1686 p->w->pending = 0; 1932 p->w->pending = 0;
1687 EV_CB_INVOKE (p->w, p->events); 1933 EV_CB_INVOKE (p->w, p->events);
1688 EV_FREQUENT_CHECK; 1934 EV_FREQUENT_CHECK;
1689 }
1690 } 1935 }
1691} 1936}
1692 1937
1693#if EV_IDLE_ENABLE 1938#if EV_IDLE_ENABLE
1694void inline_size 1939/* make idle watchers pending. this handles the "call-idle */
1940/* only when higher priorities are idle" logic */
1941inline_size void
1695idle_reify (EV_P) 1942idle_reify (EV_P)
1696{ 1943{
1697 if (expect_false (idleall)) 1944 if (expect_false (idleall))
1698 { 1945 {
1699 int pri; 1946 int pri;
… …
1711 } 1958 }
1712 } 1959 }
1713} 1960}
1714#endif 1961#endif
1715 1962
1716void inline_size 1963/* make timers pending */
1964inline_size void
1717timers_reify (EV_P) 1965timers_reify (EV_P)
1718{ 1966{
1719 EV_FREQUENT_CHECK; 1967 EV_FREQUENT_CHECK;
1720 1968
1721 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 1969 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1722 { 1970 {
1723 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 1971 do
1724
1725 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1726
1727 /* first reschedule or stop timer */
1728 if (w->repeat)
1729 { 1972 {
1973 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1974
1975 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
1976
1977 /* first reschedule or stop timer */
1978 if (w->repeat)
1979 {
1730 ev_at (w) += w->repeat; 1980 ev_at (w) += w->repeat;
1731 if (ev_at (w) < mn_now) 1981 if (ev_at (w) < mn_now)
1732 ev_at (w) = mn_now; 1982 ev_at (w) = mn_now;
1733 1983
1734 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1984 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1735 1985
1736 ANHE_at_cache (timers [HEAP0]); 1986 ANHE_at_cache (timers [HEAP0]);
1737 downheap (timers, timercnt, HEAP0); 1987 downheap (timers, timercnt, HEAP0);
1988 }
1989 else
1990 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1991
1992 EV_FREQUENT_CHECK;
1993 feed_reverse (EV_A_ (W)w);
1738 } 1994 }
1739 else 1995 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1740 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1741 1996
1742 EV_FREQUENT_CHECK;
1743 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1997 feed_reverse_done (EV_A_ EV_TIMEOUT);
1744 } 1998 }
1745} 1999}
1746 2000
1747#if EV_PERIODIC_ENABLE 2001#if EV_PERIODIC_ENABLE
1748void inline_size 2002/* make periodics pending */
2003inline_size void
1749periodics_reify (EV_P) 2004periodics_reify (EV_P)
1750{ 2005{
1751 EV_FREQUENT_CHECK; 2006 EV_FREQUENT_CHECK;
1752 2007
1753 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2008 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1754 { 2009 {
1755 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2010 int feed_count = 0;
1756 2011
1757 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 2012 do
1758
1759 /* first reschedule or stop timer */
1760 if (w->reschedule_cb)
1761 { 2013 {
2014 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2015
2016 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
2017
2018 /* first reschedule or stop timer */
2019 if (w->reschedule_cb)
2020 {
1762 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2021 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1763 2022
1764 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 2023 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1765 2024
1766 ANHE_at_cache (periodics [HEAP0]); 2025 ANHE_at_cache (periodics [HEAP0]);
1767 downheap (periodics, periodiccnt, HEAP0); 2026 downheap (periodics, periodiccnt, HEAP0);
2027 }
2028 else if (w->interval)
2029 {
2030 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2031 /* if next trigger time is not sufficiently in the future, put it there */
2032 /* this might happen because of floating point inexactness */
2033 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2034 {
2035 ev_at (w) += w->interval;
2036
2037 /* if interval is unreasonably low we might still have a time in the past */
2038 /* so correct this. this will make the periodic very inexact, but the user */
2039 /* has effectively asked to get triggered more often than possible */
2040 if (ev_at (w) < ev_rt_now)
2041 ev_at (w) = ev_rt_now;
2042 }
2043
2044 ANHE_at_cache (periodics [HEAP0]);
2045 downheap (periodics, periodiccnt, HEAP0);
2046 }
2047 else
2048 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
2049
2050 EV_FREQUENT_CHECK;
2051 feed_reverse (EV_A_ (W)w);
1768 } 2052 }
1769 else if (w->interval) 2053 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
1770 {
1771 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1772 /* if next trigger time is not sufficiently in the future, put it there */
1773 /* this might happen because of floating point inexactness */
1774 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1775 {
1776 ev_at (w) += w->interval;
1777 2054
1778 /* if interval is unreasonably low we might still have a time in the past */
1779 /* so correct this. this will make the periodic very inexact, but the user */
1780 /* has effectively asked to get triggered more often than possible */
1781 if (ev_at (w) < ev_rt_now)
1782 ev_at (w) = ev_rt_now;
1783 }
1784
1785 ANHE_at_cache (periodics [HEAP0]);
1786 downheap (periodics, periodiccnt, HEAP0);
1787 }
1788 else
1789 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1790
1791 EV_FREQUENT_CHECK;
1792 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 2055 feed_reverse_done (EV_A_ EV_PERIODIC);
1793 } 2056 }
1794} 2057}
1795 2058
2059/* simply recalculate all periodics */
2060/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1796static void noinline 2061static void noinline
1797periodics_reschedule (EV_P) 2062periodics_reschedule (EV_P)
1798{ 2063{
1799 int i; 2064 int i;
1800 2065
… …
1813 2078
1814 reheap (periodics, periodiccnt); 2079 reheap (periodics, periodiccnt);
1815} 2080}
1816#endif 2081#endif
1817 2082
1818void inline_speed 2083/* adjust all timers by a given offset */
2084static void noinline
2085timers_reschedule (EV_P_ ev_tstamp adjust)
2086{
2087 int i;
2088
2089 for (i = 0; i < timercnt; ++i)
2090 {
2091 ANHE *he = timers + i + HEAP0;
2092 ANHE_w (*he)->at += adjust;
2093 ANHE_at_cache (*he);
2094 }
2095}
2096
2097/* fetch new monotonic and realtime times from the kernel */
2098/* also detetc if there was a timejump, and act accordingly */
2099inline_speed void
1819time_update (EV_P_ ev_tstamp max_block) 2100time_update (EV_P_ ev_tstamp max_block)
1820{ 2101{
1821 int i;
1822
1823#if EV_USE_MONOTONIC 2102#if EV_USE_MONOTONIC
1824 if (expect_true (have_monotonic)) 2103 if (expect_true (have_monotonic))
1825 { 2104 {
2105 int i;
1826 ev_tstamp odiff = rtmn_diff; 2106 ev_tstamp odiff = rtmn_diff;
1827 2107
1828 mn_now = get_clock (); 2108 mn_now = get_clock ();
1829 2109
1830 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2110 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1856 ev_rt_now = ev_time (); 2136 ev_rt_now = ev_time ();
1857 mn_now = get_clock (); 2137 mn_now = get_clock ();
1858 now_floor = mn_now; 2138 now_floor = mn_now;
1859 } 2139 }
1860 2140
2141 /* no timer adjustment, as the monotonic clock doesn't jump */
2142 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1861# if EV_PERIODIC_ENABLE 2143# if EV_PERIODIC_ENABLE
1862 periodics_reschedule (EV_A); 2144 periodics_reschedule (EV_A);
1863# endif 2145# endif
1864 /* no timer adjustment, as the monotonic clock doesn't jump */
1865 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1866 } 2146 }
1867 else 2147 else
1868#endif 2148#endif
1869 { 2149 {
1870 ev_rt_now = ev_time (); 2150 ev_rt_now = ev_time ();
1871 2151
1872 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 2152 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1873 { 2153 {
2154 /* adjust timers. this is easy, as the offset is the same for all of them */
2155 timers_reschedule (EV_A_ ev_rt_now - mn_now);
1874#if EV_PERIODIC_ENABLE 2156#if EV_PERIODIC_ENABLE
1875 periodics_reschedule (EV_A); 2157 periodics_reschedule (EV_A);
1876#endif 2158#endif
1877 /* adjust timers. this is easy, as the offset is the same for all of them */
1878 for (i = 0; i < timercnt; ++i)
1879 {
1880 ANHE *he = timers + i + HEAP0;
1881 ANHE_w (*he)->at += ev_rt_now - mn_now;
1882 ANHE_at_cache (*he);
1883 }
1884 } 2159 }
1885 2160
1886 mn_now = ev_rt_now; 2161 mn_now = ev_rt_now;
1887 } 2162 }
1888} 2163}
1889 2164
1890void 2165void
1891ev_ref (EV_P)
1892{
1893 ++activecnt;
1894}
1895
1896void
1897ev_unref (EV_P)
1898{
1899 --activecnt;
1900}
1901
1902static int loop_done;
1903
1904void
1905ev_loop (EV_P_ int flags) 2166ev_loop (EV_P_ int flags)
1906{ 2167{
2168#if EV_MINIMAL < 2
2169 ++loop_depth;
2170#endif
2171
2172 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2173
1907 loop_done = EVUNLOOP_CANCEL; 2174 loop_done = EVUNLOOP_CANCEL;
1908 2175
1909 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2176 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1910 2177
1911 do 2178 do
1912 { 2179 {
1913#if EV_VERIFY >= 2 2180#if EV_VERIFY >= 2
1914 ev_loop_verify (EV_A); 2181 ev_loop_verify (EV_A);
… …
1927 /* we might have forked, so queue fork handlers */ 2194 /* we might have forked, so queue fork handlers */
1928 if (expect_false (postfork)) 2195 if (expect_false (postfork))
1929 if (forkcnt) 2196 if (forkcnt)
1930 { 2197 {
1931 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2198 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1932 call_pending (EV_A); 2199 EV_INVOKE_PENDING;
1933 } 2200 }
1934#endif 2201#endif
1935 2202
1936 /* queue prepare watchers (and execute them) */ 2203 /* queue prepare watchers (and execute them) */
1937 if (expect_false (preparecnt)) 2204 if (expect_false (preparecnt))
1938 { 2205 {
1939 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2206 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1940 call_pending (EV_A); 2207 EV_INVOKE_PENDING;
1941 } 2208 }
1942 2209
1943 if (expect_false (!activecnt)) 2210 if (expect_false (loop_done))
1944 break; 2211 break;
1945 2212
1946 /* we might have forked, so reify kernel state if necessary */ 2213 /* we might have forked, so reify kernel state if necessary */
1947 if (expect_false (postfork)) 2214 if (expect_false (postfork))
1948 loop_fork (EV_A); 2215 loop_fork (EV_A);
… …
1955 ev_tstamp waittime = 0.; 2222 ev_tstamp waittime = 0.;
1956 ev_tstamp sleeptime = 0.; 2223 ev_tstamp sleeptime = 0.;
1957 2224
1958 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2225 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1959 { 2226 {
2227 /* remember old timestamp for io_blocktime calculation */
2228 ev_tstamp prev_mn_now = mn_now;
2229
1960 /* update time to cancel out callback processing overhead */ 2230 /* update time to cancel out callback processing overhead */
1961 time_update (EV_A_ 1e100); 2231 time_update (EV_A_ 1e100);
1962 2232
1963 waittime = MAX_BLOCKTIME; 2233 waittime = MAX_BLOCKTIME;
1964 2234
… …
1974 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2244 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1975 if (waittime > to) waittime = to; 2245 if (waittime > to) waittime = to;
1976 } 2246 }
1977#endif 2247#endif
1978 2248
2249 /* don't let timeouts decrease the waittime below timeout_blocktime */
1979 if (expect_false (waittime < timeout_blocktime)) 2250 if (expect_false (waittime < timeout_blocktime))
1980 waittime = timeout_blocktime; 2251 waittime = timeout_blocktime;
1981 2252
1982 sleeptime = waittime - backend_fudge; 2253 /* extra check because io_blocktime is commonly 0 */
1983
1984 if (expect_true (sleeptime > io_blocktime)) 2254 if (expect_false (io_blocktime))
1985 sleeptime = io_blocktime;
1986
1987 if (sleeptime)
1988 { 2255 {
2256 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2257
2258 if (sleeptime > waittime - backend_fudge)
2259 sleeptime = waittime - backend_fudge;
2260
2261 if (expect_true (sleeptime > 0.))
2262 {
1989 ev_sleep (sleeptime); 2263 ev_sleep (sleeptime);
1990 waittime -= sleeptime; 2264 waittime -= sleeptime;
2265 }
1991 } 2266 }
1992 } 2267 }
1993 2268
2269#if EV_MINIMAL < 2
1994 ++loop_count; 2270 ++loop_count;
2271#endif
2272 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
1995 backend_poll (EV_A_ waittime); 2273 backend_poll (EV_A_ waittime);
2274 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
1996 2275
1997 /* update ev_rt_now, do magic */ 2276 /* update ev_rt_now, do magic */
1998 time_update (EV_A_ waittime + sleeptime); 2277 time_update (EV_A_ waittime + sleeptime);
1999 } 2278 }
2000 2279
… …
2011 2290
2012 /* queue check watchers, to be executed first */ 2291 /* queue check watchers, to be executed first */
2013 if (expect_false (checkcnt)) 2292 if (expect_false (checkcnt))
2014 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2293 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2015 2294
2016 call_pending (EV_A); 2295 EV_INVOKE_PENDING;
2017 } 2296 }
2018 while (expect_true ( 2297 while (expect_true (
2019 activecnt 2298 activecnt
2020 && !loop_done 2299 && !loop_done
2021 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2300 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2022 )); 2301 ));
2023 2302
2024 if (loop_done == EVUNLOOP_ONE) 2303 if (loop_done == EVUNLOOP_ONE)
2025 loop_done = EVUNLOOP_CANCEL; 2304 loop_done = EVUNLOOP_CANCEL;
2305
2306#if EV_MINIMAL < 2
2307 --loop_depth;
2308#endif
2026} 2309}
2027 2310
2028void 2311void
2029ev_unloop (EV_P_ int how) 2312ev_unloop (EV_P_ int how)
2030{ 2313{
2031 loop_done = how; 2314 loop_done = how;
2032} 2315}
2033 2316
2317void
2318ev_ref (EV_P)
2319{
2320 ++activecnt;
2321}
2322
2323void
2324ev_unref (EV_P)
2325{
2326 --activecnt;
2327}
2328
2329void
2330ev_now_update (EV_P)
2331{
2332 time_update (EV_A_ 1e100);
2333}
2334
2335void
2336ev_suspend (EV_P)
2337{
2338 ev_now_update (EV_A);
2339}
2340
2341void
2342ev_resume (EV_P)
2343{
2344 ev_tstamp mn_prev = mn_now;
2345
2346 ev_now_update (EV_A);
2347 timers_reschedule (EV_A_ mn_now - mn_prev);
2348#if EV_PERIODIC_ENABLE
2349 /* TODO: really do this? */
2350 periodics_reschedule (EV_A);
2351#endif
2352}
2353
2034/*****************************************************************************/ 2354/*****************************************************************************/
2355/* singly-linked list management, used when the expected list length is short */
2035 2356
2036void inline_size 2357inline_size void
2037wlist_add (WL *head, WL elem) 2358wlist_add (WL *head, WL elem)
2038{ 2359{
2039 elem->next = *head; 2360 elem->next = *head;
2040 *head = elem; 2361 *head = elem;
2041} 2362}
2042 2363
2043void inline_size 2364inline_size void
2044wlist_del (WL *head, WL elem) 2365wlist_del (WL *head, WL elem)
2045{ 2366{
2046 while (*head) 2367 while (*head)
2047 { 2368 {
2048 if (*head == elem) 2369 if (*head == elem)
… …
2053 2374
2054 head = &(*head)->next; 2375 head = &(*head)->next;
2055 } 2376 }
2056} 2377}
2057 2378
2058void inline_speed 2379/* internal, faster, version of ev_clear_pending */
2380inline_speed void
2059clear_pending (EV_P_ W w) 2381clear_pending (EV_P_ W w)
2060{ 2382{
2061 if (w->pending) 2383 if (w->pending)
2062 { 2384 {
2063 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2385 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2064 w->pending = 0; 2386 w->pending = 0;
2065 } 2387 }
2066} 2388}
2067 2389
2068int 2390int
… …
2072 int pending = w_->pending; 2394 int pending = w_->pending;
2073 2395
2074 if (expect_true (pending)) 2396 if (expect_true (pending))
2075 { 2397 {
2076 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2398 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2399 p->w = (W)&pending_w;
2077 w_->pending = 0; 2400 w_->pending = 0;
2078 p->w = 0;
2079 return p->events; 2401 return p->events;
2080 } 2402 }
2081 else 2403 else
2082 return 0; 2404 return 0;
2083} 2405}
2084 2406
2085void inline_size 2407inline_size void
2086pri_adjust (EV_P_ W w) 2408pri_adjust (EV_P_ W w)
2087{ 2409{
2088 int pri = w->priority; 2410 int pri = ev_priority (w);
2089 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2411 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2090 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2412 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2091 w->priority = pri; 2413 ev_set_priority (w, pri);
2092} 2414}
2093 2415
2094void inline_speed 2416inline_speed void
2095ev_start (EV_P_ W w, int active) 2417ev_start (EV_P_ W w, int active)
2096{ 2418{
2097 pri_adjust (EV_A_ w); 2419 pri_adjust (EV_A_ w);
2098 w->active = active; 2420 w->active = active;
2099 ev_ref (EV_A); 2421 ev_ref (EV_A);
2100} 2422}
2101 2423
2102void inline_size 2424inline_size void
2103ev_stop (EV_P_ W w) 2425ev_stop (EV_P_ W w)
2104{ 2426{
2105 ev_unref (EV_A); 2427 ev_unref (EV_A);
2106 w->active = 0; 2428 w->active = 0;
2107} 2429}
… …
2114 int fd = w->fd; 2436 int fd = w->fd;
2115 2437
2116 if (expect_false (ev_is_active (w))) 2438 if (expect_false (ev_is_active (w)))
2117 return; 2439 return;
2118 2440
2119 assert (("ev_io_start called with negative fd", fd >= 0)); 2441 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2442 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2120 2443
2121 EV_FREQUENT_CHECK; 2444 EV_FREQUENT_CHECK;
2122 2445
2123 ev_start (EV_A_ (W)w, 1); 2446 ev_start (EV_A_ (W)w, 1);
2124 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2447 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2125 wlist_add (&anfds[fd].head, (WL)w); 2448 wlist_add (&anfds[fd].head, (WL)w);
2126 2449
2127 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2450 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2128 w->events &= ~EV_IOFDSET; 2451 w->events &= ~EV__IOFDSET;
2129 2452
2130 EV_FREQUENT_CHECK; 2453 EV_FREQUENT_CHECK;
2131} 2454}
2132 2455
2133void noinline 2456void noinline
… …
2135{ 2458{
2136 clear_pending (EV_A_ (W)w); 2459 clear_pending (EV_A_ (W)w);
2137 if (expect_false (!ev_is_active (w))) 2460 if (expect_false (!ev_is_active (w)))
2138 return; 2461 return;
2139 2462
2140 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2463 assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2141 2464
2142 EV_FREQUENT_CHECK; 2465 EV_FREQUENT_CHECK;
2143 2466
2144 wlist_del (&anfds[w->fd].head, (WL)w); 2467 wlist_del (&anfds[w->fd].head, (WL)w);
2145 ev_stop (EV_A_ (W)w); 2468 ev_stop (EV_A_ (W)w);
… …
2155 if (expect_false (ev_is_active (w))) 2478 if (expect_false (ev_is_active (w)))
2156 return; 2479 return;
2157 2480
2158 ev_at (w) += mn_now; 2481 ev_at (w) += mn_now;
2159 2482
2160 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2483 assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2161 2484
2162 EV_FREQUENT_CHECK; 2485 EV_FREQUENT_CHECK;
2163 2486
2164 ++timercnt; 2487 ++timercnt;
2165 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2488 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2168 ANHE_at_cache (timers [ev_active (w)]); 2491 ANHE_at_cache (timers [ev_active (w)]);
2169 upheap (timers, ev_active (w)); 2492 upheap (timers, ev_active (w));
2170 2493
2171 EV_FREQUENT_CHECK; 2494 EV_FREQUENT_CHECK;
2172 2495
2173 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2496 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2174} 2497}
2175 2498
2176void noinline 2499void noinline
2177ev_timer_stop (EV_P_ ev_timer *w) 2500ev_timer_stop (EV_P_ ev_timer *w)
2178{ 2501{
… …
2183 EV_FREQUENT_CHECK; 2506 EV_FREQUENT_CHECK;
2184 2507
2185 { 2508 {
2186 int active = ev_active (w); 2509 int active = ev_active (w);
2187 2510
2188 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2511 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2189 2512
2190 --timercnt; 2513 --timercnt;
2191 2514
2192 if (expect_true (active < timercnt + HEAP0)) 2515 if (expect_true (active < timercnt + HEAP0))
2193 { 2516 {
… …
2226 } 2549 }
2227 2550
2228 EV_FREQUENT_CHECK; 2551 EV_FREQUENT_CHECK;
2229} 2552}
2230 2553
2554ev_tstamp
2555ev_timer_remaining (EV_P_ ev_timer *w)
2556{
2557 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2558}
2559
2231#if EV_PERIODIC_ENABLE 2560#if EV_PERIODIC_ENABLE
2232void noinline 2561void noinline
2233ev_periodic_start (EV_P_ ev_periodic *w) 2562ev_periodic_start (EV_P_ ev_periodic *w)
2234{ 2563{
2235 if (expect_false (ev_is_active (w))) 2564 if (expect_false (ev_is_active (w)))
… …
2237 2566
2238 if (w->reschedule_cb) 2567 if (w->reschedule_cb)
2239 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2568 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2240 else if (w->interval) 2569 else if (w->interval)
2241 { 2570 {
2242 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2571 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2243 /* this formula differs from the one in periodic_reify because we do not always round up */ 2572 /* this formula differs from the one in periodic_reify because we do not always round up */
2244 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2573 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2245 } 2574 }
2246 else 2575 else
2247 ev_at (w) = w->offset; 2576 ev_at (w) = w->offset;
… …
2255 ANHE_at_cache (periodics [ev_active (w)]); 2584 ANHE_at_cache (periodics [ev_active (w)]);
2256 upheap (periodics, ev_active (w)); 2585 upheap (periodics, ev_active (w));
2257 2586
2258 EV_FREQUENT_CHECK; 2587 EV_FREQUENT_CHECK;
2259 2588
2260 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2589 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2261} 2590}
2262 2591
2263void noinline 2592void noinline
2264ev_periodic_stop (EV_P_ ev_periodic *w) 2593ev_periodic_stop (EV_P_ ev_periodic *w)
2265{ 2594{
… …
2270 EV_FREQUENT_CHECK; 2599 EV_FREQUENT_CHECK;
2271 2600
2272 { 2601 {
2273 int active = ev_active (w); 2602 int active = ev_active (w);
2274 2603
2275 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2604 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2276 2605
2277 --periodiccnt; 2606 --periodiccnt;
2278 2607
2279 if (expect_true (active < periodiccnt + HEAP0)) 2608 if (expect_true (active < periodiccnt + HEAP0))
2280 { 2609 {
… …
2303 2632
2304void noinline 2633void noinline
2305ev_signal_start (EV_P_ ev_signal *w) 2634ev_signal_start (EV_P_ ev_signal *w)
2306{ 2635{
2307#if EV_MULTIPLICITY 2636#if EV_MULTIPLICITY
2308 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2637 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2309#endif 2638#endif
2310 if (expect_false (ev_is_active (w))) 2639 if (expect_false (ev_is_active (w)))
2311 return; 2640 return;
2312 2641
2313 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2642 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0));
2314 2643
2644 EV_FREQUENT_CHECK;
2645
2646#if EV_USE_SIGNALFD
2647 if (sigfd == -2)
2648 {
2649 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2650 if (sigfd < 0 && errno == EINVAL)
2651 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2652
2653 if (sigfd >= 0)
2654 {
2655 fd_intern (sigfd); /* doing it twice will not hurt */
2656
2657 sigemptyset (&sigfd_set);
2658
2659 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2660 ev_set_priority (&sigfd_w, EV_MAXPRI);
2661 ev_io_start (EV_A_ &sigfd_w);
2662 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2663 }
2664 }
2665
2666 if (sigfd >= 0)
2667 {
2668 /* TODO: check .head */
2669 sigaddset (&sigfd_set, w->signum);
2670 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2671
2672 signalfd (sigfd, &sigfd_set, 0);
2673 }
2674 else
2675#endif
2315 evpipe_init (EV_A); 2676 evpipe_init (EV_A);
2316
2317 EV_FREQUENT_CHECK;
2318 2677
2319 { 2678 {
2320#ifndef _WIN32 2679#ifndef _WIN32
2321 sigset_t full, prev; 2680 sigset_t full, prev;
2322 sigfillset (&full); 2681 sigfillset (&full);
2323 sigprocmask (SIG_SETMASK, &full, &prev); 2682 sigprocmask (SIG_SETMASK, &full, &prev);
2324#endif 2683#endif
2325 2684
2326 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2685 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2327 2686
2328#ifndef _WIN32 2687#ifndef _WIN32
2688 if (sigfd < 0)/*TODO*/
2689 sigdelset (&prev, w->signum);
2329 sigprocmask (SIG_SETMASK, &prev, 0); 2690 sigprocmask (SIG_SETMASK, &prev, 0);
2330#endif 2691#endif
2331 } 2692 }
2332 2693
2333 ev_start (EV_A_ (W)w, 1); 2694 ev_start (EV_A_ (W)w, 1);
… …
2336 if (!((WL)w)->next) 2697 if (!((WL)w)->next)
2337 { 2698 {
2338#if _WIN32 2699#if _WIN32
2339 signal (w->signum, ev_sighandler); 2700 signal (w->signum, ev_sighandler);
2340#else 2701#else
2702 if (sigfd < 0) /*TODO*/
2703 {
2341 struct sigaction sa; 2704 struct sigaction sa = { };
2342 sa.sa_handler = ev_sighandler; 2705 sa.sa_handler = ev_sighandler;
2343 sigfillset (&sa.sa_mask); 2706 sigfillset (&sa.sa_mask);
2344 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2707 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2345 sigaction (w->signum, &sa, 0); 2708 sigaction (w->signum, &sa, 0);
2709 }
2346#endif 2710#endif
2347 } 2711 }
2348 2712
2349 EV_FREQUENT_CHECK; 2713 EV_FREQUENT_CHECK;
2350} 2714}
… …
2360 2724
2361 wlist_del (&signals [w->signum - 1].head, (WL)w); 2725 wlist_del (&signals [w->signum - 1].head, (WL)w);
2362 ev_stop (EV_A_ (W)w); 2726 ev_stop (EV_A_ (W)w);
2363 2727
2364 if (!signals [w->signum - 1].head) 2728 if (!signals [w->signum - 1].head)
2729#if EV_USE_SIGNALFD
2730 if (sigfd >= 0)
2731 {
2732 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2733 sigdelset (&sigfd_set, w->signum);
2734 signalfd (sigfd, &sigfd_set, 0);
2735 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2736 /*TODO: maybe unblock signal? */
2737 }
2738 else
2739#endif
2365 signal (w->signum, SIG_DFL); 2740 signal (w->signum, SIG_DFL);
2366 2741
2367 EV_FREQUENT_CHECK; 2742 EV_FREQUENT_CHECK;
2368} 2743}
2369 2744
2370void 2745void
2371ev_child_start (EV_P_ ev_child *w) 2746ev_child_start (EV_P_ ev_child *w)
2372{ 2747{
2373#if EV_MULTIPLICITY 2748#if EV_MULTIPLICITY
2374 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2749 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2375#endif 2750#endif
2376 if (expect_false (ev_is_active (w))) 2751 if (expect_false (ev_is_active (w)))
2377 return; 2752 return;
2378 2753
2379 EV_FREQUENT_CHECK; 2754 EV_FREQUENT_CHECK;
… …
2404# ifdef _WIN32 2779# ifdef _WIN32
2405# undef lstat 2780# undef lstat
2406# define lstat(a,b) _stati64 (a,b) 2781# define lstat(a,b) _stati64 (a,b)
2407# endif 2782# endif
2408 2783
2409#define DEF_STAT_INTERVAL 5.0074891 2784#define DEF_STAT_INTERVAL 5.0074891
2785#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
2410#define MIN_STAT_INTERVAL 0.1074891 2786#define MIN_STAT_INTERVAL 0.1074891
2411 2787
2412static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2788static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2413 2789
2414#if EV_USE_INOTIFY 2790#if EV_USE_INOTIFY
2415# define EV_INOTIFY_BUFSIZE 8192 2791# define EV_INOTIFY_BUFSIZE 8192
… …
2419{ 2795{
2420 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); 2796 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);
2421 2797
2422 if (w->wd < 0) 2798 if (w->wd < 0)
2423 { 2799 {
2800 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2424 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2801 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2425 2802
2426 /* monitor some parent directory for speedup hints */ 2803 /* monitor some parent directory for speedup hints */
2427 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2804 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2428 /* but an efficiency issue only */ 2805 /* but an efficiency issue only */
2429 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2806 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2430 { 2807 {
2431 char path [4096]; 2808 char path [4096];
2432 strcpy (path, w->path); 2809 strcpy (path, w->path);
… …
2436 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2813 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2437 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2814 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2438 2815
2439 char *pend = strrchr (path, '/'); 2816 char *pend = strrchr (path, '/');
2440 2817
2441 if (!pend) 2818 if (!pend || pend == path)
2442 break; /* whoops, no '/', complain to your admin */ 2819 break;
2443 2820
2444 *pend = 0; 2821 *pend = 0;
2445 w->wd = inotify_add_watch (fs_fd, path, mask); 2822 w->wd = inotify_add_watch (fs_fd, path, mask);
2446 } 2823 }
2447 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2824 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2448 } 2825 }
2449 } 2826 }
2450 else
2451 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2452 2827
2453 if (w->wd >= 0) 2828 if (w->wd >= 0)
2829 {
2454 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2830 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2831
2832 /* now local changes will be tracked by inotify, but remote changes won't */
2833 /* unless the filesystem it known to be local, we therefore still poll */
2834 /* also do poll on <2.6.25, but with normal frequency */
2835 struct statfs sfs;
2836
2837 if (fs_2625 && !statfs (w->path, &sfs))
2838 if (sfs.f_type == 0x1373 /* devfs */
2839 || sfs.f_type == 0xEF53 /* ext2/3 */
2840 || sfs.f_type == 0x3153464a /* jfs */
2841 || sfs.f_type == 0x52654973 /* reiser3 */
2842 || sfs.f_type == 0x01021994 /* tempfs */
2843 || sfs.f_type == 0x58465342 /* xfs */)
2844 return;
2845
2846 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2847 ev_timer_again (EV_A_ &w->timer);
2848 }
2455} 2849}
2456 2850
2457static void noinline 2851static void noinline
2458infy_del (EV_P_ ev_stat *w) 2852infy_del (EV_P_ ev_stat *w)
2459{ 2853{
… …
2473 2867
2474static void noinline 2868static void noinline
2475infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2869infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2476{ 2870{
2477 if (slot < 0) 2871 if (slot < 0)
2478 /* overflow, need to check for all hahs slots */ 2872 /* overflow, need to check for all hash slots */
2479 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2873 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2480 infy_wd (EV_A_ slot, wd, ev); 2874 infy_wd (EV_A_ slot, wd, ev);
2481 else 2875 else
2482 { 2876 {
2483 WL w_; 2877 WL w_;
… …
2489 2883
2490 if (w->wd == wd || wd == -1) 2884 if (w->wd == wd || wd == -1)
2491 { 2885 {
2492 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2886 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2493 { 2887 {
2888 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2494 w->wd = -1; 2889 w->wd = -1;
2495 infy_add (EV_A_ w); /* re-add, no matter what */ 2890 infy_add (EV_A_ w); /* re-add, no matter what */
2496 } 2891 }
2497 2892
2498 stat_timer_cb (EV_A_ &w->timer, 0); 2893 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2511 2906
2512 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2907 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2513 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2908 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2514} 2909}
2515 2910
2516void inline_size 2911inline_size void
2912check_2625 (EV_P)
2913{
2914 /* kernels < 2.6.25 are borked
2915 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2916 */
2917 struct utsname buf;
2918 int major, minor, micro;
2919
2920 if (uname (&buf))
2921 return;
2922
2923 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2924 return;
2925
2926 if (major < 2
2927 || (major == 2 && minor < 6)
2928 || (major == 2 && minor == 6 && micro < 25))
2929 return;
2930
2931 fs_2625 = 1;
2932}
2933
2934inline_size void
2517infy_init (EV_P) 2935infy_init (EV_P)
2518{ 2936{
2519 if (fs_fd != -2) 2937 if (fs_fd != -2)
2520 return; 2938 return;
2939
2940 fs_fd = -1;
2941
2942 check_2625 (EV_A);
2521 2943
2522 fs_fd = inotify_init (); 2944 fs_fd = inotify_init ();
2523 2945
2524 if (fs_fd >= 0) 2946 if (fs_fd >= 0)
2525 { 2947 {
… …
2527 ev_set_priority (&fs_w, EV_MAXPRI); 2949 ev_set_priority (&fs_w, EV_MAXPRI);
2528 ev_io_start (EV_A_ &fs_w); 2950 ev_io_start (EV_A_ &fs_w);
2529 } 2951 }
2530} 2952}
2531 2953
2532void inline_size 2954inline_size void
2533infy_fork (EV_P) 2955infy_fork (EV_P)
2534{ 2956{
2535 int slot; 2957 int slot;
2536 2958
2537 if (fs_fd < 0) 2959 if (fs_fd < 0)
… …
2553 w->wd = -1; 2975 w->wd = -1;
2554 2976
2555 if (fs_fd >= 0) 2977 if (fs_fd >= 0)
2556 infy_add (EV_A_ w); /* re-add, no matter what */ 2978 infy_add (EV_A_ w); /* re-add, no matter what */
2557 else 2979 else
2558 ev_timer_start (EV_A_ &w->timer); 2980 ev_timer_again (EV_A_ &w->timer);
2559 } 2981 }
2560
2561 } 2982 }
2562} 2983}
2563 2984
2985#endif
2986
2987#ifdef _WIN32
2988# define EV_LSTAT(p,b) _stati64 (p, b)
2989#else
2990# define EV_LSTAT(p,b) lstat (p, b)
2564#endif 2991#endif
2565 2992
2566void 2993void
2567ev_stat_stat (EV_P_ ev_stat *w) 2994ev_stat_stat (EV_P_ ev_stat *w)
2568{ 2995{
… …
2595 || w->prev.st_atime != w->attr.st_atime 3022 || w->prev.st_atime != w->attr.st_atime
2596 || w->prev.st_mtime != w->attr.st_mtime 3023 || w->prev.st_mtime != w->attr.st_mtime
2597 || w->prev.st_ctime != w->attr.st_ctime 3024 || w->prev.st_ctime != w->attr.st_ctime
2598 ) { 3025 ) {
2599 #if EV_USE_INOTIFY 3026 #if EV_USE_INOTIFY
3027 if (fs_fd >= 0)
3028 {
2600 infy_del (EV_A_ w); 3029 infy_del (EV_A_ w);
2601 infy_add (EV_A_ w); 3030 infy_add (EV_A_ w);
2602 ev_stat_stat (EV_A_ w); /* avoid race... */ 3031 ev_stat_stat (EV_A_ w); /* avoid race... */
3032 }
2603 #endif 3033 #endif
2604 3034
2605 ev_feed_event (EV_A_ w, EV_STAT); 3035 ev_feed_event (EV_A_ w, EV_STAT);
2606 } 3036 }
2607} 3037}
… …
2610ev_stat_start (EV_P_ ev_stat *w) 3040ev_stat_start (EV_P_ ev_stat *w)
2611{ 3041{
2612 if (expect_false (ev_is_active (w))) 3042 if (expect_false (ev_is_active (w)))
2613 return; 3043 return;
2614 3044
2615 /* since we use memcmp, we need to clear any padding data etc. */
2616 memset (&w->prev, 0, sizeof (ev_statdata));
2617 memset (&w->attr, 0, sizeof (ev_statdata));
2618
2619 ev_stat_stat (EV_A_ w); 3045 ev_stat_stat (EV_A_ w);
2620 3046
3047 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2621 if (w->interval < MIN_STAT_INTERVAL) 3048 w->interval = MIN_STAT_INTERVAL;
2622 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2623 3049
2624 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 3050 ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2625 ev_set_priority (&w->timer, ev_priority (w)); 3051 ev_set_priority (&w->timer, ev_priority (w));
2626 3052
2627#if EV_USE_INOTIFY 3053#if EV_USE_INOTIFY
2628 infy_init (EV_A); 3054 infy_init (EV_A);
2629 3055
2630 if (fs_fd >= 0) 3056 if (fs_fd >= 0)
2631 infy_add (EV_A_ w); 3057 infy_add (EV_A_ w);
2632 else 3058 else
2633#endif 3059#endif
2634 ev_timer_start (EV_A_ &w->timer); 3060 ev_timer_again (EV_A_ &w->timer);
2635 3061
2636 ev_start (EV_A_ (W)w, 1); 3062 ev_start (EV_A_ (W)w, 1);
2637 3063
2638 EV_FREQUENT_CHECK; 3064 EV_FREQUENT_CHECK;
2639} 3065}
… …
2809 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3235 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2810 } 3236 }
2811 } 3237 }
2812} 3238}
2813 3239
3240static void
3241embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
3242{
3243 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3244
3245 ev_embed_stop (EV_A_ w);
3246
3247 {
3248 struct ev_loop *loop = w->other;
3249
3250 ev_loop_fork (EV_A);
3251 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3252 }
3253
3254 ev_embed_start (EV_A_ w);
3255}
3256
2814#if 0 3257#if 0
2815static void 3258static void
2816embed_idle_cb (EV_P_ ev_idle *idle, int revents) 3259embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2817{ 3260{
2818 ev_idle_stop (EV_A_ idle); 3261 ev_idle_stop (EV_A_ idle);
… …
2825 if (expect_false (ev_is_active (w))) 3268 if (expect_false (ev_is_active (w)))
2826 return; 3269 return;
2827 3270
2828 { 3271 {
2829 struct ev_loop *loop = w->other; 3272 struct ev_loop *loop = w->other;
2830 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3273 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2831 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3274 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2832 } 3275 }
2833 3276
2834 EV_FREQUENT_CHECK; 3277 EV_FREQUENT_CHECK;
2835 3278
… …
2838 3281
2839 ev_prepare_init (&w->prepare, embed_prepare_cb); 3282 ev_prepare_init (&w->prepare, embed_prepare_cb);
2840 ev_set_priority (&w->prepare, EV_MINPRI); 3283 ev_set_priority (&w->prepare, EV_MINPRI);
2841 ev_prepare_start (EV_A_ &w->prepare); 3284 ev_prepare_start (EV_A_ &w->prepare);
2842 3285
3286 ev_fork_init (&w->fork, embed_fork_cb);
3287 ev_fork_start (EV_A_ &w->fork);
3288
2843 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 3289 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2844 3290
2845 ev_start (EV_A_ (W)w, 1); 3291 ev_start (EV_A_ (W)w, 1);
2846 3292
2847 EV_FREQUENT_CHECK; 3293 EV_FREQUENT_CHECK;
… …
2854 if (expect_false (!ev_is_active (w))) 3300 if (expect_false (!ev_is_active (w)))
2855 return; 3301 return;
2856 3302
2857 EV_FREQUENT_CHECK; 3303 EV_FREQUENT_CHECK;
2858 3304
2859 ev_io_stop (EV_A_ &w->io); 3305 ev_io_stop (EV_A_ &w->io);
2860 ev_prepare_stop (EV_A_ &w->prepare); 3306 ev_prepare_stop (EV_A_ &w->prepare);
2861 3307 ev_fork_stop (EV_A_ &w->fork);
2862 ev_stop (EV_A_ (W)w);
2863 3308
2864 EV_FREQUENT_CHECK; 3309 EV_FREQUENT_CHECK;
2865} 3310}
2866#endif 3311#endif
2867 3312
… …
2964once_cb (EV_P_ struct ev_once *once, int revents) 3409once_cb (EV_P_ struct ev_once *once, int revents)
2965{ 3410{
2966 void (*cb)(int revents, void *arg) = once->cb; 3411 void (*cb)(int revents, void *arg) = once->cb;
2967 void *arg = once->arg; 3412 void *arg = once->arg;
2968 3413
2969 ev_io_stop (EV_A_ &once->io); 3414 ev_io_stop (EV_A_ &once->io);
2970 ev_timer_stop (EV_A_ &once->to); 3415 ev_timer_stop (EV_A_ &once->to);
2971 ev_free (once); 3416 ev_free (once);
2972 3417
2973 cb (revents, arg); 3418 cb (revents, arg);
2974} 3419}
2975 3420
2976static void 3421static void
2977once_cb_io (EV_P_ ev_io *w, int revents) 3422once_cb_io (EV_P_ ev_io *w, int revents)
2978{ 3423{
2979 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3424 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3425
3426 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
2980} 3427}
2981 3428
2982static void 3429static void
2983once_cb_to (EV_P_ ev_timer *w, int revents) 3430once_cb_to (EV_P_ ev_timer *w, int revents)
2984{ 3431{
2985 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3432 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3433
3434 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
2986} 3435}
2987 3436
2988void 3437void
2989ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3438ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
2990{ 3439{
… …
3012 ev_timer_set (&once->to, timeout, 0.); 3461 ev_timer_set (&once->to, timeout, 0.);
3013 ev_timer_start (EV_A_ &once->to); 3462 ev_timer_start (EV_A_ &once->to);
3014 } 3463 }
3015} 3464}
3016 3465
3466/*****************************************************************************/
3467
3468#if EV_WALK_ENABLE
3469void
3470ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3471{
3472 int i, j;
3473 ev_watcher_list *wl, *wn;
3474
3475 if (types & (EV_IO | EV_EMBED))
3476 for (i = 0; i < anfdmax; ++i)
3477 for (wl = anfds [i].head; wl; )
3478 {
3479 wn = wl->next;
3480
3481#if EV_EMBED_ENABLE
3482 if (ev_cb ((ev_io *)wl) == embed_io_cb)
3483 {
3484 if (types & EV_EMBED)
3485 cb (EV_A_ EV_EMBED, ((char *)wl) - offsetof (struct ev_embed, io));
3486 }
3487 else
3488#endif
3489#if EV_USE_INOTIFY
3490 if (ev_cb ((ev_io *)wl) == infy_cb)
3491 ;
3492 else
3493#endif
3494 if ((ev_io *)wl != &pipe_w)
3495 if (types & EV_IO)
3496 cb (EV_A_ EV_IO, wl);
3497
3498 wl = wn;
3499 }
3500
3501 if (types & (EV_TIMER | EV_STAT))
3502 for (i = timercnt + HEAP0; i-- > HEAP0; )
3503#if EV_STAT_ENABLE
3504 /*TODO: timer is not always active*/
3505 if (ev_cb ((ev_timer *)ANHE_w (timers [i])) == stat_timer_cb)
3506 {
3507 if (types & EV_STAT)
3508 cb (EV_A_ EV_STAT, ((char *)ANHE_w (timers [i])) - offsetof (struct ev_stat, timer));
3509 }
3510 else
3511#endif
3512 if (types & EV_TIMER)
3513 cb (EV_A_ EV_TIMER, ANHE_w (timers [i]));
3514
3515#if EV_PERIODIC_ENABLE
3516 if (types & EV_PERIODIC)
3517 for (i = periodiccnt + HEAP0; i-- > HEAP0; )
3518 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3519#endif
3520
3521#if EV_IDLE_ENABLE
3522 if (types & EV_IDLE)
3523 for (j = NUMPRI; i--; )
3524 for (i = idlecnt [j]; i--; )
3525 cb (EV_A_ EV_IDLE, idles [j][i]);
3526#endif
3527
3528#if EV_FORK_ENABLE
3529 if (types & EV_FORK)
3530 for (i = forkcnt; i--; )
3531 if (ev_cb (forks [i]) != embed_fork_cb)
3532 cb (EV_A_ EV_FORK, forks [i]);
3533#endif
3534
3535#if EV_ASYNC_ENABLE
3536 if (types & EV_ASYNC)
3537 for (i = asynccnt; i--; )
3538 cb (EV_A_ EV_ASYNC, asyncs [i]);
3539#endif
3540
3541 if (types & EV_PREPARE)
3542 for (i = preparecnt; i--; )
3543#if EV_EMBED_ENABLE
3544 if (ev_cb (prepares [i]) != embed_prepare_cb)
3545#endif
3546 cb (EV_A_ EV_PREPARE, prepares [i]);
3547
3548 if (types & EV_CHECK)
3549 for (i = checkcnt; i--; )
3550 cb (EV_A_ EV_CHECK, checks [i]);
3551
3552 if (types & EV_SIGNAL)
3553 for (i = 0; i < signalmax; ++i)
3554 for (wl = signals [i].head; wl; )
3555 {
3556 wn = wl->next;
3557 cb (EV_A_ EV_SIGNAL, wl);
3558 wl = wn;
3559 }
3560
3561 if (types & EV_CHILD)
3562 for (i = EV_PID_HASHSIZE; i--; )
3563 for (wl = childs [i]; wl; )
3564 {
3565 wn = wl->next;
3566 cb (EV_A_ EV_CHILD, wl);
3567 wl = wn;
3568 }
3569/* EV_STAT 0x00001000 /* stat data changed */
3570/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3571}
3572#endif
3573
3017#if EV_MULTIPLICITY 3574#if EV_MULTIPLICITY
3018 #include "ev_wrap.h" 3575 #include "ev_wrap.h"
3019#endif 3576#endif
3020 3577
3021#ifdef __cplusplus 3578#ifdef __cplusplus

Diff Legend

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