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

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

Diff Legend

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