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

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

Diff Legend

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