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

Comparing libev/ev.c (file contents):
Revision 1.254 by root, Wed Jun 4 20:26:55 2008 UTC vs.
Revision 1.331 by root, Tue Mar 9 08:55:03 2010 UTC

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

Diff Legend

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