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

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

Diff Legend

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