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

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

Diff Legend

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