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

Comparing libev/ev.c (file contents):
Revision 1.273 by root, Mon Nov 3 14:27:06 2008 UTC vs.
Revision 1.336 by root, Wed Mar 10 08:19:38 2010 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
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
… …
96# define EV_USE_EPOLL 0 110# define EV_USE_EPOLL 0
97# endif 111# endif
98# endif 112# endif
99 113
100# ifndef EV_USE_KQUEUE 114# ifndef EV_USE_KQUEUE
101# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
102# define EV_USE_KQUEUE 1 116# define EV_USE_KQUEUE 1
103# else 117# else
104# define EV_USE_KQUEUE 0 118# define EV_USE_KQUEUE 0
105# endif 119# endif
106# endif 120# 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
141#include <assert.h> 164#include <assert.h>
142#include <errno.h> 165#include <errno.h>
143#include <sys/types.h> 166#include <sys/types.h>
144#include <time.h> 167#include <time.h>
168#include <limits.h>
145 169
146#include <signal.h> 170#include <signal.h>
147 171
148#ifdef EV_H 172#ifdef EV_H
149# include EV_H 173# include EV_H
… …
160# define WIN32_LEAN_AND_MEAN 184# define WIN32_LEAN_AND_MEAN
161# include <windows.h> 185# include <windows.h>
162# ifndef EV_SELECT_IS_WINSOCKET 186# ifndef EV_SELECT_IS_WINSOCKET
163# define EV_SELECT_IS_WINSOCKET 1 187# define EV_SELECT_IS_WINSOCKET 1
164# endif 188# endif
189# undef EV_AVOID_STDIO
165#endif 190#endif
166 191
167/* this block tries to deduce configuration from header-defined symbols and defaults */ 192/* this block tries to deduce configuration from header-defined symbols and defaults */
193
194/* try to deduce the maximum number of signals on this platform */
195#if defined (EV_NSIG)
196/* use what's provided */
197#elif defined (NSIG)
198# define EV_NSIG (NSIG)
199#elif defined(_NSIG)
200# define EV_NSIG (_NSIG)
201#elif defined (SIGMAX)
202# define EV_NSIG (SIGMAX+1)
203#elif defined (SIG_MAX)
204# define EV_NSIG (SIG_MAX+1)
205#elif defined (_SIG_MAX)
206# define EV_NSIG (_SIG_MAX+1)
207#elif defined (MAXSIG)
208# define EV_NSIG (MAXSIG+1)
209#elif defined (MAX_SIG)
210# define EV_NSIG (MAX_SIG+1)
211#elif defined (SIGARRAYSIZE)
212# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
213#elif defined (_sys_nsig)
214# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
215#else
216# error "unable to find value for NSIG, please report"
217/* to make it compile regardless, just remove the above line, */
218/* but consider reporting it, too! :) */
219# define EV_NSIG 65
220#endif
221
222#ifndef EV_USE_CLOCK_SYSCALL
223# if __linux && __GLIBC__ >= 2
224# define EV_USE_CLOCK_SYSCALL 1
225# else
226# define EV_USE_CLOCK_SYSCALL 0
227# endif
228#endif
168 229
169#ifndef EV_USE_MONOTONIC 230#ifndef EV_USE_MONOTONIC
170# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 231# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
171# define EV_USE_MONOTONIC 1 232# define EV_USE_MONOTONIC 1
172# else 233# else
173# define EV_USE_MONOTONIC 0 234# define EV_USE_MONOTONIC 0
174# endif 235# endif
175#endif 236#endif
176 237
177#ifndef EV_USE_REALTIME 238#ifndef EV_USE_REALTIME
178# define EV_USE_REALTIME 0 239# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
179#endif 240#endif
180 241
181#ifndef EV_USE_NANOSLEEP 242#ifndef EV_USE_NANOSLEEP
182# if _POSIX_C_SOURCE >= 199309L 243# if _POSIX_C_SOURCE >= 199309L
183# define EV_USE_NANOSLEEP 1 244# define EV_USE_NANOSLEEP 1
… …
244# else 305# else
245# define EV_USE_EVENTFD 0 306# define EV_USE_EVENTFD 0
246# endif 307# endif
247#endif 308#endif
248 309
310#ifndef EV_USE_SIGNALFD
311# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
312# define EV_USE_SIGNALFD 1
313# else
314# define EV_USE_SIGNALFD 0
315# endif
316#endif
317
249#if 0 /* debugging */ 318#if 0 /* debugging */
250# define EV_VERIFY 3 319# define EV_VERIFY 3
251# define EV_USE_4HEAP 1 320# define EV_USE_4HEAP 1
252# define EV_HEAP_CACHE_AT 1 321# define EV_HEAP_CACHE_AT 1
253#endif 322#endif
… …
262 331
263#ifndef EV_HEAP_CACHE_AT 332#ifndef EV_HEAP_CACHE_AT
264# define EV_HEAP_CACHE_AT !EV_MINIMAL 333# define EV_HEAP_CACHE_AT !EV_MINIMAL
265#endif 334#endif
266 335
336/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
337/* which makes programs even slower. might work on other unices, too. */
338#if EV_USE_CLOCK_SYSCALL
339# include <syscall.h>
340# ifdef SYS_clock_gettime
341# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
342# undef EV_USE_MONOTONIC
343# define EV_USE_MONOTONIC 1
344# else
345# undef EV_USE_CLOCK_SYSCALL
346# define EV_USE_CLOCK_SYSCALL 0
347# endif
348#endif
349
267/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 350/* this block fixes any misconfiguration where we know we run into trouble otherwise */
351
352#ifdef _AIX
353/* AIX has a completely broken poll.h header */
354# undef EV_USE_POLL
355# define EV_USE_POLL 0
356#endif
268 357
269#ifndef CLOCK_MONOTONIC 358#ifndef CLOCK_MONOTONIC
270# undef EV_USE_MONOTONIC 359# undef EV_USE_MONOTONIC
271# define EV_USE_MONOTONIC 0 360# define EV_USE_MONOTONIC 0
272#endif 361#endif
… …
303#endif 392#endif
304 393
305#if EV_USE_EVENTFD 394#if EV_USE_EVENTFD
306/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 395/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
307# include <stdint.h> 396# include <stdint.h>
397# ifndef EFD_NONBLOCK
398# define EFD_NONBLOCK O_NONBLOCK
399# endif
400# ifndef EFD_CLOEXEC
401# ifdef O_CLOEXEC
402# define EFD_CLOEXEC O_CLOEXEC
403# else
404# define EFD_CLOEXEC 02000000
405# endif
406# endif
308# ifdef __cplusplus 407# ifdef __cplusplus
309extern "C" { 408extern "C" {
310# endif 409# endif
311int eventfd (unsigned int initval, int flags); 410int (eventfd) (unsigned int initval, int flags);
312# ifdef __cplusplus 411# ifdef __cplusplus
313} 412}
314# endif 413# endif
315#endif 414#endif
415
416#if EV_USE_SIGNALFD
417/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
418# include <stdint.h>
419# ifndef SFD_NONBLOCK
420# define SFD_NONBLOCK O_NONBLOCK
421# endif
422# ifndef SFD_CLOEXEC
423# ifdef O_CLOEXEC
424# define SFD_CLOEXEC O_CLOEXEC
425# else
426# define SFD_CLOEXEC 02000000
427# endif
428# endif
429# ifdef __cplusplus
430extern "C" {
431# endif
432int signalfd (int fd, const sigset_t *mask, int flags);
433
434struct signalfd_siginfo
435{
436 uint32_t ssi_signo;
437 char pad[128 - sizeof (uint32_t)];
438};
439# ifdef __cplusplus
440}
441# endif
442#endif
443
316 444
317/**/ 445/**/
318 446
319#if EV_VERIFY >= 3 447#if EV_VERIFY >= 3
320# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 448# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
… …
332 */ 460 */
333#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 461#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
334 462
335#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 463#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
336#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 464#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
337/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
338 465
339#if __GNUC__ >= 4 466#if __GNUC__ >= 4
340# define expect(expr,value) __builtin_expect ((expr),(value)) 467# define expect(expr,value) __builtin_expect ((expr),(value))
341# define noinline __attribute__ ((noinline)) 468# define noinline __attribute__ ((noinline))
342#else 469#else
… …
355# define inline_speed static noinline 482# define inline_speed static noinline
356#else 483#else
357# define inline_speed static inline 484# define inline_speed static inline
358#endif 485#endif
359 486
360#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 487#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
488
489#if EV_MINPRI == EV_MAXPRI
490# define ABSPRI(w) (((W)w), 0)
491#else
361#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 492# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
493#endif
362 494
363#define EMPTY /* required for microsofts broken pseudo-c compiler */ 495#define EMPTY /* required for microsofts broken pseudo-c compiler */
364#define EMPTY2(a,b) /* used to suppress some warnings */ 496#define EMPTY2(a,b) /* used to suppress some warnings */
365 497
366typedef ev_watcher *W; 498typedef ev_watcher *W;
… …
368typedef ev_watcher_time *WT; 500typedef ev_watcher_time *WT;
369 501
370#define ev_active(w) ((W)(w))->active 502#define ev_active(w) ((W)(w))->active
371#define ev_at(w) ((WT)(w))->at 503#define ev_at(w) ((WT)(w))->at
372 504
373#if EV_USE_MONOTONIC 505#if EV_USE_REALTIME
374/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 506/* sig_atomic_t is used to avoid per-thread variables or locking but still */
375/* giving it a reasonably high chance of working on typical architetcures */ 507/* giving it a reasonably high chance of working on typical architetcures */
508static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
509#endif
510
511#if EV_USE_MONOTONIC
376static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 512static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
513#endif
514
515#ifndef EV_FD_TO_WIN32_HANDLE
516# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
517#endif
518#ifndef EV_WIN32_HANDLE_TO_FD
519# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
520#endif
521#ifndef EV_WIN32_CLOSE_FD
522# define EV_WIN32_CLOSE_FD(fd) close (fd)
377#endif 523#endif
378 524
379#ifdef _WIN32 525#ifdef _WIN32
380# include "ev_win32.c" 526# include "ev_win32.c"
381#endif 527#endif
382 528
383/*****************************************************************************/ 529/*****************************************************************************/
530
531#if EV_AVOID_STDIO
532static void noinline
533ev_printerr (const char *msg)
534{
535 write (STDERR_FILENO, msg, strlen (msg));
536}
537#endif
384 538
385static void (*syserr_cb)(const char *msg); 539static void (*syserr_cb)(const char *msg);
386 540
387void 541void
388ev_set_syserr_cb (void (*cb)(const char *msg)) 542ev_set_syserr_cb (void (*cb)(const char *msg))
… …
398 552
399 if (syserr_cb) 553 if (syserr_cb)
400 syserr_cb (msg); 554 syserr_cb (msg);
401 else 555 else
402 { 556 {
557#if EV_AVOID_STDIO
558 const char *err = strerror (errno);
559
560 ev_printerr (msg);
561 ev_printerr (": ");
562 ev_printerr (err);
563 ev_printerr ("\n");
564#else
403 perror (msg); 565 perror (msg);
566#endif
404 abort (); 567 abort ();
405 } 568 }
406} 569}
407 570
408static void * 571static void *
409ev_realloc_emul (void *ptr, long size) 572ev_realloc_emul (void *ptr, long size)
410{ 573{
574#if __GLIBC__
575 return realloc (ptr, size);
576#else
411 /* some systems, notably openbsd and darwin, fail to properly 577 /* some systems, notably openbsd and darwin, fail to properly
412 * implement realloc (x, 0) (as required by both ansi c-98 and 578 * implement realloc (x, 0) (as required by both ansi c-89 and
413 * the single unix specification, so work around them here. 579 * the single unix specification, so work around them here.
414 */ 580 */
415 581
416 if (size) 582 if (size)
417 return realloc (ptr, size); 583 return realloc (ptr, size);
418 584
419 free (ptr); 585 free (ptr);
420 return 0; 586 return 0;
587#endif
421} 588}
422 589
423static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 590static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
424 591
425void 592void
… …
433{ 600{
434 ptr = alloc (ptr, size); 601 ptr = alloc (ptr, size);
435 602
436 if (!ptr && size) 603 if (!ptr && size)
437 { 604 {
605#if EV_AVOID_STDIO
606 ev_printerr ("libev: memory allocation failed, aborting.\n");
607#else
438 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 608 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
609#endif
439 abort (); 610 abort ();
440 } 611 }
441 612
442 return ptr; 613 return ptr;
443} 614}
… …
445#define ev_malloc(size) ev_realloc (0, (size)) 616#define ev_malloc(size) ev_realloc (0, (size))
446#define ev_free(ptr) ev_realloc ((ptr), 0) 617#define ev_free(ptr) ev_realloc ((ptr), 0)
447 618
448/*****************************************************************************/ 619/*****************************************************************************/
449 620
621/* set in reify when reification needed */
622#define EV_ANFD_REIFY 1
623
624/* file descriptor info structure */
450typedef struct 625typedef struct
451{ 626{
452 WL head; 627 WL head;
453 unsigned char events; 628 unsigned char events; /* the events watched for */
454 unsigned char reify; 629 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
455 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 630 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
456 unsigned char unused; 631 unsigned char unused;
457#if EV_USE_EPOLL 632#if EV_USE_EPOLL
458 unsigned int egen; /* generation counter to counter epoll bugs */ 633 unsigned int egen; /* generation counter to counter epoll bugs */
459#endif 634#endif
460#if EV_SELECT_IS_WINSOCKET 635#if EV_SELECT_IS_WINSOCKET
461 SOCKET handle; 636 SOCKET handle;
462#endif 637#endif
463} ANFD; 638} ANFD;
464 639
640/* stores the pending event set for a given watcher */
465typedef struct 641typedef struct
466{ 642{
467 W w; 643 W w;
468 int events; 644 int events; /* the pending event set for the given watcher */
469} ANPENDING; 645} ANPENDING;
470 646
471#if EV_USE_INOTIFY 647#if EV_USE_INOTIFY
472/* hash table entry per inotify-id */ 648/* hash table entry per inotify-id */
473typedef struct 649typedef struct
… …
476} ANFS; 652} ANFS;
477#endif 653#endif
478 654
479/* Heap Entry */ 655/* Heap Entry */
480#if EV_HEAP_CACHE_AT 656#if EV_HEAP_CACHE_AT
657 /* a heap element */
481 typedef struct { 658 typedef struct {
482 ev_tstamp at; 659 ev_tstamp at;
483 WT w; 660 WT w;
484 } ANHE; 661 } ANHE;
485 662
486 #define ANHE_w(he) (he).w /* access watcher, read-write */ 663 #define ANHE_w(he) (he).w /* access watcher, read-write */
487 #define ANHE_at(he) (he).at /* access cached at, read-only */ 664 #define ANHE_at(he) (he).at /* access cached at, read-only */
488 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */ 665 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
489#else 666#else
667 /* a heap element */
490 typedef WT ANHE; 668 typedef WT ANHE;
491 669
492 #define ANHE_w(he) (he) 670 #define ANHE_w(he) (he)
493 #define ANHE_at(he) (he)->at 671 #define ANHE_at(he) (he)->at
494 #define ANHE_at_cache(he) 672 #define ANHE_at_cache(he)
… …
518 696
519 static int ev_default_loop_ptr; 697 static int ev_default_loop_ptr;
520 698
521#endif 699#endif
522 700
701#if EV_MINIMAL < 2
702# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
703# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
704# define EV_INVOKE_PENDING invoke_cb (EV_A)
705#else
706# define EV_RELEASE_CB (void)0
707# define EV_ACQUIRE_CB (void)0
708# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
709#endif
710
711#define EVUNLOOP_RECURSE 0x80
712
523/*****************************************************************************/ 713/*****************************************************************************/
524 714
715#ifndef EV_HAVE_EV_TIME
525ev_tstamp 716ev_tstamp
526ev_time (void) 717ev_time (void)
527{ 718{
528#if EV_USE_REALTIME 719#if EV_USE_REALTIME
720 if (expect_true (have_realtime))
721 {
529 struct timespec ts; 722 struct timespec ts;
530 clock_gettime (CLOCK_REALTIME, &ts); 723 clock_gettime (CLOCK_REALTIME, &ts);
531 return ts.tv_sec + ts.tv_nsec * 1e-9; 724 return ts.tv_sec + ts.tv_nsec * 1e-9;
532#else 725 }
726#endif
727
533 struct timeval tv; 728 struct timeval tv;
534 gettimeofday (&tv, 0); 729 gettimeofday (&tv, 0);
535 return tv.tv_sec + tv.tv_usec * 1e-6; 730 return tv.tv_sec + tv.tv_usec * 1e-6;
536#endif
537} 731}
732#endif
538 733
539ev_tstamp inline_size 734inline_size ev_tstamp
540get_clock (void) 735get_clock (void)
541{ 736{
542#if EV_USE_MONOTONIC 737#if EV_USE_MONOTONIC
543 if (expect_true (have_monotonic)) 738 if (expect_true (have_monotonic))
544 { 739 {
… …
578 773
579 tv.tv_sec = (time_t)delay; 774 tv.tv_sec = (time_t)delay;
580 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 775 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
581 776
582 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 777 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
583 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 778 /* something not guaranteed by newer posix versions, but guaranteed */
584 /* by older ones */ 779 /* by older ones */
585 select (0, 0, 0, 0, &tv); 780 select (0, 0, 0, 0, &tv);
586#endif 781#endif
587 } 782 }
588} 783}
589 784
590/*****************************************************************************/ 785/*****************************************************************************/
591 786
592#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 787#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
593 788
594int inline_size 789/* find a suitable new size for the given array, */
790/* hopefully by rounding to a ncie-to-malloc size */
791inline_size int
595array_nextsize (int elem, int cur, int cnt) 792array_nextsize (int elem, int cur, int cnt)
596{ 793{
597 int ncur = cur + 1; 794 int ncur = cur + 1;
598 795
599 do 796 do
… …
640 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 837 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
641 } 838 }
642#endif 839#endif
643 840
644#define array_free(stem, idx) \ 841#define array_free(stem, idx) \
645 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 842 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
646 843
647/*****************************************************************************/ 844/*****************************************************************************/
845
846/* dummy callback for pending events */
847static void noinline
848pendingcb (EV_P_ ev_prepare *w, int revents)
849{
850}
648 851
649void noinline 852void noinline
650ev_feed_event (EV_P_ void *w, int revents) 853ev_feed_event (EV_P_ void *w, int revents)
651{ 854{
652 W w_ = (W)w; 855 W w_ = (W)w;
… …
661 pendings [pri][w_->pending - 1].w = w_; 864 pendings [pri][w_->pending - 1].w = w_;
662 pendings [pri][w_->pending - 1].events = revents; 865 pendings [pri][w_->pending - 1].events = revents;
663 } 866 }
664} 867}
665 868
666void inline_speed 869inline_speed void
870feed_reverse (EV_P_ W w)
871{
872 array_needsize (W, rfeeds, rfeedmax, rfeedcnt + 1, EMPTY2);
873 rfeeds [rfeedcnt++] = w;
874}
875
876inline_size void
877feed_reverse_done (EV_P_ int revents)
878{
879 do
880 ev_feed_event (EV_A_ rfeeds [--rfeedcnt], revents);
881 while (rfeedcnt);
882}
883
884inline_speed void
667queue_events (EV_P_ W *events, int eventcnt, int type) 885queue_events (EV_P_ W *events, int eventcnt, int type)
668{ 886{
669 int i; 887 int i;
670 888
671 for (i = 0; i < eventcnt; ++i) 889 for (i = 0; i < eventcnt; ++i)
672 ev_feed_event (EV_A_ events [i], type); 890 ev_feed_event (EV_A_ events [i], type);
673} 891}
674 892
675/*****************************************************************************/ 893/*****************************************************************************/
676 894
677void inline_speed 895inline_speed void
678fd_event (EV_P_ int fd, int revents) 896fd_event_nc (EV_P_ int fd, int revents)
679{ 897{
680 ANFD *anfd = anfds + fd; 898 ANFD *anfd = anfds + fd;
681 ev_io *w; 899 ev_io *w;
682 900
683 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 901 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
687 if (ev) 905 if (ev)
688 ev_feed_event (EV_A_ (W)w, ev); 906 ev_feed_event (EV_A_ (W)w, ev);
689 } 907 }
690} 908}
691 909
910/* do not submit kernel events for fds that have reify set */
911/* because that means they changed while we were polling for new events */
912inline_speed void
913fd_event (EV_P_ int fd, int revents)
914{
915 ANFD *anfd = anfds + fd;
916
917 if (expect_true (!anfd->reify))
918 fd_event_nc (EV_A_ fd, revents);
919}
920
692void 921void
693ev_feed_fd_event (EV_P_ int fd, int revents) 922ev_feed_fd_event (EV_P_ int fd, int revents)
694{ 923{
695 if (fd >= 0 && fd < anfdmax) 924 if (fd >= 0 && fd < anfdmax)
696 fd_event (EV_A_ fd, revents); 925 fd_event_nc (EV_A_ fd, revents);
697} 926}
698 927
699void inline_size 928/* make sure the external fd watch events are in-sync */
929/* with the kernel/libev internal state */
930inline_size void
700fd_reify (EV_P) 931fd_reify (EV_P)
701{ 932{
702 int i; 933 int i;
703 934
704 for (i = 0; i < fdchangecnt; ++i) 935 for (i = 0; i < fdchangecnt; ++i)
… …
714 945
715#if EV_SELECT_IS_WINSOCKET 946#if EV_SELECT_IS_WINSOCKET
716 if (events) 947 if (events)
717 { 948 {
718 unsigned long arg; 949 unsigned long arg;
719 #ifdef EV_FD_TO_WIN32_HANDLE
720 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 950 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
721 #else
722 anfd->handle = _get_osfhandle (fd);
723 #endif
724 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 951 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
725 } 952 }
726#endif 953#endif
727 954
728 { 955 {
729 unsigned char o_events = anfd->events; 956 unsigned char o_events = anfd->events;
730 unsigned char o_reify = anfd->reify; 957 unsigned char o_reify = anfd->reify;
731 958
732 anfd->reify = 0; 959 anfd->reify = 0;
733 anfd->events = events; 960 anfd->events = events;
734 961
735 if (o_events != events || o_reify & EV_IOFDSET) 962 if (o_events != events || o_reify & EV__IOFDSET)
736 backend_modify (EV_A_ fd, o_events, events); 963 backend_modify (EV_A_ fd, o_events, events);
737 } 964 }
738 } 965 }
739 966
740 fdchangecnt = 0; 967 fdchangecnt = 0;
741} 968}
742 969
743void inline_size 970/* something about the given fd changed */
971inline_size void
744fd_change (EV_P_ int fd, int flags) 972fd_change (EV_P_ int fd, int flags)
745{ 973{
746 unsigned char reify = anfds [fd].reify; 974 unsigned char reify = anfds [fd].reify;
747 anfds [fd].reify |= flags; 975 anfds [fd].reify |= flags;
748 976
… …
752 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 980 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
753 fdchanges [fdchangecnt - 1] = fd; 981 fdchanges [fdchangecnt - 1] = fd;
754 } 982 }
755} 983}
756 984
757void inline_speed 985/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
986inline_speed void
758fd_kill (EV_P_ int fd) 987fd_kill (EV_P_ int fd)
759{ 988{
760 ev_io *w; 989 ev_io *w;
761 990
762 while ((w = (ev_io *)anfds [fd].head)) 991 while ((w = (ev_io *)anfds [fd].head))
… …
764 ev_io_stop (EV_A_ w); 993 ev_io_stop (EV_A_ w);
765 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 994 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
766 } 995 }
767} 996}
768 997
769int inline_size 998/* check whether the given fd is actually valid, for error recovery */
999inline_size int
770fd_valid (int fd) 1000fd_valid (int fd)
771{ 1001{
772#ifdef _WIN32 1002#ifdef _WIN32
773 return _get_osfhandle (fd) != -1; 1003 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
774#else 1004#else
775 return fcntl (fd, F_GETFD) != -1; 1005 return fcntl (fd, F_GETFD) != -1;
776#endif 1006#endif
777} 1007}
778 1008
… …
796 1026
797 for (fd = anfdmax; fd--; ) 1027 for (fd = anfdmax; fd--; )
798 if (anfds [fd].events) 1028 if (anfds [fd].events)
799 { 1029 {
800 fd_kill (EV_A_ fd); 1030 fd_kill (EV_A_ fd);
801 return; 1031 break;
802 } 1032 }
803} 1033}
804 1034
805/* usually called after fork if backend needs to re-arm all fds from scratch */ 1035/* usually called after fork if backend needs to re-arm all fds from scratch */
806static void noinline 1036static void noinline
… …
811 for (fd = 0; fd < anfdmax; ++fd) 1041 for (fd = 0; fd < anfdmax; ++fd)
812 if (anfds [fd].events) 1042 if (anfds [fd].events)
813 { 1043 {
814 anfds [fd].events = 0; 1044 anfds [fd].events = 0;
815 anfds [fd].emask = 0; 1045 anfds [fd].emask = 0;
816 fd_change (EV_A_ fd, EV_IOFDSET | 1); 1046 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
817 } 1047 }
1048}
1049
1050/* used to prepare libev internal fd's */
1051/* this is not fork-safe */
1052inline_speed void
1053fd_intern (int fd)
1054{
1055#ifdef _WIN32
1056 unsigned long arg = 1;
1057 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1058#else
1059 fcntl (fd, F_SETFD, FD_CLOEXEC);
1060 fcntl (fd, F_SETFL, O_NONBLOCK);
1061#endif
818} 1062}
819 1063
820/*****************************************************************************/ 1064/*****************************************************************************/
821 1065
822/* 1066/*
… …
837#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 1081#define HEAP0 (DHEAP - 1) /* index of first element in heap */
838#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 1082#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
839#define UPHEAP_DONE(p,k) ((p) == (k)) 1083#define UPHEAP_DONE(p,k) ((p) == (k))
840 1084
841/* away from the root */ 1085/* away from the root */
842void inline_speed 1086inline_speed void
843downheap (ANHE *heap, int N, int k) 1087downheap (ANHE *heap, int N, int k)
844{ 1088{
845 ANHE he = heap [k]; 1089 ANHE he = heap [k];
846 ANHE *E = heap + N + HEAP0; 1090 ANHE *E = heap + N + HEAP0;
847 1091
… …
887#define HEAP0 1 1131#define HEAP0 1
888#define HPARENT(k) ((k) >> 1) 1132#define HPARENT(k) ((k) >> 1)
889#define UPHEAP_DONE(p,k) (!(p)) 1133#define UPHEAP_DONE(p,k) (!(p))
890 1134
891/* away from the root */ 1135/* away from the root */
892void inline_speed 1136inline_speed void
893downheap (ANHE *heap, int N, int k) 1137downheap (ANHE *heap, int N, int k)
894{ 1138{
895 ANHE he = heap [k]; 1139 ANHE he = heap [k];
896 1140
897 for (;;) 1141 for (;;)
898 { 1142 {
899 int c = k << 1; 1143 int c = k << 1;
900 1144
901 if (c > N + HEAP0 - 1) 1145 if (c >= N + HEAP0)
902 break; 1146 break;
903 1147
904 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1148 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
905 ? 1 : 0; 1149 ? 1 : 0;
906 1150
… …
917 ev_active (ANHE_w (he)) = k; 1161 ev_active (ANHE_w (he)) = k;
918} 1162}
919#endif 1163#endif
920 1164
921/* towards the root */ 1165/* towards the root */
922void inline_speed 1166inline_speed void
923upheap (ANHE *heap, int k) 1167upheap (ANHE *heap, int k)
924{ 1168{
925 ANHE he = heap [k]; 1169 ANHE he = heap [k];
926 1170
927 for (;;) 1171 for (;;)
… …
938 1182
939 heap [k] = he; 1183 heap [k] = he;
940 ev_active (ANHE_w (he)) = k; 1184 ev_active (ANHE_w (he)) = k;
941} 1185}
942 1186
943void inline_size 1187/* move an element suitably so it is in a correct place */
1188inline_size void
944adjustheap (ANHE *heap, int N, int k) 1189adjustheap (ANHE *heap, int N, int k)
945{ 1190{
946 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1191 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
947 upheap (heap, k); 1192 upheap (heap, k);
948 else 1193 else
949 downheap (heap, N, k); 1194 downheap (heap, N, k);
950} 1195}
951 1196
952/* rebuild the heap: this function is used only once and executed rarely */ 1197/* rebuild the heap: this function is used only once and executed rarely */
953void inline_size 1198inline_size void
954reheap (ANHE *heap, int N) 1199reheap (ANHE *heap, int N)
955{ 1200{
956 int i; 1201 int i;
957 1202
958 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 1203 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
… …
961 upheap (heap, i + HEAP0); 1206 upheap (heap, i + HEAP0);
962} 1207}
963 1208
964/*****************************************************************************/ 1209/*****************************************************************************/
965 1210
1211/* associate signal watchers to a signal signal */
966typedef struct 1212typedef struct
967{ 1213{
1214 EV_ATOMIC_T pending;
1215#if EV_MULTIPLICITY
1216 EV_P;
1217#endif
968 WL head; 1218 WL head;
969 EV_ATOMIC_T gotsig;
970} ANSIG; 1219} ANSIG;
971 1220
972static ANSIG *signals; 1221static ANSIG signals [EV_NSIG - 1];
973static int signalmax;
974
975static EV_ATOMIC_T gotsig;
976 1222
977/*****************************************************************************/ 1223/*****************************************************************************/
978 1224
979void inline_speed 1225#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
980fd_intern (int fd)
981{
982#ifdef _WIN32
983 unsigned long arg = 1;
984 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
985#else
986 fcntl (fd, F_SETFD, FD_CLOEXEC);
987 fcntl (fd, F_SETFL, O_NONBLOCK);
988#endif
989}
990 1226
991static void noinline 1227static void noinline
992evpipe_init (EV_P) 1228evpipe_init (EV_P)
993{ 1229{
994 if (!ev_is_active (&pipeev)) 1230 if (!ev_is_active (&pipe_w))
995 { 1231 {
996#if EV_USE_EVENTFD 1232# if EV_USE_EVENTFD
1233 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1234 if (evfd < 0 && errno == EINVAL)
997 if ((evfd = eventfd (0, 0)) >= 0) 1235 evfd = eventfd (0, 0);
1236
1237 if (evfd >= 0)
998 { 1238 {
999 evpipe [0] = -1; 1239 evpipe [0] = -1;
1000 fd_intern (evfd); 1240 fd_intern (evfd); /* doing it twice doesn't hurt */
1001 ev_io_set (&pipeev, evfd, EV_READ); 1241 ev_io_set (&pipe_w, evfd, EV_READ);
1002 } 1242 }
1003 else 1243 else
1004#endif 1244# endif
1005 { 1245 {
1006 while (pipe (evpipe)) 1246 while (pipe (evpipe))
1007 ev_syserr ("(libev) error creating signal/async pipe"); 1247 ev_syserr ("(libev) error creating signal/async pipe");
1008 1248
1009 fd_intern (evpipe [0]); 1249 fd_intern (evpipe [0]);
1010 fd_intern (evpipe [1]); 1250 fd_intern (evpipe [1]);
1011 ev_io_set (&pipeev, evpipe [0], EV_READ); 1251 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1012 } 1252 }
1013 1253
1014 ev_io_start (EV_A_ &pipeev); 1254 ev_io_start (EV_A_ &pipe_w);
1015 ev_unref (EV_A); /* watcher should not keep loop alive */ 1255 ev_unref (EV_A); /* watcher should not keep loop alive */
1016 } 1256 }
1017} 1257}
1018 1258
1019void inline_size 1259inline_size void
1020evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1260evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1021{ 1261{
1022 if (!*flag) 1262 if (!*flag)
1023 { 1263 {
1024 int old_errno = errno; /* save errno because write might clobber it */ 1264 int old_errno = errno; /* save errno because write might clobber it */
1265 char dummy;
1025 1266
1026 *flag = 1; 1267 *flag = 1;
1027 1268
1028#if EV_USE_EVENTFD 1269#if EV_USE_EVENTFD
1029 if (evfd >= 0) 1270 if (evfd >= 0)
… …
1031 uint64_t counter = 1; 1272 uint64_t counter = 1;
1032 write (evfd, &counter, sizeof (uint64_t)); 1273 write (evfd, &counter, sizeof (uint64_t));
1033 } 1274 }
1034 else 1275 else
1035#endif 1276#endif
1036 write (evpipe [1], &old_errno, 1); 1277 write (evpipe [1], &dummy, 1);
1037 1278
1038 errno = old_errno; 1279 errno = old_errno;
1039 } 1280 }
1040} 1281}
1041 1282
1283/* called whenever the libev signal pipe */
1284/* got some events (signal, async) */
1042static void 1285static void
1043pipecb (EV_P_ ev_io *iow, int revents) 1286pipecb (EV_P_ ev_io *iow, int revents)
1044{ 1287{
1288 int i;
1289
1045#if EV_USE_EVENTFD 1290#if EV_USE_EVENTFD
1046 if (evfd >= 0) 1291 if (evfd >= 0)
1047 { 1292 {
1048 uint64_t counter; 1293 uint64_t counter;
1049 read (evfd, &counter, sizeof (uint64_t)); 1294 read (evfd, &counter, sizeof (uint64_t));
… …
1053 { 1298 {
1054 char dummy; 1299 char dummy;
1055 read (evpipe [0], &dummy, 1); 1300 read (evpipe [0], &dummy, 1);
1056 } 1301 }
1057 1302
1058 if (gotsig && ev_is_default_loop (EV_A)) 1303 if (sig_pending)
1059 { 1304 {
1060 int signum; 1305 sig_pending = 0;
1061 gotsig = 0;
1062 1306
1063 for (signum = signalmax; signum--; ) 1307 for (i = EV_NSIG - 1; i--; )
1064 if (signals [signum].gotsig) 1308 if (expect_false (signals [i].pending))
1065 ev_feed_signal_event (EV_A_ signum + 1); 1309 ev_feed_signal_event (EV_A_ i + 1);
1066 } 1310 }
1067 1311
1068#if EV_ASYNC_ENABLE 1312#if EV_ASYNC_ENABLE
1069 if (gotasync) 1313 if (async_pending)
1070 { 1314 {
1071 int i; 1315 async_pending = 0;
1072 gotasync = 0;
1073 1316
1074 for (i = asynccnt; i--; ) 1317 for (i = asynccnt; i--; )
1075 if (asyncs [i]->sent) 1318 if (asyncs [i]->sent)
1076 { 1319 {
1077 asyncs [i]->sent = 0; 1320 asyncs [i]->sent = 0;
… …
1085 1328
1086static void 1329static void
1087ev_sighandler (int signum) 1330ev_sighandler (int signum)
1088{ 1331{
1089#if EV_MULTIPLICITY 1332#if EV_MULTIPLICITY
1090 struct ev_loop *loop = &default_loop_struct; 1333 EV_P = signals [signum - 1].loop;
1091#endif 1334#endif
1092 1335
1093#if _WIN32 1336#ifdef _WIN32
1094 signal (signum, ev_sighandler); 1337 signal (signum, ev_sighandler);
1095#endif 1338#endif
1096 1339
1097 signals [signum - 1].gotsig = 1; 1340 signals [signum - 1].pending = 1;
1098 evpipe_write (EV_A_ &gotsig); 1341 evpipe_write (EV_A_ &sig_pending);
1099} 1342}
1100 1343
1101void noinline 1344void noinline
1102ev_feed_signal_event (EV_P_ int signum) 1345ev_feed_signal_event (EV_P_ int signum)
1103{ 1346{
1104 WL w; 1347 WL w;
1105 1348
1349 if (expect_false (signum <= 0 || signum > EV_NSIG))
1350 return;
1351
1352 --signum;
1353
1106#if EV_MULTIPLICITY 1354#if EV_MULTIPLICITY
1107 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1355 /* it is permissible to try to feed a signal to the wrong loop */
1108#endif 1356 /* or, likely more useful, feeding a signal nobody is waiting for */
1109 1357
1110 --signum; 1358 if (expect_false (signals [signum].loop != EV_A))
1111
1112 if (signum < 0 || signum >= signalmax)
1113 return; 1359 return;
1360#endif
1114 1361
1115 signals [signum].gotsig = 0; 1362 signals [signum].pending = 0;
1116 1363
1117 for (w = signals [signum].head; w; w = w->next) 1364 for (w = signals [signum].head; w; w = w->next)
1118 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1365 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1119} 1366}
1120 1367
1368#if EV_USE_SIGNALFD
1369static void
1370sigfdcb (EV_P_ ev_io *iow, int revents)
1371{
1372 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1373
1374 for (;;)
1375 {
1376 ssize_t res = read (sigfd, si, sizeof (si));
1377
1378 /* not ISO-C, as res might be -1, but works with SuS */
1379 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1380 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1381
1382 if (res < (ssize_t)sizeof (si))
1383 break;
1384 }
1385}
1386#endif
1387
1388#endif
1389
1121/*****************************************************************************/ 1390/*****************************************************************************/
1122 1391
1392#if EV_CHILD_ENABLE
1123static WL childs [EV_PID_HASHSIZE]; 1393static WL childs [EV_PID_HASHSIZE];
1124
1125#ifndef _WIN32
1126 1394
1127static ev_signal childev; 1395static ev_signal childev;
1128 1396
1129#ifndef WIFCONTINUED 1397#ifndef WIFCONTINUED
1130# define WIFCONTINUED(status) 0 1398# define WIFCONTINUED(status) 0
1131#endif 1399#endif
1132 1400
1133void inline_speed 1401/* handle a single child status event */
1402inline_speed void
1134child_reap (EV_P_ int chain, int pid, int status) 1403child_reap (EV_P_ int chain, int pid, int status)
1135{ 1404{
1136 ev_child *w; 1405 ev_child *w;
1137 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1406 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1138 1407
… …
1151 1420
1152#ifndef WCONTINUED 1421#ifndef WCONTINUED
1153# define WCONTINUED 0 1422# define WCONTINUED 0
1154#endif 1423#endif
1155 1424
1425/* called on sigchld etc., calls waitpid */
1156static void 1426static void
1157childcb (EV_P_ ev_signal *sw, int revents) 1427childcb (EV_P_ ev_signal *sw, int revents)
1158{ 1428{
1159 int pid, status; 1429 int pid, status;
1160 1430
… …
1241 /* kqueue is borked on everything but netbsd apparently */ 1511 /* kqueue is borked on everything but netbsd apparently */
1242 /* it usually doesn't work correctly on anything but sockets and pipes */ 1512 /* it usually doesn't work correctly on anything but sockets and pipes */
1243 flags &= ~EVBACKEND_KQUEUE; 1513 flags &= ~EVBACKEND_KQUEUE;
1244#endif 1514#endif
1245#ifdef __APPLE__ 1515#ifdef __APPLE__
1246 // flags &= ~EVBACKEND_KQUEUE; for documentation 1516 /* only select works correctly on that "unix-certified" platform */
1247 flags &= ~EVBACKEND_POLL; 1517 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1518 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1248#endif 1519#endif
1249 1520
1250 return flags; 1521 return flags;
1251} 1522}
1252 1523
… …
1266ev_backend (EV_P) 1537ev_backend (EV_P)
1267{ 1538{
1268 return backend; 1539 return backend;
1269} 1540}
1270 1541
1542#if EV_MINIMAL < 2
1271unsigned int 1543unsigned int
1272ev_loop_count (EV_P) 1544ev_loop_count (EV_P)
1273{ 1545{
1274 return loop_count; 1546 return loop_count;
1275} 1547}
1276 1548
1549unsigned int
1550ev_loop_depth (EV_P)
1551{
1552 return loop_depth;
1553}
1554
1277void 1555void
1278ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1556ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1279{ 1557{
1280 io_blocktime = interval; 1558 io_blocktime = interval;
1281} 1559}
… …
1284ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1562ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1285{ 1563{
1286 timeout_blocktime = interval; 1564 timeout_blocktime = interval;
1287} 1565}
1288 1566
1567void
1568ev_set_userdata (EV_P_ void *data)
1569{
1570 userdata = data;
1571}
1572
1573void *
1574ev_userdata (EV_P)
1575{
1576 return userdata;
1577}
1578
1579void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1580{
1581 invoke_cb = invoke_pending_cb;
1582}
1583
1584void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1585{
1586 release_cb = release;
1587 acquire_cb = acquire;
1588}
1589#endif
1590
1591/* initialise a loop structure, must be zero-initialised */
1289static void noinline 1592static void noinline
1290loop_init (EV_P_ unsigned int flags) 1593loop_init (EV_P_ unsigned int flags)
1291{ 1594{
1292 if (!backend) 1595 if (!backend)
1293 { 1596 {
1597#if EV_USE_REALTIME
1598 if (!have_realtime)
1599 {
1600 struct timespec ts;
1601
1602 if (!clock_gettime (CLOCK_REALTIME, &ts))
1603 have_realtime = 1;
1604 }
1605#endif
1606
1294#if EV_USE_MONOTONIC 1607#if EV_USE_MONOTONIC
1608 if (!have_monotonic)
1295 { 1609 {
1296 struct timespec ts; 1610 struct timespec ts;
1611
1297 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1612 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1298 have_monotonic = 1; 1613 have_monotonic = 1;
1299 } 1614 }
1300#endif 1615#endif
1616
1617 /* pid check not overridable via env */
1618#ifndef _WIN32
1619 if (flags & EVFLAG_FORKCHECK)
1620 curpid = getpid ();
1621#endif
1622
1623 if (!(flags & EVFLAG_NOENV)
1624 && !enable_secure ()
1625 && getenv ("LIBEV_FLAGS"))
1626 flags = atoi (getenv ("LIBEV_FLAGS"));
1301 1627
1302 ev_rt_now = ev_time (); 1628 ev_rt_now = ev_time ();
1303 mn_now = get_clock (); 1629 mn_now = get_clock ();
1304 now_floor = mn_now; 1630 now_floor = mn_now;
1305 rtmn_diff = ev_rt_now - mn_now; 1631 rtmn_diff = ev_rt_now - mn_now;
1632#if EV_MINIMAL < 2
1633 invoke_cb = ev_invoke_pending;
1634#endif
1306 1635
1307 io_blocktime = 0.; 1636 io_blocktime = 0.;
1308 timeout_blocktime = 0.; 1637 timeout_blocktime = 0.;
1309 backend = 0; 1638 backend = 0;
1310 backend_fd = -1; 1639 backend_fd = -1;
1311 gotasync = 0; 1640 sig_pending = 0;
1641#if EV_ASYNC_ENABLE
1642 async_pending = 0;
1643#endif
1312#if EV_USE_INOTIFY 1644#if EV_USE_INOTIFY
1313 fs_fd = -2; 1645 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1314#endif 1646#endif
1315 1647#if EV_USE_SIGNALFD
1316 /* pid check not overridable via env */ 1648 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1317#ifndef _WIN32
1318 if (flags & EVFLAG_FORKCHECK)
1319 curpid = getpid ();
1320#endif 1649#endif
1321
1322 if (!(flags & EVFLAG_NOENV)
1323 && !enable_secure ()
1324 && getenv ("LIBEV_FLAGS"))
1325 flags = atoi (getenv ("LIBEV_FLAGS"));
1326 1650
1327 if (!(flags & 0x0000ffffU)) 1651 if (!(flags & 0x0000ffffU))
1328 flags |= ev_recommended_backends (); 1652 flags |= ev_recommended_backends ();
1329 1653
1330#if EV_USE_PORT 1654#if EV_USE_PORT
… …
1341#endif 1665#endif
1342#if EV_USE_SELECT 1666#if EV_USE_SELECT
1343 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1667 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1344#endif 1668#endif
1345 1669
1670 ev_prepare_init (&pending_w, pendingcb);
1671
1672#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1346 ev_init (&pipeev, pipecb); 1673 ev_init (&pipe_w, pipecb);
1347 ev_set_priority (&pipeev, EV_MAXPRI); 1674 ev_set_priority (&pipe_w, EV_MAXPRI);
1675#endif
1348 } 1676 }
1349} 1677}
1350 1678
1679/* free up a loop structure */
1351static void noinline 1680static void noinline
1352loop_destroy (EV_P) 1681loop_destroy (EV_P)
1353{ 1682{
1354 int i; 1683 int i;
1355 1684
1356 if (ev_is_active (&pipeev)) 1685 if (ev_is_active (&pipe_w))
1357 { 1686 {
1358 ev_ref (EV_A); /* signal watcher */ 1687 /*ev_ref (EV_A);*/
1359 ev_io_stop (EV_A_ &pipeev); 1688 /*ev_io_stop (EV_A_ &pipe_w);*/
1360 1689
1361#if EV_USE_EVENTFD 1690#if EV_USE_EVENTFD
1362 if (evfd >= 0) 1691 if (evfd >= 0)
1363 close (evfd); 1692 close (evfd);
1364#endif 1693#endif
1365 1694
1366 if (evpipe [0] >= 0) 1695 if (evpipe [0] >= 0)
1367 { 1696 {
1368 close (evpipe [0]); 1697 EV_WIN32_CLOSE_FD (evpipe [0]);
1369 close (evpipe [1]); 1698 EV_WIN32_CLOSE_FD (evpipe [1]);
1370 } 1699 }
1371 } 1700 }
1701
1702#if EV_USE_SIGNALFD
1703 if (ev_is_active (&sigfd_w))
1704 close (sigfd);
1705#endif
1372 1706
1373#if EV_USE_INOTIFY 1707#if EV_USE_INOTIFY
1374 if (fs_fd >= 0) 1708 if (fs_fd >= 0)
1375 close (fs_fd); 1709 close (fs_fd);
1376#endif 1710#endif
… …
1400#if EV_IDLE_ENABLE 1734#if EV_IDLE_ENABLE
1401 array_free (idle, [i]); 1735 array_free (idle, [i]);
1402#endif 1736#endif
1403 } 1737 }
1404 1738
1405 ev_free (anfds); anfdmax = 0; 1739 ev_free (anfds); anfds = 0; anfdmax = 0;
1406 1740
1407 /* have to use the microsoft-never-gets-it-right macro */ 1741 /* have to use the microsoft-never-gets-it-right macro */
1742 array_free (rfeed, EMPTY);
1408 array_free (fdchange, EMPTY); 1743 array_free (fdchange, EMPTY);
1409 array_free (timer, EMPTY); 1744 array_free (timer, EMPTY);
1410#if EV_PERIODIC_ENABLE 1745#if EV_PERIODIC_ENABLE
1411 array_free (periodic, EMPTY); 1746 array_free (periodic, EMPTY);
1412#endif 1747#endif
… …
1421 1756
1422 backend = 0; 1757 backend = 0;
1423} 1758}
1424 1759
1425#if EV_USE_INOTIFY 1760#if EV_USE_INOTIFY
1426void inline_size infy_fork (EV_P); 1761inline_size void infy_fork (EV_P);
1427#endif 1762#endif
1428 1763
1429void inline_size 1764inline_size void
1430loop_fork (EV_P) 1765loop_fork (EV_P)
1431{ 1766{
1432#if EV_USE_PORT 1767#if EV_USE_PORT
1433 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1768 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1434#endif 1769#endif
… …
1440#endif 1775#endif
1441#if EV_USE_INOTIFY 1776#if EV_USE_INOTIFY
1442 infy_fork (EV_A); 1777 infy_fork (EV_A);
1443#endif 1778#endif
1444 1779
1445 if (ev_is_active (&pipeev)) 1780 if (ev_is_active (&pipe_w))
1446 { 1781 {
1447 /* this "locks" the handlers against writing to the pipe */ 1782 /* this "locks" the handlers against writing to the pipe */
1448 /* while we modify the fd vars */ 1783 /* while we modify the fd vars */
1449 gotsig = 1; 1784 sig_pending = 1;
1450#if EV_ASYNC_ENABLE 1785#if EV_ASYNC_ENABLE
1451 gotasync = 1; 1786 async_pending = 1;
1452#endif 1787#endif
1453 1788
1454 ev_ref (EV_A); 1789 ev_ref (EV_A);
1455 ev_io_stop (EV_A_ &pipeev); 1790 ev_io_stop (EV_A_ &pipe_w);
1456 1791
1457#if EV_USE_EVENTFD 1792#if EV_USE_EVENTFD
1458 if (evfd >= 0) 1793 if (evfd >= 0)
1459 close (evfd); 1794 close (evfd);
1460#endif 1795#endif
1461 1796
1462 if (evpipe [0] >= 0) 1797 if (evpipe [0] >= 0)
1463 { 1798 {
1464 close (evpipe [0]); 1799 EV_WIN32_CLOSE_FD (evpipe [0]);
1465 close (evpipe [1]); 1800 EV_WIN32_CLOSE_FD (evpipe [1]);
1466 } 1801 }
1467 1802
1468 evpipe_init (EV_A); 1803 evpipe_init (EV_A);
1469 /* now iterate over everything, in case we missed something */ 1804 /* now iterate over everything, in case we missed something */
1470 pipecb (EV_A_ &pipeev, EV_READ); 1805 pipecb (EV_A_ &pipe_w, EV_READ);
1471 } 1806 }
1472 1807
1473 postfork = 0; 1808 postfork = 0;
1474} 1809}
1475 1810
1476#if EV_MULTIPLICITY 1811#if EV_MULTIPLICITY
1477 1812
1478struct ev_loop * 1813struct ev_loop *
1479ev_loop_new (unsigned int flags) 1814ev_loop_new (unsigned int flags)
1480{ 1815{
1481 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1816 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1482 1817
1483 memset (loop, 0, sizeof (struct ev_loop)); 1818 memset (EV_A, 0, sizeof (struct ev_loop));
1484
1485 loop_init (EV_A_ flags); 1819 loop_init (EV_A_ flags);
1486 1820
1487 if (ev_backend (EV_A)) 1821 if (ev_backend (EV_A))
1488 return loop; 1822 return EV_A;
1489 1823
1490 return 0; 1824 return 0;
1491} 1825}
1492 1826
1493void 1827void
… …
1500void 1834void
1501ev_loop_fork (EV_P) 1835ev_loop_fork (EV_P)
1502{ 1836{
1503 postfork = 1; /* must be in line with ev_default_fork */ 1837 postfork = 1; /* must be in line with ev_default_fork */
1504} 1838}
1839#endif /* multiplicity */
1505 1840
1506#if EV_VERIFY 1841#if EV_VERIFY
1507static void noinline 1842static void noinline
1508verify_watcher (EV_P_ W w) 1843verify_watcher (EV_P_ W w)
1509{ 1844{
1510 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1845 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1511 1846
1512 if (w->pending) 1847 if (w->pending)
1513 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 1848 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1514} 1849}
1515 1850
1516static void noinline 1851static void noinline
1517verify_heap (EV_P_ ANHE *heap, int N) 1852verify_heap (EV_P_ ANHE *heap, int N)
1518{ 1853{
1519 int i; 1854 int i;
1520 1855
1521 for (i = HEAP0; i < N + HEAP0; ++i) 1856 for (i = HEAP0; i < N + HEAP0; ++i)
1522 { 1857 {
1523 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i)); 1858 assert (("libev: active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1524 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i]))); 1859 assert (("libev: heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1525 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i])))); 1860 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1526 1861
1527 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1862 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1528 } 1863 }
1529} 1864}
1530 1865
1531static void noinline 1866static void noinline
1532array_verify (EV_P_ W *ws, int cnt) 1867array_verify (EV_P_ W *ws, int cnt)
1533{ 1868{
1534 while (cnt--) 1869 while (cnt--)
1535 { 1870 {
1536 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1871 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1537 verify_watcher (EV_A_ ws [cnt]); 1872 verify_watcher (EV_A_ ws [cnt]);
1538 } 1873 }
1539} 1874}
1540#endif 1875#endif
1541 1876
1877#if EV_MINIMAL < 2
1542void 1878void
1543ev_loop_verify (EV_P) 1879ev_loop_verify (EV_P)
1544{ 1880{
1545#if EV_VERIFY 1881#if EV_VERIFY
1546 int i; 1882 int i;
… …
1548 1884
1549 assert (activecnt >= -1); 1885 assert (activecnt >= -1);
1550 1886
1551 assert (fdchangemax >= fdchangecnt); 1887 assert (fdchangemax >= fdchangecnt);
1552 for (i = 0; i < fdchangecnt; ++i) 1888 for (i = 0; i < fdchangecnt; ++i)
1553 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1889 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1554 1890
1555 assert (anfdmax >= 0); 1891 assert (anfdmax >= 0);
1556 for (i = 0; i < anfdmax; ++i) 1892 for (i = 0; i < anfdmax; ++i)
1557 for (w = anfds [i].head; w; w = w->next) 1893 for (w = anfds [i].head; w; w = w->next)
1558 { 1894 {
1559 verify_watcher (EV_A_ (W)w); 1895 verify_watcher (EV_A_ (W)w);
1560 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1896 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1561 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i)); 1897 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1562 } 1898 }
1563 1899
1564 assert (timermax >= timercnt); 1900 assert (timermax >= timercnt);
1565 verify_heap (EV_A_ timers, timercnt); 1901 verify_heap (EV_A_ timers, timercnt);
1566 1902
… …
1594 1930
1595 assert (checkmax >= checkcnt); 1931 assert (checkmax >= checkcnt);
1596 array_verify (EV_A_ (W *)checks, checkcnt); 1932 array_verify (EV_A_ (W *)checks, checkcnt);
1597 1933
1598# if 0 1934# if 0
1935#if EV_CHILD_ENABLE
1599 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1936 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1600 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1937 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1601# endif 1938#endif
1602#endif 1939# endif
1940#endif
1603} 1941}
1604 1942#endif
1605#endif /* multiplicity */
1606 1943
1607#if EV_MULTIPLICITY 1944#if EV_MULTIPLICITY
1608struct ev_loop * 1945struct ev_loop *
1609ev_default_loop_init (unsigned int flags) 1946ev_default_loop_init (unsigned int flags)
1610#else 1947#else
… …
1613#endif 1950#endif
1614{ 1951{
1615 if (!ev_default_loop_ptr) 1952 if (!ev_default_loop_ptr)
1616 { 1953 {
1617#if EV_MULTIPLICITY 1954#if EV_MULTIPLICITY
1618 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1955 EV_P = ev_default_loop_ptr = &default_loop_struct;
1619#else 1956#else
1620 ev_default_loop_ptr = 1; 1957 ev_default_loop_ptr = 1;
1621#endif 1958#endif
1622 1959
1623 loop_init (EV_A_ flags); 1960 loop_init (EV_A_ flags);
1624 1961
1625 if (ev_backend (EV_A)) 1962 if (ev_backend (EV_A))
1626 { 1963 {
1627#ifndef _WIN32 1964#if EV_CHILD_ENABLE
1628 ev_signal_init (&childev, childcb, SIGCHLD); 1965 ev_signal_init (&childev, childcb, SIGCHLD);
1629 ev_set_priority (&childev, EV_MAXPRI); 1966 ev_set_priority (&childev, EV_MAXPRI);
1630 ev_signal_start (EV_A_ &childev); 1967 ev_signal_start (EV_A_ &childev);
1631 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1968 ev_unref (EV_A); /* child watcher should not keep loop alive */
1632#endif 1969#endif
… …
1640 1977
1641void 1978void
1642ev_default_destroy (void) 1979ev_default_destroy (void)
1643{ 1980{
1644#if EV_MULTIPLICITY 1981#if EV_MULTIPLICITY
1645 struct ev_loop *loop = ev_default_loop_ptr; 1982 EV_P = ev_default_loop_ptr;
1646#endif 1983#endif
1647 1984
1648 ev_default_loop_ptr = 0; 1985 ev_default_loop_ptr = 0;
1649 1986
1650#ifndef _WIN32 1987#if EV_CHILD_ENABLE
1651 ev_ref (EV_A); /* child watcher */ 1988 ev_ref (EV_A); /* child watcher */
1652 ev_signal_stop (EV_A_ &childev); 1989 ev_signal_stop (EV_A_ &childev);
1653#endif 1990#endif
1654 1991
1655 loop_destroy (EV_A); 1992 loop_destroy (EV_A);
… …
1657 1994
1658void 1995void
1659ev_default_fork (void) 1996ev_default_fork (void)
1660{ 1997{
1661#if EV_MULTIPLICITY 1998#if EV_MULTIPLICITY
1662 struct ev_loop *loop = ev_default_loop_ptr; 1999 EV_P = ev_default_loop_ptr;
1663#endif 2000#endif
1664 2001
1665 postfork = 1; /* must be in line with ev_loop_fork */ 2002 postfork = 1; /* must be in line with ev_loop_fork */
1666} 2003}
1667 2004
… …
1671ev_invoke (EV_P_ void *w, int revents) 2008ev_invoke (EV_P_ void *w, int revents)
1672{ 2009{
1673 EV_CB_INVOKE ((W)w, revents); 2010 EV_CB_INVOKE ((W)w, revents);
1674} 2011}
1675 2012
1676void inline_speed 2013unsigned int
1677call_pending (EV_P) 2014ev_pending_count (EV_P)
2015{
2016 int pri;
2017 unsigned int count = 0;
2018
2019 for (pri = NUMPRI; pri--; )
2020 count += pendingcnt [pri];
2021
2022 return count;
2023}
2024
2025void noinline
2026ev_invoke_pending (EV_P)
1678{ 2027{
1679 int pri; 2028 int pri;
1680 2029
1681 for (pri = NUMPRI; pri--; ) 2030 for (pri = NUMPRI; pri--; )
1682 while (pendingcnt [pri]) 2031 while (pendingcnt [pri])
1683 { 2032 {
1684 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2033 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1685 2034
1686 if (expect_true (p->w))
1687 {
1688 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 2035 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
2036 /* ^ this is no longer true, as pending_w could be here */
1689 2037
1690 p->w->pending = 0; 2038 p->w->pending = 0;
1691 EV_CB_INVOKE (p->w, p->events); 2039 EV_CB_INVOKE (p->w, p->events);
1692 EV_FREQUENT_CHECK; 2040 EV_FREQUENT_CHECK;
1693 }
1694 } 2041 }
1695} 2042}
1696 2043
1697#if EV_IDLE_ENABLE 2044#if EV_IDLE_ENABLE
1698void inline_size 2045/* make idle watchers pending. this handles the "call-idle */
2046/* only when higher priorities are idle" logic */
2047inline_size void
1699idle_reify (EV_P) 2048idle_reify (EV_P)
1700{ 2049{
1701 if (expect_false (idleall)) 2050 if (expect_false (idleall))
1702 { 2051 {
1703 int pri; 2052 int pri;
… …
1715 } 2064 }
1716 } 2065 }
1717} 2066}
1718#endif 2067#endif
1719 2068
1720void inline_size 2069/* make timers pending */
2070inline_size void
1721timers_reify (EV_P) 2071timers_reify (EV_P)
1722{ 2072{
1723 EV_FREQUENT_CHECK; 2073 EV_FREQUENT_CHECK;
1724 2074
1725 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 2075 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1726 { 2076 {
1727 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 2077 do
1728
1729 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1730
1731 /* first reschedule or stop timer */
1732 if (w->repeat)
1733 { 2078 {
2079 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
2080
2081 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
2082
2083 /* first reschedule or stop timer */
2084 if (w->repeat)
2085 {
1734 ev_at (w) += w->repeat; 2086 ev_at (w) += w->repeat;
1735 if (ev_at (w) < mn_now) 2087 if (ev_at (w) < mn_now)
1736 ev_at (w) = mn_now; 2088 ev_at (w) = mn_now;
1737 2089
1738 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 2090 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1739 2091
1740 ANHE_at_cache (timers [HEAP0]); 2092 ANHE_at_cache (timers [HEAP0]);
1741 downheap (timers, timercnt, HEAP0); 2093 downheap (timers, timercnt, HEAP0);
2094 }
2095 else
2096 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
2097
2098 EV_FREQUENT_CHECK;
2099 feed_reverse (EV_A_ (W)w);
1742 } 2100 }
1743 else 2101 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1744 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1745 2102
1746 EV_FREQUENT_CHECK;
1747 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 2103 feed_reverse_done (EV_A_ EV_TIMEOUT);
1748 } 2104 }
1749} 2105}
1750 2106
1751#if EV_PERIODIC_ENABLE 2107#if EV_PERIODIC_ENABLE
1752void inline_size 2108/* make periodics pending */
2109inline_size void
1753periodics_reify (EV_P) 2110periodics_reify (EV_P)
1754{ 2111{
1755 EV_FREQUENT_CHECK; 2112 EV_FREQUENT_CHECK;
1756 2113
1757 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2114 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1758 { 2115 {
1759 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2116 int feed_count = 0;
1760 2117
1761 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 2118 do
1762
1763 /* first reschedule or stop timer */
1764 if (w->reschedule_cb)
1765 { 2119 {
2120 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2121
2122 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
2123
2124 /* first reschedule or stop timer */
2125 if (w->reschedule_cb)
2126 {
1766 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2127 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1767 2128
1768 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 2129 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1769 2130
1770 ANHE_at_cache (periodics [HEAP0]); 2131 ANHE_at_cache (periodics [HEAP0]);
1771 downheap (periodics, periodiccnt, HEAP0); 2132 downheap (periodics, periodiccnt, HEAP0);
2133 }
2134 else if (w->interval)
2135 {
2136 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2137 /* if next trigger time is not sufficiently in the future, put it there */
2138 /* this might happen because of floating point inexactness */
2139 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2140 {
2141 ev_at (w) += w->interval;
2142
2143 /* if interval is unreasonably low we might still have a time in the past */
2144 /* so correct this. this will make the periodic very inexact, but the user */
2145 /* has effectively asked to get triggered more often than possible */
2146 if (ev_at (w) < ev_rt_now)
2147 ev_at (w) = ev_rt_now;
2148 }
2149
2150 ANHE_at_cache (periodics [HEAP0]);
2151 downheap (periodics, periodiccnt, HEAP0);
2152 }
2153 else
2154 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
2155
2156 EV_FREQUENT_CHECK;
2157 feed_reverse (EV_A_ (W)w);
1772 } 2158 }
1773 else if (w->interval) 2159 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
1774 {
1775 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1776 /* if next trigger time is not sufficiently in the future, put it there */
1777 /* this might happen because of floating point inexactness */
1778 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1779 {
1780 ev_at (w) += w->interval;
1781 2160
1782 /* if interval is unreasonably low we might still have a time in the past */
1783 /* so correct this. this will make the periodic very inexact, but the user */
1784 /* has effectively asked to get triggered more often than possible */
1785 if (ev_at (w) < ev_rt_now)
1786 ev_at (w) = ev_rt_now;
1787 }
1788
1789 ANHE_at_cache (periodics [HEAP0]);
1790 downheap (periodics, periodiccnt, HEAP0);
1791 }
1792 else
1793 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1794
1795 EV_FREQUENT_CHECK;
1796 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 2161 feed_reverse_done (EV_A_ EV_PERIODIC);
1797 } 2162 }
1798} 2163}
1799 2164
2165/* simply recalculate all periodics */
2166/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1800static void noinline 2167static void noinline
1801periodics_reschedule (EV_P) 2168periodics_reschedule (EV_P)
1802{ 2169{
1803 int i; 2170 int i;
1804 2171
… …
1817 2184
1818 reheap (periodics, periodiccnt); 2185 reheap (periodics, periodiccnt);
1819} 2186}
1820#endif 2187#endif
1821 2188
1822void inline_speed 2189/* adjust all timers by a given offset */
2190static void noinline
2191timers_reschedule (EV_P_ ev_tstamp adjust)
2192{
2193 int i;
2194
2195 for (i = 0; i < timercnt; ++i)
2196 {
2197 ANHE *he = timers + i + HEAP0;
2198 ANHE_w (*he)->at += adjust;
2199 ANHE_at_cache (*he);
2200 }
2201}
2202
2203/* fetch new monotonic and realtime times from the kernel */
2204/* also detect if there was a timejump, and act accordingly */
2205inline_speed void
1823time_update (EV_P_ ev_tstamp max_block) 2206time_update (EV_P_ ev_tstamp max_block)
1824{ 2207{
1825 int i;
1826
1827#if EV_USE_MONOTONIC 2208#if EV_USE_MONOTONIC
1828 if (expect_true (have_monotonic)) 2209 if (expect_true (have_monotonic))
1829 { 2210 {
2211 int i;
1830 ev_tstamp odiff = rtmn_diff; 2212 ev_tstamp odiff = rtmn_diff;
1831 2213
1832 mn_now = get_clock (); 2214 mn_now = get_clock ();
1833 2215
1834 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2216 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1860 ev_rt_now = ev_time (); 2242 ev_rt_now = ev_time ();
1861 mn_now = get_clock (); 2243 mn_now = get_clock ();
1862 now_floor = mn_now; 2244 now_floor = mn_now;
1863 } 2245 }
1864 2246
2247 /* no timer adjustment, as the monotonic clock doesn't jump */
2248 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1865# if EV_PERIODIC_ENABLE 2249# if EV_PERIODIC_ENABLE
1866 periodics_reschedule (EV_A); 2250 periodics_reschedule (EV_A);
1867# endif 2251# endif
1868 /* no timer adjustment, as the monotonic clock doesn't jump */
1869 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1870 } 2252 }
1871 else 2253 else
1872#endif 2254#endif
1873 { 2255 {
1874 ev_rt_now = ev_time (); 2256 ev_rt_now = ev_time ();
1875 2257
1876 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 2258 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1877 { 2259 {
2260 /* adjust timers. this is easy, as the offset is the same for all of them */
2261 timers_reschedule (EV_A_ ev_rt_now - mn_now);
1878#if EV_PERIODIC_ENABLE 2262#if EV_PERIODIC_ENABLE
1879 periodics_reschedule (EV_A); 2263 periodics_reschedule (EV_A);
1880#endif 2264#endif
1881 /* adjust timers. this is easy, as the offset is the same for all of them */
1882 for (i = 0; i < timercnt; ++i)
1883 {
1884 ANHE *he = timers + i + HEAP0;
1885 ANHE_w (*he)->at += ev_rt_now - mn_now;
1886 ANHE_at_cache (*he);
1887 }
1888 } 2265 }
1889 2266
1890 mn_now = ev_rt_now; 2267 mn_now = ev_rt_now;
1891 } 2268 }
1892} 2269}
1893 2270
1894void 2271void
1895ev_ref (EV_P)
1896{
1897 ++activecnt;
1898}
1899
1900void
1901ev_unref (EV_P)
1902{
1903 --activecnt;
1904}
1905
1906void
1907ev_now_update (EV_P)
1908{
1909 time_update (EV_A_ 1e100);
1910}
1911
1912static int loop_done;
1913
1914void
1915ev_loop (EV_P_ int flags) 2272ev_loop (EV_P_ int flags)
1916{ 2273{
2274#if EV_MINIMAL < 2
2275 ++loop_depth;
2276#endif
2277
2278 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2279
1917 loop_done = EVUNLOOP_CANCEL; 2280 loop_done = EVUNLOOP_CANCEL;
1918 2281
1919 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2282 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1920 2283
1921 do 2284 do
1922 { 2285 {
1923#if EV_VERIFY >= 2 2286#if EV_VERIFY >= 2
1924 ev_loop_verify (EV_A); 2287 ev_loop_verify (EV_A);
… …
1937 /* we might have forked, so queue fork handlers */ 2300 /* we might have forked, so queue fork handlers */
1938 if (expect_false (postfork)) 2301 if (expect_false (postfork))
1939 if (forkcnt) 2302 if (forkcnt)
1940 { 2303 {
1941 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2304 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1942 call_pending (EV_A); 2305 EV_INVOKE_PENDING;
1943 } 2306 }
1944#endif 2307#endif
1945 2308
1946 /* queue prepare watchers (and execute them) */ 2309 /* queue prepare watchers (and execute them) */
1947 if (expect_false (preparecnt)) 2310 if (expect_false (preparecnt))
1948 { 2311 {
1949 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2312 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1950 call_pending (EV_A); 2313 EV_INVOKE_PENDING;
1951 } 2314 }
1952 2315
1953 if (expect_false (!activecnt)) 2316 if (expect_false (loop_done))
1954 break; 2317 break;
1955 2318
1956 /* we might have forked, so reify kernel state if necessary */ 2319 /* we might have forked, so reify kernel state if necessary */
1957 if (expect_false (postfork)) 2320 if (expect_false (postfork))
1958 loop_fork (EV_A); 2321 loop_fork (EV_A);
… …
1965 ev_tstamp waittime = 0.; 2328 ev_tstamp waittime = 0.;
1966 ev_tstamp sleeptime = 0.; 2329 ev_tstamp sleeptime = 0.;
1967 2330
1968 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2331 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1969 { 2332 {
2333 /* remember old timestamp for io_blocktime calculation */
2334 ev_tstamp prev_mn_now = mn_now;
2335
1970 /* update time to cancel out callback processing overhead */ 2336 /* update time to cancel out callback processing overhead */
1971 time_update (EV_A_ 1e100); 2337 time_update (EV_A_ 1e100);
1972 2338
1973 waittime = MAX_BLOCKTIME; 2339 waittime = MAX_BLOCKTIME;
1974 2340
… …
1984 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2350 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1985 if (waittime > to) waittime = to; 2351 if (waittime > to) waittime = to;
1986 } 2352 }
1987#endif 2353#endif
1988 2354
2355 /* don't let timeouts decrease the waittime below timeout_blocktime */
1989 if (expect_false (waittime < timeout_blocktime)) 2356 if (expect_false (waittime < timeout_blocktime))
1990 waittime = timeout_blocktime; 2357 waittime = timeout_blocktime;
1991 2358
1992 sleeptime = waittime - backend_fudge; 2359 /* extra check because io_blocktime is commonly 0 */
1993
1994 if (expect_true (sleeptime > io_blocktime)) 2360 if (expect_false (io_blocktime))
1995 sleeptime = io_blocktime;
1996
1997 if (sleeptime)
1998 { 2361 {
2362 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2363
2364 if (sleeptime > waittime - backend_fudge)
2365 sleeptime = waittime - backend_fudge;
2366
2367 if (expect_true (sleeptime > 0.))
2368 {
1999 ev_sleep (sleeptime); 2369 ev_sleep (sleeptime);
2000 waittime -= sleeptime; 2370 waittime -= sleeptime;
2371 }
2001 } 2372 }
2002 } 2373 }
2003 2374
2375#if EV_MINIMAL < 2
2004 ++loop_count; 2376 ++loop_count;
2377#endif
2378 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2005 backend_poll (EV_A_ waittime); 2379 backend_poll (EV_A_ waittime);
2380 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2006 2381
2007 /* update ev_rt_now, do magic */ 2382 /* update ev_rt_now, do magic */
2008 time_update (EV_A_ waittime + sleeptime); 2383 time_update (EV_A_ waittime + sleeptime);
2009 } 2384 }
2010 2385
… …
2021 2396
2022 /* queue check watchers, to be executed first */ 2397 /* queue check watchers, to be executed first */
2023 if (expect_false (checkcnt)) 2398 if (expect_false (checkcnt))
2024 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2399 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2025 2400
2026 call_pending (EV_A); 2401 EV_INVOKE_PENDING;
2027 } 2402 }
2028 while (expect_true ( 2403 while (expect_true (
2029 activecnt 2404 activecnt
2030 && !loop_done 2405 && !loop_done
2031 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2406 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2032 )); 2407 ));
2033 2408
2034 if (loop_done == EVUNLOOP_ONE) 2409 if (loop_done == EVUNLOOP_ONE)
2035 loop_done = EVUNLOOP_CANCEL; 2410 loop_done = EVUNLOOP_CANCEL;
2411
2412#if EV_MINIMAL < 2
2413 --loop_depth;
2414#endif
2036} 2415}
2037 2416
2038void 2417void
2039ev_unloop (EV_P_ int how) 2418ev_unloop (EV_P_ int how)
2040{ 2419{
2041 loop_done = how; 2420 loop_done = how;
2042} 2421}
2043 2422
2423void
2424ev_ref (EV_P)
2425{
2426 ++activecnt;
2427}
2428
2429void
2430ev_unref (EV_P)
2431{
2432 --activecnt;
2433}
2434
2435void
2436ev_now_update (EV_P)
2437{
2438 time_update (EV_A_ 1e100);
2439}
2440
2441void
2442ev_suspend (EV_P)
2443{
2444 ev_now_update (EV_A);
2445}
2446
2447void
2448ev_resume (EV_P)
2449{
2450 ev_tstamp mn_prev = mn_now;
2451
2452 ev_now_update (EV_A);
2453 timers_reschedule (EV_A_ mn_now - mn_prev);
2454#if EV_PERIODIC_ENABLE
2455 /* TODO: really do this? */
2456 periodics_reschedule (EV_A);
2457#endif
2458}
2459
2044/*****************************************************************************/ 2460/*****************************************************************************/
2461/* singly-linked list management, used when the expected list length is short */
2045 2462
2046void inline_size 2463inline_size void
2047wlist_add (WL *head, WL elem) 2464wlist_add (WL *head, WL elem)
2048{ 2465{
2049 elem->next = *head; 2466 elem->next = *head;
2050 *head = elem; 2467 *head = elem;
2051} 2468}
2052 2469
2053void inline_size 2470inline_size void
2054wlist_del (WL *head, WL elem) 2471wlist_del (WL *head, WL elem)
2055{ 2472{
2056 while (*head) 2473 while (*head)
2057 { 2474 {
2058 if (*head == elem) 2475 if (expect_true (*head == elem))
2059 { 2476 {
2060 *head = elem->next; 2477 *head = elem->next;
2061 return; 2478 break;
2062 } 2479 }
2063 2480
2064 head = &(*head)->next; 2481 head = &(*head)->next;
2065 } 2482 }
2066} 2483}
2067 2484
2068void inline_speed 2485/* internal, faster, version of ev_clear_pending */
2486inline_speed void
2069clear_pending (EV_P_ W w) 2487clear_pending (EV_P_ W w)
2070{ 2488{
2071 if (w->pending) 2489 if (w->pending)
2072 { 2490 {
2073 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2491 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2074 w->pending = 0; 2492 w->pending = 0;
2075 } 2493 }
2076} 2494}
2077 2495
2078int 2496int
… …
2082 int pending = w_->pending; 2500 int pending = w_->pending;
2083 2501
2084 if (expect_true (pending)) 2502 if (expect_true (pending))
2085 { 2503 {
2086 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2504 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2505 p->w = (W)&pending_w;
2087 w_->pending = 0; 2506 w_->pending = 0;
2088 p->w = 0;
2089 return p->events; 2507 return p->events;
2090 } 2508 }
2091 else 2509 else
2092 return 0; 2510 return 0;
2093} 2511}
2094 2512
2095void inline_size 2513inline_size void
2096pri_adjust (EV_P_ W w) 2514pri_adjust (EV_P_ W w)
2097{ 2515{
2098 int pri = w->priority; 2516 int pri = ev_priority (w);
2099 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2517 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2100 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2518 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2101 w->priority = pri; 2519 ev_set_priority (w, pri);
2102} 2520}
2103 2521
2104void inline_speed 2522inline_speed void
2105ev_start (EV_P_ W w, int active) 2523ev_start (EV_P_ W w, int active)
2106{ 2524{
2107 pri_adjust (EV_A_ w); 2525 pri_adjust (EV_A_ w);
2108 w->active = active; 2526 w->active = active;
2109 ev_ref (EV_A); 2527 ev_ref (EV_A);
2110} 2528}
2111 2529
2112void inline_size 2530inline_size void
2113ev_stop (EV_P_ W w) 2531ev_stop (EV_P_ W w)
2114{ 2532{
2115 ev_unref (EV_A); 2533 ev_unref (EV_A);
2116 w->active = 0; 2534 w->active = 0;
2117} 2535}
… …
2124 int fd = w->fd; 2542 int fd = w->fd;
2125 2543
2126 if (expect_false (ev_is_active (w))) 2544 if (expect_false (ev_is_active (w)))
2127 return; 2545 return;
2128 2546
2129 assert (("ev_io_start called with negative fd", fd >= 0)); 2547 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2130 assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE)))); 2548 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2131 2549
2132 EV_FREQUENT_CHECK; 2550 EV_FREQUENT_CHECK;
2133 2551
2134 ev_start (EV_A_ (W)w, 1); 2552 ev_start (EV_A_ (W)w, 1);
2135 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2553 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2136 wlist_add (&anfds[fd].head, (WL)w); 2554 wlist_add (&anfds[fd].head, (WL)w);
2137 2555
2138 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2556 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2139 w->events &= ~EV_IOFDSET; 2557 w->events &= ~EV__IOFDSET;
2140 2558
2141 EV_FREQUENT_CHECK; 2559 EV_FREQUENT_CHECK;
2142} 2560}
2143 2561
2144void noinline 2562void noinline
… …
2146{ 2564{
2147 clear_pending (EV_A_ (W)w); 2565 clear_pending (EV_A_ (W)w);
2148 if (expect_false (!ev_is_active (w))) 2566 if (expect_false (!ev_is_active (w)))
2149 return; 2567 return;
2150 2568
2151 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2569 assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2152 2570
2153 EV_FREQUENT_CHECK; 2571 EV_FREQUENT_CHECK;
2154 2572
2155 wlist_del (&anfds[w->fd].head, (WL)w); 2573 wlist_del (&anfds[w->fd].head, (WL)w);
2156 ev_stop (EV_A_ (W)w); 2574 ev_stop (EV_A_ (W)w);
… …
2166 if (expect_false (ev_is_active (w))) 2584 if (expect_false (ev_is_active (w)))
2167 return; 2585 return;
2168 2586
2169 ev_at (w) += mn_now; 2587 ev_at (w) += mn_now;
2170 2588
2171 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2589 assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2172 2590
2173 EV_FREQUENT_CHECK; 2591 EV_FREQUENT_CHECK;
2174 2592
2175 ++timercnt; 2593 ++timercnt;
2176 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2594 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2179 ANHE_at_cache (timers [ev_active (w)]); 2597 ANHE_at_cache (timers [ev_active (w)]);
2180 upheap (timers, ev_active (w)); 2598 upheap (timers, ev_active (w));
2181 2599
2182 EV_FREQUENT_CHECK; 2600 EV_FREQUENT_CHECK;
2183 2601
2184 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2602 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2185} 2603}
2186 2604
2187void noinline 2605void noinline
2188ev_timer_stop (EV_P_ ev_timer *w) 2606ev_timer_stop (EV_P_ ev_timer *w)
2189{ 2607{
… …
2194 EV_FREQUENT_CHECK; 2612 EV_FREQUENT_CHECK;
2195 2613
2196 { 2614 {
2197 int active = ev_active (w); 2615 int active = ev_active (w);
2198 2616
2199 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2617 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2200 2618
2201 --timercnt; 2619 --timercnt;
2202 2620
2203 if (expect_true (active < timercnt + HEAP0)) 2621 if (expect_true (active < timercnt + HEAP0))
2204 { 2622 {
2205 timers [active] = timers [timercnt + HEAP0]; 2623 timers [active] = timers [timercnt + HEAP0];
2206 adjustheap (timers, timercnt, active); 2624 adjustheap (timers, timercnt, active);
2207 } 2625 }
2208 } 2626 }
2209 2627
2210 EV_FREQUENT_CHECK;
2211
2212 ev_at (w) -= mn_now; 2628 ev_at (w) -= mn_now;
2213 2629
2214 ev_stop (EV_A_ (W)w); 2630 ev_stop (EV_A_ (W)w);
2631
2632 EV_FREQUENT_CHECK;
2215} 2633}
2216 2634
2217void noinline 2635void noinline
2218ev_timer_again (EV_P_ ev_timer *w) 2636ev_timer_again (EV_P_ ev_timer *w)
2219{ 2637{
… …
2237 } 2655 }
2238 2656
2239 EV_FREQUENT_CHECK; 2657 EV_FREQUENT_CHECK;
2240} 2658}
2241 2659
2660ev_tstamp
2661ev_timer_remaining (EV_P_ ev_timer *w)
2662{
2663 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2664}
2665
2242#if EV_PERIODIC_ENABLE 2666#if EV_PERIODIC_ENABLE
2243void noinline 2667void noinline
2244ev_periodic_start (EV_P_ ev_periodic *w) 2668ev_periodic_start (EV_P_ ev_periodic *w)
2245{ 2669{
2246 if (expect_false (ev_is_active (w))) 2670 if (expect_false (ev_is_active (w)))
… …
2248 2672
2249 if (w->reschedule_cb) 2673 if (w->reschedule_cb)
2250 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2674 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2251 else if (w->interval) 2675 else if (w->interval)
2252 { 2676 {
2253 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2677 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2254 /* this formula differs from the one in periodic_reify because we do not always round up */ 2678 /* this formula differs from the one in periodic_reify because we do not always round up */
2255 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2679 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2256 } 2680 }
2257 else 2681 else
2258 ev_at (w) = w->offset; 2682 ev_at (w) = w->offset;
… …
2266 ANHE_at_cache (periodics [ev_active (w)]); 2690 ANHE_at_cache (periodics [ev_active (w)]);
2267 upheap (periodics, ev_active (w)); 2691 upheap (periodics, ev_active (w));
2268 2692
2269 EV_FREQUENT_CHECK; 2693 EV_FREQUENT_CHECK;
2270 2694
2271 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2695 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2272} 2696}
2273 2697
2274void noinline 2698void noinline
2275ev_periodic_stop (EV_P_ ev_periodic *w) 2699ev_periodic_stop (EV_P_ ev_periodic *w)
2276{ 2700{
… …
2281 EV_FREQUENT_CHECK; 2705 EV_FREQUENT_CHECK;
2282 2706
2283 { 2707 {
2284 int active = ev_active (w); 2708 int active = ev_active (w);
2285 2709
2286 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2710 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2287 2711
2288 --periodiccnt; 2712 --periodiccnt;
2289 2713
2290 if (expect_true (active < periodiccnt + HEAP0)) 2714 if (expect_true (active < periodiccnt + HEAP0))
2291 { 2715 {
2292 periodics [active] = periodics [periodiccnt + HEAP0]; 2716 periodics [active] = periodics [periodiccnt + HEAP0];
2293 adjustheap (periodics, periodiccnt, active); 2717 adjustheap (periodics, periodiccnt, active);
2294 } 2718 }
2295 } 2719 }
2296 2720
2297 EV_FREQUENT_CHECK;
2298
2299 ev_stop (EV_A_ (W)w); 2721 ev_stop (EV_A_ (W)w);
2722
2723 EV_FREQUENT_CHECK;
2300} 2724}
2301 2725
2302void noinline 2726void noinline
2303ev_periodic_again (EV_P_ ev_periodic *w) 2727ev_periodic_again (EV_P_ ev_periodic *w)
2304{ 2728{
… …
2310 2734
2311#ifndef SA_RESTART 2735#ifndef SA_RESTART
2312# define SA_RESTART 0 2736# define SA_RESTART 0
2313#endif 2737#endif
2314 2738
2739#if EV_SIGNAL_ENABLE
2740
2315void noinline 2741void noinline
2316ev_signal_start (EV_P_ ev_signal *w) 2742ev_signal_start (EV_P_ ev_signal *w)
2317{ 2743{
2318#if EV_MULTIPLICITY
2319 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2320#endif
2321 if (expect_false (ev_is_active (w))) 2744 if (expect_false (ev_is_active (w)))
2322 return; 2745 return;
2323 2746
2324 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2747 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2325 2748
2326 evpipe_init (EV_A); 2749#if EV_MULTIPLICITY
2750 assert (("libev: a signal must not be attached to two different loops",
2751 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2327 2752
2328 EV_FREQUENT_CHECK; 2753 signals [w->signum - 1].loop = EV_A;
2754#endif
2329 2755
2756 EV_FREQUENT_CHECK;
2757
2758#if EV_USE_SIGNALFD
2759 if (sigfd == -2)
2330 { 2760 {
2331#ifndef _WIN32 2761 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2332 sigset_t full, prev; 2762 if (sigfd < 0 && errno == EINVAL)
2333 sigfillset (&full); 2763 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2334 sigprocmask (SIG_SETMASK, &full, &prev);
2335#endif
2336 2764
2337 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2765 if (sigfd >= 0)
2766 {
2767 fd_intern (sigfd); /* doing it twice will not hurt */
2338 2768
2339#ifndef _WIN32 2769 sigemptyset (&sigfd_set);
2340 sigprocmask (SIG_SETMASK, &prev, 0); 2770
2341#endif 2771 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2772 ev_set_priority (&sigfd_w, EV_MAXPRI);
2773 ev_io_start (EV_A_ &sigfd_w);
2774 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2775 }
2342 } 2776 }
2777
2778 if (sigfd >= 0)
2779 {
2780 /* TODO: check .head */
2781 sigaddset (&sigfd_set, w->signum);
2782 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2783
2784 signalfd (sigfd, &sigfd_set, 0);
2785 }
2786#endif
2343 2787
2344 ev_start (EV_A_ (W)w, 1); 2788 ev_start (EV_A_ (W)w, 1);
2345 wlist_add (&signals [w->signum - 1].head, (WL)w); 2789 wlist_add (&signals [w->signum - 1].head, (WL)w);
2346 2790
2347 if (!((WL)w)->next) 2791 if (!((WL)w)->next)
2792# if EV_USE_SIGNALFD
2793 if (sigfd < 0) /*TODO*/
2794# endif
2348 { 2795 {
2349#if _WIN32 2796# ifdef _WIN32
2797 evpipe_init (EV_A);
2798
2350 signal (w->signum, ev_sighandler); 2799 signal (w->signum, ev_sighandler);
2351#else 2800# else
2352 struct sigaction sa; 2801 struct sigaction sa;
2802
2803 evpipe_init (EV_A);
2804
2353 sa.sa_handler = ev_sighandler; 2805 sa.sa_handler = ev_sighandler;
2354 sigfillset (&sa.sa_mask); 2806 sigfillset (&sa.sa_mask);
2355 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2807 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2356 sigaction (w->signum, &sa, 0); 2808 sigaction (w->signum, &sa, 0);
2809
2810 sigemptyset (&sa.sa_mask);
2811 sigaddset (&sa.sa_mask, w->signum);
2812 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2357#endif 2813#endif
2358 } 2814 }
2359 2815
2360 EV_FREQUENT_CHECK; 2816 EV_FREQUENT_CHECK;
2361} 2817}
2362 2818
2363void noinline 2819void noinline
… …
2371 2827
2372 wlist_del (&signals [w->signum - 1].head, (WL)w); 2828 wlist_del (&signals [w->signum - 1].head, (WL)w);
2373 ev_stop (EV_A_ (W)w); 2829 ev_stop (EV_A_ (W)w);
2374 2830
2375 if (!signals [w->signum - 1].head) 2831 if (!signals [w->signum - 1].head)
2832 {
2833#if EV_MULTIPLICITY
2834 signals [w->signum - 1].loop = 0; /* unattach from signal */
2835#endif
2836#if EV_USE_SIGNALFD
2837 if (sigfd >= 0)
2838 {
2839 sigset_t ss;
2840
2841 sigemptyset (&ss);
2842 sigaddset (&ss, w->signum);
2843 sigdelset (&sigfd_set, w->signum);
2844
2845 signalfd (sigfd, &sigfd_set, 0);
2846 sigprocmask (SIG_UNBLOCK, &ss, 0);
2847 }
2848 else
2849#endif
2376 signal (w->signum, SIG_DFL); 2850 signal (w->signum, SIG_DFL);
2851 }
2377 2852
2378 EV_FREQUENT_CHECK; 2853 EV_FREQUENT_CHECK;
2379} 2854}
2855
2856#endif
2857
2858#if EV_CHILD_ENABLE
2380 2859
2381void 2860void
2382ev_child_start (EV_P_ ev_child *w) 2861ev_child_start (EV_P_ ev_child *w)
2383{ 2862{
2384#if EV_MULTIPLICITY 2863#if EV_MULTIPLICITY
2385 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2864 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2386#endif 2865#endif
2387 if (expect_false (ev_is_active (w))) 2866 if (expect_false (ev_is_active (w)))
2388 return; 2867 return;
2389 2868
2390 EV_FREQUENT_CHECK; 2869 EV_FREQUENT_CHECK;
… …
2408 ev_stop (EV_A_ (W)w); 2887 ev_stop (EV_A_ (W)w);
2409 2888
2410 EV_FREQUENT_CHECK; 2889 EV_FREQUENT_CHECK;
2411} 2890}
2412 2891
2892#endif
2893
2413#if EV_STAT_ENABLE 2894#if EV_STAT_ENABLE
2414 2895
2415# ifdef _WIN32 2896# ifdef _WIN32
2416# undef lstat 2897# undef lstat
2417# define lstat(a,b) _stati64 (a,b) 2898# define lstat(a,b) _stati64 (a,b)
… …
2422#define MIN_STAT_INTERVAL 0.1074891 2903#define MIN_STAT_INTERVAL 0.1074891
2423 2904
2424static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2905static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2425 2906
2426#if EV_USE_INOTIFY 2907#if EV_USE_INOTIFY
2427# define EV_INOTIFY_BUFSIZE 8192 2908
2909/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2910# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2428 2911
2429static void noinline 2912static void noinline
2430infy_add (EV_P_ ev_stat *w) 2913infy_add (EV_P_ ev_stat *w)
2431{ 2914{
2432 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); 2915 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);
2433 2916
2434 if (w->wd < 0) 2917 if (w->wd >= 0)
2918 {
2919 struct statfs sfs;
2920
2921 /* now local changes will be tracked by inotify, but remote changes won't */
2922 /* unless the filesystem is known to be local, we therefore still poll */
2923 /* also do poll on <2.6.25, but with normal frequency */
2924
2925 if (!fs_2625)
2926 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2927 else if (!statfs (w->path, &sfs)
2928 && (sfs.f_type == 0x1373 /* devfs */
2929 || sfs.f_type == 0xEF53 /* ext2/3 */
2930 || sfs.f_type == 0x3153464a /* jfs */
2931 || sfs.f_type == 0x52654973 /* reiser3 */
2932 || sfs.f_type == 0x01021994 /* tempfs */
2933 || sfs.f_type == 0x58465342 /* xfs */))
2934 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2935 else
2936 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2435 { 2937 }
2938 else
2939 {
2940 /* can't use inotify, continue to stat */
2436 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2941 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2437 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2438 2942
2439 /* monitor some parent directory for speedup hints */ 2943 /* if path is not there, monitor some parent directory for speedup hints */
2440 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2944 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2441 /* but an efficiency issue only */ 2945 /* but an efficiency issue only */
2442 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2946 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2443 { 2947 {
2444 char path [4096]; 2948 char path [4096];
… …
2449 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2953 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2450 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2954 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2451 2955
2452 char *pend = strrchr (path, '/'); 2956 char *pend = strrchr (path, '/');
2453 2957
2454 if (!pend) 2958 if (!pend || pend == path)
2455 break; /* whoops, no '/', complain to your admin */ 2959 break;
2456 2960
2457 *pend = 0; 2961 *pend = 0;
2458 w->wd = inotify_add_watch (fs_fd, path, mask); 2962 w->wd = inotify_add_watch (fs_fd, path, mask);
2459 } 2963 }
2460 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2964 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2461 } 2965 }
2462 } 2966 }
2463 else 2967
2464 { 2968 if (w->wd >= 0)
2465 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2969 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2466 2970
2467 /* now local changes will be tracked by inotify, but remote changes won't */ 2971 /* now re-arm timer, if required */
2468 /* unless the filesystem it known to be local, we therefore still poll */ 2972 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2469 /* also do poll on <2.6.25, but with normal frequency */
2470 struct statfs sfs;
2471
2472 if (fs_2625 && !statfs (w->path, &sfs))
2473 if (sfs.f_type == 0x1373 /* devfs */
2474 || sfs.f_type == 0xEF53 /* ext2/3 */
2475 || sfs.f_type == 0x3153464a /* jfs */
2476 || sfs.f_type == 0x52654973 /* reiser3 */
2477 || sfs.f_type == 0x01021994 /* tempfs */
2478 || sfs.f_type == 0x58465342 /* xfs */)
2479 return;
2480
2481 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2482 ev_timer_again (EV_A_ &w->timer); 2973 ev_timer_again (EV_A_ &w->timer);
2483 } 2974 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2484} 2975}
2485 2976
2486static void noinline 2977static void noinline
2487infy_del (EV_P_ ev_stat *w) 2978infy_del (EV_P_ ev_stat *w)
2488{ 2979{
… …
2518 3009
2519 if (w->wd == wd || wd == -1) 3010 if (w->wd == wd || wd == -1)
2520 { 3011 {
2521 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3012 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2522 { 3013 {
3014 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2523 w->wd = -1; 3015 w->wd = -1;
2524 infy_add (EV_A_ w); /* re-add, no matter what */ 3016 infy_add (EV_A_ w); /* re-add, no matter what */
2525 } 3017 }
2526 3018
2527 stat_timer_cb (EV_A_ &w->timer, 0); 3019 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2532 3024
2533static void 3025static void
2534infy_cb (EV_P_ ev_io *w, int revents) 3026infy_cb (EV_P_ ev_io *w, int revents)
2535{ 3027{
2536 char buf [EV_INOTIFY_BUFSIZE]; 3028 char buf [EV_INOTIFY_BUFSIZE];
2537 struct inotify_event *ev = (struct inotify_event *)buf;
2538 int ofs; 3029 int ofs;
2539 int len = read (fs_fd, buf, sizeof (buf)); 3030 int len = read (fs_fd, buf, sizeof (buf));
2540 3031
2541 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3032 for (ofs = 0; ofs < len; )
3033 {
3034 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2542 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3035 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3036 ofs += sizeof (struct inotify_event) + ev->len;
3037 }
2543} 3038}
2544 3039
2545void inline_size 3040inline_size unsigned int
3041ev_linux_version (void)
3042{
3043 struct utsname buf;
3044 unsigned int v;
3045 int i;
3046 char *p = buf.release;
3047
3048 if (uname (&buf))
3049 return 0;
3050
3051 for (i = 3+1; --i; )
3052 {
3053 unsigned int c = 0;
3054
3055 for (;;)
3056 {
3057 if (*p >= '0' && *p <= '9')
3058 c = c * 10 + *p++ - '0';
3059 else
3060 {
3061 p += *p == '.';
3062 break;
3063 }
3064 }
3065
3066 v = (v << 8) | c;
3067 }
3068
3069 return v;
3070}
3071
3072inline_size void
2546check_2625 (EV_P) 3073ev_check_2625 (EV_P)
2547{ 3074{
2548 /* kernels < 2.6.25 are borked 3075 /* kernels < 2.6.25 are borked
2549 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3076 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2550 */ 3077 */
2551 struct utsname buf; 3078 if (ev_linux_version () < 0x020619)
2552 int major, minor, micro;
2553
2554 if (uname (&buf))
2555 return; 3079 return;
2556 3080
2557 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2558 return;
2559
2560 if (major < 2
2561 || (major == 2 && minor < 6)
2562 || (major == 2 && minor == 6 && micro < 25))
2563 return;
2564
2565 fs_2625 = 1; 3081 fs_2625 = 1;
2566} 3082}
2567 3083
2568void inline_size 3084inline_size int
3085infy_newfd (void)
3086{
3087#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3088 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3089 if (fd >= 0)
3090 return fd;
3091#endif
3092 return inotify_init ();
3093}
3094
3095inline_size void
2569infy_init (EV_P) 3096infy_init (EV_P)
2570{ 3097{
2571 if (fs_fd != -2) 3098 if (fs_fd != -2)
2572 return; 3099 return;
2573 3100
2574 fs_fd = -1; 3101 fs_fd = -1;
2575 3102
2576 check_2625 (EV_A); 3103 ev_check_2625 (EV_A);
2577 3104
2578 fs_fd = inotify_init (); 3105 fs_fd = infy_newfd ();
2579 3106
2580 if (fs_fd >= 0) 3107 if (fs_fd >= 0)
2581 { 3108 {
3109 fd_intern (fs_fd);
2582 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3110 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2583 ev_set_priority (&fs_w, EV_MAXPRI); 3111 ev_set_priority (&fs_w, EV_MAXPRI);
2584 ev_io_start (EV_A_ &fs_w); 3112 ev_io_start (EV_A_ &fs_w);
3113 ev_unref (EV_A);
2585 } 3114 }
2586} 3115}
2587 3116
2588void inline_size 3117inline_size void
2589infy_fork (EV_P) 3118infy_fork (EV_P)
2590{ 3119{
2591 int slot; 3120 int slot;
2592 3121
2593 if (fs_fd < 0) 3122 if (fs_fd < 0)
2594 return; 3123 return;
2595 3124
3125 ev_ref (EV_A);
3126 ev_io_stop (EV_A_ &fs_w);
2596 close (fs_fd); 3127 close (fs_fd);
2597 fs_fd = inotify_init (); 3128 fs_fd = infy_newfd ();
3129
3130 if (fs_fd >= 0)
3131 {
3132 fd_intern (fs_fd);
3133 ev_io_set (&fs_w, fs_fd, EV_READ);
3134 ev_io_start (EV_A_ &fs_w);
3135 ev_unref (EV_A);
3136 }
2598 3137
2599 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3138 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2600 { 3139 {
2601 WL w_ = fs_hash [slot].head; 3140 WL w_ = fs_hash [slot].head;
2602 fs_hash [slot].head = 0; 3141 fs_hash [slot].head = 0;
… …
2609 w->wd = -1; 3148 w->wd = -1;
2610 3149
2611 if (fs_fd >= 0) 3150 if (fs_fd >= 0)
2612 infy_add (EV_A_ w); /* re-add, no matter what */ 3151 infy_add (EV_A_ w); /* re-add, no matter what */
2613 else 3152 else
3153 {
3154 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3155 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2614 ev_timer_again (EV_A_ &w->timer); 3156 ev_timer_again (EV_A_ &w->timer);
3157 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3158 }
2615 } 3159 }
2616 } 3160 }
2617} 3161}
2618 3162
2619#endif 3163#endif
… …
2636static void noinline 3180static void noinline
2637stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3181stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2638{ 3182{
2639 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3183 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2640 3184
2641 /* we copy this here each the time so that */ 3185 ev_statdata prev = w->attr;
2642 /* prev has the old value when the callback gets invoked */
2643 w->prev = w->attr;
2644 ev_stat_stat (EV_A_ w); 3186 ev_stat_stat (EV_A_ w);
2645 3187
2646 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3188 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2647 if ( 3189 if (
2648 w->prev.st_dev != w->attr.st_dev 3190 prev.st_dev != w->attr.st_dev
2649 || w->prev.st_ino != w->attr.st_ino 3191 || prev.st_ino != w->attr.st_ino
2650 || w->prev.st_mode != w->attr.st_mode 3192 || prev.st_mode != w->attr.st_mode
2651 || w->prev.st_nlink != w->attr.st_nlink 3193 || prev.st_nlink != w->attr.st_nlink
2652 || w->prev.st_uid != w->attr.st_uid 3194 || prev.st_uid != w->attr.st_uid
2653 || w->prev.st_gid != w->attr.st_gid 3195 || prev.st_gid != w->attr.st_gid
2654 || w->prev.st_rdev != w->attr.st_rdev 3196 || prev.st_rdev != w->attr.st_rdev
2655 || w->prev.st_size != w->attr.st_size 3197 || prev.st_size != w->attr.st_size
2656 || w->prev.st_atime != w->attr.st_atime 3198 || prev.st_atime != w->attr.st_atime
2657 || w->prev.st_mtime != w->attr.st_mtime 3199 || prev.st_mtime != w->attr.st_mtime
2658 || w->prev.st_ctime != w->attr.st_ctime 3200 || prev.st_ctime != w->attr.st_ctime
2659 ) { 3201 ) {
3202 /* we only update w->prev on actual differences */
3203 /* in case we test more often than invoke the callback, */
3204 /* to ensure that prev is always different to attr */
3205 w->prev = prev;
3206
2660 #if EV_USE_INOTIFY 3207 #if EV_USE_INOTIFY
2661 if (fs_fd >= 0) 3208 if (fs_fd >= 0)
2662 { 3209 {
2663 infy_del (EV_A_ w); 3210 infy_del (EV_A_ w);
2664 infy_add (EV_A_ w); 3211 infy_add (EV_A_ w);
… …
2689 3236
2690 if (fs_fd >= 0) 3237 if (fs_fd >= 0)
2691 infy_add (EV_A_ w); 3238 infy_add (EV_A_ w);
2692 else 3239 else
2693#endif 3240#endif
3241 {
2694 ev_timer_again (EV_A_ &w->timer); 3242 ev_timer_again (EV_A_ &w->timer);
3243 ev_unref (EV_A);
3244 }
2695 3245
2696 ev_start (EV_A_ (W)w, 1); 3246 ev_start (EV_A_ (W)w, 1);
2697 3247
2698 EV_FREQUENT_CHECK; 3248 EV_FREQUENT_CHECK;
2699} 3249}
… …
2708 EV_FREQUENT_CHECK; 3258 EV_FREQUENT_CHECK;
2709 3259
2710#if EV_USE_INOTIFY 3260#if EV_USE_INOTIFY
2711 infy_del (EV_A_ w); 3261 infy_del (EV_A_ w);
2712#endif 3262#endif
3263
3264 if (ev_is_active (&w->timer))
3265 {
3266 ev_ref (EV_A);
2713 ev_timer_stop (EV_A_ &w->timer); 3267 ev_timer_stop (EV_A_ &w->timer);
3268 }
2714 3269
2715 ev_stop (EV_A_ (W)w); 3270 ev_stop (EV_A_ (W)w);
2716 3271
2717 EV_FREQUENT_CHECK; 3272 EV_FREQUENT_CHECK;
2718} 3273}
… …
2859embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3414embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2860{ 3415{
2861 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3416 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2862 3417
2863 { 3418 {
2864 struct ev_loop *loop = w->other; 3419 EV_P = w->other;
2865 3420
2866 while (fdchangecnt) 3421 while (fdchangecnt)
2867 { 3422 {
2868 fd_reify (EV_A); 3423 fd_reify (EV_A);
2869 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3424 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
2874static void 3429static void
2875embed_fork_cb (EV_P_ ev_fork *fork_w, int revents) 3430embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2876{ 3431{
2877 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3432 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2878 3433
3434 ev_embed_stop (EV_A_ w);
3435
2879 { 3436 {
2880 struct ev_loop *loop = w->other; 3437 EV_P = w->other;
2881 3438
2882 ev_loop_fork (EV_A); 3439 ev_loop_fork (EV_A);
3440 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2883 } 3441 }
3442
3443 ev_embed_start (EV_A_ w);
2884} 3444}
2885 3445
2886#if 0 3446#if 0
2887static void 3447static void
2888embed_idle_cb (EV_P_ ev_idle *idle, int revents) 3448embed_idle_cb (EV_P_ ev_idle *idle, int revents)
… …
2896{ 3456{
2897 if (expect_false (ev_is_active (w))) 3457 if (expect_false (ev_is_active (w)))
2898 return; 3458 return;
2899 3459
2900 { 3460 {
2901 struct ev_loop *loop = w->other; 3461 EV_P = w->other;
2902 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3462 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2903 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3463 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2904 } 3464 }
2905 3465
2906 EV_FREQUENT_CHECK; 3466 EV_FREQUENT_CHECK;
2907 3467
… …
2933 3493
2934 ev_io_stop (EV_A_ &w->io); 3494 ev_io_stop (EV_A_ &w->io);
2935 ev_prepare_stop (EV_A_ &w->prepare); 3495 ev_prepare_stop (EV_A_ &w->prepare);
2936 ev_fork_stop (EV_A_ &w->fork); 3496 ev_fork_stop (EV_A_ &w->fork);
2937 3497
3498 ev_stop (EV_A_ (W)w);
3499
2938 EV_FREQUENT_CHECK; 3500 EV_FREQUENT_CHECK;
2939} 3501}
2940#endif 3502#endif
2941 3503
2942#if EV_FORK_ENABLE 3504#if EV_FORK_ENABLE
… …
3018 3580
3019void 3581void
3020ev_async_send (EV_P_ ev_async *w) 3582ev_async_send (EV_P_ ev_async *w)
3021{ 3583{
3022 w->sent = 1; 3584 w->sent = 1;
3023 evpipe_write (EV_A_ &gotasync); 3585 evpipe_write (EV_A_ &async_pending);
3024} 3586}
3025#endif 3587#endif
3026 3588
3027/*****************************************************************************/ 3589/*****************************************************************************/
3028 3590
… …
3090 ev_timer_set (&once->to, timeout, 0.); 3652 ev_timer_set (&once->to, timeout, 0.);
3091 ev_timer_start (EV_A_ &once->to); 3653 ev_timer_start (EV_A_ &once->to);
3092 } 3654 }
3093} 3655}
3094 3656
3657/*****************************************************************************/
3658
3659#if EV_WALK_ENABLE
3660void
3661ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3662{
3663 int i, j;
3664 ev_watcher_list *wl, *wn;
3665
3666 if (types & (EV_IO | EV_EMBED))
3667 for (i = 0; i < anfdmax; ++i)
3668 for (wl = anfds [i].head; wl; )
3669 {
3670 wn = wl->next;
3671
3672#if EV_EMBED_ENABLE
3673 if (ev_cb ((ev_io *)wl) == embed_io_cb)
3674 {
3675 if (types & EV_EMBED)
3676 cb (EV_A_ EV_EMBED, ((char *)wl) - offsetof (struct ev_embed, io));
3677 }
3678 else
3679#endif
3680#if EV_USE_INOTIFY
3681 if (ev_cb ((ev_io *)wl) == infy_cb)
3682 ;
3683 else
3684#endif
3685 if ((ev_io *)wl != &pipe_w)
3686 if (types & EV_IO)
3687 cb (EV_A_ EV_IO, wl);
3688
3689 wl = wn;
3690 }
3691
3692 if (types & (EV_TIMER | EV_STAT))
3693 for (i = timercnt + HEAP0; i-- > HEAP0; )
3694#if EV_STAT_ENABLE
3695 /*TODO: timer is not always active*/
3696 if (ev_cb ((ev_timer *)ANHE_w (timers [i])) == stat_timer_cb)
3697 {
3698 if (types & EV_STAT)
3699 cb (EV_A_ EV_STAT, ((char *)ANHE_w (timers [i])) - offsetof (struct ev_stat, timer));
3700 }
3701 else
3702#endif
3703 if (types & EV_TIMER)
3704 cb (EV_A_ EV_TIMER, ANHE_w (timers [i]));
3705
3706#if EV_PERIODIC_ENABLE
3707 if (types & EV_PERIODIC)
3708 for (i = periodiccnt + HEAP0; i-- > HEAP0; )
3709 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3710#endif
3711
3712#if EV_IDLE_ENABLE
3713 if (types & EV_IDLE)
3714 for (j = NUMPRI; i--; )
3715 for (i = idlecnt [j]; i--; )
3716 cb (EV_A_ EV_IDLE, idles [j][i]);
3717#endif
3718
3719#if EV_FORK_ENABLE
3720 if (types & EV_FORK)
3721 for (i = forkcnt; i--; )
3722 if (ev_cb (forks [i]) != embed_fork_cb)
3723 cb (EV_A_ EV_FORK, forks [i]);
3724#endif
3725
3726#if EV_ASYNC_ENABLE
3727 if (types & EV_ASYNC)
3728 for (i = asynccnt; i--; )
3729 cb (EV_A_ EV_ASYNC, asyncs [i]);
3730#endif
3731
3732 if (types & EV_PREPARE)
3733 for (i = preparecnt; i--; )
3734#if EV_EMBED_ENABLE
3735 if (ev_cb (prepares [i]) != embed_prepare_cb)
3736#endif
3737 cb (EV_A_ EV_PREPARE, prepares [i]);
3738
3739 if (types & EV_CHECK)
3740 for (i = checkcnt; i--; )
3741 cb (EV_A_ EV_CHECK, checks [i]);
3742
3743 if (types & EV_SIGNAL)
3744 for (i = 0; i < EV_NSIG - 1; ++i)
3745 for (wl = signals [i].head; wl; )
3746 {
3747 wn = wl->next;
3748 cb (EV_A_ EV_SIGNAL, wl);
3749 wl = wn;
3750 }
3751
3752 if (types & EV_CHILD)
3753 for (i = EV_PID_HASHSIZE; i--; )
3754 for (wl = childs [i]; wl; )
3755 {
3756 wn = wl->next;
3757 cb (EV_A_ EV_CHILD, wl);
3758 wl = wn;
3759 }
3760/* EV_STAT 0x00001000 /* stat data changed */
3761/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3762}
3763#endif
3764
3095#if EV_MULTIPLICITY 3765#if EV_MULTIPLICITY
3096 #include "ev_wrap.h" 3766 #include "ev_wrap.h"
3097#endif 3767#endif
3098 3768
3099#ifdef __cplusplus 3769#ifdef __cplusplus

Diff Legend

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