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

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

Diff Legend

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