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

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

Diff Legend

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