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

Diff Legend

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