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

Comparing libev/ev.c (file contents):
Revision 1.159 by root, Sat Dec 1 19:48:36 2007 UTC vs.
Revision 1.238 by root, Thu May 8 20:49:12 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
… …
102# else 119# else
103# define EV_USE_INOTIFY 0 120# define EV_USE_INOTIFY 0
104# endif 121# endif
105# endif 122# endif
106 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
107#endif 132#endif
108 133
109#include <math.h> 134#include <math.h>
110#include <stdlib.h> 135#include <stdlib.h>
111#include <fcntl.h> 136#include <fcntl.h>
… …
136# ifndef EV_SELECT_IS_WINSOCKET 161# ifndef EV_SELECT_IS_WINSOCKET
137# define EV_SELECT_IS_WINSOCKET 1 162# define EV_SELECT_IS_WINSOCKET 1
138# endif 163# endif
139#endif 164#endif
140 165
141/**/ 166/* this block tries to deduce configuration from header-defined symbols and defaults */
142 167
143#ifndef EV_USE_MONOTONIC 168#ifndef EV_USE_MONOTONIC
144# define EV_USE_MONOTONIC 0 169# define EV_USE_MONOTONIC 0
145#endif 170#endif
146 171
147#ifndef EV_USE_REALTIME 172#ifndef EV_USE_REALTIME
148# 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
149#endif 178#endif
150 179
151#ifndef EV_USE_SELECT 180#ifndef EV_USE_SELECT
152# define EV_USE_SELECT 1 181# define EV_USE_SELECT 1
153#endif 182#endif
… …
159# define EV_USE_POLL 1 188# define EV_USE_POLL 1
160# endif 189# endif
161#endif 190#endif
162 191
163#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
164# define EV_USE_EPOLL 0 196# define EV_USE_EPOLL 0
197# endif
165#endif 198#endif
166 199
167#ifndef EV_USE_KQUEUE 200#ifndef EV_USE_KQUEUE
168# define EV_USE_KQUEUE 0 201# define EV_USE_KQUEUE 0
169#endif 202#endif
… …
171#ifndef EV_USE_PORT 204#ifndef EV_USE_PORT
172# define EV_USE_PORT 0 205# define EV_USE_PORT 0
173#endif 206#endif
174 207
175#ifndef EV_USE_INOTIFY 208#ifndef EV_USE_INOTIFY
209# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
210# define EV_USE_INOTIFY 1
211# else
176# define EV_USE_INOTIFY 0 212# define EV_USE_INOTIFY 0
213# endif
177#endif 214#endif
178 215
179#ifndef EV_PID_HASHSIZE 216#ifndef EV_PID_HASHSIZE
180# if EV_MINIMAL 217# if EV_MINIMAL
181# define EV_PID_HASHSIZE 1 218# define EV_PID_HASHSIZE 1
… …
190# else 227# else
191# define EV_INOTIFY_HASHSIZE 16 228# define EV_INOTIFY_HASHSIZE 16
192# endif 229# endif
193#endif 230#endif
194 231
195/**/ 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 */
196 241
197#ifndef CLOCK_MONOTONIC 242#ifndef CLOCK_MONOTONIC
198# undef EV_USE_MONOTONIC 243# undef EV_USE_MONOTONIC
199# define EV_USE_MONOTONIC 0 244# define EV_USE_MONOTONIC 0
200#endif 245#endif
… …
202#ifndef CLOCK_REALTIME 247#ifndef CLOCK_REALTIME
203# undef EV_USE_REALTIME 248# undef EV_USE_REALTIME
204# define EV_USE_REALTIME 0 249# define EV_USE_REALTIME 0
205#endif 250#endif
206 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
207#if EV_SELECT_IS_WINSOCKET 267#if EV_SELECT_IS_WINSOCKET
208# include <winsock.h> 268# include <winsock.h>
209#endif 269#endif
210 270
211#if !EV_STAT_ENABLE 271#if EV_USE_EVENTFD
212# define EV_USE_INOTIFY 0 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" {
213#endif 276# endif
214 277int eventfd (unsigned int initval, int flags);
215#if EV_USE_INOTIFY 278# ifdef __cplusplus
216# include <sys/inotify.h> 279}
280# endif
217#endif 281#endif
218 282
219/**/ 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 */
220 294
221#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) */
222#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) */
223/*#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 */
224 298
225#if __GNUC__ >= 3 299#if __GNUC__ >= 4
226# define expect(expr,value) __builtin_expect ((expr),(value)) 300# define expect(expr,value) __builtin_expect ((expr),(value))
227# define inline_size static inline /* inline for codesize */
228# if EV_MINIMAL
229# define noinline __attribute__ ((noinline)) 301# define noinline __attribute__ ((noinline))
230# define inline_speed static noinline
231# else
232# define noinline
233# define inline_speed static inline
234# endif
235#else 302#else
236# define expect(expr,value) (expr) 303# define expect(expr,value) (expr)
237# define inline_speed static
238# define inline_size static
239# define noinline 304# define noinline
305# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
306# define inline
307# endif
240#endif 308#endif
241 309
242#define expect_false(expr) expect ((expr) != 0, 0) 310#define expect_false(expr) expect ((expr) != 0, 0)
243#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
244 319
245#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 320#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
246#define ABSPRI(w) ((w)->priority - EV_MINPRI) 321#define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
247 322
248#define EMPTY0 /* required for microsofts broken pseudo-c compiler */ 323#define EMPTY /* required for microsofts broken pseudo-c compiler */
249#define EMPTY2(a,b) /* used to suppress some warnings */ 324#define EMPTY2(a,b) /* used to suppress some warnings */
250 325
251typedef ev_watcher *W; 326typedef ev_watcher *W;
252typedef ev_watcher_list *WL; 327typedef ev_watcher_list *WL;
253typedef ev_watcher_time *WT; 328typedef ev_watcher_time *WT;
254 329
330#define ev_active(w) ((W)(w))->active
331#define ev_at(w) ((WT)(w))->at
332
333#if EV_USE_MONOTONIC
334/* sig_atomic_t is used to avoid per-thread variables or locking but still */
335/* giving it a reasonably high chance of working on typical architetcures */
255static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 336static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
337#endif
256 338
257#ifdef _WIN32 339#ifdef _WIN32
258# include "ev_win32.c" 340# include "ev_win32.c"
259#endif 341#endif
260 342
… …
281 perror (msg); 363 perror (msg);
282 abort (); 364 abort ();
283 } 365 }
284} 366}
285 367
368static void *
369ev_realloc_emul (void *ptr, long size)
370{
371 /* some systems, notably openbsd and darwin, fail to properly
372 * implement realloc (x, 0) (as required by both ansi c-98 and
373 * the single unix specification, so work around them here.
374 */
375
376 if (size)
377 return realloc (ptr, size);
378
379 free (ptr);
380 return 0;
381}
382
286static void *(*alloc)(void *ptr, long size); 383static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
287 384
288void 385void
289ev_set_allocator (void *(*cb)(void *ptr, long size)) 386ev_set_allocator (void *(*cb)(void *ptr, long size))
290{ 387{
291 alloc = cb; 388 alloc = cb;
292} 389}
293 390
294inline_speed void * 391inline_speed void *
295ev_realloc (void *ptr, long size) 392ev_realloc (void *ptr, long size)
296{ 393{
297 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 394 ptr = alloc (ptr, size);
298 395
299 if (!ptr && size) 396 if (!ptr && size)
300 { 397 {
301 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 398 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
302 abort (); 399 abort ();
… …
396{ 493{
397 return ev_rt_now; 494 return ev_rt_now;
398} 495}
399#endif 496#endif
400 497
401#define array_roundsize(type,n) (((n) | 4) & ~3) 498void
499ev_sleep (ev_tstamp delay)
500{
501 if (delay > 0.)
502 {
503#if EV_USE_NANOSLEEP
504 struct timespec ts;
505
506 ts.tv_sec = (time_t)delay;
507 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
508
509 nanosleep (&ts, 0);
510#elif defined(_WIN32)
511 Sleep ((unsigned long)(delay * 1e3));
512#else
513 struct timeval tv;
514
515 tv.tv_sec = (time_t)delay;
516 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
517
518 select (0, 0, 0, 0, &tv);
519#endif
520 }
521}
522
523/*****************************************************************************/
524
525#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
526
527int inline_size
528array_nextsize (int elem, int cur, int cnt)
529{
530 int ncur = cur + 1;
531
532 do
533 ncur <<= 1;
534 while (cnt > ncur);
535
536 /* if size is large, round to MALLOC_ROUND - 4 * longs to accomodate malloc overhead */
537 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
538 {
539 ncur *= elem;
540 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
541 ncur = ncur - sizeof (void *) * 4;
542 ncur /= elem;
543 }
544
545 return ncur;
546}
547
548static noinline void *
549array_realloc (int elem, void *base, int *cur, int cnt)
550{
551 *cur = array_nextsize (elem, *cur, cnt);
552 return ev_realloc (base, elem * *cur);
553}
402 554
403#define array_needsize(type,base,cur,cnt,init) \ 555#define array_needsize(type,base,cur,cnt,init) \
404 if (expect_false ((cnt) > cur)) \ 556 if (expect_false ((cnt) > (cur))) \
405 { \ 557 { \
406 int newcnt = cur; \ 558 int ocur_ = (cur); \
407 do \ 559 (base) = (type *)array_realloc \
408 { \ 560 (sizeof (type), (base), &(cur), (cnt)); \
409 newcnt = array_roundsize (type, newcnt << 1); \ 561 init ((base) + (ocur_), (cur) - ocur_); \
410 } \
411 while ((cnt) > newcnt); \
412 \
413 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
414 init (base + cur, newcnt - cur); \
415 cur = newcnt; \
416 } 562 }
417 563
564#if 0
418#define array_slim(type,stem) \ 565#define array_slim(type,stem) \
419 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 566 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
420 { \ 567 { \
421 stem ## max = array_roundsize (stem ## cnt >> 1); \ 568 stem ## max = array_roundsize (stem ## cnt >> 1); \
422 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 569 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
423 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 570 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
424 } 571 }
572#endif
425 573
426#define array_free(stem, idx) \ 574#define array_free(stem, idx) \
427 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 575 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
428 576
429/*****************************************************************************/ 577/*****************************************************************************/
430 578
431void noinline 579void noinline
432ev_feed_event (EV_P_ void *w, int revents) 580ev_feed_event (EV_P_ void *w, int revents)
433{ 581{
434 W w_ = (W)w; 582 W w_ = (W)w;
583 int pri = ABSPRI (w_);
435 584
436 if (expect_false (w_->pending)) 585 if (expect_false (w_->pending))
586 pendings [pri][w_->pending - 1].events |= revents;
587 else
437 { 588 {
589 w_->pending = ++pendingcnt [pri];
590 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
591 pendings [pri][w_->pending - 1].w = w_;
438 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 592 pendings [pri][w_->pending - 1].events = revents;
439 return;
440 } 593 }
441
442 w_->pending = ++pendingcnt [ABSPRI (w_)];
443 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
444 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
445 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
446} 594}
447 595
448void inline_size 596void inline_speed
449queue_events (EV_P_ W *events, int eventcnt, int type) 597queue_events (EV_P_ W *events, int eventcnt, int type)
450{ 598{
451 int i; 599 int i;
452 600
453 for (i = 0; i < eventcnt; ++i) 601 for (i = 0; i < eventcnt; ++i)
… …
485} 633}
486 634
487void 635void
488ev_feed_fd_event (EV_P_ int fd, int revents) 636ev_feed_fd_event (EV_P_ int fd, int revents)
489{ 637{
638 if (fd >= 0 && fd < anfdmax)
490 fd_event (EV_A_ fd, revents); 639 fd_event (EV_A_ fd, revents);
491} 640}
492 641
493void inline_size 642void inline_size
494fd_reify (EV_P) 643fd_reify (EV_P)
495{ 644{
… …
499 { 648 {
500 int fd = fdchanges [i]; 649 int fd = fdchanges [i];
501 ANFD *anfd = anfds + fd; 650 ANFD *anfd = anfds + fd;
502 ev_io *w; 651 ev_io *w;
503 652
504 int events = 0; 653 unsigned char events = 0;
505 654
506 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 655 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
507 events |= w->events; 656 events |= (unsigned char)w->events;
508 657
509#if EV_SELECT_IS_WINSOCKET 658#if EV_SELECT_IS_WINSOCKET
510 if (events) 659 if (events)
511 { 660 {
512 unsigned long argp; 661 unsigned long argp;
662 #ifdef EV_FD_TO_WIN32_HANDLE
663 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
664 #else
513 anfd->handle = _get_osfhandle (fd); 665 anfd->handle = _get_osfhandle (fd);
666 #endif
514 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 667 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
515 } 668 }
516#endif 669#endif
517 670
671 {
672 unsigned char o_events = anfd->events;
673 unsigned char o_reify = anfd->reify;
674
518 anfd->reify = 0; 675 anfd->reify = 0;
519
520 backend_modify (EV_A_ fd, anfd->events, events);
521 anfd->events = events; 676 anfd->events = events;
677
678 if (o_events != events || o_reify & EV_IOFDSET)
679 backend_modify (EV_A_ fd, o_events, events);
680 }
522 } 681 }
523 682
524 fdchangecnt = 0; 683 fdchangecnt = 0;
525} 684}
526 685
527void inline_size 686void inline_size
528fd_change (EV_P_ int fd) 687fd_change (EV_P_ int fd, int flags)
529{ 688{
530 if (expect_false (anfds [fd].reify)) 689 unsigned char reify = anfds [fd].reify;
531 return;
532
533 anfds [fd].reify = 1; 690 anfds [fd].reify |= flags;
534 691
692 if (expect_true (!reify))
693 {
535 ++fdchangecnt; 694 ++fdchangecnt;
536 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 695 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
537 fdchanges [fdchangecnt - 1] = fd; 696 fdchanges [fdchangecnt - 1] = fd;
697 }
538} 698}
539 699
540void inline_speed 700void inline_speed
541fd_kill (EV_P_ int fd) 701fd_kill (EV_P_ int fd)
542{ 702{
… …
593 753
594 for (fd = 0; fd < anfdmax; ++fd) 754 for (fd = 0; fd < anfdmax; ++fd)
595 if (anfds [fd].events) 755 if (anfds [fd].events)
596 { 756 {
597 anfds [fd].events = 0; 757 anfds [fd].events = 0;
598 fd_change (EV_A_ fd); 758 fd_change (EV_A_ fd, EV_IOFDSET | 1);
599 } 759 }
600} 760}
601 761
602/*****************************************************************************/ 762/*****************************************************************************/
603 763
764/*
765 * at the moment we allow libev the luxury of two heaps,
766 * a small-code-size 2-heap one and a ~1.5kb larger 4-heap
767 * which is more cache-efficient.
768 * the difference is about 5% with 50000+ watchers.
769 */
770#define USE_4HEAP !EV_MINIMAL
771#define USE_4HEAP 1/* they do not work corretcly */
772#if USE_4HEAP
773
774#define DHEAP 4
775#define HEAP0 (DHEAP - 1) /* index of first element in heap */
776
777/* towards the root */
604void inline_speed 778void inline_speed
605upheap (WT *heap, int k) 779upheap (WT *heap, int k)
606{ 780{
607 WT w = heap [k]; 781 WT w = heap [k];
608 782
609 while (k && heap [k >> 1]->at > w->at) 783 for (;;)
610 { 784 {
785 int p = ((k - HEAP0 - 1) / DHEAP) + HEAP0;
786
787 if (p == k || heap [p]->at <= w->at)
788 break;
789
611 heap [k] = heap [k >> 1]; 790 heap [k] = heap [p];
612 ((W)heap [k])->active = k + 1; 791 ev_active (heap [k]) = k;
613 k >>= 1; 792 k = p;
614 } 793 }
615 794
616 heap [k] = w; 795 heap [k] = w;
617 ((W)heap [k])->active = k + 1; 796 ev_active (heap [k]) = k;
618
619} 797}
620 798
799/* away from the root */
621void inline_speed 800void inline_speed
622downheap (WT *heap, int N, int k) 801downheap (WT *heap, int N, int k)
623{ 802{
624 WT w = heap [k]; 803 WT w = heap [k];
804 WT *E = heap + N + HEAP0;
625 805
626 while (k < (N >> 1)) 806 for (;;)
627 { 807 {
628 int j = k << 1; 808 ev_tstamp minat;
809 WT *minpos;
810 WT *pos = heap + DHEAP * (k - HEAP0) + HEAP0;
629 811
630 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 812 // find minimum child
813 if (expect_true (pos + DHEAP - 1 < E))
631 ++j; 814 {
815 /* fast path */
816 (minpos = pos + 0), (minat = (*minpos)->at);
817 if (pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at);
818 if (pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at);
819 if (pos [3]->at < minat) (minpos = pos + 3), (minat = (*minpos)->at);
820 }
821 else
822 {
823 /* slow path */
824 if (pos >= E)
825 break;
826 (minpos = pos + 0), (minat = (*minpos)->at);
827 if (pos + 1 < E && pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at);
828 if (pos + 2 < E && pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at);
829 if (pos + 3 < E && pos [3]->at < minat) (minpos = pos + 3), (minat = (*minpos)->at);
830 }
632 831
633 if (w->at <= heap [j]->at) 832 if (w->at <= minat)
634 break; 833 break;
635 834
636 heap [k] = heap [j]; 835 ev_active (*minpos) = k;
637 ((W)heap [k])->active = k + 1; 836 heap [k] = *minpos;
638 k = j; 837
838 k = minpos - heap;
639 } 839 }
640 840
641 heap [k] = w; 841 heap [k] = w;
842 ev_active (heap [k]) = k;
843}
844
845#else // 4HEAP
846
847#define HEAP0 1
848
849/* towards the root */
850void inline_speed
851upheap (WT *heap, int k)
852{
853 WT w = heap [k];
854
855 for (;;)
856 {
857 int p = k >> 1;
858
859 /* maybe we could use a dummy element at heap [0]? */
860 if (!p || heap [p]->at <= w->at)
861 break;
862
863 heap [k] = heap [p];
864 ev_active (heap [k]) = k;
865 k = p;
866 }
867
868 heap [k] = w;
869 ev_active (heap [k]) = k;
870}
871
872/* away from the root */
873void inline_speed
874downheap (WT *heap, int N, int k)
875{
876 WT w = heap [k];
877
878 for (;;)
879 {
880 int c = k << 1;
881
882 if (c > N)
883 break;
884
885 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
886 ? 1 : 0;
887
888 if (w->at <= heap [c]->at)
889 break;
890
891 heap [k] = heap [c];
642 ((W)heap [k])->active = k + 1; 892 ((W)heap [k])->active = k;
893
894 k = c;
895 }
896
897 heap [k] = w;
898 ev_active (heap [k]) = k;
643} 899}
900#endif
644 901
645void inline_size 902void inline_size
646adjustheap (WT *heap, int N, int k) 903adjustheap (WT *heap, int N, int k)
647{ 904{
648 upheap (heap, k); 905 upheap (heap, k);
… …
652/*****************************************************************************/ 909/*****************************************************************************/
653 910
654typedef struct 911typedef struct
655{ 912{
656 WL head; 913 WL head;
657 sig_atomic_t volatile gotsig; 914 EV_ATOMIC_T gotsig;
658} ANSIG; 915} ANSIG;
659 916
660static ANSIG *signals; 917static ANSIG *signals;
661static int signalmax; 918static int signalmax;
662 919
663static int sigpipe [2]; 920static EV_ATOMIC_T gotsig;
664static sig_atomic_t volatile gotsig;
665static ev_io sigev;
666 921
667void inline_size 922void inline_size
668signals_init (ANSIG *base, int count) 923signals_init (ANSIG *base, int count)
669{ 924{
670 while (count--) 925 while (count--)
… …
674 929
675 ++base; 930 ++base;
676 } 931 }
677} 932}
678 933
679static void 934/*****************************************************************************/
680sighandler (int signum)
681{
682#if _WIN32
683 signal (signum, sighandler);
684#endif
685 935
686 signals [signum - 1].gotsig = 1;
687
688 if (!gotsig)
689 {
690 int old_errno = errno;
691 gotsig = 1;
692 write (sigpipe [1], &signum, 1);
693 errno = old_errno;
694 }
695}
696
697void noinline
698ev_feed_signal_event (EV_P_ int signum)
699{
700 WL w;
701
702#if EV_MULTIPLICITY
703 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
704#endif
705
706 --signum;
707
708 if (signum < 0 || signum >= signalmax)
709 return;
710
711 signals [signum].gotsig = 0;
712
713 for (w = signals [signum].head; w; w = w->next)
714 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
715}
716
717static void
718sigcb (EV_P_ ev_io *iow, int revents)
719{
720 int signum;
721
722 read (sigpipe [0], &revents, 1);
723 gotsig = 0;
724
725 for (signum = signalmax; signum--; )
726 if (signals [signum].gotsig)
727 ev_feed_signal_event (EV_A_ signum + 1);
728}
729
730void inline_size 936void inline_speed
731fd_intern (int fd) 937fd_intern (int fd)
732{ 938{
733#ifdef _WIN32 939#ifdef _WIN32
734 int arg = 1; 940 int arg = 1;
735 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 941 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
738 fcntl (fd, F_SETFL, O_NONBLOCK); 944 fcntl (fd, F_SETFL, O_NONBLOCK);
739#endif 945#endif
740} 946}
741 947
742static void noinline 948static void noinline
743siginit (EV_P) 949evpipe_init (EV_P)
744{ 950{
951 if (!ev_is_active (&pipeev))
952 {
953#if EV_USE_EVENTFD
954 if ((evfd = eventfd (0, 0)) >= 0)
955 {
956 evpipe [0] = -1;
957 fd_intern (evfd);
958 ev_io_set (&pipeev, evfd, EV_READ);
959 }
960 else
961#endif
962 {
963 while (pipe (evpipe))
964 syserr ("(libev) error creating signal/async pipe");
965
745 fd_intern (sigpipe [0]); 966 fd_intern (evpipe [0]);
746 fd_intern (sigpipe [1]); 967 fd_intern (evpipe [1]);
968 ev_io_set (&pipeev, evpipe [0], EV_READ);
969 }
747 970
748 ev_io_set (&sigev, sigpipe [0], EV_READ);
749 ev_io_start (EV_A_ &sigev); 971 ev_io_start (EV_A_ &pipeev);
750 ev_unref (EV_A); /* child watcher should not keep loop alive */ 972 ev_unref (EV_A); /* watcher should not keep loop alive */
973 }
974}
975
976void inline_size
977evpipe_write (EV_P_ EV_ATOMIC_T *flag)
978{
979 if (!*flag)
980 {
981 int old_errno = errno; /* save errno because write might clobber it */
982
983 *flag = 1;
984
985#if EV_USE_EVENTFD
986 if (evfd >= 0)
987 {
988 uint64_t counter = 1;
989 write (evfd, &counter, sizeof (uint64_t));
990 }
991 else
992#endif
993 write (evpipe [1], &old_errno, 1);
994
995 errno = old_errno;
996 }
997}
998
999static void
1000pipecb (EV_P_ ev_io *iow, int revents)
1001{
1002#if EV_USE_EVENTFD
1003 if (evfd >= 0)
1004 {
1005 uint64_t counter;
1006 read (evfd, &counter, sizeof (uint64_t));
1007 }
1008 else
1009#endif
1010 {
1011 char dummy;
1012 read (evpipe [0], &dummy, 1);
1013 }
1014
1015 if (gotsig && ev_is_default_loop (EV_A))
1016 {
1017 int signum;
1018 gotsig = 0;
1019
1020 for (signum = signalmax; signum--; )
1021 if (signals [signum].gotsig)
1022 ev_feed_signal_event (EV_A_ signum + 1);
1023 }
1024
1025#if EV_ASYNC_ENABLE
1026 if (gotasync)
1027 {
1028 int i;
1029 gotasync = 0;
1030
1031 for (i = asynccnt; i--; )
1032 if (asyncs [i]->sent)
1033 {
1034 asyncs [i]->sent = 0;
1035 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
1036 }
1037 }
1038#endif
751} 1039}
752 1040
753/*****************************************************************************/ 1041/*****************************************************************************/
754 1042
1043static void
1044ev_sighandler (int signum)
1045{
1046#if EV_MULTIPLICITY
1047 struct ev_loop *loop = &default_loop_struct;
1048#endif
1049
1050#if _WIN32
1051 signal (signum, ev_sighandler);
1052#endif
1053
1054 signals [signum - 1].gotsig = 1;
1055 evpipe_write (EV_A_ &gotsig);
1056}
1057
1058void noinline
1059ev_feed_signal_event (EV_P_ int signum)
1060{
1061 WL w;
1062
1063#if EV_MULTIPLICITY
1064 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
1065#endif
1066
1067 --signum;
1068
1069 if (signum < 0 || signum >= signalmax)
1070 return;
1071
1072 signals [signum].gotsig = 0;
1073
1074 for (w = signals [signum].head; w; w = w->next)
1075 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1076}
1077
1078/*****************************************************************************/
1079
755static ev_child *childs [EV_PID_HASHSIZE]; 1080static WL childs [EV_PID_HASHSIZE];
756 1081
757#ifndef _WIN32 1082#ifndef _WIN32
758 1083
759static ev_signal childev; 1084static ev_signal childev;
760 1085
1086#ifndef WIFCONTINUED
1087# define WIFCONTINUED(status) 0
1088#endif
1089
761void inline_speed 1090void inline_speed
762child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1091child_reap (EV_P_ int chain, int pid, int status)
763{ 1092{
764 ev_child *w; 1093 ev_child *w;
1094 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
765 1095
766 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1096 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1097 {
767 if (w->pid == pid || !w->pid) 1098 if ((w->pid == pid || !w->pid)
1099 && (!traced || (w->flags & 1)))
768 { 1100 {
769 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 1101 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
770 w->rpid = pid; 1102 w->rpid = pid;
771 w->rstatus = status; 1103 w->rstatus = status;
772 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1104 ev_feed_event (EV_A_ (W)w, EV_CHILD);
773 } 1105 }
1106 }
774} 1107}
775 1108
776#ifndef WCONTINUED 1109#ifndef WCONTINUED
777# define WCONTINUED 0 1110# define WCONTINUED 0
778#endif 1111#endif
… …
787 if (!WCONTINUED 1120 if (!WCONTINUED
788 || errno != EINVAL 1121 || errno != EINVAL
789 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1122 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
790 return; 1123 return;
791 1124
792 /* make sure we are called again until all childs have been reaped */ 1125 /* make sure we are called again until all children have been reaped */
793 /* we need to do it this way so that the callback gets called before we continue */ 1126 /* we need to do it this way so that the callback gets called before we continue */
794 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1127 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
795 1128
796 child_reap (EV_A_ sw, pid, pid, status); 1129 child_reap (EV_A_ pid, pid, status);
797 if (EV_PID_HASHSIZE > 1) 1130 if (EV_PID_HASHSIZE > 1)
798 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1131 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
799} 1132}
800 1133
801#endif 1134#endif
802 1135
803/*****************************************************************************/ 1136/*****************************************************************************/
… …
875} 1208}
876 1209
877unsigned int 1210unsigned int
878ev_embeddable_backends (void) 1211ev_embeddable_backends (void)
879{ 1212{
880 return EVBACKEND_EPOLL 1213 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
881 | EVBACKEND_KQUEUE 1214
882 | EVBACKEND_PORT; 1215 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1216 /* please fix it and tell me how to detect the fix */
1217 flags &= ~EVBACKEND_EPOLL;
1218
1219 return flags;
883} 1220}
884 1221
885unsigned int 1222unsigned int
886ev_backend (EV_P) 1223ev_backend (EV_P)
887{ 1224{
888 return backend; 1225 return backend;
1226}
1227
1228unsigned int
1229ev_loop_count (EV_P)
1230{
1231 return loop_count;
1232}
1233
1234void
1235ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1236{
1237 io_blocktime = interval;
1238}
1239
1240void
1241ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1242{
1243 timeout_blocktime = interval;
889} 1244}
890 1245
891static void noinline 1246static void noinline
892loop_init (EV_P_ unsigned int flags) 1247loop_init (EV_P_ unsigned int flags)
893{ 1248{
… …
899 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1254 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
900 have_monotonic = 1; 1255 have_monotonic = 1;
901 } 1256 }
902#endif 1257#endif
903 1258
904 ev_rt_now = ev_time (); 1259 ev_rt_now = ev_time ();
905 mn_now = get_clock (); 1260 mn_now = get_clock ();
906 now_floor = mn_now; 1261 now_floor = mn_now;
907 rtmn_diff = ev_rt_now - mn_now; 1262 rtmn_diff = ev_rt_now - mn_now;
1263
1264 io_blocktime = 0.;
1265 timeout_blocktime = 0.;
1266 backend = 0;
1267 backend_fd = -1;
1268 gotasync = 0;
1269#if EV_USE_INOTIFY
1270 fs_fd = -2;
1271#endif
908 1272
909 /* pid check not overridable via env */ 1273 /* pid check not overridable via env */
910#ifndef _WIN32 1274#ifndef _WIN32
911 if (flags & EVFLAG_FORKCHECK) 1275 if (flags & EVFLAG_FORKCHECK)
912 curpid = getpid (); 1276 curpid = getpid ();
… …
915 if (!(flags & EVFLAG_NOENV) 1279 if (!(flags & EVFLAG_NOENV)
916 && !enable_secure () 1280 && !enable_secure ()
917 && getenv ("LIBEV_FLAGS")) 1281 && getenv ("LIBEV_FLAGS"))
918 flags = atoi (getenv ("LIBEV_FLAGS")); 1282 flags = atoi (getenv ("LIBEV_FLAGS"));
919 1283
920 if (!(flags & 0x0000ffffUL)) 1284 if (!(flags & 0x0000ffffU))
921 flags |= ev_recommended_backends (); 1285 flags |= ev_recommended_backends ();
922
923 backend = 0;
924 backend_fd = -1;
925#if EV_USE_INOTIFY
926 fs_fd = -2;
927#endif
928 1286
929#if EV_USE_PORT 1287#if EV_USE_PORT
930 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1288 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
931#endif 1289#endif
932#if EV_USE_KQUEUE 1290#if EV_USE_KQUEUE
… …
940#endif 1298#endif
941#if EV_USE_SELECT 1299#if EV_USE_SELECT
942 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1300 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
943#endif 1301#endif
944 1302
945 ev_init (&sigev, sigcb); 1303 ev_init (&pipeev, pipecb);
946 ev_set_priority (&sigev, EV_MAXPRI); 1304 ev_set_priority (&pipeev, EV_MAXPRI);
947 } 1305 }
948} 1306}
949 1307
950static void noinline 1308static void noinline
951loop_destroy (EV_P) 1309loop_destroy (EV_P)
952{ 1310{
953 int i; 1311 int i;
1312
1313 if (ev_is_active (&pipeev))
1314 {
1315 ev_ref (EV_A); /* signal watcher */
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 {
1325 close (evpipe [0]);
1326 close (evpipe [1]);
1327 }
1328 }
954 1329
955#if EV_USE_INOTIFY 1330#if EV_USE_INOTIFY
956 if (fs_fd >= 0) 1331 if (fs_fd >= 0)
957 close (fs_fd); 1332 close (fs_fd);
958#endif 1333#endif
… …
975#if EV_USE_SELECT 1350#if EV_USE_SELECT
976 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1351 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
977#endif 1352#endif
978 1353
979 for (i = NUMPRI; i--; ) 1354 for (i = NUMPRI; i--; )
1355 {
980 array_free (pending, [i]); 1356 array_free (pending, [i]);
1357#if EV_IDLE_ENABLE
1358 array_free (idle, [i]);
1359#endif
1360 }
1361
1362 ev_free (anfds); anfdmax = 0;
981 1363
982 /* have to use the microsoft-never-gets-it-right macro */ 1364 /* have to use the microsoft-never-gets-it-right macro */
983 array_free (fdchange, EMPTY0); 1365 array_free (fdchange, EMPTY);
984 array_free (timer, EMPTY0); 1366 array_free (timer, EMPTY);
985#if EV_PERIODIC_ENABLE 1367#if EV_PERIODIC_ENABLE
986 array_free (periodic, EMPTY0); 1368 array_free (periodic, EMPTY);
987#endif 1369#endif
1370#if EV_FORK_ENABLE
988 array_free (idle, EMPTY0); 1371 array_free (fork, EMPTY);
1372#endif
989 array_free (prepare, EMPTY0); 1373 array_free (prepare, EMPTY);
990 array_free (check, EMPTY0); 1374 array_free (check, EMPTY);
1375#if EV_ASYNC_ENABLE
1376 array_free (async, EMPTY);
1377#endif
991 1378
992 backend = 0; 1379 backend = 0;
993} 1380}
994 1381
1382#if EV_USE_INOTIFY
995void inline_size infy_fork (EV_P); 1383void inline_size infy_fork (EV_P);
1384#endif
996 1385
997void inline_size 1386void inline_size
998loop_fork (EV_P) 1387loop_fork (EV_P)
999{ 1388{
1000#if EV_USE_PORT 1389#if EV_USE_PORT
… …
1008#endif 1397#endif
1009#if EV_USE_INOTIFY 1398#if EV_USE_INOTIFY
1010 infy_fork (EV_A); 1399 infy_fork (EV_A);
1011#endif 1400#endif
1012 1401
1013 if (ev_is_active (&sigev)) 1402 if (ev_is_active (&pipeev))
1014 { 1403 {
1015 /* default loop */ 1404 /* this "locks" the handlers against writing to the pipe */
1405 /* while we modify the fd vars */
1406 gotsig = 1;
1407#if EV_ASYNC_ENABLE
1408 gotasync = 1;
1409#endif
1016 1410
1017 ev_ref (EV_A); 1411 ev_ref (EV_A);
1018 ev_io_stop (EV_A_ &sigev); 1412 ev_io_stop (EV_A_ &pipeev);
1413
1414#if EV_USE_EVENTFD
1415 if (evfd >= 0)
1416 close (evfd);
1417#endif
1418
1419 if (evpipe [0] >= 0)
1420 {
1019 close (sigpipe [0]); 1421 close (evpipe [0]);
1020 close (sigpipe [1]); 1422 close (evpipe [1]);
1423 }
1021 1424
1022 while (pipe (sigpipe))
1023 syserr ("(libev) error creating pipe");
1024
1025 siginit (EV_A); 1425 evpipe_init (EV_A);
1426 /* now iterate over everything, in case we missed something */
1427 pipecb (EV_A_ &pipeev, EV_READ);
1026 } 1428 }
1027 1429
1028 postfork = 0; 1430 postfork = 0;
1029} 1431}
1030 1432
… …
1052} 1454}
1053 1455
1054void 1456void
1055ev_loop_fork (EV_P) 1457ev_loop_fork (EV_P)
1056{ 1458{
1057 postfork = 1; 1459 postfork = 1; /* must be in line with ev_default_fork */
1058} 1460}
1059
1060#endif 1461#endif
1061 1462
1062#if EV_MULTIPLICITY 1463#if EV_MULTIPLICITY
1063struct ev_loop * 1464struct ev_loop *
1064ev_default_loop_init (unsigned int flags) 1465ev_default_loop_init (unsigned int flags)
1065#else 1466#else
1066int 1467int
1067ev_default_loop (unsigned int flags) 1468ev_default_loop (unsigned int flags)
1068#endif 1469#endif
1069{ 1470{
1070 if (sigpipe [0] == sigpipe [1])
1071 if (pipe (sigpipe))
1072 return 0;
1073
1074 if (!ev_default_loop_ptr) 1471 if (!ev_default_loop_ptr)
1075 { 1472 {
1076#if EV_MULTIPLICITY 1473#if EV_MULTIPLICITY
1077 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1474 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1078#else 1475#else
… …
1081 1478
1082 loop_init (EV_A_ flags); 1479 loop_init (EV_A_ flags);
1083 1480
1084 if (ev_backend (EV_A)) 1481 if (ev_backend (EV_A))
1085 { 1482 {
1086 siginit (EV_A);
1087
1088#ifndef _WIN32 1483#ifndef _WIN32
1089 ev_signal_init (&childev, childcb, SIGCHLD); 1484 ev_signal_init (&childev, childcb, SIGCHLD);
1090 ev_set_priority (&childev, EV_MAXPRI); 1485 ev_set_priority (&childev, EV_MAXPRI);
1091 ev_signal_start (EV_A_ &childev); 1486 ev_signal_start (EV_A_ &childev);
1092 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1487 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1109#ifndef _WIN32 1504#ifndef _WIN32
1110 ev_ref (EV_A); /* child watcher */ 1505 ev_ref (EV_A); /* child watcher */
1111 ev_signal_stop (EV_A_ &childev); 1506 ev_signal_stop (EV_A_ &childev);
1112#endif 1507#endif
1113 1508
1114 ev_ref (EV_A); /* signal watcher */
1115 ev_io_stop (EV_A_ &sigev);
1116
1117 close (sigpipe [0]); sigpipe [0] = 0;
1118 close (sigpipe [1]); sigpipe [1] = 0;
1119
1120 loop_destroy (EV_A); 1509 loop_destroy (EV_A);
1121} 1510}
1122 1511
1123void 1512void
1124ev_default_fork (void) 1513ev_default_fork (void)
… …
1126#if EV_MULTIPLICITY 1515#if EV_MULTIPLICITY
1127 struct ev_loop *loop = ev_default_loop_ptr; 1516 struct ev_loop *loop = ev_default_loop_ptr;
1128#endif 1517#endif
1129 1518
1130 if (backend) 1519 if (backend)
1131 postfork = 1; 1520 postfork = 1; /* must be in line with ev_loop_fork */
1132} 1521}
1133 1522
1134/*****************************************************************************/ 1523/*****************************************************************************/
1135 1524
1136int inline_size 1525void
1137any_pending (EV_P) 1526ev_invoke (EV_P_ void *w, int revents)
1138{ 1527{
1139 int pri; 1528 EV_CB_INVOKE ((W)w, revents);
1140
1141 for (pri = NUMPRI; pri--; )
1142 if (pendingcnt [pri])
1143 return 1;
1144
1145 return 0;
1146} 1529}
1147 1530
1148void inline_speed 1531void inline_speed
1149call_pending (EV_P) 1532call_pending (EV_P)
1150{ 1533{
… …
1163 EV_CB_INVOKE (p->w, p->events); 1546 EV_CB_INVOKE (p->w, p->events);
1164 } 1547 }
1165 } 1548 }
1166} 1549}
1167 1550
1551#if EV_IDLE_ENABLE
1552void inline_size
1553idle_reify (EV_P)
1554{
1555 if (expect_false (idleall))
1556 {
1557 int pri;
1558
1559 for (pri = NUMPRI; pri--; )
1560 {
1561 if (pendingcnt [pri])
1562 break;
1563
1564 if (idlecnt [pri])
1565 {
1566 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1567 break;
1568 }
1569 }
1570 }
1571}
1572#endif
1573
1168void inline_size 1574void inline_size
1169timers_reify (EV_P) 1575timers_reify (EV_P)
1170{ 1576{
1171 while (timercnt && ((WT)timers [0])->at <= mn_now) 1577 while (timercnt && ev_at (timers [HEAP0]) <= mn_now)
1172 { 1578 {
1173 ev_timer *w = timers [0]; 1579 ev_timer *w = (ev_timer *)timers [HEAP0];
1174 1580
1175 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1581 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1176 1582
1177 /* first reschedule or stop timer */ 1583 /* first reschedule or stop timer */
1178 if (w->repeat) 1584 if (w->repeat)
1179 { 1585 {
1180 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1586 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1181 1587
1182 ((WT)w)->at += w->repeat; 1588 ev_at (w) += w->repeat;
1183 if (((WT)w)->at < mn_now) 1589 if (ev_at (w) < mn_now)
1184 ((WT)w)->at = mn_now; 1590 ev_at (w) = mn_now;
1185 1591
1186 downheap ((WT *)timers, timercnt, 0); 1592 downheap (timers, timercnt, HEAP0);
1187 } 1593 }
1188 else 1594 else
1189 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1595 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1190 1596
1191 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1597 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1194 1600
1195#if EV_PERIODIC_ENABLE 1601#if EV_PERIODIC_ENABLE
1196void inline_size 1602void inline_size
1197periodics_reify (EV_P) 1603periodics_reify (EV_P)
1198{ 1604{
1199 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1605 while (periodiccnt && ev_at (periodics [HEAP0]) <= ev_rt_now)
1200 { 1606 {
1201 ev_periodic *w = periodics [0]; 1607 ev_periodic *w = (ev_periodic *)periodics [HEAP0];
1202 1608
1203 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1609 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1204 1610
1205 /* first reschedule or stop timer */ 1611 /* first reschedule or stop timer */
1206 if (w->reschedule_cb) 1612 if (w->reschedule_cb)
1207 { 1613 {
1208 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1614 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1209 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1615 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now));
1210 downheap ((WT *)periodics, periodiccnt, 0); 1616 downheap (periodics, periodiccnt, 1);
1211 } 1617 }
1212 else if (w->interval) 1618 else if (w->interval)
1213 { 1619 {
1214 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1620 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1621 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval;
1215 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1622 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now));
1216 downheap ((WT *)periodics, periodiccnt, 0); 1623 downheap (periodics, periodiccnt, HEAP0);
1217 } 1624 }
1218 else 1625 else
1219 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1626 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1220 1627
1221 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1628 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1226periodics_reschedule (EV_P) 1633periodics_reschedule (EV_P)
1227{ 1634{
1228 int i; 1635 int i;
1229 1636
1230 /* adjust periodics after time jump */ 1637 /* adjust periodics after time jump */
1231 for (i = 0; i < periodiccnt; ++i) 1638 for (i = 1; i <= periodiccnt; ++i)
1232 { 1639 {
1233 ev_periodic *w = periodics [i]; 1640 ev_periodic *w = (ev_periodic *)periodics [i];
1234 1641
1235 if (w->reschedule_cb) 1642 if (w->reschedule_cb)
1236 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1643 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1237 else if (w->interval) 1644 else if (w->interval)
1238 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1645 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1239 } 1646 }
1240 1647
1241 /* now rebuild the heap */ 1648 /* now rebuild the heap */
1242 for (i = periodiccnt >> 1; i--; ) 1649 for (i = periodiccnt >> 1; --i; )
1243 downheap ((WT *)periodics, periodiccnt, i); 1650 downheap (periodics, periodiccnt, i + HEAP0);
1244} 1651}
1245#endif 1652#endif
1246 1653
1247int inline_size 1654void inline_speed
1248time_update_monotonic (EV_P) 1655time_update (EV_P_ ev_tstamp max_block)
1249{ 1656{
1657 int i;
1658
1659#if EV_USE_MONOTONIC
1660 if (expect_true (have_monotonic))
1661 {
1662 ev_tstamp odiff = rtmn_diff;
1663
1250 mn_now = get_clock (); 1664 mn_now = get_clock ();
1251 1665
1666 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1667 /* interpolate in the meantime */
1252 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1668 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1253 { 1669 {
1254 ev_rt_now = rtmn_diff + mn_now; 1670 ev_rt_now = rtmn_diff + mn_now;
1255 return 0; 1671 return;
1256 } 1672 }
1257 else 1673
1258 {
1259 now_floor = mn_now; 1674 now_floor = mn_now;
1260 ev_rt_now = ev_time (); 1675 ev_rt_now = ev_time ();
1261 return 1;
1262 }
1263}
1264 1676
1265void inline_size 1677 /* loop a few times, before making important decisions.
1266time_update (EV_P) 1678 * on the choice of "4": one iteration isn't enough,
1267{ 1679 * in case we get preempted during the calls to
1268 int i; 1680 * ev_time and get_clock. a second call is almost guaranteed
1269 1681 * to succeed in that case, though. and looping a few more times
1270#if EV_USE_MONOTONIC 1682 * doesn't hurt either as we only do this on time-jumps or
1271 if (expect_true (have_monotonic)) 1683 * in the unlikely event of having been preempted here.
1272 { 1684 */
1273 if (time_update_monotonic (EV_A)) 1685 for (i = 4; --i; )
1274 { 1686 {
1275 ev_tstamp odiff = rtmn_diff;
1276
1277 /* loop a few times, before making important decisions.
1278 * on the choice of "4": one iteration isn't enough,
1279 * in case we get preempted during the calls to
1280 * ev_time and get_clock. a second call is almost guaranteed
1281 * to succeed in that case, though. and looping a few more times
1282 * doesn't hurt either as we only do this on time-jumps or
1283 * in the unlikely event of having been preempted here.
1284 */
1285 for (i = 4; --i; )
1286 {
1287 rtmn_diff = ev_rt_now - mn_now; 1687 rtmn_diff = ev_rt_now - mn_now;
1288 1688
1289 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1689 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1290 return; /* all is well */ 1690 return; /* all is well */
1291 1691
1292 ev_rt_now = ev_time (); 1692 ev_rt_now = ev_time ();
1293 mn_now = get_clock (); 1693 mn_now = get_clock ();
1294 now_floor = mn_now; 1694 now_floor = mn_now;
1295 } 1695 }
1296 1696
1297# if EV_PERIODIC_ENABLE 1697# if EV_PERIODIC_ENABLE
1298 periodics_reschedule (EV_A); 1698 periodics_reschedule (EV_A);
1299# endif 1699# endif
1300 /* no timer adjustment, as the monotonic clock doesn't jump */ 1700 /* no timer adjustment, as the monotonic clock doesn't jump */
1301 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1701 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1302 }
1303 } 1702 }
1304 else 1703 else
1305#endif 1704#endif
1306 { 1705 {
1307 ev_rt_now = ev_time (); 1706 ev_rt_now = ev_time ();
1308 1707
1309 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1708 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1310 { 1709 {
1311#if EV_PERIODIC_ENABLE 1710#if EV_PERIODIC_ENABLE
1312 periodics_reschedule (EV_A); 1711 periodics_reschedule (EV_A);
1313#endif 1712#endif
1314
1315 /* adjust timers. this is easy, as the offset is the same for all of them */ 1713 /* adjust timers. this is easy, as the offset is the same for all of them */
1316 for (i = 0; i < timercnt; ++i) 1714 for (i = 1; i <= timercnt; ++i)
1317 ((WT)timers [i])->at += ev_rt_now - mn_now; 1715 ev_at (timers [i]) += ev_rt_now - mn_now;
1318 } 1716 }
1319 1717
1320 mn_now = ev_rt_now; 1718 mn_now = ev_rt_now;
1321 } 1719 }
1322} 1720}
… …
1336static int loop_done; 1734static int loop_done;
1337 1735
1338void 1736void
1339ev_loop (EV_P_ int flags) 1737ev_loop (EV_P_ int flags)
1340{ 1738{
1341 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1739 loop_done = EVUNLOOP_CANCEL;
1342 ? EVUNLOOP_ONE
1343 : EVUNLOOP_CANCEL;
1344 1740
1345 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1741 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1346 1742
1347 for (;;) 1743 do
1348 { 1744 {
1349#ifndef _WIN32 1745#ifndef _WIN32
1350 if (expect_false (curpid)) /* penalise the forking check even more */ 1746 if (expect_false (curpid)) /* penalise the forking check even more */
1351 if (expect_false (getpid () != curpid)) 1747 if (expect_false (getpid () != curpid))
1352 { 1748 {
… …
1363 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1759 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1364 call_pending (EV_A); 1760 call_pending (EV_A);
1365 } 1761 }
1366#endif 1762#endif
1367 1763
1368 /* queue check watchers (and execute them) */ 1764 /* queue prepare watchers (and execute them) */
1369 if (expect_false (preparecnt)) 1765 if (expect_false (preparecnt))
1370 { 1766 {
1371 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1767 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1372 call_pending (EV_A); 1768 call_pending (EV_A);
1373 } 1769 }
… …
1382 /* update fd-related kernel structures */ 1778 /* update fd-related kernel structures */
1383 fd_reify (EV_A); 1779 fd_reify (EV_A);
1384 1780
1385 /* calculate blocking time */ 1781 /* calculate blocking time */
1386 { 1782 {
1387 ev_tstamp block; 1783 ev_tstamp waittime = 0.;
1784 ev_tstamp sleeptime = 0.;
1388 1785
1389 if (flags & EVLOOP_NONBLOCK || idlecnt) 1786 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1390 block = 0.; /* do not block at all */
1391 else
1392 { 1787 {
1393 /* update time to cancel out callback processing overhead */ 1788 /* update time to cancel out callback processing overhead */
1394#if EV_USE_MONOTONIC
1395 if (expect_true (have_monotonic))
1396 time_update_monotonic (EV_A); 1789 time_update (EV_A_ 1e100);
1397 else
1398#endif
1399 {
1400 ev_rt_now = ev_time ();
1401 mn_now = ev_rt_now;
1402 }
1403 1790
1404 block = MAX_BLOCKTIME; 1791 waittime = MAX_BLOCKTIME;
1405 1792
1406 if (timercnt) 1793 if (timercnt)
1407 { 1794 {
1408 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1795 ev_tstamp to = ev_at (timers [HEAP0]) - mn_now + backend_fudge;
1409 if (block > to) block = to; 1796 if (waittime > to) waittime = to;
1410 } 1797 }
1411 1798
1412#if EV_PERIODIC_ENABLE 1799#if EV_PERIODIC_ENABLE
1413 if (periodiccnt) 1800 if (periodiccnt)
1414 { 1801 {
1415 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1802 ev_tstamp to = ev_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1416 if (block > to) block = to; 1803 if (waittime > to) waittime = to;
1417 } 1804 }
1418#endif 1805#endif
1419 1806
1420 if (expect_false (block < 0.)) block = 0.; 1807 if (expect_false (waittime < timeout_blocktime))
1808 waittime = timeout_blocktime;
1809
1810 sleeptime = waittime - backend_fudge;
1811
1812 if (expect_true (sleeptime > io_blocktime))
1813 sleeptime = io_blocktime;
1814
1815 if (sleeptime)
1816 {
1817 ev_sleep (sleeptime);
1818 waittime -= sleeptime;
1819 }
1421 } 1820 }
1422 1821
1822 ++loop_count;
1423 backend_poll (EV_A_ block); 1823 backend_poll (EV_A_ waittime);
1824
1825 /* update ev_rt_now, do magic */
1826 time_update (EV_A_ waittime + sleeptime);
1424 } 1827 }
1425
1426 /* update ev_rt_now, do magic */
1427 time_update (EV_A);
1428 1828
1429 /* queue pending timers and reschedule them */ 1829 /* queue pending timers and reschedule them */
1430 timers_reify (EV_A); /* relative timers called last */ 1830 timers_reify (EV_A); /* relative timers called last */
1431#if EV_PERIODIC_ENABLE 1831#if EV_PERIODIC_ENABLE
1432 periodics_reify (EV_A); /* absolute timers called first */ 1832 periodics_reify (EV_A); /* absolute timers called first */
1433#endif 1833#endif
1434 1834
1835#if EV_IDLE_ENABLE
1435 /* queue idle watchers unless other events are pending */ 1836 /* queue idle watchers unless other events are pending */
1436 if (idlecnt && !any_pending (EV_A)) 1837 idle_reify (EV_A);
1437 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1838#endif
1438 1839
1439 /* queue check watchers, to be executed first */ 1840 /* queue check watchers, to be executed first */
1440 if (expect_false (checkcnt)) 1841 if (expect_false (checkcnt))
1441 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1842 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1442 1843
1443 call_pending (EV_A); 1844 call_pending (EV_A);
1444
1445 if (expect_false (loop_done))
1446 break;
1447 } 1845 }
1846 while (expect_true (
1847 activecnt
1848 && !loop_done
1849 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1850 ));
1448 1851
1449 if (loop_done == EVUNLOOP_ONE) 1852 if (loop_done == EVUNLOOP_ONE)
1450 loop_done = EVUNLOOP_CANCEL; 1853 loop_done = EVUNLOOP_CANCEL;
1451} 1854}
1452 1855
… …
1479 head = &(*head)->next; 1882 head = &(*head)->next;
1480 } 1883 }
1481} 1884}
1482 1885
1483void inline_speed 1886void inline_speed
1484ev_clear_pending (EV_P_ W w) 1887clear_pending (EV_P_ W w)
1485{ 1888{
1486 if (w->pending) 1889 if (w->pending)
1487 { 1890 {
1488 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1891 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1489 w->pending = 0; 1892 w->pending = 0;
1490 } 1893 }
1491} 1894}
1492 1895
1896int
1897ev_clear_pending (EV_P_ void *w)
1898{
1899 W w_ = (W)w;
1900 int pending = w_->pending;
1901
1902 if (expect_true (pending))
1903 {
1904 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1905 w_->pending = 0;
1906 p->w = 0;
1907 return p->events;
1908 }
1909 else
1910 return 0;
1911}
1912
1913void inline_size
1914pri_adjust (EV_P_ W w)
1915{
1916 int pri = w->priority;
1917 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
1918 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
1919 w->priority = pri;
1920}
1921
1493void inline_speed 1922void inline_speed
1494ev_start (EV_P_ W w, int active) 1923ev_start (EV_P_ W w, int active)
1495{ 1924{
1496 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1925 pri_adjust (EV_A_ w);
1497 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1498
1499 w->active = active; 1926 w->active = active;
1500 ev_ref (EV_A); 1927 ev_ref (EV_A);
1501} 1928}
1502 1929
1503void inline_size 1930void inline_size
… …
1507 w->active = 0; 1934 w->active = 0;
1508} 1935}
1509 1936
1510/*****************************************************************************/ 1937/*****************************************************************************/
1511 1938
1512void 1939void noinline
1513ev_io_start (EV_P_ ev_io *w) 1940ev_io_start (EV_P_ ev_io *w)
1514{ 1941{
1515 int fd = w->fd; 1942 int fd = w->fd;
1516 1943
1517 if (expect_false (ev_is_active (w))) 1944 if (expect_false (ev_is_active (w)))
… …
1519 1946
1520 assert (("ev_io_start called with negative fd", fd >= 0)); 1947 assert (("ev_io_start called with negative fd", fd >= 0));
1521 1948
1522 ev_start (EV_A_ (W)w, 1); 1949 ev_start (EV_A_ (W)w, 1);
1523 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1950 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1524 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1951 wlist_add (&anfds[fd].head, (WL)w);
1525 1952
1526 fd_change (EV_A_ fd); 1953 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1954 w->events &= ~EV_IOFDSET;
1527} 1955}
1528 1956
1529void 1957void noinline
1530ev_io_stop (EV_P_ ev_io *w) 1958ev_io_stop (EV_P_ ev_io *w)
1531{ 1959{
1532 ev_clear_pending (EV_A_ (W)w); 1960 clear_pending (EV_A_ (W)w);
1533 if (expect_false (!ev_is_active (w))) 1961 if (expect_false (!ev_is_active (w)))
1534 return; 1962 return;
1535 1963
1536 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1964 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1537 1965
1538 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1966 wlist_del (&anfds[w->fd].head, (WL)w);
1539 ev_stop (EV_A_ (W)w); 1967 ev_stop (EV_A_ (W)w);
1540 1968
1541 fd_change (EV_A_ w->fd); 1969 fd_change (EV_A_ w->fd, 1);
1542} 1970}
1543 1971
1544void 1972void noinline
1545ev_timer_start (EV_P_ ev_timer *w) 1973ev_timer_start (EV_P_ ev_timer *w)
1546{ 1974{
1547 if (expect_false (ev_is_active (w))) 1975 if (expect_false (ev_is_active (w)))
1548 return; 1976 return;
1549 1977
1550 ((WT)w)->at += mn_now; 1978 ev_at (w) += mn_now;
1551 1979
1552 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1980 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1553 1981
1554 ev_start (EV_A_ (W)w, ++timercnt); 1982 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1);
1555 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1983 array_needsize (WT, timers, timermax, timercnt + HEAP0, EMPTY2);
1556 timers [timercnt - 1] = w; 1984 timers [ev_active (w)] = (WT)w;
1557 upheap ((WT *)timers, timercnt - 1); 1985 upheap (timers, ev_active (w));
1558 1986
1559 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1987 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/
1560} 1988}
1561 1989
1562void 1990void noinline
1563ev_timer_stop (EV_P_ ev_timer *w) 1991ev_timer_stop (EV_P_ ev_timer *w)
1564{ 1992{
1565 ev_clear_pending (EV_A_ (W)w); 1993 clear_pending (EV_A_ (W)w);
1566 if (expect_false (!ev_is_active (w))) 1994 if (expect_false (!ev_is_active (w)))
1567 return; 1995 return;
1568 1996
1569 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1570
1571 { 1997 {
1572 int active = ((W)w)->active; 1998 int active = ev_active (w);
1573 1999
2000 assert (("internal timer heap corruption", timers [active] == (WT)w));
2001
1574 if (expect_true (--active < --timercnt)) 2002 if (expect_true (active < timercnt + HEAP0 - 1))
1575 { 2003 {
1576 timers [active] = timers [timercnt]; 2004 timers [active] = timers [timercnt + HEAP0 - 1];
1577 adjustheap ((WT *)timers, timercnt, active); 2005 adjustheap (timers, timercnt, active);
1578 } 2006 }
2007
2008 --timercnt;
1579 } 2009 }
1580 2010
1581 ((WT)w)->at -= mn_now; 2011 ev_at (w) -= mn_now;
1582 2012
1583 ev_stop (EV_A_ (W)w); 2013 ev_stop (EV_A_ (W)w);
1584} 2014}
1585 2015
1586void 2016void noinline
1587ev_timer_again (EV_P_ ev_timer *w) 2017ev_timer_again (EV_P_ ev_timer *w)
1588{ 2018{
1589 if (ev_is_active (w)) 2019 if (ev_is_active (w))
1590 { 2020 {
1591 if (w->repeat) 2021 if (w->repeat)
1592 { 2022 {
1593 ((WT)w)->at = mn_now + w->repeat; 2023 ev_at (w) = mn_now + w->repeat;
1594 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 2024 adjustheap (timers, timercnt, ev_active (w));
1595 } 2025 }
1596 else 2026 else
1597 ev_timer_stop (EV_A_ w); 2027 ev_timer_stop (EV_A_ w);
1598 } 2028 }
1599 else if (w->repeat) 2029 else if (w->repeat)
1600 { 2030 {
1601 w->at = w->repeat; 2031 ev_at (w) = w->repeat;
1602 ev_timer_start (EV_A_ w); 2032 ev_timer_start (EV_A_ w);
1603 } 2033 }
1604} 2034}
1605 2035
1606#if EV_PERIODIC_ENABLE 2036#if EV_PERIODIC_ENABLE
1607void 2037void noinline
1608ev_periodic_start (EV_P_ ev_periodic *w) 2038ev_periodic_start (EV_P_ ev_periodic *w)
1609{ 2039{
1610 if (expect_false (ev_is_active (w))) 2040 if (expect_false (ev_is_active (w)))
1611 return; 2041 return;
1612 2042
1613 if (w->reschedule_cb) 2043 if (w->reschedule_cb)
1614 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 2044 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1615 else if (w->interval) 2045 else if (w->interval)
1616 { 2046 {
1617 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2047 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1618 /* this formula differs from the one in periodic_reify because we do not always round up */ 2048 /* this formula differs from the one in periodic_reify because we do not always round up */
1619 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 2049 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1620 } 2050 }
2051 else
2052 ev_at (w) = w->offset;
1621 2053
1622 ev_start (EV_A_ (W)w, ++periodiccnt); 2054 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1);
1623 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 2055 array_needsize (WT, periodics, periodicmax, periodiccnt + HEAP0, EMPTY2);
1624 periodics [periodiccnt - 1] = w; 2056 periodics [ev_active (w)] = (WT)w;
1625 upheap ((WT *)periodics, periodiccnt - 1); 2057 upheap (periodics, ev_active (w));
1626 2058
1627 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 2059 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/
1628} 2060}
1629 2061
1630void 2062void noinline
1631ev_periodic_stop (EV_P_ ev_periodic *w) 2063ev_periodic_stop (EV_P_ ev_periodic *w)
1632{ 2064{
1633 ev_clear_pending (EV_A_ (W)w); 2065 clear_pending (EV_A_ (W)w);
1634 if (expect_false (!ev_is_active (w))) 2066 if (expect_false (!ev_is_active (w)))
1635 return; 2067 return;
1636 2068
1637 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1638
1639 { 2069 {
1640 int active = ((W)w)->active; 2070 int active = ev_active (w);
1641 2071
2072 assert (("internal periodic heap corruption", periodics [active] == (WT)w));
2073
1642 if (expect_true (--active < --periodiccnt)) 2074 if (expect_true (active < periodiccnt + HEAP0 - 1))
1643 { 2075 {
1644 periodics [active] = periodics [periodiccnt]; 2076 periodics [active] = periodics [periodiccnt + HEAP0 - 1];
1645 adjustheap ((WT *)periodics, periodiccnt, active); 2077 adjustheap (periodics, periodiccnt, active);
1646 } 2078 }
2079
2080 --periodiccnt;
1647 } 2081 }
1648 2082
1649 ev_stop (EV_A_ (W)w); 2083 ev_stop (EV_A_ (W)w);
1650} 2084}
1651 2085
1652void 2086void noinline
1653ev_periodic_again (EV_P_ ev_periodic *w) 2087ev_periodic_again (EV_P_ ev_periodic *w)
1654{ 2088{
1655 /* TODO: use adjustheap and recalculation */ 2089 /* TODO: use adjustheap and recalculation */
1656 ev_periodic_stop (EV_A_ w); 2090 ev_periodic_stop (EV_A_ w);
1657 ev_periodic_start (EV_A_ w); 2091 ev_periodic_start (EV_A_ w);
… …
1660 2094
1661#ifndef SA_RESTART 2095#ifndef SA_RESTART
1662# define SA_RESTART 0 2096# define SA_RESTART 0
1663#endif 2097#endif
1664 2098
1665void 2099void noinline
1666ev_signal_start (EV_P_ ev_signal *w) 2100ev_signal_start (EV_P_ ev_signal *w)
1667{ 2101{
1668#if EV_MULTIPLICITY 2102#if EV_MULTIPLICITY
1669 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2103 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1670#endif 2104#endif
1671 if (expect_false (ev_is_active (w))) 2105 if (expect_false (ev_is_active (w)))
1672 return; 2106 return;
1673 2107
1674 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2108 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1675 2109
2110 evpipe_init (EV_A);
2111
2112 {
2113#ifndef _WIN32
2114 sigset_t full, prev;
2115 sigfillset (&full);
2116 sigprocmask (SIG_SETMASK, &full, &prev);
2117#endif
2118
2119 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
2120
2121#ifndef _WIN32
2122 sigprocmask (SIG_SETMASK, &prev, 0);
2123#endif
2124 }
2125
1676 ev_start (EV_A_ (W)w, 1); 2126 ev_start (EV_A_ (W)w, 1);
1677 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1678 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 2127 wlist_add (&signals [w->signum - 1].head, (WL)w);
1679 2128
1680 if (!((WL)w)->next) 2129 if (!((WL)w)->next)
1681 { 2130 {
1682#if _WIN32 2131#if _WIN32
1683 signal (w->signum, sighandler); 2132 signal (w->signum, ev_sighandler);
1684#else 2133#else
1685 struct sigaction sa; 2134 struct sigaction sa;
1686 sa.sa_handler = sighandler; 2135 sa.sa_handler = ev_sighandler;
1687 sigfillset (&sa.sa_mask); 2136 sigfillset (&sa.sa_mask);
1688 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2137 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1689 sigaction (w->signum, &sa, 0); 2138 sigaction (w->signum, &sa, 0);
1690#endif 2139#endif
1691 } 2140 }
1692} 2141}
1693 2142
1694void 2143void noinline
1695ev_signal_stop (EV_P_ ev_signal *w) 2144ev_signal_stop (EV_P_ ev_signal *w)
1696{ 2145{
1697 ev_clear_pending (EV_A_ (W)w); 2146 clear_pending (EV_A_ (W)w);
1698 if (expect_false (!ev_is_active (w))) 2147 if (expect_false (!ev_is_active (w)))
1699 return; 2148 return;
1700 2149
1701 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 2150 wlist_del (&signals [w->signum - 1].head, (WL)w);
1702 ev_stop (EV_A_ (W)w); 2151 ev_stop (EV_A_ (W)w);
1703 2152
1704 if (!signals [w->signum - 1].head) 2153 if (!signals [w->signum - 1].head)
1705 signal (w->signum, SIG_DFL); 2154 signal (w->signum, SIG_DFL);
1706} 2155}
… …
1713#endif 2162#endif
1714 if (expect_false (ev_is_active (w))) 2163 if (expect_false (ev_is_active (w)))
1715 return; 2164 return;
1716 2165
1717 ev_start (EV_A_ (W)w, 1); 2166 ev_start (EV_A_ (W)w, 1);
1718 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2167 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1719} 2168}
1720 2169
1721void 2170void
1722ev_child_stop (EV_P_ ev_child *w) 2171ev_child_stop (EV_P_ ev_child *w)
1723{ 2172{
1724 ev_clear_pending (EV_A_ (W)w); 2173 clear_pending (EV_A_ (W)w);
1725 if (expect_false (!ev_is_active (w))) 2174 if (expect_false (!ev_is_active (w)))
1726 return; 2175 return;
1727 2176
1728 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2177 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1729 ev_stop (EV_A_ (W)w); 2178 ev_stop (EV_A_ (W)w);
1730} 2179}
1731 2180
1732#if EV_STAT_ENABLE 2181#if EV_STAT_ENABLE
1733 2182
… …
1752 if (w->wd < 0) 2201 if (w->wd < 0)
1753 { 2202 {
1754 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2203 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1755 2204
1756 /* monitor some parent directory for speedup hints */ 2205 /* monitor some parent directory for speedup hints */
2206 /* note that exceeding the hardcoded limit is not a correctness issue, */
2207 /* but an efficiency issue only */
1757 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2208 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1758 { 2209 {
1759 char path [4096]; 2210 char path [4096];
1760 strcpy (path, w->path); 2211 strcpy (path, w->path);
1761 2212
… …
1965} 2416}
1966 2417
1967void 2418void
1968ev_stat_stop (EV_P_ ev_stat *w) 2419ev_stat_stop (EV_P_ ev_stat *w)
1969{ 2420{
1970 ev_clear_pending (EV_A_ (W)w); 2421 clear_pending (EV_A_ (W)w);
1971 if (expect_false (!ev_is_active (w))) 2422 if (expect_false (!ev_is_active (w)))
1972 return; 2423 return;
1973 2424
1974#if EV_USE_INOTIFY 2425#if EV_USE_INOTIFY
1975 infy_del (EV_A_ w); 2426 infy_del (EV_A_ w);
… …
1978 2429
1979 ev_stop (EV_A_ (W)w); 2430 ev_stop (EV_A_ (W)w);
1980} 2431}
1981#endif 2432#endif
1982 2433
2434#if EV_IDLE_ENABLE
1983void 2435void
1984ev_idle_start (EV_P_ ev_idle *w) 2436ev_idle_start (EV_P_ ev_idle *w)
1985{ 2437{
1986 if (expect_false (ev_is_active (w))) 2438 if (expect_false (ev_is_active (w)))
1987 return; 2439 return;
1988 2440
2441 pri_adjust (EV_A_ (W)w);
2442
2443 {
2444 int active = ++idlecnt [ABSPRI (w)];
2445
2446 ++idleall;
1989 ev_start (EV_A_ (W)w, ++idlecnt); 2447 ev_start (EV_A_ (W)w, active);
2448
1990 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2449 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
1991 idles [idlecnt - 1] = w; 2450 idles [ABSPRI (w)][active - 1] = w;
2451 }
1992} 2452}
1993 2453
1994void 2454void
1995ev_idle_stop (EV_P_ ev_idle *w) 2455ev_idle_stop (EV_P_ ev_idle *w)
1996{ 2456{
1997 ev_clear_pending (EV_A_ (W)w); 2457 clear_pending (EV_A_ (W)w);
1998 if (expect_false (!ev_is_active (w))) 2458 if (expect_false (!ev_is_active (w)))
1999 return; 2459 return;
2000 2460
2001 { 2461 {
2002 int active = ((W)w)->active; 2462 int active = ev_active (w);
2003 idles [active - 1] = idles [--idlecnt]; 2463
2004 ((W)idles [active - 1])->active = active; 2464 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2465 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2466
2467 ev_stop (EV_A_ (W)w);
2468 --idleall;
2005 } 2469 }
2006
2007 ev_stop (EV_A_ (W)w);
2008} 2470}
2471#endif
2009 2472
2010void 2473void
2011ev_prepare_start (EV_P_ ev_prepare *w) 2474ev_prepare_start (EV_P_ ev_prepare *w)
2012{ 2475{
2013 if (expect_false (ev_is_active (w))) 2476 if (expect_false (ev_is_active (w)))
… …
2019} 2482}
2020 2483
2021void 2484void
2022ev_prepare_stop (EV_P_ ev_prepare *w) 2485ev_prepare_stop (EV_P_ ev_prepare *w)
2023{ 2486{
2024 ev_clear_pending (EV_A_ (W)w); 2487 clear_pending (EV_A_ (W)w);
2025 if (expect_false (!ev_is_active (w))) 2488 if (expect_false (!ev_is_active (w)))
2026 return; 2489 return;
2027 2490
2028 { 2491 {
2029 int active = ((W)w)->active; 2492 int active = ev_active (w);
2493
2030 prepares [active - 1] = prepares [--preparecnt]; 2494 prepares [active - 1] = prepares [--preparecnt];
2031 ((W)prepares [active - 1])->active = active; 2495 ev_active (prepares [active - 1]) = active;
2032 } 2496 }
2033 2497
2034 ev_stop (EV_A_ (W)w); 2498 ev_stop (EV_A_ (W)w);
2035} 2499}
2036 2500
… …
2046} 2510}
2047 2511
2048void 2512void
2049ev_check_stop (EV_P_ ev_check *w) 2513ev_check_stop (EV_P_ ev_check *w)
2050{ 2514{
2051 ev_clear_pending (EV_A_ (W)w); 2515 clear_pending (EV_A_ (W)w);
2052 if (expect_false (!ev_is_active (w))) 2516 if (expect_false (!ev_is_active (w)))
2053 return; 2517 return;
2054 2518
2055 { 2519 {
2056 int active = ((W)w)->active; 2520 int active = ev_active (w);
2521
2057 checks [active - 1] = checks [--checkcnt]; 2522 checks [active - 1] = checks [--checkcnt];
2058 ((W)checks [active - 1])->active = active; 2523 ev_active (checks [active - 1]) = active;
2059 } 2524 }
2060 2525
2061 ev_stop (EV_A_ (W)w); 2526 ev_stop (EV_A_ (W)w);
2062} 2527}
2063 2528
2064#if EV_EMBED_ENABLE 2529#if EV_EMBED_ENABLE
2065void noinline 2530void noinline
2066ev_embed_sweep (EV_P_ ev_embed *w) 2531ev_embed_sweep (EV_P_ ev_embed *w)
2067{ 2532{
2068 ev_loop (w->loop, EVLOOP_NONBLOCK); 2533 ev_loop (w->other, EVLOOP_NONBLOCK);
2069} 2534}
2070 2535
2071static void 2536static void
2072embed_cb (EV_P_ ev_io *io, int revents) 2537embed_io_cb (EV_P_ ev_io *io, int revents)
2073{ 2538{
2074 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2539 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2075 2540
2076 if (ev_cb (w)) 2541 if (ev_cb (w))
2077 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2542 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2078 else 2543 else
2079 ev_embed_sweep (loop, w); 2544 ev_loop (w->other, EVLOOP_NONBLOCK);
2080} 2545}
2546
2547static void
2548embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2549{
2550 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2551
2552 {
2553 struct ev_loop *loop = w->other;
2554
2555 while (fdchangecnt)
2556 {
2557 fd_reify (EV_A);
2558 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2559 }
2560 }
2561}
2562
2563#if 0
2564static void
2565embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2566{
2567 ev_idle_stop (EV_A_ idle);
2568}
2569#endif
2081 2570
2082void 2571void
2083ev_embed_start (EV_P_ ev_embed *w) 2572ev_embed_start (EV_P_ ev_embed *w)
2084{ 2573{
2085 if (expect_false (ev_is_active (w))) 2574 if (expect_false (ev_is_active (w)))
2086 return; 2575 return;
2087 2576
2088 { 2577 {
2089 struct ev_loop *loop = w->loop; 2578 struct ev_loop *loop = w->other;
2090 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2579 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2091 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2580 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2092 } 2581 }
2093 2582
2094 ev_set_priority (&w->io, ev_priority (w)); 2583 ev_set_priority (&w->io, ev_priority (w));
2095 ev_io_start (EV_A_ &w->io); 2584 ev_io_start (EV_A_ &w->io);
2096 2585
2586 ev_prepare_init (&w->prepare, embed_prepare_cb);
2587 ev_set_priority (&w->prepare, EV_MINPRI);
2588 ev_prepare_start (EV_A_ &w->prepare);
2589
2590 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2591
2097 ev_start (EV_A_ (W)w, 1); 2592 ev_start (EV_A_ (W)w, 1);
2098} 2593}
2099 2594
2100void 2595void
2101ev_embed_stop (EV_P_ ev_embed *w) 2596ev_embed_stop (EV_P_ ev_embed *w)
2102{ 2597{
2103 ev_clear_pending (EV_A_ (W)w); 2598 clear_pending (EV_A_ (W)w);
2104 if (expect_false (!ev_is_active (w))) 2599 if (expect_false (!ev_is_active (w)))
2105 return; 2600 return;
2106 2601
2107 ev_io_stop (EV_A_ &w->io); 2602 ev_io_stop (EV_A_ &w->io);
2603 ev_prepare_stop (EV_A_ &w->prepare);
2108 2604
2109 ev_stop (EV_A_ (W)w); 2605 ev_stop (EV_A_ (W)w);
2110} 2606}
2111#endif 2607#endif
2112 2608
… …
2123} 2619}
2124 2620
2125void 2621void
2126ev_fork_stop (EV_P_ ev_fork *w) 2622ev_fork_stop (EV_P_ ev_fork *w)
2127{ 2623{
2128 ev_clear_pending (EV_A_ (W)w); 2624 clear_pending (EV_A_ (W)w);
2129 if (expect_false (!ev_is_active (w))) 2625 if (expect_false (!ev_is_active (w)))
2130 return; 2626 return;
2131 2627
2132 { 2628 {
2133 int active = ((W)w)->active; 2629 int active = ev_active (w);
2630
2134 forks [active - 1] = forks [--forkcnt]; 2631 forks [active - 1] = forks [--forkcnt];
2135 ((W)forks [active - 1])->active = active; 2632 ev_active (forks [active - 1]) = active;
2136 } 2633 }
2137 2634
2138 ev_stop (EV_A_ (W)w); 2635 ev_stop (EV_A_ (W)w);
2636}
2637#endif
2638
2639#if EV_ASYNC_ENABLE
2640void
2641ev_async_start (EV_P_ ev_async *w)
2642{
2643 if (expect_false (ev_is_active (w)))
2644 return;
2645
2646 evpipe_init (EV_A);
2647
2648 ev_start (EV_A_ (W)w, ++asynccnt);
2649 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2650 asyncs [asynccnt - 1] = w;
2651}
2652
2653void
2654ev_async_stop (EV_P_ ev_async *w)
2655{
2656 clear_pending (EV_A_ (W)w);
2657 if (expect_false (!ev_is_active (w)))
2658 return;
2659
2660 {
2661 int active = ev_active (w);
2662
2663 asyncs [active - 1] = asyncs [--asynccnt];
2664 ev_active (asyncs [active - 1]) = active;
2665 }
2666
2667 ev_stop (EV_A_ (W)w);
2668}
2669
2670void
2671ev_async_send (EV_P_ ev_async *w)
2672{
2673 w->sent = 1;
2674 evpipe_write (EV_A_ &gotasync);
2139} 2675}
2140#endif 2676#endif
2141 2677
2142/*****************************************************************************/ 2678/*****************************************************************************/
2143 2679
… …
2201 ev_timer_set (&once->to, timeout, 0.); 2737 ev_timer_set (&once->to, timeout, 0.);
2202 ev_timer_start (EV_A_ &once->to); 2738 ev_timer_start (EV_A_ &once->to);
2203 } 2739 }
2204} 2740}
2205 2741
2742#if EV_MULTIPLICITY
2743 #include "ev_wrap.h"
2744#endif
2745
2206#ifdef __cplusplus 2746#ifdef __cplusplus
2207} 2747}
2208#endif 2748#endif
2209 2749

Diff Legend

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