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

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

Diff Legend

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