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

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

Diff Legend

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