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

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

Diff Legend

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