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

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

Diff Legend

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