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

Comparing libev/ev.c (file contents):
Revision 1.264 by root, Mon Oct 13 23:20:12 2008 UTC vs.
Revision 1.331 by root, Tue Mar 9 08:55:03 2010 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
47# include EV_CONFIG_H 47# include EV_CONFIG_H
48# else 48# else
49# include "config.h" 49# include "config.h"
50# endif 50# endif
51 51
52# if HAVE_CLOCK_SYSCALL
53# ifndef EV_USE_CLOCK_SYSCALL
54# define EV_USE_CLOCK_SYSCALL 1
55# ifndef EV_USE_REALTIME
56# define EV_USE_REALTIME 0
57# endif
58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1
60# endif
61# endif
62# elif !defined(EV_USE_CLOCK_SYSCALL)
63# define EV_USE_CLOCK_SYSCALL 0
64# endif
65
52# if HAVE_CLOCK_GETTIME 66# if HAVE_CLOCK_GETTIME
53# ifndef EV_USE_MONOTONIC 67# ifndef EV_USE_MONOTONIC
54# define EV_USE_MONOTONIC 1 68# define EV_USE_MONOTONIC 1
55# endif 69# endif
56# ifndef EV_USE_REALTIME 70# ifndef EV_USE_REALTIME
57# define EV_USE_REALTIME 1 71# define EV_USE_REALTIME 0
58# endif 72# endif
59# else 73# else
60# ifndef EV_USE_MONOTONIC 74# ifndef EV_USE_MONOTONIC
61# define EV_USE_MONOTONIC 0 75# define EV_USE_MONOTONIC 0
62# endif 76# endif
… …
96# define EV_USE_EPOLL 0 110# define EV_USE_EPOLL 0
97# endif 111# endif
98# endif 112# endif
99 113
100# ifndef EV_USE_KQUEUE 114# ifndef EV_USE_KQUEUE
101# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
102# define EV_USE_KQUEUE 1 116# define EV_USE_KQUEUE 1
103# else 117# else
104# define EV_USE_KQUEUE 0 118# define EV_USE_KQUEUE 0
105# endif 119# endif
106# endif 120# endif
… …
119# else 133# else
120# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
121# endif 135# endif
122# endif 136# endif
123 137
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1
141# else
142# define EV_USE_SIGNALFD 0
143# endif
144# endif
145
124# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
125# if HAVE_EVENTFD 147# if HAVE_EVENTFD
126# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD 1
127# else 149# else
128# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
… …
131 153
132#endif 154#endif
133 155
134#include <math.h> 156#include <math.h>
135#include <stdlib.h> 157#include <stdlib.h>
158#include <string.h>
136#include <fcntl.h> 159#include <fcntl.h>
137#include <stddef.h> 160#include <stddef.h>
138 161
139#include <stdio.h> 162#include <stdio.h>
140 163
141#include <assert.h> 164#include <assert.h>
142#include <errno.h> 165#include <errno.h>
143#include <sys/types.h> 166#include <sys/types.h>
144#include <time.h> 167#include <time.h>
168#include <limits.h>
145 169
146#include <signal.h> 170#include <signal.h>
147 171
148#ifdef EV_H 172#ifdef EV_H
149# include EV_H 173# include EV_H
… …
160# define WIN32_LEAN_AND_MEAN 184# define WIN32_LEAN_AND_MEAN
161# include <windows.h> 185# include <windows.h>
162# ifndef EV_SELECT_IS_WINSOCKET 186# ifndef EV_SELECT_IS_WINSOCKET
163# define EV_SELECT_IS_WINSOCKET 1 187# define EV_SELECT_IS_WINSOCKET 1
164# endif 188# endif
189# undef EV_AVOID_STDIO
165#endif 190#endif
166 191
167/* this block tries to deduce configuration from header-defined symbols and defaults */ 192/* this block tries to deduce configuration from header-defined symbols and defaults */
193
194/* try to deduce the maximum number of signals on this platform */
195#if defined (EV_NSIG)
196/* use what's provided */
197#elif defined (NSIG)
198# define EV_NSIG (NSIG)
199#elif defined(_NSIG)
200# define EV_NSIG (_NSIG)
201#elif defined (SIGMAX)
202# define EV_NSIG (SIGMAX+1)
203#elif defined (SIG_MAX)
204# define EV_NSIG (SIG_MAX+1)
205#elif defined (_SIG_MAX)
206# define EV_NSIG (_SIG_MAX+1)
207#elif defined (MAXSIG)
208# define EV_NSIG (MAXSIG+1)
209#elif defined (MAX_SIG)
210# define EV_NSIG (MAX_SIG+1)
211#elif defined (SIGARRAYSIZE)
212# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
213#elif defined (_sys_nsig)
214# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
215#else
216# error "unable to find value for NSIG, please report"
217/* to make it compile regardless, just remove the above line */
218# define EV_NSIG 65
219#endif
220
221#ifndef EV_USE_CLOCK_SYSCALL
222# if __linux && __GLIBC__ >= 2
223# define EV_USE_CLOCK_SYSCALL 1
224# else
225# define EV_USE_CLOCK_SYSCALL 0
226# endif
227#endif
168 228
169#ifndef EV_USE_MONOTONIC 229#ifndef EV_USE_MONOTONIC
170# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 230# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
171# define EV_USE_MONOTONIC 1 231# define EV_USE_MONOTONIC 1
172# else 232# else
173# define EV_USE_MONOTONIC 0 233# define EV_USE_MONOTONIC 0
174# endif 234# endif
175#endif 235#endif
176 236
177#ifndef EV_USE_REALTIME 237#ifndef EV_USE_REALTIME
178# define EV_USE_REALTIME 0 238# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
179#endif 239#endif
180 240
181#ifndef EV_USE_NANOSLEEP 241#ifndef EV_USE_NANOSLEEP
182# if _POSIX_C_SOURCE >= 199309L 242# if _POSIX_C_SOURCE >= 199309L
183# define EV_USE_NANOSLEEP 1 243# define EV_USE_NANOSLEEP 1
… …
244# else 304# else
245# define EV_USE_EVENTFD 0 305# define EV_USE_EVENTFD 0
246# endif 306# endif
247#endif 307#endif
248 308
309#ifndef EV_USE_SIGNALFD
310# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
311# define EV_USE_SIGNALFD 1
312# else
313# define EV_USE_SIGNALFD 0
314# endif
315#endif
316
249#if 0 /* debugging */ 317#if 0 /* debugging */
250# define EV_VERIFY 3 318# define EV_VERIFY 3
251# define EV_USE_4HEAP 1 319# define EV_USE_4HEAP 1
252# define EV_HEAP_CACHE_AT 1 320# define EV_HEAP_CACHE_AT 1
253#endif 321#endif
… …
262 330
263#ifndef EV_HEAP_CACHE_AT 331#ifndef EV_HEAP_CACHE_AT
264# define EV_HEAP_CACHE_AT !EV_MINIMAL 332# define EV_HEAP_CACHE_AT !EV_MINIMAL
265#endif 333#endif
266 334
335/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
336/* which makes programs even slower. might work on other unices, too. */
337#if EV_USE_CLOCK_SYSCALL
338# include <syscall.h>
339# ifdef SYS_clock_gettime
340# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
341# undef EV_USE_MONOTONIC
342# define EV_USE_MONOTONIC 1
343# else
344# undef EV_USE_CLOCK_SYSCALL
345# define EV_USE_CLOCK_SYSCALL 0
346# endif
347#endif
348
267/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 349/* this block fixes any misconfiguration where we know we run into trouble otherwise */
350
351#ifdef _AIX
352/* AIX has a completely broken poll.h header */
353# undef EV_USE_POLL
354# define EV_USE_POLL 0
355#endif
268 356
269#ifndef CLOCK_MONOTONIC 357#ifndef CLOCK_MONOTONIC
270# undef EV_USE_MONOTONIC 358# undef EV_USE_MONOTONIC
271# define EV_USE_MONOTONIC 0 359# define EV_USE_MONOTONIC 0
272#endif 360#endif
… …
287# endif 375# endif
288#endif 376#endif
289 377
290#if EV_USE_INOTIFY 378#if EV_USE_INOTIFY
291# include <sys/utsname.h> 379# include <sys/utsname.h>
380# include <sys/statfs.h>
292# include <sys/inotify.h> 381# include <sys/inotify.h>
293/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 382/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
294# ifndef IN_DONT_FOLLOW 383# ifndef IN_DONT_FOLLOW
295# undef EV_USE_INOTIFY 384# undef EV_USE_INOTIFY
296# define EV_USE_INOTIFY 0 385# define EV_USE_INOTIFY 0
… …
302#endif 391#endif
303 392
304#if EV_USE_EVENTFD 393#if EV_USE_EVENTFD
305/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 394/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
306# include <stdint.h> 395# include <stdint.h>
396# ifndef EFD_NONBLOCK
397# define EFD_NONBLOCK O_NONBLOCK
398# endif
399# ifndef EFD_CLOEXEC
400# ifdef O_CLOEXEC
401# define EFD_CLOEXEC O_CLOEXEC
402# else
403# define EFD_CLOEXEC 02000000
404# endif
405# endif
307# ifdef __cplusplus 406# ifdef __cplusplus
308extern "C" { 407extern "C" {
309# endif 408# endif
310int eventfd (unsigned int initval, int flags); 409int (eventfd) (unsigned int initval, int flags);
311# ifdef __cplusplus 410# ifdef __cplusplus
312} 411}
313# endif 412# endif
314#endif 413#endif
414
415#if EV_USE_SIGNALFD
416/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
417# include <stdint.h>
418# ifndef SFD_NONBLOCK
419# define SFD_NONBLOCK O_NONBLOCK
420# endif
421# ifndef SFD_CLOEXEC
422# ifdef O_CLOEXEC
423# define SFD_CLOEXEC O_CLOEXEC
424# else
425# define SFD_CLOEXEC 02000000
426# endif
427# endif
428# ifdef __cplusplus
429extern "C" {
430# endif
431int signalfd (int fd, const sigset_t *mask, int flags);
432
433struct signalfd_siginfo
434{
435 uint32_t ssi_signo;
436 char pad[128 - sizeof (uint32_t)];
437};
438# ifdef __cplusplus
439}
440# endif
441#endif
442
315 443
316/**/ 444/**/
317 445
318#if EV_VERIFY >= 3 446#if EV_VERIFY >= 3
319# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 447# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
… …
331 */ 459 */
332#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 460#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
333 461
334#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 462#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
335#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 463#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
336/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
337 464
338#if __GNUC__ >= 4 465#if __GNUC__ >= 4
339# define expect(expr,value) __builtin_expect ((expr),(value)) 466# define expect(expr,value) __builtin_expect ((expr),(value))
340# define noinline __attribute__ ((noinline)) 467# define noinline __attribute__ ((noinline))
341#else 468#else
… …
354# define inline_speed static noinline 481# define inline_speed static noinline
355#else 482#else
356# define inline_speed static inline 483# define inline_speed static inline
357#endif 484#endif
358 485
359#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 486#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
487
488#if EV_MINPRI == EV_MAXPRI
489# define ABSPRI(w) (((W)w), 0)
490#else
360#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 491# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
492#endif
361 493
362#define EMPTY /* required for microsofts broken pseudo-c compiler */ 494#define EMPTY /* required for microsofts broken pseudo-c compiler */
363#define EMPTY2(a,b) /* used to suppress some warnings */ 495#define EMPTY2(a,b) /* used to suppress some warnings */
364 496
365typedef ev_watcher *W; 497typedef ev_watcher *W;
… …
367typedef ev_watcher_time *WT; 499typedef ev_watcher_time *WT;
368 500
369#define ev_active(w) ((W)(w))->active 501#define ev_active(w) ((W)(w))->active
370#define ev_at(w) ((WT)(w))->at 502#define ev_at(w) ((WT)(w))->at
371 503
372#if EV_USE_MONOTONIC 504#if EV_USE_REALTIME
373/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 505/* sig_atomic_t is used to avoid per-thread variables or locking but still */
374/* giving it a reasonably high chance of working on typical architetcures */ 506/* giving it a reasonably high chance of working on typical architetcures */
507static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
508#endif
509
510#if EV_USE_MONOTONIC
375static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 511static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
512#endif
513
514#ifndef EV_FD_TO_WIN32_HANDLE
515# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
516#endif
517#ifndef EV_WIN32_HANDLE_TO_FD
518# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
519#endif
520#ifndef EV_WIN32_CLOSE_FD
521# define EV_WIN32_CLOSE_FD(fd) close (fd)
376#endif 522#endif
377 523
378#ifdef _WIN32 524#ifdef _WIN32
379# include "ev_win32.c" 525# include "ev_win32.c"
380#endif 526#endif
381 527
382/*****************************************************************************/ 528/*****************************************************************************/
383 529
530#if EV_AVOID_STDIO
531static void noinline
532ev_printerr (const char *msg)
533{
534 write (STDERR_FILENO, msg, strlen (msg));
535}
536#endif
537
384static void (*syserr_cb)(const char *msg); 538static void (*syserr_cb)(const char *msg);
385 539
386void 540void
387ev_set_syserr_cb (void (*cb)(const char *msg)) 541ev_set_syserr_cb (void (*cb)(const char *msg))
388{ 542{
389 syserr_cb = cb; 543 syserr_cb = cb;
390} 544}
391 545
392static void noinline 546static void noinline
393syserr (const char *msg) 547ev_syserr (const char *msg)
394{ 548{
395 if (!msg) 549 if (!msg)
396 msg = "(libev) system error"; 550 msg = "(libev) system error";
397 551
398 if (syserr_cb) 552 if (syserr_cb)
399 syserr_cb (msg); 553 syserr_cb (msg);
400 else 554 else
401 { 555 {
556#if EV_AVOID_STDIO
557 const char *err = strerror (errno);
558
559 ev_printerr (msg);
560 ev_printerr (": ");
561 ev_printerr (err);
562 ev_printerr ("\n");
563#else
402 perror (msg); 564 perror (msg);
565#endif
403 abort (); 566 abort ();
404 } 567 }
405} 568}
406 569
407static void * 570static void *
… …
432{ 595{
433 ptr = alloc (ptr, size); 596 ptr = alloc (ptr, size);
434 597
435 if (!ptr && size) 598 if (!ptr && size)
436 { 599 {
600#if EV_AVOID_STDIO
601 ev_printerr ("libev: memory allocation failed, aborting.\n");
602#else
437 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 603 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
604#endif
438 abort (); 605 abort ();
439 } 606 }
440 607
441 return ptr; 608 return ptr;
442} 609}
… …
444#define ev_malloc(size) ev_realloc (0, (size)) 611#define ev_malloc(size) ev_realloc (0, (size))
445#define ev_free(ptr) ev_realloc ((ptr), 0) 612#define ev_free(ptr) ev_realloc ((ptr), 0)
446 613
447/*****************************************************************************/ 614/*****************************************************************************/
448 615
616/* set in reify when reification needed */
617#define EV_ANFD_REIFY 1
618
619/* file descriptor info structure */
449typedef struct 620typedef struct
450{ 621{
451 WL head; 622 WL head;
452 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 */
453 unsigned char reify; 626 unsigned char unused;
627#if EV_USE_EPOLL
628 unsigned int egen; /* generation counter to counter epoll bugs */
629#endif
454#if EV_SELECT_IS_WINSOCKET 630#if EV_SELECT_IS_WINSOCKET
455 SOCKET handle; 631 SOCKET handle;
456#endif 632#endif
457} ANFD; 633} ANFD;
458 634
635/* stores the pending event set for a given watcher */
459typedef struct 636typedef struct
460{ 637{
461 W w; 638 W w;
462 int events; 639 int events; /* the pending event set for the given watcher */
463} ANPENDING; 640} ANPENDING;
464 641
465#if EV_USE_INOTIFY 642#if EV_USE_INOTIFY
466/* hash table entry per inotify-id */ 643/* hash table entry per inotify-id */
467typedef struct 644typedef struct
… …
470} ANFS; 647} ANFS;
471#endif 648#endif
472 649
473/* Heap Entry */ 650/* Heap Entry */
474#if EV_HEAP_CACHE_AT 651#if EV_HEAP_CACHE_AT
652 /* a heap element */
475 typedef struct { 653 typedef struct {
476 ev_tstamp at; 654 ev_tstamp at;
477 WT w; 655 WT w;
478 } ANHE; 656 } ANHE;
479 657
480 #define ANHE_w(he) (he).w /* access watcher, read-write */ 658 #define ANHE_w(he) (he).w /* access watcher, read-write */
481 #define ANHE_at(he) (he).at /* access cached at, read-only */ 659 #define ANHE_at(he) (he).at /* access cached at, read-only */
482 #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 */
483#else 661#else
662 /* a heap element */
484 typedef WT ANHE; 663 typedef WT ANHE;
485 664
486 #define ANHE_w(he) (he) 665 #define ANHE_w(he) (he)
487 #define ANHE_at(he) (he)->at 666 #define ANHE_at(he) (he)->at
488 #define ANHE_at_cache(he) 667 #define ANHE_at_cache(he)
… …
512 691
513 static int ev_default_loop_ptr; 692 static int ev_default_loop_ptr;
514 693
515#endif 694#endif
516 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
517/*****************************************************************************/ 708/*****************************************************************************/
518 709
710#ifndef EV_HAVE_EV_TIME
519ev_tstamp 711ev_tstamp
520ev_time (void) 712ev_time (void)
521{ 713{
522#if EV_USE_REALTIME 714#if EV_USE_REALTIME
715 if (expect_true (have_realtime))
716 {
523 struct timespec ts; 717 struct timespec ts;
524 clock_gettime (CLOCK_REALTIME, &ts); 718 clock_gettime (CLOCK_REALTIME, &ts);
525 return ts.tv_sec + ts.tv_nsec * 1e-9; 719 return ts.tv_sec + ts.tv_nsec * 1e-9;
526#else 720 }
721#endif
722
527 struct timeval tv; 723 struct timeval tv;
528 gettimeofday (&tv, 0); 724 gettimeofday (&tv, 0);
529 return tv.tv_sec + tv.tv_usec * 1e-6; 725 return tv.tv_sec + tv.tv_usec * 1e-6;
530#endif
531} 726}
727#endif
532 728
533ev_tstamp inline_size 729inline_size ev_tstamp
534get_clock (void) 730get_clock (void)
535{ 731{
536#if EV_USE_MONOTONIC 732#if EV_USE_MONOTONIC
537 if (expect_true (have_monotonic)) 733 if (expect_true (have_monotonic))
538 { 734 {
… …
572 768
573 tv.tv_sec = (time_t)delay; 769 tv.tv_sec = (time_t)delay;
574 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 770 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
575 771
576 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 772 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
577 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 773 /* something not guaranteed by newer posix versions, but guaranteed */
578 /* by older ones */ 774 /* by older ones */
579 select (0, 0, 0, 0, &tv); 775 select (0, 0, 0, 0, &tv);
580#endif 776#endif
581 } 777 }
582} 778}
583 779
584/*****************************************************************************/ 780/*****************************************************************************/
585 781
586#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 */
587 783
588int 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
589array_nextsize (int elem, int cur, int cnt) 787array_nextsize (int elem, int cur, int cnt)
590{ 788{
591 int ncur = cur + 1; 789 int ncur = cur + 1;
592 790
593 do 791 do
… …
610array_realloc (int elem, void *base, int *cur, int cnt) 808array_realloc (int elem, void *base, int *cur, int cnt)
611{ 809{
612 *cur = array_nextsize (elem, *cur, cnt); 810 *cur = array_nextsize (elem, *cur, cnt);
613 return ev_realloc (base, elem * *cur); 811 return ev_realloc (base, elem * *cur);
614} 812}
813
814#define array_init_zero(base,count) \
815 memset ((void *)(base), 0, sizeof (*(base)) * (count))
615 816
616#define array_needsize(type,base,cur,cnt,init) \ 817#define array_needsize(type,base,cur,cnt,init) \
617 if (expect_false ((cnt) > (cur))) \ 818 if (expect_false ((cnt) > (cur))) \
618 { \ 819 { \
619 int ocur_ = (cur); \ 820 int ocur_ = (cur); \
… …
631 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 832 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
632 } 833 }
633#endif 834#endif
634 835
635#define array_free(stem, idx) \ 836#define array_free(stem, idx) \
636 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
637 838
638/*****************************************************************************/ 839/*****************************************************************************/
840
841/* dummy callback for pending events */
842static void noinline
843pendingcb (EV_P_ ev_prepare *w, int revents)
844{
845}
639 846
640void noinline 847void noinline
641ev_feed_event (EV_P_ void *w, int revents) 848ev_feed_event (EV_P_ void *w, int revents)
642{ 849{
643 W w_ = (W)w; 850 W w_ = (W)w;
… …
652 pendings [pri][w_->pending - 1].w = w_; 859 pendings [pri][w_->pending - 1].w = w_;
653 pendings [pri][w_->pending - 1].events = revents; 860 pendings [pri][w_->pending - 1].events = revents;
654 } 861 }
655} 862}
656 863
657void 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
658queue_events (EV_P_ W *events, int eventcnt, int type) 880queue_events (EV_P_ W *events, int eventcnt, int type)
659{ 881{
660 int i; 882 int i;
661 883
662 for (i = 0; i < eventcnt; ++i) 884 for (i = 0; i < eventcnt; ++i)
663 ev_feed_event (EV_A_ events [i], type); 885 ev_feed_event (EV_A_ events [i], type);
664} 886}
665 887
666/*****************************************************************************/ 888/*****************************************************************************/
667 889
668void inline_size 890inline_speed void
669anfds_init (ANFD *base, int count)
670{
671 while (count--)
672 {
673 base->head = 0;
674 base->events = EV_NONE;
675 base->reify = 0;
676
677 ++base;
678 }
679}
680
681void inline_speed
682fd_event (EV_P_ int fd, int revents) 891fd_event_nc (EV_P_ int fd, int revents)
683{ 892{
684 ANFD *anfd = anfds + fd; 893 ANFD *anfd = anfds + fd;
685 ev_io *w; 894 ev_io *w;
686 895
687 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)
… …
691 if (ev) 900 if (ev)
692 ev_feed_event (EV_A_ (W)w, ev); 901 ev_feed_event (EV_A_ (W)w, ev);
693 } 902 }
694} 903}
695 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
696void 916void
697ev_feed_fd_event (EV_P_ int fd, int revents) 917ev_feed_fd_event (EV_P_ int fd, int revents)
698{ 918{
699 if (fd >= 0 && fd < anfdmax) 919 if (fd >= 0 && fd < anfdmax)
700 fd_event (EV_A_ fd, revents); 920 fd_event_nc (EV_A_ fd, revents);
701} 921}
702 922
703void inline_size 923/* make sure the external fd watch events are in-sync */
924/* with the kernel/libev internal state */
925inline_size void
704fd_reify (EV_P) 926fd_reify (EV_P)
705{ 927{
706 int i; 928 int i;
707 929
708 for (i = 0; i < fdchangecnt; ++i) 930 for (i = 0; i < fdchangecnt; ++i)
… …
718 940
719#if EV_SELECT_IS_WINSOCKET 941#if EV_SELECT_IS_WINSOCKET
720 if (events) 942 if (events)
721 { 943 {
722 unsigned long arg; 944 unsigned long arg;
723 #ifdef EV_FD_TO_WIN32_HANDLE
724 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 945 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
725 #else
726 anfd->handle = _get_osfhandle (fd);
727 #endif
728 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 946 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
729 } 947 }
730#endif 948#endif
731 949
732 { 950 {
733 unsigned char o_events = anfd->events; 951 unsigned char o_events = anfd->events;
734 unsigned char o_reify = anfd->reify; 952 unsigned char o_reify = anfd->reify;
735 953
736 anfd->reify = 0; 954 anfd->reify = 0;
737 anfd->events = events; 955 anfd->events = events;
738 956
739 if (o_events != events || o_reify & EV_IOFDSET) 957 if (o_events != events || o_reify & EV__IOFDSET)
740 backend_modify (EV_A_ fd, o_events, events); 958 backend_modify (EV_A_ fd, o_events, events);
741 } 959 }
742 } 960 }
743 961
744 fdchangecnt = 0; 962 fdchangecnt = 0;
745} 963}
746 964
747void inline_size 965/* something about the given fd changed */
966inline_size void
748fd_change (EV_P_ int fd, int flags) 967fd_change (EV_P_ int fd, int flags)
749{ 968{
750 unsigned char reify = anfds [fd].reify; 969 unsigned char reify = anfds [fd].reify;
751 anfds [fd].reify |= flags; 970 anfds [fd].reify |= flags;
752 971
… …
756 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 975 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
757 fdchanges [fdchangecnt - 1] = fd; 976 fdchanges [fdchangecnt - 1] = fd;
758 } 977 }
759} 978}
760 979
761void inline_speed 980/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
981inline_speed void
762fd_kill (EV_P_ int fd) 982fd_kill (EV_P_ int fd)
763{ 983{
764 ev_io *w; 984 ev_io *w;
765 985
766 while ((w = (ev_io *)anfds [fd].head)) 986 while ((w = (ev_io *)anfds [fd].head))
… …
768 ev_io_stop (EV_A_ w); 988 ev_io_stop (EV_A_ w);
769 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);
770 } 990 }
771} 991}
772 992
773int inline_size 993/* check whether the given fd is atcually valid, for error recovery */
994inline_size int
774fd_valid (int fd) 995fd_valid (int fd)
775{ 996{
776#ifdef _WIN32 997#ifdef _WIN32
777 return _get_osfhandle (fd) != -1; 998 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
778#else 999#else
779 return fcntl (fd, F_GETFD) != -1; 1000 return fcntl (fd, F_GETFD) != -1;
780#endif 1001#endif
781} 1002}
782 1003
… …
800 1021
801 for (fd = anfdmax; fd--; ) 1022 for (fd = anfdmax; fd--; )
802 if (anfds [fd].events) 1023 if (anfds [fd].events)
803 { 1024 {
804 fd_kill (EV_A_ fd); 1025 fd_kill (EV_A_ fd);
805 return; 1026 break;
806 } 1027 }
807} 1028}
808 1029
809/* 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 */
810static void noinline 1031static void noinline
… …
814 1035
815 for (fd = 0; fd < anfdmax; ++fd) 1036 for (fd = 0; fd < anfdmax; ++fd)
816 if (anfds [fd].events) 1037 if (anfds [fd].events)
817 { 1038 {
818 anfds [fd].events = 0; 1039 anfds [fd].events = 0;
1040 anfds [fd].emask = 0;
819 fd_change (EV_A_ fd, EV_IOFDSET | 1); 1041 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
820 } 1042 }
821} 1043}
822 1044
823/*****************************************************************************/ 1045/*****************************************************************************/
824 1046
… …
840#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 1062#define HEAP0 (DHEAP - 1) /* index of first element in heap */
841#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 1063#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
842#define UPHEAP_DONE(p,k) ((p) == (k)) 1064#define UPHEAP_DONE(p,k) ((p) == (k))
843 1065
844/* away from the root */ 1066/* away from the root */
845void inline_speed 1067inline_speed void
846downheap (ANHE *heap, int N, int k) 1068downheap (ANHE *heap, int N, int k)
847{ 1069{
848 ANHE he = heap [k]; 1070 ANHE he = heap [k];
849 ANHE *E = heap + N + HEAP0; 1071 ANHE *E = heap + N + HEAP0;
850 1072
… …
890#define HEAP0 1 1112#define HEAP0 1
891#define HPARENT(k) ((k) >> 1) 1113#define HPARENT(k) ((k) >> 1)
892#define UPHEAP_DONE(p,k) (!(p)) 1114#define UPHEAP_DONE(p,k) (!(p))
893 1115
894/* away from the root */ 1116/* away from the root */
895void inline_speed 1117inline_speed void
896downheap (ANHE *heap, int N, int k) 1118downheap (ANHE *heap, int N, int k)
897{ 1119{
898 ANHE he = heap [k]; 1120 ANHE he = heap [k];
899 1121
900 for (;;) 1122 for (;;)
901 { 1123 {
902 int c = k << 1; 1124 int c = k << 1;
903 1125
904 if (c > N + HEAP0 - 1) 1126 if (c >= N + HEAP0)
905 break; 1127 break;
906 1128
907 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])
908 ? 1 : 0; 1130 ? 1 : 0;
909 1131
… …
920 ev_active (ANHE_w (he)) = k; 1142 ev_active (ANHE_w (he)) = k;
921} 1143}
922#endif 1144#endif
923 1145
924/* towards the root */ 1146/* towards the root */
925void inline_speed 1147inline_speed void
926upheap (ANHE *heap, int k) 1148upheap (ANHE *heap, int k)
927{ 1149{
928 ANHE he = heap [k]; 1150 ANHE he = heap [k];
929 1151
930 for (;;) 1152 for (;;)
… …
941 1163
942 heap [k] = he; 1164 heap [k] = he;
943 ev_active (ANHE_w (he)) = k; 1165 ev_active (ANHE_w (he)) = k;
944} 1166}
945 1167
946void inline_size 1168/* move an element suitably so it is in a correct place */
1169inline_size void
947adjustheap (ANHE *heap, int N, int k) 1170adjustheap (ANHE *heap, int N, int k)
948{ 1171{
949 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)]))
950 upheap (heap, k); 1173 upheap (heap, k);
951 else 1174 else
952 downheap (heap, N, k); 1175 downheap (heap, N, k);
953} 1176}
954 1177
955/* 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 */
956void inline_size 1179inline_size void
957reheap (ANHE *heap, int N) 1180reheap (ANHE *heap, int N)
958{ 1181{
959 int i; 1182 int i;
960 1183
961 /* 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 */
… …
964 upheap (heap, i + HEAP0); 1187 upheap (heap, i + HEAP0);
965} 1188}
966 1189
967/*****************************************************************************/ 1190/*****************************************************************************/
968 1191
1192/* associate signal watchers to a signal signal */
969typedef struct 1193typedef struct
970{ 1194{
1195 EV_ATOMIC_T pending;
1196#if EV_MULTIPLICITY
1197 EV_P;
1198#endif
971 WL head; 1199 WL head;
972 EV_ATOMIC_T gotsig;
973} ANSIG; 1200} ANSIG;
974 1201
975static ANSIG *signals; 1202static ANSIG signals [EV_NSIG - 1];
976static int signalmax;
977
978static EV_ATOMIC_T gotsig;
979
980void inline_size
981signals_init (ANSIG *base, int count)
982{
983 while (count--)
984 {
985 base->head = 0;
986 base->gotsig = 0;
987
988 ++base;
989 }
990}
991 1203
992/*****************************************************************************/ 1204/*****************************************************************************/
993 1205
994void inline_speed 1206/* used to prepare libev internal fd's */
1207/* this is not fork-safe */
1208inline_speed void
995fd_intern (int fd) 1209fd_intern (int fd)
996{ 1210{
997#ifdef _WIN32 1211#ifdef _WIN32
998 unsigned long arg = 1; 1212 unsigned long arg = 1;
999 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1213 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1000#else 1214#else
1001 fcntl (fd, F_SETFD, FD_CLOEXEC); 1215 fcntl (fd, F_SETFD, FD_CLOEXEC);
1002 fcntl (fd, F_SETFL, O_NONBLOCK); 1216 fcntl (fd, F_SETFL, O_NONBLOCK);
1003#endif 1217#endif
1004} 1218}
1005 1219
1006static void noinline 1220static void noinline
1007evpipe_init (EV_P) 1221evpipe_init (EV_P)
1008{ 1222{
1009 if (!ev_is_active (&pipeev)) 1223 if (!ev_is_active (&pipe_w))
1010 { 1224 {
1011#if EV_USE_EVENTFD 1225#if EV_USE_EVENTFD
1226 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1227 if (evfd < 0 && errno == EINVAL)
1012 if ((evfd = eventfd (0, 0)) >= 0) 1228 evfd = eventfd (0, 0);
1229
1230 if (evfd >= 0)
1013 { 1231 {
1014 evpipe [0] = -1; 1232 evpipe [0] = -1;
1015 fd_intern (evfd); 1233 fd_intern (evfd); /* doing it twice doesn't hurt */
1016 ev_io_set (&pipeev, evfd, EV_READ); 1234 ev_io_set (&pipe_w, evfd, EV_READ);
1017 } 1235 }
1018 else 1236 else
1019#endif 1237#endif
1020 { 1238 {
1021 while (pipe (evpipe)) 1239 while (pipe (evpipe))
1022 syserr ("(libev) error creating signal/async pipe"); 1240 ev_syserr ("(libev) error creating signal/async pipe");
1023 1241
1024 fd_intern (evpipe [0]); 1242 fd_intern (evpipe [0]);
1025 fd_intern (evpipe [1]); 1243 fd_intern (evpipe [1]);
1026 ev_io_set (&pipeev, evpipe [0], EV_READ); 1244 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1027 } 1245 }
1028 1246
1029 ev_io_start (EV_A_ &pipeev); 1247 ev_io_start (EV_A_ &pipe_w);
1030 ev_unref (EV_A); /* watcher should not keep loop alive */ 1248 ev_unref (EV_A); /* watcher should not keep loop alive */
1031 } 1249 }
1032} 1250}
1033 1251
1034void inline_size 1252inline_size void
1035evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1253evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1036{ 1254{
1037 if (!*flag) 1255 if (!*flag)
1038 { 1256 {
1039 int old_errno = errno; /* save errno because write might clobber it */ 1257 int old_errno = errno; /* save errno because write might clobber it */
… …
1052 1270
1053 errno = old_errno; 1271 errno = old_errno;
1054 } 1272 }
1055} 1273}
1056 1274
1275/* called whenever the libev signal pipe */
1276/* got some events (signal, async) */
1057static void 1277static void
1058pipecb (EV_P_ ev_io *iow, int revents) 1278pipecb (EV_P_ ev_io *iow, int revents)
1059{ 1279{
1280 int i;
1281
1060#if EV_USE_EVENTFD 1282#if EV_USE_EVENTFD
1061 if (evfd >= 0) 1283 if (evfd >= 0)
1062 { 1284 {
1063 uint64_t counter; 1285 uint64_t counter;
1064 read (evfd, &counter, sizeof (uint64_t)); 1286 read (evfd, &counter, sizeof (uint64_t));
… …
1068 { 1290 {
1069 char dummy; 1291 char dummy;
1070 read (evpipe [0], &dummy, 1); 1292 read (evpipe [0], &dummy, 1);
1071 } 1293 }
1072 1294
1073 if (gotsig && ev_is_default_loop (EV_A)) 1295 if (sig_pending)
1074 { 1296 {
1075 int signum; 1297 sig_pending = 0;
1076 gotsig = 0;
1077 1298
1078 for (signum = signalmax; signum--; ) 1299 for (i = EV_NSIG - 1; i--; )
1079 if (signals [signum].gotsig) 1300 if (expect_false (signals [i].pending))
1080 ev_feed_signal_event (EV_A_ signum + 1); 1301 ev_feed_signal_event (EV_A_ i + 1);
1081 } 1302 }
1082 1303
1083#if EV_ASYNC_ENABLE 1304#if EV_ASYNC_ENABLE
1084 if (gotasync) 1305 if (async_pending)
1085 { 1306 {
1086 int i; 1307 async_pending = 0;
1087 gotasync = 0;
1088 1308
1089 for (i = asynccnt; i--; ) 1309 for (i = asynccnt; i--; )
1090 if (asyncs [i]->sent) 1310 if (asyncs [i]->sent)
1091 { 1311 {
1092 asyncs [i]->sent = 0; 1312 asyncs [i]->sent = 0;
… …
1100 1320
1101static void 1321static void
1102ev_sighandler (int signum) 1322ev_sighandler (int signum)
1103{ 1323{
1104#if EV_MULTIPLICITY 1324#if EV_MULTIPLICITY
1105 struct ev_loop *loop = &default_loop_struct; 1325 EV_P = signals [signum - 1].loop;
1106#endif 1326#endif
1107 1327
1108#if _WIN32 1328#ifdef _WIN32
1109 signal (signum, ev_sighandler); 1329 signal (signum, ev_sighandler);
1110#endif 1330#endif
1111 1331
1112 signals [signum - 1].gotsig = 1; 1332 signals [signum - 1].pending = 1;
1113 evpipe_write (EV_A_ &gotsig); 1333 evpipe_write (EV_A_ &sig_pending);
1114} 1334}
1115 1335
1116void noinline 1336void noinline
1117ev_feed_signal_event (EV_P_ int signum) 1337ev_feed_signal_event (EV_P_ int signum)
1118{ 1338{
1119 WL w; 1339 WL w;
1120 1340
1341 if (expect_false (signum <= 0 || signum > EV_NSIG))
1342 return;
1343
1344 --signum;
1345
1121#if EV_MULTIPLICITY 1346#if EV_MULTIPLICITY
1122 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 */
1123#endif 1348 /* or, likely more useful, feeding a signal nobody is waiting for */
1124 1349
1125 --signum; 1350 if (expect_false (signals [signum].loop != EV_A))
1126
1127 if (signum < 0 || signum >= signalmax)
1128 return; 1351 return;
1352#endif
1129 1353
1130 signals [signum].gotsig = 0; 1354 signals [signum].pending = 0;
1131 1355
1132 for (w = signals [signum].head; w; w = w->next) 1356 for (w = signals [signum].head; w; w = w->next)
1133 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1357 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1134} 1358}
1135 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
1136/*****************************************************************************/ 1380/*****************************************************************************/
1137 1381
1138static WL childs [EV_PID_HASHSIZE]; 1382static WL childs [EV_PID_HASHSIZE];
1139 1383
1140#ifndef _WIN32 1384#ifndef _WIN32
… …
1143 1387
1144#ifndef WIFCONTINUED 1388#ifndef WIFCONTINUED
1145# define WIFCONTINUED(status) 0 1389# define WIFCONTINUED(status) 0
1146#endif 1390#endif
1147 1391
1148void inline_speed 1392/* handle a single child status event */
1393inline_speed void
1149child_reap (EV_P_ int chain, int pid, int status) 1394child_reap (EV_P_ int chain, int pid, int status)
1150{ 1395{
1151 ev_child *w; 1396 ev_child *w;
1152 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1397 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1153 1398
… …
1166 1411
1167#ifndef WCONTINUED 1412#ifndef WCONTINUED
1168# define WCONTINUED 0 1413# define WCONTINUED 0
1169#endif 1414#endif
1170 1415
1416/* called on sigchld etc., calls waitpid */
1171static void 1417static void
1172childcb (EV_P_ ev_signal *sw, int revents) 1418childcb (EV_P_ ev_signal *sw, int revents)
1173{ 1419{
1174 int pid, status; 1420 int pid, status;
1175 1421
… …
1256 /* kqueue is borked on everything but netbsd apparently */ 1502 /* kqueue is borked on everything but netbsd apparently */
1257 /* 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 */
1258 flags &= ~EVBACKEND_KQUEUE; 1504 flags &= ~EVBACKEND_KQUEUE;
1259#endif 1505#endif
1260#ifdef __APPLE__ 1506#ifdef __APPLE__
1261 // flags &= ~EVBACKEND_KQUEUE; for documentation 1507 /* only select works correctly on that "unix-certified" platform */
1262 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 */
1263#endif 1510#endif
1264 1511
1265 return flags; 1512 return flags;
1266} 1513}
1267 1514
… …
1281ev_backend (EV_P) 1528ev_backend (EV_P)
1282{ 1529{
1283 return backend; 1530 return backend;
1284} 1531}
1285 1532
1533#if EV_MINIMAL < 2
1286unsigned int 1534unsigned int
1287ev_loop_count (EV_P) 1535ev_loop_count (EV_P)
1288{ 1536{
1289 return loop_count; 1537 return loop_count;
1290} 1538}
1291 1539
1540unsigned int
1541ev_loop_depth (EV_P)
1542{
1543 return loop_depth;
1544}
1545
1292void 1546void
1293ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1547ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1294{ 1548{
1295 io_blocktime = interval; 1549 io_blocktime = interval;
1296} 1550}
… …
1299ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1553ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1300{ 1554{
1301 timeout_blocktime = interval; 1555 timeout_blocktime = interval;
1302} 1556}
1303 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 */
1304static void noinline 1583static void noinline
1305loop_init (EV_P_ unsigned int flags) 1584loop_init (EV_P_ unsigned int flags)
1306{ 1585{
1307 if (!backend) 1586 if (!backend)
1308 { 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
1309#if EV_USE_MONOTONIC 1598#if EV_USE_MONOTONIC
1599 if (!have_monotonic)
1310 { 1600 {
1311 struct timespec ts; 1601 struct timespec ts;
1602
1312 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1603 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1313 have_monotonic = 1; 1604 have_monotonic = 1;
1314 } 1605 }
1315#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"));
1316 1618
1317 ev_rt_now = ev_time (); 1619 ev_rt_now = ev_time ();
1318 mn_now = get_clock (); 1620 mn_now = get_clock ();
1319 now_floor = mn_now; 1621 now_floor = mn_now;
1320 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
1321 1626
1322 io_blocktime = 0.; 1627 io_blocktime = 0.;
1323 timeout_blocktime = 0.; 1628 timeout_blocktime = 0.;
1324 backend = 0; 1629 backend = 0;
1325 backend_fd = -1; 1630 backend_fd = -1;
1326 gotasync = 0; 1631 sig_pending = 0;
1632#if EV_ASYNC_ENABLE
1633 async_pending = 0;
1634#endif
1327#if EV_USE_INOTIFY 1635#if EV_USE_INOTIFY
1328 fs_fd = -2; 1636 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1329#endif 1637#endif
1330 1638#if EV_USE_SIGNALFD
1331 /* pid check not overridable via env */ 1639 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1332#ifndef _WIN32
1333 if (flags & EVFLAG_FORKCHECK)
1334 curpid = getpid ();
1335#endif 1640#endif
1336
1337 if (!(flags & EVFLAG_NOENV)
1338 && !enable_secure ()
1339 && getenv ("LIBEV_FLAGS"))
1340 flags = atoi (getenv ("LIBEV_FLAGS"));
1341 1641
1342 if (!(flags & 0x0000ffffU)) 1642 if (!(flags & 0x0000ffffU))
1343 flags |= ev_recommended_backends (); 1643 flags |= ev_recommended_backends ();
1344 1644
1345#if EV_USE_PORT 1645#if EV_USE_PORT
… …
1356#endif 1656#endif
1357#if EV_USE_SELECT 1657#if EV_USE_SELECT
1358 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1658 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1359#endif 1659#endif
1360 1660
1661 ev_prepare_init (&pending_w, pendingcb);
1662
1361 ev_init (&pipeev, pipecb); 1663 ev_init (&pipe_w, pipecb);
1362 ev_set_priority (&pipeev, EV_MAXPRI); 1664 ev_set_priority (&pipe_w, EV_MAXPRI);
1363 } 1665 }
1364} 1666}
1365 1667
1668/* free up a loop structure */
1366static void noinline 1669static void noinline
1367loop_destroy (EV_P) 1670loop_destroy (EV_P)
1368{ 1671{
1369 int i; 1672 int i;
1370 1673
1371 if (ev_is_active (&pipeev)) 1674 if (ev_is_active (&pipe_w))
1372 { 1675 {
1373 ev_ref (EV_A); /* signal watcher */ 1676 /*ev_ref (EV_A);*/
1374 ev_io_stop (EV_A_ &pipeev); 1677 /*ev_io_stop (EV_A_ &pipe_w);*/
1375 1678
1376#if EV_USE_EVENTFD 1679#if EV_USE_EVENTFD
1377 if (evfd >= 0) 1680 if (evfd >= 0)
1378 close (evfd); 1681 close (evfd);
1379#endif 1682#endif
1380 1683
1381 if (evpipe [0] >= 0) 1684 if (evpipe [0] >= 0)
1382 { 1685 {
1383 close (evpipe [0]); 1686 EV_WIN32_CLOSE_FD (evpipe [0]);
1384 close (evpipe [1]); 1687 EV_WIN32_CLOSE_FD (evpipe [1]);
1385 } 1688 }
1386 } 1689 }
1690
1691#if EV_USE_SIGNALFD
1692 if (ev_is_active (&sigfd_w))
1693 close (sigfd);
1694#endif
1387 1695
1388#if EV_USE_INOTIFY 1696#if EV_USE_INOTIFY
1389 if (fs_fd >= 0) 1697 if (fs_fd >= 0)
1390 close (fs_fd); 1698 close (fs_fd);
1391#endif 1699#endif
… …
1415#if EV_IDLE_ENABLE 1723#if EV_IDLE_ENABLE
1416 array_free (idle, [i]); 1724 array_free (idle, [i]);
1417#endif 1725#endif
1418 } 1726 }
1419 1727
1420 ev_free (anfds); anfdmax = 0; 1728 ev_free (anfds); anfds = 0; anfdmax = 0;
1421 1729
1422 /* 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);
1423 array_free (fdchange, EMPTY); 1732 array_free (fdchange, EMPTY);
1424 array_free (timer, EMPTY); 1733 array_free (timer, EMPTY);
1425#if EV_PERIODIC_ENABLE 1734#if EV_PERIODIC_ENABLE
1426 array_free (periodic, EMPTY); 1735 array_free (periodic, EMPTY);
1427#endif 1736#endif
… …
1436 1745
1437 backend = 0; 1746 backend = 0;
1438} 1747}
1439 1748
1440#if EV_USE_INOTIFY 1749#if EV_USE_INOTIFY
1441void inline_size infy_fork (EV_P); 1750inline_size void infy_fork (EV_P);
1442#endif 1751#endif
1443 1752
1444void inline_size 1753inline_size void
1445loop_fork (EV_P) 1754loop_fork (EV_P)
1446{ 1755{
1447#if EV_USE_PORT 1756#if EV_USE_PORT
1448 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1757 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1449#endif 1758#endif
… …
1455#endif 1764#endif
1456#if EV_USE_INOTIFY 1765#if EV_USE_INOTIFY
1457 infy_fork (EV_A); 1766 infy_fork (EV_A);
1458#endif 1767#endif
1459 1768
1460 if (ev_is_active (&pipeev)) 1769 if (ev_is_active (&pipe_w))
1461 { 1770 {
1462 /* this "locks" the handlers against writing to the pipe */ 1771 /* this "locks" the handlers against writing to the pipe */
1463 /* while we modify the fd vars */ 1772 /* while we modify the fd vars */
1464 gotsig = 1; 1773 sig_pending = 1;
1465#if EV_ASYNC_ENABLE 1774#if EV_ASYNC_ENABLE
1466 gotasync = 1; 1775 async_pending = 1;
1467#endif 1776#endif
1468 1777
1469 ev_ref (EV_A); 1778 ev_ref (EV_A);
1470 ev_io_stop (EV_A_ &pipeev); 1779 ev_io_stop (EV_A_ &pipe_w);
1471 1780
1472#if EV_USE_EVENTFD 1781#if EV_USE_EVENTFD
1473 if (evfd >= 0) 1782 if (evfd >= 0)
1474 close (evfd); 1783 close (evfd);
1475#endif 1784#endif
1476 1785
1477 if (evpipe [0] >= 0) 1786 if (evpipe [0] >= 0)
1478 { 1787 {
1479 close (evpipe [0]); 1788 EV_WIN32_CLOSE_FD (evpipe [0]);
1480 close (evpipe [1]); 1789 EV_WIN32_CLOSE_FD (evpipe [1]);
1481 } 1790 }
1482 1791
1483 evpipe_init (EV_A); 1792 evpipe_init (EV_A);
1484 /* now iterate over everything, in case we missed something */ 1793 /* now iterate over everything, in case we missed something */
1485 pipecb (EV_A_ &pipeev, EV_READ); 1794 pipecb (EV_A_ &pipe_w, EV_READ);
1486 } 1795 }
1487 1796
1488 postfork = 0; 1797 postfork = 0;
1489} 1798}
1490 1799
1491#if EV_MULTIPLICITY 1800#if EV_MULTIPLICITY
1492 1801
1493struct ev_loop * 1802struct ev_loop *
1494ev_loop_new (unsigned int flags) 1803ev_loop_new (unsigned int flags)
1495{ 1804{
1496 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));
1497 1806
1498 memset (loop, 0, sizeof (struct ev_loop)); 1807 memset (EV_A, 0, sizeof (struct ev_loop));
1499
1500 loop_init (EV_A_ flags); 1808 loop_init (EV_A_ flags);
1501 1809
1502 if (ev_backend (EV_A)) 1810 if (ev_backend (EV_A))
1503 return loop; 1811 return EV_A;
1504 1812
1505 return 0; 1813 return 0;
1506} 1814}
1507 1815
1508void 1816void
… …
1515void 1823void
1516ev_loop_fork (EV_P) 1824ev_loop_fork (EV_P)
1517{ 1825{
1518 postfork = 1; /* must be in line with ev_default_fork */ 1826 postfork = 1; /* must be in line with ev_default_fork */
1519} 1827}
1828#endif /* multiplicity */
1520 1829
1521#if EV_VERIFY 1830#if EV_VERIFY
1522static void noinline 1831static void noinline
1523verify_watcher (EV_P_ W w) 1832verify_watcher (EV_P_ W w)
1524{ 1833{
1525 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1834 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1526 1835
1527 if (w->pending) 1836 if (w->pending)
1528 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));
1529} 1838}
1530 1839
1531static void noinline 1840static void noinline
1532verify_heap (EV_P_ ANHE *heap, int N) 1841verify_heap (EV_P_ ANHE *heap, int N)
1533{ 1842{
1534 int i; 1843 int i;
1535 1844
1536 for (i = HEAP0; i < N + HEAP0; ++i) 1845 for (i = HEAP0; i < N + HEAP0; ++i)
1537 { 1846 {
1538 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));
1539 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])));
1540 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]))));
1541 1850
1542 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1851 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1543 } 1852 }
1544} 1853}
1545 1854
1546static void noinline 1855static void noinline
1547array_verify (EV_P_ W *ws, int cnt) 1856array_verify (EV_P_ W *ws, int cnt)
1548{ 1857{
1549 while (cnt--) 1858 while (cnt--)
1550 { 1859 {
1551 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1860 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1552 verify_watcher (EV_A_ ws [cnt]); 1861 verify_watcher (EV_A_ ws [cnt]);
1553 } 1862 }
1554} 1863}
1555#endif 1864#endif
1556 1865
1866#if EV_MINIMAL < 2
1557void 1867void
1558ev_loop_verify (EV_P) 1868ev_loop_verify (EV_P)
1559{ 1869{
1560#if EV_VERIFY 1870#if EV_VERIFY
1561 int i; 1871 int i;
… …
1563 1873
1564 assert (activecnt >= -1); 1874 assert (activecnt >= -1);
1565 1875
1566 assert (fdchangemax >= fdchangecnt); 1876 assert (fdchangemax >= fdchangecnt);
1567 for (i = 0; i < fdchangecnt; ++i) 1877 for (i = 0; i < fdchangecnt; ++i)
1568 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1878 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1569 1879
1570 assert (anfdmax >= 0); 1880 assert (anfdmax >= 0);
1571 for (i = 0; i < anfdmax; ++i) 1881 for (i = 0; i < anfdmax; ++i)
1572 for (w = anfds [i].head; w; w = w->next) 1882 for (w = anfds [i].head; w; w = w->next)
1573 { 1883 {
1574 verify_watcher (EV_A_ (W)w); 1884 verify_watcher (EV_A_ (W)w);
1575 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1885 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1576 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));
1577 } 1887 }
1578 1888
1579 assert (timermax >= timercnt); 1889 assert (timermax >= timercnt);
1580 verify_heap (EV_A_ timers, timercnt); 1890 verify_heap (EV_A_ timers, timercnt);
1581 1891
… …
1610 assert (checkmax >= checkcnt); 1920 assert (checkmax >= checkcnt);
1611 array_verify (EV_A_ (W *)checks, checkcnt); 1921 array_verify (EV_A_ (W *)checks, checkcnt);
1612 1922
1613# if 0 1923# if 0
1614 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)
1615 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1925 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1616# endif
1617#endif 1926# endif
1927#endif
1618} 1928}
1619 1929#endif
1620#endif /* multiplicity */
1621 1930
1622#if EV_MULTIPLICITY 1931#if EV_MULTIPLICITY
1623struct ev_loop * 1932struct ev_loop *
1624ev_default_loop_init (unsigned int flags) 1933ev_default_loop_init (unsigned int flags)
1625#else 1934#else
… …
1628#endif 1937#endif
1629{ 1938{
1630 if (!ev_default_loop_ptr) 1939 if (!ev_default_loop_ptr)
1631 { 1940 {
1632#if EV_MULTIPLICITY 1941#if EV_MULTIPLICITY
1633 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1942 EV_P = ev_default_loop_ptr = &default_loop_struct;
1634#else 1943#else
1635 ev_default_loop_ptr = 1; 1944 ev_default_loop_ptr = 1;
1636#endif 1945#endif
1637 1946
1638 loop_init (EV_A_ flags); 1947 loop_init (EV_A_ flags);
… …
1655 1964
1656void 1965void
1657ev_default_destroy (void) 1966ev_default_destroy (void)
1658{ 1967{
1659#if EV_MULTIPLICITY 1968#if EV_MULTIPLICITY
1660 struct ev_loop *loop = ev_default_loop_ptr; 1969 EV_P = ev_default_loop_ptr;
1661#endif 1970#endif
1971
1972 ev_default_loop_ptr = 0;
1662 1973
1663#ifndef _WIN32 1974#ifndef _WIN32
1664 ev_ref (EV_A); /* child watcher */ 1975 ev_ref (EV_A); /* child watcher */
1665 ev_signal_stop (EV_A_ &childev); 1976 ev_signal_stop (EV_A_ &childev);
1666#endif 1977#endif
… …
1670 1981
1671void 1982void
1672ev_default_fork (void) 1983ev_default_fork (void)
1673{ 1984{
1674#if EV_MULTIPLICITY 1985#if EV_MULTIPLICITY
1675 struct ev_loop *loop = ev_default_loop_ptr; 1986 EV_P = ev_default_loop_ptr;
1676#endif 1987#endif
1677 1988
1678 if (backend)
1679 postfork = 1; /* must be in line with ev_loop_fork */ 1989 postfork = 1; /* must be in line with ev_loop_fork */
1680} 1990}
1681 1991
1682/*****************************************************************************/ 1992/*****************************************************************************/
1683 1993
1684void 1994void
1685ev_invoke (EV_P_ void *w, int revents) 1995ev_invoke (EV_P_ void *w, int revents)
1686{ 1996{
1687 EV_CB_INVOKE ((W)w, revents); 1997 EV_CB_INVOKE ((W)w, revents);
1688} 1998}
1689 1999
1690void inline_speed 2000unsigned int
1691call_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)
1692{ 2014{
1693 int pri; 2015 int pri;
1694 2016
1695 for (pri = NUMPRI; pri--; ) 2017 for (pri = NUMPRI; pri--; )
1696 while (pendingcnt [pri]) 2018 while (pendingcnt [pri])
1697 { 2019 {
1698 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2020 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1699 2021
1700 if (expect_true (p->w))
1701 {
1702 /*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 */
1703 2024
1704 p->w->pending = 0; 2025 p->w->pending = 0;
1705 EV_CB_INVOKE (p->w, p->events); 2026 EV_CB_INVOKE (p->w, p->events);
1706 EV_FREQUENT_CHECK; 2027 EV_FREQUENT_CHECK;
1707 }
1708 } 2028 }
1709} 2029}
1710 2030
1711#if EV_IDLE_ENABLE 2031#if EV_IDLE_ENABLE
1712void inline_size 2032/* make idle watchers pending. this handles the "call-idle */
2033/* only when higher priorities are idle" logic */
2034inline_size void
1713idle_reify (EV_P) 2035idle_reify (EV_P)
1714{ 2036{
1715 if (expect_false (idleall)) 2037 if (expect_false (idleall))
1716 { 2038 {
1717 int pri; 2039 int pri;
… …
1729 } 2051 }
1730 } 2052 }
1731} 2053}
1732#endif 2054#endif
1733 2055
1734void inline_size 2056/* make timers pending */
2057inline_size void
1735timers_reify (EV_P) 2058timers_reify (EV_P)
1736{ 2059{
1737 EV_FREQUENT_CHECK; 2060 EV_FREQUENT_CHECK;
1738 2061
1739 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 2062 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1740 { 2063 {
1741 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 2064 do
1742
1743 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1744
1745 /* first reschedule or stop timer */
1746 if (w->repeat)
1747 { 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 {
1748 ev_at (w) += w->repeat; 2073 ev_at (w) += w->repeat;
1749 if (ev_at (w) < mn_now) 2074 if (ev_at (w) < mn_now)
1750 ev_at (w) = mn_now; 2075 ev_at (w) = mn_now;
1751 2076
1752 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.));
1753 2078
1754 ANHE_at_cache (timers [HEAP0]); 2079 ANHE_at_cache (timers [HEAP0]);
1755 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);
1756 } 2087 }
1757 else 2088 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1758 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1759 2089
1760 EV_FREQUENT_CHECK;
1761 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 2090 feed_reverse_done (EV_A_ EV_TIMEOUT);
1762 } 2091 }
1763} 2092}
1764 2093
1765#if EV_PERIODIC_ENABLE 2094#if EV_PERIODIC_ENABLE
1766void inline_size 2095/* make periodics pending */
2096inline_size void
1767periodics_reify (EV_P) 2097periodics_reify (EV_P)
1768{ 2098{
1769 EV_FREQUENT_CHECK; 2099 EV_FREQUENT_CHECK;
1770 2100
1771 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2101 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1772 { 2102 {
1773 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2103 int feed_count = 0;
1774 2104
1775 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 2105 do
1776
1777 /* first reschedule or stop timer */
1778 if (w->reschedule_cb)
1779 { 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 {
1780 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2114 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1781 2115
1782 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));
1783 2117
1784 ANHE_at_cache (periodics [HEAP0]); 2118 ANHE_at_cache (periodics [HEAP0]);
1785 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);
1786 } 2145 }
1787 else if (w->interval) 2146 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
1788 {
1789 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1790 /* if next trigger time is not sufficiently in the future, put it there */
1791 /* this might happen because of floating point inexactness */
1792 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1793 {
1794 ev_at (w) += w->interval;
1795 2147
1796 /* if interval is unreasonably low we might still have a time in the past */
1797 /* so correct this. this will make the periodic very inexact, but the user */
1798 /* has effectively asked to get triggered more often than possible */
1799 if (ev_at (w) < ev_rt_now)
1800 ev_at (w) = ev_rt_now;
1801 }
1802
1803 ANHE_at_cache (periodics [HEAP0]);
1804 downheap (periodics, periodiccnt, HEAP0);
1805 }
1806 else
1807 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1808
1809 EV_FREQUENT_CHECK;
1810 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 2148 feed_reverse_done (EV_A_ EV_PERIODIC);
1811 } 2149 }
1812} 2150}
1813 2151
2152/* simply recalculate all periodics */
2153/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1814static void noinline 2154static void noinline
1815periodics_reschedule (EV_P) 2155periodics_reschedule (EV_P)
1816{ 2156{
1817 int i; 2157 int i;
1818 2158
… …
1831 2171
1832 reheap (periodics, periodiccnt); 2172 reheap (periodics, periodiccnt);
1833} 2173}
1834#endif 2174#endif
1835 2175
1836void 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
1837time_update (EV_P_ ev_tstamp max_block) 2193time_update (EV_P_ ev_tstamp max_block)
1838{ 2194{
1839 int i;
1840
1841#if EV_USE_MONOTONIC 2195#if EV_USE_MONOTONIC
1842 if (expect_true (have_monotonic)) 2196 if (expect_true (have_monotonic))
1843 { 2197 {
2198 int i;
1844 ev_tstamp odiff = rtmn_diff; 2199 ev_tstamp odiff = rtmn_diff;
1845 2200
1846 mn_now = get_clock (); 2201 mn_now = get_clock ();
1847 2202
1848 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2203 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1874 ev_rt_now = ev_time (); 2229 ev_rt_now = ev_time ();
1875 mn_now = get_clock (); 2230 mn_now = get_clock ();
1876 now_floor = mn_now; 2231 now_floor = mn_now;
1877 } 2232 }
1878 2233
2234 /* no timer adjustment, as the monotonic clock doesn't jump */
2235 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1879# if EV_PERIODIC_ENABLE 2236# if EV_PERIODIC_ENABLE
1880 periodics_reschedule (EV_A); 2237 periodics_reschedule (EV_A);
1881# endif 2238# endif
1882 /* no timer adjustment, as the monotonic clock doesn't jump */
1883 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1884 } 2239 }
1885 else 2240 else
1886#endif 2241#endif
1887 { 2242 {
1888 ev_rt_now = ev_time (); 2243 ev_rt_now = ev_time ();
1889 2244
1890 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))
1891 { 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);
1892#if EV_PERIODIC_ENABLE 2249#if EV_PERIODIC_ENABLE
1893 periodics_reschedule (EV_A); 2250 periodics_reschedule (EV_A);
1894#endif 2251#endif
1895 /* adjust timers. this is easy, as the offset is the same for all of them */
1896 for (i = 0; i < timercnt; ++i)
1897 {
1898 ANHE *he = timers + i + HEAP0;
1899 ANHE_w (*he)->at += ev_rt_now - mn_now;
1900 ANHE_at_cache (*he);
1901 }
1902 } 2252 }
1903 2253
1904 mn_now = ev_rt_now; 2254 mn_now = ev_rt_now;
1905 } 2255 }
1906} 2256}
1907 2257
1908void 2258void
1909ev_ref (EV_P)
1910{
1911 ++activecnt;
1912}
1913
1914void
1915ev_unref (EV_P)
1916{
1917 --activecnt;
1918}
1919
1920void
1921ev_now_update (EV_P)
1922{
1923 time_update (EV_A_ 1e100);
1924}
1925
1926static int loop_done;
1927
1928void
1929ev_loop (EV_P_ int flags) 2259ev_loop (EV_P_ int flags)
1930{ 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
1931 loop_done = EVUNLOOP_CANCEL; 2267 loop_done = EVUNLOOP_CANCEL;
1932 2268
1933 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 */
1934 2270
1935 do 2271 do
1936 { 2272 {
1937#if EV_VERIFY >= 2 2273#if EV_VERIFY >= 2
1938 ev_loop_verify (EV_A); 2274 ev_loop_verify (EV_A);
… …
1951 /* we might have forked, so queue fork handlers */ 2287 /* we might have forked, so queue fork handlers */
1952 if (expect_false (postfork)) 2288 if (expect_false (postfork))
1953 if (forkcnt) 2289 if (forkcnt)
1954 { 2290 {
1955 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2291 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1956 call_pending (EV_A); 2292 EV_INVOKE_PENDING;
1957 } 2293 }
1958#endif 2294#endif
1959 2295
1960 /* queue prepare watchers (and execute them) */ 2296 /* queue prepare watchers (and execute them) */
1961 if (expect_false (preparecnt)) 2297 if (expect_false (preparecnt))
1962 { 2298 {
1963 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2299 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1964 call_pending (EV_A); 2300 EV_INVOKE_PENDING;
1965 } 2301 }
1966 2302
1967 if (expect_false (!activecnt)) 2303 if (expect_false (loop_done))
1968 break; 2304 break;
1969 2305
1970 /* we might have forked, so reify kernel state if necessary */ 2306 /* we might have forked, so reify kernel state if necessary */
1971 if (expect_false (postfork)) 2307 if (expect_false (postfork))
1972 loop_fork (EV_A); 2308 loop_fork (EV_A);
… …
1979 ev_tstamp waittime = 0.; 2315 ev_tstamp waittime = 0.;
1980 ev_tstamp sleeptime = 0.; 2316 ev_tstamp sleeptime = 0.;
1981 2317
1982 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2318 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1983 { 2319 {
2320 /* remember old timestamp for io_blocktime calculation */
2321 ev_tstamp prev_mn_now = mn_now;
2322
1984 /* update time to cancel out callback processing overhead */ 2323 /* update time to cancel out callback processing overhead */
1985 time_update (EV_A_ 1e100); 2324 time_update (EV_A_ 1e100);
1986 2325
1987 waittime = MAX_BLOCKTIME; 2326 waittime = MAX_BLOCKTIME;
1988 2327
… …
1998 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;
1999 if (waittime > to) waittime = to; 2338 if (waittime > to) waittime = to;
2000 } 2339 }
2001#endif 2340#endif
2002 2341
2342 /* don't let timeouts decrease the waittime below timeout_blocktime */
2003 if (expect_false (waittime < timeout_blocktime)) 2343 if (expect_false (waittime < timeout_blocktime))
2004 waittime = timeout_blocktime; 2344 waittime = timeout_blocktime;
2005 2345
2006 sleeptime = waittime - backend_fudge; 2346 /* extra check because io_blocktime is commonly 0 */
2007
2008 if (expect_true (sleeptime > io_blocktime)) 2347 if (expect_false (io_blocktime))
2009 sleeptime = io_blocktime;
2010
2011 if (sleeptime)
2012 { 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 {
2013 ev_sleep (sleeptime); 2356 ev_sleep (sleeptime);
2014 waittime -= sleeptime; 2357 waittime -= sleeptime;
2358 }
2015 } 2359 }
2016 } 2360 }
2017 2361
2362#if EV_MINIMAL < 2
2018 ++loop_count; 2363 ++loop_count;
2364#endif
2365 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2019 backend_poll (EV_A_ waittime); 2366 backend_poll (EV_A_ waittime);
2367 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2020 2368
2021 /* update ev_rt_now, do magic */ 2369 /* update ev_rt_now, do magic */
2022 time_update (EV_A_ waittime + sleeptime); 2370 time_update (EV_A_ waittime + sleeptime);
2023 } 2371 }
2024 2372
… …
2035 2383
2036 /* queue check watchers, to be executed first */ 2384 /* queue check watchers, to be executed first */
2037 if (expect_false (checkcnt)) 2385 if (expect_false (checkcnt))
2038 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2386 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2039 2387
2040 call_pending (EV_A); 2388 EV_INVOKE_PENDING;
2041 } 2389 }
2042 while (expect_true ( 2390 while (expect_true (
2043 activecnt 2391 activecnt
2044 && !loop_done 2392 && !loop_done
2045 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2393 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2046 )); 2394 ));
2047 2395
2048 if (loop_done == EVUNLOOP_ONE) 2396 if (loop_done == EVUNLOOP_ONE)
2049 loop_done = EVUNLOOP_CANCEL; 2397 loop_done = EVUNLOOP_CANCEL;
2398
2399#if EV_MINIMAL < 2
2400 --loop_depth;
2401#endif
2050} 2402}
2051 2403
2052void 2404void
2053ev_unloop (EV_P_ int how) 2405ev_unloop (EV_P_ int how)
2054{ 2406{
2055 loop_done = how; 2407 loop_done = how;
2056} 2408}
2057 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
2058/*****************************************************************************/ 2447/*****************************************************************************/
2448/* singly-linked list management, used when the expected list length is short */
2059 2449
2060void inline_size 2450inline_size void
2061wlist_add (WL *head, WL elem) 2451wlist_add (WL *head, WL elem)
2062{ 2452{
2063 elem->next = *head; 2453 elem->next = *head;
2064 *head = elem; 2454 *head = elem;
2065} 2455}
2066 2456
2067void inline_size 2457inline_size void
2068wlist_del (WL *head, WL elem) 2458wlist_del (WL *head, WL elem)
2069{ 2459{
2070 while (*head) 2460 while (*head)
2071 { 2461 {
2072 if (*head == elem) 2462 if (expect_true (*head == elem))
2073 { 2463 {
2074 *head = elem->next; 2464 *head = elem->next;
2075 return; 2465 break;
2076 } 2466 }
2077 2467
2078 head = &(*head)->next; 2468 head = &(*head)->next;
2079 } 2469 }
2080} 2470}
2081 2471
2082void inline_speed 2472/* internal, faster, version of ev_clear_pending */
2473inline_speed void
2083clear_pending (EV_P_ W w) 2474clear_pending (EV_P_ W w)
2084{ 2475{
2085 if (w->pending) 2476 if (w->pending)
2086 { 2477 {
2087 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2478 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2088 w->pending = 0; 2479 w->pending = 0;
2089 } 2480 }
2090} 2481}
2091 2482
2092int 2483int
… …
2096 int pending = w_->pending; 2487 int pending = w_->pending;
2097 2488
2098 if (expect_true (pending)) 2489 if (expect_true (pending))
2099 { 2490 {
2100 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2491 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2492 p->w = (W)&pending_w;
2101 w_->pending = 0; 2493 w_->pending = 0;
2102 p->w = 0;
2103 return p->events; 2494 return p->events;
2104 } 2495 }
2105 else 2496 else
2106 return 0; 2497 return 0;
2107} 2498}
2108 2499
2109void inline_size 2500inline_size void
2110pri_adjust (EV_P_ W w) 2501pri_adjust (EV_P_ W w)
2111{ 2502{
2112 int pri = w->priority; 2503 int pri = ev_priority (w);
2113 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2504 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2114 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2505 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2115 w->priority = pri; 2506 ev_set_priority (w, pri);
2116} 2507}
2117 2508
2118void inline_speed 2509inline_speed void
2119ev_start (EV_P_ W w, int active) 2510ev_start (EV_P_ W w, int active)
2120{ 2511{
2121 pri_adjust (EV_A_ w); 2512 pri_adjust (EV_A_ w);
2122 w->active = active; 2513 w->active = active;
2123 ev_ref (EV_A); 2514 ev_ref (EV_A);
2124} 2515}
2125 2516
2126void inline_size 2517inline_size void
2127ev_stop (EV_P_ W w) 2518ev_stop (EV_P_ W w)
2128{ 2519{
2129 ev_unref (EV_A); 2520 ev_unref (EV_A);
2130 w->active = 0; 2521 w->active = 0;
2131} 2522}
… …
2138 int fd = w->fd; 2529 int fd = w->fd;
2139 2530
2140 if (expect_false (ev_is_active (w))) 2531 if (expect_false (ev_is_active (w)))
2141 return; 2532 return;
2142 2533
2143 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))));
2144 2536
2145 EV_FREQUENT_CHECK; 2537 EV_FREQUENT_CHECK;
2146 2538
2147 ev_start (EV_A_ (W)w, 1); 2539 ev_start (EV_A_ (W)w, 1);
2148 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2540 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2149 wlist_add (&anfds[fd].head, (WL)w); 2541 wlist_add (&anfds[fd].head, (WL)w);
2150 2542
2151 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2543 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2152 w->events &= ~EV_IOFDSET; 2544 w->events &= ~EV__IOFDSET;
2153 2545
2154 EV_FREQUENT_CHECK; 2546 EV_FREQUENT_CHECK;
2155} 2547}
2156 2548
2157void noinline 2549void noinline
… …
2159{ 2551{
2160 clear_pending (EV_A_ (W)w); 2552 clear_pending (EV_A_ (W)w);
2161 if (expect_false (!ev_is_active (w))) 2553 if (expect_false (!ev_is_active (w)))
2162 return; 2554 return;
2163 2555
2164 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));
2165 2557
2166 EV_FREQUENT_CHECK; 2558 EV_FREQUENT_CHECK;
2167 2559
2168 wlist_del (&anfds[w->fd].head, (WL)w); 2560 wlist_del (&anfds[w->fd].head, (WL)w);
2169 ev_stop (EV_A_ (W)w); 2561 ev_stop (EV_A_ (W)w);
… …
2179 if (expect_false (ev_is_active (w))) 2571 if (expect_false (ev_is_active (w)))
2180 return; 2572 return;
2181 2573
2182 ev_at (w) += mn_now; 2574 ev_at (w) += mn_now;
2183 2575
2184 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.));
2185 2577
2186 EV_FREQUENT_CHECK; 2578 EV_FREQUENT_CHECK;
2187 2579
2188 ++timercnt; 2580 ++timercnt;
2189 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2581 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2192 ANHE_at_cache (timers [ev_active (w)]); 2584 ANHE_at_cache (timers [ev_active (w)]);
2193 upheap (timers, ev_active (w)); 2585 upheap (timers, ev_active (w));
2194 2586
2195 EV_FREQUENT_CHECK; 2587 EV_FREQUENT_CHECK;
2196 2588
2197 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2589 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2198} 2590}
2199 2591
2200void noinline 2592void noinline
2201ev_timer_stop (EV_P_ ev_timer *w) 2593ev_timer_stop (EV_P_ ev_timer *w)
2202{ 2594{
… …
2207 EV_FREQUENT_CHECK; 2599 EV_FREQUENT_CHECK;
2208 2600
2209 { 2601 {
2210 int active = ev_active (w); 2602 int active = ev_active (w);
2211 2603
2212 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2604 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2213 2605
2214 --timercnt; 2606 --timercnt;
2215 2607
2216 if (expect_true (active < timercnt + HEAP0)) 2608 if (expect_true (active < timercnt + HEAP0))
2217 { 2609 {
2218 timers [active] = timers [timercnt + HEAP0]; 2610 timers [active] = timers [timercnt + HEAP0];
2219 adjustheap (timers, timercnt, active); 2611 adjustheap (timers, timercnt, active);
2220 } 2612 }
2221 } 2613 }
2222 2614
2223 EV_FREQUENT_CHECK;
2224
2225 ev_at (w) -= mn_now; 2615 ev_at (w) -= mn_now;
2226 2616
2227 ev_stop (EV_A_ (W)w); 2617 ev_stop (EV_A_ (W)w);
2618
2619 EV_FREQUENT_CHECK;
2228} 2620}
2229 2621
2230void noinline 2622void noinline
2231ev_timer_again (EV_P_ ev_timer *w) 2623ev_timer_again (EV_P_ ev_timer *w)
2232{ 2624{
… …
2250 } 2642 }
2251 2643
2252 EV_FREQUENT_CHECK; 2644 EV_FREQUENT_CHECK;
2253} 2645}
2254 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
2255#if EV_PERIODIC_ENABLE 2653#if EV_PERIODIC_ENABLE
2256void noinline 2654void noinline
2257ev_periodic_start (EV_P_ ev_periodic *w) 2655ev_periodic_start (EV_P_ ev_periodic *w)
2258{ 2656{
2259 if (expect_false (ev_is_active (w))) 2657 if (expect_false (ev_is_active (w)))
… …
2261 2659
2262 if (w->reschedule_cb) 2660 if (w->reschedule_cb)
2263 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2661 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2264 else if (w->interval) 2662 else if (w->interval)
2265 { 2663 {
2266 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.));
2267 /* 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 */
2268 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;
2269 } 2667 }
2270 else 2668 else
2271 ev_at (w) = w->offset; 2669 ev_at (w) = w->offset;
… …
2279 ANHE_at_cache (periodics [ev_active (w)]); 2677 ANHE_at_cache (periodics [ev_active (w)]);
2280 upheap (periodics, ev_active (w)); 2678 upheap (periodics, ev_active (w));
2281 2679
2282 EV_FREQUENT_CHECK; 2680 EV_FREQUENT_CHECK;
2283 2681
2284 /*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));*/
2285} 2683}
2286 2684
2287void noinline 2685void noinline
2288ev_periodic_stop (EV_P_ ev_periodic *w) 2686ev_periodic_stop (EV_P_ ev_periodic *w)
2289{ 2687{
… …
2294 EV_FREQUENT_CHECK; 2692 EV_FREQUENT_CHECK;
2295 2693
2296 { 2694 {
2297 int active = ev_active (w); 2695 int active = ev_active (w);
2298 2696
2299 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2697 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2300 2698
2301 --periodiccnt; 2699 --periodiccnt;
2302 2700
2303 if (expect_true (active < periodiccnt + HEAP0)) 2701 if (expect_true (active < periodiccnt + HEAP0))
2304 { 2702 {
2305 periodics [active] = periodics [periodiccnt + HEAP0]; 2703 periodics [active] = periodics [periodiccnt + HEAP0];
2306 adjustheap (periodics, periodiccnt, active); 2704 adjustheap (periodics, periodiccnt, active);
2307 } 2705 }
2308 } 2706 }
2309 2707
2310 EV_FREQUENT_CHECK;
2311
2312 ev_stop (EV_A_ (W)w); 2708 ev_stop (EV_A_ (W)w);
2709
2710 EV_FREQUENT_CHECK;
2313} 2711}
2314 2712
2315void noinline 2713void noinline
2316ev_periodic_again (EV_P_ ev_periodic *w) 2714ev_periodic_again (EV_P_ ev_periodic *w)
2317{ 2715{
… …
2326#endif 2724#endif
2327 2725
2328void noinline 2726void noinline
2329ev_signal_start (EV_P_ ev_signal *w) 2727ev_signal_start (EV_P_ ev_signal *w)
2330{ 2728{
2331#if EV_MULTIPLICITY
2332 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2333#endif
2334 if (expect_false (ev_is_active (w))) 2729 if (expect_false (ev_is_active (w)))
2335 return; 2730 return;
2336 2731
2337 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));
2338 2733
2339 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));
2340 2737
2341 EV_FREQUENT_CHECK; 2738 signals [w->signum - 1].loop = EV_A;
2739#endif
2342 2740
2741 EV_FREQUENT_CHECK;
2742
2743#if EV_USE_SIGNALFD
2744 if (sigfd == -2)
2343 { 2745 {
2344#ifndef _WIN32 2746 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2345 sigset_t full, prev; 2747 if (sigfd < 0 && errno == EINVAL)
2346 sigfillset (&full); 2748 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2347 sigprocmask (SIG_SETMASK, &full, &prev);
2348#endif
2349 2749
2350 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2750 if (sigfd >= 0)
2751 {
2752 fd_intern (sigfd); /* doing it twice will not hurt */
2351 2753
2352#ifndef _WIN32 2754 sigemptyset (&sigfd_set);
2353 sigprocmask (SIG_SETMASK, &prev, 0); 2755
2354#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 }
2355 } 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
2356 2772
2357 ev_start (EV_A_ (W)w, 1); 2773 ev_start (EV_A_ (W)w, 1);
2358 wlist_add (&signals [w->signum - 1].head, (WL)w); 2774 wlist_add (&signals [w->signum - 1].head, (WL)w);
2359 2775
2360 if (!((WL)w)->next) 2776 if (!((WL)w)->next)
2777# if EV_USE_SIGNALFD
2778 if (sigfd < 0) /*TODO*/
2779# endif
2361 { 2780 {
2362#if _WIN32 2781# ifdef _WIN32
2782 evpipe_init (EV_A);
2783
2363 signal (w->signum, ev_sighandler); 2784 signal (w->signum, ev_sighandler);
2364#else 2785# else
2365 struct sigaction sa; 2786 struct sigaction sa;
2787
2788 evpipe_init (EV_A);
2789
2366 sa.sa_handler = ev_sighandler; 2790 sa.sa_handler = ev_sighandler;
2367 sigfillset (&sa.sa_mask); 2791 sigfillset (&sa.sa_mask);
2368 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 */
2369 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);
2370#endif 2798#endif
2371 } 2799 }
2372 2800
2373 EV_FREQUENT_CHECK; 2801 EV_FREQUENT_CHECK;
2374} 2802}
2375 2803
2376void noinline 2804void noinline
… …
2384 2812
2385 wlist_del (&signals [w->signum - 1].head, (WL)w); 2813 wlist_del (&signals [w->signum - 1].head, (WL)w);
2386 ev_stop (EV_A_ (W)w); 2814 ev_stop (EV_A_ (W)w);
2387 2815
2388 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
2389 signal (w->signum, SIG_DFL); 2835 signal (w->signum, SIG_DFL);
2836 }
2390 2837
2391 EV_FREQUENT_CHECK; 2838 EV_FREQUENT_CHECK;
2392} 2839}
2393 2840
2394void 2841void
2395ev_child_start (EV_P_ ev_child *w) 2842ev_child_start (EV_P_ ev_child *w)
2396{ 2843{
2397#if EV_MULTIPLICITY 2844#if EV_MULTIPLICITY
2398 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));
2399#endif 2846#endif
2400 if (expect_false (ev_is_active (w))) 2847 if (expect_false (ev_is_active (w)))
2401 return; 2848 return;
2402 2849
2403 EV_FREQUENT_CHECK; 2850 EV_FREQUENT_CHECK;
… …
2428# ifdef _WIN32 2875# ifdef _WIN32
2429# undef lstat 2876# undef lstat
2430# define lstat(a,b) _stati64 (a,b) 2877# define lstat(a,b) _stati64 (a,b)
2431# endif 2878# endif
2432 2879
2433#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 */
2434#define MIN_STAT_INTERVAL 0.1074891 2882#define MIN_STAT_INTERVAL 0.1074891
2435 2883
2436static 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);
2437 2885
2438#if EV_USE_INOTIFY 2886#if EV_USE_INOTIFY
2439# 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)
2440 2890
2441static void noinline 2891static void noinline
2442infy_add (EV_P_ ev_stat *w) 2892infy_add (EV_P_ ev_stat *w)
2443{ 2893{
2444 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);
2445 2895
2446 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 */
2447 { 2916 }
2448 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;
2449 2921
2450 /* monitor some parent directory for speedup hints */ 2922 /* if path is not there, monitor some parent directory for speedup hints */
2451 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2923 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2452 /* but an efficiency issue only */ 2924 /* but an efficiency issue only */
2453 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2925 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2454 { 2926 {
2455 char path [4096]; 2927 char path [4096];
2456 strcpy (path, w->path); 2928 strcpy (path, w->path);
… …
2460 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2932 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2461 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2933 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2462 2934
2463 char *pend = strrchr (path, '/'); 2935 char *pend = strrchr (path, '/');
2464 2936
2465 if (!pend) 2937 if (!pend || pend == path)
2466 break; /* whoops, no '/', complain to your admin */ 2938 break;
2467 2939
2468 *pend = 0; 2940 *pend = 0;
2469 w->wd = inotify_add_watch (fs_fd, path, mask); 2941 w->wd = inotify_add_watch (fs_fd, path, mask);
2470 } 2942 }
2471 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2943 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2472 } 2944 }
2473 } 2945 }
2474 else
2475 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2476 2946
2477 if (w->wd >= 0) 2947 if (w->wd >= 0)
2478 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);
2479} 2954}
2480 2955
2481static void noinline 2956static void noinline
2482infy_del (EV_P_ ev_stat *w) 2957infy_del (EV_P_ ev_stat *w)
2483{ 2958{
… …
2513 2988
2514 if (w->wd == wd || wd == -1) 2989 if (w->wd == wd || wd == -1)
2515 { 2990 {
2516 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2991 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2517 { 2992 {
2993 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2518 w->wd = -1; 2994 w->wd = -1;
2519 infy_add (EV_A_ w); /* re-add, no matter what */ 2995 infy_add (EV_A_ w); /* re-add, no matter what */
2520 } 2996 }
2521 2997
2522 stat_timer_cb (EV_A_ &w->timer, 0); 2998 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2527 3003
2528static void 3004static void
2529infy_cb (EV_P_ ev_io *w, int revents) 3005infy_cb (EV_P_ ev_io *w, int revents)
2530{ 3006{
2531 char buf [EV_INOTIFY_BUFSIZE]; 3007 char buf [EV_INOTIFY_BUFSIZE];
2532 struct inotify_event *ev = (struct inotify_event *)buf;
2533 int ofs; 3008 int ofs;
2534 int len = read (fs_fd, buf, sizeof (buf)); 3009 int len = read (fs_fd, buf, sizeof (buf));
2535 3010
2536 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);
2537 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 }
2538} 3017}
2539 3018
2540void inline_size 3019inline_size unsigned int
2541infy_init (EV_P) 3020ev_linux_version (void)
2542{ 3021{
2543 if (fs_fd != -2) 3022 struct utsname buf;
3023 unsigned int v;
3024 int i;
3025 char *p = buf.release;
3026
3027 if (uname (&buf))
2544 return; 3028 return 0;
2545 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{
2546 /* kernels < 2.6.25 are borked 3054 /* kernels < 2.6.25 are borked
2547 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3055 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2548 */ 3056 */
2549 { 3057 if (ev_linux_version () < 0x020619)
2550 struct utsname buf; 3058 return;
2551 int major, minor, micro;
2552 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
3075infy_init (EV_P)
3076{
3077 if (fs_fd != -2)
3078 return;
3079
2553 fs_fd = -1; 3080 fs_fd = -1;
2554 3081
2555 if (uname (&buf)) 3082 ev_check_2625 (EV_A);
2556 return;
2557 3083
2558 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2559 return;
2560
2561 if (major < 2
2562 || (major == 2 && minor < 6)
2563 || (major == 2 && minor == 6 && micro < 25))
2564 return;
2565 }
2566
2567 fs_fd = inotify_init (); 3084 fs_fd = infy_newfd ();
2568 3085
2569 if (fs_fd >= 0) 3086 if (fs_fd >= 0)
2570 { 3087 {
3088 fd_intern (fs_fd);
2571 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3089 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2572 ev_set_priority (&fs_w, EV_MAXPRI); 3090 ev_set_priority (&fs_w, EV_MAXPRI);
2573 ev_io_start (EV_A_ &fs_w); 3091 ev_io_start (EV_A_ &fs_w);
3092 ev_unref (EV_A);
2574 } 3093 }
2575} 3094}
2576 3095
2577void inline_size 3096inline_size void
2578infy_fork (EV_P) 3097infy_fork (EV_P)
2579{ 3098{
2580 int slot; 3099 int slot;
2581 3100
2582 if (fs_fd < 0) 3101 if (fs_fd < 0)
2583 return; 3102 return;
2584 3103
3104 ev_ref (EV_A);
3105 ev_io_stop (EV_A_ &fs_w);
2585 close (fs_fd); 3106 close (fs_fd);
2586 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 }
2587 3116
2588 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3117 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2589 { 3118 {
2590 WL w_ = fs_hash [slot].head; 3119 WL w_ = fs_hash [slot].head;
2591 fs_hash [slot].head = 0; 3120 fs_hash [slot].head = 0;
… …
2598 w->wd = -1; 3127 w->wd = -1;
2599 3128
2600 if (fs_fd >= 0) 3129 if (fs_fd >= 0)
2601 infy_add (EV_A_ w); /* re-add, no matter what */ 3130 infy_add (EV_A_ w); /* re-add, no matter what */
2602 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);
2603 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 }
2604 } 3138 }
2605 } 3139 }
2606} 3140}
2607 3141
2608#endif 3142#endif
… …
2625static void noinline 3159static void noinline
2626stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3160stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2627{ 3161{
2628 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3162 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2629 3163
2630 /* we copy this here each the time so that */ 3164 ev_statdata prev = w->attr;
2631 /* prev has the old value when the callback gets invoked */
2632 w->prev = w->attr;
2633 ev_stat_stat (EV_A_ w); 3165 ev_stat_stat (EV_A_ w);
2634 3166
2635 /* 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 */
2636 if ( 3168 if (
2637 w->prev.st_dev != w->attr.st_dev 3169 prev.st_dev != w->attr.st_dev
2638 || w->prev.st_ino != w->attr.st_ino 3170 || prev.st_ino != w->attr.st_ino
2639 || w->prev.st_mode != w->attr.st_mode 3171 || prev.st_mode != w->attr.st_mode
2640 || w->prev.st_nlink != w->attr.st_nlink 3172 || prev.st_nlink != w->attr.st_nlink
2641 || w->prev.st_uid != w->attr.st_uid 3173 || prev.st_uid != w->attr.st_uid
2642 || w->prev.st_gid != w->attr.st_gid 3174 || prev.st_gid != w->attr.st_gid
2643 || w->prev.st_rdev != w->attr.st_rdev 3175 || prev.st_rdev != w->attr.st_rdev
2644 || w->prev.st_size != w->attr.st_size 3176 || prev.st_size != w->attr.st_size
2645 || w->prev.st_atime != w->attr.st_atime 3177 || prev.st_atime != w->attr.st_atime
2646 || w->prev.st_mtime != w->attr.st_mtime 3178 || prev.st_mtime != w->attr.st_mtime
2647 || w->prev.st_ctime != w->attr.st_ctime 3179 || prev.st_ctime != w->attr.st_ctime
2648 ) { 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
2649 #if EV_USE_INOTIFY 3186 #if EV_USE_INOTIFY
2650 if (fs_fd >= 0) 3187 if (fs_fd >= 0)
2651 { 3188 {
2652 infy_del (EV_A_ w); 3189 infy_del (EV_A_ w);
2653 infy_add (EV_A_ w); 3190 infy_add (EV_A_ w);
… …
2663ev_stat_start (EV_P_ ev_stat *w) 3200ev_stat_start (EV_P_ ev_stat *w)
2664{ 3201{
2665 if (expect_false (ev_is_active (w))) 3202 if (expect_false (ev_is_active (w)))
2666 return; 3203 return;
2667 3204
2668 /* since we use memcmp, we need to clear any padding data etc. */
2669 memset (&w->prev, 0, sizeof (ev_statdata));
2670 memset (&w->attr, 0, sizeof (ev_statdata));
2671
2672 ev_stat_stat (EV_A_ w); 3205 ev_stat_stat (EV_A_ w);
2673 3206
3207 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2674 if (w->interval < MIN_STAT_INTERVAL) 3208 w->interval = MIN_STAT_INTERVAL;
2675 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2676 3209
2677 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);
2678 ev_set_priority (&w->timer, ev_priority (w)); 3211 ev_set_priority (&w->timer, ev_priority (w));
2679 3212
2680#if EV_USE_INOTIFY 3213#if EV_USE_INOTIFY
2681 infy_init (EV_A); 3214 infy_init (EV_A);
2682 3215
2683 if (fs_fd >= 0) 3216 if (fs_fd >= 0)
2684 infy_add (EV_A_ w); 3217 infy_add (EV_A_ w);
2685 else 3218 else
2686#endif 3219#endif
3220 {
2687 ev_timer_start (EV_A_ &w->timer); 3221 ev_timer_again (EV_A_ &w->timer);
3222 ev_unref (EV_A);
3223 }
2688 3224
2689 ev_start (EV_A_ (W)w, 1); 3225 ev_start (EV_A_ (W)w, 1);
2690 3226
2691 EV_FREQUENT_CHECK; 3227 EV_FREQUENT_CHECK;
2692} 3228}
… …
2701 EV_FREQUENT_CHECK; 3237 EV_FREQUENT_CHECK;
2702 3238
2703#if EV_USE_INOTIFY 3239#if EV_USE_INOTIFY
2704 infy_del (EV_A_ w); 3240 infy_del (EV_A_ w);
2705#endif 3241#endif
3242
3243 if (ev_is_active (&w->timer))
3244 {
3245 ev_ref (EV_A);
2706 ev_timer_stop (EV_A_ &w->timer); 3246 ev_timer_stop (EV_A_ &w->timer);
3247 }
2707 3248
2708 ev_stop (EV_A_ (W)w); 3249 ev_stop (EV_A_ (W)w);
2709 3250
2710 EV_FREQUENT_CHECK; 3251 EV_FREQUENT_CHECK;
2711} 3252}
… …
2852embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3393embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2853{ 3394{
2854 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3395 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2855 3396
2856 { 3397 {
2857 struct ev_loop *loop = w->other; 3398 EV_P = w->other;
2858 3399
2859 while (fdchangecnt) 3400 while (fdchangecnt)
2860 { 3401 {
2861 fd_reify (EV_A); 3402 fd_reify (EV_A);
2862 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3403 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
2867static void 3408static void
2868embed_fork_cb (EV_P_ ev_fork *fork_w, int revents) 3409embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2869{ 3410{
2870 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3411 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2871 3412
3413 ev_embed_stop (EV_A_ w);
3414
2872 { 3415 {
2873 struct ev_loop *loop = w->other; 3416 EV_P = w->other;
2874 3417
2875 ev_loop_fork (EV_A); 3418 ev_loop_fork (EV_A);
3419 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2876 } 3420 }
3421
3422 ev_embed_start (EV_A_ w);
2877} 3423}
2878 3424
2879#if 0 3425#if 0
2880static void 3426static void
2881embed_idle_cb (EV_P_ ev_idle *idle, int revents) 3427embed_idle_cb (EV_P_ ev_idle *idle, int revents)
… …
2889{ 3435{
2890 if (expect_false (ev_is_active (w))) 3436 if (expect_false (ev_is_active (w)))
2891 return; 3437 return;
2892 3438
2893 { 3439 {
2894 struct ev_loop *loop = w->other; 3440 EV_P = w->other;
2895 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 ()));
2896 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);
2897 } 3443 }
2898 3444
2899 EV_FREQUENT_CHECK; 3445 EV_FREQUENT_CHECK;
2900 3446
… …
2926 3472
2927 ev_io_stop (EV_A_ &w->io); 3473 ev_io_stop (EV_A_ &w->io);
2928 ev_prepare_stop (EV_A_ &w->prepare); 3474 ev_prepare_stop (EV_A_ &w->prepare);
2929 ev_fork_stop (EV_A_ &w->fork); 3475 ev_fork_stop (EV_A_ &w->fork);
2930 3476
3477 ev_stop (EV_A_ (W)w);
3478
2931 EV_FREQUENT_CHECK; 3479 EV_FREQUENT_CHECK;
2932} 3480}
2933#endif 3481#endif
2934 3482
2935#if EV_FORK_ENABLE 3483#if EV_FORK_ENABLE
… …
3011 3559
3012void 3560void
3013ev_async_send (EV_P_ ev_async *w) 3561ev_async_send (EV_P_ ev_async *w)
3014{ 3562{
3015 w->sent = 1; 3563 w->sent = 1;
3016 evpipe_write (EV_A_ &gotasync); 3564 evpipe_write (EV_A_ &async_pending);
3017} 3565}
3018#endif 3566#endif
3019 3567
3020/*****************************************************************************/ 3568/*****************************************************************************/
3021 3569
… …
3083 ev_timer_set (&once->to, timeout, 0.); 3631 ev_timer_set (&once->to, timeout, 0.);
3084 ev_timer_start (EV_A_ &once->to); 3632 ev_timer_start (EV_A_ &once->to);
3085 } 3633 }
3086} 3634}
3087 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
3088#if EV_MULTIPLICITY 3744#if EV_MULTIPLICITY
3089 #include "ev_wrap.h" 3745 #include "ev_wrap.h"
3090#endif 3746#endif
3091 3747
3092#ifdef __cplusplus 3748#ifdef __cplusplus

Diff Legend

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