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

Comparing libev/ev.c (file contents):
Revision 1.272 by root, Mon Nov 3 12:17:40 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
… …
287# endif 376# endif
288#endif 377#endif
289 378
290#if EV_USE_INOTIFY 379#if EV_USE_INOTIFY
291# include <sys/utsname.h> 380# include <sys/utsname.h>
381# include <sys/statfs.h>
292# include <sys/inotify.h> 382# include <sys/inotify.h>
293/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 383/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
294# ifndef IN_DONT_FOLLOW 384# ifndef IN_DONT_FOLLOW
295# undef EV_USE_INOTIFY 385# undef EV_USE_INOTIFY
296# define EV_USE_INOTIFY 0 386# define EV_USE_INOTIFY 0
… …
302#endif 392#endif
303 393
304#if EV_USE_EVENTFD 394#if EV_USE_EVENTFD
305/* 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 */
306# 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
307# ifdef __cplusplus 407# ifdef __cplusplus
308extern "C" { 408extern "C" {
309# endif 409# endif
310int eventfd (unsigned int initval, int flags); 410int (eventfd) (unsigned int initval, int flags);
311# ifdef __cplusplus 411# ifdef __cplusplus
312} 412}
313# endif 413# endif
314#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
315 444
316/**/ 445/**/
317 446
318#if EV_VERIFY >= 3 447#if EV_VERIFY >= 3
319# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 448# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
… …
331 */ 460 */
332#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 461#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
333 462
334#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) */
335#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) */
336/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
337 465
338#if __GNUC__ >= 4 466#if __GNUC__ >= 4
339# define expect(expr,value) __builtin_expect ((expr),(value)) 467# define expect(expr,value) __builtin_expect ((expr),(value))
340# define noinline __attribute__ ((noinline)) 468# define noinline __attribute__ ((noinline))
341#else 469#else
… …
354# define inline_speed static noinline 482# define inline_speed static noinline
355#else 483#else
356# define inline_speed static inline 484# define inline_speed static inline
357#endif 485#endif
358 486
359#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
360#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 492# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
493#endif
361 494
362#define EMPTY /* required for microsofts broken pseudo-c compiler */ 495#define EMPTY /* required for microsofts broken pseudo-c compiler */
363#define EMPTY2(a,b) /* used to suppress some warnings */ 496#define EMPTY2(a,b) /* used to suppress some warnings */
364 497
365typedef ev_watcher *W; 498typedef ev_watcher *W;
… …
367typedef ev_watcher_time *WT; 500typedef ev_watcher_time *WT;
368 501
369#define ev_active(w) ((W)(w))->active 502#define ev_active(w) ((W)(w))->active
370#define ev_at(w) ((WT)(w))->at 503#define ev_at(w) ((WT)(w))->at
371 504
372#if EV_USE_MONOTONIC 505#if EV_USE_REALTIME
373/* 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 */
374/* 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
375static 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)
376#endif 523#endif
377 524
378#ifdef _WIN32 525#ifdef _WIN32
379# include "ev_win32.c" 526# include "ev_win32.c"
380#endif 527#endif
381 528
382/*****************************************************************************/ 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
383 538
384static void (*syserr_cb)(const char *msg); 539static void (*syserr_cb)(const char *msg);
385 540
386void 541void
387ev_set_syserr_cb (void (*cb)(const char *msg)) 542ev_set_syserr_cb (void (*cb)(const char *msg))
… …
397 552
398 if (syserr_cb) 553 if (syserr_cb)
399 syserr_cb (msg); 554 syserr_cb (msg);
400 else 555 else
401 { 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
402 perror (msg); 565 perror (msg);
566#endif
403 abort (); 567 abort ();
404 } 568 }
405} 569}
406 570
407static void * 571static void *
408ev_realloc_emul (void *ptr, long size) 572ev_realloc_emul (void *ptr, long size)
409{ 573{
574#if __GLIBC__
575 return realloc (ptr, size);
576#else
410 /* some systems, notably openbsd and darwin, fail to properly 577 /* some systems, notably openbsd and darwin, fail to properly
411 * 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
412 * the single unix specification, so work around them here. 579 * the single unix specification, so work around them here.
413 */ 580 */
414 581
415 if (size) 582 if (size)
416 return realloc (ptr, size); 583 return realloc (ptr, size);
417 584
418 free (ptr); 585 free (ptr);
419 return 0; 586 return 0;
587#endif
420} 588}
421 589
422static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 590static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
423 591
424void 592void
… …
432{ 600{
433 ptr = alloc (ptr, size); 601 ptr = alloc (ptr, size);
434 602
435 if (!ptr && size) 603 if (!ptr && size)
436 { 604 {
605#if EV_AVOID_STDIO
606 ev_printerr ("libev: memory allocation failed, aborting.\n");
607#else
437 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 608 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
609#endif
438 abort (); 610 abort ();
439 } 611 }
440 612
441 return ptr; 613 return ptr;
442} 614}
… …
444#define ev_malloc(size) ev_realloc (0, (size)) 616#define ev_malloc(size) ev_realloc (0, (size))
445#define ev_free(ptr) ev_realloc ((ptr), 0) 617#define ev_free(ptr) ev_realloc ((ptr), 0)
446 618
447/*****************************************************************************/ 619/*****************************************************************************/
448 620
621/* set in reify when reification needed */
622#define EV_ANFD_REIFY 1
623
624/* file descriptor info structure */
449typedef struct 625typedef struct
450{ 626{
451 WL head; 627 WL head;
452 unsigned char events; 628 unsigned char events; /* the events watched for */
453 unsigned char reify; 629 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
454 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 630 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
455 unsigned char unused; 631 unsigned char unused;
456#if EV_USE_EPOLL 632#if EV_USE_EPOLL
457 unsigned int egen; /* generation counter to counter epoll bugs */ 633 unsigned int egen; /* generation counter to counter epoll bugs */
458#endif 634#endif
459#if EV_SELECT_IS_WINSOCKET 635#if EV_SELECT_IS_WINSOCKET
460 SOCKET handle; 636 SOCKET handle;
461#endif 637#endif
462} ANFD; 638} ANFD;
463 639
640/* stores the pending event set for a given watcher */
464typedef struct 641typedef struct
465{ 642{
466 W w; 643 W w;
467 int events; 644 int events; /* the pending event set for the given watcher */
468} ANPENDING; 645} ANPENDING;
469 646
470#if EV_USE_INOTIFY 647#if EV_USE_INOTIFY
471/* hash table entry per inotify-id */ 648/* hash table entry per inotify-id */
472typedef struct 649typedef struct
… …
475} ANFS; 652} ANFS;
476#endif 653#endif
477 654
478/* Heap Entry */ 655/* Heap Entry */
479#if EV_HEAP_CACHE_AT 656#if EV_HEAP_CACHE_AT
657 /* a heap element */
480 typedef struct { 658 typedef struct {
481 ev_tstamp at; 659 ev_tstamp at;
482 WT w; 660 WT w;
483 } ANHE; 661 } ANHE;
484 662
485 #define ANHE_w(he) (he).w /* access watcher, read-write */ 663 #define ANHE_w(he) (he).w /* access watcher, read-write */
486 #define ANHE_at(he) (he).at /* access cached at, read-only */ 664 #define ANHE_at(he) (he).at /* access cached at, read-only */
487 #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 */
488#else 666#else
667 /* a heap element */
489 typedef WT ANHE; 668 typedef WT ANHE;
490 669
491 #define ANHE_w(he) (he) 670 #define ANHE_w(he) (he)
492 #define ANHE_at(he) (he)->at 671 #define ANHE_at(he) (he)->at
493 #define ANHE_at_cache(he) 672 #define ANHE_at_cache(he)
… …
517 696
518 static int ev_default_loop_ptr; 697 static int ev_default_loop_ptr;
519 698
520#endif 699#endif
521 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
522/*****************************************************************************/ 713/*****************************************************************************/
523 714
715#ifndef EV_HAVE_EV_TIME
524ev_tstamp 716ev_tstamp
525ev_time (void) 717ev_time (void)
526{ 718{
527#if EV_USE_REALTIME 719#if EV_USE_REALTIME
720 if (expect_true (have_realtime))
721 {
528 struct timespec ts; 722 struct timespec ts;
529 clock_gettime (CLOCK_REALTIME, &ts); 723 clock_gettime (CLOCK_REALTIME, &ts);
530 return ts.tv_sec + ts.tv_nsec * 1e-9; 724 return ts.tv_sec + ts.tv_nsec * 1e-9;
531#else 725 }
726#endif
727
532 struct timeval tv; 728 struct timeval tv;
533 gettimeofday (&tv, 0); 729 gettimeofday (&tv, 0);
534 return tv.tv_sec + tv.tv_usec * 1e-6; 730 return tv.tv_sec + tv.tv_usec * 1e-6;
535#endif
536} 731}
732#endif
537 733
538ev_tstamp inline_size 734inline_size ev_tstamp
539get_clock (void) 735get_clock (void)
540{ 736{
541#if EV_USE_MONOTONIC 737#if EV_USE_MONOTONIC
542 if (expect_true (have_monotonic)) 738 if (expect_true (have_monotonic))
543 { 739 {
… …
577 773
578 tv.tv_sec = (time_t)delay; 774 tv.tv_sec = (time_t)delay;
579 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 775 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
580 776
581 /* 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 */
582 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 778 /* something not guaranteed by newer posix versions, but guaranteed */
583 /* by older ones */ 779 /* by older ones */
584 select (0, 0, 0, 0, &tv); 780 select (0, 0, 0, 0, &tv);
585#endif 781#endif
586 } 782 }
587} 783}
588 784
589/*****************************************************************************/ 785/*****************************************************************************/
590 786
591#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 */
592 788
593int 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
594array_nextsize (int elem, int cur, int cnt) 792array_nextsize (int elem, int cur, int cnt)
595{ 793{
596 int ncur = cur + 1; 794 int ncur = cur + 1;
597 795
598 do 796 do
… …
639 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 837 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
640 } 838 }
641#endif 839#endif
642 840
643#define array_free(stem, idx) \ 841#define array_free(stem, idx) \
644 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
645 843
646/*****************************************************************************/ 844/*****************************************************************************/
845
846/* dummy callback for pending events */
847static void noinline
848pendingcb (EV_P_ ev_prepare *w, int revents)
849{
850}
647 851
648void noinline 852void noinline
649ev_feed_event (EV_P_ void *w, int revents) 853ev_feed_event (EV_P_ void *w, int revents)
650{ 854{
651 W w_ = (W)w; 855 W w_ = (W)w;
… …
660 pendings [pri][w_->pending - 1].w = w_; 864 pendings [pri][w_->pending - 1].w = w_;
661 pendings [pri][w_->pending - 1].events = revents; 865 pendings [pri][w_->pending - 1].events = revents;
662 } 866 }
663} 867}
664 868
665void 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
666queue_events (EV_P_ W *events, int eventcnt, int type) 885queue_events (EV_P_ W *events, int eventcnt, int type)
667{ 886{
668 int i; 887 int i;
669 888
670 for (i = 0; i < eventcnt; ++i) 889 for (i = 0; i < eventcnt; ++i)
671 ev_feed_event (EV_A_ events [i], type); 890 ev_feed_event (EV_A_ events [i], type);
672} 891}
673 892
674/*****************************************************************************/ 893/*****************************************************************************/
675 894
676void inline_speed 895inline_speed void
677fd_event (EV_P_ int fd, int revents) 896fd_event_nc (EV_P_ int fd, int revents)
678{ 897{
679 ANFD *anfd = anfds + fd; 898 ANFD *anfd = anfds + fd;
680 ev_io *w; 899 ev_io *w;
681 900
682 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)
… …
686 if (ev) 905 if (ev)
687 ev_feed_event (EV_A_ (W)w, ev); 906 ev_feed_event (EV_A_ (W)w, ev);
688 } 907 }
689} 908}
690 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
691void 921void
692ev_feed_fd_event (EV_P_ int fd, int revents) 922ev_feed_fd_event (EV_P_ int fd, int revents)
693{ 923{
694 if (fd >= 0 && fd < anfdmax) 924 if (fd >= 0 && fd < anfdmax)
695 fd_event (EV_A_ fd, revents); 925 fd_event_nc (EV_A_ fd, revents);
696} 926}
697 927
698void inline_size 928/* make sure the external fd watch events are in-sync */
929/* with the kernel/libev internal state */
930inline_size void
699fd_reify (EV_P) 931fd_reify (EV_P)
700{ 932{
701 int i; 933 int i;
702 934
703 for (i = 0; i < fdchangecnt; ++i) 935 for (i = 0; i < fdchangecnt; ++i)
… …
713 945
714#if EV_SELECT_IS_WINSOCKET 946#if EV_SELECT_IS_WINSOCKET
715 if (events) 947 if (events)
716 { 948 {
717 unsigned long arg; 949 unsigned long arg;
718 #ifdef EV_FD_TO_WIN32_HANDLE
719 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 950 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
720 #else
721 anfd->handle = _get_osfhandle (fd);
722 #endif
723 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));
724 } 952 }
725#endif 953#endif
726 954
727 { 955 {
728 unsigned char o_events = anfd->events; 956 unsigned char o_events = anfd->events;
729 unsigned char o_reify = anfd->reify; 957 unsigned char o_reify = anfd->reify;
730 958
731 anfd->reify = 0; 959 anfd->reify = 0;
732 anfd->events = events; 960 anfd->events = events;
733 961
734 if (o_events != events || o_reify & EV_IOFDSET) 962 if (o_events != events || o_reify & EV__IOFDSET)
735 backend_modify (EV_A_ fd, o_events, events); 963 backend_modify (EV_A_ fd, o_events, events);
736 } 964 }
737 } 965 }
738 966
739 fdchangecnt = 0; 967 fdchangecnt = 0;
740} 968}
741 969
742void inline_size 970/* something about the given fd changed */
971inline_size void
743fd_change (EV_P_ int fd, int flags) 972fd_change (EV_P_ int fd, int flags)
744{ 973{
745 unsigned char reify = anfds [fd].reify; 974 unsigned char reify = anfds [fd].reify;
746 anfds [fd].reify |= flags; 975 anfds [fd].reify |= flags;
747 976
… …
751 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 980 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
752 fdchanges [fdchangecnt - 1] = fd; 981 fdchanges [fdchangecnt - 1] = fd;
753 } 982 }
754} 983}
755 984
756void inline_speed 985/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
986inline_speed void
757fd_kill (EV_P_ int fd) 987fd_kill (EV_P_ int fd)
758{ 988{
759 ev_io *w; 989 ev_io *w;
760 990
761 while ((w = (ev_io *)anfds [fd].head)) 991 while ((w = (ev_io *)anfds [fd].head))
… …
763 ev_io_stop (EV_A_ w); 993 ev_io_stop (EV_A_ w);
764 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);
765 } 995 }
766} 996}
767 997
768int inline_size 998/* check whether the given fd is actually valid, for error recovery */
999inline_size int
769fd_valid (int fd) 1000fd_valid (int fd)
770{ 1001{
771#ifdef _WIN32 1002#ifdef _WIN32
772 return _get_osfhandle (fd) != -1; 1003 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
773#else 1004#else
774 return fcntl (fd, F_GETFD) != -1; 1005 return fcntl (fd, F_GETFD) != -1;
775#endif 1006#endif
776} 1007}
777 1008
… …
795 1026
796 for (fd = anfdmax; fd--; ) 1027 for (fd = anfdmax; fd--; )
797 if (anfds [fd].events) 1028 if (anfds [fd].events)
798 { 1029 {
799 fd_kill (EV_A_ fd); 1030 fd_kill (EV_A_ fd);
800 return; 1031 break;
801 } 1032 }
802} 1033}
803 1034
804/* 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 */
805static void noinline 1036static void noinline
… …
810 for (fd = 0; fd < anfdmax; ++fd) 1041 for (fd = 0; fd < anfdmax; ++fd)
811 if (anfds [fd].events) 1042 if (anfds [fd].events)
812 { 1043 {
813 anfds [fd].events = 0; 1044 anfds [fd].events = 0;
814 anfds [fd].emask = 0; 1045 anfds [fd].emask = 0;
815 fd_change (EV_A_ fd, EV_IOFDSET | 1); 1046 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
816 } 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
817} 1062}
818 1063
819/*****************************************************************************/ 1064/*****************************************************************************/
820 1065
821/* 1066/*
… …
836#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 1081#define HEAP0 (DHEAP - 1) /* index of first element in heap */
837#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 1082#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
838#define UPHEAP_DONE(p,k) ((p) == (k)) 1083#define UPHEAP_DONE(p,k) ((p) == (k))
839 1084
840/* away from the root */ 1085/* away from the root */
841void inline_speed 1086inline_speed void
842downheap (ANHE *heap, int N, int k) 1087downheap (ANHE *heap, int N, int k)
843{ 1088{
844 ANHE he = heap [k]; 1089 ANHE he = heap [k];
845 ANHE *E = heap + N + HEAP0; 1090 ANHE *E = heap + N + HEAP0;
846 1091
… …
886#define HEAP0 1 1131#define HEAP0 1
887#define HPARENT(k) ((k) >> 1) 1132#define HPARENT(k) ((k) >> 1)
888#define UPHEAP_DONE(p,k) (!(p)) 1133#define UPHEAP_DONE(p,k) (!(p))
889 1134
890/* away from the root */ 1135/* away from the root */
891void inline_speed 1136inline_speed void
892downheap (ANHE *heap, int N, int k) 1137downheap (ANHE *heap, int N, int k)
893{ 1138{
894 ANHE he = heap [k]; 1139 ANHE he = heap [k];
895 1140
896 for (;;) 1141 for (;;)
897 { 1142 {
898 int c = k << 1; 1143 int c = k << 1;
899 1144
900 if (c > N + HEAP0 - 1) 1145 if (c >= N + HEAP0)
901 break; 1146 break;
902 1147
903 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])
904 ? 1 : 0; 1149 ? 1 : 0;
905 1150
… …
916 ev_active (ANHE_w (he)) = k; 1161 ev_active (ANHE_w (he)) = k;
917} 1162}
918#endif 1163#endif
919 1164
920/* towards the root */ 1165/* towards the root */
921void inline_speed 1166inline_speed void
922upheap (ANHE *heap, int k) 1167upheap (ANHE *heap, int k)
923{ 1168{
924 ANHE he = heap [k]; 1169 ANHE he = heap [k];
925 1170
926 for (;;) 1171 for (;;)
… …
937 1182
938 heap [k] = he; 1183 heap [k] = he;
939 ev_active (ANHE_w (he)) = k; 1184 ev_active (ANHE_w (he)) = k;
940} 1185}
941 1186
942void inline_size 1187/* move an element suitably so it is in a correct place */
1188inline_size void
943adjustheap (ANHE *heap, int N, int k) 1189adjustheap (ANHE *heap, int N, int k)
944{ 1190{
945 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)]))
946 upheap (heap, k); 1192 upheap (heap, k);
947 else 1193 else
948 downheap (heap, N, k); 1194 downheap (heap, N, k);
949} 1195}
950 1196
951/* 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 */
952void inline_size 1198inline_size void
953reheap (ANHE *heap, int N) 1199reheap (ANHE *heap, int N)
954{ 1200{
955 int i; 1201 int i;
956 1202
957 /* 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 */
… …
960 upheap (heap, i + HEAP0); 1206 upheap (heap, i + HEAP0);
961} 1207}
962 1208
963/*****************************************************************************/ 1209/*****************************************************************************/
964 1210
1211/* associate signal watchers to a signal signal */
965typedef struct 1212typedef struct
966{ 1213{
1214 EV_ATOMIC_T pending;
1215#if EV_MULTIPLICITY
1216 EV_P;
1217#endif
967 WL head; 1218 WL head;
968 EV_ATOMIC_T gotsig;
969} ANSIG; 1219} ANSIG;
970 1220
971static ANSIG *signals; 1221static ANSIG signals [EV_NSIG - 1];
972static int signalmax;
973
974static EV_ATOMIC_T gotsig;
975 1222
976/*****************************************************************************/ 1223/*****************************************************************************/
977 1224
978void inline_speed 1225#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
979fd_intern (int fd)
980{
981#ifdef _WIN32
982 unsigned long arg = 1;
983 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
984#else
985 fcntl (fd, F_SETFD, FD_CLOEXEC);
986 fcntl (fd, F_SETFL, O_NONBLOCK);
987#endif
988}
989 1226
990static void noinline 1227static void noinline
991evpipe_init (EV_P) 1228evpipe_init (EV_P)
992{ 1229{
993 if (!ev_is_active (&pipeev)) 1230 if (!ev_is_active (&pipe_w))
994 { 1231 {
995#if EV_USE_EVENTFD 1232# if EV_USE_EVENTFD
1233 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1234 if (evfd < 0 && errno == EINVAL)
996 if ((evfd = eventfd (0, 0)) >= 0) 1235 evfd = eventfd (0, 0);
1236
1237 if (evfd >= 0)
997 { 1238 {
998 evpipe [0] = -1; 1239 evpipe [0] = -1;
999 fd_intern (evfd); 1240 fd_intern (evfd); /* doing it twice doesn't hurt */
1000 ev_io_set (&pipeev, evfd, EV_READ); 1241 ev_io_set (&pipe_w, evfd, EV_READ);
1001 } 1242 }
1002 else 1243 else
1003#endif 1244# endif
1004 { 1245 {
1005 while (pipe (evpipe)) 1246 while (pipe (evpipe))
1006 ev_syserr ("(libev) error creating signal/async pipe"); 1247 ev_syserr ("(libev) error creating signal/async pipe");
1007 1248
1008 fd_intern (evpipe [0]); 1249 fd_intern (evpipe [0]);
1009 fd_intern (evpipe [1]); 1250 fd_intern (evpipe [1]);
1010 ev_io_set (&pipeev, evpipe [0], EV_READ); 1251 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1011 } 1252 }
1012 1253
1013 ev_io_start (EV_A_ &pipeev); 1254 ev_io_start (EV_A_ &pipe_w);
1014 ev_unref (EV_A); /* watcher should not keep loop alive */ 1255 ev_unref (EV_A); /* watcher should not keep loop alive */
1015 } 1256 }
1016} 1257}
1017 1258
1018void inline_size 1259inline_size void
1019evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1260evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1020{ 1261{
1021 if (!*flag) 1262 if (!*flag)
1022 { 1263 {
1023 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;
1024 1266
1025 *flag = 1; 1267 *flag = 1;
1026 1268
1027#if EV_USE_EVENTFD 1269#if EV_USE_EVENTFD
1028 if (evfd >= 0) 1270 if (evfd >= 0)
… …
1030 uint64_t counter = 1; 1272 uint64_t counter = 1;
1031 write (evfd, &counter, sizeof (uint64_t)); 1273 write (evfd, &counter, sizeof (uint64_t));
1032 } 1274 }
1033 else 1275 else
1034#endif 1276#endif
1035 write (evpipe [1], &old_errno, 1); 1277 write (evpipe [1], &dummy, 1);
1036 1278
1037 errno = old_errno; 1279 errno = old_errno;
1038 } 1280 }
1039} 1281}
1040 1282
1283/* called whenever the libev signal pipe */
1284/* got some events (signal, async) */
1041static void 1285static void
1042pipecb (EV_P_ ev_io *iow, int revents) 1286pipecb (EV_P_ ev_io *iow, int revents)
1043{ 1287{
1288 int i;
1289
1044#if EV_USE_EVENTFD 1290#if EV_USE_EVENTFD
1045 if (evfd >= 0) 1291 if (evfd >= 0)
1046 { 1292 {
1047 uint64_t counter; 1293 uint64_t counter;
1048 read (evfd, &counter, sizeof (uint64_t)); 1294 read (evfd, &counter, sizeof (uint64_t));
… …
1052 { 1298 {
1053 char dummy; 1299 char dummy;
1054 read (evpipe [0], &dummy, 1); 1300 read (evpipe [0], &dummy, 1);
1055 } 1301 }
1056 1302
1057 if (gotsig && ev_is_default_loop (EV_A)) 1303 if (sig_pending)
1058 { 1304 {
1059 int signum; 1305 sig_pending = 0;
1060 gotsig = 0;
1061 1306
1062 for (signum = signalmax; signum--; ) 1307 for (i = EV_NSIG - 1; i--; )
1063 if (signals [signum].gotsig) 1308 if (expect_false (signals [i].pending))
1064 ev_feed_signal_event (EV_A_ signum + 1); 1309 ev_feed_signal_event (EV_A_ i + 1);
1065 } 1310 }
1066 1311
1067#if EV_ASYNC_ENABLE 1312#if EV_ASYNC_ENABLE
1068 if (gotasync) 1313 if (async_pending)
1069 { 1314 {
1070 int i; 1315 async_pending = 0;
1071 gotasync = 0;
1072 1316
1073 for (i = asynccnt; i--; ) 1317 for (i = asynccnt; i--; )
1074 if (asyncs [i]->sent) 1318 if (asyncs [i]->sent)
1075 { 1319 {
1076 asyncs [i]->sent = 0; 1320 asyncs [i]->sent = 0;
… …
1084 1328
1085static void 1329static void
1086ev_sighandler (int signum) 1330ev_sighandler (int signum)
1087{ 1331{
1088#if EV_MULTIPLICITY 1332#if EV_MULTIPLICITY
1089 struct ev_loop *loop = &default_loop_struct; 1333 EV_P = signals [signum - 1].loop;
1090#endif 1334#endif
1091 1335
1092#if _WIN32 1336#ifdef _WIN32
1093 signal (signum, ev_sighandler); 1337 signal (signum, ev_sighandler);
1094#endif 1338#endif
1095 1339
1096 signals [signum - 1].gotsig = 1; 1340 signals [signum - 1].pending = 1;
1097 evpipe_write (EV_A_ &gotsig); 1341 evpipe_write (EV_A_ &sig_pending);
1098} 1342}
1099 1343
1100void noinline 1344void noinline
1101ev_feed_signal_event (EV_P_ int signum) 1345ev_feed_signal_event (EV_P_ int signum)
1102{ 1346{
1103 WL w; 1347 WL w;
1104 1348
1349 if (expect_false (signum <= 0 || signum > EV_NSIG))
1350 return;
1351
1352 --signum;
1353
1105#if EV_MULTIPLICITY 1354#if EV_MULTIPLICITY
1106 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 */
1107#endif 1356 /* or, likely more useful, feeding a signal nobody is waiting for */
1108 1357
1109 --signum; 1358 if (expect_false (signals [signum].loop != EV_A))
1110
1111 if (signum < 0 || signum >= signalmax)
1112 return; 1359 return;
1360#endif
1113 1361
1114 signals [signum].gotsig = 0; 1362 signals [signum].pending = 0;
1115 1363
1116 for (w = signals [signum].head; w; w = w->next) 1364 for (w = signals [signum].head; w; w = w->next)
1117 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1365 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1118} 1366}
1119 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
1120/*****************************************************************************/ 1390/*****************************************************************************/
1121 1391
1392#if EV_CHILD_ENABLE
1122static WL childs [EV_PID_HASHSIZE]; 1393static WL childs [EV_PID_HASHSIZE];
1123
1124#ifndef _WIN32
1125 1394
1126static ev_signal childev; 1395static ev_signal childev;
1127 1396
1128#ifndef WIFCONTINUED 1397#ifndef WIFCONTINUED
1129# define WIFCONTINUED(status) 0 1398# define WIFCONTINUED(status) 0
1130#endif 1399#endif
1131 1400
1132void inline_speed 1401/* handle a single child status event */
1402inline_speed void
1133child_reap (EV_P_ int chain, int pid, int status) 1403child_reap (EV_P_ int chain, int pid, int status)
1134{ 1404{
1135 ev_child *w; 1405 ev_child *w;
1136 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1406 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1137 1407
… …
1150 1420
1151#ifndef WCONTINUED 1421#ifndef WCONTINUED
1152# define WCONTINUED 0 1422# define WCONTINUED 0
1153#endif 1423#endif
1154 1424
1425/* called on sigchld etc., calls waitpid */
1155static void 1426static void
1156childcb (EV_P_ ev_signal *sw, int revents) 1427childcb (EV_P_ ev_signal *sw, int revents)
1157{ 1428{
1158 int pid, status; 1429 int pid, status;
1159 1430
… …
1240 /* kqueue is borked on everything but netbsd apparently */ 1511 /* kqueue is borked on everything but netbsd apparently */
1241 /* 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 */
1242 flags &= ~EVBACKEND_KQUEUE; 1513 flags &= ~EVBACKEND_KQUEUE;
1243#endif 1514#endif
1244#ifdef __APPLE__ 1515#ifdef __APPLE__
1245 // flags &= ~EVBACKEND_KQUEUE; for documentation 1516 /* only select works correctly on that "unix-certified" platform */
1246 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 */
1247#endif 1519#endif
1248 1520
1249 return flags; 1521 return flags;
1250} 1522}
1251 1523
… …
1265ev_backend (EV_P) 1537ev_backend (EV_P)
1266{ 1538{
1267 return backend; 1539 return backend;
1268} 1540}
1269 1541
1542#if EV_MINIMAL < 2
1270unsigned int 1543unsigned int
1271ev_loop_count (EV_P) 1544ev_loop_count (EV_P)
1272{ 1545{
1273 return loop_count; 1546 return loop_count;
1274} 1547}
1275 1548
1549unsigned int
1550ev_loop_depth (EV_P)
1551{
1552 return loop_depth;
1553}
1554
1276void 1555void
1277ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1556ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1278{ 1557{
1279 io_blocktime = interval; 1558 io_blocktime = interval;
1280} 1559}
… …
1283ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1562ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1284{ 1563{
1285 timeout_blocktime = interval; 1564 timeout_blocktime = interval;
1286} 1565}
1287 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 */
1288static void noinline 1592static void noinline
1289loop_init (EV_P_ unsigned int flags) 1593loop_init (EV_P_ unsigned int flags)
1290{ 1594{
1291 if (!backend) 1595 if (!backend)
1292 { 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
1293#if EV_USE_MONOTONIC 1607#if EV_USE_MONOTONIC
1608 if (!have_monotonic)
1294 { 1609 {
1295 struct timespec ts; 1610 struct timespec ts;
1611
1296 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1612 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1297 have_monotonic = 1; 1613 have_monotonic = 1;
1298 } 1614 }
1299#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"));
1300 1627
1301 ev_rt_now = ev_time (); 1628 ev_rt_now = ev_time ();
1302 mn_now = get_clock (); 1629 mn_now = get_clock ();
1303 now_floor = mn_now; 1630 now_floor = mn_now;
1304 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
1305 1635
1306 io_blocktime = 0.; 1636 io_blocktime = 0.;
1307 timeout_blocktime = 0.; 1637 timeout_blocktime = 0.;
1308 backend = 0; 1638 backend = 0;
1309 backend_fd = -1; 1639 backend_fd = -1;
1310 gotasync = 0; 1640 sig_pending = 0;
1641#if EV_ASYNC_ENABLE
1642 async_pending = 0;
1643#endif
1311#if EV_USE_INOTIFY 1644#if EV_USE_INOTIFY
1312 fs_fd = -2; 1645 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1313#endif 1646#endif
1314 1647#if EV_USE_SIGNALFD
1315 /* pid check not overridable via env */ 1648 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1316#ifndef _WIN32
1317 if (flags & EVFLAG_FORKCHECK)
1318 curpid = getpid ();
1319#endif 1649#endif
1320
1321 if (!(flags & EVFLAG_NOENV)
1322 && !enable_secure ()
1323 && getenv ("LIBEV_FLAGS"))
1324 flags = atoi (getenv ("LIBEV_FLAGS"));
1325 1650
1326 if (!(flags & 0x0000ffffU)) 1651 if (!(flags & 0x0000ffffU))
1327 flags |= ev_recommended_backends (); 1652 flags |= ev_recommended_backends ();
1328 1653
1329#if EV_USE_PORT 1654#if EV_USE_PORT
… …
1340#endif 1665#endif
1341#if EV_USE_SELECT 1666#if EV_USE_SELECT
1342 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1667 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1343#endif 1668#endif
1344 1669
1670 ev_prepare_init (&pending_w, pendingcb);
1671
1672#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1345 ev_init (&pipeev, pipecb); 1673 ev_init (&pipe_w, pipecb);
1346 ev_set_priority (&pipeev, EV_MAXPRI); 1674 ev_set_priority (&pipe_w, EV_MAXPRI);
1675#endif
1347 } 1676 }
1348} 1677}
1349 1678
1679/* free up a loop structure */
1350static void noinline 1680static void noinline
1351loop_destroy (EV_P) 1681loop_destroy (EV_P)
1352{ 1682{
1353 int i; 1683 int i;
1354 1684
1355 if (ev_is_active (&pipeev)) 1685 if (ev_is_active (&pipe_w))
1356 { 1686 {
1357 ev_ref (EV_A); /* signal watcher */ 1687 /*ev_ref (EV_A);*/
1358 ev_io_stop (EV_A_ &pipeev); 1688 /*ev_io_stop (EV_A_ &pipe_w);*/
1359 1689
1360#if EV_USE_EVENTFD 1690#if EV_USE_EVENTFD
1361 if (evfd >= 0) 1691 if (evfd >= 0)
1362 close (evfd); 1692 close (evfd);
1363#endif 1693#endif
1364 1694
1365 if (evpipe [0] >= 0) 1695 if (evpipe [0] >= 0)
1366 { 1696 {
1367 close (evpipe [0]); 1697 EV_WIN32_CLOSE_FD (evpipe [0]);
1368 close (evpipe [1]); 1698 EV_WIN32_CLOSE_FD (evpipe [1]);
1369 } 1699 }
1370 } 1700 }
1701
1702#if EV_USE_SIGNALFD
1703 if (ev_is_active (&sigfd_w))
1704 close (sigfd);
1705#endif
1371 1706
1372#if EV_USE_INOTIFY 1707#if EV_USE_INOTIFY
1373 if (fs_fd >= 0) 1708 if (fs_fd >= 0)
1374 close (fs_fd); 1709 close (fs_fd);
1375#endif 1710#endif
… …
1399#if EV_IDLE_ENABLE 1734#if EV_IDLE_ENABLE
1400 array_free (idle, [i]); 1735 array_free (idle, [i]);
1401#endif 1736#endif
1402 } 1737 }
1403 1738
1404 ev_free (anfds); anfdmax = 0; 1739 ev_free (anfds); anfds = 0; anfdmax = 0;
1405 1740
1406 /* 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);
1407 array_free (fdchange, EMPTY); 1743 array_free (fdchange, EMPTY);
1408 array_free (timer, EMPTY); 1744 array_free (timer, EMPTY);
1409#if EV_PERIODIC_ENABLE 1745#if EV_PERIODIC_ENABLE
1410 array_free (periodic, EMPTY); 1746 array_free (periodic, EMPTY);
1411#endif 1747#endif
… …
1420 1756
1421 backend = 0; 1757 backend = 0;
1422} 1758}
1423 1759
1424#if EV_USE_INOTIFY 1760#if EV_USE_INOTIFY
1425void inline_size infy_fork (EV_P); 1761inline_size void infy_fork (EV_P);
1426#endif 1762#endif
1427 1763
1428void inline_size 1764inline_size void
1429loop_fork (EV_P) 1765loop_fork (EV_P)
1430{ 1766{
1431#if EV_USE_PORT 1767#if EV_USE_PORT
1432 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1768 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1433#endif 1769#endif
… …
1439#endif 1775#endif
1440#if EV_USE_INOTIFY 1776#if EV_USE_INOTIFY
1441 infy_fork (EV_A); 1777 infy_fork (EV_A);
1442#endif 1778#endif
1443 1779
1444 if (ev_is_active (&pipeev)) 1780 if (ev_is_active (&pipe_w))
1445 { 1781 {
1446 /* this "locks" the handlers against writing to the pipe */ 1782 /* this "locks" the handlers against writing to the pipe */
1447 /* while we modify the fd vars */ 1783 /* while we modify the fd vars */
1448 gotsig = 1; 1784 sig_pending = 1;
1449#if EV_ASYNC_ENABLE 1785#if EV_ASYNC_ENABLE
1450 gotasync = 1; 1786 async_pending = 1;
1451#endif 1787#endif
1452 1788
1453 ev_ref (EV_A); 1789 ev_ref (EV_A);
1454 ev_io_stop (EV_A_ &pipeev); 1790 ev_io_stop (EV_A_ &pipe_w);
1455 1791
1456#if EV_USE_EVENTFD 1792#if EV_USE_EVENTFD
1457 if (evfd >= 0) 1793 if (evfd >= 0)
1458 close (evfd); 1794 close (evfd);
1459#endif 1795#endif
1460 1796
1461 if (evpipe [0] >= 0) 1797 if (evpipe [0] >= 0)
1462 { 1798 {
1463 close (evpipe [0]); 1799 EV_WIN32_CLOSE_FD (evpipe [0]);
1464 close (evpipe [1]); 1800 EV_WIN32_CLOSE_FD (evpipe [1]);
1465 } 1801 }
1466 1802
1467 evpipe_init (EV_A); 1803 evpipe_init (EV_A);
1468 /* now iterate over everything, in case we missed something */ 1804 /* now iterate over everything, in case we missed something */
1469 pipecb (EV_A_ &pipeev, EV_READ); 1805 pipecb (EV_A_ &pipe_w, EV_READ);
1470 } 1806 }
1471 1807
1472 postfork = 0; 1808 postfork = 0;
1473} 1809}
1474 1810
1475#if EV_MULTIPLICITY 1811#if EV_MULTIPLICITY
1476 1812
1477struct ev_loop * 1813struct ev_loop *
1478ev_loop_new (unsigned int flags) 1814ev_loop_new (unsigned int flags)
1479{ 1815{
1480 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));
1481 1817
1482 memset (loop, 0, sizeof (struct ev_loop)); 1818 memset (EV_A, 0, sizeof (struct ev_loop));
1483
1484 loop_init (EV_A_ flags); 1819 loop_init (EV_A_ flags);
1485 1820
1486 if (ev_backend (EV_A)) 1821 if (ev_backend (EV_A))
1487 return loop; 1822 return EV_A;
1488 1823
1489 return 0; 1824 return 0;
1490} 1825}
1491 1826
1492void 1827void
… …
1499void 1834void
1500ev_loop_fork (EV_P) 1835ev_loop_fork (EV_P)
1501{ 1836{
1502 postfork = 1; /* must be in line with ev_default_fork */ 1837 postfork = 1; /* must be in line with ev_default_fork */
1503} 1838}
1839#endif /* multiplicity */
1504 1840
1505#if EV_VERIFY 1841#if EV_VERIFY
1506static void noinline 1842static void noinline
1507verify_watcher (EV_P_ W w) 1843verify_watcher (EV_P_ W w)
1508{ 1844{
1509 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1845 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1510 1846
1511 if (w->pending) 1847 if (w->pending)
1512 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));
1513} 1849}
1514 1850
1515static void noinline 1851static void noinline
1516verify_heap (EV_P_ ANHE *heap, int N) 1852verify_heap (EV_P_ ANHE *heap, int N)
1517{ 1853{
1518 int i; 1854 int i;
1519 1855
1520 for (i = HEAP0; i < N + HEAP0; ++i) 1856 for (i = HEAP0; i < N + HEAP0; ++i)
1521 { 1857 {
1522 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));
1523 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])));
1524 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]))));
1525 1861
1526 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1862 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1527 } 1863 }
1528} 1864}
1529 1865
1530static void noinline 1866static void noinline
1531array_verify (EV_P_ W *ws, int cnt) 1867array_verify (EV_P_ W *ws, int cnt)
1532{ 1868{
1533 while (cnt--) 1869 while (cnt--)
1534 { 1870 {
1535 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1871 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1536 verify_watcher (EV_A_ ws [cnt]); 1872 verify_watcher (EV_A_ ws [cnt]);
1537 } 1873 }
1538} 1874}
1539#endif 1875#endif
1540 1876
1877#if EV_MINIMAL < 2
1541void 1878void
1542ev_loop_verify (EV_P) 1879ev_loop_verify (EV_P)
1543{ 1880{
1544#if EV_VERIFY 1881#if EV_VERIFY
1545 int i; 1882 int i;
… …
1547 1884
1548 assert (activecnt >= -1); 1885 assert (activecnt >= -1);
1549 1886
1550 assert (fdchangemax >= fdchangecnt); 1887 assert (fdchangemax >= fdchangecnt);
1551 for (i = 0; i < fdchangecnt; ++i) 1888 for (i = 0; i < fdchangecnt; ++i)
1552 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1889 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1553 1890
1554 assert (anfdmax >= 0); 1891 assert (anfdmax >= 0);
1555 for (i = 0; i < anfdmax; ++i) 1892 for (i = 0; i < anfdmax; ++i)
1556 for (w = anfds [i].head; w; w = w->next) 1893 for (w = anfds [i].head; w; w = w->next)
1557 { 1894 {
1558 verify_watcher (EV_A_ (W)w); 1895 verify_watcher (EV_A_ (W)w);
1559 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1896 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1560 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));
1561 } 1898 }
1562 1899
1563 assert (timermax >= timercnt); 1900 assert (timermax >= timercnt);
1564 verify_heap (EV_A_ timers, timercnt); 1901 verify_heap (EV_A_ timers, timercnt);
1565 1902
… …
1593 1930
1594 assert (checkmax >= checkcnt); 1931 assert (checkmax >= checkcnt);
1595 array_verify (EV_A_ (W *)checks, checkcnt); 1932 array_verify (EV_A_ (W *)checks, checkcnt);
1596 1933
1597# if 0 1934# if 0
1935#if EV_CHILD_ENABLE
1598 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)
1599 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1937 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1600# endif 1938#endif
1601#endif 1939# endif
1940#endif
1602} 1941}
1603 1942#endif
1604#endif /* multiplicity */
1605 1943
1606#if EV_MULTIPLICITY 1944#if EV_MULTIPLICITY
1607struct ev_loop * 1945struct ev_loop *
1608ev_default_loop_init (unsigned int flags) 1946ev_default_loop_init (unsigned int flags)
1609#else 1947#else
… …
1612#endif 1950#endif
1613{ 1951{
1614 if (!ev_default_loop_ptr) 1952 if (!ev_default_loop_ptr)
1615 { 1953 {
1616#if EV_MULTIPLICITY 1954#if EV_MULTIPLICITY
1617 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1955 EV_P = ev_default_loop_ptr = &default_loop_struct;
1618#else 1956#else
1619 ev_default_loop_ptr = 1; 1957 ev_default_loop_ptr = 1;
1620#endif 1958#endif
1621 1959
1622 loop_init (EV_A_ flags); 1960 loop_init (EV_A_ flags);
1623 1961
1624 if (ev_backend (EV_A)) 1962 if (ev_backend (EV_A))
1625 { 1963 {
1626#ifndef _WIN32 1964#if EV_CHILD_ENABLE
1627 ev_signal_init (&childev, childcb, SIGCHLD); 1965 ev_signal_init (&childev, childcb, SIGCHLD);
1628 ev_set_priority (&childev, EV_MAXPRI); 1966 ev_set_priority (&childev, EV_MAXPRI);
1629 ev_signal_start (EV_A_ &childev); 1967 ev_signal_start (EV_A_ &childev);
1630 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1968 ev_unref (EV_A); /* child watcher should not keep loop alive */
1631#endif 1969#endif
… …
1639 1977
1640void 1978void
1641ev_default_destroy (void) 1979ev_default_destroy (void)
1642{ 1980{
1643#if EV_MULTIPLICITY 1981#if EV_MULTIPLICITY
1644 struct ev_loop *loop = ev_default_loop_ptr; 1982 EV_P = ev_default_loop_ptr;
1645#endif 1983#endif
1646 1984
1647 ev_default_loop_ptr = 0; 1985 ev_default_loop_ptr = 0;
1648 1986
1649#ifndef _WIN32 1987#if EV_CHILD_ENABLE
1650 ev_ref (EV_A); /* child watcher */ 1988 ev_ref (EV_A); /* child watcher */
1651 ev_signal_stop (EV_A_ &childev); 1989 ev_signal_stop (EV_A_ &childev);
1652#endif 1990#endif
1653 1991
1654 loop_destroy (EV_A); 1992 loop_destroy (EV_A);
… …
1656 1994
1657void 1995void
1658ev_default_fork (void) 1996ev_default_fork (void)
1659{ 1997{
1660#if EV_MULTIPLICITY 1998#if EV_MULTIPLICITY
1661 struct ev_loop *loop = ev_default_loop_ptr; 1999 EV_P = ev_default_loop_ptr;
1662#endif 2000#endif
1663 2001
1664 postfork = 1; /* must be in line with ev_loop_fork */ 2002 postfork = 1; /* must be in line with ev_loop_fork */
1665} 2003}
1666 2004
… …
1670ev_invoke (EV_P_ void *w, int revents) 2008ev_invoke (EV_P_ void *w, int revents)
1671{ 2009{
1672 EV_CB_INVOKE ((W)w, revents); 2010 EV_CB_INVOKE ((W)w, revents);
1673} 2011}
1674 2012
1675void inline_speed 2013unsigned int
1676call_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)
1677{ 2027{
1678 int pri; 2028 int pri;
1679 2029
1680 for (pri = NUMPRI; pri--; ) 2030 for (pri = NUMPRI; pri--; )
1681 while (pendingcnt [pri]) 2031 while (pendingcnt [pri])
1682 { 2032 {
1683 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2033 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1684 2034
1685 if (expect_true (p->w))
1686 {
1687 /*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 */
1688 2037
1689 p->w->pending = 0; 2038 p->w->pending = 0;
1690 EV_CB_INVOKE (p->w, p->events); 2039 EV_CB_INVOKE (p->w, p->events);
1691 EV_FREQUENT_CHECK; 2040 EV_FREQUENT_CHECK;
1692 }
1693 } 2041 }
1694} 2042}
1695 2043
1696#if EV_IDLE_ENABLE 2044#if EV_IDLE_ENABLE
1697void inline_size 2045/* make idle watchers pending. this handles the "call-idle */
2046/* only when higher priorities are idle" logic */
2047inline_size void
1698idle_reify (EV_P) 2048idle_reify (EV_P)
1699{ 2049{
1700 if (expect_false (idleall)) 2050 if (expect_false (idleall))
1701 { 2051 {
1702 int pri; 2052 int pri;
… …
1714 } 2064 }
1715 } 2065 }
1716} 2066}
1717#endif 2067#endif
1718 2068
1719void inline_size 2069/* make timers pending */
2070inline_size void
1720timers_reify (EV_P) 2071timers_reify (EV_P)
1721{ 2072{
1722 EV_FREQUENT_CHECK; 2073 EV_FREQUENT_CHECK;
1723 2074
1724 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 2075 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1725 { 2076 {
1726 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 2077 do
1727
1728 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1729
1730 /* first reschedule or stop timer */
1731 if (w->repeat)
1732 { 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 {
1733 ev_at (w) += w->repeat; 2086 ev_at (w) += w->repeat;
1734 if (ev_at (w) < mn_now) 2087 if (ev_at (w) < mn_now)
1735 ev_at (w) = mn_now; 2088 ev_at (w) = mn_now;
1736 2089
1737 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.));
1738 2091
1739 ANHE_at_cache (timers [HEAP0]); 2092 ANHE_at_cache (timers [HEAP0]);
1740 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);
1741 } 2100 }
1742 else 2101 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1743 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1744 2102
1745 EV_FREQUENT_CHECK;
1746 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 2103 feed_reverse_done (EV_A_ EV_TIMEOUT);
1747 } 2104 }
1748} 2105}
1749 2106
1750#if EV_PERIODIC_ENABLE 2107#if EV_PERIODIC_ENABLE
1751void inline_size 2108/* make periodics pending */
2109inline_size void
1752periodics_reify (EV_P) 2110periodics_reify (EV_P)
1753{ 2111{
1754 EV_FREQUENT_CHECK; 2112 EV_FREQUENT_CHECK;
1755 2113
1756 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2114 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1757 { 2115 {
1758 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2116 int feed_count = 0;
1759 2117
1760 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 2118 do
1761
1762 /* first reschedule or stop timer */
1763 if (w->reschedule_cb)
1764 { 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 {
1765 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2127 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1766 2128
1767 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));
1768 2130
1769 ANHE_at_cache (periodics [HEAP0]); 2131 ANHE_at_cache (periodics [HEAP0]);
1770 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);
1771 } 2158 }
1772 else if (w->interval) 2159 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
1773 {
1774 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1775 /* if next trigger time is not sufficiently in the future, put it there */
1776 /* this might happen because of floating point inexactness */
1777 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1778 {
1779 ev_at (w) += w->interval;
1780 2160
1781 /* if interval is unreasonably low we might still have a time in the past */
1782 /* so correct this. this will make the periodic very inexact, but the user */
1783 /* has effectively asked to get triggered more often than possible */
1784 if (ev_at (w) < ev_rt_now)
1785 ev_at (w) = ev_rt_now;
1786 }
1787
1788 ANHE_at_cache (periodics [HEAP0]);
1789 downheap (periodics, periodiccnt, HEAP0);
1790 }
1791 else
1792 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1793
1794 EV_FREQUENT_CHECK;
1795 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 2161 feed_reverse_done (EV_A_ EV_PERIODIC);
1796 } 2162 }
1797} 2163}
1798 2164
2165/* simply recalculate all periodics */
2166/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1799static void noinline 2167static void noinline
1800periodics_reschedule (EV_P) 2168periodics_reschedule (EV_P)
1801{ 2169{
1802 int i; 2170 int i;
1803 2171
… …
1816 2184
1817 reheap (periodics, periodiccnt); 2185 reheap (periodics, periodiccnt);
1818} 2186}
1819#endif 2187#endif
1820 2188
1821void 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
1822time_update (EV_P_ ev_tstamp max_block) 2206time_update (EV_P_ ev_tstamp max_block)
1823{ 2207{
1824 int i;
1825
1826#if EV_USE_MONOTONIC 2208#if EV_USE_MONOTONIC
1827 if (expect_true (have_monotonic)) 2209 if (expect_true (have_monotonic))
1828 { 2210 {
2211 int i;
1829 ev_tstamp odiff = rtmn_diff; 2212 ev_tstamp odiff = rtmn_diff;
1830 2213
1831 mn_now = get_clock (); 2214 mn_now = get_clock ();
1832 2215
1833 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2216 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1859 ev_rt_now = ev_time (); 2242 ev_rt_now = ev_time ();
1860 mn_now = get_clock (); 2243 mn_now = get_clock ();
1861 now_floor = mn_now; 2244 now_floor = mn_now;
1862 } 2245 }
1863 2246
2247 /* no timer adjustment, as the monotonic clock doesn't jump */
2248 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1864# if EV_PERIODIC_ENABLE 2249# if EV_PERIODIC_ENABLE
1865 periodics_reschedule (EV_A); 2250 periodics_reschedule (EV_A);
1866# endif 2251# endif
1867 /* no timer adjustment, as the monotonic clock doesn't jump */
1868 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1869 } 2252 }
1870 else 2253 else
1871#endif 2254#endif
1872 { 2255 {
1873 ev_rt_now = ev_time (); 2256 ev_rt_now = ev_time ();
1874 2257
1875 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))
1876 { 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);
1877#if EV_PERIODIC_ENABLE 2262#if EV_PERIODIC_ENABLE
1878 periodics_reschedule (EV_A); 2263 periodics_reschedule (EV_A);
1879#endif 2264#endif
1880 /* adjust timers. this is easy, as the offset is the same for all of them */
1881 for (i = 0; i < timercnt; ++i)
1882 {
1883 ANHE *he = timers + i + HEAP0;
1884 ANHE_w (*he)->at += ev_rt_now - mn_now;
1885 ANHE_at_cache (*he);
1886 }
1887 } 2265 }
1888 2266
1889 mn_now = ev_rt_now; 2267 mn_now = ev_rt_now;
1890 } 2268 }
1891} 2269}
1892 2270
1893void 2271void
1894ev_ref (EV_P)
1895{
1896 ++activecnt;
1897}
1898
1899void
1900ev_unref (EV_P)
1901{
1902 --activecnt;
1903}
1904
1905void
1906ev_now_update (EV_P)
1907{
1908 time_update (EV_A_ 1e100);
1909}
1910
1911static int loop_done;
1912
1913void
1914ev_loop (EV_P_ int flags) 2272ev_loop (EV_P_ int flags)
1915{ 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
1916 loop_done = EVUNLOOP_CANCEL; 2280 loop_done = EVUNLOOP_CANCEL;
1917 2281
1918 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 */
1919 2283
1920 do 2284 do
1921 { 2285 {
1922#if EV_VERIFY >= 2 2286#if EV_VERIFY >= 2
1923 ev_loop_verify (EV_A); 2287 ev_loop_verify (EV_A);
… …
1936 /* we might have forked, so queue fork handlers */ 2300 /* we might have forked, so queue fork handlers */
1937 if (expect_false (postfork)) 2301 if (expect_false (postfork))
1938 if (forkcnt) 2302 if (forkcnt)
1939 { 2303 {
1940 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2304 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1941 call_pending (EV_A); 2305 EV_INVOKE_PENDING;
1942 } 2306 }
1943#endif 2307#endif
1944 2308
1945 /* queue prepare watchers (and execute them) */ 2309 /* queue prepare watchers (and execute them) */
1946 if (expect_false (preparecnt)) 2310 if (expect_false (preparecnt))
1947 { 2311 {
1948 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2312 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1949 call_pending (EV_A); 2313 EV_INVOKE_PENDING;
1950 } 2314 }
1951 2315
1952 if (expect_false (!activecnt)) 2316 if (expect_false (loop_done))
1953 break; 2317 break;
1954 2318
1955 /* we might have forked, so reify kernel state if necessary */ 2319 /* we might have forked, so reify kernel state if necessary */
1956 if (expect_false (postfork)) 2320 if (expect_false (postfork))
1957 loop_fork (EV_A); 2321 loop_fork (EV_A);
… …
1964 ev_tstamp waittime = 0.; 2328 ev_tstamp waittime = 0.;
1965 ev_tstamp sleeptime = 0.; 2329 ev_tstamp sleeptime = 0.;
1966 2330
1967 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2331 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1968 { 2332 {
2333 /* remember old timestamp for io_blocktime calculation */
2334 ev_tstamp prev_mn_now = mn_now;
2335
1969 /* update time to cancel out callback processing overhead */ 2336 /* update time to cancel out callback processing overhead */
1970 time_update (EV_A_ 1e100); 2337 time_update (EV_A_ 1e100);
1971 2338
1972 waittime = MAX_BLOCKTIME; 2339 waittime = MAX_BLOCKTIME;
1973 2340
… …
1983 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;
1984 if (waittime > to) waittime = to; 2351 if (waittime > to) waittime = to;
1985 } 2352 }
1986#endif 2353#endif
1987 2354
2355 /* don't let timeouts decrease the waittime below timeout_blocktime */
1988 if (expect_false (waittime < timeout_blocktime)) 2356 if (expect_false (waittime < timeout_blocktime))
1989 waittime = timeout_blocktime; 2357 waittime = timeout_blocktime;
1990 2358
1991 sleeptime = waittime - backend_fudge; 2359 /* extra check because io_blocktime is commonly 0 */
1992
1993 if (expect_true (sleeptime > io_blocktime)) 2360 if (expect_false (io_blocktime))
1994 sleeptime = io_blocktime;
1995
1996 if (sleeptime)
1997 { 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 {
1998 ev_sleep (sleeptime); 2369 ev_sleep (sleeptime);
1999 waittime -= sleeptime; 2370 waittime -= sleeptime;
2371 }
2000 } 2372 }
2001 } 2373 }
2002 2374
2375#if EV_MINIMAL < 2
2003 ++loop_count; 2376 ++loop_count;
2377#endif
2378 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2004 backend_poll (EV_A_ waittime); 2379 backend_poll (EV_A_ waittime);
2380 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2005 2381
2006 /* update ev_rt_now, do magic */ 2382 /* update ev_rt_now, do magic */
2007 time_update (EV_A_ waittime + sleeptime); 2383 time_update (EV_A_ waittime + sleeptime);
2008 } 2384 }
2009 2385
… …
2020 2396
2021 /* queue check watchers, to be executed first */ 2397 /* queue check watchers, to be executed first */
2022 if (expect_false (checkcnt)) 2398 if (expect_false (checkcnt))
2023 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2399 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2024 2400
2025 call_pending (EV_A); 2401 EV_INVOKE_PENDING;
2026 } 2402 }
2027 while (expect_true ( 2403 while (expect_true (
2028 activecnt 2404 activecnt
2029 && !loop_done 2405 && !loop_done
2030 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2406 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2031 )); 2407 ));
2032 2408
2033 if (loop_done == EVUNLOOP_ONE) 2409 if (loop_done == EVUNLOOP_ONE)
2034 loop_done = EVUNLOOP_CANCEL; 2410 loop_done = EVUNLOOP_CANCEL;
2411
2412#if EV_MINIMAL < 2
2413 --loop_depth;
2414#endif
2035} 2415}
2036 2416
2037void 2417void
2038ev_unloop (EV_P_ int how) 2418ev_unloop (EV_P_ int how)
2039{ 2419{
2040 loop_done = how; 2420 loop_done = how;
2041} 2421}
2042 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
2043/*****************************************************************************/ 2460/*****************************************************************************/
2461/* singly-linked list management, used when the expected list length is short */
2044 2462
2045void inline_size 2463inline_size void
2046wlist_add (WL *head, WL elem) 2464wlist_add (WL *head, WL elem)
2047{ 2465{
2048 elem->next = *head; 2466 elem->next = *head;
2049 *head = elem; 2467 *head = elem;
2050} 2468}
2051 2469
2052void inline_size 2470inline_size void
2053wlist_del (WL *head, WL elem) 2471wlist_del (WL *head, WL elem)
2054{ 2472{
2055 while (*head) 2473 while (*head)
2056 { 2474 {
2057 if (*head == elem) 2475 if (expect_true (*head == elem))
2058 { 2476 {
2059 *head = elem->next; 2477 *head = elem->next;
2060 return; 2478 break;
2061 } 2479 }
2062 2480
2063 head = &(*head)->next; 2481 head = &(*head)->next;
2064 } 2482 }
2065} 2483}
2066 2484
2067void inline_speed 2485/* internal, faster, version of ev_clear_pending */
2486inline_speed void
2068clear_pending (EV_P_ W w) 2487clear_pending (EV_P_ W w)
2069{ 2488{
2070 if (w->pending) 2489 if (w->pending)
2071 { 2490 {
2072 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2491 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2073 w->pending = 0; 2492 w->pending = 0;
2074 } 2493 }
2075} 2494}
2076 2495
2077int 2496int
… …
2081 int pending = w_->pending; 2500 int pending = w_->pending;
2082 2501
2083 if (expect_true (pending)) 2502 if (expect_true (pending))
2084 { 2503 {
2085 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2504 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2505 p->w = (W)&pending_w;
2086 w_->pending = 0; 2506 w_->pending = 0;
2087 p->w = 0;
2088 return p->events; 2507 return p->events;
2089 } 2508 }
2090 else 2509 else
2091 return 0; 2510 return 0;
2092} 2511}
2093 2512
2094void inline_size 2513inline_size void
2095pri_adjust (EV_P_ W w) 2514pri_adjust (EV_P_ W w)
2096{ 2515{
2097 int pri = w->priority; 2516 int pri = ev_priority (w);
2098 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2517 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2099 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2518 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2100 w->priority = pri; 2519 ev_set_priority (w, pri);
2101} 2520}
2102 2521
2103void inline_speed 2522inline_speed void
2104ev_start (EV_P_ W w, int active) 2523ev_start (EV_P_ W w, int active)
2105{ 2524{
2106 pri_adjust (EV_A_ w); 2525 pri_adjust (EV_A_ w);
2107 w->active = active; 2526 w->active = active;
2108 ev_ref (EV_A); 2527 ev_ref (EV_A);
2109} 2528}
2110 2529
2111void inline_size 2530inline_size void
2112ev_stop (EV_P_ W w) 2531ev_stop (EV_P_ W w)
2113{ 2532{
2114 ev_unref (EV_A); 2533 ev_unref (EV_A);
2115 w->active = 0; 2534 w->active = 0;
2116} 2535}
… …
2123 int fd = w->fd; 2542 int fd = w->fd;
2124 2543
2125 if (expect_false (ev_is_active (w))) 2544 if (expect_false (ev_is_active (w)))
2126 return; 2545 return;
2127 2546
2128 assert (("ev_io_start called with negative fd", fd >= 0)); 2547 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2129 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))));
2130 2549
2131 EV_FREQUENT_CHECK; 2550 EV_FREQUENT_CHECK;
2132 2551
2133 ev_start (EV_A_ (W)w, 1); 2552 ev_start (EV_A_ (W)w, 1);
2134 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2553 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2135 wlist_add (&anfds[fd].head, (WL)w); 2554 wlist_add (&anfds[fd].head, (WL)w);
2136 2555
2137 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2556 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2138 w->events &= ~EV_IOFDSET; 2557 w->events &= ~EV__IOFDSET;
2139 2558
2140 EV_FREQUENT_CHECK; 2559 EV_FREQUENT_CHECK;
2141} 2560}
2142 2561
2143void noinline 2562void noinline
… …
2145{ 2564{
2146 clear_pending (EV_A_ (W)w); 2565 clear_pending (EV_A_ (W)w);
2147 if (expect_false (!ev_is_active (w))) 2566 if (expect_false (!ev_is_active (w)))
2148 return; 2567 return;
2149 2568
2150 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));
2151 2570
2152 EV_FREQUENT_CHECK; 2571 EV_FREQUENT_CHECK;
2153 2572
2154 wlist_del (&anfds[w->fd].head, (WL)w); 2573 wlist_del (&anfds[w->fd].head, (WL)w);
2155 ev_stop (EV_A_ (W)w); 2574 ev_stop (EV_A_ (W)w);
… …
2165 if (expect_false (ev_is_active (w))) 2584 if (expect_false (ev_is_active (w)))
2166 return; 2585 return;
2167 2586
2168 ev_at (w) += mn_now; 2587 ev_at (w) += mn_now;
2169 2588
2170 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.));
2171 2590
2172 EV_FREQUENT_CHECK; 2591 EV_FREQUENT_CHECK;
2173 2592
2174 ++timercnt; 2593 ++timercnt;
2175 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2594 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2178 ANHE_at_cache (timers [ev_active (w)]); 2597 ANHE_at_cache (timers [ev_active (w)]);
2179 upheap (timers, ev_active (w)); 2598 upheap (timers, ev_active (w));
2180 2599
2181 EV_FREQUENT_CHECK; 2600 EV_FREQUENT_CHECK;
2182 2601
2183 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2602 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2184} 2603}
2185 2604
2186void noinline 2605void noinline
2187ev_timer_stop (EV_P_ ev_timer *w) 2606ev_timer_stop (EV_P_ ev_timer *w)
2188{ 2607{
… …
2193 EV_FREQUENT_CHECK; 2612 EV_FREQUENT_CHECK;
2194 2613
2195 { 2614 {
2196 int active = ev_active (w); 2615 int active = ev_active (w);
2197 2616
2198 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2617 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2199 2618
2200 --timercnt; 2619 --timercnt;
2201 2620
2202 if (expect_true (active < timercnt + HEAP0)) 2621 if (expect_true (active < timercnt + HEAP0))
2203 { 2622 {
2204 timers [active] = timers [timercnt + HEAP0]; 2623 timers [active] = timers [timercnt + HEAP0];
2205 adjustheap (timers, timercnt, active); 2624 adjustheap (timers, timercnt, active);
2206 } 2625 }
2207 } 2626 }
2208 2627
2209 EV_FREQUENT_CHECK;
2210
2211 ev_at (w) -= mn_now; 2628 ev_at (w) -= mn_now;
2212 2629
2213 ev_stop (EV_A_ (W)w); 2630 ev_stop (EV_A_ (W)w);
2631
2632 EV_FREQUENT_CHECK;
2214} 2633}
2215 2634
2216void noinline 2635void noinline
2217ev_timer_again (EV_P_ ev_timer *w) 2636ev_timer_again (EV_P_ ev_timer *w)
2218{ 2637{
… …
2236 } 2655 }
2237 2656
2238 EV_FREQUENT_CHECK; 2657 EV_FREQUENT_CHECK;
2239} 2658}
2240 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
2241#if EV_PERIODIC_ENABLE 2666#if EV_PERIODIC_ENABLE
2242void noinline 2667void noinline
2243ev_periodic_start (EV_P_ ev_periodic *w) 2668ev_periodic_start (EV_P_ ev_periodic *w)
2244{ 2669{
2245 if (expect_false (ev_is_active (w))) 2670 if (expect_false (ev_is_active (w)))
… …
2247 2672
2248 if (w->reschedule_cb) 2673 if (w->reschedule_cb)
2249 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2674 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2250 else if (w->interval) 2675 else if (w->interval)
2251 { 2676 {
2252 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.));
2253 /* 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 */
2254 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;
2255 } 2680 }
2256 else 2681 else
2257 ev_at (w) = w->offset; 2682 ev_at (w) = w->offset;
… …
2265 ANHE_at_cache (periodics [ev_active (w)]); 2690 ANHE_at_cache (periodics [ev_active (w)]);
2266 upheap (periodics, ev_active (w)); 2691 upheap (periodics, ev_active (w));
2267 2692
2268 EV_FREQUENT_CHECK; 2693 EV_FREQUENT_CHECK;
2269 2694
2270 /*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));*/
2271} 2696}
2272 2697
2273void noinline 2698void noinline
2274ev_periodic_stop (EV_P_ ev_periodic *w) 2699ev_periodic_stop (EV_P_ ev_periodic *w)
2275{ 2700{
… …
2280 EV_FREQUENT_CHECK; 2705 EV_FREQUENT_CHECK;
2281 2706
2282 { 2707 {
2283 int active = ev_active (w); 2708 int active = ev_active (w);
2284 2709
2285 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2710 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2286 2711
2287 --periodiccnt; 2712 --periodiccnt;
2288 2713
2289 if (expect_true (active < periodiccnt + HEAP0)) 2714 if (expect_true (active < periodiccnt + HEAP0))
2290 { 2715 {
2291 periodics [active] = periodics [periodiccnt + HEAP0]; 2716 periodics [active] = periodics [periodiccnt + HEAP0];
2292 adjustheap (periodics, periodiccnt, active); 2717 adjustheap (periodics, periodiccnt, active);
2293 } 2718 }
2294 } 2719 }
2295 2720
2296 EV_FREQUENT_CHECK;
2297
2298 ev_stop (EV_A_ (W)w); 2721 ev_stop (EV_A_ (W)w);
2722
2723 EV_FREQUENT_CHECK;
2299} 2724}
2300 2725
2301void noinline 2726void noinline
2302ev_periodic_again (EV_P_ ev_periodic *w) 2727ev_periodic_again (EV_P_ ev_periodic *w)
2303{ 2728{
… …
2309 2734
2310#ifndef SA_RESTART 2735#ifndef SA_RESTART
2311# define SA_RESTART 0 2736# define SA_RESTART 0
2312#endif 2737#endif
2313 2738
2739#if EV_SIGNAL_ENABLE
2740
2314void noinline 2741void noinline
2315ev_signal_start (EV_P_ ev_signal *w) 2742ev_signal_start (EV_P_ ev_signal *w)
2316{ 2743{
2317#if EV_MULTIPLICITY
2318 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2319#endif
2320 if (expect_false (ev_is_active (w))) 2744 if (expect_false (ev_is_active (w)))
2321 return; 2745 return;
2322 2746
2323 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));
2324 2748
2325 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));
2326 2752
2327 EV_FREQUENT_CHECK; 2753 signals [w->signum - 1].loop = EV_A;
2754#endif
2328 2755
2756 EV_FREQUENT_CHECK;
2757
2758#if EV_USE_SIGNALFD
2759 if (sigfd == -2)
2329 { 2760 {
2330#ifndef _WIN32 2761 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2331 sigset_t full, prev; 2762 if (sigfd < 0 && errno == EINVAL)
2332 sigfillset (&full); 2763 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2333 sigprocmask (SIG_SETMASK, &full, &prev);
2334#endif
2335 2764
2336 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 */
2337 2768
2338#ifndef _WIN32 2769 sigemptyset (&sigfd_set);
2339 sigprocmask (SIG_SETMASK, &prev, 0); 2770
2340#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 }
2341 } 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
2342 2787
2343 ev_start (EV_A_ (W)w, 1); 2788 ev_start (EV_A_ (W)w, 1);
2344 wlist_add (&signals [w->signum - 1].head, (WL)w); 2789 wlist_add (&signals [w->signum - 1].head, (WL)w);
2345 2790
2346 if (!((WL)w)->next) 2791 if (!((WL)w)->next)
2792# if EV_USE_SIGNALFD
2793 if (sigfd < 0) /*TODO*/
2794# endif
2347 { 2795 {
2348#if _WIN32 2796# ifdef _WIN32
2797 evpipe_init (EV_A);
2798
2349 signal (w->signum, ev_sighandler); 2799 signal (w->signum, ev_sighandler);
2350#else 2800# else
2351 struct sigaction sa; 2801 struct sigaction sa;
2802
2803 evpipe_init (EV_A);
2804
2352 sa.sa_handler = ev_sighandler; 2805 sa.sa_handler = ev_sighandler;
2353 sigfillset (&sa.sa_mask); 2806 sigfillset (&sa.sa_mask);
2354 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 */
2355 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);
2356#endif 2813#endif
2357 } 2814 }
2358 2815
2359 EV_FREQUENT_CHECK; 2816 EV_FREQUENT_CHECK;
2360} 2817}
2361 2818
2362void noinline 2819void noinline
… …
2370 2827
2371 wlist_del (&signals [w->signum - 1].head, (WL)w); 2828 wlist_del (&signals [w->signum - 1].head, (WL)w);
2372 ev_stop (EV_A_ (W)w); 2829 ev_stop (EV_A_ (W)w);
2373 2830
2374 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
2375 signal (w->signum, SIG_DFL); 2850 signal (w->signum, SIG_DFL);
2851 }
2376 2852
2377 EV_FREQUENT_CHECK; 2853 EV_FREQUENT_CHECK;
2378} 2854}
2855
2856#endif
2857
2858#if EV_CHILD_ENABLE
2379 2859
2380void 2860void
2381ev_child_start (EV_P_ ev_child *w) 2861ev_child_start (EV_P_ ev_child *w)
2382{ 2862{
2383#if EV_MULTIPLICITY 2863#if EV_MULTIPLICITY
2384 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));
2385#endif 2865#endif
2386 if (expect_false (ev_is_active (w))) 2866 if (expect_false (ev_is_active (w)))
2387 return; 2867 return;
2388 2868
2389 EV_FREQUENT_CHECK; 2869 EV_FREQUENT_CHECK;
… …
2407 ev_stop (EV_A_ (W)w); 2887 ev_stop (EV_A_ (W)w);
2408 2888
2409 EV_FREQUENT_CHECK; 2889 EV_FREQUENT_CHECK;
2410} 2890}
2411 2891
2892#endif
2893
2412#if EV_STAT_ENABLE 2894#if EV_STAT_ENABLE
2413 2895
2414# ifdef _WIN32 2896# ifdef _WIN32
2415# undef lstat 2897# undef lstat
2416# define lstat(a,b) _stati64 (a,b) 2898# define lstat(a,b) _stati64 (a,b)
2417# endif 2899# endif
2418 2900
2419#define DEF_STAT_INTERVAL 5.0074891 2901#define DEF_STAT_INTERVAL 5.0074891
2902#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
2420#define MIN_STAT_INTERVAL 0.1074891 2903#define MIN_STAT_INTERVAL 0.1074891
2421 2904
2422static 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);
2423 2906
2424#if EV_USE_INOTIFY 2907#if EV_USE_INOTIFY
2425# 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)
2426 2911
2427static void noinline 2912static void noinline
2428infy_add (EV_P_ ev_stat *w) 2913infy_add (EV_P_ ev_stat *w)
2429{ 2914{
2430 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);
2431 2916
2432 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 */
2433 { 2937 }
2434 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2938 else
2939 {
2940 /* can't use inotify, continue to stat */
2941 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2435 2942
2436 /* monitor some parent directory for speedup hints */ 2943 /* if path is not there, monitor some parent directory for speedup hints */
2437 /* 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, */
2438 /* but an efficiency issue only */ 2945 /* but an efficiency issue only */
2439 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2946 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2440 { 2947 {
2441 char path [4096]; 2948 char path [4096];
… …
2446 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2953 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2447 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2954 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2448 2955
2449 char *pend = strrchr (path, '/'); 2956 char *pend = strrchr (path, '/');
2450 2957
2451 if (!pend) 2958 if (!pend || pend == path)
2452 break; /* whoops, no '/', complain to your admin */ 2959 break;
2453 2960
2454 *pend = 0; 2961 *pend = 0;
2455 w->wd = inotify_add_watch (fs_fd, path, mask); 2962 w->wd = inotify_add_watch (fs_fd, path, mask);
2456 } 2963 }
2457 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2964 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2458 } 2965 }
2459 } 2966 }
2460 else
2461 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2462 2967
2463 if (w->wd >= 0) 2968 if (w->wd >= 0)
2464 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);
2970
2971 /* now re-arm timer, if required */
2972 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2973 ev_timer_again (EV_A_ &w->timer);
2974 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2465} 2975}
2466 2976
2467static void noinline 2977static void noinline
2468infy_del (EV_P_ ev_stat *w) 2978infy_del (EV_P_ ev_stat *w)
2469{ 2979{
… …
2499 3009
2500 if (w->wd == wd || wd == -1) 3010 if (w->wd == wd || wd == -1)
2501 { 3011 {
2502 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3012 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2503 { 3013 {
3014 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2504 w->wd = -1; 3015 w->wd = -1;
2505 infy_add (EV_A_ w); /* re-add, no matter what */ 3016 infy_add (EV_A_ w); /* re-add, no matter what */
2506 } 3017 }
2507 3018
2508 stat_timer_cb (EV_A_ &w->timer, 0); 3019 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2513 3024
2514static void 3025static void
2515infy_cb (EV_P_ ev_io *w, int revents) 3026infy_cb (EV_P_ ev_io *w, int revents)
2516{ 3027{
2517 char buf [EV_INOTIFY_BUFSIZE]; 3028 char buf [EV_INOTIFY_BUFSIZE];
2518 struct inotify_event *ev = (struct inotify_event *)buf;
2519 int ofs; 3029 int ofs;
2520 int len = read (fs_fd, buf, sizeof (buf)); 3030 int len = read (fs_fd, buf, sizeof (buf));
2521 3031
2522 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);
2523 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 }
2524} 3038}
2525 3039
2526void inline_size 3040inline_size unsigned int
2527infy_init (EV_P) 3041ev_linux_version (void)
2528{ 3042{
2529 if (fs_fd != -2) 3043 struct utsname buf;
3044 unsigned int v;
3045 int i;
3046 char *p = buf.release;
3047
3048 if (uname (&buf))
2530 return; 3049 return 0;
2531 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
3073ev_check_2625 (EV_P)
3074{
2532 /* kernels < 2.6.25 are borked 3075 /* kernels < 2.6.25 are borked
2533 * 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
2534 */ 3077 */
2535 { 3078 if (ev_linux_version () < 0x020619)
2536 struct utsname buf; 3079 return;
2537 int major, minor, micro;
2538 3080
3081 fs_2625 = 1;
3082}
3083
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
3096infy_init (EV_P)
3097{
3098 if (fs_fd != -2)
3099 return;
3100
2539 fs_fd = -1; 3101 fs_fd = -1;
2540 3102
2541 if (uname (&buf)) 3103 ev_check_2625 (EV_A);
2542 return;
2543 3104
2544 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2545 return;
2546
2547 if (major < 2
2548 || (major == 2 && minor < 6)
2549 || (major == 2 && minor == 6 && micro < 25))
2550 return;
2551 }
2552
2553 fs_fd = inotify_init (); 3105 fs_fd = infy_newfd ();
2554 3106
2555 if (fs_fd >= 0) 3107 if (fs_fd >= 0)
2556 { 3108 {
3109 fd_intern (fs_fd);
2557 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3110 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2558 ev_set_priority (&fs_w, EV_MAXPRI); 3111 ev_set_priority (&fs_w, EV_MAXPRI);
2559 ev_io_start (EV_A_ &fs_w); 3112 ev_io_start (EV_A_ &fs_w);
3113 ev_unref (EV_A);
2560 } 3114 }
2561} 3115}
2562 3116
2563void inline_size 3117inline_size void
2564infy_fork (EV_P) 3118infy_fork (EV_P)
2565{ 3119{
2566 int slot; 3120 int slot;
2567 3121
2568 if (fs_fd < 0) 3122 if (fs_fd < 0)
2569 return; 3123 return;
2570 3124
3125 ev_ref (EV_A);
3126 ev_io_stop (EV_A_ &fs_w);
2571 close (fs_fd); 3127 close (fs_fd);
2572 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 }
2573 3137
2574 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3138 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2575 { 3139 {
2576 WL w_ = fs_hash [slot].head; 3140 WL w_ = fs_hash [slot].head;
2577 fs_hash [slot].head = 0; 3141 fs_hash [slot].head = 0;
… …
2584 w->wd = -1; 3148 w->wd = -1;
2585 3149
2586 if (fs_fd >= 0) 3150 if (fs_fd >= 0)
2587 infy_add (EV_A_ w); /* re-add, no matter what */ 3151 infy_add (EV_A_ w); /* re-add, no matter what */
2588 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);
2589 ev_timer_start (EV_A_ &w->timer); 3156 ev_timer_again (EV_A_ &w->timer);
3157 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3158 }
2590 } 3159 }
2591 } 3160 }
2592} 3161}
2593 3162
2594#endif 3163#endif
… …
2611static void noinline 3180static void noinline
2612stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3181stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2613{ 3182{
2614 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3183 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2615 3184
2616 /* we copy this here each the time so that */ 3185 ev_statdata prev = w->attr;
2617 /* prev has the old value when the callback gets invoked */
2618 w->prev = w->attr;
2619 ev_stat_stat (EV_A_ w); 3186 ev_stat_stat (EV_A_ w);
2620 3187
2621 /* 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 */
2622 if ( 3189 if (
2623 w->prev.st_dev != w->attr.st_dev 3190 prev.st_dev != w->attr.st_dev
2624 || w->prev.st_ino != w->attr.st_ino 3191 || prev.st_ino != w->attr.st_ino
2625 || w->prev.st_mode != w->attr.st_mode 3192 || prev.st_mode != w->attr.st_mode
2626 || w->prev.st_nlink != w->attr.st_nlink 3193 || prev.st_nlink != w->attr.st_nlink
2627 || w->prev.st_uid != w->attr.st_uid 3194 || prev.st_uid != w->attr.st_uid
2628 || w->prev.st_gid != w->attr.st_gid 3195 || prev.st_gid != w->attr.st_gid
2629 || w->prev.st_rdev != w->attr.st_rdev 3196 || prev.st_rdev != w->attr.st_rdev
2630 || w->prev.st_size != w->attr.st_size 3197 || prev.st_size != w->attr.st_size
2631 || w->prev.st_atime != w->attr.st_atime 3198 || prev.st_atime != w->attr.st_atime
2632 || w->prev.st_mtime != w->attr.st_mtime 3199 || prev.st_mtime != w->attr.st_mtime
2633 || w->prev.st_ctime != w->attr.st_ctime 3200 || prev.st_ctime != w->attr.st_ctime
2634 ) { 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
2635 #if EV_USE_INOTIFY 3207 #if EV_USE_INOTIFY
2636 if (fs_fd >= 0) 3208 if (fs_fd >= 0)
2637 { 3209 {
2638 infy_del (EV_A_ w); 3210 infy_del (EV_A_ w);
2639 infy_add (EV_A_ w); 3211 infy_add (EV_A_ w);
… …
2649ev_stat_start (EV_P_ ev_stat *w) 3221ev_stat_start (EV_P_ ev_stat *w)
2650{ 3222{
2651 if (expect_false (ev_is_active (w))) 3223 if (expect_false (ev_is_active (w)))
2652 return; 3224 return;
2653 3225
2654 /* since we use memcmp, we need to clear any padding data etc. */
2655 memset (&w->prev, 0, sizeof (ev_statdata));
2656 memset (&w->attr, 0, sizeof (ev_statdata));
2657
2658 ev_stat_stat (EV_A_ w); 3226 ev_stat_stat (EV_A_ w);
2659 3227
3228 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2660 if (w->interval < MIN_STAT_INTERVAL) 3229 w->interval = MIN_STAT_INTERVAL;
2661 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2662 3230
2663 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 3231 ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2664 ev_set_priority (&w->timer, ev_priority (w)); 3232 ev_set_priority (&w->timer, ev_priority (w));
2665 3233
2666#if EV_USE_INOTIFY 3234#if EV_USE_INOTIFY
2667 infy_init (EV_A); 3235 infy_init (EV_A);
2668 3236
2669 if (fs_fd >= 0) 3237 if (fs_fd >= 0)
2670 infy_add (EV_A_ w); 3238 infy_add (EV_A_ w);
2671 else 3239 else
2672#endif 3240#endif
3241 {
2673 ev_timer_start (EV_A_ &w->timer); 3242 ev_timer_again (EV_A_ &w->timer);
3243 ev_unref (EV_A);
3244 }
2674 3245
2675 ev_start (EV_A_ (W)w, 1); 3246 ev_start (EV_A_ (W)w, 1);
2676 3247
2677 EV_FREQUENT_CHECK; 3248 EV_FREQUENT_CHECK;
2678} 3249}
… …
2687 EV_FREQUENT_CHECK; 3258 EV_FREQUENT_CHECK;
2688 3259
2689#if EV_USE_INOTIFY 3260#if EV_USE_INOTIFY
2690 infy_del (EV_A_ w); 3261 infy_del (EV_A_ w);
2691#endif 3262#endif
3263
3264 if (ev_is_active (&w->timer))
3265 {
3266 ev_ref (EV_A);
2692 ev_timer_stop (EV_A_ &w->timer); 3267 ev_timer_stop (EV_A_ &w->timer);
3268 }
2693 3269
2694 ev_stop (EV_A_ (W)w); 3270 ev_stop (EV_A_ (W)w);
2695 3271
2696 EV_FREQUENT_CHECK; 3272 EV_FREQUENT_CHECK;
2697} 3273}
… …
2838embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3414embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2839{ 3415{
2840 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3416 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2841 3417
2842 { 3418 {
2843 struct ev_loop *loop = w->other; 3419 EV_P = w->other;
2844 3420
2845 while (fdchangecnt) 3421 while (fdchangecnt)
2846 { 3422 {
2847 fd_reify (EV_A); 3423 fd_reify (EV_A);
2848 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3424 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
2853static void 3429static void
2854embed_fork_cb (EV_P_ ev_fork *fork_w, int revents) 3430embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2855{ 3431{
2856 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));
2857 3433
3434 ev_embed_stop (EV_A_ w);
3435
2858 { 3436 {
2859 struct ev_loop *loop = w->other; 3437 EV_P = w->other;
2860 3438
2861 ev_loop_fork (EV_A); 3439 ev_loop_fork (EV_A);
3440 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2862 } 3441 }
3442
3443 ev_embed_start (EV_A_ w);
2863} 3444}
2864 3445
2865#if 0 3446#if 0
2866static void 3447static void
2867embed_idle_cb (EV_P_ ev_idle *idle, int revents) 3448embed_idle_cb (EV_P_ ev_idle *idle, int revents)
… …
2875{ 3456{
2876 if (expect_false (ev_is_active (w))) 3457 if (expect_false (ev_is_active (w)))
2877 return; 3458 return;
2878 3459
2879 { 3460 {
2880 struct ev_loop *loop = w->other; 3461 EV_P = w->other;
2881 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 ()));
2882 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);
2883 } 3464 }
2884 3465
2885 EV_FREQUENT_CHECK; 3466 EV_FREQUENT_CHECK;
2886 3467
… …
2912 3493
2913 ev_io_stop (EV_A_ &w->io); 3494 ev_io_stop (EV_A_ &w->io);
2914 ev_prepare_stop (EV_A_ &w->prepare); 3495 ev_prepare_stop (EV_A_ &w->prepare);
2915 ev_fork_stop (EV_A_ &w->fork); 3496 ev_fork_stop (EV_A_ &w->fork);
2916 3497
3498 ev_stop (EV_A_ (W)w);
3499
2917 EV_FREQUENT_CHECK; 3500 EV_FREQUENT_CHECK;
2918} 3501}
2919#endif 3502#endif
2920 3503
2921#if EV_FORK_ENABLE 3504#if EV_FORK_ENABLE
… …
2997 3580
2998void 3581void
2999ev_async_send (EV_P_ ev_async *w) 3582ev_async_send (EV_P_ ev_async *w)
3000{ 3583{
3001 w->sent = 1; 3584 w->sent = 1;
3002 evpipe_write (EV_A_ &gotasync); 3585 evpipe_write (EV_A_ &async_pending);
3003} 3586}
3004#endif 3587#endif
3005 3588
3006/*****************************************************************************/ 3589/*****************************************************************************/
3007 3590
… …
3069 ev_timer_set (&once->to, timeout, 0.); 3652 ev_timer_set (&once->to, timeout, 0.);
3070 ev_timer_start (EV_A_ &once->to); 3653 ev_timer_start (EV_A_ &once->to);
3071 } 3654 }
3072} 3655}
3073 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
3074#if EV_MULTIPLICITY 3765#if EV_MULTIPLICITY
3075 #include "ev_wrap.h" 3766 #include "ev_wrap.h"
3076#endif 3767#endif
3077 3768
3078#ifdef __cplusplus 3769#ifdef __cplusplus

Diff Legend

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