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

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

Diff Legend

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