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

Comparing libev/ev.c (file contents):
Revision 1.168 by root, Sat Dec 8 14:12:07 2007 UTC vs.
Revision 1.229 by root, Fri May 2 08:08:45 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)w)->priority - EV_MINPRI) 321#define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
247 322
248#define EMPTY /* required for microsofts broken pseudo-c compiler */ 323#define EMPTY /* required for microsofts broken pseudo-c compiler */
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
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
401int inline_size 525int inline_size
402array_nextsize (int elem, int cur, int cnt) 526array_nextsize (int elem, int cur, int cnt)
403{ 527{
404 int ncur = cur + 1; 528 int ncur = cur + 1;
405 529
417 } 541 }
418 542
419 return ncur; 543 return ncur;
420} 544}
421 545
422inline_speed void * 546static noinline void *
423array_realloc (int elem, void *base, int *cur, int cnt) 547array_realloc (int elem, void *base, int *cur, int cnt)
424{ 548{
425 *cur = array_nextsize (elem, *cur, cnt); 549 *cur = array_nextsize (elem, *cur, cnt);
426 return ev_realloc (base, elem * *cur); 550 return ev_realloc (base, elem * *cur);
427} 551}
452 576
453void noinline 577void noinline
454ev_feed_event (EV_P_ void *w, int revents) 578ev_feed_event (EV_P_ void *w, int revents)
455{ 579{
456 W w_ = (W)w; 580 W w_ = (W)w;
581 int pri = ABSPRI (w_);
457 582
458 if (expect_false (w_->pending)) 583 if (expect_false (w_->pending))
584 pendings [pri][w_->pending - 1].events |= revents;
585 else
459 { 586 {
587 w_->pending = ++pendingcnt [pri];
588 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
589 pendings [pri][w_->pending - 1].w = w_;
460 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 590 pendings [pri][w_->pending - 1].events = revents;
461 return;
462 } 591 }
463
464 w_->pending = ++pendingcnt [ABSPRI (w_)];
465 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
466 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
467 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
468} 592}
469 593
470void inline_size 594void inline_speed
471queue_events (EV_P_ W *events, int eventcnt, int type) 595queue_events (EV_P_ W *events, int eventcnt, int type)
472{ 596{
473 int i; 597 int i;
474 598
475 for (i = 0; i < eventcnt; ++i) 599 for (i = 0; i < eventcnt; ++i)
522 { 646 {
523 int fd = fdchanges [i]; 647 int fd = fdchanges [i];
524 ANFD *anfd = anfds + fd; 648 ANFD *anfd = anfds + fd;
525 ev_io *w; 649 ev_io *w;
526 650
527 int events = 0; 651 unsigned char events = 0;
528 652
529 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 653 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
530 events |= w->events; 654 events |= (unsigned char)w->events;
531 655
532#if EV_SELECT_IS_WINSOCKET 656#if EV_SELECT_IS_WINSOCKET
533 if (events) 657 if (events)
534 { 658 {
535 unsigned long argp; 659 unsigned long argp;
660 #ifdef EV_FD_TO_WIN32_HANDLE
661 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
662 #else
536 anfd->handle = _get_osfhandle (fd); 663 anfd->handle = _get_osfhandle (fd);
664 #endif
537 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 665 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
538 } 666 }
539#endif 667#endif
540 668
669 {
670 unsigned char o_events = anfd->events;
671 unsigned char o_reify = anfd->reify;
672
541 anfd->reify = 0; 673 anfd->reify = 0;
542
543 backend_modify (EV_A_ fd, anfd->events, events);
544 anfd->events = events; 674 anfd->events = events;
675
676 if (o_events != events || o_reify & EV_IOFDSET)
677 backend_modify (EV_A_ fd, o_events, events);
678 }
545 } 679 }
546 680
547 fdchangecnt = 0; 681 fdchangecnt = 0;
548} 682}
549 683
550void inline_size 684void inline_size
551fd_change (EV_P_ int fd) 685fd_change (EV_P_ int fd, int flags)
552{ 686{
553 if (expect_false (anfds [fd].reify)) 687 unsigned char reify = anfds [fd].reify;
554 return;
555
556 anfds [fd].reify = 1; 688 anfds [fd].reify |= flags;
557 689
690 if (expect_true (!reify))
691 {
558 ++fdchangecnt; 692 ++fdchangecnt;
559 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 693 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
560 fdchanges [fdchangecnt - 1] = fd; 694 fdchanges [fdchangecnt - 1] = fd;
695 }
561} 696}
562 697
563void inline_speed 698void inline_speed
564fd_kill (EV_P_ int fd) 699fd_kill (EV_P_ int fd)
565{ 700{
616 751
617 for (fd = 0; fd < anfdmax; ++fd) 752 for (fd = 0; fd < anfdmax; ++fd)
618 if (anfds [fd].events) 753 if (anfds [fd].events)
619 { 754 {
620 anfds [fd].events = 0; 755 anfds [fd].events = 0;
621 fd_change (EV_A_ fd); 756 fd_change (EV_A_ fd, EV_IOFDSET | 1);
622 } 757 }
623} 758}
624 759
625/*****************************************************************************/ 760/*****************************************************************************/
626 761
762/* towards the root */
627void inline_speed 763void inline_speed
628upheap (WT *heap, int k) 764upheap (WT *heap, int k)
629{ 765{
630 WT w = heap [k]; 766 WT w = heap [k];
631 767
632 while (k && heap [k >> 1]->at > w->at) 768 for (;;)
633 { 769 {
770 int p = k >> 1;
771
772 /* maybe we could use a dummy element at heap [0]? */
773 if (!p || heap [p]->at <= w->at)
774 break;
775
634 heap [k] = heap [k >> 1]; 776 heap [k] = heap [p];
635 ((W)heap [k])->active = k + 1; 777 ((W)heap [k])->active = k;
636 k >>= 1; 778 k = p;
637 } 779 }
638 780
639 heap [k] = w; 781 heap [k] = w;
640 ((W)heap [k])->active = k + 1; 782 ((W)heap [k])->active = k;
641
642} 783}
643 784
785/* away from the root */
644void inline_speed 786void inline_speed
645downheap (WT *heap, int N, int k) 787downheap (WT *heap, int N, int k)
646{ 788{
647 WT w = heap [k]; 789 WT w = heap [k];
648 790
649 while (k < (N >> 1)) 791 for (;;)
650 { 792 {
651 int j = k << 1; 793 int c = k << 1;
652 794
653 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 795 if (c > N)
654 ++j;
655
656 if (w->at <= heap [j]->at)
657 break; 796 break;
658 797
798 c += c < N && heap [c]->at > heap [c + 1]->at
799 ? 1 : 0;
800
801 if (w->at <= heap [c]->at)
802 break;
803
659 heap [k] = heap [j]; 804 heap [k] = heap [c];
660 ((W)heap [k])->active = k + 1; 805 ((W)heap [k])->active = k;
806
661 k = j; 807 k = c;
662 } 808 }
663 809
664 heap [k] = w; 810 heap [k] = w;
665 ((W)heap [k])->active = k + 1; 811 ((W)heap [k])->active = k;
666} 812}
667 813
668void inline_size 814void inline_size
669adjustheap (WT *heap, int N, int k) 815adjustheap (WT *heap, int N, int k)
670{ 816{
675/*****************************************************************************/ 821/*****************************************************************************/
676 822
677typedef struct 823typedef struct
678{ 824{
679 WL head; 825 WL head;
680 sig_atomic_t volatile gotsig; 826 EV_ATOMIC_T gotsig;
681} ANSIG; 827} ANSIG;
682 828
683static ANSIG *signals; 829static ANSIG *signals;
684static int signalmax; 830static int signalmax;
685 831
686static int sigpipe [2]; 832static EV_ATOMIC_T gotsig;
687static sig_atomic_t volatile gotsig;
688static ev_io sigev;
689 833
690void inline_size 834void inline_size
691signals_init (ANSIG *base, int count) 835signals_init (ANSIG *base, int count)
692{ 836{
693 while (count--) 837 while (count--)
697 841
698 ++base; 842 ++base;
699 } 843 }
700} 844}
701 845
702static void 846/*****************************************************************************/
703sighandler (int signum)
704{
705#if _WIN32
706 signal (signum, sighandler);
707#endif
708 847
709 signals [signum - 1].gotsig = 1;
710
711 if (!gotsig)
712 {
713 int old_errno = errno;
714 gotsig = 1;
715 write (sigpipe [1], &signum, 1);
716 errno = old_errno;
717 }
718}
719
720void noinline
721ev_feed_signal_event (EV_P_ int signum)
722{
723 WL w;
724
725#if EV_MULTIPLICITY
726 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
727#endif
728
729 --signum;
730
731 if (signum < 0 || signum >= signalmax)
732 return;
733
734 signals [signum].gotsig = 0;
735
736 for (w = signals [signum].head; w; w = w->next)
737 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
738}
739
740static void
741sigcb (EV_P_ ev_io *iow, int revents)
742{
743 int signum;
744
745 read (sigpipe [0], &revents, 1);
746 gotsig = 0;
747
748 for (signum = signalmax; signum--; )
749 if (signals [signum].gotsig)
750 ev_feed_signal_event (EV_A_ signum + 1);
751}
752
753void inline_size 848void inline_speed
754fd_intern (int fd) 849fd_intern (int fd)
755{ 850{
756#ifdef _WIN32 851#ifdef _WIN32
757 int arg = 1; 852 int arg = 1;
758 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 853 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
761 fcntl (fd, F_SETFL, O_NONBLOCK); 856 fcntl (fd, F_SETFL, O_NONBLOCK);
762#endif 857#endif
763} 858}
764 859
765static void noinline 860static void noinline
766siginit (EV_P) 861evpipe_init (EV_P)
767{ 862{
863 if (!ev_is_active (&pipeev))
864 {
865#if EV_USE_EVENTFD
866 if ((evfd = eventfd (0, 0)) >= 0)
867 {
868 evpipe [0] = -1;
869 fd_intern (evfd);
870 ev_io_set (&pipeev, evfd, EV_READ);
871 }
872 else
873#endif
874 {
875 while (pipe (evpipe))
876 syserr ("(libev) error creating signal/async pipe");
877
768 fd_intern (sigpipe [0]); 878 fd_intern (evpipe [0]);
769 fd_intern (sigpipe [1]); 879 fd_intern (evpipe [1]);
880 ev_io_set (&pipeev, evpipe [0], EV_READ);
881 }
770 882
771 ev_io_set (&sigev, sigpipe [0], EV_READ);
772 ev_io_start (EV_A_ &sigev); 883 ev_io_start (EV_A_ &pipeev);
773 ev_unref (EV_A); /* child watcher should not keep loop alive */ 884 ev_unref (EV_A); /* watcher should not keep loop alive */
885 }
886}
887
888void inline_size
889evpipe_write (EV_P_ EV_ATOMIC_T *flag)
890{
891 if (!*flag)
892 {
893 int old_errno = errno; /* save errno because write might clobber it */
894
895 *flag = 1;
896
897#if EV_USE_EVENTFD
898 if (evfd >= 0)
899 {
900 uint64_t counter = 1;
901 write (evfd, &counter, sizeof (uint64_t));
902 }
903 else
904#endif
905 write (evpipe [1], &old_errno, 1);
906
907 errno = old_errno;
908 }
909}
910
911static void
912pipecb (EV_P_ ev_io *iow, int revents)
913{
914#if EV_USE_EVENTFD
915 if (evfd >= 0)
916 {
917 uint64_t counter = 1;
918 read (evfd, &counter, sizeof (uint64_t));
919 }
920 else
921#endif
922 {
923 char dummy;
924 read (evpipe [0], &dummy, 1);
925 }
926
927 if (gotsig && ev_is_default_loop (EV_A))
928 {
929 int signum;
930 gotsig = 0;
931
932 for (signum = signalmax; signum--; )
933 if (signals [signum].gotsig)
934 ev_feed_signal_event (EV_A_ signum + 1);
935 }
936
937#if EV_ASYNC_ENABLE
938 if (gotasync)
939 {
940 int i;
941 gotasync = 0;
942
943 for (i = asynccnt; i--; )
944 if (asyncs [i]->sent)
945 {
946 asyncs [i]->sent = 0;
947 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
948 }
949 }
950#endif
774} 951}
775 952
776/*****************************************************************************/ 953/*****************************************************************************/
777 954
955static void
956ev_sighandler (int signum)
957{
958#if EV_MULTIPLICITY
959 struct ev_loop *loop = &default_loop_struct;
960#endif
961
962#if _WIN32
963 signal (signum, ev_sighandler);
964#endif
965
966 signals [signum - 1].gotsig = 1;
967 evpipe_write (EV_A_ &gotsig);
968}
969
970void noinline
971ev_feed_signal_event (EV_P_ int signum)
972{
973 WL w;
974
975#if EV_MULTIPLICITY
976 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
977#endif
978
979 --signum;
980
981 if (signum < 0 || signum >= signalmax)
982 return;
983
984 signals [signum].gotsig = 0;
985
986 for (w = signals [signum].head; w; w = w->next)
987 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
988}
989
990/*****************************************************************************/
991
778static ev_child *childs [EV_PID_HASHSIZE]; 992static WL childs [EV_PID_HASHSIZE];
779 993
780#ifndef _WIN32 994#ifndef _WIN32
781 995
782static ev_signal childev; 996static ev_signal childev;
783 997
998#ifndef WIFCONTINUED
999# define WIFCONTINUED(status) 0
1000#endif
1001
784void inline_speed 1002void inline_speed
785child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1003child_reap (EV_P_ int chain, int pid, int status)
786{ 1004{
787 ev_child *w; 1005 ev_child *w;
1006 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
788 1007
789 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1008 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1009 {
790 if (w->pid == pid || !w->pid) 1010 if ((w->pid == pid || !w->pid)
1011 && (!traced || (w->flags & 1)))
791 { 1012 {
792 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 1013 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
793 w->rpid = pid; 1014 w->rpid = pid;
794 w->rstatus = status; 1015 w->rstatus = status;
795 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1016 ev_feed_event (EV_A_ (W)w, EV_CHILD);
796 } 1017 }
1018 }
797} 1019}
798 1020
799#ifndef WCONTINUED 1021#ifndef WCONTINUED
800# define WCONTINUED 0 1022# define WCONTINUED 0
801#endif 1023#endif
810 if (!WCONTINUED 1032 if (!WCONTINUED
811 || errno != EINVAL 1033 || errno != EINVAL
812 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1034 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
813 return; 1035 return;
814 1036
815 /* make sure we are called again until all childs have been reaped */ 1037 /* make sure we are called again until all children have been reaped */
816 /* we need to do it this way so that the callback gets called before we continue */ 1038 /* we need to do it this way so that the callback gets called before we continue */
817 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1039 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
818 1040
819 child_reap (EV_A_ sw, pid, pid, status); 1041 child_reap (EV_A_ pid, pid, status);
820 if (EV_PID_HASHSIZE > 1) 1042 if (EV_PID_HASHSIZE > 1)
821 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1043 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
822} 1044}
823 1045
824#endif 1046#endif
825 1047
826/*****************************************************************************/ 1048/*****************************************************************************/
898} 1120}
899 1121
900unsigned int 1122unsigned int
901ev_embeddable_backends (void) 1123ev_embeddable_backends (void)
902{ 1124{
903 return EVBACKEND_EPOLL 1125 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
904 | EVBACKEND_KQUEUE 1126
905 | EVBACKEND_PORT; 1127 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1128 /* please fix it and tell me how to detect the fix */
1129 flags &= ~EVBACKEND_EPOLL;
1130
1131 return flags;
906} 1132}
907 1133
908unsigned int 1134unsigned int
909ev_backend (EV_P) 1135ev_backend (EV_P)
910{ 1136{
913 1139
914unsigned int 1140unsigned int
915ev_loop_count (EV_P) 1141ev_loop_count (EV_P)
916{ 1142{
917 return loop_count; 1143 return loop_count;
1144}
1145
1146void
1147ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1148{
1149 io_blocktime = interval;
1150}
1151
1152void
1153ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1154{
1155 timeout_blocktime = interval;
918} 1156}
919 1157
920static void noinline 1158static void noinline
921loop_init (EV_P_ unsigned int flags) 1159loop_init (EV_P_ unsigned int flags)
922{ 1160{
928 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1166 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
929 have_monotonic = 1; 1167 have_monotonic = 1;
930 } 1168 }
931#endif 1169#endif
932 1170
933 ev_rt_now = ev_time (); 1171 ev_rt_now = ev_time ();
934 mn_now = get_clock (); 1172 mn_now = get_clock ();
935 now_floor = mn_now; 1173 now_floor = mn_now;
936 rtmn_diff = ev_rt_now - mn_now; 1174 rtmn_diff = ev_rt_now - mn_now;
1175
1176 io_blocktime = 0.;
1177 timeout_blocktime = 0.;
1178 backend = 0;
1179 backend_fd = -1;
1180 gotasync = 0;
1181#if EV_USE_INOTIFY
1182 fs_fd = -2;
1183#endif
937 1184
938 /* pid check not overridable via env */ 1185 /* pid check not overridable via env */
939#ifndef _WIN32 1186#ifndef _WIN32
940 if (flags & EVFLAG_FORKCHECK) 1187 if (flags & EVFLAG_FORKCHECK)
941 curpid = getpid (); 1188 curpid = getpid ();
944 if (!(flags & EVFLAG_NOENV) 1191 if (!(flags & EVFLAG_NOENV)
945 && !enable_secure () 1192 && !enable_secure ()
946 && getenv ("LIBEV_FLAGS")) 1193 && getenv ("LIBEV_FLAGS"))
947 flags = atoi (getenv ("LIBEV_FLAGS")); 1194 flags = atoi (getenv ("LIBEV_FLAGS"));
948 1195
949 if (!(flags & 0x0000ffffUL)) 1196 if (!(flags & 0x0000ffffU))
950 flags |= ev_recommended_backends (); 1197 flags |= ev_recommended_backends ();
951
952 backend = 0;
953 backend_fd = -1;
954#if EV_USE_INOTIFY
955 fs_fd = -2;
956#endif
957 1198
958#if EV_USE_PORT 1199#if EV_USE_PORT
959 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1200 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
960#endif 1201#endif
961#if EV_USE_KQUEUE 1202#if EV_USE_KQUEUE
969#endif 1210#endif
970#if EV_USE_SELECT 1211#if EV_USE_SELECT
971 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1212 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
972#endif 1213#endif
973 1214
974 ev_init (&sigev, sigcb); 1215 ev_init (&pipeev, pipecb);
975 ev_set_priority (&sigev, EV_MAXPRI); 1216 ev_set_priority (&pipeev, EV_MAXPRI);
976 } 1217 }
977} 1218}
978 1219
979static void noinline 1220static void noinline
980loop_destroy (EV_P) 1221loop_destroy (EV_P)
981{ 1222{
982 int i; 1223 int i;
1224
1225 if (ev_is_active (&pipeev))
1226 {
1227 ev_ref (EV_A); /* signal watcher */
1228 ev_io_stop (EV_A_ &pipeev);
1229
1230#if EV_USE_EVENTFD
1231 if (evfd >= 0)
1232 close (evfd);
1233#endif
1234
1235 if (evpipe [0] >= 0)
1236 {
1237 close (evpipe [0]);
1238 close (evpipe [1]);
1239 }
1240 }
983 1241
984#if EV_USE_INOTIFY 1242#if EV_USE_INOTIFY
985 if (fs_fd >= 0) 1243 if (fs_fd >= 0)
986 close (fs_fd); 1244 close (fs_fd);
987#endif 1245#endif
1010 array_free (pending, [i]); 1268 array_free (pending, [i]);
1011#if EV_IDLE_ENABLE 1269#if EV_IDLE_ENABLE
1012 array_free (idle, [i]); 1270 array_free (idle, [i]);
1013#endif 1271#endif
1014 } 1272 }
1273
1274 ev_free (anfds); anfdmax = 0;
1015 1275
1016 /* have to use the microsoft-never-gets-it-right macro */ 1276 /* have to use the microsoft-never-gets-it-right macro */
1017 array_free (fdchange, EMPTY); 1277 array_free (fdchange, EMPTY);
1018 array_free (timer, EMPTY); 1278 array_free (timer, EMPTY);
1019#if EV_PERIODIC_ENABLE 1279#if EV_PERIODIC_ENABLE
1020 array_free (periodic, EMPTY); 1280 array_free (periodic, EMPTY);
1021#endif 1281#endif
1282#if EV_FORK_ENABLE
1283 array_free (fork, EMPTY);
1284#endif
1022 array_free (prepare, EMPTY); 1285 array_free (prepare, EMPTY);
1023 array_free (check, EMPTY); 1286 array_free (check, EMPTY);
1287#if EV_ASYNC_ENABLE
1288 array_free (async, EMPTY);
1289#endif
1024 1290
1025 backend = 0; 1291 backend = 0;
1026} 1292}
1027 1293
1294#if EV_USE_INOTIFY
1028void inline_size infy_fork (EV_P); 1295void inline_size infy_fork (EV_P);
1296#endif
1029 1297
1030void inline_size 1298void inline_size
1031loop_fork (EV_P) 1299loop_fork (EV_P)
1032{ 1300{
1033#if EV_USE_PORT 1301#if EV_USE_PORT
1041#endif 1309#endif
1042#if EV_USE_INOTIFY 1310#if EV_USE_INOTIFY
1043 infy_fork (EV_A); 1311 infy_fork (EV_A);
1044#endif 1312#endif
1045 1313
1046 if (ev_is_active (&sigev)) 1314 if (ev_is_active (&pipeev))
1047 { 1315 {
1048 /* default loop */ 1316 /* this "locks" the handlers against writing to the pipe */
1317 /* while we modify the fd vars */
1318 gotsig = 1;
1319#if EV_ASYNC_ENABLE
1320 gotasync = 1;
1321#endif
1049 1322
1050 ev_ref (EV_A); 1323 ev_ref (EV_A);
1051 ev_io_stop (EV_A_ &sigev); 1324 ev_io_stop (EV_A_ &pipeev);
1325
1326#if EV_USE_EVENTFD
1327 if (evfd >= 0)
1328 close (evfd);
1329#endif
1330
1331 if (evpipe [0] >= 0)
1332 {
1052 close (sigpipe [0]); 1333 close (evpipe [0]);
1053 close (sigpipe [1]); 1334 close (evpipe [1]);
1335 }
1054 1336
1055 while (pipe (sigpipe))
1056 syserr ("(libev) error creating pipe");
1057
1058 siginit (EV_A); 1337 evpipe_init (EV_A);
1338 /* now iterate over everything, in case we missed something */
1339 pipecb (EV_A_ &pipeev, EV_READ);
1059 } 1340 }
1060 1341
1061 postfork = 0; 1342 postfork = 0;
1062} 1343}
1063 1344
1085} 1366}
1086 1367
1087void 1368void
1088ev_loop_fork (EV_P) 1369ev_loop_fork (EV_P)
1089{ 1370{
1090 postfork = 1; 1371 postfork = 1; /* must be in line with ev_default_fork */
1091} 1372}
1092 1373
1093#endif 1374#endif
1094 1375
1095#if EV_MULTIPLICITY 1376#if EV_MULTIPLICITY
1098#else 1379#else
1099int 1380int
1100ev_default_loop (unsigned int flags) 1381ev_default_loop (unsigned int flags)
1101#endif 1382#endif
1102{ 1383{
1103 if (sigpipe [0] == sigpipe [1])
1104 if (pipe (sigpipe))
1105 return 0;
1106
1107 if (!ev_default_loop_ptr) 1384 if (!ev_default_loop_ptr)
1108 { 1385 {
1109#if EV_MULTIPLICITY 1386#if EV_MULTIPLICITY
1110 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1387 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1111#else 1388#else
1114 1391
1115 loop_init (EV_A_ flags); 1392 loop_init (EV_A_ flags);
1116 1393
1117 if (ev_backend (EV_A)) 1394 if (ev_backend (EV_A))
1118 { 1395 {
1119 siginit (EV_A);
1120
1121#ifndef _WIN32 1396#ifndef _WIN32
1122 ev_signal_init (&childev, childcb, SIGCHLD); 1397 ev_signal_init (&childev, childcb, SIGCHLD);
1123 ev_set_priority (&childev, EV_MAXPRI); 1398 ev_set_priority (&childev, EV_MAXPRI);
1124 ev_signal_start (EV_A_ &childev); 1399 ev_signal_start (EV_A_ &childev);
1125 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1400 ev_unref (EV_A); /* child watcher should not keep loop alive */
1142#ifndef _WIN32 1417#ifndef _WIN32
1143 ev_ref (EV_A); /* child watcher */ 1418 ev_ref (EV_A); /* child watcher */
1144 ev_signal_stop (EV_A_ &childev); 1419 ev_signal_stop (EV_A_ &childev);
1145#endif 1420#endif
1146 1421
1147 ev_ref (EV_A); /* signal watcher */
1148 ev_io_stop (EV_A_ &sigev);
1149
1150 close (sigpipe [0]); sigpipe [0] = 0;
1151 close (sigpipe [1]); sigpipe [1] = 0;
1152
1153 loop_destroy (EV_A); 1422 loop_destroy (EV_A);
1154} 1423}
1155 1424
1156void 1425void
1157ev_default_fork (void) 1426ev_default_fork (void)
1159#if EV_MULTIPLICITY 1428#if EV_MULTIPLICITY
1160 struct ev_loop *loop = ev_default_loop_ptr; 1429 struct ev_loop *loop = ev_default_loop_ptr;
1161#endif 1430#endif
1162 1431
1163 if (backend) 1432 if (backend)
1164 postfork = 1; 1433 postfork = 1; /* must be in line with ev_loop_fork */
1165} 1434}
1166 1435
1167/*****************************************************************************/ 1436/*****************************************************************************/
1168 1437
1169void 1438void
1193} 1462}
1194 1463
1195void inline_size 1464void inline_size
1196timers_reify (EV_P) 1465timers_reify (EV_P)
1197{ 1466{
1198 while (timercnt && ((WT)timers [0])->at <= mn_now) 1467 while (timercnt && ev_at (timers [1]) <= mn_now)
1199 { 1468 {
1200 ev_timer *w = timers [0]; 1469 ev_timer *w = (ev_timer *)timers [1];
1201 1470
1202 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1471 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1203 1472
1204 /* first reschedule or stop timer */ 1473 /* first reschedule or stop timer */
1205 if (w->repeat) 1474 if (w->repeat)
1206 { 1475 {
1207 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1476 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1208 1477
1209 ((WT)w)->at += w->repeat; 1478 ev_at (w) += w->repeat;
1210 if (((WT)w)->at < mn_now) 1479 if (ev_at (w) < mn_now)
1211 ((WT)w)->at = mn_now; 1480 ev_at (w) = mn_now;
1212 1481
1213 downheap ((WT *)timers, timercnt, 0); 1482 downheap (timers, timercnt, 1);
1214 } 1483 }
1215 else 1484 else
1216 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1485 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1217 1486
1218 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1487 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1221 1490
1222#if EV_PERIODIC_ENABLE 1491#if EV_PERIODIC_ENABLE
1223void inline_size 1492void inline_size
1224periodics_reify (EV_P) 1493periodics_reify (EV_P)
1225{ 1494{
1226 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1495 while (periodiccnt && ev_at (periodics [1]) <= ev_rt_now)
1227 { 1496 {
1228 ev_periodic *w = periodics [0]; 1497 ev_periodic *w = (ev_periodic *)periodics [1];
1229 1498
1230 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1499 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1231 1500
1232 /* first reschedule or stop timer */ 1501 /* first reschedule or stop timer */
1233 if (w->reschedule_cb) 1502 if (w->reschedule_cb)
1234 { 1503 {
1235 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1504 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1236 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1505 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now));
1237 downheap ((WT *)periodics, periodiccnt, 0); 1506 downheap (periodics, periodiccnt, 1);
1238 } 1507 }
1239 else if (w->interval) 1508 else if (w->interval)
1240 { 1509 {
1241 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1510 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1511 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval;
1242 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1512 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now));
1243 downheap ((WT *)periodics, periodiccnt, 0); 1513 downheap (periodics, periodiccnt, 1);
1244 } 1514 }
1245 else 1515 else
1246 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1516 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1247 1517
1248 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1518 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1255 int i; 1525 int i;
1256 1526
1257 /* adjust periodics after time jump */ 1527 /* adjust periodics after time jump */
1258 for (i = 0; i < periodiccnt; ++i) 1528 for (i = 0; i < periodiccnt; ++i)
1259 { 1529 {
1260 ev_periodic *w = periodics [i]; 1530 ev_periodic *w = (ev_periodic *)periodics [i];
1261 1531
1262 if (w->reschedule_cb) 1532 if (w->reschedule_cb)
1263 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1533 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1264 else if (w->interval) 1534 else if (w->interval)
1265 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1535 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1266 } 1536 }
1267 1537
1268 /* now rebuild the heap */ 1538 /* now rebuild the heap */
1269 for (i = periodiccnt >> 1; i--; ) 1539 for (i = periodiccnt >> 1; i--; )
1270 downheap ((WT *)periodics, periodiccnt, i); 1540 downheap (periodics, periodiccnt, i);
1271} 1541}
1272#endif 1542#endif
1273 1543
1274#if EV_IDLE_ENABLE 1544#if EV_IDLE_ENABLE
1275void inline_size 1545void inline_size
1292 } 1562 }
1293 } 1563 }
1294} 1564}
1295#endif 1565#endif
1296 1566
1297int inline_size 1567void inline_speed
1298time_update_monotonic (EV_P) 1568time_update (EV_P_ ev_tstamp max_block)
1299{ 1569{
1570 int i;
1571
1572#if EV_USE_MONOTONIC
1573 if (expect_true (have_monotonic))
1574 {
1575 ev_tstamp odiff = rtmn_diff;
1576
1300 mn_now = get_clock (); 1577 mn_now = get_clock ();
1301 1578
1579 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1580 /* interpolate in the meantime */
1302 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1581 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1303 { 1582 {
1304 ev_rt_now = rtmn_diff + mn_now; 1583 ev_rt_now = rtmn_diff + mn_now;
1305 return 0; 1584 return;
1306 } 1585 }
1307 else 1586
1308 {
1309 now_floor = mn_now; 1587 now_floor = mn_now;
1310 ev_rt_now = ev_time (); 1588 ev_rt_now = ev_time ();
1311 return 1;
1312 }
1313}
1314 1589
1315void inline_size 1590 /* loop a few times, before making important decisions.
1316time_update (EV_P) 1591 * on the choice of "4": one iteration isn't enough,
1317{ 1592 * in case we get preempted during the calls to
1318 int i; 1593 * ev_time and get_clock. a second call is almost guaranteed
1319 1594 * to succeed in that case, though. and looping a few more times
1320#if EV_USE_MONOTONIC 1595 * doesn't hurt either as we only do this on time-jumps or
1321 if (expect_true (have_monotonic)) 1596 * in the unlikely event of having been preempted here.
1322 { 1597 */
1323 if (time_update_monotonic (EV_A)) 1598 for (i = 4; --i; )
1324 { 1599 {
1325 ev_tstamp odiff = rtmn_diff;
1326
1327 /* loop a few times, before making important decisions.
1328 * on the choice of "4": one iteration isn't enough,
1329 * in case we get preempted during the calls to
1330 * ev_time and get_clock. a second call is almost guaranteed
1331 * to succeed in that case, though. and looping a few more times
1332 * doesn't hurt either as we only do this on time-jumps or
1333 * in the unlikely event of having been preempted here.
1334 */
1335 for (i = 4; --i; )
1336 {
1337 rtmn_diff = ev_rt_now - mn_now; 1600 rtmn_diff = ev_rt_now - mn_now;
1338 1601
1339 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1602 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1340 return; /* all is well */ 1603 return; /* all is well */
1341 1604
1342 ev_rt_now = ev_time (); 1605 ev_rt_now = ev_time ();
1343 mn_now = get_clock (); 1606 mn_now = get_clock ();
1344 now_floor = mn_now; 1607 now_floor = mn_now;
1345 } 1608 }
1346 1609
1347# if EV_PERIODIC_ENABLE 1610# if EV_PERIODIC_ENABLE
1348 periodics_reschedule (EV_A); 1611 periodics_reschedule (EV_A);
1349# endif 1612# endif
1350 /* no timer adjustment, as the monotonic clock doesn't jump */ 1613 /* no timer adjustment, as the monotonic clock doesn't jump */
1351 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1614 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1352 }
1353 } 1615 }
1354 else 1616 else
1355#endif 1617#endif
1356 { 1618 {
1357 ev_rt_now = ev_time (); 1619 ev_rt_now = ev_time ();
1358 1620
1359 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1621 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1360 { 1622 {
1361#if EV_PERIODIC_ENABLE 1623#if EV_PERIODIC_ENABLE
1362 periodics_reschedule (EV_A); 1624 periodics_reschedule (EV_A);
1363#endif 1625#endif
1364
1365 /* adjust timers. this is easy, as the offset is the same for all of them */ 1626 /* adjust timers. this is easy, as the offset is the same for all of them */
1366 for (i = 0; i < timercnt; ++i) 1627 for (i = 1; i <= timercnt; ++i)
1367 ((WT)timers [i])->at += ev_rt_now - mn_now; 1628 ev_at (timers [i]) += ev_rt_now - mn_now;
1368 } 1629 }
1369 1630
1370 mn_now = ev_rt_now; 1631 mn_now = ev_rt_now;
1371 } 1632 }
1372} 1633}
1386static int loop_done; 1647static int loop_done;
1387 1648
1388void 1649void
1389ev_loop (EV_P_ int flags) 1650ev_loop (EV_P_ int flags)
1390{ 1651{
1391 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1652 loop_done = EVUNLOOP_CANCEL;
1392 ? EVUNLOOP_ONE
1393 : EVUNLOOP_CANCEL;
1394 1653
1395 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1654 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1396 1655
1397 do 1656 do
1398 { 1657 {
1413 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1672 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1414 call_pending (EV_A); 1673 call_pending (EV_A);
1415 } 1674 }
1416#endif 1675#endif
1417 1676
1418 /* queue check watchers (and execute them) */ 1677 /* queue prepare watchers (and execute them) */
1419 if (expect_false (preparecnt)) 1678 if (expect_false (preparecnt))
1420 { 1679 {
1421 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1680 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1422 call_pending (EV_A); 1681 call_pending (EV_A);
1423 } 1682 }
1432 /* update fd-related kernel structures */ 1691 /* update fd-related kernel structures */
1433 fd_reify (EV_A); 1692 fd_reify (EV_A);
1434 1693
1435 /* calculate blocking time */ 1694 /* calculate blocking time */
1436 { 1695 {
1437 ev_tstamp block; 1696 ev_tstamp waittime = 0.;
1697 ev_tstamp sleeptime = 0.;
1438 1698
1439 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1699 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1440 block = 0.; /* do not block at all */
1441 else
1442 { 1700 {
1443 /* update time to cancel out callback processing overhead */ 1701 /* update time to cancel out callback processing overhead */
1444#if EV_USE_MONOTONIC
1445 if (expect_true (have_monotonic))
1446 time_update_monotonic (EV_A); 1702 time_update (EV_A_ 1e100);
1447 else
1448#endif
1449 {
1450 ev_rt_now = ev_time ();
1451 mn_now = ev_rt_now;
1452 }
1453 1703
1454 block = MAX_BLOCKTIME; 1704 waittime = MAX_BLOCKTIME;
1455 1705
1456 if (timercnt) 1706 if (timercnt)
1457 { 1707 {
1458 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1708 ev_tstamp to = ev_at (timers [1]) - mn_now + backend_fudge;
1459 if (block > to) block = to; 1709 if (waittime > to) waittime = to;
1460 } 1710 }
1461 1711
1462#if EV_PERIODIC_ENABLE 1712#if EV_PERIODIC_ENABLE
1463 if (periodiccnt) 1713 if (periodiccnt)
1464 { 1714 {
1465 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1715 ev_tstamp to = ev_at (periodics [1]) - ev_rt_now + backend_fudge;
1466 if (block > to) block = to; 1716 if (waittime > to) waittime = to;
1467 } 1717 }
1468#endif 1718#endif
1469 1719
1470 if (expect_false (block < 0.)) block = 0.; 1720 if (expect_false (waittime < timeout_blocktime))
1721 waittime = timeout_blocktime;
1722
1723 sleeptime = waittime - backend_fudge;
1724
1725 if (expect_true (sleeptime > io_blocktime))
1726 sleeptime = io_blocktime;
1727
1728 if (sleeptime)
1729 {
1730 ev_sleep (sleeptime);
1731 waittime -= sleeptime;
1732 }
1471 } 1733 }
1472 1734
1473 ++loop_count; 1735 ++loop_count;
1474 backend_poll (EV_A_ block); 1736 backend_poll (EV_A_ waittime);
1737
1738 /* update ev_rt_now, do magic */
1739 time_update (EV_A_ waittime + sleeptime);
1475 } 1740 }
1476
1477 /* update ev_rt_now, do magic */
1478 time_update (EV_A);
1479 1741
1480 /* queue pending timers and reschedule them */ 1742 /* queue pending timers and reschedule them */
1481 timers_reify (EV_A); /* relative timers called last */ 1743 timers_reify (EV_A); /* relative timers called last */
1482#if EV_PERIODIC_ENABLE 1744#if EV_PERIODIC_ENABLE
1483 periodics_reify (EV_A); /* absolute timers called first */ 1745 periodics_reify (EV_A); /* absolute timers called first */
1491 /* queue check watchers, to be executed first */ 1753 /* queue check watchers, to be executed first */
1492 if (expect_false (checkcnt)) 1754 if (expect_false (checkcnt))
1493 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1755 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1494 1756
1495 call_pending (EV_A); 1757 call_pending (EV_A);
1496
1497 } 1758 }
1498 while (expect_true (activecnt && !loop_done)); 1759 while (expect_true (
1760 activecnt
1761 && !loop_done
1762 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1763 ));
1499 1764
1500 if (loop_done == EVUNLOOP_ONE) 1765 if (loop_done == EVUNLOOP_ONE)
1501 loop_done = EVUNLOOP_CANCEL; 1766 loop_done = EVUNLOOP_CANCEL;
1502} 1767}
1503 1768
1545ev_clear_pending (EV_P_ void *w) 1810ev_clear_pending (EV_P_ void *w)
1546{ 1811{
1547 W w_ = (W)w; 1812 W w_ = (W)w;
1548 int pending = w_->pending; 1813 int pending = w_->pending;
1549 1814
1550 if (!pending) 1815 if (expect_true (pending))
1816 {
1817 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1818 w_->pending = 0;
1819 p->w = 0;
1820 return p->events;
1821 }
1822 else
1551 return 0; 1823 return 0;
1552
1553 w_->pending = 0;
1554 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1555 p->w = 0;
1556
1557 return p->events;
1558} 1824}
1559 1825
1560void inline_size 1826void inline_size
1561pri_adjust (EV_P_ W w) 1827pri_adjust (EV_P_ W w)
1562{ 1828{
1581 w->active = 0; 1847 w->active = 0;
1582} 1848}
1583 1849
1584/*****************************************************************************/ 1850/*****************************************************************************/
1585 1851
1586void 1852void noinline
1587ev_io_start (EV_P_ ev_io *w) 1853ev_io_start (EV_P_ ev_io *w)
1588{ 1854{
1589 int fd = w->fd; 1855 int fd = w->fd;
1590 1856
1591 if (expect_false (ev_is_active (w))) 1857 if (expect_false (ev_is_active (w)))
1593 1859
1594 assert (("ev_io_start called with negative fd", fd >= 0)); 1860 assert (("ev_io_start called with negative fd", fd >= 0));
1595 1861
1596 ev_start (EV_A_ (W)w, 1); 1862 ev_start (EV_A_ (W)w, 1);
1597 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1863 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1598 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1864 wlist_add (&anfds[fd].head, (WL)w);
1599 1865
1600 fd_change (EV_A_ fd); 1866 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1867 w->events &= ~EV_IOFDSET;
1601} 1868}
1602 1869
1603void 1870void noinline
1604ev_io_stop (EV_P_ ev_io *w) 1871ev_io_stop (EV_P_ ev_io *w)
1605{ 1872{
1606 clear_pending (EV_A_ (W)w); 1873 clear_pending (EV_A_ (W)w);
1607 if (expect_false (!ev_is_active (w))) 1874 if (expect_false (!ev_is_active (w)))
1608 return; 1875 return;
1609 1876
1610 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1877 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1611 1878
1612 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1879 wlist_del (&anfds[w->fd].head, (WL)w);
1613 ev_stop (EV_A_ (W)w); 1880 ev_stop (EV_A_ (W)w);
1614 1881
1615 fd_change (EV_A_ w->fd); 1882 fd_change (EV_A_ w->fd, 1);
1616} 1883}
1617 1884
1618void 1885void noinline
1619ev_timer_start (EV_P_ ev_timer *w) 1886ev_timer_start (EV_P_ ev_timer *w)
1620{ 1887{
1621 if (expect_false (ev_is_active (w))) 1888 if (expect_false (ev_is_active (w)))
1622 return; 1889 return;
1623 1890
1624 ((WT)w)->at += mn_now; 1891 ev_at (w) += mn_now;
1625 1892
1626 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1893 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1627 1894
1628 ev_start (EV_A_ (W)w, ++timercnt); 1895 ev_start (EV_A_ (W)w, ++timercnt);
1629 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1896 array_needsize (WT, timers, timermax, timercnt + 1, EMPTY2);
1630 timers [timercnt - 1] = w; 1897 timers [timercnt] = (WT)w;
1631 upheap ((WT *)timers, timercnt - 1); 1898 upheap (timers, timercnt);
1632 1899
1633 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1900 /*assert (("internal timer heap corruption", timers [((W)w)->active] == w));*/
1634} 1901}
1635 1902
1636void 1903void noinline
1637ev_timer_stop (EV_P_ ev_timer *w) 1904ev_timer_stop (EV_P_ ev_timer *w)
1638{ 1905{
1639 clear_pending (EV_A_ (W)w); 1906 clear_pending (EV_A_ (W)w);
1640 if (expect_false (!ev_is_active (w))) 1907 if (expect_false (!ev_is_active (w)))
1641 return; 1908 return;
1642 1909
1643 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1910 assert (("internal timer heap corruption", timers [((W)w)->active] == (WT)w));
1644 1911
1645 { 1912 {
1646 int active = ((W)w)->active; 1913 int active = ((W)w)->active;
1647 1914
1648 if (expect_true (--active < --timercnt)) 1915 if (expect_true (active < timercnt))
1649 { 1916 {
1650 timers [active] = timers [timercnt]; 1917 timers [active] = timers [timercnt];
1651 adjustheap ((WT *)timers, timercnt, active); 1918 adjustheap (timers, timercnt, active);
1652 } 1919 }
1920
1921 --timercnt;
1653 } 1922 }
1654 1923
1655 ((WT)w)->at -= mn_now; 1924 ev_at (w) -= mn_now;
1656 1925
1657 ev_stop (EV_A_ (W)w); 1926 ev_stop (EV_A_ (W)w);
1658} 1927}
1659 1928
1660void 1929void noinline
1661ev_timer_again (EV_P_ ev_timer *w) 1930ev_timer_again (EV_P_ ev_timer *w)
1662{ 1931{
1663 if (ev_is_active (w)) 1932 if (ev_is_active (w))
1664 { 1933 {
1665 if (w->repeat) 1934 if (w->repeat)
1666 { 1935 {
1667 ((WT)w)->at = mn_now + w->repeat; 1936 ev_at (w) = mn_now + w->repeat;
1668 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1937 adjustheap (timers, timercnt, ((W)w)->active);
1669 } 1938 }
1670 else 1939 else
1671 ev_timer_stop (EV_A_ w); 1940 ev_timer_stop (EV_A_ w);
1672 } 1941 }
1673 else if (w->repeat) 1942 else if (w->repeat)
1674 { 1943 {
1675 w->at = w->repeat; 1944 ev_at (w) = w->repeat;
1676 ev_timer_start (EV_A_ w); 1945 ev_timer_start (EV_A_ w);
1677 } 1946 }
1678} 1947}
1679 1948
1680#if EV_PERIODIC_ENABLE 1949#if EV_PERIODIC_ENABLE
1681void 1950void noinline
1682ev_periodic_start (EV_P_ ev_periodic *w) 1951ev_periodic_start (EV_P_ ev_periodic *w)
1683{ 1952{
1684 if (expect_false (ev_is_active (w))) 1953 if (expect_false (ev_is_active (w)))
1685 return; 1954 return;
1686 1955
1687 if (w->reschedule_cb) 1956 if (w->reschedule_cb)
1688 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1957 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1689 else if (w->interval) 1958 else if (w->interval)
1690 { 1959 {
1691 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1960 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1692 /* this formula differs from the one in periodic_reify because we do not always round up */ 1961 /* this formula differs from the one in periodic_reify because we do not always round up */
1693 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1962 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1694 } 1963 }
1964 else
1965 ev_at (w) = w->offset;
1695 1966
1696 ev_start (EV_A_ (W)w, ++periodiccnt); 1967 ev_start (EV_A_ (W)w, ++periodiccnt);
1697 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1968 array_needsize (WT, periodics, periodicmax, periodiccnt + 1, EMPTY2);
1698 periodics [periodiccnt - 1] = w; 1969 periodics [periodiccnt] = (WT)w;
1699 upheap ((WT *)periodics, periodiccnt - 1); 1970 upheap (periodics, periodiccnt);
1700 1971
1701 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1972 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1702} 1973}
1703 1974
1704void 1975void noinline
1705ev_periodic_stop (EV_P_ ev_periodic *w) 1976ev_periodic_stop (EV_P_ ev_periodic *w)
1706{ 1977{
1707 clear_pending (EV_A_ (W)w); 1978 clear_pending (EV_A_ (W)w);
1708 if (expect_false (!ev_is_active (w))) 1979 if (expect_false (!ev_is_active (w)))
1709 return; 1980 return;
1710 1981
1711 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1982 assert (("internal periodic heap corruption", periodics [((W)w)->active] == (WT)w));
1712 1983
1713 { 1984 {
1714 int active = ((W)w)->active; 1985 int active = ((W)w)->active;
1715 1986
1716 if (expect_true (--active < --periodiccnt)) 1987 if (expect_true (active < periodiccnt))
1717 { 1988 {
1718 periodics [active] = periodics [periodiccnt]; 1989 periodics [active] = periodics [periodiccnt];
1719 adjustheap ((WT *)periodics, periodiccnt, active); 1990 adjustheap (periodics, periodiccnt, active);
1720 } 1991 }
1992
1993 --periodiccnt;
1721 } 1994 }
1722 1995
1723 ev_stop (EV_A_ (W)w); 1996 ev_stop (EV_A_ (W)w);
1724} 1997}
1725 1998
1726void 1999void noinline
1727ev_periodic_again (EV_P_ ev_periodic *w) 2000ev_periodic_again (EV_P_ ev_periodic *w)
1728{ 2001{
1729 /* TODO: use adjustheap and recalculation */ 2002 /* TODO: use adjustheap and recalculation */
1730 ev_periodic_stop (EV_A_ w); 2003 ev_periodic_stop (EV_A_ w);
1731 ev_periodic_start (EV_A_ w); 2004 ev_periodic_start (EV_A_ w);
1734 2007
1735#ifndef SA_RESTART 2008#ifndef SA_RESTART
1736# define SA_RESTART 0 2009# define SA_RESTART 0
1737#endif 2010#endif
1738 2011
1739void 2012void noinline
1740ev_signal_start (EV_P_ ev_signal *w) 2013ev_signal_start (EV_P_ ev_signal *w)
1741{ 2014{
1742#if EV_MULTIPLICITY 2015#if EV_MULTIPLICITY
1743 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2016 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1744#endif 2017#endif
1745 if (expect_false (ev_is_active (w))) 2018 if (expect_false (ev_is_active (w)))
1746 return; 2019 return;
1747 2020
1748 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2021 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1749 2022
2023 evpipe_init (EV_A);
2024
2025 {
2026#ifndef _WIN32
2027 sigset_t full, prev;
2028 sigfillset (&full);
2029 sigprocmask (SIG_SETMASK, &full, &prev);
2030#endif
2031
2032 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
2033
2034#ifndef _WIN32
2035 sigprocmask (SIG_SETMASK, &prev, 0);
2036#endif
2037 }
2038
1750 ev_start (EV_A_ (W)w, 1); 2039 ev_start (EV_A_ (W)w, 1);
1751 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1752 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 2040 wlist_add (&signals [w->signum - 1].head, (WL)w);
1753 2041
1754 if (!((WL)w)->next) 2042 if (!((WL)w)->next)
1755 { 2043 {
1756#if _WIN32 2044#if _WIN32
1757 signal (w->signum, sighandler); 2045 signal (w->signum, ev_sighandler);
1758#else 2046#else
1759 struct sigaction sa; 2047 struct sigaction sa;
1760 sa.sa_handler = sighandler; 2048 sa.sa_handler = ev_sighandler;
1761 sigfillset (&sa.sa_mask); 2049 sigfillset (&sa.sa_mask);
1762 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2050 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1763 sigaction (w->signum, &sa, 0); 2051 sigaction (w->signum, &sa, 0);
1764#endif 2052#endif
1765 } 2053 }
1766} 2054}
1767 2055
1768void 2056void noinline
1769ev_signal_stop (EV_P_ ev_signal *w) 2057ev_signal_stop (EV_P_ ev_signal *w)
1770{ 2058{
1771 clear_pending (EV_A_ (W)w); 2059 clear_pending (EV_A_ (W)w);
1772 if (expect_false (!ev_is_active (w))) 2060 if (expect_false (!ev_is_active (w)))
1773 return; 2061 return;
1774 2062
1775 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 2063 wlist_del (&signals [w->signum - 1].head, (WL)w);
1776 ev_stop (EV_A_ (W)w); 2064 ev_stop (EV_A_ (W)w);
1777 2065
1778 if (!signals [w->signum - 1].head) 2066 if (!signals [w->signum - 1].head)
1779 signal (w->signum, SIG_DFL); 2067 signal (w->signum, SIG_DFL);
1780} 2068}
1787#endif 2075#endif
1788 if (expect_false (ev_is_active (w))) 2076 if (expect_false (ev_is_active (w)))
1789 return; 2077 return;
1790 2078
1791 ev_start (EV_A_ (W)w, 1); 2079 ev_start (EV_A_ (W)w, 1);
1792 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2080 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1793} 2081}
1794 2082
1795void 2083void
1796ev_child_stop (EV_P_ ev_child *w) 2084ev_child_stop (EV_P_ ev_child *w)
1797{ 2085{
1798 clear_pending (EV_A_ (W)w); 2086 clear_pending (EV_A_ (W)w);
1799 if (expect_false (!ev_is_active (w))) 2087 if (expect_false (!ev_is_active (w)))
1800 return; 2088 return;
1801 2089
1802 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2090 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1803 ev_stop (EV_A_ (W)w); 2091 ev_stop (EV_A_ (W)w);
1804} 2092}
1805 2093
1806#if EV_STAT_ENABLE 2094#if EV_STAT_ENABLE
1807 2095
2149 2437
2150#if EV_EMBED_ENABLE 2438#if EV_EMBED_ENABLE
2151void noinline 2439void noinline
2152ev_embed_sweep (EV_P_ ev_embed *w) 2440ev_embed_sweep (EV_P_ ev_embed *w)
2153{ 2441{
2154 ev_loop (w->loop, EVLOOP_NONBLOCK); 2442 ev_loop (w->other, EVLOOP_NONBLOCK);
2155} 2443}
2156 2444
2157static void 2445static void
2158embed_cb (EV_P_ ev_io *io, int revents) 2446embed_io_cb (EV_P_ ev_io *io, int revents)
2159{ 2447{
2160 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2448 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2161 2449
2162 if (ev_cb (w)) 2450 if (ev_cb (w))
2163 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2451 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2164 else 2452 else
2165 ev_embed_sweep (loop, w); 2453 ev_loop (w->other, EVLOOP_NONBLOCK);
2166} 2454}
2455
2456static void
2457embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2458{
2459 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2460
2461 {
2462 struct ev_loop *loop = w->other;
2463
2464 while (fdchangecnt)
2465 {
2466 fd_reify (EV_A);
2467 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2468 }
2469 }
2470}
2471
2472#if 0
2473static void
2474embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2475{
2476 ev_idle_stop (EV_A_ idle);
2477}
2478#endif
2167 2479
2168void 2480void
2169ev_embed_start (EV_P_ ev_embed *w) 2481ev_embed_start (EV_P_ ev_embed *w)
2170{ 2482{
2171 if (expect_false (ev_is_active (w))) 2483 if (expect_false (ev_is_active (w)))
2172 return; 2484 return;
2173 2485
2174 { 2486 {
2175 struct ev_loop *loop = w->loop; 2487 struct ev_loop *loop = w->other;
2176 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2488 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2177 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2489 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2178 } 2490 }
2179 2491
2180 ev_set_priority (&w->io, ev_priority (w)); 2492 ev_set_priority (&w->io, ev_priority (w));
2181 ev_io_start (EV_A_ &w->io); 2493 ev_io_start (EV_A_ &w->io);
2182 2494
2495 ev_prepare_init (&w->prepare, embed_prepare_cb);
2496 ev_set_priority (&w->prepare, EV_MINPRI);
2497 ev_prepare_start (EV_A_ &w->prepare);
2498
2499 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2500
2183 ev_start (EV_A_ (W)w, 1); 2501 ev_start (EV_A_ (W)w, 1);
2184} 2502}
2185 2503
2186void 2504void
2187ev_embed_stop (EV_P_ ev_embed *w) 2505ev_embed_stop (EV_P_ ev_embed *w)
2189 clear_pending (EV_A_ (W)w); 2507 clear_pending (EV_A_ (W)w);
2190 if (expect_false (!ev_is_active (w))) 2508 if (expect_false (!ev_is_active (w)))
2191 return; 2509 return;
2192 2510
2193 ev_io_stop (EV_A_ &w->io); 2511 ev_io_stop (EV_A_ &w->io);
2512 ev_prepare_stop (EV_A_ &w->prepare);
2194 2513
2195 ev_stop (EV_A_ (W)w); 2514 ev_stop (EV_A_ (W)w);
2196} 2515}
2197#endif 2516#endif
2198 2517
2223 2542
2224 ev_stop (EV_A_ (W)w); 2543 ev_stop (EV_A_ (W)w);
2225} 2544}
2226#endif 2545#endif
2227 2546
2547#if EV_ASYNC_ENABLE
2548void
2549ev_async_start (EV_P_ ev_async *w)
2550{
2551 if (expect_false (ev_is_active (w)))
2552 return;
2553
2554 evpipe_init (EV_A);
2555
2556 ev_start (EV_A_ (W)w, ++asynccnt);
2557 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2558 asyncs [asynccnt - 1] = w;
2559}
2560
2561void
2562ev_async_stop (EV_P_ ev_async *w)
2563{
2564 clear_pending (EV_A_ (W)w);
2565 if (expect_false (!ev_is_active (w)))
2566 return;
2567
2568 {
2569 int active = ((W)w)->active;
2570 asyncs [active - 1] = asyncs [--asynccnt];
2571 ((W)asyncs [active - 1])->active = active;
2572 }
2573
2574 ev_stop (EV_A_ (W)w);
2575}
2576
2577void
2578ev_async_send (EV_P_ ev_async *w)
2579{
2580 w->sent = 1;
2581 evpipe_write (EV_A_ &gotasync);
2582}
2583#endif
2584
2228/*****************************************************************************/ 2585/*****************************************************************************/
2229 2586
2230struct ev_once 2587struct ev_once
2231{ 2588{
2232 ev_io io; 2589 ev_io io;
2287 ev_timer_set (&once->to, timeout, 0.); 2644 ev_timer_set (&once->to, timeout, 0.);
2288 ev_timer_start (EV_A_ &once->to); 2645 ev_timer_start (EV_A_ &once->to);
2289 } 2646 }
2290} 2647}
2291 2648
2649#if EV_MULTIPLICITY
2650 #include "ev_wrap.h"
2651#endif
2652
2292#ifdef __cplusplus 2653#ifdef __cplusplus
2293} 2654}
2294#endif 2655#endif
2295 2656

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines