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

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

Diff Legend

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