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

Comparing libev/ev.c (file contents):
Revision 1.149 by root, Tue Nov 27 19:23:31 2007 UTC vs.
Revision 1.246 by root, Wed May 21 12:51:38 2008 UTC

1/* 1/*
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,2008 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
35 43
44/* this big block deduces configuration from config.h */
36#ifndef EV_STANDALONE 45#ifndef EV_STANDALONE
37# ifdef EV_CONFIG_H 46# ifdef EV_CONFIG_H
38# include EV_CONFIG_H 47# include EV_CONFIG_H
39# else 48# else
40# include "config.h" 49# include "config.h"
… …
51# ifndef EV_USE_MONOTONIC 60# ifndef EV_USE_MONOTONIC
52# define EV_USE_MONOTONIC 0 61# define EV_USE_MONOTONIC 0
53# endif 62# endif
54# ifndef EV_USE_REALTIME 63# ifndef EV_USE_REALTIME
55# define EV_USE_REALTIME 0 64# define EV_USE_REALTIME 0
65# endif
66# endif
67
68# ifndef EV_USE_NANOSLEEP
69# if HAVE_NANOSLEEP
70# define EV_USE_NANOSLEEP 1
71# else
72# define EV_USE_NANOSLEEP 0
56# endif 73# endif
57# endif 74# endif
58 75
59# ifndef EV_USE_SELECT 76# ifndef EV_USE_SELECT
60# if HAVE_SELECT && HAVE_SYS_SELECT_H 77# if HAVE_SELECT && HAVE_SYS_SELECT_H
… …
94# else 111# else
95# define EV_USE_PORT 0 112# define EV_USE_PORT 0
96# endif 113# endif
97# endif 114# endif
98 115
116# ifndef EV_USE_INOTIFY
117# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
118# define EV_USE_INOTIFY 1
119# else
120# define EV_USE_INOTIFY 0
121# endif
122# endif
123
124# ifndef EV_USE_EVENTFD
125# if HAVE_EVENTFD
126# define EV_USE_EVENTFD 1
127# else
128# define EV_USE_EVENTFD 0
129# endif
130# endif
131
99#endif 132#endif
100 133
101#include <math.h> 134#include <math.h>
102#include <stdlib.h> 135#include <stdlib.h>
103#include <fcntl.h> 136#include <fcntl.h>
… …
109#include <errno.h> 142#include <errno.h>
110#include <sys/types.h> 143#include <sys/types.h>
111#include <time.h> 144#include <time.h>
112 145
113#include <signal.h> 146#include <signal.h>
147
148#ifdef EV_H
149# include EV_H
150#else
151# include "ev.h"
152#endif
114 153
115#ifndef _WIN32 154#ifndef _WIN32
116# include <sys/time.h> 155# include <sys/time.h>
117# include <sys/wait.h> 156# include <sys/wait.h>
118# include <unistd.h> 157# include <unistd.h>
… …
122# ifndef EV_SELECT_IS_WINSOCKET 161# ifndef EV_SELECT_IS_WINSOCKET
123# define EV_SELECT_IS_WINSOCKET 1 162# define EV_SELECT_IS_WINSOCKET 1
124# endif 163# endif
125#endif 164#endif
126 165
127/**/ 166/* this block tries to deduce configuration from header-defined symbols and defaults */
128 167
129#ifndef EV_USE_MONOTONIC 168#ifndef EV_USE_MONOTONIC
130# define EV_USE_MONOTONIC 0 169# define EV_USE_MONOTONIC 0
131#endif 170#endif
132 171
133#ifndef EV_USE_REALTIME 172#ifndef EV_USE_REALTIME
134# define EV_USE_REALTIME 0 173# define EV_USE_REALTIME 0
174#endif
175
176#ifndef EV_USE_NANOSLEEP
177# define EV_USE_NANOSLEEP 0
135#endif 178#endif
136 179
137#ifndef EV_USE_SELECT 180#ifndef EV_USE_SELECT
138# define EV_USE_SELECT 1 181# define EV_USE_SELECT 1
139#endif 182#endif
… …
145# define EV_USE_POLL 1 188# define EV_USE_POLL 1
146# endif 189# endif
147#endif 190#endif
148 191
149#ifndef EV_USE_EPOLL 192#ifndef EV_USE_EPOLL
193# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
194# define EV_USE_EPOLL 1
195# else
150# define EV_USE_EPOLL 0 196# define EV_USE_EPOLL 0
197# endif
151#endif 198#endif
152 199
153#ifndef EV_USE_KQUEUE 200#ifndef EV_USE_KQUEUE
154# define EV_USE_KQUEUE 0 201# define EV_USE_KQUEUE 0
155#endif 202#endif
156 203
157#ifndef EV_USE_PORT 204#ifndef EV_USE_PORT
158# define EV_USE_PORT 0 205# define EV_USE_PORT 0
206#endif
207
208#ifndef EV_USE_INOTIFY
209# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
210# define EV_USE_INOTIFY 1
211# else
212# define EV_USE_INOTIFY 0
213# endif
159#endif 214#endif
160 215
161#ifndef EV_PID_HASHSIZE 216#ifndef EV_PID_HASHSIZE
162# if EV_MINIMAL 217# if EV_MINIMAL
163# define EV_PID_HASHSIZE 1 218# define EV_PID_HASHSIZE 1
164# else 219# else
165# define EV_PID_HASHSIZE 16 220# define EV_PID_HASHSIZE 16
166# endif 221# endif
167#endif 222#endif
168 223
169/**/ 224#ifndef EV_INOTIFY_HASHSIZE
225# if EV_MINIMAL
226# define EV_INOTIFY_HASHSIZE 1
227# else
228# define EV_INOTIFY_HASHSIZE 16
229# endif
230#endif
231
232#ifndef EV_USE_EVENTFD
233# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
234# define EV_USE_EVENTFD 1
235# else
236# define EV_USE_EVENTFD 0
237# endif
238#endif
239
240#ifndef EV_USE_4HEAP
241# define EV_USE_4HEAP !EV_MINIMAL
242#endif
243
244#ifndef EV_HEAP_CACHE_AT
245# define EV_HEAP_CACHE_AT !EV_MINIMAL
246#endif
247
248/* this block fixes any misconfiguration where we know we run into trouble otherwise */
170 249
171#ifndef CLOCK_MONOTONIC 250#ifndef CLOCK_MONOTONIC
172# undef EV_USE_MONOTONIC 251# undef EV_USE_MONOTONIC
173# define EV_USE_MONOTONIC 0 252# define EV_USE_MONOTONIC 0
174#endif 253#endif
… …
176#ifndef CLOCK_REALTIME 255#ifndef CLOCK_REALTIME
177# undef EV_USE_REALTIME 256# undef EV_USE_REALTIME
178# define EV_USE_REALTIME 0 257# define EV_USE_REALTIME 0
179#endif 258#endif
180 259
260#if !EV_STAT_ENABLE
261# undef EV_USE_INOTIFY
262# define EV_USE_INOTIFY 0
263#endif
264
265#if !EV_USE_NANOSLEEP
266# ifndef _WIN32
267# include <sys/select.h>
268# endif
269#endif
270
271#if EV_USE_INOTIFY
272# include <sys/inotify.h>
273#endif
274
181#if EV_SELECT_IS_WINSOCKET 275#if EV_SELECT_IS_WINSOCKET
182# include <winsock.h> 276# include <winsock.h>
183#endif 277#endif
184 278
279#if EV_USE_EVENTFD
280/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
281# include <stdint.h>
282# ifdef __cplusplus
283extern "C" {
284# endif
285int eventfd (unsigned int initval, int flags);
286# ifdef __cplusplus
287}
288# endif
289#endif
290
185/**/ 291/**/
292
293/*
294 * This is used to avoid floating point rounding problems.
295 * It is added to ev_rt_now when scheduling periodics
296 * to ensure progress, time-wise, even when rounding
297 * errors are against us.
298 * This value is good at least till the year 4000.
299 * Better solutions welcome.
300 */
301#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
186 302
187#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 303#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
188#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 304#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
189/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */ 305/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
190 306
191#ifdef EV_H
192# include EV_H
193#else
194# include "ev.h"
195#endif
196
197#if __GNUC__ >= 3 307#if __GNUC__ >= 4
198# define expect(expr,value) __builtin_expect ((expr),(value)) 308# define expect(expr,value) __builtin_expect ((expr),(value))
199# define inline_size static inline /* inline for codesize */
200# if EV_MINIMAL
201# define noinline __attribute__ ((noinline)) 309# define noinline __attribute__ ((noinline))
202# define inline_speed static noinline
203# else
204# define noinline
205# define inline_speed static inline
206# endif
207#else 310#else
208# define expect(expr,value) (expr) 311# define expect(expr,value) (expr)
209# define inline_speed static
210# define inline_size static
211# define noinline 312# define noinline
313# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
314# define inline
315# endif
212#endif 316#endif
213 317
214#define expect_false(expr) expect ((expr) != 0, 0) 318#define expect_false(expr) expect ((expr) != 0, 0)
215#define expect_true(expr) expect ((expr) != 0, 1) 319#define expect_true(expr) expect ((expr) != 0, 1)
320#define inline_size static inline
321
322#if EV_MINIMAL
323# define inline_speed static noinline
324#else
325# define inline_speed static inline
326#endif
216 327
217#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 328#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
218#define ABSPRI(w) ((w)->priority - EV_MINPRI) 329#define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
219 330
220#define EMPTY0 /* required for microsofts broken pseudo-c compiler */ 331#define EMPTY /* required for microsofts broken pseudo-c compiler */
221#define EMPTY2(a,b) /* used to suppress some warnings */ 332#define EMPTY2(a,b) /* used to suppress some warnings */
222 333
223typedef ev_watcher *W; 334typedef ev_watcher *W;
224typedef ev_watcher_list *WL; 335typedef ev_watcher_list *WL;
225typedef ev_watcher_time *WT; 336typedef ev_watcher_time *WT;
226 337
338#define ev_active(w) ((W)(w))->active
339#define ev_at(w) ((WT)(w))->at
340
341#if EV_USE_MONOTONIC
342/* sig_atomic_t is used to avoid per-thread variables or locking but still */
343/* giving it a reasonably high chance of working on typical architetcures */
227static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 344static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
345#endif
228 346
229#ifdef _WIN32 347#ifdef _WIN32
230# include "ev_win32.c" 348# include "ev_win32.c"
231#endif 349#endif
232 350
… …
253 perror (msg); 371 perror (msg);
254 abort (); 372 abort ();
255 } 373 }
256} 374}
257 375
376static void *
377ev_realloc_emul (void *ptr, long size)
378{
379 /* some systems, notably openbsd and darwin, fail to properly
380 * implement realloc (x, 0) (as required by both ansi c-98 and
381 * the single unix specification, so work around them here.
382 */
383
384 if (size)
385 return realloc (ptr, size);
386
387 free (ptr);
388 return 0;
389}
390
258static void *(*alloc)(void *ptr, long size); 391static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
259 392
260void 393void
261ev_set_allocator (void *(*cb)(void *ptr, long size)) 394ev_set_allocator (void *(*cb)(void *ptr, long size))
262{ 395{
263 alloc = cb; 396 alloc = cb;
264} 397}
265 398
266static void * 399inline_speed void *
267ev_realloc (void *ptr, long size) 400ev_realloc (void *ptr, long size)
268{ 401{
269 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 402 ptr = alloc (ptr, size);
270 403
271 if (!ptr && size) 404 if (!ptr && size)
272 { 405 {
273 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 406 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
274 abort (); 407 abort ();
… …
295typedef struct 428typedef struct
296{ 429{
297 W w; 430 W w;
298 int events; 431 int events;
299} ANPENDING; 432} ANPENDING;
433
434#if EV_USE_INOTIFY
435/* hash table entry per inotify-id */
436typedef struct
437{
438 WL head;
439} ANFS;
440#endif
441
442/* Heap Entry */
443#if EV_HEAP_CACHE_AT
444 typedef struct {
445 ev_tstamp at;
446 WT w;
447 } ANHE;
448
449 #define ANHE_w(he) (he).w /* access watcher, read-write */
450 #define ANHE_at(he) (he).at /* access cached at, read-only */
451 #define ANHE_at_set(he) (he).at = (he).w->at /* update at from watcher */
452#else
453 typedef WT ANHE;
454
455 #define ANHE_w(he) (he)
456 #define ANHE_at(he) (he)->at
457 #define ANHE_at_set(he)
458#endif
300 459
301#if EV_MULTIPLICITY 460#if EV_MULTIPLICITY
302 461
303 struct ev_loop 462 struct ev_loop
304 { 463 {
… …
361{ 520{
362 return ev_rt_now; 521 return ev_rt_now;
363} 522}
364#endif 523#endif
365 524
366#define array_roundsize(type,n) (((n) | 4) & ~3) 525void
526ev_sleep (ev_tstamp delay)
527{
528 if (delay > 0.)
529 {
530#if EV_USE_NANOSLEEP
531 struct timespec ts;
532
533 ts.tv_sec = (time_t)delay;
534 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
535
536 nanosleep (&ts, 0);
537#elif defined(_WIN32)
538 Sleep ((unsigned long)(delay * 1e3));
539#else
540 struct timeval tv;
541
542 tv.tv_sec = (time_t)delay;
543 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
544
545 select (0, 0, 0, 0, &tv);
546#endif
547 }
548}
549
550/*****************************************************************************/
551
552#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
553
554int inline_size
555array_nextsize (int elem, int cur, int cnt)
556{
557 int ncur = cur + 1;
558
559 do
560 ncur <<= 1;
561 while (cnt > ncur);
562
563 /* if size is large, round to MALLOC_ROUND - 4 * longs to accomodate malloc overhead */
564 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
565 {
566 ncur *= elem;
567 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
568 ncur = ncur - sizeof (void *) * 4;
569 ncur /= elem;
570 }
571
572 return ncur;
573}
574
575static noinline void *
576array_realloc (int elem, void *base, int *cur, int cnt)
577{
578 *cur = array_nextsize (elem, *cur, cnt);
579 return ev_realloc (base, elem * *cur);
580}
367 581
368#define array_needsize(type,base,cur,cnt,init) \ 582#define array_needsize(type,base,cur,cnt,init) \
369 if (expect_false ((cnt) > cur)) \ 583 if (expect_false ((cnt) > (cur))) \
370 { \ 584 { \
371 int newcnt = cur; \ 585 int ocur_ = (cur); \
372 do \ 586 (base) = (type *)array_realloc \
373 { \ 587 (sizeof (type), (base), &(cur), (cnt)); \
374 newcnt = array_roundsize (type, newcnt << 1); \ 588 init ((base) + (ocur_), (cur) - ocur_); \
375 } \
376 while ((cnt) > newcnt); \
377 \
378 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
379 init (base + cur, newcnt - cur); \
380 cur = newcnt; \
381 } 589 }
382 590
591#if 0
383#define array_slim(type,stem) \ 592#define array_slim(type,stem) \
384 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 593 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
385 { \ 594 { \
386 stem ## max = array_roundsize (stem ## cnt >> 1); \ 595 stem ## max = array_roundsize (stem ## cnt >> 1); \
387 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 596 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
388 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 597 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
389 } 598 }
599#endif
390 600
391#define array_free(stem, idx) \ 601#define array_free(stem, idx) \
392 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 602 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
393 603
394/*****************************************************************************/ 604/*****************************************************************************/
395 605
396void noinline 606void noinline
397ev_feed_event (EV_P_ void *w, int revents) 607ev_feed_event (EV_P_ void *w, int revents)
398{ 608{
399 W w_ = (W)w; 609 W w_ = (W)w;
610 int pri = ABSPRI (w_);
400 611
401 if (expect_false (w_->pending)) 612 if (expect_false (w_->pending))
613 pendings [pri][w_->pending - 1].events |= revents;
614 else
402 { 615 {
616 w_->pending = ++pendingcnt [pri];
617 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
618 pendings [pri][w_->pending - 1].w = w_;
403 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 619 pendings [pri][w_->pending - 1].events = revents;
404 return;
405 } 620 }
406
407 w_->pending = ++pendingcnt [ABSPRI (w_)];
408 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
409 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
410 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
411} 621}
412 622
413void inline_size 623void inline_speed
414queue_events (EV_P_ W *events, int eventcnt, int type) 624queue_events (EV_P_ W *events, int eventcnt, int type)
415{ 625{
416 int i; 626 int i;
417 627
418 for (i = 0; i < eventcnt; ++i) 628 for (i = 0; i < eventcnt; ++i)
… …
450} 660}
451 661
452void 662void
453ev_feed_fd_event (EV_P_ int fd, int revents) 663ev_feed_fd_event (EV_P_ int fd, int revents)
454{ 664{
665 if (fd >= 0 && fd < anfdmax)
455 fd_event (EV_A_ fd, revents); 666 fd_event (EV_A_ fd, revents);
456} 667}
457 668
458void inline_size 669void inline_size
459fd_reify (EV_P) 670fd_reify (EV_P)
460{ 671{
… …
464 { 675 {
465 int fd = fdchanges [i]; 676 int fd = fdchanges [i];
466 ANFD *anfd = anfds + fd; 677 ANFD *anfd = anfds + fd;
467 ev_io *w; 678 ev_io *w;
468 679
469 int events = 0; 680 unsigned char events = 0;
470 681
471 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 682 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
472 events |= w->events; 683 events |= (unsigned char)w->events;
473 684
474#if EV_SELECT_IS_WINSOCKET 685#if EV_SELECT_IS_WINSOCKET
475 if (events) 686 if (events)
476 { 687 {
477 unsigned long argp; 688 unsigned long argp;
689 #ifdef EV_FD_TO_WIN32_HANDLE
690 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
691 #else
478 anfd->handle = _get_osfhandle (fd); 692 anfd->handle = _get_osfhandle (fd);
693 #endif
479 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 694 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
480 } 695 }
481#endif 696#endif
482 697
698 {
699 unsigned char o_events = anfd->events;
700 unsigned char o_reify = anfd->reify;
701
483 anfd->reify = 0; 702 anfd->reify = 0;
484
485 backend_modify (EV_A_ fd, anfd->events, events);
486 anfd->events = events; 703 anfd->events = events;
704
705 if (o_events != events || o_reify & EV_IOFDSET)
706 backend_modify (EV_A_ fd, o_events, events);
707 }
487 } 708 }
488 709
489 fdchangecnt = 0; 710 fdchangecnt = 0;
490} 711}
491 712
492void inline_size 713void inline_size
493fd_change (EV_P_ int fd) 714fd_change (EV_P_ int fd, int flags)
494{ 715{
495 if (expect_false (anfds [fd].reify)) 716 unsigned char reify = anfds [fd].reify;
496 return;
497
498 anfds [fd].reify = 1; 717 anfds [fd].reify |= flags;
499 718
719 if (expect_true (!reify))
720 {
500 ++fdchangecnt; 721 ++fdchangecnt;
501 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 722 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
502 fdchanges [fdchangecnt - 1] = fd; 723 fdchanges [fdchangecnt - 1] = fd;
724 }
503} 725}
504 726
505void inline_speed 727void inline_speed
506fd_kill (EV_P_ int fd) 728fd_kill (EV_P_ int fd)
507{ 729{
… …
554static void noinline 776static void noinline
555fd_rearm_all (EV_P) 777fd_rearm_all (EV_P)
556{ 778{
557 int fd; 779 int fd;
558 780
559 /* this should be highly optimised to not do anything but set a flag */
560 for (fd = 0; fd < anfdmax; ++fd) 781 for (fd = 0; fd < anfdmax; ++fd)
561 if (anfds [fd].events) 782 if (anfds [fd].events)
562 { 783 {
563 anfds [fd].events = 0; 784 anfds [fd].events = 0;
564 fd_change (EV_A_ fd); 785 fd_change (EV_A_ fd, EV_IOFDSET | 1);
565 } 786 }
566} 787}
567 788
568/*****************************************************************************/ 789/*****************************************************************************/
569 790
791/*
792 * the heap functions want a real array index. array index 0 uis guaranteed to not
793 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
794 * the branching factor of the d-tree.
795 */
796
797/*
798 * at the moment we allow libev the luxury of two heaps,
799 * a small-code-size 2-heap one and a ~1.5kb larger 4-heap
800 * which is more cache-efficient.
801 * the difference is about 5% with 50000+ watchers.
802 */
803#if EV_USE_4HEAP
804
805#define DHEAP 4
806#define HEAP0 (DHEAP - 1) /* index of first element in heap */
807
808/* towards the root */
570void inline_speed 809void inline_speed
571upheap (WT *heap, int k) 810upheap (ANHE *heap, int k)
572{ 811{
573 WT w = heap [k]; 812 ANHE he = heap [k];
574 813
575 while (k && heap [k >> 1]->at > w->at) 814 for (;;)
576 { 815 {
816 int p = ((k - HEAP0 - 1) / DHEAP) + HEAP0;
817
818 if (p == k || ANHE_at (heap [p]) <= ANHE_at (he))
819 break;
820
577 heap [k] = heap [k >> 1]; 821 heap [k] = heap [p];
578 ((W)heap [k])->active = k + 1; 822 ev_active (ANHE_w (heap [k])) = k;
579 k >>= 1; 823 k = p;
580 } 824 }
581 825
826 ev_active (ANHE_w (he)) = k;
582 heap [k] = w; 827 heap [k] = he;
583 ((W)heap [k])->active = k + 1;
584
585} 828}
586 829
830/* away from the root */
587void inline_speed 831void inline_speed
588downheap (WT *heap, int N, int k) 832downheap (ANHE *heap, int N, int k)
589{ 833{
590 WT w = heap [k]; 834 ANHE he = heap [k];
835 ANHE *E = heap + N + HEAP0;
591 836
592 while (k < (N >> 1)) 837 for (;;)
593 { 838 {
594 int j = k << 1; 839 ev_tstamp minat;
840 ANHE *minpos;
841 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0;
595 842
596 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 843 // find minimum child
844 if (expect_true (pos + DHEAP - 1 < E))
597 ++j; 845 {
598 846 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
599 if (w->at <= heap [j]->at) 847 if ( ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
848 if ( ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
849 if ( ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
850 }
851 else if (pos < E)
852 {
853 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
854 if (pos + 1 < E && ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
855 if (pos + 2 < E && ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
856 if (pos + 3 < E && ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
857 }
858 else
600 break; 859 break;
601 860
861 if (ANHE_at (he) <= minat)
862 break;
863
864 ev_active (ANHE_w (*minpos)) = k;
865 heap [k] = *minpos;
866
867 k = minpos - heap;
868 }
869
870 ev_active (ANHE_w (he)) = k;
871 heap [k] = he;
872}
873
874#else // 4HEAP
875
876#define HEAP0 1
877
878/* towards the root */
879void inline_speed
880upheap (ANHE *heap, int k)
881{
882 ANHE he = heap [k];
883
884 for (;;)
885 {
886 int p = k >> 1;
887
888 /* maybe we could use a dummy element at heap [0]? */
889 if (!p || ANHE_at (heap [p]) <= ANHE_at (he))
890 break;
891
602 heap [k] = heap [j]; 892 heap [k] = heap [p];
603 ((W)heap [k])->active = k + 1; 893 ev_active (ANHE_w (heap [k])) = k;
604 k = j; 894 k = p;
605 } 895 }
606 896
607 heap [k] = w; 897 heap [k] = he;
608 ((W)heap [k])->active = k + 1; 898 ev_active (ANHE_w (heap [k])) = k;
609} 899}
900
901/* away from the root */
902void inline_speed
903downheap (ANHE *heap, int N, int k)
904{
905 ANHE he = heap [k];
906
907 for (;;)
908 {
909 int c = k << 1;
910
911 if (c > N)
912 break;
913
914 c += c + 1 < N && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
915 ? 1 : 0;
916
917 if (ANHE_at (he) <= ANHE_at (heap [c]))
918 break;
919
920 heap [k] = heap [c];
921 ev_active (ANHE_w (heap [k])) = k;
922
923 k = c;
924 }
925
926 heap [k] = he;
927 ev_active (ANHE_w (he)) = k;
928}
929#endif
610 930
611void inline_size 931void inline_size
612adjustheap (WT *heap, int N, int k) 932adjustheap (ANHE *heap, int N, int k)
613{ 933{
614 upheap (heap, k); 934 upheap (heap, k);
615 downheap (heap, N, k); 935 downheap (heap, N, k);
616} 936}
617 937
618/*****************************************************************************/ 938/*****************************************************************************/
619 939
620typedef struct 940typedef struct
621{ 941{
622 WL head; 942 WL head;
623 sig_atomic_t volatile gotsig; 943 EV_ATOMIC_T gotsig;
624} ANSIG; 944} ANSIG;
625 945
626static ANSIG *signals; 946static ANSIG *signals;
627static int signalmax; 947static int signalmax;
628 948
629static int sigpipe [2]; 949static EV_ATOMIC_T gotsig;
630static sig_atomic_t volatile gotsig;
631static ev_io sigev;
632 950
633void inline_size 951void inline_size
634signals_init (ANSIG *base, int count) 952signals_init (ANSIG *base, int count)
635{ 953{
636 while (count--) 954 while (count--)
… …
640 958
641 ++base; 959 ++base;
642 } 960 }
643} 961}
644 962
645static void 963/*****************************************************************************/
646sighandler (int signum)
647{
648#if _WIN32
649 signal (signum, sighandler);
650#endif
651 964
652 signals [signum - 1].gotsig = 1;
653
654 if (!gotsig)
655 {
656 int old_errno = errno;
657 gotsig = 1;
658 write (sigpipe [1], &signum, 1);
659 errno = old_errno;
660 }
661}
662
663void noinline
664ev_feed_signal_event (EV_P_ int signum)
665{
666 WL w;
667
668#if EV_MULTIPLICITY
669 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
670#endif
671
672 --signum;
673
674 if (signum < 0 || signum >= signalmax)
675 return;
676
677 signals [signum].gotsig = 0;
678
679 for (w = signals [signum].head; w; w = w->next)
680 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
681}
682
683static void
684sigcb (EV_P_ ev_io *iow, int revents)
685{
686 int signum;
687
688 read (sigpipe [0], &revents, 1);
689 gotsig = 0;
690
691 for (signum = signalmax; signum--; )
692 if (signals [signum].gotsig)
693 ev_feed_signal_event (EV_A_ signum + 1);
694}
695
696void inline_size 965void inline_speed
697fd_intern (int fd) 966fd_intern (int fd)
698{ 967{
699#ifdef _WIN32 968#ifdef _WIN32
700 int arg = 1; 969 int arg = 1;
701 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 970 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
704 fcntl (fd, F_SETFL, O_NONBLOCK); 973 fcntl (fd, F_SETFL, O_NONBLOCK);
705#endif 974#endif
706} 975}
707 976
708static void noinline 977static void noinline
709siginit (EV_P) 978evpipe_init (EV_P)
710{ 979{
980 if (!ev_is_active (&pipeev))
981 {
982#if EV_USE_EVENTFD
983 if ((evfd = eventfd (0, 0)) >= 0)
984 {
985 evpipe [0] = -1;
986 fd_intern (evfd);
987 ev_io_set (&pipeev, evfd, EV_READ);
988 }
989 else
990#endif
991 {
992 while (pipe (evpipe))
993 syserr ("(libev) error creating signal/async pipe");
994
711 fd_intern (sigpipe [0]); 995 fd_intern (evpipe [0]);
712 fd_intern (sigpipe [1]); 996 fd_intern (evpipe [1]);
997 ev_io_set (&pipeev, evpipe [0], EV_READ);
998 }
713 999
714 ev_io_set (&sigev, sigpipe [0], EV_READ);
715 ev_io_start (EV_A_ &sigev); 1000 ev_io_start (EV_A_ &pipeev);
716 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1001 ev_unref (EV_A); /* watcher should not keep loop alive */
1002 }
1003}
1004
1005void inline_size
1006evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1007{
1008 if (!*flag)
1009 {
1010 int old_errno = errno; /* save errno because write might clobber it */
1011
1012 *flag = 1;
1013
1014#if EV_USE_EVENTFD
1015 if (evfd >= 0)
1016 {
1017 uint64_t counter = 1;
1018 write (evfd, &counter, sizeof (uint64_t));
1019 }
1020 else
1021#endif
1022 write (evpipe [1], &old_errno, 1);
1023
1024 errno = old_errno;
1025 }
1026}
1027
1028static void
1029pipecb (EV_P_ ev_io *iow, int revents)
1030{
1031#if EV_USE_EVENTFD
1032 if (evfd >= 0)
1033 {
1034 uint64_t counter;
1035 read (evfd, &counter, sizeof (uint64_t));
1036 }
1037 else
1038#endif
1039 {
1040 char dummy;
1041 read (evpipe [0], &dummy, 1);
1042 }
1043
1044 if (gotsig && ev_is_default_loop (EV_A))
1045 {
1046 int signum;
1047 gotsig = 0;
1048
1049 for (signum = signalmax; signum--; )
1050 if (signals [signum].gotsig)
1051 ev_feed_signal_event (EV_A_ signum + 1);
1052 }
1053
1054#if EV_ASYNC_ENABLE
1055 if (gotasync)
1056 {
1057 int i;
1058 gotasync = 0;
1059
1060 for (i = asynccnt; i--; )
1061 if (asyncs [i]->sent)
1062 {
1063 asyncs [i]->sent = 0;
1064 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
1065 }
1066 }
1067#endif
717} 1068}
718 1069
719/*****************************************************************************/ 1070/*****************************************************************************/
720 1071
1072static void
1073ev_sighandler (int signum)
1074{
1075#if EV_MULTIPLICITY
1076 struct ev_loop *loop = &default_loop_struct;
1077#endif
1078
1079#if _WIN32
1080 signal (signum, ev_sighandler);
1081#endif
1082
1083 signals [signum - 1].gotsig = 1;
1084 evpipe_write (EV_A_ &gotsig);
1085}
1086
1087void noinline
1088ev_feed_signal_event (EV_P_ int signum)
1089{
1090 WL w;
1091
1092#if EV_MULTIPLICITY
1093 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
1094#endif
1095
1096 --signum;
1097
1098 if (signum < 0 || signum >= signalmax)
1099 return;
1100
1101 signals [signum].gotsig = 0;
1102
1103 for (w = signals [signum].head; w; w = w->next)
1104 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1105}
1106
1107/*****************************************************************************/
1108
721static ev_child *childs [EV_PID_HASHSIZE]; 1109static WL childs [EV_PID_HASHSIZE];
722 1110
723#ifndef _WIN32 1111#ifndef _WIN32
724 1112
725static ev_signal childev; 1113static ev_signal childev;
726 1114
1115#ifndef WIFCONTINUED
1116# define WIFCONTINUED(status) 0
1117#endif
1118
727void inline_speed 1119void inline_speed
728child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1120child_reap (EV_P_ int chain, int pid, int status)
729{ 1121{
730 ev_child *w; 1122 ev_child *w;
1123 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
731 1124
732 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1125 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1126 {
733 if (w->pid == pid || !w->pid) 1127 if ((w->pid == pid || !w->pid)
1128 && (!traced || (w->flags & 1)))
734 { 1129 {
735 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 1130 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
736 w->rpid = pid; 1131 w->rpid = pid;
737 w->rstatus = status; 1132 w->rstatus = status;
738 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1133 ev_feed_event (EV_A_ (W)w, EV_CHILD);
739 } 1134 }
1135 }
740} 1136}
741 1137
742#ifndef WCONTINUED 1138#ifndef WCONTINUED
743# define WCONTINUED 0 1139# define WCONTINUED 0
744#endif 1140#endif
… …
753 if (!WCONTINUED 1149 if (!WCONTINUED
754 || errno != EINVAL 1150 || errno != EINVAL
755 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1151 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
756 return; 1152 return;
757 1153
758 /* make sure we are called again until all childs have been reaped */ 1154 /* make sure we are called again until all children have been reaped */
759 /* we need to do it this way so that the callback gets called before we continue */ 1155 /* we need to do it this way so that the callback gets called before we continue */
760 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1156 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
761 1157
762 child_reap (EV_A_ sw, pid, pid, status); 1158 child_reap (EV_A_ pid, pid, status);
763 if (EV_PID_HASHSIZE > 1) 1159 if (EV_PID_HASHSIZE > 1)
764 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1160 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
765} 1161}
766 1162
767#endif 1163#endif
768 1164
769/*****************************************************************************/ 1165/*****************************************************************************/
… …
841} 1237}
842 1238
843unsigned int 1239unsigned int
844ev_embeddable_backends (void) 1240ev_embeddable_backends (void)
845{ 1241{
846 return EVBACKEND_EPOLL 1242 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
847 | EVBACKEND_KQUEUE 1243
848 | EVBACKEND_PORT; 1244 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1245 /* please fix it and tell me how to detect the fix */
1246 flags &= ~EVBACKEND_EPOLL;
1247
1248 return flags;
849} 1249}
850 1250
851unsigned int 1251unsigned int
852ev_backend (EV_P) 1252ev_backend (EV_P)
853{ 1253{
854 return backend; 1254 return backend;
855} 1255}
856 1256
857static void 1257unsigned int
1258ev_loop_count (EV_P)
1259{
1260 return loop_count;
1261}
1262
1263void
1264ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1265{
1266 io_blocktime = interval;
1267}
1268
1269void
1270ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1271{
1272 timeout_blocktime = interval;
1273}
1274
1275static void noinline
858loop_init (EV_P_ unsigned int flags) 1276loop_init (EV_P_ unsigned int flags)
859{ 1277{
860 if (!backend) 1278 if (!backend)
861 { 1279 {
862#if EV_USE_MONOTONIC 1280#if EV_USE_MONOTONIC
… …
865 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1283 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
866 have_monotonic = 1; 1284 have_monotonic = 1;
867 } 1285 }
868#endif 1286#endif
869 1287
870 ev_rt_now = ev_time (); 1288 ev_rt_now = ev_time ();
871 mn_now = get_clock (); 1289 mn_now = get_clock ();
872 now_floor = mn_now; 1290 now_floor = mn_now;
873 rtmn_diff = ev_rt_now - mn_now; 1291 rtmn_diff = ev_rt_now - mn_now;
1292
1293 io_blocktime = 0.;
1294 timeout_blocktime = 0.;
1295 backend = 0;
1296 backend_fd = -1;
1297 gotasync = 0;
1298#if EV_USE_INOTIFY
1299 fs_fd = -2;
1300#endif
1301
1302 /* pid check not overridable via env */
1303#ifndef _WIN32
1304 if (flags & EVFLAG_FORKCHECK)
1305 curpid = getpid ();
1306#endif
874 1307
875 if (!(flags & EVFLAG_NOENV) 1308 if (!(flags & EVFLAG_NOENV)
876 && !enable_secure () 1309 && !enable_secure ()
877 && getenv ("LIBEV_FLAGS")) 1310 && getenv ("LIBEV_FLAGS"))
878 flags = atoi (getenv ("LIBEV_FLAGS")); 1311 flags = atoi (getenv ("LIBEV_FLAGS"));
879 1312
880 if (!(flags & 0x0000ffffUL)) 1313 if (!(flags & 0x0000ffffU))
881 flags |= ev_recommended_backends (); 1314 flags |= ev_recommended_backends ();
882 1315
883 backend = 0;
884#if EV_USE_PORT 1316#if EV_USE_PORT
885 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1317 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
886#endif 1318#endif
887#if EV_USE_KQUEUE 1319#if EV_USE_KQUEUE
888 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1320 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
895#endif 1327#endif
896#if EV_USE_SELECT 1328#if EV_USE_SELECT
897 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1329 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
898#endif 1330#endif
899 1331
900 ev_init (&sigev, sigcb); 1332 ev_init (&pipeev, pipecb);
901 ev_set_priority (&sigev, EV_MAXPRI); 1333 ev_set_priority (&pipeev, EV_MAXPRI);
902 } 1334 }
903} 1335}
904 1336
905static void 1337static void noinline
906loop_destroy (EV_P) 1338loop_destroy (EV_P)
907{ 1339{
908 int i; 1340 int i;
1341
1342 if (ev_is_active (&pipeev))
1343 {
1344 ev_ref (EV_A); /* signal watcher */
1345 ev_io_stop (EV_A_ &pipeev);
1346
1347#if EV_USE_EVENTFD
1348 if (evfd >= 0)
1349 close (evfd);
1350#endif
1351
1352 if (evpipe [0] >= 0)
1353 {
1354 close (evpipe [0]);
1355 close (evpipe [1]);
1356 }
1357 }
1358
1359#if EV_USE_INOTIFY
1360 if (fs_fd >= 0)
1361 close (fs_fd);
1362#endif
1363
1364 if (backend_fd >= 0)
1365 close (backend_fd);
909 1366
910#if EV_USE_PORT 1367#if EV_USE_PORT
911 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1368 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
912#endif 1369#endif
913#if EV_USE_KQUEUE 1370#if EV_USE_KQUEUE
… …
922#if EV_USE_SELECT 1379#if EV_USE_SELECT
923 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1380 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
924#endif 1381#endif
925 1382
926 for (i = NUMPRI; i--; ) 1383 for (i = NUMPRI; i--; )
1384 {
927 array_free (pending, [i]); 1385 array_free (pending, [i]);
1386#if EV_IDLE_ENABLE
1387 array_free (idle, [i]);
1388#endif
1389 }
1390
1391 ev_free (anfds); anfdmax = 0;
928 1392
929 /* have to use the microsoft-never-gets-it-right macro */ 1393 /* have to use the microsoft-never-gets-it-right macro */
930 array_free (fdchange, EMPTY0); 1394 array_free (fdchange, EMPTY);
931 array_free (timer, EMPTY0); 1395 array_free (timer, EMPTY);
932#if EV_PERIODIC_ENABLE 1396#if EV_PERIODIC_ENABLE
933 array_free (periodic, EMPTY0); 1397 array_free (periodic, EMPTY);
934#endif 1398#endif
1399#if EV_FORK_ENABLE
935 array_free (idle, EMPTY0); 1400 array_free (fork, EMPTY);
1401#endif
936 array_free (prepare, EMPTY0); 1402 array_free (prepare, EMPTY);
937 array_free (check, EMPTY0); 1403 array_free (check, EMPTY);
1404#if EV_ASYNC_ENABLE
1405 array_free (async, EMPTY);
1406#endif
938 1407
939 backend = 0; 1408 backend = 0;
940} 1409}
941 1410
942static void 1411#if EV_USE_INOTIFY
1412void inline_size infy_fork (EV_P);
1413#endif
1414
1415void inline_size
943loop_fork (EV_P) 1416loop_fork (EV_P)
944{ 1417{
945#if EV_USE_PORT 1418#if EV_USE_PORT
946 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1419 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
947#endif 1420#endif
… …
949 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A); 1422 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
950#endif 1423#endif
951#if EV_USE_EPOLL 1424#if EV_USE_EPOLL
952 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A); 1425 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
953#endif 1426#endif
1427#if EV_USE_INOTIFY
1428 infy_fork (EV_A);
1429#endif
954 1430
955 if (ev_is_active (&sigev)) 1431 if (ev_is_active (&pipeev))
956 { 1432 {
957 /* default loop */ 1433 /* this "locks" the handlers against writing to the pipe */
1434 /* while we modify the fd vars */
1435 gotsig = 1;
1436#if EV_ASYNC_ENABLE
1437 gotasync = 1;
1438#endif
958 1439
959 ev_ref (EV_A); 1440 ev_ref (EV_A);
960 ev_io_stop (EV_A_ &sigev); 1441 ev_io_stop (EV_A_ &pipeev);
1442
1443#if EV_USE_EVENTFD
1444 if (evfd >= 0)
1445 close (evfd);
1446#endif
1447
1448 if (evpipe [0] >= 0)
1449 {
961 close (sigpipe [0]); 1450 close (evpipe [0]);
962 close (sigpipe [1]); 1451 close (evpipe [1]);
1452 }
963 1453
964 while (pipe (sigpipe))
965 syserr ("(libev) error creating pipe");
966
967 siginit (EV_A); 1454 evpipe_init (EV_A);
1455 /* now iterate over everything, in case we missed something */
1456 pipecb (EV_A_ &pipeev, EV_READ);
968 } 1457 }
969 1458
970 postfork = 0; 1459 postfork = 0;
971} 1460}
972 1461
… …
994} 1483}
995 1484
996void 1485void
997ev_loop_fork (EV_P) 1486ev_loop_fork (EV_P)
998{ 1487{
999 postfork = 1; 1488 postfork = 1; /* must be in line with ev_default_fork */
1000} 1489}
1001
1002#endif 1490#endif
1003 1491
1004#if EV_MULTIPLICITY 1492#if EV_MULTIPLICITY
1005struct ev_loop * 1493struct ev_loop *
1006ev_default_loop_init (unsigned int flags) 1494ev_default_loop_init (unsigned int flags)
1007#else 1495#else
1008int 1496int
1009ev_default_loop (unsigned int flags) 1497ev_default_loop (unsigned int flags)
1010#endif 1498#endif
1011{ 1499{
1012 if (sigpipe [0] == sigpipe [1])
1013 if (pipe (sigpipe))
1014 return 0;
1015
1016 if (!ev_default_loop_ptr) 1500 if (!ev_default_loop_ptr)
1017 { 1501 {
1018#if EV_MULTIPLICITY 1502#if EV_MULTIPLICITY
1019 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1503 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1020#else 1504#else
… …
1023 1507
1024 loop_init (EV_A_ flags); 1508 loop_init (EV_A_ flags);
1025 1509
1026 if (ev_backend (EV_A)) 1510 if (ev_backend (EV_A))
1027 { 1511 {
1028 siginit (EV_A);
1029
1030#ifndef _WIN32 1512#ifndef _WIN32
1031 ev_signal_init (&childev, childcb, SIGCHLD); 1513 ev_signal_init (&childev, childcb, SIGCHLD);
1032 ev_set_priority (&childev, EV_MAXPRI); 1514 ev_set_priority (&childev, EV_MAXPRI);
1033 ev_signal_start (EV_A_ &childev); 1515 ev_signal_start (EV_A_ &childev);
1034 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1516 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1051#ifndef _WIN32 1533#ifndef _WIN32
1052 ev_ref (EV_A); /* child watcher */ 1534 ev_ref (EV_A); /* child watcher */
1053 ev_signal_stop (EV_A_ &childev); 1535 ev_signal_stop (EV_A_ &childev);
1054#endif 1536#endif
1055 1537
1056 ev_ref (EV_A); /* signal watcher */
1057 ev_io_stop (EV_A_ &sigev);
1058
1059 close (sigpipe [0]); sigpipe [0] = 0;
1060 close (sigpipe [1]); sigpipe [1] = 0;
1061
1062 loop_destroy (EV_A); 1538 loop_destroy (EV_A);
1063} 1539}
1064 1540
1065void 1541void
1066ev_default_fork (void) 1542ev_default_fork (void)
… …
1068#if EV_MULTIPLICITY 1544#if EV_MULTIPLICITY
1069 struct ev_loop *loop = ev_default_loop_ptr; 1545 struct ev_loop *loop = ev_default_loop_ptr;
1070#endif 1546#endif
1071 1547
1072 if (backend) 1548 if (backend)
1073 postfork = 1; 1549 postfork = 1; /* must be in line with ev_loop_fork */
1074} 1550}
1075 1551
1076/*****************************************************************************/ 1552/*****************************************************************************/
1077 1553
1078int inline_size 1554void
1079any_pending (EV_P) 1555ev_invoke (EV_P_ void *w, int revents)
1080{ 1556{
1081 int pri; 1557 EV_CB_INVOKE ((W)w, revents);
1082
1083 for (pri = NUMPRI; pri--; )
1084 if (pendingcnt [pri])
1085 return 1;
1086
1087 return 0;
1088} 1558}
1089 1559
1090void inline_speed 1560void inline_speed
1091call_pending (EV_P) 1561call_pending (EV_P)
1092{ 1562{
… …
1097 { 1567 {
1098 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1568 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1099 1569
1100 if (expect_true (p->w)) 1570 if (expect_true (p->w))
1101 { 1571 {
1102 assert (("non-pending watcher on pending list", p->w->pending)); 1572 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1103 1573
1104 p->w->pending = 0; 1574 p->w->pending = 0;
1105 EV_CB_INVOKE (p->w, p->events); 1575 EV_CB_INVOKE (p->w, p->events);
1106 } 1576 }
1107 } 1577 }
1108} 1578}
1109 1579
1580#if EV_IDLE_ENABLE
1581void inline_size
1582idle_reify (EV_P)
1583{
1584 if (expect_false (idleall))
1585 {
1586 int pri;
1587
1588 for (pri = NUMPRI; pri--; )
1589 {
1590 if (pendingcnt [pri])
1591 break;
1592
1593 if (idlecnt [pri])
1594 {
1595 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1596 break;
1597 }
1598 }
1599 }
1600}
1601#endif
1602
1110void inline_size 1603void inline_size
1111timers_reify (EV_P) 1604timers_reify (EV_P)
1112{ 1605{
1113 while (timercnt && ((WT)timers [0])->at <= mn_now) 1606 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1114 { 1607 {
1115 ev_timer *w = timers [0]; 1608 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1116 1609
1117 assert (("inactive timer on timer heap detected", ev_is_active (w))); 1610 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1118 1611
1119 /* first reschedule or stop timer */ 1612 /* first reschedule or stop timer */
1120 if (w->repeat) 1613 if (w->repeat)
1121 { 1614 {
1615 ev_at (w) += w->repeat;
1616 if (ev_at (w) < mn_now)
1617 ev_at (w) = mn_now;
1618
1122 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1619 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1123 1620
1124 ((WT)w)->at += w->repeat; 1621 ANHE_at_set (timers [HEAP0]);
1125 if (((WT)w)->at < mn_now)
1126 ((WT)w)->at = mn_now;
1127
1128 downheap ((WT *)timers, timercnt, 0); 1622 downheap (timers, timercnt, HEAP0);
1129 } 1623 }
1130 else 1624 else
1131 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1625 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1132 1626
1133 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1627 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1136 1630
1137#if EV_PERIODIC_ENABLE 1631#if EV_PERIODIC_ENABLE
1138void inline_size 1632void inline_size
1139periodics_reify (EV_P) 1633periodics_reify (EV_P)
1140{ 1634{
1141 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1635 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1142 { 1636 {
1143 ev_periodic *w = periodics [0]; 1637 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1144 1638
1145 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1639 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1146 1640
1147 /* first reschedule or stop timer */ 1641 /* first reschedule or stop timer */
1148 if (w->reschedule_cb) 1642 if (w->reschedule_cb)
1149 { 1643 {
1150 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1644 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1645
1151 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1646 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1647
1648 ANHE_at_set (periodics [HEAP0]);
1152 downheap ((WT *)periodics, periodiccnt, 0); 1649 downheap (periodics, periodiccnt, HEAP0);
1153 } 1650 }
1154 else if (w->interval) 1651 else if (w->interval)
1155 { 1652 {
1156 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1653 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1157 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1654 /* if next trigger time is not sufficiently in the future, put it there */
1655 /* this might happen because of floating point inexactness */
1656 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1657 {
1658 ev_at (w) += w->interval;
1659
1660 /* if interval is unreasonably low we might still have a time in the past */
1661 /* so correct this. this will make the periodic very inexact, but the user */
1662 /* has effectively asked to get triggered more often than possible */
1663 if (ev_at (w) < ev_rt_now)
1664 ev_at (w) = ev_rt_now;
1665 }
1666
1667 ANHE_at_set (periodics [HEAP0]);
1158 downheap ((WT *)periodics, periodiccnt, 0); 1668 downheap (periodics, periodiccnt, HEAP0);
1159 } 1669 }
1160 else 1670 else
1161 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1671 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1162 1672
1163 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1673 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1168periodics_reschedule (EV_P) 1678periodics_reschedule (EV_P)
1169{ 1679{
1170 int i; 1680 int i;
1171 1681
1172 /* adjust periodics after time jump */ 1682 /* adjust periodics after time jump */
1683 for (i = HEAP0; i < periodiccnt + HEAP0; ++i)
1684 {
1685 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
1686
1687 if (w->reschedule_cb)
1688 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1689 else if (w->interval)
1690 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1691
1692 ANHE_at_set (periodics [i]);
1693 }
1694
1695 /* we don't use floyds algorithm, uphead is simpler and is more cache-efficient */
1696 /* also, this is easy and corretc for both 2-heaps and 4-heaps */
1173 for (i = 0; i < periodiccnt; ++i) 1697 for (i = 0; i < periodiccnt; ++i)
1174 { 1698 upheap (periodics, i + HEAP0);
1175 ev_periodic *w = periodics [i]; 1699}
1700#endif
1176 1701
1177 if (w->reschedule_cb) 1702void inline_speed
1178 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1703time_update (EV_P_ ev_tstamp max_block)
1179 else if (w->interval) 1704{
1180 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1705 int i;
1706
1707#if EV_USE_MONOTONIC
1708 if (expect_true (have_monotonic))
1181 } 1709 {
1710 ev_tstamp odiff = rtmn_diff;
1182 1711
1183 /* now rebuild the heap */
1184 for (i = periodiccnt >> 1; i--; )
1185 downheap ((WT *)periodics, periodiccnt, i);
1186}
1187#endif
1188
1189int inline_size
1190time_update_monotonic (EV_P)
1191{
1192 mn_now = get_clock (); 1712 mn_now = get_clock ();
1193 1713
1714 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1715 /* interpolate in the meantime */
1194 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1716 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1195 { 1717 {
1196 ev_rt_now = rtmn_diff + mn_now; 1718 ev_rt_now = rtmn_diff + mn_now;
1197 return 0; 1719 return;
1198 } 1720 }
1199 else 1721
1200 {
1201 now_floor = mn_now; 1722 now_floor = mn_now;
1202 ev_rt_now = ev_time (); 1723 ev_rt_now = ev_time ();
1203 return 1;
1204 }
1205}
1206 1724
1207void inline_size 1725 /* loop a few times, before making important decisions.
1208time_update (EV_P) 1726 * on the choice of "4": one iteration isn't enough,
1209{ 1727 * in case we get preempted during the calls to
1210 int i; 1728 * ev_time and get_clock. a second call is almost guaranteed
1211 1729 * to succeed in that case, though. and looping a few more times
1212#if EV_USE_MONOTONIC 1730 * doesn't hurt either as we only do this on time-jumps or
1213 if (expect_true (have_monotonic)) 1731 * in the unlikely event of having been preempted here.
1214 { 1732 */
1215 if (time_update_monotonic (EV_A)) 1733 for (i = 4; --i; )
1216 { 1734 {
1217 ev_tstamp odiff = rtmn_diff;
1218
1219 /* loop a few times, before making important decisions.
1220 * on the choice of "4": one iteration isn't enough,
1221 * in case we get preempted during the calls to
1222 * ev_time and get_clock. a second call is almost guarenteed
1223 * to succeed in that case, though. and looping a few more times
1224 * doesn't hurt either as we only do this on time-jumps or
1225 * in the unlikely event of getting preempted here.
1226 */
1227 for (i = 4; --i; )
1228 {
1229 rtmn_diff = ev_rt_now - mn_now; 1735 rtmn_diff = ev_rt_now - mn_now;
1230 1736
1231 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1737 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1232 return; /* all is well */ 1738 return; /* all is well */
1233 1739
1234 ev_rt_now = ev_time (); 1740 ev_rt_now = ev_time ();
1235 mn_now = get_clock (); 1741 mn_now = get_clock ();
1236 now_floor = mn_now; 1742 now_floor = mn_now;
1237 } 1743 }
1238 1744
1239# if EV_PERIODIC_ENABLE 1745# if EV_PERIODIC_ENABLE
1240 periodics_reschedule (EV_A); 1746 periodics_reschedule (EV_A);
1241# endif 1747# endif
1242 /* no timer adjustment, as the monotonic clock doesn't jump */ 1748 /* no timer adjustment, as the monotonic clock doesn't jump */
1243 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1749 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1244 }
1245 } 1750 }
1246 else 1751 else
1247#endif 1752#endif
1248 { 1753 {
1249 ev_rt_now = ev_time (); 1754 ev_rt_now = ev_time ();
1250 1755
1251 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1756 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1252 { 1757 {
1253#if EV_PERIODIC_ENABLE 1758#if EV_PERIODIC_ENABLE
1254 periodics_reschedule (EV_A); 1759 periodics_reschedule (EV_A);
1255#endif 1760#endif
1256
1257 /* adjust timers. this is easy, as the offset is the same for all */ 1761 /* adjust timers. this is easy, as the offset is the same for all of them */
1258 for (i = 0; i < timercnt; ++i) 1762 for (i = 0; i < timercnt; ++i)
1763 {
1764 ANHE *he = timers + i + HEAP0;
1259 ((WT)timers [i])->at += ev_rt_now - mn_now; 1765 ANHE_w (*he)->at += ev_rt_now - mn_now;
1766 ANHE_at_set (*he);
1767 }
1260 } 1768 }
1261 1769
1262 mn_now = ev_rt_now; 1770 mn_now = ev_rt_now;
1263 } 1771 }
1264} 1772}
… …
1278static int loop_done; 1786static int loop_done;
1279 1787
1280void 1788void
1281ev_loop (EV_P_ int flags) 1789ev_loop (EV_P_ int flags)
1282{ 1790{
1283 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1791 loop_done = EVUNLOOP_CANCEL;
1284 ? EVUNLOOP_ONE
1285 : EVUNLOOP_CANCEL;
1286 1792
1287 while (activecnt) 1793 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1794
1795 do
1288 { 1796 {
1289 /* we might have forked, so reify kernel state if necessary */ 1797#ifndef _WIN32
1798 if (expect_false (curpid)) /* penalise the forking check even more */
1799 if (expect_false (getpid () != curpid))
1800 {
1801 curpid = getpid ();
1802 postfork = 1;
1803 }
1804#endif
1805
1290 #if EV_FORK_ENABLE 1806#if EV_FORK_ENABLE
1807 /* we might have forked, so queue fork handlers */
1291 if (expect_false (postfork)) 1808 if (expect_false (postfork))
1292 if (forkcnt) 1809 if (forkcnt)
1293 { 1810 {
1294 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1811 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1295 call_pending (EV_A); 1812 call_pending (EV_A);
1296 } 1813 }
1297 #endif 1814#endif
1298 1815
1299 /* queue check watchers (and execute them) */ 1816 /* queue prepare watchers (and execute them) */
1300 if (expect_false (preparecnt)) 1817 if (expect_false (preparecnt))
1301 { 1818 {
1302 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1819 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1303 call_pending (EV_A); 1820 call_pending (EV_A);
1304 } 1821 }
1305 1822
1823 if (expect_false (!activecnt))
1824 break;
1825
1306 /* we might have forked, so reify kernel state if necessary */ 1826 /* we might have forked, so reify kernel state if necessary */
1307 if (expect_false (postfork)) 1827 if (expect_false (postfork))
1308 loop_fork (EV_A); 1828 loop_fork (EV_A);
1309 1829
1310 /* update fd-related kernel structures */ 1830 /* update fd-related kernel structures */
1311 fd_reify (EV_A); 1831 fd_reify (EV_A);
1312 1832
1313 /* calculate blocking time */ 1833 /* calculate blocking time */
1314 { 1834 {
1315 double block; 1835 ev_tstamp waittime = 0.;
1836 ev_tstamp sleeptime = 0.;
1316 1837
1317 if (flags & EVLOOP_NONBLOCK || idlecnt) 1838 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1318 block = 0.; /* do not block at all */
1319 else
1320 { 1839 {
1321 /* update time to cancel out callback processing overhead */ 1840 /* update time to cancel out callback processing overhead */
1322#if EV_USE_MONOTONIC
1323 if (expect_true (have_monotonic))
1324 time_update_monotonic (EV_A); 1841 time_update (EV_A_ 1e100);
1325 else
1326#endif
1327 {
1328 ev_rt_now = ev_time ();
1329 mn_now = ev_rt_now;
1330 }
1331 1842
1332 block = MAX_BLOCKTIME; 1843 waittime = MAX_BLOCKTIME;
1333 1844
1334 if (timercnt) 1845 if (timercnt)
1335 { 1846 {
1336 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1847 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
1337 if (block > to) block = to; 1848 if (waittime > to) waittime = to;
1338 } 1849 }
1339 1850
1340#if EV_PERIODIC_ENABLE 1851#if EV_PERIODIC_ENABLE
1341 if (periodiccnt) 1852 if (periodiccnt)
1342 { 1853 {
1343 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1854 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1344 if (block > to) block = to; 1855 if (waittime > to) waittime = to;
1345 } 1856 }
1346#endif 1857#endif
1347 1858
1348 if (expect_false (block < 0.)) block = 0.; 1859 if (expect_false (waittime < timeout_blocktime))
1860 waittime = timeout_blocktime;
1861
1862 sleeptime = waittime - backend_fudge;
1863
1864 if (expect_true (sleeptime > io_blocktime))
1865 sleeptime = io_blocktime;
1866
1867 if (sleeptime)
1868 {
1869 ev_sleep (sleeptime);
1870 waittime -= sleeptime;
1871 }
1349 } 1872 }
1350 1873
1874 ++loop_count;
1351 backend_poll (EV_A_ block); 1875 backend_poll (EV_A_ waittime);
1876
1877 /* update ev_rt_now, do magic */
1878 time_update (EV_A_ waittime + sleeptime);
1352 } 1879 }
1353
1354 /* update ev_rt_now, do magic */
1355 time_update (EV_A);
1356 1880
1357 /* queue pending timers and reschedule them */ 1881 /* queue pending timers and reschedule them */
1358 timers_reify (EV_A); /* relative timers called last */ 1882 timers_reify (EV_A); /* relative timers called last */
1359#if EV_PERIODIC_ENABLE 1883#if EV_PERIODIC_ENABLE
1360 periodics_reify (EV_A); /* absolute timers called first */ 1884 periodics_reify (EV_A); /* absolute timers called first */
1361#endif 1885#endif
1362 1886
1887#if EV_IDLE_ENABLE
1363 /* queue idle watchers unless other events are pending */ 1888 /* queue idle watchers unless other events are pending */
1364 if (idlecnt && !any_pending (EV_A)) 1889 idle_reify (EV_A);
1365 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1890#endif
1366 1891
1367 /* queue check watchers, to be executed first */ 1892 /* queue check watchers, to be executed first */
1368 if (expect_false (checkcnt)) 1893 if (expect_false (checkcnt))
1369 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1894 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1370 1895
1371 call_pending (EV_A); 1896 call_pending (EV_A);
1372
1373 if (expect_false (loop_done))
1374 break;
1375 } 1897 }
1898 while (expect_true (
1899 activecnt
1900 && !loop_done
1901 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1902 ));
1376 1903
1377 if (loop_done == EVUNLOOP_ONE) 1904 if (loop_done == EVUNLOOP_ONE)
1378 loop_done = EVUNLOOP_CANCEL; 1905 loop_done = EVUNLOOP_CANCEL;
1379} 1906}
1380 1907
… …
1407 head = &(*head)->next; 1934 head = &(*head)->next;
1408 } 1935 }
1409} 1936}
1410 1937
1411void inline_speed 1938void inline_speed
1412ev_clear_pending (EV_P_ W w) 1939clear_pending (EV_P_ W w)
1413{ 1940{
1414 if (w->pending) 1941 if (w->pending)
1415 { 1942 {
1416 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1943 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1417 w->pending = 0; 1944 w->pending = 0;
1418 } 1945 }
1419} 1946}
1420 1947
1948int
1949ev_clear_pending (EV_P_ void *w)
1950{
1951 W w_ = (W)w;
1952 int pending = w_->pending;
1953
1954 if (expect_true (pending))
1955 {
1956 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1957 w_->pending = 0;
1958 p->w = 0;
1959 return p->events;
1960 }
1961 else
1962 return 0;
1963}
1964
1965void inline_size
1966pri_adjust (EV_P_ W w)
1967{
1968 int pri = w->priority;
1969 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
1970 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
1971 w->priority = pri;
1972}
1973
1421void inline_speed 1974void inline_speed
1422ev_start (EV_P_ W w, int active) 1975ev_start (EV_P_ W w, int active)
1423{ 1976{
1424 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1977 pri_adjust (EV_A_ w);
1425 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1426
1427 w->active = active; 1978 w->active = active;
1428 ev_ref (EV_A); 1979 ev_ref (EV_A);
1429} 1980}
1430 1981
1431void inline_size 1982void inline_size
… …
1435 w->active = 0; 1986 w->active = 0;
1436} 1987}
1437 1988
1438/*****************************************************************************/ 1989/*****************************************************************************/
1439 1990
1440void 1991void noinline
1441ev_io_start (EV_P_ ev_io *w) 1992ev_io_start (EV_P_ ev_io *w)
1442{ 1993{
1443 int fd = w->fd; 1994 int fd = w->fd;
1444 1995
1445 if (expect_false (ev_is_active (w))) 1996 if (expect_false (ev_is_active (w)))
… …
1447 1998
1448 assert (("ev_io_start called with negative fd", fd >= 0)); 1999 assert (("ev_io_start called with negative fd", fd >= 0));
1449 2000
1450 ev_start (EV_A_ (W)w, 1); 2001 ev_start (EV_A_ (W)w, 1);
1451 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2002 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1452 wlist_add ((WL *)&anfds[fd].head, (WL)w); 2003 wlist_add (&anfds[fd].head, (WL)w);
1453 2004
1454 fd_change (EV_A_ fd); 2005 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
2006 w->events &= ~EV_IOFDSET;
1455} 2007}
1456 2008
1457void 2009void noinline
1458ev_io_stop (EV_P_ ev_io *w) 2010ev_io_stop (EV_P_ ev_io *w)
1459{ 2011{
1460 ev_clear_pending (EV_A_ (W)w); 2012 clear_pending (EV_A_ (W)w);
1461 if (expect_false (!ev_is_active (w))) 2013 if (expect_false (!ev_is_active (w)))
1462 return; 2014 return;
1463 2015
1464 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2016 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1465 2017
1466 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 2018 wlist_del (&anfds[w->fd].head, (WL)w);
1467 ev_stop (EV_A_ (W)w); 2019 ev_stop (EV_A_ (W)w);
1468 2020
1469 fd_change (EV_A_ w->fd); 2021 fd_change (EV_A_ w->fd, 1);
1470} 2022}
1471 2023
1472void 2024void noinline
1473ev_timer_start (EV_P_ ev_timer *w) 2025ev_timer_start (EV_P_ ev_timer *w)
1474{ 2026{
1475 if (expect_false (ev_is_active (w))) 2027 if (expect_false (ev_is_active (w)))
1476 return; 2028 return;
1477 2029
1478 ((WT)w)->at += mn_now; 2030 ev_at (w) += mn_now;
1479 2031
1480 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2032 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1481 2033
1482 ev_start (EV_A_ (W)w, ++timercnt); 2034 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1);
1483 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 2035 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
1484 timers [timercnt - 1] = w; 2036 ANHE_w (timers [ev_active (w)]) = (WT)w;
1485 upheap ((WT *)timers, timercnt - 1); 2037 ANHE_at_set (timers [ev_active (w)]);
2038 upheap (timers, ev_active (w));
1486 2039
1487 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 2040 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
1488} 2041}
1489 2042
1490void 2043void noinline
1491ev_timer_stop (EV_P_ ev_timer *w) 2044ev_timer_stop (EV_P_ ev_timer *w)
1492{ 2045{
1493 ev_clear_pending (EV_A_ (W)w); 2046 clear_pending (EV_A_ (W)w);
1494 if (expect_false (!ev_is_active (w))) 2047 if (expect_false (!ev_is_active (w)))
1495 return; 2048 return;
1496 2049
2050 {
2051 int active = ev_active (w);
2052
1497 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 2053 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
1498 2054
1499 if (expect_true (((W)w)->active < timercnt--)) 2055 if (expect_true (active < timercnt + HEAP0 - 1))
1500 { 2056 {
1501 timers [((W)w)->active - 1] = timers [timercnt]; 2057 timers [active] = timers [timercnt + HEAP0 - 1];
1502 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 2058 adjustheap (timers, timercnt, active);
1503 } 2059 }
1504 2060
1505 ((WT)w)->at -= mn_now; 2061 --timercnt;
2062 }
2063
2064 ev_at (w) -= mn_now;
1506 2065
1507 ev_stop (EV_A_ (W)w); 2066 ev_stop (EV_A_ (W)w);
1508} 2067}
1509 2068
1510void 2069void noinline
1511ev_timer_again (EV_P_ ev_timer *w) 2070ev_timer_again (EV_P_ ev_timer *w)
1512{ 2071{
1513 if (ev_is_active (w)) 2072 if (ev_is_active (w))
1514 { 2073 {
1515 if (w->repeat) 2074 if (w->repeat)
1516 { 2075 {
1517 ((WT)w)->at = mn_now + w->repeat; 2076 ev_at (w) = mn_now + w->repeat;
2077 ANHE_at_set (timers [ev_active (w)]);
1518 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 2078 adjustheap (timers, timercnt, ev_active (w));
1519 } 2079 }
1520 else 2080 else
1521 ev_timer_stop (EV_A_ w); 2081 ev_timer_stop (EV_A_ w);
1522 } 2082 }
1523 else if (w->repeat) 2083 else if (w->repeat)
1524 { 2084 {
1525 w->at = w->repeat; 2085 ev_at (w) = w->repeat;
1526 ev_timer_start (EV_A_ w); 2086 ev_timer_start (EV_A_ w);
1527 } 2087 }
1528} 2088}
1529 2089
1530#if EV_PERIODIC_ENABLE 2090#if EV_PERIODIC_ENABLE
1531void 2091void noinline
1532ev_periodic_start (EV_P_ ev_periodic *w) 2092ev_periodic_start (EV_P_ ev_periodic *w)
1533{ 2093{
1534 if (expect_false (ev_is_active (w))) 2094 if (expect_false (ev_is_active (w)))
1535 return; 2095 return;
1536 2096
1537 if (w->reschedule_cb) 2097 if (w->reschedule_cb)
1538 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 2098 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1539 else if (w->interval) 2099 else if (w->interval)
1540 { 2100 {
1541 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2101 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1542 /* this formula differs from the one in periodic_reify because we do not always round up */ 2102 /* this formula differs from the one in periodic_reify because we do not always round up */
1543 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 2103 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1544 } 2104 }
2105 else
2106 ev_at (w) = w->offset;
1545 2107
1546 ev_start (EV_A_ (W)w, ++periodiccnt); 2108 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1);
1547 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 2109 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
1548 periodics [periodiccnt - 1] = w; 2110 ANHE_w (periodics [ev_active (w)]) = (WT)w;
1549 upheap ((WT *)periodics, periodiccnt - 1); 2111 ANHE_at_set (periodics [ev_active (w)]);
2112 upheap (periodics, ev_active (w));
1550 2113
1551 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 2114 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
1552} 2115}
1553 2116
1554void 2117void noinline
1555ev_periodic_stop (EV_P_ ev_periodic *w) 2118ev_periodic_stop (EV_P_ ev_periodic *w)
1556{ 2119{
1557 ev_clear_pending (EV_A_ (W)w); 2120 clear_pending (EV_A_ (W)w);
1558 if (expect_false (!ev_is_active (w))) 2121 if (expect_false (!ev_is_active (w)))
1559 return; 2122 return;
1560 2123
2124 {
2125 int active = ev_active (w);
2126
1561 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 2127 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
1562 2128
1563 if (expect_true (((W)w)->active < periodiccnt--)) 2129 if (expect_true (active < periodiccnt + HEAP0 - 1))
1564 { 2130 {
1565 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 2131 periodics [active] = periodics [periodiccnt + HEAP0 - 1];
1566 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 2132 adjustheap (periodics, periodiccnt, active);
1567 } 2133 }
2134
2135 --periodiccnt;
2136 }
1568 2137
1569 ev_stop (EV_A_ (W)w); 2138 ev_stop (EV_A_ (W)w);
1570} 2139}
1571 2140
1572void 2141void noinline
1573ev_periodic_again (EV_P_ ev_periodic *w) 2142ev_periodic_again (EV_P_ ev_periodic *w)
1574{ 2143{
1575 /* TODO: use adjustheap and recalculation */ 2144 /* TODO: use adjustheap and recalculation */
1576 ev_periodic_stop (EV_A_ w); 2145 ev_periodic_stop (EV_A_ w);
1577 ev_periodic_start (EV_A_ w); 2146 ev_periodic_start (EV_A_ w);
… …
1580 2149
1581#ifndef SA_RESTART 2150#ifndef SA_RESTART
1582# define SA_RESTART 0 2151# define SA_RESTART 0
1583#endif 2152#endif
1584 2153
1585void 2154void noinline
1586ev_signal_start (EV_P_ ev_signal *w) 2155ev_signal_start (EV_P_ ev_signal *w)
1587{ 2156{
1588#if EV_MULTIPLICITY 2157#if EV_MULTIPLICITY
1589 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2158 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1590#endif 2159#endif
1591 if (expect_false (ev_is_active (w))) 2160 if (expect_false (ev_is_active (w)))
1592 return; 2161 return;
1593 2162
1594 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2163 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1595 2164
2165 evpipe_init (EV_A);
2166
2167 {
2168#ifndef _WIN32
2169 sigset_t full, prev;
2170 sigfillset (&full);
2171 sigprocmask (SIG_SETMASK, &full, &prev);
2172#endif
2173
2174 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
2175
2176#ifndef _WIN32
2177 sigprocmask (SIG_SETMASK, &prev, 0);
2178#endif
2179 }
2180
1596 ev_start (EV_A_ (W)w, 1); 2181 ev_start (EV_A_ (W)w, 1);
1597 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1598 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 2182 wlist_add (&signals [w->signum - 1].head, (WL)w);
1599 2183
1600 if (!((WL)w)->next) 2184 if (!((WL)w)->next)
1601 { 2185 {
1602#if _WIN32 2186#if _WIN32
1603 signal (w->signum, sighandler); 2187 signal (w->signum, ev_sighandler);
1604#else 2188#else
1605 struct sigaction sa; 2189 struct sigaction sa;
1606 sa.sa_handler = sighandler; 2190 sa.sa_handler = ev_sighandler;
1607 sigfillset (&sa.sa_mask); 2191 sigfillset (&sa.sa_mask);
1608 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2192 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1609 sigaction (w->signum, &sa, 0); 2193 sigaction (w->signum, &sa, 0);
1610#endif 2194#endif
1611 } 2195 }
1612} 2196}
1613 2197
1614void 2198void noinline
1615ev_signal_stop (EV_P_ ev_signal *w) 2199ev_signal_stop (EV_P_ ev_signal *w)
1616{ 2200{
1617 ev_clear_pending (EV_A_ (W)w); 2201 clear_pending (EV_A_ (W)w);
1618 if (expect_false (!ev_is_active (w))) 2202 if (expect_false (!ev_is_active (w)))
1619 return; 2203 return;
1620 2204
1621 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 2205 wlist_del (&signals [w->signum - 1].head, (WL)w);
1622 ev_stop (EV_A_ (W)w); 2206 ev_stop (EV_A_ (W)w);
1623 2207
1624 if (!signals [w->signum - 1].head) 2208 if (!signals [w->signum - 1].head)
1625 signal (w->signum, SIG_DFL); 2209 signal (w->signum, SIG_DFL);
1626} 2210}
… …
1633#endif 2217#endif
1634 if (expect_false (ev_is_active (w))) 2218 if (expect_false (ev_is_active (w)))
1635 return; 2219 return;
1636 2220
1637 ev_start (EV_A_ (W)w, 1); 2221 ev_start (EV_A_ (W)w, 1);
1638 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2222 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1639} 2223}
1640 2224
1641void 2225void
1642ev_child_stop (EV_P_ ev_child *w) 2226ev_child_stop (EV_P_ ev_child *w)
1643{ 2227{
1644 ev_clear_pending (EV_A_ (W)w); 2228 clear_pending (EV_A_ (W)w);
1645 if (expect_false (!ev_is_active (w))) 2229 if (expect_false (!ev_is_active (w)))
1646 return; 2230 return;
1647 2231
1648 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2232 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1649 ev_stop (EV_A_ (W)w); 2233 ev_stop (EV_A_ (W)w);
1650} 2234}
1651 2235
1652#if EV_STAT_ENABLE 2236#if EV_STAT_ENABLE
1653 2237
… …
1657# endif 2241# endif
1658 2242
1659#define DEF_STAT_INTERVAL 5.0074891 2243#define DEF_STAT_INTERVAL 5.0074891
1660#define MIN_STAT_INTERVAL 0.1074891 2244#define MIN_STAT_INTERVAL 0.1074891
1661 2245
2246static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2247
2248#if EV_USE_INOTIFY
2249# define EV_INOTIFY_BUFSIZE 8192
2250
2251static void noinline
2252infy_add (EV_P_ ev_stat *w)
2253{
2254 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);
2255
2256 if (w->wd < 0)
2257 {
2258 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2259
2260 /* monitor some parent directory for speedup hints */
2261 /* note that exceeding the hardcoded limit is not a correctness issue, */
2262 /* but an efficiency issue only */
2263 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2264 {
2265 char path [4096];
2266 strcpy (path, w->path);
2267
2268 do
2269 {
2270 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2271 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2272
2273 char *pend = strrchr (path, '/');
2274
2275 if (!pend)
2276 break; /* whoops, no '/', complain to your admin */
2277
2278 *pend = 0;
2279 w->wd = inotify_add_watch (fs_fd, path, mask);
2280 }
2281 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2282 }
2283 }
2284 else
2285 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2286
2287 if (w->wd >= 0)
2288 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2289}
2290
2291static void noinline
2292infy_del (EV_P_ ev_stat *w)
2293{
2294 int slot;
2295 int wd = w->wd;
2296
2297 if (wd < 0)
2298 return;
2299
2300 w->wd = -2;
2301 slot = wd & (EV_INOTIFY_HASHSIZE - 1);
2302 wlist_del (&fs_hash [slot].head, (WL)w);
2303
2304 /* remove this watcher, if others are watching it, they will rearm */
2305 inotify_rm_watch (fs_fd, wd);
2306}
2307
2308static void noinline
2309infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2310{
2311 if (slot < 0)
2312 /* overflow, need to check for all hahs slots */
2313 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2314 infy_wd (EV_A_ slot, wd, ev);
2315 else
2316 {
2317 WL w_;
2318
2319 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; )
2320 {
2321 ev_stat *w = (ev_stat *)w_;
2322 w_ = w_->next; /* lets us remove this watcher and all before it */
2323
2324 if (w->wd == wd || wd == -1)
2325 {
2326 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2327 {
2328 w->wd = -1;
2329 infy_add (EV_A_ w); /* re-add, no matter what */
2330 }
2331
2332 stat_timer_cb (EV_A_ &w->timer, 0);
2333 }
2334 }
2335 }
2336}
2337
2338static void
2339infy_cb (EV_P_ ev_io *w, int revents)
2340{
2341 char buf [EV_INOTIFY_BUFSIZE];
2342 struct inotify_event *ev = (struct inotify_event *)buf;
2343 int ofs;
2344 int len = read (fs_fd, buf, sizeof (buf));
2345
2346 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2347 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2348}
2349
2350void inline_size
2351infy_init (EV_P)
2352{
2353 if (fs_fd != -2)
2354 return;
2355
2356 fs_fd = inotify_init ();
2357
2358 if (fs_fd >= 0)
2359 {
2360 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2361 ev_set_priority (&fs_w, EV_MAXPRI);
2362 ev_io_start (EV_A_ &fs_w);
2363 }
2364}
2365
2366void inline_size
2367infy_fork (EV_P)
2368{
2369 int slot;
2370
2371 if (fs_fd < 0)
2372 return;
2373
2374 close (fs_fd);
2375 fs_fd = inotify_init ();
2376
2377 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2378 {
2379 WL w_ = fs_hash [slot].head;
2380 fs_hash [slot].head = 0;
2381
2382 while (w_)
2383 {
2384 ev_stat *w = (ev_stat *)w_;
2385 w_ = w_->next; /* lets us add this watcher */
2386
2387 w->wd = -1;
2388
2389 if (fs_fd >= 0)
2390 infy_add (EV_A_ w); /* re-add, no matter what */
2391 else
2392 ev_timer_start (EV_A_ &w->timer);
2393 }
2394
2395 }
2396}
2397
2398#endif
2399
1662void 2400void
1663ev_stat_stat (EV_P_ ev_stat *w) 2401ev_stat_stat (EV_P_ ev_stat *w)
1664{ 2402{
1665 if (lstat (w->path, &w->attr) < 0) 2403 if (lstat (w->path, &w->attr) < 0)
1666 w->attr.st_nlink = 0; 2404 w->attr.st_nlink = 0;
1667 else if (!w->attr.st_nlink) 2405 else if (!w->attr.st_nlink)
1668 w->attr.st_nlink = 1; 2406 w->attr.st_nlink = 1;
1669} 2407}
1670 2408
1671static void 2409static void noinline
1672stat_timer_cb (EV_P_ ev_timer *w_, int revents) 2410stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1673{ 2411{
1674 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 2412 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1675 2413
1676 /* we copy this here each the time so that */ 2414 /* we copy this here each the time so that */
1677 /* prev has the old value when the callback gets invoked */ 2415 /* prev has the old value when the callback gets invoked */
1678 w->prev = w->attr; 2416 w->prev = w->attr;
1679 ev_stat_stat (EV_A_ w); 2417 ev_stat_stat (EV_A_ w);
1680 2418
1681 if (memcmp (&w->prev, &w->attr, sizeof (ev_statdata))) 2419 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2420 if (
2421 w->prev.st_dev != w->attr.st_dev
2422 || w->prev.st_ino != w->attr.st_ino
2423 || w->prev.st_mode != w->attr.st_mode
2424 || w->prev.st_nlink != w->attr.st_nlink
2425 || w->prev.st_uid != w->attr.st_uid
2426 || w->prev.st_gid != w->attr.st_gid
2427 || w->prev.st_rdev != w->attr.st_rdev
2428 || w->prev.st_size != w->attr.st_size
2429 || w->prev.st_atime != w->attr.st_atime
2430 || w->prev.st_mtime != w->attr.st_mtime
2431 || w->prev.st_ctime != w->attr.st_ctime
2432 ) {
2433 #if EV_USE_INOTIFY
2434 infy_del (EV_A_ w);
2435 infy_add (EV_A_ w);
2436 ev_stat_stat (EV_A_ w); /* avoid race... */
2437 #endif
2438
1682 ev_feed_event (EV_A_ w, EV_STAT); 2439 ev_feed_event (EV_A_ w, EV_STAT);
2440 }
1683} 2441}
1684 2442
1685void 2443void
1686ev_stat_start (EV_P_ ev_stat *w) 2444ev_stat_start (EV_P_ ev_stat *w)
1687{ 2445{
… …
1697 if (w->interval < MIN_STAT_INTERVAL) 2455 if (w->interval < MIN_STAT_INTERVAL)
1698 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL; 2456 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
1699 2457
1700 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 2458 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
1701 ev_set_priority (&w->timer, ev_priority (w)); 2459 ev_set_priority (&w->timer, ev_priority (w));
2460
2461#if EV_USE_INOTIFY
2462 infy_init (EV_A);
2463
2464 if (fs_fd >= 0)
2465 infy_add (EV_A_ w);
2466 else
2467#endif
1702 ev_timer_start (EV_A_ &w->timer); 2468 ev_timer_start (EV_A_ &w->timer);
1703 2469
1704 ev_start (EV_A_ (W)w, 1); 2470 ev_start (EV_A_ (W)w, 1);
1705} 2471}
1706 2472
1707void 2473void
1708ev_stat_stop (EV_P_ ev_stat *w) 2474ev_stat_stop (EV_P_ ev_stat *w)
1709{ 2475{
1710 ev_clear_pending (EV_A_ (W)w); 2476 clear_pending (EV_A_ (W)w);
1711 if (expect_false (!ev_is_active (w))) 2477 if (expect_false (!ev_is_active (w)))
1712 return; 2478 return;
1713 2479
2480#if EV_USE_INOTIFY
2481 infy_del (EV_A_ w);
2482#endif
1714 ev_timer_stop (EV_A_ &w->timer); 2483 ev_timer_stop (EV_A_ &w->timer);
1715 2484
1716 ev_stop (EV_A_ (W)w); 2485 ev_stop (EV_A_ (W)w);
1717} 2486}
1718#endif 2487#endif
1719 2488
2489#if EV_IDLE_ENABLE
1720void 2490void
1721ev_idle_start (EV_P_ ev_idle *w) 2491ev_idle_start (EV_P_ ev_idle *w)
1722{ 2492{
1723 if (expect_false (ev_is_active (w))) 2493 if (expect_false (ev_is_active (w)))
1724 return; 2494 return;
1725 2495
2496 pri_adjust (EV_A_ (W)w);
2497
2498 {
2499 int active = ++idlecnt [ABSPRI (w)];
2500
2501 ++idleall;
1726 ev_start (EV_A_ (W)w, ++idlecnt); 2502 ev_start (EV_A_ (W)w, active);
2503
1727 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2504 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
1728 idles [idlecnt - 1] = w; 2505 idles [ABSPRI (w)][active - 1] = w;
2506 }
1729} 2507}
1730 2508
1731void 2509void
1732ev_idle_stop (EV_P_ ev_idle *w) 2510ev_idle_stop (EV_P_ ev_idle *w)
1733{ 2511{
1734 ev_clear_pending (EV_A_ (W)w); 2512 clear_pending (EV_A_ (W)w);
1735 if (expect_false (!ev_is_active (w))) 2513 if (expect_false (!ev_is_active (w)))
1736 return; 2514 return;
1737 2515
1738 { 2516 {
1739 int active = ((W)w)->active; 2517 int active = ev_active (w);
1740 idles [active - 1] = idles [--idlecnt]; 2518
1741 ((W)idles [active - 1])->active = active; 2519 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2520 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2521
2522 ev_stop (EV_A_ (W)w);
2523 --idleall;
1742 } 2524 }
1743
1744 ev_stop (EV_A_ (W)w);
1745} 2525}
2526#endif
1746 2527
1747void 2528void
1748ev_prepare_start (EV_P_ ev_prepare *w) 2529ev_prepare_start (EV_P_ ev_prepare *w)
1749{ 2530{
1750 if (expect_false (ev_is_active (w))) 2531 if (expect_false (ev_is_active (w)))
… …
1756} 2537}
1757 2538
1758void 2539void
1759ev_prepare_stop (EV_P_ ev_prepare *w) 2540ev_prepare_stop (EV_P_ ev_prepare *w)
1760{ 2541{
1761 ev_clear_pending (EV_A_ (W)w); 2542 clear_pending (EV_A_ (W)w);
1762 if (expect_false (!ev_is_active (w))) 2543 if (expect_false (!ev_is_active (w)))
1763 return; 2544 return;
1764 2545
1765 { 2546 {
1766 int active = ((W)w)->active; 2547 int active = ev_active (w);
2548
1767 prepares [active - 1] = prepares [--preparecnt]; 2549 prepares [active - 1] = prepares [--preparecnt];
1768 ((W)prepares [active - 1])->active = active; 2550 ev_active (prepares [active - 1]) = active;
1769 } 2551 }
1770 2552
1771 ev_stop (EV_A_ (W)w); 2553 ev_stop (EV_A_ (W)w);
1772} 2554}
1773 2555
… …
1783} 2565}
1784 2566
1785void 2567void
1786ev_check_stop (EV_P_ ev_check *w) 2568ev_check_stop (EV_P_ ev_check *w)
1787{ 2569{
1788 ev_clear_pending (EV_A_ (W)w); 2570 clear_pending (EV_A_ (W)w);
1789 if (expect_false (!ev_is_active (w))) 2571 if (expect_false (!ev_is_active (w)))
1790 return; 2572 return;
1791 2573
1792 { 2574 {
1793 int active = ((W)w)->active; 2575 int active = ev_active (w);
2576
1794 checks [active - 1] = checks [--checkcnt]; 2577 checks [active - 1] = checks [--checkcnt];
1795 ((W)checks [active - 1])->active = active; 2578 ev_active (checks [active - 1]) = active;
1796 } 2579 }
1797 2580
1798 ev_stop (EV_A_ (W)w); 2581 ev_stop (EV_A_ (W)w);
1799} 2582}
1800 2583
1801#if EV_EMBED_ENABLE 2584#if EV_EMBED_ENABLE
1802void noinline 2585void noinline
1803ev_embed_sweep (EV_P_ ev_embed *w) 2586ev_embed_sweep (EV_P_ ev_embed *w)
1804{ 2587{
1805 ev_loop (w->loop, EVLOOP_NONBLOCK); 2588 ev_loop (w->other, EVLOOP_NONBLOCK);
1806} 2589}
1807 2590
1808static void 2591static void
1809embed_cb (EV_P_ ev_io *io, int revents) 2592embed_io_cb (EV_P_ ev_io *io, int revents)
1810{ 2593{
1811 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2594 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
1812 2595
1813 if (ev_cb (w)) 2596 if (ev_cb (w))
1814 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2597 ev_feed_event (EV_A_ (W)w, EV_EMBED);
1815 else 2598 else
1816 ev_embed_sweep (loop, w); 2599 ev_loop (w->other, EVLOOP_NONBLOCK);
1817} 2600}
2601
2602static void
2603embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2604{
2605 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2606
2607 {
2608 struct ev_loop *loop = w->other;
2609
2610 while (fdchangecnt)
2611 {
2612 fd_reify (EV_A);
2613 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2614 }
2615 }
2616}
2617
2618#if 0
2619static void
2620embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2621{
2622 ev_idle_stop (EV_A_ idle);
2623}
2624#endif
1818 2625
1819void 2626void
1820ev_embed_start (EV_P_ ev_embed *w) 2627ev_embed_start (EV_P_ ev_embed *w)
1821{ 2628{
1822 if (expect_false (ev_is_active (w))) 2629 if (expect_false (ev_is_active (w)))
1823 return; 2630 return;
1824 2631
1825 { 2632 {
1826 struct ev_loop *loop = w->loop; 2633 struct ev_loop *loop = w->other;
1827 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2634 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
1828 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2635 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
1829 } 2636 }
1830 2637
1831 ev_set_priority (&w->io, ev_priority (w)); 2638 ev_set_priority (&w->io, ev_priority (w));
1832 ev_io_start (EV_A_ &w->io); 2639 ev_io_start (EV_A_ &w->io);
1833 2640
2641 ev_prepare_init (&w->prepare, embed_prepare_cb);
2642 ev_set_priority (&w->prepare, EV_MINPRI);
2643 ev_prepare_start (EV_A_ &w->prepare);
2644
2645 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2646
1834 ev_start (EV_A_ (W)w, 1); 2647 ev_start (EV_A_ (W)w, 1);
1835} 2648}
1836 2649
1837void 2650void
1838ev_embed_stop (EV_P_ ev_embed *w) 2651ev_embed_stop (EV_P_ ev_embed *w)
1839{ 2652{
1840 ev_clear_pending (EV_A_ (W)w); 2653 clear_pending (EV_A_ (W)w);
1841 if (expect_false (!ev_is_active (w))) 2654 if (expect_false (!ev_is_active (w)))
1842 return; 2655 return;
1843 2656
1844 ev_io_stop (EV_A_ &w->io); 2657 ev_io_stop (EV_A_ &w->io);
2658 ev_prepare_stop (EV_A_ &w->prepare);
1845 2659
1846 ev_stop (EV_A_ (W)w); 2660 ev_stop (EV_A_ (W)w);
1847} 2661}
1848#endif 2662#endif
1849 2663
… …
1860} 2674}
1861 2675
1862void 2676void
1863ev_fork_stop (EV_P_ ev_fork *w) 2677ev_fork_stop (EV_P_ ev_fork *w)
1864{ 2678{
1865 ev_clear_pending (EV_A_ (W)w); 2679 clear_pending (EV_A_ (W)w);
1866 if (expect_false (!ev_is_active (w))) 2680 if (expect_false (!ev_is_active (w)))
1867 return; 2681 return;
1868 2682
1869 { 2683 {
1870 int active = ((W)w)->active; 2684 int active = ev_active (w);
2685
1871 forks [active - 1] = forks [--forkcnt]; 2686 forks [active - 1] = forks [--forkcnt];
1872 ((W)forks [active - 1])->active = active; 2687 ev_active (forks [active - 1]) = active;
1873 } 2688 }
1874 2689
1875 ev_stop (EV_A_ (W)w); 2690 ev_stop (EV_A_ (W)w);
2691}
2692#endif
2693
2694#if EV_ASYNC_ENABLE
2695void
2696ev_async_start (EV_P_ ev_async *w)
2697{
2698 if (expect_false (ev_is_active (w)))
2699 return;
2700
2701 evpipe_init (EV_A);
2702
2703 ev_start (EV_A_ (W)w, ++asynccnt);
2704 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2705 asyncs [asynccnt - 1] = w;
2706}
2707
2708void
2709ev_async_stop (EV_P_ ev_async *w)
2710{
2711 clear_pending (EV_A_ (W)w);
2712 if (expect_false (!ev_is_active (w)))
2713 return;
2714
2715 {
2716 int active = ev_active (w);
2717
2718 asyncs [active - 1] = asyncs [--asynccnt];
2719 ev_active (asyncs [active - 1]) = active;
2720 }
2721
2722 ev_stop (EV_A_ (W)w);
2723}
2724
2725void
2726ev_async_send (EV_P_ ev_async *w)
2727{
2728 w->sent = 1;
2729 evpipe_write (EV_A_ &gotasync);
1876} 2730}
1877#endif 2731#endif
1878 2732
1879/*****************************************************************************/ 2733/*****************************************************************************/
1880 2734
… …
1938 ev_timer_set (&once->to, timeout, 0.); 2792 ev_timer_set (&once->to, timeout, 0.);
1939 ev_timer_start (EV_A_ &once->to); 2793 ev_timer_start (EV_A_ &once->to);
1940 } 2794 }
1941} 2795}
1942 2796
2797#if EV_MULTIPLICITY
2798 #include "ev_wrap.h"
2799#endif
2800
1943#ifdef __cplusplus 2801#ifdef __cplusplus
1944} 2802}
1945#endif 2803#endif
1946 2804

Diff Legend

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