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

Comparing libev/ev.c (file contents):
Revision 1.162 by root, Mon Dec 3 13:41:24 2007 UTC vs.
Revision 1.236 by root, Wed May 7 14:46:22 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#if USE_4HEAP
772
773#define HEAP0 3 /* index of first element in heap */
774
775/* towards the root */
604void inline_speed 776void inline_speed
605upheap (WT *heap, int k) 777upheap (WT *heap, int k)
606{ 778{
607 WT w = heap [k]; 779 WT w = heap [k];
608 780
609 while (k && heap [k >> 1]->at > w->at) 781 for (;;)
610 { 782 {
783 int p = ((k - HEAP0 - 1) / 4) + HEAP0;
784
785 if (p >= HEAP0 || heap [p]->at <= w->at)
786 break;
787
611 heap [k] = heap [k >> 1]; 788 heap [k] = heap [p];
612 ((W)heap [k])->active = k + 1; 789 ev_active (heap [k]) = k;
613 k >>= 1; 790 k = p;
614 } 791 }
615 792
616 heap [k] = w; 793 heap [k] = w;
617 ((W)heap [k])->active = k + 1; 794 ev_active (heap [k]) = k;
618
619} 795}
620 796
797/* away from the root */
621void inline_speed 798void inline_speed
622downheap (WT *heap, int N, int k) 799downheap (WT *heap, int N, int k)
623{ 800{
624 WT w = heap [k]; 801 WT w = heap [k];
802 WT *E = heap + N + HEAP0;
625 803
626 while (k < (N >> 1)) 804 for (;;)
627 { 805 {
628 int j = k << 1; 806 ev_tstamp minat;
807 WT *minpos;
808 WT *pos = heap + 4 * (k - HEAP0) + HEAP0;
629 809
630 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 810 // find minimum child
811 if (expect_true (pos +3 < E))
631 ++j; 812 {
813 /* fast path */
814 (minpos = pos + 0), (minat = (*minpos)->at);
815 if (pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at);
816 if (pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at);
817 if (pos [3]->at < minat) (minpos = pos + 3), (minat = (*minpos)->at);
818 }
819 else
820 {
821 /* slow path */
822 if (pos >= E)
823 break;
824 (minpos = pos + 0), (minat = (*minpos)->at);
825 if (pos + 1 < E && pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at);
826 if (pos + 2 < E && pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at);
827 if (pos + 3 < E && pos [3]->at < minat) (minpos = pos + 3), (minat = (*minpos)->at);
828 }
632 829
633 if (w->at <= heap [j]->at) 830 if (w->at <= minat)
634 break; 831 break;
635 832
636 heap [k] = heap [j]; 833 ev_active (*minpos) = k;
637 ((W)heap [k])->active = k + 1; 834 heap [k] = *minpos;
638 k = j; 835
836 k = minpos - heap;
639 } 837 }
640 838
641 heap [k] = w; 839 heap [k] = w;
840 ev_active (heap [k]) = k;
841}
842
843#else // 4HEAP
844
845#define HEAP0 1
846
847/* towards the root */
848void inline_speed
849upheap (WT *heap, int k)
850{
851 WT w = heap [k];
852
853 for (;;)
854 {
855 int p = k >> 1;
856
857 /* maybe we could use a dummy element at heap [0]? */
858 if (!p || heap [p]->at <= w->at)
859 break;
860
861 heap [k] = heap [p];
862 ev_active (heap [k]) = k;
863 k = p;
864 }
865
866 heap [k] = w;
867 ev_active (heap [k]) = k;
868}
869
870/* away from the root */
871void inline_speed
872downheap (WT *heap, int N, int k)
873{
874 WT w = heap [k];
875
876 for (;;)
877 {
878 int c = k << 1;
879
880 if (c > N)
881 break;
882
883 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
884 ? 1 : 0;
885
886 if (w->at <= heap [c]->at)
887 break;
888
889 heap [k] = heap [c];
642 ((W)heap [k])->active = k + 1; 890 ((W)heap [k])->active = k;
891
892 k = c;
893 }
894
895 heap [k] = w;
896 ev_active (heap [k]) = k;
643} 897}
898#endif
644 899
645void inline_size 900void inline_size
646adjustheap (WT *heap, int N, int k) 901adjustheap (WT *heap, int N, int k)
647{ 902{
648 upheap (heap, k); 903 upheap (heap, k);
… …
652/*****************************************************************************/ 907/*****************************************************************************/
653 908
654typedef struct 909typedef struct
655{ 910{
656 WL head; 911 WL head;
657 sig_atomic_t volatile gotsig; 912 EV_ATOMIC_T gotsig;
658} ANSIG; 913} ANSIG;
659 914
660static ANSIG *signals; 915static ANSIG *signals;
661static int signalmax; 916static int signalmax;
662 917
663static int sigpipe [2]; 918static EV_ATOMIC_T gotsig;
664static sig_atomic_t volatile gotsig;
665static ev_io sigev;
666 919
667void inline_size 920void inline_size
668signals_init (ANSIG *base, int count) 921signals_init (ANSIG *base, int count)
669{ 922{
670 while (count--) 923 while (count--)
… …
674 927
675 ++base; 928 ++base;
676 } 929 }
677} 930}
678 931
679static void 932/*****************************************************************************/
680sighandler (int signum)
681{
682#if _WIN32
683 signal (signum, sighandler);
684#endif
685 933
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 934void inline_speed
731fd_intern (int fd) 935fd_intern (int fd)
732{ 936{
733#ifdef _WIN32 937#ifdef _WIN32
734 int arg = 1; 938 int arg = 1;
735 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 939 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
738 fcntl (fd, F_SETFL, O_NONBLOCK); 942 fcntl (fd, F_SETFL, O_NONBLOCK);
739#endif 943#endif
740} 944}
741 945
742static void noinline 946static void noinline
743siginit (EV_P) 947evpipe_init (EV_P)
744{ 948{
949 if (!ev_is_active (&pipeev))
950 {
951#if EV_USE_EVENTFD
952 if ((evfd = eventfd (0, 0)) >= 0)
953 {
954 evpipe [0] = -1;
955 fd_intern (evfd);
956 ev_io_set (&pipeev, evfd, EV_READ);
957 }
958 else
959#endif
960 {
961 while (pipe (evpipe))
962 syserr ("(libev) error creating signal/async pipe");
963
745 fd_intern (sigpipe [0]); 964 fd_intern (evpipe [0]);
746 fd_intern (sigpipe [1]); 965 fd_intern (evpipe [1]);
966 ev_io_set (&pipeev, evpipe [0], EV_READ);
967 }
747 968
748 ev_io_set (&sigev, sigpipe [0], EV_READ);
749 ev_io_start (EV_A_ &sigev); 969 ev_io_start (EV_A_ &pipeev);
750 ev_unref (EV_A); /* child watcher should not keep loop alive */ 970 ev_unref (EV_A); /* watcher should not keep loop alive */
971 }
972}
973
974void inline_size
975evpipe_write (EV_P_ EV_ATOMIC_T *flag)
976{
977 if (!*flag)
978 {
979 int old_errno = errno; /* save errno because write might clobber it */
980
981 *flag = 1;
982
983#if EV_USE_EVENTFD
984 if (evfd >= 0)
985 {
986 uint64_t counter = 1;
987 write (evfd, &counter, sizeof (uint64_t));
988 }
989 else
990#endif
991 write (evpipe [1], &old_errno, 1);
992
993 errno = old_errno;
994 }
995}
996
997static void
998pipecb (EV_P_ ev_io *iow, int revents)
999{
1000#if EV_USE_EVENTFD
1001 if (evfd >= 0)
1002 {
1003 uint64_t counter;
1004 read (evfd, &counter, sizeof (uint64_t));
1005 }
1006 else
1007#endif
1008 {
1009 char dummy;
1010 read (evpipe [0], &dummy, 1);
1011 }
1012
1013 if (gotsig && ev_is_default_loop (EV_A))
1014 {
1015 int signum;
1016 gotsig = 0;
1017
1018 for (signum = signalmax; signum--; )
1019 if (signals [signum].gotsig)
1020 ev_feed_signal_event (EV_A_ signum + 1);
1021 }
1022
1023#if EV_ASYNC_ENABLE
1024 if (gotasync)
1025 {
1026 int i;
1027 gotasync = 0;
1028
1029 for (i = asynccnt; i--; )
1030 if (asyncs [i]->sent)
1031 {
1032 asyncs [i]->sent = 0;
1033 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
1034 }
1035 }
1036#endif
751} 1037}
752 1038
753/*****************************************************************************/ 1039/*****************************************************************************/
754 1040
1041static void
1042ev_sighandler (int signum)
1043{
1044#if EV_MULTIPLICITY
1045 struct ev_loop *loop = &default_loop_struct;
1046#endif
1047
1048#if _WIN32
1049 signal (signum, ev_sighandler);
1050#endif
1051
1052 signals [signum - 1].gotsig = 1;
1053 evpipe_write (EV_A_ &gotsig);
1054}
1055
1056void noinline
1057ev_feed_signal_event (EV_P_ int signum)
1058{
1059 WL w;
1060
1061#if EV_MULTIPLICITY
1062 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
1063#endif
1064
1065 --signum;
1066
1067 if (signum < 0 || signum >= signalmax)
1068 return;
1069
1070 signals [signum].gotsig = 0;
1071
1072 for (w = signals [signum].head; w; w = w->next)
1073 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1074}
1075
1076/*****************************************************************************/
1077
755static ev_child *childs [EV_PID_HASHSIZE]; 1078static WL childs [EV_PID_HASHSIZE];
756 1079
757#ifndef _WIN32 1080#ifndef _WIN32
758 1081
759static ev_signal childev; 1082static ev_signal childev;
760 1083
1084#ifndef WIFCONTINUED
1085# define WIFCONTINUED(status) 0
1086#endif
1087
761void inline_speed 1088void inline_speed
762child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1089child_reap (EV_P_ int chain, int pid, int status)
763{ 1090{
764 ev_child *w; 1091 ev_child *w;
1092 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
765 1093
766 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1094 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1095 {
767 if (w->pid == pid || !w->pid) 1096 if ((w->pid == pid || !w->pid)
1097 && (!traced || (w->flags & 1)))
768 { 1098 {
769 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 1099 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; 1100 w->rpid = pid;
771 w->rstatus = status; 1101 w->rstatus = status;
772 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1102 ev_feed_event (EV_A_ (W)w, EV_CHILD);
773 } 1103 }
1104 }
774} 1105}
775 1106
776#ifndef WCONTINUED 1107#ifndef WCONTINUED
777# define WCONTINUED 0 1108# define WCONTINUED 0
778#endif 1109#endif
… …
787 if (!WCONTINUED 1118 if (!WCONTINUED
788 || errno != EINVAL 1119 || errno != EINVAL
789 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1120 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
790 return; 1121 return;
791 1122
792 /* make sure we are called again until all childs have been reaped */ 1123 /* 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 */ 1124 /* 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); 1125 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
795 1126
796 child_reap (EV_A_ sw, pid, pid, status); 1127 child_reap (EV_A_ pid, pid, status);
797 if (EV_PID_HASHSIZE > 1) 1128 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 */ 1129 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
799} 1130}
800 1131
801#endif 1132#endif
802 1133
803/*****************************************************************************/ 1134/*****************************************************************************/
… …
875} 1206}
876 1207
877unsigned int 1208unsigned int
878ev_embeddable_backends (void) 1209ev_embeddable_backends (void)
879{ 1210{
880 return EVBACKEND_EPOLL 1211 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
881 | EVBACKEND_KQUEUE 1212
882 | EVBACKEND_PORT; 1213 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1214 /* please fix it and tell me how to detect the fix */
1215 flags &= ~EVBACKEND_EPOLL;
1216
1217 return flags;
883} 1218}
884 1219
885unsigned int 1220unsigned int
886ev_backend (EV_P) 1221ev_backend (EV_P)
887{ 1222{
… …
890 1225
891unsigned int 1226unsigned int
892ev_loop_count (EV_P) 1227ev_loop_count (EV_P)
893{ 1228{
894 return loop_count; 1229 return loop_count;
1230}
1231
1232void
1233ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1234{
1235 io_blocktime = interval;
1236}
1237
1238void
1239ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1240{
1241 timeout_blocktime = interval;
895} 1242}
896 1243
897static void noinline 1244static void noinline
898loop_init (EV_P_ unsigned int flags) 1245loop_init (EV_P_ unsigned int flags)
899{ 1246{
… …
905 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1252 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
906 have_monotonic = 1; 1253 have_monotonic = 1;
907 } 1254 }
908#endif 1255#endif
909 1256
910 ev_rt_now = ev_time (); 1257 ev_rt_now = ev_time ();
911 mn_now = get_clock (); 1258 mn_now = get_clock ();
912 now_floor = mn_now; 1259 now_floor = mn_now;
913 rtmn_diff = ev_rt_now - mn_now; 1260 rtmn_diff = ev_rt_now - mn_now;
1261
1262 io_blocktime = 0.;
1263 timeout_blocktime = 0.;
1264 backend = 0;
1265 backend_fd = -1;
1266 gotasync = 0;
1267#if EV_USE_INOTIFY
1268 fs_fd = -2;
1269#endif
914 1270
915 /* pid check not overridable via env */ 1271 /* pid check not overridable via env */
916#ifndef _WIN32 1272#ifndef _WIN32
917 if (flags & EVFLAG_FORKCHECK) 1273 if (flags & EVFLAG_FORKCHECK)
918 curpid = getpid (); 1274 curpid = getpid ();
… …
921 if (!(flags & EVFLAG_NOENV) 1277 if (!(flags & EVFLAG_NOENV)
922 && !enable_secure () 1278 && !enable_secure ()
923 && getenv ("LIBEV_FLAGS")) 1279 && getenv ("LIBEV_FLAGS"))
924 flags = atoi (getenv ("LIBEV_FLAGS")); 1280 flags = atoi (getenv ("LIBEV_FLAGS"));
925 1281
926 if (!(flags & 0x0000ffffUL)) 1282 if (!(flags & 0x0000ffffU))
927 flags |= ev_recommended_backends (); 1283 flags |= ev_recommended_backends ();
928
929 backend = 0;
930 backend_fd = -1;
931#if EV_USE_INOTIFY
932 fs_fd = -2;
933#endif
934 1284
935#if EV_USE_PORT 1285#if EV_USE_PORT
936 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1286 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
937#endif 1287#endif
938#if EV_USE_KQUEUE 1288#if EV_USE_KQUEUE
… …
946#endif 1296#endif
947#if EV_USE_SELECT 1297#if EV_USE_SELECT
948 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1298 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
949#endif 1299#endif
950 1300
951 ev_init (&sigev, sigcb); 1301 ev_init (&pipeev, pipecb);
952 ev_set_priority (&sigev, EV_MAXPRI); 1302 ev_set_priority (&pipeev, EV_MAXPRI);
953 } 1303 }
954} 1304}
955 1305
956static void noinline 1306static void noinline
957loop_destroy (EV_P) 1307loop_destroy (EV_P)
958{ 1308{
959 int i; 1309 int i;
1310
1311 if (ev_is_active (&pipeev))
1312 {
1313 ev_ref (EV_A); /* signal watcher */
1314 ev_io_stop (EV_A_ &pipeev);
1315
1316#if EV_USE_EVENTFD
1317 if (evfd >= 0)
1318 close (evfd);
1319#endif
1320
1321 if (evpipe [0] >= 0)
1322 {
1323 close (evpipe [0]);
1324 close (evpipe [1]);
1325 }
1326 }
960 1327
961#if EV_USE_INOTIFY 1328#if EV_USE_INOTIFY
962 if (fs_fd >= 0) 1329 if (fs_fd >= 0)
963 close (fs_fd); 1330 close (fs_fd);
964#endif 1331#endif
… …
981#if EV_USE_SELECT 1348#if EV_USE_SELECT
982 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1349 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
983#endif 1350#endif
984 1351
985 for (i = NUMPRI; i--; ) 1352 for (i = NUMPRI; i--; )
1353 {
986 array_free (pending, [i]); 1354 array_free (pending, [i]);
1355#if EV_IDLE_ENABLE
1356 array_free (idle, [i]);
1357#endif
1358 }
1359
1360 ev_free (anfds); anfdmax = 0;
987 1361
988 /* have to use the microsoft-never-gets-it-right macro */ 1362 /* have to use the microsoft-never-gets-it-right macro */
989 array_free (fdchange, EMPTY0); 1363 array_free (fdchange, EMPTY);
990 array_free (timer, EMPTY0); 1364 array_free (timer, EMPTY);
991#if EV_PERIODIC_ENABLE 1365#if EV_PERIODIC_ENABLE
992 array_free (periodic, EMPTY0); 1366 array_free (periodic, EMPTY);
993#endif 1367#endif
1368#if EV_FORK_ENABLE
994 array_free (idle, EMPTY0); 1369 array_free (fork, EMPTY);
1370#endif
995 array_free (prepare, EMPTY0); 1371 array_free (prepare, EMPTY);
996 array_free (check, EMPTY0); 1372 array_free (check, EMPTY);
1373#if EV_ASYNC_ENABLE
1374 array_free (async, EMPTY);
1375#endif
997 1376
998 backend = 0; 1377 backend = 0;
999} 1378}
1000 1379
1380#if EV_USE_INOTIFY
1001void inline_size infy_fork (EV_P); 1381void inline_size infy_fork (EV_P);
1382#endif
1002 1383
1003void inline_size 1384void inline_size
1004loop_fork (EV_P) 1385loop_fork (EV_P)
1005{ 1386{
1006#if EV_USE_PORT 1387#if EV_USE_PORT
… …
1014#endif 1395#endif
1015#if EV_USE_INOTIFY 1396#if EV_USE_INOTIFY
1016 infy_fork (EV_A); 1397 infy_fork (EV_A);
1017#endif 1398#endif
1018 1399
1019 if (ev_is_active (&sigev)) 1400 if (ev_is_active (&pipeev))
1020 { 1401 {
1021 /* default loop */ 1402 /* this "locks" the handlers against writing to the pipe */
1403 /* while we modify the fd vars */
1404 gotsig = 1;
1405#if EV_ASYNC_ENABLE
1406 gotasync = 1;
1407#endif
1022 1408
1023 ev_ref (EV_A); 1409 ev_ref (EV_A);
1024 ev_io_stop (EV_A_ &sigev); 1410 ev_io_stop (EV_A_ &pipeev);
1411
1412#if EV_USE_EVENTFD
1413 if (evfd >= 0)
1414 close (evfd);
1415#endif
1416
1417 if (evpipe [0] >= 0)
1418 {
1025 close (sigpipe [0]); 1419 close (evpipe [0]);
1026 close (sigpipe [1]); 1420 close (evpipe [1]);
1421 }
1027 1422
1028 while (pipe (sigpipe))
1029 syserr ("(libev) error creating pipe");
1030
1031 siginit (EV_A); 1423 evpipe_init (EV_A);
1424 /* now iterate over everything, in case we missed something */
1425 pipecb (EV_A_ &pipeev, EV_READ);
1032 } 1426 }
1033 1427
1034 postfork = 0; 1428 postfork = 0;
1035} 1429}
1036 1430
… …
1058} 1452}
1059 1453
1060void 1454void
1061ev_loop_fork (EV_P) 1455ev_loop_fork (EV_P)
1062{ 1456{
1063 postfork = 1; 1457 postfork = 1; /* must be in line with ev_default_fork */
1064} 1458}
1065
1066#endif 1459#endif
1067 1460
1068#if EV_MULTIPLICITY 1461#if EV_MULTIPLICITY
1069struct ev_loop * 1462struct ev_loop *
1070ev_default_loop_init (unsigned int flags) 1463ev_default_loop_init (unsigned int flags)
1071#else 1464#else
1072int 1465int
1073ev_default_loop (unsigned int flags) 1466ev_default_loop (unsigned int flags)
1074#endif 1467#endif
1075{ 1468{
1076 if (sigpipe [0] == sigpipe [1])
1077 if (pipe (sigpipe))
1078 return 0;
1079
1080 if (!ev_default_loop_ptr) 1469 if (!ev_default_loop_ptr)
1081 { 1470 {
1082#if EV_MULTIPLICITY 1471#if EV_MULTIPLICITY
1083 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1472 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1084#else 1473#else
… …
1087 1476
1088 loop_init (EV_A_ flags); 1477 loop_init (EV_A_ flags);
1089 1478
1090 if (ev_backend (EV_A)) 1479 if (ev_backend (EV_A))
1091 { 1480 {
1092 siginit (EV_A);
1093
1094#ifndef _WIN32 1481#ifndef _WIN32
1095 ev_signal_init (&childev, childcb, SIGCHLD); 1482 ev_signal_init (&childev, childcb, SIGCHLD);
1096 ev_set_priority (&childev, EV_MAXPRI); 1483 ev_set_priority (&childev, EV_MAXPRI);
1097 ev_signal_start (EV_A_ &childev); 1484 ev_signal_start (EV_A_ &childev);
1098 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1485 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1115#ifndef _WIN32 1502#ifndef _WIN32
1116 ev_ref (EV_A); /* child watcher */ 1503 ev_ref (EV_A); /* child watcher */
1117 ev_signal_stop (EV_A_ &childev); 1504 ev_signal_stop (EV_A_ &childev);
1118#endif 1505#endif
1119 1506
1120 ev_ref (EV_A); /* signal watcher */
1121 ev_io_stop (EV_A_ &sigev);
1122
1123 close (sigpipe [0]); sigpipe [0] = 0;
1124 close (sigpipe [1]); sigpipe [1] = 0;
1125
1126 loop_destroy (EV_A); 1507 loop_destroy (EV_A);
1127} 1508}
1128 1509
1129void 1510void
1130ev_default_fork (void) 1511ev_default_fork (void)
… …
1132#if EV_MULTIPLICITY 1513#if EV_MULTIPLICITY
1133 struct ev_loop *loop = ev_default_loop_ptr; 1514 struct ev_loop *loop = ev_default_loop_ptr;
1134#endif 1515#endif
1135 1516
1136 if (backend) 1517 if (backend)
1137 postfork = 1; 1518 postfork = 1; /* must be in line with ev_loop_fork */
1138} 1519}
1139 1520
1140/*****************************************************************************/ 1521/*****************************************************************************/
1141 1522
1142int inline_size 1523void
1143any_pending (EV_P) 1524ev_invoke (EV_P_ void *w, int revents)
1144{ 1525{
1145 int pri; 1526 EV_CB_INVOKE ((W)w, revents);
1146
1147 for (pri = NUMPRI; pri--; )
1148 if (pendingcnt [pri])
1149 return 1;
1150
1151 return 0;
1152} 1527}
1153 1528
1154void inline_speed 1529void inline_speed
1155call_pending (EV_P) 1530call_pending (EV_P)
1156{ 1531{
… …
1169 EV_CB_INVOKE (p->w, p->events); 1544 EV_CB_INVOKE (p->w, p->events);
1170 } 1545 }
1171 } 1546 }
1172} 1547}
1173 1548
1549#if EV_IDLE_ENABLE
1550void inline_size
1551idle_reify (EV_P)
1552{
1553 if (expect_false (idleall))
1554 {
1555 int pri;
1556
1557 for (pri = NUMPRI; pri--; )
1558 {
1559 if (pendingcnt [pri])
1560 break;
1561
1562 if (idlecnt [pri])
1563 {
1564 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1565 break;
1566 }
1567 }
1568 }
1569}
1570#endif
1571
1174void inline_size 1572void inline_size
1175timers_reify (EV_P) 1573timers_reify (EV_P)
1176{ 1574{
1177 while (timercnt && ((WT)timers [0])->at <= mn_now) 1575 while (timercnt && ev_at (timers [HEAP0]) <= mn_now)
1178 { 1576 {
1179 ev_timer *w = timers [0]; 1577 ev_timer *w = (ev_timer *)timers [HEAP0];
1180 1578
1181 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1579 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1182 1580
1183 /* first reschedule or stop timer */ 1581 /* first reschedule or stop timer */
1184 if (w->repeat) 1582 if (w->repeat)
1185 { 1583 {
1186 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1584 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1187 1585
1188 ((WT)w)->at += w->repeat; 1586 ev_at (w) += w->repeat;
1189 if (((WT)w)->at < mn_now) 1587 if (ev_at (w) < mn_now)
1190 ((WT)w)->at = mn_now; 1588 ev_at (w) = mn_now;
1191 1589
1192 downheap ((WT *)timers, timercnt, 0); 1590 downheap (timers, timercnt, HEAP0);
1193 } 1591 }
1194 else 1592 else
1195 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1593 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1196 1594
1197 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1595 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1200 1598
1201#if EV_PERIODIC_ENABLE 1599#if EV_PERIODIC_ENABLE
1202void inline_size 1600void inline_size
1203periodics_reify (EV_P) 1601periodics_reify (EV_P)
1204{ 1602{
1205 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1603 while (periodiccnt && ev_at (periodics [HEAP0]) <= ev_rt_now)
1206 { 1604 {
1207 ev_periodic *w = periodics [0]; 1605 ev_periodic *w = (ev_periodic *)periodics [HEAP0];
1208 1606
1209 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1607 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1210 1608
1211 /* first reschedule or stop timer */ 1609 /* first reschedule or stop timer */
1212 if (w->reschedule_cb) 1610 if (w->reschedule_cb)
1213 { 1611 {
1214 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1612 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1215 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1613 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now));
1216 downheap ((WT *)periodics, periodiccnt, 0); 1614 downheap (periodics, periodiccnt, 1);
1217 } 1615 }
1218 else if (w->interval) 1616 else if (w->interval)
1219 { 1617 {
1220 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1618 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1619 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval;
1221 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1620 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now));
1222 downheap ((WT *)periodics, periodiccnt, 0); 1621 downheap (periodics, periodiccnt, HEAP0);
1223 } 1622 }
1224 else 1623 else
1225 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1624 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1226 1625
1227 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1626 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1232periodics_reschedule (EV_P) 1631periodics_reschedule (EV_P)
1233{ 1632{
1234 int i; 1633 int i;
1235 1634
1236 /* adjust periodics after time jump */ 1635 /* adjust periodics after time jump */
1237 for (i = 0; i < periodiccnt; ++i) 1636 for (i = 1; i <= periodiccnt; ++i)
1238 { 1637 {
1239 ev_periodic *w = periodics [i]; 1638 ev_periodic *w = (ev_periodic *)periodics [i];
1240 1639
1241 if (w->reschedule_cb) 1640 if (w->reschedule_cb)
1242 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1641 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1243 else if (w->interval) 1642 else if (w->interval)
1244 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1643 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1245 } 1644 }
1246 1645
1247 /* now rebuild the heap */ 1646 /* now rebuild the heap */
1248 for (i = periodiccnt >> 1; i--; ) 1647 for (i = periodiccnt >> 1; --i; )
1249 downheap ((WT *)periodics, periodiccnt, i); 1648 downheap (periodics, periodiccnt, i + HEAP0);
1250} 1649}
1251#endif 1650#endif
1252 1651
1253int inline_size 1652void inline_speed
1254time_update_monotonic (EV_P) 1653time_update (EV_P_ ev_tstamp max_block)
1255{ 1654{
1655 int i;
1656
1657#if EV_USE_MONOTONIC
1658 if (expect_true (have_monotonic))
1659 {
1660 ev_tstamp odiff = rtmn_diff;
1661
1256 mn_now = get_clock (); 1662 mn_now = get_clock ();
1257 1663
1664 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1665 /* interpolate in the meantime */
1258 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1666 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1259 { 1667 {
1260 ev_rt_now = rtmn_diff + mn_now; 1668 ev_rt_now = rtmn_diff + mn_now;
1261 return 0; 1669 return;
1262 } 1670 }
1263 else 1671
1264 {
1265 now_floor = mn_now; 1672 now_floor = mn_now;
1266 ev_rt_now = ev_time (); 1673 ev_rt_now = ev_time ();
1267 return 1;
1268 }
1269}
1270 1674
1271void inline_size 1675 /* loop a few times, before making important decisions.
1272time_update (EV_P) 1676 * on the choice of "4": one iteration isn't enough,
1273{ 1677 * in case we get preempted during the calls to
1274 int i; 1678 * ev_time and get_clock. a second call is almost guaranteed
1275 1679 * to succeed in that case, though. and looping a few more times
1276#if EV_USE_MONOTONIC 1680 * doesn't hurt either as we only do this on time-jumps or
1277 if (expect_true (have_monotonic)) 1681 * in the unlikely event of having been preempted here.
1278 { 1682 */
1279 if (time_update_monotonic (EV_A)) 1683 for (i = 4; --i; )
1280 { 1684 {
1281 ev_tstamp odiff = rtmn_diff;
1282
1283 /* loop a few times, before making important decisions.
1284 * on the choice of "4": one iteration isn't enough,
1285 * in case we get preempted during the calls to
1286 * ev_time and get_clock. a second call is almost guaranteed
1287 * to succeed in that case, though. and looping a few more times
1288 * doesn't hurt either as we only do this on time-jumps or
1289 * in the unlikely event of having been preempted here.
1290 */
1291 for (i = 4; --i; )
1292 {
1293 rtmn_diff = ev_rt_now - mn_now; 1685 rtmn_diff = ev_rt_now - mn_now;
1294 1686
1295 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1687 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1296 return; /* all is well */ 1688 return; /* all is well */
1297 1689
1298 ev_rt_now = ev_time (); 1690 ev_rt_now = ev_time ();
1299 mn_now = get_clock (); 1691 mn_now = get_clock ();
1300 now_floor = mn_now; 1692 now_floor = mn_now;
1301 } 1693 }
1302 1694
1303# if EV_PERIODIC_ENABLE 1695# if EV_PERIODIC_ENABLE
1304 periodics_reschedule (EV_A); 1696 periodics_reschedule (EV_A);
1305# endif 1697# endif
1306 /* no timer adjustment, as the monotonic clock doesn't jump */ 1698 /* no timer adjustment, as the monotonic clock doesn't jump */
1307 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1699 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1308 }
1309 } 1700 }
1310 else 1701 else
1311#endif 1702#endif
1312 { 1703 {
1313 ev_rt_now = ev_time (); 1704 ev_rt_now = ev_time ();
1314 1705
1315 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1706 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1316 { 1707 {
1317#if EV_PERIODIC_ENABLE 1708#if EV_PERIODIC_ENABLE
1318 periodics_reschedule (EV_A); 1709 periodics_reschedule (EV_A);
1319#endif 1710#endif
1320
1321 /* adjust timers. this is easy, as the offset is the same for all of them */ 1711 /* adjust timers. this is easy, as the offset is the same for all of them */
1322 for (i = 0; i < timercnt; ++i) 1712 for (i = 1; i <= timercnt; ++i)
1323 ((WT)timers [i])->at += ev_rt_now - mn_now; 1713 ev_at (timers [i]) += ev_rt_now - mn_now;
1324 } 1714 }
1325 1715
1326 mn_now = ev_rt_now; 1716 mn_now = ev_rt_now;
1327 } 1717 }
1328} 1718}
… …
1342static int loop_done; 1732static int loop_done;
1343 1733
1344void 1734void
1345ev_loop (EV_P_ int flags) 1735ev_loop (EV_P_ int flags)
1346{ 1736{
1347 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1737 loop_done = EVUNLOOP_CANCEL;
1348 ? EVUNLOOP_ONE
1349 : EVUNLOOP_CANCEL;
1350 1738
1351 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1739 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1352 1740
1353 do 1741 do
1354 { 1742 {
… …
1369 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1757 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1370 call_pending (EV_A); 1758 call_pending (EV_A);
1371 } 1759 }
1372#endif 1760#endif
1373 1761
1374 /* queue check watchers (and execute them) */ 1762 /* queue prepare watchers (and execute them) */
1375 if (expect_false (preparecnt)) 1763 if (expect_false (preparecnt))
1376 { 1764 {
1377 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1765 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1378 call_pending (EV_A); 1766 call_pending (EV_A);
1379 } 1767 }
… …
1388 /* update fd-related kernel structures */ 1776 /* update fd-related kernel structures */
1389 fd_reify (EV_A); 1777 fd_reify (EV_A);
1390 1778
1391 /* calculate blocking time */ 1779 /* calculate blocking time */
1392 { 1780 {
1393 ev_tstamp block; 1781 ev_tstamp waittime = 0.;
1782 ev_tstamp sleeptime = 0.;
1394 1783
1395 if (expect_false (flags & EVLOOP_NONBLOCK || idlecnt || !activecnt)) 1784 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1396 block = 0.; /* do not block at all */
1397 else
1398 { 1785 {
1399 /* update time to cancel out callback processing overhead */ 1786 /* update time to cancel out callback processing overhead */
1400#if EV_USE_MONOTONIC
1401 if (expect_true (have_monotonic))
1402 time_update_monotonic (EV_A); 1787 time_update (EV_A_ 1e100);
1403 else
1404#endif
1405 {
1406 ev_rt_now = ev_time ();
1407 mn_now = ev_rt_now;
1408 }
1409 1788
1410 block = MAX_BLOCKTIME; 1789 waittime = MAX_BLOCKTIME;
1411 1790
1412 if (timercnt) 1791 if (timercnt)
1413 { 1792 {
1414 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1793 ev_tstamp to = ev_at (timers [HEAP0]) - mn_now + backend_fudge;
1415 if (block > to) block = to; 1794 if (waittime > to) waittime = to;
1416 } 1795 }
1417 1796
1418#if EV_PERIODIC_ENABLE 1797#if EV_PERIODIC_ENABLE
1419 if (periodiccnt) 1798 if (periodiccnt)
1420 { 1799 {
1421 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1800 ev_tstamp to = ev_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1422 if (block > to) block = to; 1801 if (waittime > to) waittime = to;
1423 } 1802 }
1424#endif 1803#endif
1425 1804
1426 if (expect_false (block < 0.)) block = 0.; 1805 if (expect_false (waittime < timeout_blocktime))
1806 waittime = timeout_blocktime;
1807
1808 sleeptime = waittime - backend_fudge;
1809
1810 if (expect_true (sleeptime > io_blocktime))
1811 sleeptime = io_blocktime;
1812
1813 if (sleeptime)
1814 {
1815 ev_sleep (sleeptime);
1816 waittime -= sleeptime;
1817 }
1427 } 1818 }
1428 1819
1429 ++loop_count; 1820 ++loop_count;
1430 backend_poll (EV_A_ block); 1821 backend_poll (EV_A_ waittime);
1822
1823 /* update ev_rt_now, do magic */
1824 time_update (EV_A_ waittime + sleeptime);
1431 } 1825 }
1432
1433 /* update ev_rt_now, do magic */
1434 time_update (EV_A);
1435 1826
1436 /* queue pending timers and reschedule them */ 1827 /* queue pending timers and reschedule them */
1437 timers_reify (EV_A); /* relative timers called last */ 1828 timers_reify (EV_A); /* relative timers called last */
1438#if EV_PERIODIC_ENABLE 1829#if EV_PERIODIC_ENABLE
1439 periodics_reify (EV_A); /* absolute timers called first */ 1830 periodics_reify (EV_A); /* absolute timers called first */
1440#endif 1831#endif
1441 1832
1833#if EV_IDLE_ENABLE
1442 /* queue idle watchers unless other events are pending */ 1834 /* queue idle watchers unless other events are pending */
1443 if (idlecnt && !any_pending (EV_A)) 1835 idle_reify (EV_A);
1444 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1836#endif
1445 1837
1446 /* queue check watchers, to be executed first */ 1838 /* queue check watchers, to be executed first */
1447 if (expect_false (checkcnt)) 1839 if (expect_false (checkcnt))
1448 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1840 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1449 1841
1450 call_pending (EV_A); 1842 call_pending (EV_A);
1451
1452 } 1843 }
1453 while (expect_true (activecnt && !loop_done)); 1844 while (expect_true (
1845 activecnt
1846 && !loop_done
1847 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1848 ));
1454 1849
1455 if (loop_done == EVUNLOOP_ONE) 1850 if (loop_done == EVUNLOOP_ONE)
1456 loop_done = EVUNLOOP_CANCEL; 1851 loop_done = EVUNLOOP_CANCEL;
1457} 1852}
1458 1853
… …
1485 head = &(*head)->next; 1880 head = &(*head)->next;
1486 } 1881 }
1487} 1882}
1488 1883
1489void inline_speed 1884void inline_speed
1490ev_clear_pending (EV_P_ W w) 1885clear_pending (EV_P_ W w)
1491{ 1886{
1492 if (w->pending) 1887 if (w->pending)
1493 { 1888 {
1494 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1889 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1495 w->pending = 0; 1890 w->pending = 0;
1496 } 1891 }
1497} 1892}
1498 1893
1894int
1895ev_clear_pending (EV_P_ void *w)
1896{
1897 W w_ = (W)w;
1898 int pending = w_->pending;
1899
1900 if (expect_true (pending))
1901 {
1902 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1903 w_->pending = 0;
1904 p->w = 0;
1905 return p->events;
1906 }
1907 else
1908 return 0;
1909}
1910
1911void inline_size
1912pri_adjust (EV_P_ W w)
1913{
1914 int pri = w->priority;
1915 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
1916 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
1917 w->priority = pri;
1918}
1919
1499void inline_speed 1920void inline_speed
1500ev_start (EV_P_ W w, int active) 1921ev_start (EV_P_ W w, int active)
1501{ 1922{
1502 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1923 pri_adjust (EV_A_ w);
1503 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1504
1505 w->active = active; 1924 w->active = active;
1506 ev_ref (EV_A); 1925 ev_ref (EV_A);
1507} 1926}
1508 1927
1509void inline_size 1928void inline_size
… …
1513 w->active = 0; 1932 w->active = 0;
1514} 1933}
1515 1934
1516/*****************************************************************************/ 1935/*****************************************************************************/
1517 1936
1518void 1937void noinline
1519ev_io_start (EV_P_ ev_io *w) 1938ev_io_start (EV_P_ ev_io *w)
1520{ 1939{
1521 int fd = w->fd; 1940 int fd = w->fd;
1522 1941
1523 if (expect_false (ev_is_active (w))) 1942 if (expect_false (ev_is_active (w)))
… …
1525 1944
1526 assert (("ev_io_start called with negative fd", fd >= 0)); 1945 assert (("ev_io_start called with negative fd", fd >= 0));
1527 1946
1528 ev_start (EV_A_ (W)w, 1); 1947 ev_start (EV_A_ (W)w, 1);
1529 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1948 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1530 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1949 wlist_add (&anfds[fd].head, (WL)w);
1531 1950
1532 fd_change (EV_A_ fd); 1951 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1952 w->events &= ~EV_IOFDSET;
1533} 1953}
1534 1954
1535void 1955void noinline
1536ev_io_stop (EV_P_ ev_io *w) 1956ev_io_stop (EV_P_ ev_io *w)
1537{ 1957{
1538 ev_clear_pending (EV_A_ (W)w); 1958 clear_pending (EV_A_ (W)w);
1539 if (expect_false (!ev_is_active (w))) 1959 if (expect_false (!ev_is_active (w)))
1540 return; 1960 return;
1541 1961
1542 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1962 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1543 1963
1544 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1964 wlist_del (&anfds[w->fd].head, (WL)w);
1545 ev_stop (EV_A_ (W)w); 1965 ev_stop (EV_A_ (W)w);
1546 1966
1547 fd_change (EV_A_ w->fd); 1967 fd_change (EV_A_ w->fd, 1);
1548} 1968}
1549 1969
1550void 1970void noinline
1551ev_timer_start (EV_P_ ev_timer *w) 1971ev_timer_start (EV_P_ ev_timer *w)
1552{ 1972{
1553 if (expect_false (ev_is_active (w))) 1973 if (expect_false (ev_is_active (w)))
1554 return; 1974 return;
1555 1975
1556 ((WT)w)->at += mn_now; 1976 ev_at (w) += mn_now;
1557 1977
1558 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1978 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1559 1979
1560 ev_start (EV_A_ (W)w, ++timercnt); 1980 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1);
1561 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1981 array_needsize (WT, timers, timermax, timercnt + HEAP0, EMPTY2);
1562 timers [timercnt - 1] = w; 1982 timers [ev_active (w)] = (WT)w;
1563 upheap ((WT *)timers, timercnt - 1); 1983 upheap (timers, ev_active (w));
1564 1984
1565 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1985 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/
1566} 1986}
1567 1987
1568void 1988void noinline
1569ev_timer_stop (EV_P_ ev_timer *w) 1989ev_timer_stop (EV_P_ ev_timer *w)
1570{ 1990{
1571 ev_clear_pending (EV_A_ (W)w); 1991 clear_pending (EV_A_ (W)w);
1572 if (expect_false (!ev_is_active (w))) 1992 if (expect_false (!ev_is_active (w)))
1573 return; 1993 return;
1574 1994
1575 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1576
1577 { 1995 {
1578 int active = ((W)w)->active; 1996 int active = ev_active (w);
1579 1997
1998 assert (("internal timer heap corruption", timers [active] == (WT)w));
1999
1580 if (expect_true (--active < --timercnt)) 2000 if (expect_true (active < timercnt + HEAP0 - 1))
1581 { 2001 {
1582 timers [active] = timers [timercnt]; 2002 timers [active] = timers [timercnt + HEAP0 - 1];
1583 adjustheap ((WT *)timers, timercnt, active); 2003 adjustheap (timers, timercnt, active);
1584 } 2004 }
2005
2006 --timercnt;
1585 } 2007 }
1586 2008
1587 ((WT)w)->at -= mn_now; 2009 ev_at (w) -= mn_now;
1588 2010
1589 ev_stop (EV_A_ (W)w); 2011 ev_stop (EV_A_ (W)w);
1590} 2012}
1591 2013
1592void 2014void noinline
1593ev_timer_again (EV_P_ ev_timer *w) 2015ev_timer_again (EV_P_ ev_timer *w)
1594{ 2016{
1595 if (ev_is_active (w)) 2017 if (ev_is_active (w))
1596 { 2018 {
1597 if (w->repeat) 2019 if (w->repeat)
1598 { 2020 {
1599 ((WT)w)->at = mn_now + w->repeat; 2021 ev_at (w) = mn_now + w->repeat;
1600 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 2022 adjustheap (timers, timercnt, ev_active (w));
1601 } 2023 }
1602 else 2024 else
1603 ev_timer_stop (EV_A_ w); 2025 ev_timer_stop (EV_A_ w);
1604 } 2026 }
1605 else if (w->repeat) 2027 else if (w->repeat)
1606 { 2028 {
1607 w->at = w->repeat; 2029 ev_at (w) = w->repeat;
1608 ev_timer_start (EV_A_ w); 2030 ev_timer_start (EV_A_ w);
1609 } 2031 }
1610} 2032}
1611 2033
1612#if EV_PERIODIC_ENABLE 2034#if EV_PERIODIC_ENABLE
1613void 2035void noinline
1614ev_periodic_start (EV_P_ ev_periodic *w) 2036ev_periodic_start (EV_P_ ev_periodic *w)
1615{ 2037{
1616 if (expect_false (ev_is_active (w))) 2038 if (expect_false (ev_is_active (w)))
1617 return; 2039 return;
1618 2040
1619 if (w->reschedule_cb) 2041 if (w->reschedule_cb)
1620 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 2042 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1621 else if (w->interval) 2043 else if (w->interval)
1622 { 2044 {
1623 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2045 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1624 /* this formula differs from the one in periodic_reify because we do not always round up */ 2046 /* this formula differs from the one in periodic_reify because we do not always round up */
1625 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 2047 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1626 } 2048 }
2049 else
2050 ev_at (w) = w->offset;
1627 2051
1628 ev_start (EV_A_ (W)w, ++periodiccnt); 2052 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1);
1629 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 2053 array_needsize (WT, periodics, periodicmax, periodiccnt + HEAP0, EMPTY2);
1630 periodics [periodiccnt - 1] = w; 2054 periodics [ev_active (w)] = (WT)w;
1631 upheap ((WT *)periodics, periodiccnt - 1); 2055 upheap (periodics, ev_active (w));
1632 2056
1633 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 2057 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/
1634} 2058}
1635 2059
1636void 2060void noinline
1637ev_periodic_stop (EV_P_ ev_periodic *w) 2061ev_periodic_stop (EV_P_ ev_periodic *w)
1638{ 2062{
1639 ev_clear_pending (EV_A_ (W)w); 2063 clear_pending (EV_A_ (W)w);
1640 if (expect_false (!ev_is_active (w))) 2064 if (expect_false (!ev_is_active (w)))
1641 return; 2065 return;
1642 2066
1643 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1644
1645 { 2067 {
1646 int active = ((W)w)->active; 2068 int active = ev_active (w);
1647 2069
2070 assert (("internal periodic heap corruption", periodics [active] == (WT)w));
2071
1648 if (expect_true (--active < --periodiccnt)) 2072 if (expect_true (active < periodiccnt + HEAP0 - 1))
1649 { 2073 {
1650 periodics [active] = periodics [periodiccnt]; 2074 periodics [active] = periodics [periodiccnt + HEAP0 - 1];
1651 adjustheap ((WT *)periodics, periodiccnt, active); 2075 adjustheap (periodics, periodiccnt, active);
1652 } 2076 }
2077
2078 --periodiccnt;
1653 } 2079 }
1654 2080
1655 ev_stop (EV_A_ (W)w); 2081 ev_stop (EV_A_ (W)w);
1656} 2082}
1657 2083
1658void 2084void noinline
1659ev_periodic_again (EV_P_ ev_periodic *w) 2085ev_periodic_again (EV_P_ ev_periodic *w)
1660{ 2086{
1661 /* TODO: use adjustheap and recalculation */ 2087 /* TODO: use adjustheap and recalculation */
1662 ev_periodic_stop (EV_A_ w); 2088 ev_periodic_stop (EV_A_ w);
1663 ev_periodic_start (EV_A_ w); 2089 ev_periodic_start (EV_A_ w);
… …
1666 2092
1667#ifndef SA_RESTART 2093#ifndef SA_RESTART
1668# define SA_RESTART 0 2094# define SA_RESTART 0
1669#endif 2095#endif
1670 2096
1671void 2097void noinline
1672ev_signal_start (EV_P_ ev_signal *w) 2098ev_signal_start (EV_P_ ev_signal *w)
1673{ 2099{
1674#if EV_MULTIPLICITY 2100#if EV_MULTIPLICITY
1675 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2101 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1676#endif 2102#endif
1677 if (expect_false (ev_is_active (w))) 2103 if (expect_false (ev_is_active (w)))
1678 return; 2104 return;
1679 2105
1680 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2106 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1681 2107
2108 evpipe_init (EV_A);
2109
2110 {
2111#ifndef _WIN32
2112 sigset_t full, prev;
2113 sigfillset (&full);
2114 sigprocmask (SIG_SETMASK, &full, &prev);
2115#endif
2116
2117 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
2118
2119#ifndef _WIN32
2120 sigprocmask (SIG_SETMASK, &prev, 0);
2121#endif
2122 }
2123
1682 ev_start (EV_A_ (W)w, 1); 2124 ev_start (EV_A_ (W)w, 1);
1683 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1684 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 2125 wlist_add (&signals [w->signum - 1].head, (WL)w);
1685 2126
1686 if (!((WL)w)->next) 2127 if (!((WL)w)->next)
1687 { 2128 {
1688#if _WIN32 2129#if _WIN32
1689 signal (w->signum, sighandler); 2130 signal (w->signum, ev_sighandler);
1690#else 2131#else
1691 struct sigaction sa; 2132 struct sigaction sa;
1692 sa.sa_handler = sighandler; 2133 sa.sa_handler = ev_sighandler;
1693 sigfillset (&sa.sa_mask); 2134 sigfillset (&sa.sa_mask);
1694 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2135 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1695 sigaction (w->signum, &sa, 0); 2136 sigaction (w->signum, &sa, 0);
1696#endif 2137#endif
1697 } 2138 }
1698} 2139}
1699 2140
1700void 2141void noinline
1701ev_signal_stop (EV_P_ ev_signal *w) 2142ev_signal_stop (EV_P_ ev_signal *w)
1702{ 2143{
1703 ev_clear_pending (EV_A_ (W)w); 2144 clear_pending (EV_A_ (W)w);
1704 if (expect_false (!ev_is_active (w))) 2145 if (expect_false (!ev_is_active (w)))
1705 return; 2146 return;
1706 2147
1707 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 2148 wlist_del (&signals [w->signum - 1].head, (WL)w);
1708 ev_stop (EV_A_ (W)w); 2149 ev_stop (EV_A_ (W)w);
1709 2150
1710 if (!signals [w->signum - 1].head) 2151 if (!signals [w->signum - 1].head)
1711 signal (w->signum, SIG_DFL); 2152 signal (w->signum, SIG_DFL);
1712} 2153}
… …
1719#endif 2160#endif
1720 if (expect_false (ev_is_active (w))) 2161 if (expect_false (ev_is_active (w)))
1721 return; 2162 return;
1722 2163
1723 ev_start (EV_A_ (W)w, 1); 2164 ev_start (EV_A_ (W)w, 1);
1724 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2165 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1725} 2166}
1726 2167
1727void 2168void
1728ev_child_stop (EV_P_ ev_child *w) 2169ev_child_stop (EV_P_ ev_child *w)
1729{ 2170{
1730 ev_clear_pending (EV_A_ (W)w); 2171 clear_pending (EV_A_ (W)w);
1731 if (expect_false (!ev_is_active (w))) 2172 if (expect_false (!ev_is_active (w)))
1732 return; 2173 return;
1733 2174
1734 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2175 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1735 ev_stop (EV_A_ (W)w); 2176 ev_stop (EV_A_ (W)w);
1736} 2177}
1737 2178
1738#if EV_STAT_ENABLE 2179#if EV_STAT_ENABLE
1739 2180
… …
1758 if (w->wd < 0) 2199 if (w->wd < 0)
1759 { 2200 {
1760 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2201 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1761 2202
1762 /* monitor some parent directory for speedup hints */ 2203 /* monitor some parent directory for speedup hints */
2204 /* note that exceeding the hardcoded limit is not a correctness issue, */
2205 /* but an efficiency issue only */
1763 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2206 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1764 { 2207 {
1765 char path [4096]; 2208 char path [4096];
1766 strcpy (path, w->path); 2209 strcpy (path, w->path);
1767 2210
… …
1971} 2414}
1972 2415
1973void 2416void
1974ev_stat_stop (EV_P_ ev_stat *w) 2417ev_stat_stop (EV_P_ ev_stat *w)
1975{ 2418{
1976 ev_clear_pending (EV_A_ (W)w); 2419 clear_pending (EV_A_ (W)w);
1977 if (expect_false (!ev_is_active (w))) 2420 if (expect_false (!ev_is_active (w)))
1978 return; 2421 return;
1979 2422
1980#if EV_USE_INOTIFY 2423#if EV_USE_INOTIFY
1981 infy_del (EV_A_ w); 2424 infy_del (EV_A_ w);
… …
1984 2427
1985 ev_stop (EV_A_ (W)w); 2428 ev_stop (EV_A_ (W)w);
1986} 2429}
1987#endif 2430#endif
1988 2431
2432#if EV_IDLE_ENABLE
1989void 2433void
1990ev_idle_start (EV_P_ ev_idle *w) 2434ev_idle_start (EV_P_ ev_idle *w)
1991{ 2435{
1992 if (expect_false (ev_is_active (w))) 2436 if (expect_false (ev_is_active (w)))
1993 return; 2437 return;
1994 2438
2439 pri_adjust (EV_A_ (W)w);
2440
2441 {
2442 int active = ++idlecnt [ABSPRI (w)];
2443
2444 ++idleall;
1995 ev_start (EV_A_ (W)w, ++idlecnt); 2445 ev_start (EV_A_ (W)w, active);
2446
1996 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2447 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
1997 idles [idlecnt - 1] = w; 2448 idles [ABSPRI (w)][active - 1] = w;
2449 }
1998} 2450}
1999 2451
2000void 2452void
2001ev_idle_stop (EV_P_ ev_idle *w) 2453ev_idle_stop (EV_P_ ev_idle *w)
2002{ 2454{
2003 ev_clear_pending (EV_A_ (W)w); 2455 clear_pending (EV_A_ (W)w);
2004 if (expect_false (!ev_is_active (w))) 2456 if (expect_false (!ev_is_active (w)))
2005 return; 2457 return;
2006 2458
2007 { 2459 {
2008 int active = ((W)w)->active; 2460 int active = ev_active (w);
2009 idles [active - 1] = idles [--idlecnt]; 2461
2010 ((W)idles [active - 1])->active = active; 2462 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2463 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2464
2465 ev_stop (EV_A_ (W)w);
2466 --idleall;
2011 } 2467 }
2012
2013 ev_stop (EV_A_ (W)w);
2014} 2468}
2469#endif
2015 2470
2016void 2471void
2017ev_prepare_start (EV_P_ ev_prepare *w) 2472ev_prepare_start (EV_P_ ev_prepare *w)
2018{ 2473{
2019 if (expect_false (ev_is_active (w))) 2474 if (expect_false (ev_is_active (w)))
… …
2025} 2480}
2026 2481
2027void 2482void
2028ev_prepare_stop (EV_P_ ev_prepare *w) 2483ev_prepare_stop (EV_P_ ev_prepare *w)
2029{ 2484{
2030 ev_clear_pending (EV_A_ (W)w); 2485 clear_pending (EV_A_ (W)w);
2031 if (expect_false (!ev_is_active (w))) 2486 if (expect_false (!ev_is_active (w)))
2032 return; 2487 return;
2033 2488
2034 { 2489 {
2035 int active = ((W)w)->active; 2490 int active = ev_active (w);
2491
2036 prepares [active - 1] = prepares [--preparecnt]; 2492 prepares [active - 1] = prepares [--preparecnt];
2037 ((W)prepares [active - 1])->active = active; 2493 ev_active (prepares [active - 1]) = active;
2038 } 2494 }
2039 2495
2040 ev_stop (EV_A_ (W)w); 2496 ev_stop (EV_A_ (W)w);
2041} 2497}
2042 2498
… …
2052} 2508}
2053 2509
2054void 2510void
2055ev_check_stop (EV_P_ ev_check *w) 2511ev_check_stop (EV_P_ ev_check *w)
2056{ 2512{
2057 ev_clear_pending (EV_A_ (W)w); 2513 clear_pending (EV_A_ (W)w);
2058 if (expect_false (!ev_is_active (w))) 2514 if (expect_false (!ev_is_active (w)))
2059 return; 2515 return;
2060 2516
2061 { 2517 {
2062 int active = ((W)w)->active; 2518 int active = ev_active (w);
2519
2063 checks [active - 1] = checks [--checkcnt]; 2520 checks [active - 1] = checks [--checkcnt];
2064 ((W)checks [active - 1])->active = active; 2521 ev_active (checks [active - 1]) = active;
2065 } 2522 }
2066 2523
2067 ev_stop (EV_A_ (W)w); 2524 ev_stop (EV_A_ (W)w);
2068} 2525}
2069 2526
2070#if EV_EMBED_ENABLE 2527#if EV_EMBED_ENABLE
2071void noinline 2528void noinline
2072ev_embed_sweep (EV_P_ ev_embed *w) 2529ev_embed_sweep (EV_P_ ev_embed *w)
2073{ 2530{
2074 ev_loop (w->loop, EVLOOP_NONBLOCK); 2531 ev_loop (w->other, EVLOOP_NONBLOCK);
2075} 2532}
2076 2533
2077static void 2534static void
2078embed_cb (EV_P_ ev_io *io, int revents) 2535embed_io_cb (EV_P_ ev_io *io, int revents)
2079{ 2536{
2080 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2537 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2081 2538
2082 if (ev_cb (w)) 2539 if (ev_cb (w))
2083 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2540 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2084 else 2541 else
2085 ev_embed_sweep (loop, w); 2542 ev_loop (w->other, EVLOOP_NONBLOCK);
2086} 2543}
2544
2545static void
2546embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2547{
2548 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2549
2550 {
2551 struct ev_loop *loop = w->other;
2552
2553 while (fdchangecnt)
2554 {
2555 fd_reify (EV_A);
2556 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2557 }
2558 }
2559}
2560
2561#if 0
2562static void
2563embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2564{
2565 ev_idle_stop (EV_A_ idle);
2566}
2567#endif
2087 2568
2088void 2569void
2089ev_embed_start (EV_P_ ev_embed *w) 2570ev_embed_start (EV_P_ ev_embed *w)
2090{ 2571{
2091 if (expect_false (ev_is_active (w))) 2572 if (expect_false (ev_is_active (w)))
2092 return; 2573 return;
2093 2574
2094 { 2575 {
2095 struct ev_loop *loop = w->loop; 2576 struct ev_loop *loop = w->other;
2096 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2577 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2097 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2578 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2098 } 2579 }
2099 2580
2100 ev_set_priority (&w->io, ev_priority (w)); 2581 ev_set_priority (&w->io, ev_priority (w));
2101 ev_io_start (EV_A_ &w->io); 2582 ev_io_start (EV_A_ &w->io);
2102 2583
2584 ev_prepare_init (&w->prepare, embed_prepare_cb);
2585 ev_set_priority (&w->prepare, EV_MINPRI);
2586 ev_prepare_start (EV_A_ &w->prepare);
2587
2588 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2589
2103 ev_start (EV_A_ (W)w, 1); 2590 ev_start (EV_A_ (W)w, 1);
2104} 2591}
2105 2592
2106void 2593void
2107ev_embed_stop (EV_P_ ev_embed *w) 2594ev_embed_stop (EV_P_ ev_embed *w)
2108{ 2595{
2109 ev_clear_pending (EV_A_ (W)w); 2596 clear_pending (EV_A_ (W)w);
2110 if (expect_false (!ev_is_active (w))) 2597 if (expect_false (!ev_is_active (w)))
2111 return; 2598 return;
2112 2599
2113 ev_io_stop (EV_A_ &w->io); 2600 ev_io_stop (EV_A_ &w->io);
2601 ev_prepare_stop (EV_A_ &w->prepare);
2114 2602
2115 ev_stop (EV_A_ (W)w); 2603 ev_stop (EV_A_ (W)w);
2116} 2604}
2117#endif 2605#endif
2118 2606
… …
2129} 2617}
2130 2618
2131void 2619void
2132ev_fork_stop (EV_P_ ev_fork *w) 2620ev_fork_stop (EV_P_ ev_fork *w)
2133{ 2621{
2134 ev_clear_pending (EV_A_ (W)w); 2622 clear_pending (EV_A_ (W)w);
2135 if (expect_false (!ev_is_active (w))) 2623 if (expect_false (!ev_is_active (w)))
2136 return; 2624 return;
2137 2625
2138 { 2626 {
2139 int active = ((W)w)->active; 2627 int active = ev_active (w);
2628
2140 forks [active - 1] = forks [--forkcnt]; 2629 forks [active - 1] = forks [--forkcnt];
2141 ((W)forks [active - 1])->active = active; 2630 ev_active (forks [active - 1]) = active;
2142 } 2631 }
2143 2632
2144 ev_stop (EV_A_ (W)w); 2633 ev_stop (EV_A_ (W)w);
2634}
2635#endif
2636
2637#if EV_ASYNC_ENABLE
2638void
2639ev_async_start (EV_P_ ev_async *w)
2640{
2641 if (expect_false (ev_is_active (w)))
2642 return;
2643
2644 evpipe_init (EV_A);
2645
2646 ev_start (EV_A_ (W)w, ++asynccnt);
2647 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2648 asyncs [asynccnt - 1] = w;
2649}
2650
2651void
2652ev_async_stop (EV_P_ ev_async *w)
2653{
2654 clear_pending (EV_A_ (W)w);
2655 if (expect_false (!ev_is_active (w)))
2656 return;
2657
2658 {
2659 int active = ev_active (w);
2660
2661 asyncs [active - 1] = asyncs [--asynccnt];
2662 ev_active (asyncs [active - 1]) = active;
2663 }
2664
2665 ev_stop (EV_A_ (W)w);
2666}
2667
2668void
2669ev_async_send (EV_P_ ev_async *w)
2670{
2671 w->sent = 1;
2672 evpipe_write (EV_A_ &gotasync);
2145} 2673}
2146#endif 2674#endif
2147 2675
2148/*****************************************************************************/ 2676/*****************************************************************************/
2149 2677
… …
2207 ev_timer_set (&once->to, timeout, 0.); 2735 ev_timer_set (&once->to, timeout, 0.);
2208 ev_timer_start (EV_A_ &once->to); 2736 ev_timer_start (EV_A_ &once->to);
2209 } 2737 }
2210} 2738}
2211 2739
2740#if EV_MULTIPLICITY
2741 #include "ev_wrap.h"
2742#endif
2743
2212#ifdef __cplusplus 2744#ifdef __cplusplus
2213} 2745}
2214#endif 2746#endif
2215 2747

Diff Legend

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