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

Comparing libev/ev.c (file contents):
Revision 1.253 by root, Sat May 31 03:13:27 2008 UTC vs.
Revision 1.334 by root, Tue Mar 9 09:00:59 2010 UTC

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

Diff Legend

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