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

Comparing libev/ev.c (file contents):
Revision 1.148 by root, Tue Nov 27 11:11:13 2007 UTC vs.
Revision 1.206 by root, Fri Jan 25 15:45:08 2008 UTC

2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007 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 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * modification, are permitted provided that the following conditions are 8 * tion, are permitted provided that the following conditions are met:
9 * met: 9 *
10 * 1. Redistributions of source code must retain the above copyright notice,
11 * this list of conditions and the following disclaimer.
12 *
13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution.
16 *
17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
22 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
23 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
24 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
25 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
26 * OF THE POSSIBILITY OF SUCH DAMAGE.
10 * 27 *
11 * * Redistributions of source code must retain the above copyright 28 * Alternatively, the contents of this file may be used under the terms of
12 * notice, this list of conditions and the following disclaimer. 29 * the GNU General Public License ("GPL") version 2 or any later version,
13 * 30 * in which case the provisions of the GPL are applicable instead of
14 * * Redistributions in binary form must reproduce the above 31 * the above. If you wish to allow the use of your version of this file
15 * copyright notice, this list of conditions and the following 32 * only under the terms of the GPL and not to allow others to use your
16 * disclaimer in the documentation and/or other materials provided 33 * version of this file under the BSD license, indicate your decision
17 * with the distribution. 34 * by deleting the provisions above and replace them with the notice
18 * 35 * and other provisions required by the GPL. If you do not delete the
19 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 36 * provisions above, a recipient may use your version of this file under
20 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 37 * either the BSD or the GPL.
21 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
22 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
23 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
24 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 38 */
31 39
32#ifdef __cplusplus 40#ifdef __cplusplus
33extern "C" { 41extern "C" {
34#endif 42#endif
51# ifndef EV_USE_MONOTONIC 59# ifndef EV_USE_MONOTONIC
52# define EV_USE_MONOTONIC 0 60# define EV_USE_MONOTONIC 0
53# endif 61# endif
54# ifndef EV_USE_REALTIME 62# ifndef EV_USE_REALTIME
55# define EV_USE_REALTIME 0 63# define EV_USE_REALTIME 0
64# endif
65# endif
66
67# ifndef EV_USE_NANOSLEEP
68# if HAVE_NANOSLEEP
69# define EV_USE_NANOSLEEP 1
70# else
71# define EV_USE_NANOSLEEP 0
56# endif 72# endif
57# endif 73# endif
58 74
59# ifndef EV_USE_SELECT 75# ifndef EV_USE_SELECT
60# if HAVE_SELECT && HAVE_SYS_SELECT_H 76# if HAVE_SELECT && HAVE_SYS_SELECT_H
94# else 110# else
95# define EV_USE_PORT 0 111# define EV_USE_PORT 0
96# endif 112# endif
97# endif 113# endif
98 114
115# ifndef EV_USE_INOTIFY
116# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
117# define EV_USE_INOTIFY 1
118# else
119# define EV_USE_INOTIFY 0
120# endif
121# endif
122
99#endif 123#endif
100 124
101#include <math.h> 125#include <math.h>
102#include <stdlib.h> 126#include <stdlib.h>
103#include <fcntl.h> 127#include <fcntl.h>
109#include <errno.h> 133#include <errno.h>
110#include <sys/types.h> 134#include <sys/types.h>
111#include <time.h> 135#include <time.h>
112 136
113#include <signal.h> 137#include <signal.h>
138
139#ifdef EV_H
140# include EV_H
141#else
142# include "ev.h"
143#endif
114 144
115#ifndef _WIN32 145#ifndef _WIN32
116# include <sys/time.h> 146# include <sys/time.h>
117# include <sys/wait.h> 147# include <sys/wait.h>
118# include <unistd.h> 148# include <unistd.h>
132 162
133#ifndef EV_USE_REALTIME 163#ifndef EV_USE_REALTIME
134# define EV_USE_REALTIME 0 164# define EV_USE_REALTIME 0
135#endif 165#endif
136 166
167#ifndef EV_USE_NANOSLEEP
168# define EV_USE_NANOSLEEP 0
169#endif
170
137#ifndef EV_USE_SELECT 171#ifndef EV_USE_SELECT
138# define EV_USE_SELECT 1 172# define EV_USE_SELECT 1
139#endif 173#endif
140 174
141#ifndef EV_USE_POLL 175#ifndef EV_USE_POLL
156 190
157#ifndef EV_USE_PORT 191#ifndef EV_USE_PORT
158# define EV_USE_PORT 0 192# define EV_USE_PORT 0
159#endif 193#endif
160 194
195#ifndef EV_USE_INOTIFY
196# define EV_USE_INOTIFY 0
197#endif
198
199#ifndef EV_PID_HASHSIZE
200# if EV_MINIMAL
201# define EV_PID_HASHSIZE 1
202# else
203# define EV_PID_HASHSIZE 16
204# endif
205#endif
206
207#ifndef EV_INOTIFY_HASHSIZE
208# if EV_MINIMAL
209# define EV_INOTIFY_HASHSIZE 1
210# else
211# define EV_INOTIFY_HASHSIZE 16
212# endif
213#endif
214
161/**/ 215/**/
162 216
163#ifndef CLOCK_MONOTONIC 217#ifndef CLOCK_MONOTONIC
164# undef EV_USE_MONOTONIC 218# undef EV_USE_MONOTONIC
165# define EV_USE_MONOTONIC 0 219# define EV_USE_MONOTONIC 0
168#ifndef CLOCK_REALTIME 222#ifndef CLOCK_REALTIME
169# undef EV_USE_REALTIME 223# undef EV_USE_REALTIME
170# define EV_USE_REALTIME 0 224# define EV_USE_REALTIME 0
171#endif 225#endif
172 226
227#if !EV_STAT_ENABLE
228# undef EV_USE_INOTIFY
229# define EV_USE_INOTIFY 0
230#endif
231
232#if !EV_USE_NANOSLEEP
233# ifndef _WIN32
234# include <sys/select.h>
235# endif
236#endif
237
238#if EV_USE_INOTIFY
239# include <sys/inotify.h>
240#endif
241
173#if EV_SELECT_IS_WINSOCKET 242#if EV_SELECT_IS_WINSOCKET
174# include <winsock.h> 243# include <winsock.h>
175#endif 244#endif
176 245
177/**/ 246/**/
178 247
248/*
249 * This is used to avoid floating point rounding problems.
250 * It is added to ev_rt_now when scheduling periodics
251 * to ensure progress, time-wise, even when rounding
252 * errors are against us.
253 * This value is good at least till the year 4000.
254 * Better solutions welcome.
255 */
256#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
257
179#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 258#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
180#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 259#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
181#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
182/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */ 260/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
183 261
184#ifdef EV_H
185# include EV_H
186#else
187# include "ev.h"
188#endif
189
190#if __GNUC__ >= 3 262#if __GNUC__ >= 4
191# define expect(expr,value) __builtin_expect ((expr),(value)) 263# define expect(expr,value) __builtin_expect ((expr),(value))
192# define inline_size static inline /* inline for codesize */
193# if EV_MINIMAL
194# define noinline __attribute__ ((noinline)) 264# define noinline __attribute__ ((noinline))
195# define inline_speed static noinline
196# else
197# define noinline
198# define inline_speed static inline
199# endif
200#else 265#else
201# define expect(expr,value) (expr) 266# define expect(expr,value) (expr)
202# define inline_speed static
203# define inline_size static
204# define noinline 267# define noinline
268# if __STDC_VERSION__ < 199901L
269# define inline
270# endif
205#endif 271#endif
206 272
207#define expect_false(expr) expect ((expr) != 0, 0) 273#define expect_false(expr) expect ((expr) != 0, 0)
208#define expect_true(expr) expect ((expr) != 0, 1) 274#define expect_true(expr) expect ((expr) != 0, 1)
275#define inline_size static inline
276
277#if EV_MINIMAL
278# define inline_speed static noinline
279#else
280# define inline_speed static inline
281#endif
209 282
210#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 283#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
211#define ABSPRI(w) ((w)->priority - EV_MINPRI) 284#define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
212 285
213#define EMPTY0 /* required for microsofts broken pseudo-c compiler */ 286#define EMPTY /* required for microsofts broken pseudo-c compiler */
214#define EMPTY2(a,b) /* used to suppress some warnings */ 287#define EMPTY2(a,b) /* used to suppress some warnings */
215 288
216typedef ev_watcher *W; 289typedef ev_watcher *W;
217typedef ev_watcher_list *WL; 290typedef ev_watcher_list *WL;
218typedef ev_watcher_time *WT; 291typedef ev_watcher_time *WT;
219 292
293#if EV_USE_MONOTONIC
294/* 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 */
220static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 296static sig_atomic_t have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
297#endif
221 298
222#ifdef _WIN32 299#ifdef _WIN32
223# include "ev_win32.c" 300# include "ev_win32.c"
224#endif 301#endif
225 302
254ev_set_allocator (void *(*cb)(void *ptr, long size)) 331ev_set_allocator (void *(*cb)(void *ptr, long size))
255{ 332{
256 alloc = cb; 333 alloc = cb;
257} 334}
258 335
259static void * 336inline_speed void *
260ev_realloc (void *ptr, long size) 337ev_realloc (void *ptr, long size)
261{ 338{
262 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 339 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size);
263 340
264 if (!ptr && size) 341 if (!ptr && size)
288typedef struct 365typedef struct
289{ 366{
290 W w; 367 W w;
291 int events; 368 int events;
292} ANPENDING; 369} ANPENDING;
370
371#if EV_USE_INOTIFY
372typedef struct
373{
374 WL head;
375} ANFS;
376#endif
293 377
294#if EV_MULTIPLICITY 378#if EV_MULTIPLICITY
295 379
296 struct ev_loop 380 struct ev_loop
297 { 381 {
354{ 438{
355 return ev_rt_now; 439 return ev_rt_now;
356} 440}
357#endif 441#endif
358 442
359#define array_roundsize(type,n) (((n) | 4) & ~3) 443void
444ev_sleep (ev_tstamp delay)
445{
446 if (delay > 0.)
447 {
448#if EV_USE_NANOSLEEP
449 struct timespec ts;
450
451 ts.tv_sec = (time_t)delay;
452 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
453
454 nanosleep (&ts, 0);
455#elif defined(_WIN32)
456 Sleep (delay * 1e3);
457#else
458 struct timeval tv;
459
460 tv.tv_sec = (time_t)delay;
461 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
462
463 select (0, 0, 0, 0, &tv);
464#endif
465 }
466}
467
468/*****************************************************************************/
469
470int inline_size
471array_nextsize (int elem, int cur, int cnt)
472{
473 int ncur = cur + 1;
474
475 do
476 ncur <<= 1;
477 while (cnt > ncur);
478
479 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */
480 if (elem * ncur > 4096)
481 {
482 ncur *= elem;
483 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095;
484 ncur = ncur - sizeof (void *) * 4;
485 ncur /= elem;
486 }
487
488 return ncur;
489}
490
491static noinline void *
492array_realloc (int elem, void *base, int *cur, int cnt)
493{
494 *cur = array_nextsize (elem, *cur, cnt);
495 return ev_realloc (base, elem * *cur);
496}
360 497
361#define array_needsize(type,base,cur,cnt,init) \ 498#define array_needsize(type,base,cur,cnt,init) \
362 if (expect_false ((cnt) > cur)) \ 499 if (expect_false ((cnt) > (cur))) \
363 { \ 500 { \
364 int newcnt = cur; \ 501 int ocur_ = (cur); \
365 do \ 502 (base) = (type *)array_realloc \
366 { \ 503 (sizeof (type), (base), &(cur), (cnt)); \
367 newcnt = array_roundsize (type, newcnt << 1); \ 504 init ((base) + (ocur_), (cur) - ocur_); \
368 } \
369 while ((cnt) > newcnt); \
370 \
371 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
372 init (base + cur, newcnt - cur); \
373 cur = newcnt; \
374 } 505 }
375 506
507#if 0
376#define array_slim(type,stem) \ 508#define array_slim(type,stem) \
377 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 509 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
378 { \ 510 { \
379 stem ## max = array_roundsize (stem ## cnt >> 1); \ 511 stem ## max = array_roundsize (stem ## cnt >> 1); \
380 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 512 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
381 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 513 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
382 } 514 }
515#endif
383 516
384#define array_free(stem, idx) \ 517#define array_free(stem, idx) \
385 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 518 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
386 519
387/*****************************************************************************/ 520/*****************************************************************************/
388 521
389void noinline 522void noinline
390ev_feed_event (EV_P_ void *w, int revents) 523ev_feed_event (EV_P_ void *w, int revents)
391{ 524{
392 W w_ = (W)w; 525 W w_ = (W)w;
526 int pri = ABSPRI (w_);
393 527
394 if (expect_false (w_->pending)) 528 if (expect_false (w_->pending))
529 pendings [pri][w_->pending - 1].events |= revents;
530 else
395 { 531 {
532 w_->pending = ++pendingcnt [pri];
533 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
534 pendings [pri][w_->pending - 1].w = w_;
396 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 535 pendings [pri][w_->pending - 1].events = revents;
397 return;
398 } 536 }
399
400 w_->pending = ++pendingcnt [ABSPRI (w_)];
401 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
402 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
403 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
404} 537}
405 538
406void inline_size 539void inline_speed
407queue_events (EV_P_ W *events, int eventcnt, int type) 540queue_events (EV_P_ W *events, int eventcnt, int type)
408{ 541{
409 int i; 542 int i;
410 543
411 for (i = 0; i < eventcnt; ++i) 544 for (i = 0; i < eventcnt; ++i)
443} 576}
444 577
445void 578void
446ev_feed_fd_event (EV_P_ int fd, int revents) 579ev_feed_fd_event (EV_P_ int fd, int revents)
447{ 580{
581 if (fd >= 0 && fd < anfdmax)
448 fd_event (EV_A_ fd, revents); 582 fd_event (EV_A_ fd, revents);
449} 583}
450 584
451void inline_size 585void inline_size
452fd_reify (EV_P) 586fd_reify (EV_P)
453{ 587{
457 { 591 {
458 int fd = fdchanges [i]; 592 int fd = fdchanges [i];
459 ANFD *anfd = anfds + fd; 593 ANFD *anfd = anfds + fd;
460 ev_io *w; 594 ev_io *w;
461 595
462 int events = 0; 596 unsigned char events = 0;
463 597
464 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 598 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
465 events |= w->events; 599 events |= (unsigned char)w->events;
466 600
467#if EV_SELECT_IS_WINSOCKET 601#if EV_SELECT_IS_WINSOCKET
468 if (events) 602 if (events)
469 { 603 {
470 unsigned long argp; 604 unsigned long argp;
605 #ifdef EV_FD_TO_WIN32_HANDLE
606 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
607 #else
471 anfd->handle = _get_osfhandle (fd); 608 anfd->handle = _get_osfhandle (fd);
609 #endif
472 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 610 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
473 } 611 }
474#endif 612#endif
475 613
614 {
615 unsigned char o_events = anfd->events;
616 unsigned char o_reify = anfd->reify;
617
476 anfd->reify = 0; 618 anfd->reify = 0;
477
478 backend_modify (EV_A_ fd, anfd->events, events);
479 anfd->events = events; 619 anfd->events = events;
620
621 if (o_events != events || o_reify & EV_IOFDSET)
622 backend_modify (EV_A_ fd, o_events, events);
623 }
480 } 624 }
481 625
482 fdchangecnt = 0; 626 fdchangecnt = 0;
483} 627}
484 628
485void inline_size 629void inline_size
486fd_change (EV_P_ int fd) 630fd_change (EV_P_ int fd, int flags)
487{ 631{
488 if (expect_false (anfds [fd].reify)) 632 unsigned char reify = anfds [fd].reify;
489 return;
490
491 anfds [fd].reify = 1; 633 anfds [fd].reify |= flags;
492 634
635 if (expect_true (!reify))
636 {
493 ++fdchangecnt; 637 ++fdchangecnt;
494 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 638 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
495 fdchanges [fdchangecnt - 1] = fd; 639 fdchanges [fdchangecnt - 1] = fd;
640 }
496} 641}
497 642
498void inline_speed 643void inline_speed
499fd_kill (EV_P_ int fd) 644fd_kill (EV_P_ int fd)
500{ 645{
547static void noinline 692static void noinline
548fd_rearm_all (EV_P) 693fd_rearm_all (EV_P)
549{ 694{
550 int fd; 695 int fd;
551 696
552 /* this should be highly optimised to not do anything but set a flag */
553 for (fd = 0; fd < anfdmax; ++fd) 697 for (fd = 0; fd < anfdmax; ++fd)
554 if (anfds [fd].events) 698 if (anfds [fd].events)
555 { 699 {
556 anfds [fd].events = 0; 700 anfds [fd].events = 0;
557 fd_change (EV_A_ fd); 701 fd_change (EV_A_ fd, EV_IOFDSET | 1);
558 } 702 }
559} 703}
560 704
561/*****************************************************************************/ 705/*****************************************************************************/
562 706
563void inline_speed 707void inline_speed
564upheap (WT *heap, int k) 708upheap (WT *heap, int k)
565{ 709{
566 WT w = heap [k]; 710 WT w = heap [k];
567 711
568 while (k && heap [k >> 1]->at > w->at) 712 while (k)
569 { 713 {
714 int p = (k - 1) >> 1;
715
716 if (heap [p]->at <= w->at)
717 break;
718
570 heap [k] = heap [k >> 1]; 719 heap [k] = heap [p];
571 ((W)heap [k])->active = k + 1; 720 ((W)heap [k])->active = k + 1;
572 k >>= 1; 721 k = p;
573 } 722 }
574 723
575 heap [k] = w; 724 heap [k] = w;
576 ((W)heap [k])->active = k + 1; 725 ((W)heap [k])->active = k + 1;
577
578} 726}
579 727
580void inline_speed 728void inline_speed
581downheap (WT *heap, int N, int k) 729downheap (WT *heap, int N, int k)
582{ 730{
583 WT w = heap [k]; 731 WT w = heap [k];
584 732
585 while (k < (N >> 1)) 733 for (;;)
586 { 734 {
587 int j = k << 1; 735 int c = (k << 1) + 1;
588 736
589 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 737 if (c >= N)
590 ++j;
591
592 if (w->at <= heap [j]->at)
593 break; 738 break;
594 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
595 heap [k] = heap [j]; 746 heap [k] = heap [c];
596 ((W)heap [k])->active = k + 1; 747 ((W)heap [k])->active = k + 1;
748
597 k = j; 749 k = c;
598 } 750 }
599 751
600 heap [k] = w; 752 heap [k] = w;
601 ((W)heap [k])->active = k + 1; 753 ((W)heap [k])->active = k + 1;
602} 754}
684 for (signum = signalmax; signum--; ) 836 for (signum = signalmax; signum--; )
685 if (signals [signum].gotsig) 837 if (signals [signum].gotsig)
686 ev_feed_signal_event (EV_A_ signum + 1); 838 ev_feed_signal_event (EV_A_ signum + 1);
687} 839}
688 840
689void inline_size 841void inline_speed
690fd_intern (int fd) 842fd_intern (int fd)
691{ 843{
692#ifdef _WIN32 844#ifdef _WIN32
693 int arg = 1; 845 int arg = 1;
694 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 846 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
709 ev_unref (EV_A); /* child watcher should not keep loop alive */ 861 ev_unref (EV_A); /* child watcher should not keep loop alive */
710} 862}
711 863
712/*****************************************************************************/ 864/*****************************************************************************/
713 865
714static ev_child *childs [PID_HASHSIZE]; 866static WL childs [EV_PID_HASHSIZE];
715 867
716#ifndef _WIN32 868#ifndef _WIN32
717 869
718static ev_signal childev; 870static ev_signal childev;
871
872#ifndef WIFCONTINUED
873# define WIFCONTINUED(status) 0
874#endif
719 875
720void inline_speed 876void inline_speed
721child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 877child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status)
722{ 878{
723 ev_child *w; 879 ev_child *w;
880 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
724 881
725 for (w = (ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 882 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
883 {
726 if (w->pid == pid || !w->pid) 884 if ((w->pid == pid || !w->pid)
885 && (!traced || (w->flags & 1)))
727 { 886 {
728 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 887 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */
729 w->rpid = pid; 888 w->rpid = pid;
730 w->rstatus = status; 889 w->rstatus = status;
731 ev_feed_event (EV_A_ (W)w, EV_CHILD); 890 ev_feed_event (EV_A_ (W)w, EV_CHILD);
732 } 891 }
892 }
733} 893}
734 894
735#ifndef WCONTINUED 895#ifndef WCONTINUED
736# define WCONTINUED 0 896# define WCONTINUED 0
737#endif 897#endif
751 /* make sure we are called again until all childs have been reaped */ 911 /* make sure we are called again until all childs have been reaped */
752 /* we need to do it this way so that the callback gets called before we continue */ 912 /* we need to do it this way so that the callback gets called before we continue */
753 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 913 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
754 914
755 child_reap (EV_A_ sw, pid, pid, status); 915 child_reap (EV_A_ sw, pid, pid, status);
916 if (EV_PID_HASHSIZE > 1)
756 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 917 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
757} 918}
758 919
759#endif 920#endif
760 921
761/*****************************************************************************/ 922/*****************************************************************************/
833} 994}
834 995
835unsigned int 996unsigned int
836ev_embeddable_backends (void) 997ev_embeddable_backends (void)
837{ 998{
838 return EVBACKEND_EPOLL 999 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
839 | EVBACKEND_KQUEUE 1000
840 | EVBACKEND_PORT; 1001 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1002 /* please fix it and tell me how to detect the fix */
1003 flags &= ~EVBACKEND_EPOLL;
1004
1005 return flags;
841} 1006}
842 1007
843unsigned int 1008unsigned int
844ev_backend (EV_P) 1009ev_backend (EV_P)
845{ 1010{
846 return backend; 1011 return backend;
847} 1012}
848 1013
849static void 1014unsigned int
1015ev_loop_count (EV_P)
1016{
1017 return loop_count;
1018}
1019
1020void
1021ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1022{
1023 io_blocktime = interval;
1024}
1025
1026void
1027ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1028{
1029 timeout_blocktime = interval;
1030}
1031
1032static void noinline
850loop_init (EV_P_ unsigned int flags) 1033loop_init (EV_P_ unsigned int flags)
851{ 1034{
852 if (!backend) 1035 if (!backend)
853 { 1036 {
854#if EV_USE_MONOTONIC 1037#if EV_USE_MONOTONIC
862 ev_rt_now = ev_time (); 1045 ev_rt_now = ev_time ();
863 mn_now = get_clock (); 1046 mn_now = get_clock ();
864 now_floor = mn_now; 1047 now_floor = mn_now;
865 rtmn_diff = ev_rt_now - mn_now; 1048 rtmn_diff = ev_rt_now - mn_now;
866 1049
1050 io_blocktime = 0.;
1051 timeout_blocktime = 0.;
1052
1053 /* pid check not overridable via env */
1054#ifndef _WIN32
1055 if (flags & EVFLAG_FORKCHECK)
1056 curpid = getpid ();
1057#endif
1058
867 if (!(flags & EVFLAG_NOENV) 1059 if (!(flags & EVFLAG_NOENV)
868 && !enable_secure () 1060 && !enable_secure ()
869 && getenv ("LIBEV_FLAGS")) 1061 && getenv ("LIBEV_FLAGS"))
870 flags = atoi (getenv ("LIBEV_FLAGS")); 1062 flags = atoi (getenv ("LIBEV_FLAGS"));
871 1063
872 if (!(flags & 0x0000ffffUL)) 1064 if (!(flags & 0x0000ffffUL))
873 flags |= ev_recommended_backends (); 1065 flags |= ev_recommended_backends ();
874 1066
875 backend = 0; 1067 backend = 0;
1068 backend_fd = -1;
1069#if EV_USE_INOTIFY
1070 fs_fd = -2;
1071#endif
1072
876#if EV_USE_PORT 1073#if EV_USE_PORT
877 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1074 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
878#endif 1075#endif
879#if EV_USE_KQUEUE 1076#if EV_USE_KQUEUE
880 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1077 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
892 ev_init (&sigev, sigcb); 1089 ev_init (&sigev, sigcb);
893 ev_set_priority (&sigev, EV_MAXPRI); 1090 ev_set_priority (&sigev, EV_MAXPRI);
894 } 1091 }
895} 1092}
896 1093
897static void 1094static void noinline
898loop_destroy (EV_P) 1095loop_destroy (EV_P)
899{ 1096{
900 int i; 1097 int i;
1098
1099#if EV_USE_INOTIFY
1100 if (fs_fd >= 0)
1101 close (fs_fd);
1102#endif
1103
1104 if (backend_fd >= 0)
1105 close (backend_fd);
901 1106
902#if EV_USE_PORT 1107#if EV_USE_PORT
903 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1108 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
904#endif 1109#endif
905#if EV_USE_KQUEUE 1110#if EV_USE_KQUEUE
914#if EV_USE_SELECT 1119#if EV_USE_SELECT
915 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1120 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
916#endif 1121#endif
917 1122
918 for (i = NUMPRI; i--; ) 1123 for (i = NUMPRI; i--; )
1124 {
919 array_free (pending, [i]); 1125 array_free (pending, [i]);
1126#if EV_IDLE_ENABLE
1127 array_free (idle, [i]);
1128#endif
1129 }
1130
1131 ev_free (anfds); anfdmax = 0;
920 1132
921 /* have to use the microsoft-never-gets-it-right macro */ 1133 /* have to use the microsoft-never-gets-it-right macro */
922 array_free (fdchange, EMPTY0); 1134 array_free (fdchange, EMPTY);
923 array_free (timer, EMPTY0); 1135 array_free (timer, EMPTY);
924#if EV_PERIODIC_ENABLE 1136#if EV_PERIODIC_ENABLE
925 array_free (periodic, EMPTY0); 1137 array_free (periodic, EMPTY);
926#endif 1138#endif
1139#if EV_FORK_ENABLE
927 array_free (idle, EMPTY0); 1140 array_free (fork, EMPTY);
1141#endif
928 array_free (prepare, EMPTY0); 1142 array_free (prepare, EMPTY);
929 array_free (check, EMPTY0); 1143 array_free (check, EMPTY);
930 1144
931 backend = 0; 1145 backend = 0;
932} 1146}
933 1147
934static void 1148void inline_size infy_fork (EV_P);
1149
1150void inline_size
935loop_fork (EV_P) 1151loop_fork (EV_P)
936{ 1152{
937#if EV_USE_PORT 1153#if EV_USE_PORT
938 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1154 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
939#endif 1155#endif
940#if EV_USE_KQUEUE 1156#if EV_USE_KQUEUE
941 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A); 1157 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
942#endif 1158#endif
943#if EV_USE_EPOLL 1159#if EV_USE_EPOLL
944 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A); 1160 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
1161#endif
1162#if EV_USE_INOTIFY
1163 infy_fork (EV_A);
945#endif 1164#endif
946 1165
947 if (ev_is_active (&sigev)) 1166 if (ev_is_active (&sigev))
948 { 1167 {
949 /* default loop */ 1168 /* default loop */
955 1174
956 while (pipe (sigpipe)) 1175 while (pipe (sigpipe))
957 syserr ("(libev) error creating pipe"); 1176 syserr ("(libev) error creating pipe");
958 1177
959 siginit (EV_A); 1178 siginit (EV_A);
1179 sigcb (EV_A_ &sigev, EV_READ);
960 } 1180 }
961 1181
962 postfork = 0; 1182 postfork = 0;
963} 1183}
964 1184
986} 1206}
987 1207
988void 1208void
989ev_loop_fork (EV_P) 1209ev_loop_fork (EV_P)
990{ 1210{
991 postfork = 1; 1211 postfork = 1; /* must be in line with ev_default_fork */
992} 1212}
993 1213
994#endif 1214#endif
995 1215
996#if EV_MULTIPLICITY 1216#if EV_MULTIPLICITY
1060#if EV_MULTIPLICITY 1280#if EV_MULTIPLICITY
1061 struct ev_loop *loop = ev_default_loop_ptr; 1281 struct ev_loop *loop = ev_default_loop_ptr;
1062#endif 1282#endif
1063 1283
1064 if (backend) 1284 if (backend)
1065 postfork = 1; 1285 postfork = 1; /* must be in line with ev_loop_fork */
1066} 1286}
1067 1287
1068/*****************************************************************************/ 1288/*****************************************************************************/
1069 1289
1070int inline_size 1290void
1071any_pending (EV_P) 1291ev_invoke (EV_P_ void *w, int revents)
1072{ 1292{
1073 int pri; 1293 EV_CB_INVOKE ((W)w, revents);
1074
1075 for (pri = NUMPRI; pri--; )
1076 if (pendingcnt [pri])
1077 return 1;
1078
1079 return 0;
1080} 1294}
1081 1295
1082void inline_speed 1296void inline_speed
1083call_pending (EV_P) 1297call_pending (EV_P)
1084{ 1298{
1089 { 1303 {
1090 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1304 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1091 1305
1092 if (expect_true (p->w)) 1306 if (expect_true (p->w))
1093 { 1307 {
1094 assert (("non-pending watcher on pending list", p->w->pending)); 1308 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1095 1309
1096 p->w->pending = 0; 1310 p->w->pending = 0;
1097 EV_CB_INVOKE (p->w, p->events); 1311 EV_CB_INVOKE (p->w, p->events);
1098 } 1312 }
1099 } 1313 }
1102void inline_size 1316void inline_size
1103timers_reify (EV_P) 1317timers_reify (EV_P)
1104{ 1318{
1105 while (timercnt && ((WT)timers [0])->at <= mn_now) 1319 while (timercnt && ((WT)timers [0])->at <= mn_now)
1106 { 1320 {
1107 ev_timer *w = timers [0]; 1321 ev_timer *w = (ev_timer *)timers [0];
1108 1322
1109 assert (("inactive timer on timer heap detected", ev_is_active (w))); 1323 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1110 1324
1111 /* first reschedule or stop timer */ 1325 /* first reschedule or stop timer */
1112 if (w->repeat) 1326 if (w->repeat)
1113 { 1327 {
1114 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1328 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1115 1329
1116 ((WT)w)->at += w->repeat; 1330 ((WT)w)->at += w->repeat;
1117 if (((WT)w)->at < mn_now) 1331 if (((WT)w)->at < mn_now)
1118 ((WT)w)->at = mn_now; 1332 ((WT)w)->at = mn_now;
1119 1333
1120 downheap ((WT *)timers, timercnt, 0); 1334 downheap (timers, timercnt, 0);
1121 } 1335 }
1122 else 1336 else
1123 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1337 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1124 1338
1125 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1339 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1130void inline_size 1344void inline_size
1131periodics_reify (EV_P) 1345periodics_reify (EV_P)
1132{ 1346{
1133 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1347 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1134 { 1348 {
1135 ev_periodic *w = periodics [0]; 1349 ev_periodic *w = (ev_periodic *)periodics [0];
1136 1350
1137 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1351 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1138 1352
1139 /* first reschedule or stop timer */ 1353 /* first reschedule or stop timer */
1140 if (w->reschedule_cb) 1354 if (w->reschedule_cb)
1141 { 1355 {
1142 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1356 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1143 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1357 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1144 downheap ((WT *)periodics, periodiccnt, 0); 1358 downheap (periodics, periodiccnt, 0);
1145 } 1359 }
1146 else if (w->interval) 1360 else if (w->interval)
1147 { 1361 {
1148 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1362 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1363 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1149 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1364 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1150 downheap ((WT *)periodics, periodiccnt, 0); 1365 downheap (periodics, periodiccnt, 0);
1151 } 1366 }
1152 else 1367 else
1153 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1368 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1154 1369
1155 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1370 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1162 int i; 1377 int i;
1163 1378
1164 /* adjust periodics after time jump */ 1379 /* adjust periodics after time jump */
1165 for (i = 0; i < periodiccnt; ++i) 1380 for (i = 0; i < periodiccnt; ++i)
1166 { 1381 {
1167 ev_periodic *w = periodics [i]; 1382 ev_periodic *w = (ev_periodic *)periodics [i];
1168 1383
1169 if (w->reschedule_cb) 1384 if (w->reschedule_cb)
1170 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1385 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1171 else if (w->interval) 1386 else if (w->interval)
1172 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1387 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1173 } 1388 }
1174 1389
1175 /* now rebuild the heap */ 1390 /* now rebuild the heap */
1176 for (i = periodiccnt >> 1; i--; ) 1391 for (i = periodiccnt >> 1; i--; )
1177 downheap ((WT *)periodics, periodiccnt, i); 1392 downheap (periodics, periodiccnt, i);
1178} 1393}
1179#endif 1394#endif
1180 1395
1396#if EV_IDLE_ENABLE
1181int inline_size 1397void inline_size
1182time_update_monotonic (EV_P) 1398idle_reify (EV_P)
1183{ 1399{
1400 if (expect_false (idleall))
1401 {
1402 int pri;
1403
1404 for (pri = NUMPRI; pri--; )
1405 {
1406 if (pendingcnt [pri])
1407 break;
1408
1409 if (idlecnt [pri])
1410 {
1411 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1412 break;
1413 }
1414 }
1415 }
1416}
1417#endif
1418
1419void inline_speed
1420time_update (EV_P_ ev_tstamp max_block)
1421{
1422 int i;
1423
1424#if EV_USE_MONOTONIC
1425 if (expect_true (have_monotonic))
1426 {
1427 ev_tstamp odiff = rtmn_diff;
1428
1184 mn_now = get_clock (); 1429 mn_now = get_clock ();
1185 1430
1431 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1432 /* interpolate in the meantime */
1186 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1433 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1187 { 1434 {
1188 ev_rt_now = rtmn_diff + mn_now; 1435 ev_rt_now = rtmn_diff + mn_now;
1189 return 0; 1436 return;
1190 } 1437 }
1191 else 1438
1192 {
1193 now_floor = mn_now; 1439 now_floor = mn_now;
1194 ev_rt_now = ev_time (); 1440 ev_rt_now = ev_time ();
1195 return 1;
1196 }
1197}
1198 1441
1199void inline_size 1442 /* loop a few times, before making important decisions.
1200time_update (EV_P) 1443 * on the choice of "4": one iteration isn't enough,
1201{ 1444 * in case we get preempted during the calls to
1202 int i; 1445 * ev_time and get_clock. a second call is almost guaranteed
1203 1446 * to succeed in that case, though. and looping a few more times
1204#if EV_USE_MONOTONIC 1447 * doesn't hurt either as we only do this on time-jumps or
1205 if (expect_true (have_monotonic)) 1448 * in the unlikely event of having been preempted here.
1206 { 1449 */
1207 if (time_update_monotonic (EV_A)) 1450 for (i = 4; --i; )
1208 { 1451 {
1209 ev_tstamp odiff = rtmn_diff;
1210
1211 /* loop a few times, before making important decisions.
1212 * on the choice of "4": one iteration isn't enough,
1213 * in case we get preempted during the calls to
1214 * ev_time and get_clock. a second call is almost guarenteed
1215 * to succeed in that case, though. and looping a few more times
1216 * doesn't hurt either as we only do this on time-jumps or
1217 * in the unlikely event of getting preempted here.
1218 */
1219 for (i = 4; --i; )
1220 {
1221 rtmn_diff = ev_rt_now - mn_now; 1452 rtmn_diff = ev_rt_now - mn_now;
1222 1453
1223 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1454 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1224 return; /* all is well */ 1455 return; /* all is well */
1225 1456
1226 ev_rt_now = ev_time (); 1457 ev_rt_now = ev_time ();
1227 mn_now = get_clock (); 1458 mn_now = get_clock ();
1228 now_floor = mn_now; 1459 now_floor = mn_now;
1229 } 1460 }
1230 1461
1231# if EV_PERIODIC_ENABLE 1462# if EV_PERIODIC_ENABLE
1232 periodics_reschedule (EV_A); 1463 periodics_reschedule (EV_A);
1233# endif 1464# endif
1234 /* no timer adjustment, as the monotonic clock doesn't jump */ 1465 /* no timer adjustment, as the monotonic clock doesn't jump */
1235 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1466 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1236 }
1237 } 1467 }
1238 else 1468 else
1239#endif 1469#endif
1240 { 1470 {
1241 ev_rt_now = ev_time (); 1471 ev_rt_now = ev_time ();
1242 1472
1243 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1473 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1244 { 1474 {
1245#if EV_PERIODIC_ENABLE 1475#if EV_PERIODIC_ENABLE
1246 periodics_reschedule (EV_A); 1476 periodics_reschedule (EV_A);
1247#endif 1477#endif
1248
1249 /* adjust timers. this is easy, as the offset is the same for all */ 1478 /* adjust timers. this is easy, as the offset is the same for all of them */
1250 for (i = 0; i < timercnt; ++i) 1479 for (i = 0; i < timercnt; ++i)
1251 ((WT)timers [i])->at += ev_rt_now - mn_now; 1480 ((WT)timers [i])->at += ev_rt_now - mn_now;
1252 } 1481 }
1253 1482
1254 mn_now = ev_rt_now; 1483 mn_now = ev_rt_now;
1274{ 1503{
1275 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1504 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1276 ? EVUNLOOP_ONE 1505 ? EVUNLOOP_ONE
1277 : EVUNLOOP_CANCEL; 1506 : EVUNLOOP_CANCEL;
1278 1507
1279 while (activecnt) 1508 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1509
1510 do
1280 { 1511 {
1281 /* we might have forked, so reify kernel state if necessary */ 1512#ifndef _WIN32
1513 if (expect_false (curpid)) /* penalise the forking check even more */
1514 if (expect_false (getpid () != curpid))
1515 {
1516 curpid = getpid ();
1517 postfork = 1;
1518 }
1519#endif
1520
1282 #if EV_FORK_ENABLE 1521#if EV_FORK_ENABLE
1522 /* we might have forked, so queue fork handlers */
1283 if (expect_false (postfork)) 1523 if (expect_false (postfork))
1284 if (forkcnt) 1524 if (forkcnt)
1285 { 1525 {
1286 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1526 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1287 call_pending (EV_A); 1527 call_pending (EV_A);
1288 } 1528 }
1289 #endif 1529#endif
1290 1530
1291 /* queue check watchers (and execute them) */ 1531 /* queue prepare watchers (and execute them) */
1292 if (expect_false (preparecnt)) 1532 if (expect_false (preparecnt))
1293 { 1533 {
1294 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1534 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1295 call_pending (EV_A); 1535 call_pending (EV_A);
1296 } 1536 }
1297 1537
1538 if (expect_false (!activecnt))
1539 break;
1540
1298 /* we might have forked, so reify kernel state if necessary */ 1541 /* we might have forked, so reify kernel state if necessary */
1299 if (expect_false (postfork)) 1542 if (expect_false (postfork))
1300 loop_fork (EV_A); 1543 loop_fork (EV_A);
1301 1544
1302 /* update fd-related kernel structures */ 1545 /* update fd-related kernel structures */
1303 fd_reify (EV_A); 1546 fd_reify (EV_A);
1304 1547
1305 /* calculate blocking time */ 1548 /* calculate blocking time */
1306 { 1549 {
1307 double block; 1550 ev_tstamp waittime = 0.;
1551 ev_tstamp sleeptime = 0.;
1308 1552
1309 if (flags & EVLOOP_NONBLOCK || idlecnt) 1553 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1310 block = 0.; /* do not block at all */
1311 else
1312 { 1554 {
1313 /* update time to cancel out callback processing overhead */ 1555 /* update time to cancel out callback processing overhead */
1314#if EV_USE_MONOTONIC
1315 if (expect_true (have_monotonic))
1316 time_update_monotonic (EV_A); 1556 time_update (EV_A_ 1e100);
1317 else
1318#endif
1319 {
1320 ev_rt_now = ev_time ();
1321 mn_now = ev_rt_now;
1322 }
1323 1557
1324 block = MAX_BLOCKTIME; 1558 waittime = MAX_BLOCKTIME;
1325 1559
1326 if (timercnt) 1560 if (timercnt)
1327 { 1561 {
1328 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1562 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1329 if (block > to) block = to; 1563 if (waittime > to) waittime = to;
1330 } 1564 }
1331 1565
1332#if EV_PERIODIC_ENABLE 1566#if EV_PERIODIC_ENABLE
1333 if (periodiccnt) 1567 if (periodiccnt)
1334 { 1568 {
1335 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1569 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1336 if (block > to) block = to; 1570 if (waittime > to) waittime = to;
1337 } 1571 }
1338#endif 1572#endif
1339 1573
1340 if (expect_false (block < 0.)) block = 0.; 1574 if (expect_false (waittime < timeout_blocktime))
1575 waittime = timeout_blocktime;
1576
1577 sleeptime = waittime - backend_fudge;
1578
1579 if (expect_true (sleeptime > io_blocktime))
1580 sleeptime = io_blocktime;
1581
1582 if (sleeptime)
1583 {
1584 ev_sleep (sleeptime);
1585 waittime -= sleeptime;
1586 }
1341 } 1587 }
1342 1588
1589 ++loop_count;
1343 backend_poll (EV_A_ block); 1590 backend_poll (EV_A_ waittime);
1591
1592 /* update ev_rt_now, do magic */
1593 time_update (EV_A_ waittime + sleeptime);
1344 } 1594 }
1345
1346 /* update ev_rt_now, do magic */
1347 time_update (EV_A);
1348 1595
1349 /* queue pending timers and reschedule them */ 1596 /* queue pending timers and reschedule them */
1350 timers_reify (EV_A); /* relative timers called last */ 1597 timers_reify (EV_A); /* relative timers called last */
1351#if EV_PERIODIC_ENABLE 1598#if EV_PERIODIC_ENABLE
1352 periodics_reify (EV_A); /* absolute timers called first */ 1599 periodics_reify (EV_A); /* absolute timers called first */
1353#endif 1600#endif
1354 1601
1602#if EV_IDLE_ENABLE
1355 /* queue idle watchers unless other events are pending */ 1603 /* queue idle watchers unless other events are pending */
1356 if (idlecnt && !any_pending (EV_A)) 1604 idle_reify (EV_A);
1357 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1605#endif
1358 1606
1359 /* queue check watchers, to be executed first */ 1607 /* queue check watchers, to be executed first */
1360 if (expect_false (checkcnt)) 1608 if (expect_false (checkcnt))
1361 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1609 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1362 1610
1363 call_pending (EV_A); 1611 call_pending (EV_A);
1364 1612
1365 if (expect_false (loop_done))
1366 break;
1367 } 1613 }
1614 while (expect_true (activecnt && !loop_done));
1368 1615
1369 if (loop_done == EVUNLOOP_ONE) 1616 if (loop_done == EVUNLOOP_ONE)
1370 loop_done = EVUNLOOP_CANCEL; 1617 loop_done = EVUNLOOP_CANCEL;
1371} 1618}
1372 1619
1399 head = &(*head)->next; 1646 head = &(*head)->next;
1400 } 1647 }
1401} 1648}
1402 1649
1403void inline_speed 1650void inline_speed
1404ev_clear_pending (EV_P_ W w) 1651clear_pending (EV_P_ W w)
1405{ 1652{
1406 if (w->pending) 1653 if (w->pending)
1407 { 1654 {
1408 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1655 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1409 w->pending = 0; 1656 w->pending = 0;
1410 } 1657 }
1411} 1658}
1412 1659
1660int
1661ev_clear_pending (EV_P_ void *w)
1662{
1663 W w_ = (W)w;
1664 int pending = w_->pending;
1665
1666 if (expect_true (pending))
1667 {
1668 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1669 w_->pending = 0;
1670 p->w = 0;
1671 return p->events;
1672 }
1673 else
1674 return 0;
1675}
1676
1677void inline_size
1678pri_adjust (EV_P_ W w)
1679{
1680 int pri = w->priority;
1681 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
1682 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
1683 w->priority = pri;
1684}
1685
1413void inline_speed 1686void inline_speed
1414ev_start (EV_P_ W w, int active) 1687ev_start (EV_P_ W w, int active)
1415{ 1688{
1416 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1689 pri_adjust (EV_A_ w);
1417 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1418
1419 w->active = active; 1690 w->active = active;
1420 ev_ref (EV_A); 1691 ev_ref (EV_A);
1421} 1692}
1422 1693
1423void inline_size 1694void inline_size
1427 w->active = 0; 1698 w->active = 0;
1428} 1699}
1429 1700
1430/*****************************************************************************/ 1701/*****************************************************************************/
1431 1702
1432void 1703void noinline
1433ev_io_start (EV_P_ ev_io *w) 1704ev_io_start (EV_P_ ev_io *w)
1434{ 1705{
1435 int fd = w->fd; 1706 int fd = w->fd;
1436 1707
1437 if (expect_false (ev_is_active (w))) 1708 if (expect_false (ev_is_active (w)))
1439 1710
1440 assert (("ev_io_start called with negative fd", fd >= 0)); 1711 assert (("ev_io_start called with negative fd", fd >= 0));
1441 1712
1442 ev_start (EV_A_ (W)w, 1); 1713 ev_start (EV_A_ (W)w, 1);
1443 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1714 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1444 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1715 wlist_add (&anfds[fd].head, (WL)w);
1445 1716
1446 fd_change (EV_A_ fd); 1717 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1718 w->events &= ~EV_IOFDSET;
1447} 1719}
1448 1720
1449void 1721void noinline
1450ev_io_stop (EV_P_ ev_io *w) 1722ev_io_stop (EV_P_ ev_io *w)
1451{ 1723{
1452 ev_clear_pending (EV_A_ (W)w); 1724 clear_pending (EV_A_ (W)w);
1453 if (expect_false (!ev_is_active (w))) 1725 if (expect_false (!ev_is_active (w)))
1454 return; 1726 return;
1455 1727
1456 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1728 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1457 1729
1458 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1730 wlist_del (&anfds[w->fd].head, (WL)w);
1459 ev_stop (EV_A_ (W)w); 1731 ev_stop (EV_A_ (W)w);
1460 1732
1461 fd_change (EV_A_ w->fd); 1733 fd_change (EV_A_ w->fd, 1);
1462} 1734}
1463 1735
1464void 1736void noinline
1465ev_timer_start (EV_P_ ev_timer *w) 1737ev_timer_start (EV_P_ ev_timer *w)
1466{ 1738{
1467 if (expect_false (ev_is_active (w))) 1739 if (expect_false (ev_is_active (w)))
1468 return; 1740 return;
1469 1741
1470 ((WT)w)->at += mn_now; 1742 ((WT)w)->at += mn_now;
1471 1743
1472 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1744 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1473 1745
1474 ev_start (EV_A_ (W)w, ++timercnt); 1746 ev_start (EV_A_ (W)w, ++timercnt);
1475 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1747 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1476 timers [timercnt - 1] = w; 1748 timers [timercnt - 1] = (WT)w;
1477 upheap ((WT *)timers, timercnt - 1); 1749 upheap (timers, timercnt - 1);
1478 1750
1479 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1751 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1480} 1752}
1481 1753
1482void 1754void noinline
1483ev_timer_stop (EV_P_ ev_timer *w) 1755ev_timer_stop (EV_P_ ev_timer *w)
1484{ 1756{
1485 ev_clear_pending (EV_A_ (W)w); 1757 clear_pending (EV_A_ (W)w);
1486 if (expect_false (!ev_is_active (w))) 1758 if (expect_false (!ev_is_active (w)))
1487 return; 1759 return;
1488 1760
1489 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1761 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1490 1762
1763 {
1764 int active = ((W)w)->active;
1765
1491 if (expect_true (((W)w)->active < timercnt--)) 1766 if (expect_true (--active < --timercnt))
1492 { 1767 {
1493 timers [((W)w)->active - 1] = timers [timercnt]; 1768 timers [active] = timers [timercnt];
1494 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1769 adjustheap (timers, timercnt, active);
1495 } 1770 }
1771 }
1496 1772
1497 ((WT)w)->at -= mn_now; 1773 ((WT)w)->at -= mn_now;
1498 1774
1499 ev_stop (EV_A_ (W)w); 1775 ev_stop (EV_A_ (W)w);
1500} 1776}
1501 1777
1502void 1778void noinline
1503ev_timer_again (EV_P_ ev_timer *w) 1779ev_timer_again (EV_P_ ev_timer *w)
1504{ 1780{
1505 if (ev_is_active (w)) 1781 if (ev_is_active (w))
1506 { 1782 {
1507 if (w->repeat) 1783 if (w->repeat)
1508 { 1784 {
1509 ((WT)w)->at = mn_now + w->repeat; 1785 ((WT)w)->at = mn_now + w->repeat;
1510 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1786 adjustheap (timers, timercnt, ((W)w)->active - 1);
1511 } 1787 }
1512 else 1788 else
1513 ev_timer_stop (EV_A_ w); 1789 ev_timer_stop (EV_A_ w);
1514 } 1790 }
1515 else if (w->repeat) 1791 else if (w->repeat)
1518 ev_timer_start (EV_A_ w); 1794 ev_timer_start (EV_A_ w);
1519 } 1795 }
1520} 1796}
1521 1797
1522#if EV_PERIODIC_ENABLE 1798#if EV_PERIODIC_ENABLE
1523void 1799void noinline
1524ev_periodic_start (EV_P_ ev_periodic *w) 1800ev_periodic_start (EV_P_ ev_periodic *w)
1525{ 1801{
1526 if (expect_false (ev_is_active (w))) 1802 if (expect_false (ev_is_active (w)))
1527 return; 1803 return;
1528 1804
1530 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1806 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1531 else if (w->interval) 1807 else if (w->interval)
1532 { 1808 {
1533 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1809 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1534 /* this formula differs from the one in periodic_reify because we do not always round up */ 1810 /* this formula differs from the one in periodic_reify because we do not always round up */
1535 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1811 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1536 } 1812 }
1813 else
1814 ((WT)w)->at = w->offset;
1537 1815
1538 ev_start (EV_A_ (W)w, ++periodiccnt); 1816 ev_start (EV_A_ (W)w, ++periodiccnt);
1539 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1817 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1540 periodics [periodiccnt - 1] = w; 1818 periodics [periodiccnt - 1] = (WT)w;
1541 upheap ((WT *)periodics, periodiccnt - 1); 1819 upheap (periodics, periodiccnt - 1);
1542 1820
1543 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1821 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1544} 1822}
1545 1823
1546void 1824void noinline
1547ev_periodic_stop (EV_P_ ev_periodic *w) 1825ev_periodic_stop (EV_P_ ev_periodic *w)
1548{ 1826{
1549 ev_clear_pending (EV_A_ (W)w); 1827 clear_pending (EV_A_ (W)w);
1550 if (expect_false (!ev_is_active (w))) 1828 if (expect_false (!ev_is_active (w)))
1551 return; 1829 return;
1552 1830
1553 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1831 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1554 1832
1833 {
1834 int active = ((W)w)->active;
1835
1555 if (expect_true (((W)w)->active < periodiccnt--)) 1836 if (expect_true (--active < --periodiccnt))
1556 { 1837 {
1557 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1838 periodics [active] = periodics [periodiccnt];
1558 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1839 adjustheap (periodics, periodiccnt, active);
1559 } 1840 }
1841 }
1560 1842
1561 ev_stop (EV_A_ (W)w); 1843 ev_stop (EV_A_ (W)w);
1562} 1844}
1563 1845
1564void 1846void noinline
1565ev_periodic_again (EV_P_ ev_periodic *w) 1847ev_periodic_again (EV_P_ ev_periodic *w)
1566{ 1848{
1567 /* TODO: use adjustheap and recalculation */ 1849 /* TODO: use adjustheap and recalculation */
1568 ev_periodic_stop (EV_A_ w); 1850 ev_periodic_stop (EV_A_ w);
1569 ev_periodic_start (EV_A_ w); 1851 ev_periodic_start (EV_A_ w);
1572 1854
1573#ifndef SA_RESTART 1855#ifndef SA_RESTART
1574# define SA_RESTART 0 1856# define SA_RESTART 0
1575#endif 1857#endif
1576 1858
1577void 1859void noinline
1578ev_signal_start (EV_P_ ev_signal *w) 1860ev_signal_start (EV_P_ ev_signal *w)
1579{ 1861{
1580#if EV_MULTIPLICITY 1862#if EV_MULTIPLICITY
1581 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1863 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1582#endif 1864#endif
1583 if (expect_false (ev_is_active (w))) 1865 if (expect_false (ev_is_active (w)))
1584 return; 1866 return;
1585 1867
1586 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1868 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1587 1869
1870 {
1871#ifndef _WIN32
1872 sigset_t full, prev;
1873 sigfillset (&full);
1874 sigprocmask (SIG_SETMASK, &full, &prev);
1875#endif
1876
1877 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1878
1879#ifndef _WIN32
1880 sigprocmask (SIG_SETMASK, &prev, 0);
1881#endif
1882 }
1883
1588 ev_start (EV_A_ (W)w, 1); 1884 ev_start (EV_A_ (W)w, 1);
1589 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1590 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1885 wlist_add (&signals [w->signum - 1].head, (WL)w);
1591 1886
1592 if (!((WL)w)->next) 1887 if (!((WL)w)->next)
1593 { 1888 {
1594#if _WIN32 1889#if _WIN32
1595 signal (w->signum, sighandler); 1890 signal (w->signum, sighandler);
1601 sigaction (w->signum, &sa, 0); 1896 sigaction (w->signum, &sa, 0);
1602#endif 1897#endif
1603 } 1898 }
1604} 1899}
1605 1900
1606void 1901void noinline
1607ev_signal_stop (EV_P_ ev_signal *w) 1902ev_signal_stop (EV_P_ ev_signal *w)
1608{ 1903{
1609 ev_clear_pending (EV_A_ (W)w); 1904 clear_pending (EV_A_ (W)w);
1610 if (expect_false (!ev_is_active (w))) 1905 if (expect_false (!ev_is_active (w)))
1611 return; 1906 return;
1612 1907
1613 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1908 wlist_del (&signals [w->signum - 1].head, (WL)w);
1614 ev_stop (EV_A_ (W)w); 1909 ev_stop (EV_A_ (W)w);
1615 1910
1616 if (!signals [w->signum - 1].head) 1911 if (!signals [w->signum - 1].head)
1617 signal (w->signum, SIG_DFL); 1912 signal (w->signum, SIG_DFL);
1618} 1913}
1625#endif 1920#endif
1626 if (expect_false (ev_is_active (w))) 1921 if (expect_false (ev_is_active (w)))
1627 return; 1922 return;
1628 1923
1629 ev_start (EV_A_ (W)w, 1); 1924 ev_start (EV_A_ (W)w, 1);
1630 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1925 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1631} 1926}
1632 1927
1633void 1928void
1634ev_child_stop (EV_P_ ev_child *w) 1929ev_child_stop (EV_P_ ev_child *w)
1635{ 1930{
1636 ev_clear_pending (EV_A_ (W)w); 1931 clear_pending (EV_A_ (W)w);
1637 if (expect_false (!ev_is_active (w))) 1932 if (expect_false (!ev_is_active (w)))
1638 return; 1933 return;
1639 1934
1640 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1935 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1641 ev_stop (EV_A_ (W)w); 1936 ev_stop (EV_A_ (W)w);
1642} 1937}
1643 1938
1644#if EV_STAT_ENABLE 1939#if EV_STAT_ENABLE
1645 1940
1649# endif 1944# endif
1650 1945
1651#define DEF_STAT_INTERVAL 5.0074891 1946#define DEF_STAT_INTERVAL 5.0074891
1652#define MIN_STAT_INTERVAL 0.1074891 1947#define MIN_STAT_INTERVAL 0.1074891
1653 1948
1949static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
1950
1951#if EV_USE_INOTIFY
1952# define EV_INOTIFY_BUFSIZE 8192
1953
1954static void noinline
1955infy_add (EV_P_ ev_stat *w)
1956{
1957 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);
1958
1959 if (w->wd < 0)
1960 {
1961 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1962
1963 /* monitor some parent directory for speedup hints */
1964 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1965 {
1966 char path [4096];
1967 strcpy (path, w->path);
1968
1969 do
1970 {
1971 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
1972 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
1973
1974 char *pend = strrchr (path, '/');
1975
1976 if (!pend)
1977 break; /* whoops, no '/', complain to your admin */
1978
1979 *pend = 0;
1980 w->wd = inotify_add_watch (fs_fd, path, mask);
1981 }
1982 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
1983 }
1984 }
1985 else
1986 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
1987
1988 if (w->wd >= 0)
1989 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
1990}
1991
1992static void noinline
1993infy_del (EV_P_ ev_stat *w)
1994{
1995 int slot;
1996 int wd = w->wd;
1997
1998 if (wd < 0)
1999 return;
2000
2001 w->wd = -2;
2002 slot = wd & (EV_INOTIFY_HASHSIZE - 1);
2003 wlist_del (&fs_hash [slot].head, (WL)w);
2004
2005 /* remove this watcher, if others are watching it, they will rearm */
2006 inotify_rm_watch (fs_fd, wd);
2007}
2008
2009static void noinline
2010infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2011{
2012 if (slot < 0)
2013 /* overflow, need to check for all hahs slots */
2014 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2015 infy_wd (EV_A_ slot, wd, ev);
2016 else
2017 {
2018 WL w_;
2019
2020 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; )
2021 {
2022 ev_stat *w = (ev_stat *)w_;
2023 w_ = w_->next; /* lets us remove this watcher and all before it */
2024
2025 if (w->wd == wd || wd == -1)
2026 {
2027 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2028 {
2029 w->wd = -1;
2030 infy_add (EV_A_ w); /* re-add, no matter what */
2031 }
2032
2033 stat_timer_cb (EV_A_ &w->timer, 0);
2034 }
2035 }
2036 }
2037}
2038
2039static void
2040infy_cb (EV_P_ ev_io *w, int revents)
2041{
2042 char buf [EV_INOTIFY_BUFSIZE];
2043 struct inotify_event *ev = (struct inotify_event *)buf;
2044 int ofs;
2045 int len = read (fs_fd, buf, sizeof (buf));
2046
2047 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2048 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2049}
2050
2051void inline_size
2052infy_init (EV_P)
2053{
2054 if (fs_fd != -2)
2055 return;
2056
2057 fs_fd = inotify_init ();
2058
2059 if (fs_fd >= 0)
2060 {
2061 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2062 ev_set_priority (&fs_w, EV_MAXPRI);
2063 ev_io_start (EV_A_ &fs_w);
2064 }
2065}
2066
2067void inline_size
2068infy_fork (EV_P)
2069{
2070 int slot;
2071
2072 if (fs_fd < 0)
2073 return;
2074
2075 close (fs_fd);
2076 fs_fd = inotify_init ();
2077
2078 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2079 {
2080 WL w_ = fs_hash [slot].head;
2081 fs_hash [slot].head = 0;
2082
2083 while (w_)
2084 {
2085 ev_stat *w = (ev_stat *)w_;
2086 w_ = w_->next; /* lets us add this watcher */
2087
2088 w->wd = -1;
2089
2090 if (fs_fd >= 0)
2091 infy_add (EV_A_ w); /* re-add, no matter what */
2092 else
2093 ev_timer_start (EV_A_ &w->timer);
2094 }
2095
2096 }
2097}
2098
2099#endif
2100
1654void 2101void
1655ev_stat_stat (EV_P_ ev_stat *w) 2102ev_stat_stat (EV_P_ ev_stat *w)
1656{ 2103{
1657 if (lstat (w->path, &w->attr) < 0) 2104 if (lstat (w->path, &w->attr) < 0)
1658 w->attr.st_nlink = 0; 2105 w->attr.st_nlink = 0;
1659 else if (!w->attr.st_nlink) 2106 else if (!w->attr.st_nlink)
1660 w->attr.st_nlink = 1; 2107 w->attr.st_nlink = 1;
1661} 2108}
1662 2109
1663static void 2110static void noinline
1664stat_timer_cb (EV_P_ ev_timer *w_, int revents) 2111stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1665{ 2112{
1666 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 2113 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1667 2114
1668 /* we copy this here each the time so that */ 2115 /* we copy this here each the time so that */
1669 /* prev has the old value when the callback gets invoked */ 2116 /* prev has the old value when the callback gets invoked */
1670 w->prev = w->attr; 2117 w->prev = w->attr;
1671 ev_stat_stat (EV_A_ w); 2118 ev_stat_stat (EV_A_ w);
1672 2119
1673 if (memcmp (&w->prev, &w->attr, sizeof (ev_statdata))) 2120 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2121 if (
2122 w->prev.st_dev != w->attr.st_dev
2123 || w->prev.st_ino != w->attr.st_ino
2124 || w->prev.st_mode != w->attr.st_mode
2125 || w->prev.st_nlink != w->attr.st_nlink
2126 || w->prev.st_uid != w->attr.st_uid
2127 || w->prev.st_gid != w->attr.st_gid
2128 || w->prev.st_rdev != w->attr.st_rdev
2129 || w->prev.st_size != w->attr.st_size
2130 || w->prev.st_atime != w->attr.st_atime
2131 || w->prev.st_mtime != w->attr.st_mtime
2132 || w->prev.st_ctime != w->attr.st_ctime
2133 ) {
2134 #if EV_USE_INOTIFY
2135 infy_del (EV_A_ w);
2136 infy_add (EV_A_ w);
2137 ev_stat_stat (EV_A_ w); /* avoid race... */
2138 #endif
2139
1674 ev_feed_event (EV_A_ w, EV_STAT); 2140 ev_feed_event (EV_A_ w, EV_STAT);
2141 }
1675} 2142}
1676 2143
1677void 2144void
1678ev_stat_start (EV_P_ ev_stat *w) 2145ev_stat_start (EV_P_ ev_stat *w)
1679{ 2146{
1689 if (w->interval < MIN_STAT_INTERVAL) 2156 if (w->interval < MIN_STAT_INTERVAL)
1690 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL; 2157 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
1691 2158
1692 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 2159 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
1693 ev_set_priority (&w->timer, ev_priority (w)); 2160 ev_set_priority (&w->timer, ev_priority (w));
2161
2162#if EV_USE_INOTIFY
2163 infy_init (EV_A);
2164
2165 if (fs_fd >= 0)
2166 infy_add (EV_A_ w);
2167 else
2168#endif
1694 ev_timer_start (EV_A_ &w->timer); 2169 ev_timer_start (EV_A_ &w->timer);
1695 2170
1696 ev_start (EV_A_ (W)w, 1); 2171 ev_start (EV_A_ (W)w, 1);
1697} 2172}
1698 2173
1699void 2174void
1700ev_stat_stop (EV_P_ ev_stat *w) 2175ev_stat_stop (EV_P_ ev_stat *w)
1701{ 2176{
1702 ev_clear_pending (EV_A_ (W)w); 2177 clear_pending (EV_A_ (W)w);
1703 if (expect_false (!ev_is_active (w))) 2178 if (expect_false (!ev_is_active (w)))
1704 return; 2179 return;
1705 2180
2181#if EV_USE_INOTIFY
2182 infy_del (EV_A_ w);
2183#endif
1706 ev_timer_stop (EV_A_ &w->timer); 2184 ev_timer_stop (EV_A_ &w->timer);
1707 2185
1708 ev_stop (EV_A_ (W)w); 2186 ev_stop (EV_A_ (W)w);
1709} 2187}
1710#endif 2188#endif
1711 2189
2190#if EV_IDLE_ENABLE
1712void 2191void
1713ev_idle_start (EV_P_ ev_idle *w) 2192ev_idle_start (EV_P_ ev_idle *w)
1714{ 2193{
1715 if (expect_false (ev_is_active (w))) 2194 if (expect_false (ev_is_active (w)))
1716 return; 2195 return;
1717 2196
2197 pri_adjust (EV_A_ (W)w);
2198
2199 {
2200 int active = ++idlecnt [ABSPRI (w)];
2201
2202 ++idleall;
1718 ev_start (EV_A_ (W)w, ++idlecnt); 2203 ev_start (EV_A_ (W)w, active);
2204
1719 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2205 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
1720 idles [idlecnt - 1] = w; 2206 idles [ABSPRI (w)][active - 1] = w;
2207 }
1721} 2208}
1722 2209
1723void 2210void
1724ev_idle_stop (EV_P_ ev_idle *w) 2211ev_idle_stop (EV_P_ ev_idle *w)
1725{ 2212{
1726 ev_clear_pending (EV_A_ (W)w); 2213 clear_pending (EV_A_ (W)w);
1727 if (expect_false (!ev_is_active (w))) 2214 if (expect_false (!ev_is_active (w)))
1728 return; 2215 return;
1729 2216
1730 { 2217 {
1731 int active = ((W)w)->active; 2218 int active = ((W)w)->active;
1732 idles [active - 1] = idles [--idlecnt]; 2219
2220 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
1733 ((W)idles [active - 1])->active = active; 2221 ((W)idles [ABSPRI (w)][active - 1])->active = active;
2222
2223 ev_stop (EV_A_ (W)w);
2224 --idleall;
1734 } 2225 }
1735
1736 ev_stop (EV_A_ (W)w);
1737} 2226}
2227#endif
1738 2228
1739void 2229void
1740ev_prepare_start (EV_P_ ev_prepare *w) 2230ev_prepare_start (EV_P_ ev_prepare *w)
1741{ 2231{
1742 if (expect_false (ev_is_active (w))) 2232 if (expect_false (ev_is_active (w)))
1748} 2238}
1749 2239
1750void 2240void
1751ev_prepare_stop (EV_P_ ev_prepare *w) 2241ev_prepare_stop (EV_P_ ev_prepare *w)
1752{ 2242{
1753 ev_clear_pending (EV_A_ (W)w); 2243 clear_pending (EV_A_ (W)w);
1754 if (expect_false (!ev_is_active (w))) 2244 if (expect_false (!ev_is_active (w)))
1755 return; 2245 return;
1756 2246
1757 { 2247 {
1758 int active = ((W)w)->active; 2248 int active = ((W)w)->active;
1775} 2265}
1776 2266
1777void 2267void
1778ev_check_stop (EV_P_ ev_check *w) 2268ev_check_stop (EV_P_ ev_check *w)
1779{ 2269{
1780 ev_clear_pending (EV_A_ (W)w); 2270 clear_pending (EV_A_ (W)w);
1781 if (expect_false (!ev_is_active (w))) 2271 if (expect_false (!ev_is_active (w)))
1782 return; 2272 return;
1783 2273
1784 { 2274 {
1785 int active = ((W)w)->active; 2275 int active = ((W)w)->active;
1792 2282
1793#if EV_EMBED_ENABLE 2283#if EV_EMBED_ENABLE
1794void noinline 2284void noinline
1795ev_embed_sweep (EV_P_ ev_embed *w) 2285ev_embed_sweep (EV_P_ ev_embed *w)
1796{ 2286{
1797 ev_loop (w->loop, EVLOOP_NONBLOCK); 2287 ev_loop (w->other, EVLOOP_NONBLOCK);
1798} 2288}
1799 2289
1800static void 2290static void
1801embed_cb (EV_P_ ev_io *io, int revents) 2291embed_io_cb (EV_P_ ev_io *io, int revents)
1802{ 2292{
1803 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2293 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
1804 2294
1805 if (ev_cb (w)) 2295 if (ev_cb (w))
1806 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2296 ev_feed_event (EV_A_ (W)w, EV_EMBED);
1807 else 2297 else
1808 ev_embed_sweep (loop, w); 2298 ev_loop (w->other, EVLOOP_NONBLOCK);
1809} 2299}
2300
2301static void
2302embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2303{
2304 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2305
2306 {
2307 struct ev_loop *loop = w->other;
2308
2309 while (fdchangecnt)
2310 {
2311 fd_reify (EV_A);
2312 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2313 }
2314 }
2315}
2316
2317#if 0
2318static void
2319embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2320{
2321 ev_idle_stop (EV_A_ idle);
2322}
2323#endif
1810 2324
1811void 2325void
1812ev_embed_start (EV_P_ ev_embed *w) 2326ev_embed_start (EV_P_ ev_embed *w)
1813{ 2327{
1814 if (expect_false (ev_is_active (w))) 2328 if (expect_false (ev_is_active (w)))
1815 return; 2329 return;
1816 2330
1817 { 2331 {
1818 struct ev_loop *loop = w->loop; 2332 struct ev_loop *loop = w->other;
1819 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2333 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
1820 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2334 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
1821 } 2335 }
1822 2336
1823 ev_set_priority (&w->io, ev_priority (w)); 2337 ev_set_priority (&w->io, ev_priority (w));
1824 ev_io_start (EV_A_ &w->io); 2338 ev_io_start (EV_A_ &w->io);
1825 2339
2340 ev_prepare_init (&w->prepare, embed_prepare_cb);
2341 ev_set_priority (&w->prepare, EV_MINPRI);
2342 ev_prepare_start (EV_A_ &w->prepare);
2343
2344 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2345
1826 ev_start (EV_A_ (W)w, 1); 2346 ev_start (EV_A_ (W)w, 1);
1827} 2347}
1828 2348
1829void 2349void
1830ev_embed_stop (EV_P_ ev_embed *w) 2350ev_embed_stop (EV_P_ ev_embed *w)
1831{ 2351{
1832 ev_clear_pending (EV_A_ (W)w); 2352 clear_pending (EV_A_ (W)w);
1833 if (expect_false (!ev_is_active (w))) 2353 if (expect_false (!ev_is_active (w)))
1834 return; 2354 return;
1835 2355
1836 ev_io_stop (EV_A_ &w->io); 2356 ev_io_stop (EV_A_ &w->io);
2357 ev_prepare_stop (EV_A_ &w->prepare);
1837 2358
1838 ev_stop (EV_A_ (W)w); 2359 ev_stop (EV_A_ (W)w);
1839} 2360}
1840#endif 2361#endif
1841 2362
1852} 2373}
1853 2374
1854void 2375void
1855ev_fork_stop (EV_P_ ev_fork *w) 2376ev_fork_stop (EV_P_ ev_fork *w)
1856{ 2377{
1857 ev_clear_pending (EV_A_ (W)w); 2378 clear_pending (EV_A_ (W)w);
1858 if (expect_false (!ev_is_active (w))) 2379 if (expect_false (!ev_is_active (w)))
1859 return; 2380 return;
1860 2381
1861 { 2382 {
1862 int active = ((W)w)->active; 2383 int active = ((W)w)->active;
1930 ev_timer_set (&once->to, timeout, 0.); 2451 ev_timer_set (&once->to, timeout, 0.);
1931 ev_timer_start (EV_A_ &once->to); 2452 ev_timer_start (EV_A_ &once->to);
1932 } 2453 }
1933} 2454}
1934 2455
2456#if EV_MULTIPLICITY
2457 #include "ev_wrap.h"
2458#endif
2459
1935#ifdef __cplusplus 2460#ifdef __cplusplus
1936} 2461}
1937#endif 2462#endif
1938 2463

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines