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

Comparing libev/ev.c (file contents):
Revision 1.144 by root, Tue Nov 27 08:11: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
159#endif 206#endif
160 207
161/**/ 208#ifndef EV_USE_INOTIFY
209# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
210# define EV_USE_INOTIFY 1
211# else
212# define EV_USE_INOTIFY 0
213# endif
214#endif
215
216#ifndef EV_PID_HASHSIZE
217# if EV_MINIMAL
218# define EV_PID_HASHSIZE 1
219# else
220# define EV_PID_HASHSIZE 16
221# endif
222#endif
223
224#ifndef EV_INOTIFY_HASHSIZE
225# if EV_MINIMAL
226# define EV_INOTIFY_HASHSIZE 1
227# else
228# define EV_INOTIFY_HASHSIZE 16
229# endif
230#endif
231
232#ifndef EV_USE_EVENTFD
233# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
234# define EV_USE_EVENTFD 1
235# else
236# define EV_USE_EVENTFD 0
237# endif
238#endif
239
240/* this block fixes any misconfiguration where we know we run into trouble otherwise */
162 241
163#ifndef CLOCK_MONOTONIC 242#ifndef CLOCK_MONOTONIC
164# undef EV_USE_MONOTONIC 243# undef EV_USE_MONOTONIC
165# define EV_USE_MONOTONIC 0 244# define EV_USE_MONOTONIC 0
166#endif 245#endif
… …
168#ifndef CLOCK_REALTIME 247#ifndef CLOCK_REALTIME
169# undef EV_USE_REALTIME 248# undef EV_USE_REALTIME
170# define EV_USE_REALTIME 0 249# define EV_USE_REALTIME 0
171#endif 250#endif
172 251
252#if !EV_STAT_ENABLE
253# undef EV_USE_INOTIFY
254# define EV_USE_INOTIFY 0
255#endif
256
257#if !EV_USE_NANOSLEEP
258# ifndef _WIN32
259# include <sys/select.h>
260# endif
261#endif
262
263#if EV_USE_INOTIFY
264# include <sys/inotify.h>
265#endif
266
173#if EV_SELECT_IS_WINSOCKET 267#if EV_SELECT_IS_WINSOCKET
174# include <winsock.h> 268# include <winsock.h>
175#endif 269#endif
176 270
271#if EV_USE_EVENTFD
272/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
273# include <stdint.h>
274int eventfd (unsigned int initval, int flags);
275#endif
276
177/**/ 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 */
178 288
179#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) */
180#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) */
181#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
182/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */ 291/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
183 292
184#ifdef EV_H
185# include EV_H
186#else
187# include "ev.h"
188#endif
189
190#if __GNUC__ >= 3 293#if __GNUC__ >= 4
191# define expect(expr,value) __builtin_expect ((expr),(value)) 294# define expect(expr,value) __builtin_expect ((expr),(value))
192# define inline_size static inline /* inline for codesize */
193# if EV_MINIMAL
194# define noinline __attribute__ ((noinline)) 295# define noinline __attribute__ ((noinline))
195# define inline_speed static noinline
196# else
197# define noinline
198# define inline_speed static inline
199# endif
200#else 296#else
201# define expect(expr,value) (expr) 297# define expect(expr,value) (expr)
202# define inline_speed static
203# define inline_minimal static
204# define noinline 298# define noinline
299# if __STDC_VERSION__ < 199901L
300# define inline
301# endif
205#endif 302#endif
206 303
207#define expect_false(expr) expect ((expr) != 0, 0) 304#define expect_false(expr) expect ((expr) != 0, 0)
208#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
209 313
210#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 314#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
211#define ABSPRI(w) ((w)->priority - EV_MINPRI) 315#define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
212 316
213#define EMPTY0 /* required for microsofts broken pseudo-c compiler */ 317#define EMPTY /* required for microsofts broken pseudo-c compiler */
214#define EMPTY2(a,b) /* used to suppress some warnings */ 318#define EMPTY2(a,b) /* used to suppress some warnings */
215 319
216typedef ev_watcher *W; 320typedef ev_watcher *W;
217typedef ev_watcher_list *WL; 321typedef ev_watcher_list *WL;
218typedef ev_watcher_time *WT; 322typedef ev_watcher_time *WT;
219 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 */
220static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 327static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
328#endif
221 329
222#ifdef _WIN32 330#ifdef _WIN32
223# include "ev_win32.c" 331# include "ev_win32.c"
224#endif 332#endif
225 333
… …
254ev_set_allocator (void *(*cb)(void *ptr, long size)) 362ev_set_allocator (void *(*cb)(void *ptr, long size))
255{ 363{
256 alloc = cb; 364 alloc = cb;
257} 365}
258 366
259static void * 367inline_speed void *
260ev_realloc (void *ptr, long size) 368ev_realloc (void *ptr, long size)
261{ 369{
262 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 370 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size);
263 371
264 if (!ptr && size) 372 if (!ptr && size)
… …
288typedef struct 396typedef struct
289{ 397{
290 W w; 398 W w;
291 int events; 399 int events;
292} ANPENDING; 400} ANPENDING;
401
402#if EV_USE_INOTIFY
403typedef struct
404{
405 WL head;
406} ANFS;
407#endif
293 408
294#if EV_MULTIPLICITY 409#if EV_MULTIPLICITY
295 410
296 struct ev_loop 411 struct ev_loop
297 { 412 {
… …
354{ 469{
355 return ev_rt_now; 470 return ev_rt_now;
356} 471}
357#endif 472#endif
358 473
359#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}
360 528
361#define array_needsize(type,base,cur,cnt,init) \ 529#define array_needsize(type,base,cur,cnt,init) \
362 if (expect_false ((cnt) > cur)) \ 530 if (expect_false ((cnt) > (cur))) \
363 { \ 531 { \
364 int newcnt = cur; \ 532 int ocur_ = (cur); \
365 do \ 533 (base) = (type *)array_realloc \
366 { \ 534 (sizeof (type), (base), &(cur), (cnt)); \
367 newcnt = array_roundsize (type, newcnt << 1); \ 535 init ((base) + (ocur_), (cur) - ocur_); \
368 } \
369 while ((cnt) > newcnt); \
370 \
371 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
372 init (base + cur, newcnt - cur); \
373 cur = newcnt; \
374 } 536 }
375 537
538#if 0
376#define array_slim(type,stem) \ 539#define array_slim(type,stem) \
377 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 540 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
378 { \ 541 { \
379 stem ## max = array_roundsize (stem ## cnt >> 1); \ 542 stem ## max = array_roundsize (stem ## cnt >> 1); \
380 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 543 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
381 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 544 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
382 } 545 }
546#endif
383 547
384#define array_free(stem, idx) \ 548#define array_free(stem, idx) \
385 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;
386 550
387/*****************************************************************************/ 551/*****************************************************************************/
388 552
389void noinline 553void noinline
390ev_feed_event (EV_P_ void *w, int revents) 554ev_feed_event (EV_P_ void *w, int revents)
391{ 555{
392 W w_ = (W)w; 556 W w_ = (W)w;
557 int pri = ABSPRI (w_);
393 558
394 if (expect_false (w_->pending)) 559 if (expect_false (w_->pending))
560 pendings [pri][w_->pending - 1].events |= revents;
561 else
395 { 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_;
396 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 566 pendings [pri][w_->pending - 1].events = revents;
397 return;
398 } 567 }
399
400 w_->pending = ++pendingcnt [ABSPRI (w_)];
401 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
402 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
403 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
404} 568}
405 569
406void inline_size 570void inline_speed
407queue_events (EV_P_ W *events, int eventcnt, int type) 571queue_events (EV_P_ W *events, int eventcnt, int type)
408{ 572{
409 int i; 573 int i;
410 574
411 for (i = 0; i < eventcnt; ++i) 575 for (i = 0; i < eventcnt; ++i)
… …
443} 607}
444 608
445void 609void
446ev_feed_fd_event (EV_P_ int fd, int revents) 610ev_feed_fd_event (EV_P_ int fd, int revents)
447{ 611{
612 if (fd >= 0 && fd < anfdmax)
448 fd_event (EV_A_ fd, revents); 613 fd_event (EV_A_ fd, revents);
449} 614}
450 615
451void inline_size 616void inline_size
452fd_reify (EV_P) 617fd_reify (EV_P)
453{ 618{
… …
457 { 622 {
458 int fd = fdchanges [i]; 623 int fd = fdchanges [i];
459 ANFD *anfd = anfds + fd; 624 ANFD *anfd = anfds + fd;
460 ev_io *w; 625 ev_io *w;
461 626
462 int events = 0; 627 unsigned char events = 0;
463 628
464 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)
465 events |= w->events; 630 events |= (unsigned char)w->events;
466 631
467#if EV_SELECT_IS_WINSOCKET 632#if EV_SELECT_IS_WINSOCKET
468 if (events) 633 if (events)
469 { 634 {
470 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
471 anfd->handle = _get_osfhandle (fd); 639 anfd->handle = _get_osfhandle (fd);
640 #endif
472 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));
473 } 642 }
474#endif 643#endif
475 644
645 {
646 unsigned char o_events = anfd->events;
647 unsigned char o_reify = anfd->reify;
648
476 anfd->reify = 0; 649 anfd->reify = 0;
477
478 backend_modify (EV_A_ fd, anfd->events, events);
479 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 }
480 } 655 }
481 656
482 fdchangecnt = 0; 657 fdchangecnt = 0;
483} 658}
484 659
485void inline_size 660void inline_size
486fd_change (EV_P_ int fd) 661fd_change (EV_P_ int fd, int flags)
487{ 662{
488 if (expect_false (anfds [fd].reify)) 663 unsigned char reify = anfds [fd].reify;
489 return;
490
491 anfds [fd].reify = 1; 664 anfds [fd].reify |= flags;
492 665
666 if (expect_true (!reify))
667 {
493 ++fdchangecnt; 668 ++fdchangecnt;
494 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 669 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
495 fdchanges [fdchangecnt - 1] = fd; 670 fdchanges [fdchangecnt - 1] = fd;
671 }
496} 672}
497 673
498void inline_speed 674void inline_speed
499fd_kill (EV_P_ int fd) 675fd_kill (EV_P_ int fd)
500{ 676{
… …
547static void noinline 723static void noinline
548fd_rearm_all (EV_P) 724fd_rearm_all (EV_P)
549{ 725{
550 int fd; 726 int fd;
551 727
552 /* this should be highly optimised to not do anything but set a flag */
553 for (fd = 0; fd < anfdmax; ++fd) 728 for (fd = 0; fd < anfdmax; ++fd)
554 if (anfds [fd].events) 729 if (anfds [fd].events)
555 { 730 {
556 anfds [fd].events = 0; 731 anfds [fd].events = 0;
557 fd_change (EV_A_ fd); 732 fd_change (EV_A_ fd, EV_IOFDSET | 1);
558 } 733 }
559} 734}
560 735
561/*****************************************************************************/ 736/*****************************************************************************/
562 737
563void inline_speed 738void inline_speed
564upheap (WT *heap, int k) 739upheap (WT *heap, int k)
565{ 740{
566 WT w = heap [k]; 741 WT w = heap [k];
567 742
568 while (k && heap [k >> 1]->at > w->at) 743 while (k)
569 { 744 {
745 int p = (k - 1) >> 1;
746
747 if (heap [p]->at <= w->at)
748 break;
749
570 heap [k] = heap [k >> 1]; 750 heap [k] = heap [p];
571 ((W)heap [k])->active = k + 1; 751 ((W)heap [k])->active = k + 1;
572 k >>= 1; 752 k = p;
573 } 753 }
574 754
575 heap [k] = w; 755 heap [k] = w;
576 ((W)heap [k])->active = k + 1; 756 ((W)heap [k])->active = k + 1;
577
578} 757}
579 758
580void inline_speed 759void inline_speed
581downheap (WT *heap, int N, int k) 760downheap (WT *heap, int N, int k)
582{ 761{
583 WT w = heap [k]; 762 WT w = heap [k];
584 763
585 while (k < (N >> 1)) 764 for (;;)
586 { 765 {
587 int j = k << 1; 766 int c = (k << 1) + 1;
588 767
589 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 768 if (c >= N)
590 ++j;
591
592 if (w->at <= heap [j]->at)
593 break; 769 break;
594 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
595 heap [k] = heap [j]; 777 heap [k] = heap [c];
596 ((W)heap [k])->active = k + 1; 778 ((W)heap [k])->active = k + 1;
779
597 k = j; 780 k = c;
598 } 781 }
599 782
600 heap [k] = w; 783 heap [k] = w;
601 ((W)heap [k])->active = k + 1; 784 ((W)heap [k])->active = k + 1;
602} 785}
… …
611/*****************************************************************************/ 794/*****************************************************************************/
612 795
613typedef struct 796typedef struct
614{ 797{
615 WL head; 798 WL head;
616 sig_atomic_t volatile gotsig; 799 EV_ATOMIC_T gotsig;
617} ANSIG; 800} ANSIG;
618 801
619static ANSIG *signals; 802static ANSIG *signals;
620static int signalmax; 803static int signalmax;
621 804
622static int sigpipe [2]; 805static EV_ATOMIC_T gotsig;
623static sig_atomic_t volatile gotsig;
624static ev_io sigev;
625 806
626void inline_size 807void inline_size
627signals_init (ANSIG *base, int count) 808signals_init (ANSIG *base, int count)
628{ 809{
629 while (count--) 810 while (count--)
… …
633 814
634 ++base; 815 ++base;
635 } 816 }
636} 817}
637 818
638static void 819/*****************************************************************************/
639sighandler (int signum)
640{
641#if _WIN32
642 signal (signum, sighandler);
643#endif
644 820
645 signals [signum - 1].gotsig = 1;
646
647 if (!gotsig)
648 {
649 int old_errno = errno;
650 gotsig = 1;
651 write (sigpipe [1], &signum, 1);
652 errno = old_errno;
653 }
654}
655
656void noinline
657ev_feed_signal_event (EV_P_ int signum)
658{
659 WL w;
660
661#if EV_MULTIPLICITY
662 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
663#endif
664
665 --signum;
666
667 if (signum < 0 || signum >= signalmax)
668 return;
669
670 signals [signum].gotsig = 0;
671
672 for (w = signals [signum].head; w; w = w->next)
673 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
674}
675
676static void
677sigcb (EV_P_ ev_io *iow, int revents)
678{
679 int signum;
680
681 read (sigpipe [0], &revents, 1);
682 gotsig = 0;
683
684 for (signum = signalmax; signum--; )
685 if (signals [signum].gotsig)
686 ev_feed_signal_event (EV_A_ signum + 1);
687}
688
689void inline_size 821void inline_speed
690fd_intern (int fd) 822fd_intern (int fd)
691{ 823{
692#ifdef _WIN32 824#ifdef _WIN32
693 int arg = 1; 825 int arg = 1;
694 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 826 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
697 fcntl (fd, F_SETFL, O_NONBLOCK); 829 fcntl (fd, F_SETFL, O_NONBLOCK);
698#endif 830#endif
699} 831}
700 832
701static void noinline 833static void noinline
702siginit (EV_P) 834evpipe_init (EV_P)
703{ 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
704 fd_intern (sigpipe [0]); 851 fd_intern (evpipe [0]);
705 fd_intern (sigpipe [1]); 852 fd_intern (evpipe [1]);
853 ev_io_set (&pipeev, evpipe [0], EV_READ);
854 }
706 855
707 ev_io_set (&sigev, sigpipe [0], EV_READ);
708 ev_io_start (EV_A_ &sigev); 856 ev_io_start (EV_A_ &pipeev);
709 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
710} 924}
711 925
712/*****************************************************************************/ 926/*****************************************************************************/
713 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
714static ev_child *childs [PID_HASHSIZE]; 965static WL childs [EV_PID_HASHSIZE];
715 966
716#ifndef _WIN32 967#ifndef _WIN32
717 968
718static ev_signal childev; 969static ev_signal childev;
719 970
971#ifndef WIFCONTINUED
972# define WIFCONTINUED(status) 0
973#endif
974
720void inline_speed 975void inline_speed
721child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 976child_reap (EV_P_ int chain, int pid, int status)
722{ 977{
723 ev_child *w; 978 ev_child *w;
979 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
724 980
725 for (w = (ev_child *)childs [chain & (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 {
726 if (w->pid == pid || !w->pid) 983 if ((w->pid == pid || !w->pid)
984 && (!traced || (w->flags & 1)))
727 { 985 {
728 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 */
729 w->rpid = pid; 987 w->rpid = pid;
730 w->rstatus = status; 988 w->rstatus = status;
731 ev_feed_event (EV_A_ (W)w, EV_CHILD); 989 ev_feed_event (EV_A_ (W)w, EV_CHILD);
732 } 990 }
991 }
733} 992}
734 993
735#ifndef WCONTINUED 994#ifndef WCONTINUED
736# define WCONTINUED 0 995# define WCONTINUED 0
737#endif 996#endif
… …
746 if (!WCONTINUED 1005 if (!WCONTINUED
747 || errno != EINVAL 1006 || errno != EINVAL
748 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1007 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
749 return; 1008 return;
750 1009
751 /* 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 */
752 /* 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 */
753 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1012 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
754 1013
755 child_reap (EV_A_ sw, pid, pid, status); 1014 child_reap (EV_A_ pid, pid, status);
1015 if (EV_PID_HASHSIZE > 1)
756 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1016 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
757} 1017}
758 1018
759#endif 1019#endif
760 1020
761/*****************************************************************************/ 1021/*****************************************************************************/
… …
833} 1093}
834 1094
835unsigned int 1095unsigned int
836ev_embeddable_backends (void) 1096ev_embeddable_backends (void)
837{ 1097{
838 return EVBACKEND_EPOLL 1098 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
839 | EVBACKEND_KQUEUE 1099
840 | 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;
841} 1105}
842 1106
843unsigned int 1107unsigned int
844ev_backend (EV_P) 1108ev_backend (EV_P)
845{ 1109{
846 return backend; 1110 return backend;
847} 1111}
848 1112
849static 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
850loop_init (EV_P_ unsigned int flags) 1132loop_init (EV_P_ unsigned int flags)
851{ 1133{
852 if (!backend) 1134 if (!backend)
853 { 1135 {
854#if EV_USE_MONOTONIC 1136#if EV_USE_MONOTONIC
… …
857 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1139 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
858 have_monotonic = 1; 1140 have_monotonic = 1;
859 } 1141 }
860#endif 1142#endif
861 1143
862 ev_rt_now = ev_time (); 1144 ev_rt_now = ev_time ();
863 mn_now = get_clock (); 1145 mn_now = get_clock ();
864 now_floor = mn_now; 1146 now_floor = mn_now;
865 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
866 1163
867 if (!(flags & EVFLAG_NOENV) 1164 if (!(flags & EVFLAG_NOENV)
868 && !enable_secure () 1165 && !enable_secure ()
869 && getenv ("LIBEV_FLAGS")) 1166 && getenv ("LIBEV_FLAGS"))
870 flags = atoi (getenv ("LIBEV_FLAGS")); 1167 flags = atoi (getenv ("LIBEV_FLAGS"));
871 1168
872 if (!(flags & 0x0000ffffUL)) 1169 if (!(flags & 0x0000ffffUL))
873 flags |= ev_recommended_backends (); 1170 flags |= ev_recommended_backends ();
874 1171
875 backend = 0;
876#if EV_USE_PORT 1172#if EV_USE_PORT
877 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1173 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
878#endif 1174#endif
879#if EV_USE_KQUEUE 1175#if EV_USE_KQUEUE
880 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1176 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
887#endif 1183#endif
888#if EV_USE_SELECT 1184#if EV_USE_SELECT
889 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1185 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
890#endif 1186#endif
891 1187
892 ev_init (&sigev, sigcb); 1188 ev_init (&pipeev, pipecb);
893 ev_set_priority (&sigev, EV_MAXPRI); 1189 ev_set_priority (&pipeev, EV_MAXPRI);
894 } 1190 }
895} 1191}
896 1192
897static void 1193static void noinline
898loop_destroy (EV_P) 1194loop_destroy (EV_P)
899{ 1195{
900 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);
901 1222
902#if EV_USE_PORT 1223#if EV_USE_PORT
903 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1224 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
904#endif 1225#endif
905#if EV_USE_KQUEUE 1226#if EV_USE_KQUEUE
… …
914#if EV_USE_SELECT 1235#if EV_USE_SELECT
915 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1236 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
916#endif 1237#endif
917 1238
918 for (i = NUMPRI; i--; ) 1239 for (i = NUMPRI; i--; )
1240 {
919 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;
920 1248
921 /* have to use the microsoft-never-gets-it-right macro */ 1249 /* have to use the microsoft-never-gets-it-right macro */
922 array_free (fdchange, EMPTY0); 1250 array_free (fdchange, EMPTY);
923 array_free (timer, EMPTY0); 1251 array_free (timer, EMPTY);
924#if EV_PERIODIC_ENABLE 1252#if EV_PERIODIC_ENABLE
925 array_free (periodic, EMPTY0); 1253 array_free (periodic, EMPTY);
926#endif 1254#endif
1255#if EV_FORK_ENABLE
927 array_free (idle, EMPTY0); 1256 array_free (fork, EMPTY);
1257#endif
928 array_free (prepare, EMPTY0); 1258 array_free (prepare, EMPTY);
929 array_free (check, EMPTY0); 1259 array_free (check, EMPTY);
1260#if EV_ASYNC_ENABLE
1261 array_free (async, EMPTY);
1262#endif
930 1263
931 backend = 0; 1264 backend = 0;
932} 1265}
933 1266
934static void 1267void inline_size infy_fork (EV_P);
1268
1269void inline_size
935loop_fork (EV_P) 1270loop_fork (EV_P)
936{ 1271{
937#if EV_USE_PORT 1272#if EV_USE_PORT
938 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1273 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
939#endif 1274#endif
… …
941 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A); 1276 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
942#endif 1277#endif
943#if EV_USE_EPOLL 1278#if EV_USE_EPOLL
944 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A); 1279 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
945#endif 1280#endif
1281#if EV_USE_INOTIFY
1282 infy_fork (EV_A);
1283#endif
946 1284
947 if (ev_is_active (&sigev)) 1285 if (ev_is_active (&pipeev))
948 { 1286 {
949 /* 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
950 1293
951 ev_ref (EV_A); 1294 ev_ref (EV_A);
952 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 {
953 close (sigpipe [0]); 1304 close (evpipe [0]);
954 close (sigpipe [1]); 1305 close (evpipe [1]);
1306 }
955 1307
956 while (pipe (sigpipe))
957 syserr ("(libev) error creating pipe");
958
959 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);
960 } 1311 }
961 1312
962 postfork = 0; 1313 postfork = 0;
963} 1314}
964 1315
… …
986} 1337}
987 1338
988void 1339void
989ev_loop_fork (EV_P) 1340ev_loop_fork (EV_P)
990{ 1341{
991 postfork = 1; 1342 postfork = 1; /* must be in line with ev_default_fork */
992} 1343}
993 1344
994#endif 1345#endif
995 1346
996#if EV_MULTIPLICITY 1347#if EV_MULTIPLICITY
… …
999#else 1350#else
1000int 1351int
1001ev_default_loop (unsigned int flags) 1352ev_default_loop (unsigned int flags)
1002#endif 1353#endif
1003{ 1354{
1004 if (sigpipe [0] == sigpipe [1])
1005 if (pipe (sigpipe))
1006 return 0;
1007
1008 if (!ev_default_loop_ptr) 1355 if (!ev_default_loop_ptr)
1009 { 1356 {
1010#if EV_MULTIPLICITY 1357#if EV_MULTIPLICITY
1011 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1358 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1012#else 1359#else
… …
1015 1362
1016 loop_init (EV_A_ flags); 1363 loop_init (EV_A_ flags);
1017 1364
1018 if (ev_backend (EV_A)) 1365 if (ev_backend (EV_A))
1019 { 1366 {
1020 siginit (EV_A);
1021
1022#ifndef _WIN32 1367#ifndef _WIN32
1023 ev_signal_init (&childev, childcb, SIGCHLD); 1368 ev_signal_init (&childev, childcb, SIGCHLD);
1024 ev_set_priority (&childev, EV_MAXPRI); 1369 ev_set_priority (&childev, EV_MAXPRI);
1025 ev_signal_start (EV_A_ &childev); 1370 ev_signal_start (EV_A_ &childev);
1026 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1371 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1043#ifndef _WIN32 1388#ifndef _WIN32
1044 ev_ref (EV_A); /* child watcher */ 1389 ev_ref (EV_A); /* child watcher */
1045 ev_signal_stop (EV_A_ &childev); 1390 ev_signal_stop (EV_A_ &childev);
1046#endif 1391#endif
1047 1392
1048 ev_ref (EV_A); /* signal watcher */
1049 ev_io_stop (EV_A_ &sigev);
1050
1051 close (sigpipe [0]); sigpipe [0] = 0;
1052 close (sigpipe [1]); sigpipe [1] = 0;
1053
1054 loop_destroy (EV_A); 1393 loop_destroy (EV_A);
1055} 1394}
1056 1395
1057void 1396void
1058ev_default_fork (void) 1397ev_default_fork (void)
… …
1060#if EV_MULTIPLICITY 1399#if EV_MULTIPLICITY
1061 struct ev_loop *loop = ev_default_loop_ptr; 1400 struct ev_loop *loop = ev_default_loop_ptr;
1062#endif 1401#endif
1063 1402
1064 if (backend) 1403 if (backend)
1065 postfork = 1; 1404 postfork = 1; /* must be in line with ev_loop_fork */
1066} 1405}
1067 1406
1068/*****************************************************************************/ 1407/*****************************************************************************/
1069 1408
1070int inline_size 1409void
1071any_pending (EV_P) 1410ev_invoke (EV_P_ void *w, int revents)
1072{ 1411{
1073 int pri; 1412 EV_CB_INVOKE ((W)w, revents);
1074
1075 for (pri = NUMPRI; pri--; )
1076 if (pendingcnt [pri])
1077 return 1;
1078
1079 return 0;
1080} 1413}
1081 1414
1082void inline_speed 1415void inline_speed
1083call_pending (EV_P) 1416call_pending (EV_P)
1084{ 1417{
… …
1089 { 1422 {
1090 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1423 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1091 1424
1092 if (expect_true (p->w)) 1425 if (expect_true (p->w))
1093 { 1426 {
1094 assert (("non-pending watcher on pending list", p->w->pending)); 1427 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1095 1428
1096 p->w->pending = 0; 1429 p->w->pending = 0;
1097 EV_CB_INVOKE (p->w, p->events); 1430 EV_CB_INVOKE (p->w, p->events);
1098 } 1431 }
1099 } 1432 }
… …
1102void inline_size 1435void inline_size
1103timers_reify (EV_P) 1436timers_reify (EV_P)
1104{ 1437{
1105 while (timercnt && ((WT)timers [0])->at <= mn_now) 1438 while (timercnt && ((WT)timers [0])->at <= mn_now)
1106 { 1439 {
1107 ev_timer *w = timers [0]; 1440 ev_timer *w = (ev_timer *)timers [0];
1108 1441
1109 assert (("inactive timer on timer heap detected", ev_is_active (w))); 1442 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1110 1443
1111 /* first reschedule or stop timer */ 1444 /* first reschedule or stop timer */
1112 if (w->repeat) 1445 if (w->repeat)
1113 { 1446 {
1114 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.));
1115 1448
1116 ((WT)w)->at += w->repeat; 1449 ((WT)w)->at += w->repeat;
1117 if (((WT)w)->at < mn_now) 1450 if (((WT)w)->at < mn_now)
1118 ((WT)w)->at = mn_now; 1451 ((WT)w)->at = mn_now;
1119 1452
1120 downheap ((WT *)timers, timercnt, 0); 1453 downheap (timers, timercnt, 0);
1121 } 1454 }
1122 else 1455 else
1123 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1456 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1124 1457
1125 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1458 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1130void inline_size 1463void inline_size
1131periodics_reify (EV_P) 1464periodics_reify (EV_P)
1132{ 1465{
1133 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1466 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1134 { 1467 {
1135 ev_periodic *w = periodics [0]; 1468 ev_periodic *w = (ev_periodic *)periodics [0];
1136 1469
1137 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1470 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1138 1471
1139 /* first reschedule or stop timer */ 1472 /* first reschedule or stop timer */
1140 if (w->reschedule_cb) 1473 if (w->reschedule_cb)
1141 { 1474 {
1142 ((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);
1143 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));
1144 downheap ((WT *)periodics, periodiccnt, 0); 1477 downheap (periodics, periodiccnt, 0);
1145 } 1478 }
1146 else if (w->interval) 1479 else if (w->interval)
1147 { 1480 {
1148 ((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;
1149 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));
1150 downheap ((WT *)periodics, periodiccnt, 0); 1484 downheap (periodics, periodiccnt, 0);
1151 } 1485 }
1152 else 1486 else
1153 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1487 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1154 1488
1155 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1489 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1162 int i; 1496 int i;
1163 1497
1164 /* adjust periodics after time jump */ 1498 /* adjust periodics after time jump */
1165 for (i = 0; i < periodiccnt; ++i) 1499 for (i = 0; i < periodiccnt; ++i)
1166 { 1500 {
1167 ev_periodic *w = periodics [i]; 1501 ev_periodic *w = (ev_periodic *)periodics [i];
1168 1502
1169 if (w->reschedule_cb) 1503 if (w->reschedule_cb)
1170 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1504 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1171 else if (w->interval) 1505 else if (w->interval)
1172 ((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;
1173 } 1507 }
1174 1508
1175 /* now rebuild the heap */ 1509 /* now rebuild the heap */
1176 for (i = periodiccnt >> 1; i--; ) 1510 for (i = periodiccnt >> 1; i--; )
1177 downheap ((WT *)periodics, periodiccnt, i); 1511 downheap (periodics, periodiccnt, i);
1178} 1512}
1179#endif 1513#endif
1180 1514
1515#if EV_IDLE_ENABLE
1181int inline_size 1516void inline_size
1182time_update_monotonic (EV_P) 1517idle_reify (EV_P)
1183{ 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
1184 mn_now = get_clock (); 1548 mn_now = get_clock ();
1185 1549
1550 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1551 /* interpolate in the meantime */
1186 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1552 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1187 { 1553 {
1188 ev_rt_now = rtmn_diff + mn_now; 1554 ev_rt_now = rtmn_diff + mn_now;
1189 return 0; 1555 return;
1190 } 1556 }
1191 else 1557
1192 {
1193 now_floor = mn_now; 1558 now_floor = mn_now;
1194 ev_rt_now = ev_time (); 1559 ev_rt_now = ev_time ();
1195 return 1;
1196 }
1197}
1198 1560
1199void inline_size 1561 /* loop a few times, before making important decisions.
1200time_update (EV_P) 1562 * on the choice of "4": one iteration isn't enough,
1201{ 1563 * in case we get preempted during the calls to
1202 int i; 1564 * ev_time and get_clock. a second call is almost guaranteed
1203 1565 * to succeed in that case, though. and looping a few more times
1204#if EV_USE_MONOTONIC 1566 * doesn't hurt either as we only do this on time-jumps or
1205 if (expect_true (have_monotonic)) 1567 * in the unlikely event of having been preempted here.
1206 { 1568 */
1207 if (time_update_monotonic (EV_A)) 1569 for (i = 4; --i; )
1208 { 1570 {
1209 ev_tstamp odiff = rtmn_diff;
1210
1211 /* loop a few times, before making important decisions.
1212 * on the choice of "4": one iteration isn't enough,
1213 * in case we get preempted during the calls to
1214 * ev_time and get_clock. a second call is almost guarenteed
1215 * to succeed in that case, though. and looping a few more times
1216 * doesn't hurt either as we only do this on time-jumps or
1217 * in the unlikely event of getting preempted here.
1218 */
1219 for (i = 4; --i; )
1220 {
1221 rtmn_diff = ev_rt_now - mn_now; 1571 rtmn_diff = ev_rt_now - mn_now;
1222 1572
1223 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1573 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1224 return; /* all is well */ 1574 return; /* all is well */
1225 1575
1226 ev_rt_now = ev_time (); 1576 ev_rt_now = ev_time ();
1227 mn_now = get_clock (); 1577 mn_now = get_clock ();
1228 now_floor = mn_now; 1578 now_floor = mn_now;
1229 } 1579 }
1230 1580
1231# if EV_PERIODIC_ENABLE 1581# if EV_PERIODIC_ENABLE
1232 periodics_reschedule (EV_A); 1582 periodics_reschedule (EV_A);
1233# endif 1583# endif
1234 /* no timer adjustment, as the monotonic clock doesn't jump */ 1584 /* no timer adjustment, as the monotonic clock doesn't jump */
1235 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1585 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1236 }
1237 } 1586 }
1238 else 1587 else
1239#endif 1588#endif
1240 { 1589 {
1241 ev_rt_now = ev_time (); 1590 ev_rt_now = ev_time ();
1242 1591
1243 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))
1244 { 1593 {
1245#if EV_PERIODIC_ENABLE 1594#if EV_PERIODIC_ENABLE
1246 periodics_reschedule (EV_A); 1595 periodics_reschedule (EV_A);
1247#endif 1596#endif
1248
1249 /* 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 */
1250 for (i = 0; i < timercnt; ++i) 1598 for (i = 0; i < timercnt; ++i)
1251 ((WT)timers [i])->at += ev_rt_now - mn_now; 1599 ((WT)timers [i])->at += ev_rt_now - mn_now;
1252 } 1600 }
1253 1601
1254 mn_now = ev_rt_now; 1602 mn_now = ev_rt_now;
… …
1270static int loop_done; 1618static int loop_done;
1271 1619
1272void 1620void
1273ev_loop (EV_P_ int flags) 1621ev_loop (EV_P_ int flags)
1274{ 1622{
1275 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1623 loop_done = EVUNLOOP_CANCEL;
1276 ? EVUNLOOP_ONE
1277 : EVUNLOOP_CANCEL;
1278 1624
1279 while (activecnt) 1625 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1626
1627 do
1280 { 1628 {
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
1638#if EV_FORK_ENABLE
1639 /* we might have forked, so queue fork handlers */
1640 if (expect_false (postfork))
1641 if (forkcnt)
1642 {
1643 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1644 call_pending (EV_A);
1645 }
1646#endif
1647
1281 /* queue check watchers (and execute them) */ 1648 /* queue prepare watchers (and execute them) */
1282 if (expect_false (preparecnt)) 1649 if (expect_false (preparecnt))
1283 { 1650 {
1284 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1651 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1285 call_pending (EV_A); 1652 call_pending (EV_A);
1286 } 1653 }
1287 1654
1655 if (expect_false (!activecnt))
1656 break;
1657
1288 /* we might have forked, so reify kernel state if necessary */ 1658 /* we might have forked, so reify kernel state if necessary */
1289 if (expect_false (postfork)) 1659 if (expect_false (postfork))
1290 loop_fork (EV_A); 1660 loop_fork (EV_A);
1291 1661
1292 /* update fd-related kernel structures */ 1662 /* update fd-related kernel structures */
1293 fd_reify (EV_A); 1663 fd_reify (EV_A);
1294 1664
1295 /* calculate blocking time */ 1665 /* calculate blocking time */
1296 { 1666 {
1297 double block; 1667 ev_tstamp waittime = 0.;
1668 ev_tstamp sleeptime = 0.;
1298 1669
1299 if (flags & EVLOOP_NONBLOCK || idlecnt) 1670 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1300 block = 0.; /* do not block at all */
1301 else
1302 { 1671 {
1303 /* update time to cancel out callback processing overhead */ 1672 /* update time to cancel out callback processing overhead */
1304#if EV_USE_MONOTONIC
1305 if (expect_true (have_monotonic))
1306 time_update_monotonic (EV_A); 1673 time_update (EV_A_ 1e100);
1307 else
1308#endif
1309 {
1310 ev_rt_now = ev_time ();
1311 mn_now = ev_rt_now;
1312 }
1313 1674
1314 block = MAX_BLOCKTIME; 1675 waittime = MAX_BLOCKTIME;
1315 1676
1316 if (timercnt) 1677 if (timercnt)
1317 { 1678 {
1318 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1679 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1319 if (block > to) block = to; 1680 if (waittime > to) waittime = to;
1320 } 1681 }
1321 1682
1322#if EV_PERIODIC_ENABLE 1683#if EV_PERIODIC_ENABLE
1323 if (periodiccnt) 1684 if (periodiccnt)
1324 { 1685 {
1325 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;
1326 if (block > to) block = to; 1687 if (waittime > to) waittime = to;
1327 } 1688 }
1328#endif 1689#endif
1329 1690
1330 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 }
1331 } 1704 }
1332 1705
1706 ++loop_count;
1333 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);
1334 } 1711 }
1335
1336 /* update ev_rt_now, do magic */
1337 time_update (EV_A);
1338 1712
1339 /* queue pending timers and reschedule them */ 1713 /* queue pending timers and reschedule them */
1340 timers_reify (EV_A); /* relative timers called last */ 1714 timers_reify (EV_A); /* relative timers called last */
1341#if EV_PERIODIC_ENABLE 1715#if EV_PERIODIC_ENABLE
1342 periodics_reify (EV_A); /* absolute timers called first */ 1716 periodics_reify (EV_A); /* absolute timers called first */
1343#endif 1717#endif
1344 1718
1719#if EV_IDLE_ENABLE
1345 /* queue idle watchers unless other events are pending */ 1720 /* queue idle watchers unless other events are pending */
1346 if (idlecnt && !any_pending (EV_A)) 1721 idle_reify (EV_A);
1347 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1722#endif
1348 1723
1349 /* queue check watchers, to be executed first */ 1724 /* queue check watchers, to be executed first */
1350 if (expect_false (checkcnt)) 1725 if (expect_false (checkcnt))
1351 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1726 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1352 1727
1353 call_pending (EV_A); 1728 call_pending (EV_A);
1354
1355 if (expect_false (loop_done))
1356 break;
1357 } 1729 }
1730 while (expect_true (
1731 activecnt
1732 && !loop_done
1733 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1734 ));
1358 1735
1359 if (loop_done == EVUNLOOP_ONE) 1736 if (loop_done == EVUNLOOP_ONE)
1360 loop_done = EVUNLOOP_CANCEL; 1737 loop_done = EVUNLOOP_CANCEL;
1361} 1738}
1362 1739
… …
1389 head = &(*head)->next; 1766 head = &(*head)->next;
1390 } 1767 }
1391} 1768}
1392 1769
1393void inline_speed 1770void inline_speed
1394ev_clear_pending (EV_P_ W w) 1771clear_pending (EV_P_ W w)
1395{ 1772{
1396 if (w->pending) 1773 if (w->pending)
1397 { 1774 {
1398 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1775 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1399 w->pending = 0; 1776 w->pending = 0;
1400 } 1777 }
1401} 1778}
1402 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
1403void inline_speed 1806void inline_speed
1404ev_start (EV_P_ W w, int active) 1807ev_start (EV_P_ W w, int active)
1405{ 1808{
1406 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1809 pri_adjust (EV_A_ w);
1407 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1408
1409 w->active = active; 1810 w->active = active;
1410 ev_ref (EV_A); 1811 ev_ref (EV_A);
1411} 1812}
1412 1813
1413void inline_size 1814void inline_size
… …
1417 w->active = 0; 1818 w->active = 0;
1418} 1819}
1419 1820
1420/*****************************************************************************/ 1821/*****************************************************************************/
1421 1822
1422void 1823void noinline
1423ev_io_start (EV_P_ ev_io *w) 1824ev_io_start (EV_P_ ev_io *w)
1424{ 1825{
1425 int fd = w->fd; 1826 int fd = w->fd;
1426 1827
1427 if (expect_false (ev_is_active (w))) 1828 if (expect_false (ev_is_active (w)))
… …
1429 1830
1430 assert (("ev_io_start called with negative fd", fd >= 0)); 1831 assert (("ev_io_start called with negative fd", fd >= 0));
1431 1832
1432 ev_start (EV_A_ (W)w, 1); 1833 ev_start (EV_A_ (W)w, 1);
1433 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1834 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1434 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1835 wlist_add (&anfds[fd].head, (WL)w);
1435 1836
1436 fd_change (EV_A_ fd); 1837 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1838 w->events &= ~EV_IOFDSET;
1437} 1839}
1438 1840
1439void 1841void noinline
1440ev_io_stop (EV_P_ ev_io *w) 1842ev_io_stop (EV_P_ ev_io *w)
1441{ 1843{
1442 ev_clear_pending (EV_A_ (W)w); 1844 clear_pending (EV_A_ (W)w);
1443 if (expect_false (!ev_is_active (w))) 1845 if (expect_false (!ev_is_active (w)))
1444 return; 1846 return;
1445 1847
1446 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));
1447 1849
1448 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1850 wlist_del (&anfds[w->fd].head, (WL)w);
1449 ev_stop (EV_A_ (W)w); 1851 ev_stop (EV_A_ (W)w);
1450 1852
1451 fd_change (EV_A_ w->fd); 1853 fd_change (EV_A_ w->fd, 1);
1452} 1854}
1453 1855
1454void 1856void noinline
1455ev_timer_start (EV_P_ ev_timer *w) 1857ev_timer_start (EV_P_ ev_timer *w)
1456{ 1858{
1457 if (expect_false (ev_is_active (w))) 1859 if (expect_false (ev_is_active (w)))
1458 return; 1860 return;
1459 1861
1460 ((WT)w)->at += mn_now; 1862 ((WT)w)->at += mn_now;
1461 1863
1462 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.));
1463 1865
1464 ev_start (EV_A_ (W)w, ++timercnt); 1866 ev_start (EV_A_ (W)w, ++timercnt);
1465 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1867 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1466 timers [timercnt - 1] = w; 1868 timers [timercnt - 1] = (WT)w;
1467 upheap ((WT *)timers, timercnt - 1); 1869 upheap (timers, timercnt - 1);
1468 1870
1469 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1871 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1470} 1872}
1471 1873
1472void 1874void noinline
1473ev_timer_stop (EV_P_ ev_timer *w) 1875ev_timer_stop (EV_P_ ev_timer *w)
1474{ 1876{
1475 ev_clear_pending (EV_A_ (W)w); 1877 clear_pending (EV_A_ (W)w);
1476 if (expect_false (!ev_is_active (w))) 1878 if (expect_false (!ev_is_active (w)))
1477 return; 1879 return;
1478 1880
1479 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1881 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1480 1882
1883 {
1884 int active = ((W)w)->active;
1885
1481 if (expect_true (((W)w)->active < timercnt--)) 1886 if (expect_true (--active < --timercnt))
1482 { 1887 {
1483 timers [((W)w)->active - 1] = timers [timercnt]; 1888 timers [active] = timers [timercnt];
1484 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1889 adjustheap (timers, timercnt, active);
1485 } 1890 }
1891 }
1486 1892
1487 ((WT)w)->at -= mn_now; 1893 ((WT)w)->at -= mn_now;
1488 1894
1489 ev_stop (EV_A_ (W)w); 1895 ev_stop (EV_A_ (W)w);
1490} 1896}
1491 1897
1492void 1898void noinline
1493ev_timer_again (EV_P_ ev_timer *w) 1899ev_timer_again (EV_P_ ev_timer *w)
1494{ 1900{
1495 if (ev_is_active (w)) 1901 if (ev_is_active (w))
1496 { 1902 {
1497 if (w->repeat) 1903 if (w->repeat)
1498 { 1904 {
1499 ((WT)w)->at = mn_now + w->repeat; 1905 ((WT)w)->at = mn_now + w->repeat;
1500 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1906 adjustheap (timers, timercnt, ((W)w)->active - 1);
1501 } 1907 }
1502 else 1908 else
1503 ev_timer_stop (EV_A_ w); 1909 ev_timer_stop (EV_A_ w);
1504 } 1910 }
1505 else if (w->repeat) 1911 else if (w->repeat)
… …
1508 ev_timer_start (EV_A_ w); 1914 ev_timer_start (EV_A_ w);
1509 } 1915 }
1510} 1916}
1511 1917
1512#if EV_PERIODIC_ENABLE 1918#if EV_PERIODIC_ENABLE
1513void 1919void noinline
1514ev_periodic_start (EV_P_ ev_periodic *w) 1920ev_periodic_start (EV_P_ ev_periodic *w)
1515{ 1921{
1516 if (expect_false (ev_is_active (w))) 1922 if (expect_false (ev_is_active (w)))
1517 return; 1923 return;
1518 1924
… …
1520 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1926 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1521 else if (w->interval) 1927 else if (w->interval)
1522 { 1928 {
1523 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.));
1524 /* 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 */
1525 ((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;
1526 } 1932 }
1933 else
1934 ((WT)w)->at = w->offset;
1527 1935
1528 ev_start (EV_A_ (W)w, ++periodiccnt); 1936 ev_start (EV_A_ (W)w, ++periodiccnt);
1529 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1937 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1530 periodics [periodiccnt - 1] = w; 1938 periodics [periodiccnt - 1] = (WT)w;
1531 upheap ((WT *)periodics, periodiccnt - 1); 1939 upheap (periodics, periodiccnt - 1);
1532 1940
1533 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1941 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1534} 1942}
1535 1943
1536void 1944void noinline
1537ev_periodic_stop (EV_P_ ev_periodic *w) 1945ev_periodic_stop (EV_P_ ev_periodic *w)
1538{ 1946{
1539 ev_clear_pending (EV_A_ (W)w); 1947 clear_pending (EV_A_ (W)w);
1540 if (expect_false (!ev_is_active (w))) 1948 if (expect_false (!ev_is_active (w)))
1541 return; 1949 return;
1542 1950
1543 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1951 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1544 1952
1953 {
1954 int active = ((W)w)->active;
1955
1545 if (expect_true (((W)w)->active < periodiccnt--)) 1956 if (expect_true (--active < --periodiccnt))
1546 { 1957 {
1547 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1958 periodics [active] = periodics [periodiccnt];
1548 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1959 adjustheap (periodics, periodiccnt, active);
1549 } 1960 }
1961 }
1550 1962
1551 ev_stop (EV_A_ (W)w); 1963 ev_stop (EV_A_ (W)w);
1552} 1964}
1553 1965
1554void 1966void noinline
1555ev_periodic_again (EV_P_ ev_periodic *w) 1967ev_periodic_again (EV_P_ ev_periodic *w)
1556{ 1968{
1557 /* TODO: use adjustheap and recalculation */ 1969 /* TODO: use adjustheap and recalculation */
1558 ev_periodic_stop (EV_A_ w); 1970 ev_periodic_stop (EV_A_ w);
1559 ev_periodic_start (EV_A_ w); 1971 ev_periodic_start (EV_A_ w);
… …
1562 1974
1563#ifndef SA_RESTART 1975#ifndef SA_RESTART
1564# define SA_RESTART 0 1976# define SA_RESTART 0
1565#endif 1977#endif
1566 1978
1567void 1979void noinline
1568ev_signal_start (EV_P_ ev_signal *w) 1980ev_signal_start (EV_P_ ev_signal *w)
1569{ 1981{
1570#if EV_MULTIPLICITY 1982#if EV_MULTIPLICITY
1571 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));
1572#endif 1984#endif
1573 if (expect_false (ev_is_active (w))) 1985 if (expect_false (ev_is_active (w)))
1574 return; 1986 return;
1575 1987
1576 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));
1577 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
1578 ev_start (EV_A_ (W)w, 1); 2006 ev_start (EV_A_ (W)w, 1);
1579 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1580 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 2007 wlist_add (&signals [w->signum - 1].head, (WL)w);
1581 2008
1582 if (!((WL)w)->next) 2009 if (!((WL)w)->next)
1583 { 2010 {
1584#if _WIN32 2011#if _WIN32
1585 signal (w->signum, sighandler); 2012 signal (w->signum, ev_sighandler);
1586#else 2013#else
1587 struct sigaction sa; 2014 struct sigaction sa;
1588 sa.sa_handler = sighandler; 2015 sa.sa_handler = ev_sighandler;
1589 sigfillset (&sa.sa_mask); 2016 sigfillset (&sa.sa_mask);
1590 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 */
1591 sigaction (w->signum, &sa, 0); 2018 sigaction (w->signum, &sa, 0);
1592#endif 2019#endif
1593 } 2020 }
1594} 2021}
1595 2022
1596void 2023void noinline
1597ev_signal_stop (EV_P_ ev_signal *w) 2024ev_signal_stop (EV_P_ ev_signal *w)
1598{ 2025{
1599 ev_clear_pending (EV_A_ (W)w); 2026 clear_pending (EV_A_ (W)w);
1600 if (expect_false (!ev_is_active (w))) 2027 if (expect_false (!ev_is_active (w)))
1601 return; 2028 return;
1602 2029
1603 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 2030 wlist_del (&signals [w->signum - 1].head, (WL)w);
1604 ev_stop (EV_A_ (W)w); 2031 ev_stop (EV_A_ (W)w);
1605 2032
1606 if (!signals [w->signum - 1].head) 2033 if (!signals [w->signum - 1].head)
1607 signal (w->signum, SIG_DFL); 2034 signal (w->signum, SIG_DFL);
1608} 2035}
… …
1615#endif 2042#endif
1616 if (expect_false (ev_is_active (w))) 2043 if (expect_false (ev_is_active (w)))
1617 return; 2044 return;
1618 2045
1619 ev_start (EV_A_ (W)w, 1); 2046 ev_start (EV_A_ (W)w, 1);
1620 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 2047 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1621} 2048}
1622 2049
1623void 2050void
1624ev_child_stop (EV_P_ ev_child *w) 2051ev_child_stop (EV_P_ ev_child *w)
1625{ 2052{
1626 ev_clear_pending (EV_A_ (W)w); 2053 clear_pending (EV_A_ (W)w);
1627 if (expect_false (!ev_is_active (w))) 2054 if (expect_false (!ev_is_active (w)))
1628 return; 2055 return;
1629 2056
1630 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 2057 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1631 ev_stop (EV_A_ (W)w); 2058 ev_stop (EV_A_ (W)w);
1632} 2059}
1633 2060
1634#if EV_STAT_ENABLE 2061#if EV_STAT_ENABLE
1635 2062
1636# ifdef _WIN32 2063# ifdef _WIN32
2064# undef lstat
1637# define lstat(a,b) stat(a,b) 2065# define lstat(a,b) _stati64 (a,b)
1638# endif 2066# endif
1639 2067
1640#define DEF_STAT_INTERVAL 5.0074891 2068#define DEF_STAT_INTERVAL 5.0074891
1641#define MIN_STAT_INTERVAL 0.1074891 2069#define MIN_STAT_INTERVAL 0.1074891
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
1642 2222
1643void 2223void
1644ev_stat_stat (EV_P_ ev_stat *w) 2224ev_stat_stat (EV_P_ ev_stat *w)
1645{ 2225{
1646 if (lstat (w->path, &w->attr) < 0) 2226 if (lstat (w->path, &w->attr) < 0)
1647 w->attr.st_nlink = 0; 2227 w->attr.st_nlink = 0;
1648 else if (!w->attr.st_nlink) 2228 else if (!w->attr.st_nlink)
1649 w->attr.st_nlink = 1; 2229 w->attr.st_nlink = 1;
1650} 2230}
1651 2231
1652static void 2232static void noinline
1653stat_timer_cb (EV_P_ ev_timer *w_, int revents) 2233stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1654{ 2234{
1655 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 2235 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1656 2236
1657 /* we copy this here each the time so that */ 2237 /* we copy this here each the time so that */
1658 /* prev has the old value when the callback gets invoked */ 2238 /* prev has the old value when the callback gets invoked */
1659 w->prev = w->attr; 2239 w->prev = w->attr;
1660 ev_stat_stat (EV_A_ w); 2240 ev_stat_stat (EV_A_ w);
1661 2241
1662 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
1663 ev_feed_event (EV_A_ w, EV_STAT); 2262 ev_feed_event (EV_A_ w, EV_STAT);
2263 }
1664} 2264}
1665 2265
1666void 2266void
1667ev_stat_start (EV_P_ ev_stat *w) 2267ev_stat_start (EV_P_ ev_stat *w)
1668{ 2268{
… …
1678 if (w->interval < MIN_STAT_INTERVAL) 2278 if (w->interval < MIN_STAT_INTERVAL)
1679 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL; 2279 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
1680 2280
1681 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);
1682 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
1683 ev_timer_start (EV_A_ &w->timer); 2291 ev_timer_start (EV_A_ &w->timer);
1684 2292
1685 ev_start (EV_A_ (W)w, 1); 2293 ev_start (EV_A_ (W)w, 1);
1686} 2294}
1687 2295
1688void 2296void
1689ev_stat_stop (EV_P_ ev_stat *w) 2297ev_stat_stop (EV_P_ ev_stat *w)
1690{ 2298{
1691 ev_clear_pending (EV_A_ (W)w); 2299 clear_pending (EV_A_ (W)w);
1692 if (expect_false (!ev_is_active (w))) 2300 if (expect_false (!ev_is_active (w)))
1693 return; 2301 return;
1694 2302
2303#if EV_USE_INOTIFY
2304 infy_del (EV_A_ w);
2305#endif
1695 ev_timer_stop (EV_A_ &w->timer); 2306 ev_timer_stop (EV_A_ &w->timer);
1696 2307
1697 ev_stop (EV_A_ (W)w); 2308 ev_stop (EV_A_ (W)w);
1698} 2309}
1699#endif 2310#endif
1700 2311
2312#if EV_IDLE_ENABLE
1701void 2313void
1702ev_idle_start (EV_P_ ev_idle *w) 2314ev_idle_start (EV_P_ ev_idle *w)
1703{ 2315{
1704 if (expect_false (ev_is_active (w))) 2316 if (expect_false (ev_is_active (w)))
1705 return; 2317 return;
1706 2318
2319 pri_adjust (EV_A_ (W)w);
2320
2321 {
2322 int active = ++idlecnt [ABSPRI (w)];
2323
2324 ++idleall;
1707 ev_start (EV_A_ (W)w, ++idlecnt); 2325 ev_start (EV_A_ (W)w, active);
2326
1708 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2327 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
1709 idles [idlecnt - 1] = w; 2328 idles [ABSPRI (w)][active - 1] = w;
2329 }
1710} 2330}
1711 2331
1712void 2332void
1713ev_idle_stop (EV_P_ ev_idle *w) 2333ev_idle_stop (EV_P_ ev_idle *w)
1714{ 2334{
1715 ev_clear_pending (EV_A_ (W)w); 2335 clear_pending (EV_A_ (W)w);
1716 if (expect_false (!ev_is_active (w))) 2336 if (expect_false (!ev_is_active (w)))
1717 return; 2337 return;
1718 2338
1719 { 2339 {
1720 int active = ((W)w)->active; 2340 int active = ((W)w)->active;
1721 idles [active - 1] = idles [--idlecnt]; 2341
2342 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
1722 ((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;
1723 } 2347 }
1724
1725 ev_stop (EV_A_ (W)w);
1726} 2348}
2349#endif
1727 2350
1728void 2351void
1729ev_prepare_start (EV_P_ ev_prepare *w) 2352ev_prepare_start (EV_P_ ev_prepare *w)
1730{ 2353{
1731 if (expect_false (ev_is_active (w))) 2354 if (expect_false (ev_is_active (w)))
… …
1737} 2360}
1738 2361
1739void 2362void
1740ev_prepare_stop (EV_P_ ev_prepare *w) 2363ev_prepare_stop (EV_P_ ev_prepare *w)
1741{ 2364{
1742 ev_clear_pending (EV_A_ (W)w); 2365 clear_pending (EV_A_ (W)w);
1743 if (expect_false (!ev_is_active (w))) 2366 if (expect_false (!ev_is_active (w)))
1744 return; 2367 return;
1745 2368
1746 { 2369 {
1747 int active = ((W)w)->active; 2370 int active = ((W)w)->active;
… …
1764} 2387}
1765 2388
1766void 2389void
1767ev_check_stop (EV_P_ ev_check *w) 2390ev_check_stop (EV_P_ ev_check *w)
1768{ 2391{
1769 ev_clear_pending (EV_A_ (W)w); 2392 clear_pending (EV_A_ (W)w);
1770 if (expect_false (!ev_is_active (w))) 2393 if (expect_false (!ev_is_active (w)))
1771 return; 2394 return;
1772 2395
1773 { 2396 {
1774 int active = ((W)w)->active; 2397 int active = ((W)w)->active;
… …
1781 2404
1782#if EV_EMBED_ENABLE 2405#if EV_EMBED_ENABLE
1783void noinline 2406void noinline
1784ev_embed_sweep (EV_P_ ev_embed *w) 2407ev_embed_sweep (EV_P_ ev_embed *w)
1785{ 2408{
1786 ev_loop (w->loop, EVLOOP_NONBLOCK); 2409 ev_loop (w->other, EVLOOP_NONBLOCK);
1787} 2410}
1788 2411
1789static void 2412static void
1790embed_cb (EV_P_ ev_io *io, int revents) 2413embed_io_cb (EV_P_ ev_io *io, int revents)
1791{ 2414{
1792 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2415 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
1793 2416
1794 if (ev_cb (w)) 2417 if (ev_cb (w))
1795 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2418 ev_feed_event (EV_A_ (W)w, EV_EMBED);
1796 else 2419 else
1797 ev_embed_sweep (loop, w); 2420 ev_loop (w->other, EVLOOP_NONBLOCK);
1798} 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
1799 2446
1800void 2447void
1801ev_embed_start (EV_P_ ev_embed *w) 2448ev_embed_start (EV_P_ ev_embed *w)
1802{ 2449{
1803 if (expect_false (ev_is_active (w))) 2450 if (expect_false (ev_is_active (w)))
1804 return; 2451 return;
1805 2452
1806 { 2453 {
1807 struct ev_loop *loop = w->loop; 2454 struct ev_loop *loop = w->other;
1808 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 ()));
1809 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2456 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
1810 } 2457 }
1811 2458
1812 ev_set_priority (&w->io, ev_priority (w)); 2459 ev_set_priority (&w->io, ev_priority (w));
1813 ev_io_start (EV_A_ &w->io); 2460 ev_io_start (EV_A_ &w->io);
1814 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
1815 ev_start (EV_A_ (W)w, 1); 2468 ev_start (EV_A_ (W)w, 1);
1816} 2469}
1817 2470
1818void 2471void
1819ev_embed_stop (EV_P_ ev_embed *w) 2472ev_embed_stop (EV_P_ ev_embed *w)
1820{ 2473{
1821 ev_clear_pending (EV_A_ (W)w); 2474 clear_pending (EV_A_ (W)w);
1822 if (expect_false (!ev_is_active (w))) 2475 if (expect_false (!ev_is_active (w)))
1823 return; 2476 return;
1824 2477
1825 ev_io_stop (EV_A_ &w->io); 2478 ev_io_stop (EV_A_ &w->io);
2479 ev_prepare_stop (EV_A_ &w->prepare);
1826 2480
1827 ev_stop (EV_A_ (W)w); 2481 ev_stop (EV_A_ (W)w);
2482}
2483#endif
2484
2485#if EV_FORK_ENABLE
2486void
2487ev_fork_start (EV_P_ ev_fork *w)
2488{
2489 if (expect_false (ev_is_active (w)))
2490 return;
2491
2492 ev_start (EV_A_ (W)w, ++forkcnt);
2493 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2494 forks [forkcnt - 1] = w;
2495}
2496
2497void
2498ev_fork_stop (EV_P_ ev_fork *w)
2499{
2500 clear_pending (EV_A_ (W)w);
2501 if (expect_false (!ev_is_active (w)))
2502 return;
2503
2504 {
2505 int active = ((W)w)->active;
2506 forks [active - 1] = forks [--forkcnt];
2507 ((W)forks [active - 1])->active = active;
2508 }
2509
2510 ev_stop (EV_A_ (W)w);
2511}
2512#endif
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);
1828} 2549}
1829#endif 2550#endif
1830 2551
1831/*****************************************************************************/ 2552/*****************************************************************************/
1832 2553
… …
1890 ev_timer_set (&once->to, timeout, 0.); 2611 ev_timer_set (&once->to, timeout, 0.);
1891 ev_timer_start (EV_A_ &once->to); 2612 ev_timer_start (EV_A_ &once->to);
1892 } 2613 }
1893} 2614}
1894 2615
2616#if EV_MULTIPLICITY
2617 #include "ev_wrap.h"
2618#endif
2619
1895#ifdef __cplusplus 2620#ifdef __cplusplus
1896} 2621}
1897#endif 2622#endif
1898 2623

Diff Legend

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