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

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

Diff Legend

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