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

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

Diff Legend

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