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

Comparing libev/ev.c (file contents):
Revision 1.165 by root, Fri Dec 7 18:09:38 2007 UTC vs.
Revision 1.204 by root, Fri Jan 18 13:45:55 2008 UTC

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 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
51# ifndef EV_USE_MONOTONIC 59# ifndef EV_USE_MONOTONIC
52# define EV_USE_MONOTONIC 0 60# define EV_USE_MONOTONIC 0
53# endif 61# endif
54# ifndef EV_USE_REALTIME 62# ifndef EV_USE_REALTIME
55# define EV_USE_REALTIME 0 63# define EV_USE_REALTIME 0
64# endif
65# endif
66
67# ifndef EV_USE_NANOSLEEP
68# if HAVE_NANOSLEEP
69# define EV_USE_NANOSLEEP 1
70# else
71# define EV_USE_NANOSLEEP 0
56# endif 72# endif
57# endif 73# endif
58 74
59# ifndef EV_USE_SELECT 75# ifndef EV_USE_SELECT
60# if HAVE_SELECT && HAVE_SYS_SELECT_H 76# if HAVE_SELECT && HAVE_SYS_SELECT_H
146 162
147#ifndef EV_USE_REALTIME 163#ifndef EV_USE_REALTIME
148# define EV_USE_REALTIME 0 164# define EV_USE_REALTIME 0
149#endif 165#endif
150 166
167#ifndef EV_USE_NANOSLEEP
168# define EV_USE_NANOSLEEP 0
169#endif
170
151#ifndef EV_USE_SELECT 171#ifndef EV_USE_SELECT
152# define EV_USE_SELECT 1 172# define EV_USE_SELECT 1
153#endif 173#endif
154 174
155#ifndef EV_USE_POLL 175#ifndef EV_USE_POLL
202#ifndef CLOCK_REALTIME 222#ifndef CLOCK_REALTIME
203# undef EV_USE_REALTIME 223# undef EV_USE_REALTIME
204# define EV_USE_REALTIME 0 224# define EV_USE_REALTIME 0
205#endif 225#endif
206 226
227#if !EV_STAT_ENABLE
228# undef EV_USE_INOTIFY
229# define EV_USE_INOTIFY 0
230#endif
231
232#if !EV_USE_NANOSLEEP
233# ifndef _WIN32
234# include <sys/select.h>
235# endif
236#endif
237
238#if EV_USE_INOTIFY
239# include <sys/inotify.h>
240#endif
241
207#if EV_SELECT_IS_WINSOCKET 242#if EV_SELECT_IS_WINSOCKET
208# include <winsock.h> 243# include <winsock.h>
209#endif 244#endif
210 245
211#if !EV_STAT_ENABLE
212# define EV_USE_INOTIFY 0
213#endif
214
215#if EV_USE_INOTIFY
216# include <sys/inotify.h>
217#endif
218
219/**/ 246/**/
247
248/*
249 * This is used to avoid floating point rounding problems.
250 * It is added to ev_rt_now when scheduling periodics
251 * to ensure progress, time-wise, even when rounding
252 * errors are against us.
253 * This value is good at least till the year 4000.
254 * Better solutions welcome.
255 */
256#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
220 257
221#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 258#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) */ 259#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 */ 260/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
224 261
225#if __GNUC__ >= 3 262#if __GNUC__ >= 4
226# define expect(expr,value) __builtin_expect ((expr),(value)) 263# 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)) 264# 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 265#else
236# define expect(expr,value) (expr) 266# define expect(expr,value) (expr)
237# define inline_speed static
238# define inline_size static
239# define noinline 267# define noinline
268# if __STDC_VERSION__ < 199901L
269# define inline
270# endif
240#endif 271#endif
241 272
242#define expect_false(expr) expect ((expr) != 0, 0) 273#define expect_false(expr) expect ((expr) != 0, 0)
243#define expect_true(expr) expect ((expr) != 0, 1) 274#define expect_true(expr) expect ((expr) != 0, 1)
275#define inline_size static inline
276
277#if EV_MINIMAL
278# define inline_speed static noinline
279#else
280# define inline_speed static inline
281#endif
244 282
245#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 283#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
246#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 284#define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
247 285
248#define EMPTY /* required for microsofts broken pseudo-c compiler */ 286#define EMPTY /* required for microsofts broken pseudo-c compiler */
250 288
251typedef ev_watcher *W; 289typedef ev_watcher *W;
252typedef ev_watcher_list *WL; 290typedef ev_watcher_list *WL;
253typedef ev_watcher_time *WT; 291typedef ev_watcher_time *WT;
254 292
293#if EV_USE_MONOTONIC
294/* sig_atomic_t is used to avoid per-thread variables or locking but still */
295/* giving it a reasonably high chance of working on typical architetcures */
255static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 296static sig_atomic_t have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
297#endif
256 298
257#ifdef _WIN32 299#ifdef _WIN32
258# include "ev_win32.c" 300# include "ev_win32.c"
259#endif 301#endif
260 302
396{ 438{
397 return ev_rt_now; 439 return ev_rt_now;
398} 440}
399#endif 441#endif
400 442
443void
444ev_sleep (ev_tstamp delay)
445{
446 if (delay > 0.)
447 {
448#if EV_USE_NANOSLEEP
449 struct timespec ts;
450
451 ts.tv_sec = (time_t)delay;
452 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
453
454 nanosleep (&ts, 0);
455#elif defined(_WIN32)
456 Sleep (delay * 1e3);
457#else
458 struct timeval tv;
459
460 tv.tv_sec = (time_t)delay;
461 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
462
463 select (0, 0, 0, 0, &tv);
464#endif
465 }
466}
467
468/*****************************************************************************/
469
401int inline_size 470int inline_size
402array_nextsize (int elem, int cur, int cnt) 471array_nextsize (int elem, int cur, int cnt)
403{ 472{
404 int ncur = cur + 1; 473 int ncur = cur + 1;
405 474
417 } 486 }
418 487
419 return ncur; 488 return ncur;
420} 489}
421 490
422inline_speed void * 491static noinline void *
423array_realloc (int elem, void *base, int *cur, int cnt) 492array_realloc (int elem, void *base, int *cur, int cnt)
424{ 493{
425 *cur = array_nextsize (elem, *cur, cnt); 494 *cur = array_nextsize (elem, *cur, cnt);
426 return ev_realloc (base, elem * *cur); 495 return ev_realloc (base, elem * *cur);
427} 496}
452 521
453void noinline 522void noinline
454ev_feed_event (EV_P_ void *w, int revents) 523ev_feed_event (EV_P_ void *w, int revents)
455{ 524{
456 W w_ = (W)w; 525 W w_ = (W)w;
526 int pri = ABSPRI (w_);
457 527
458 if (expect_false (w_->pending)) 528 if (expect_false (w_->pending))
529 pendings [pri][w_->pending - 1].events |= revents;
530 else
459 { 531 {
532 w_->pending = ++pendingcnt [pri];
533 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
534 pendings [pri][w_->pending - 1].w = w_;
460 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 535 pendings [pri][w_->pending - 1].events = revents;
461 return;
462 } 536 }
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} 537}
469 538
470void inline_size 539void inline_speed
471queue_events (EV_P_ W *events, int eventcnt, int type) 540queue_events (EV_P_ W *events, int eventcnt, int type)
472{ 541{
473 int i; 542 int i;
474 543
475 for (i = 0; i < eventcnt; ++i) 544 for (i = 0; i < eventcnt; ++i)
507} 576}
508 577
509void 578void
510ev_feed_fd_event (EV_P_ int fd, int revents) 579ev_feed_fd_event (EV_P_ int fd, int revents)
511{ 580{
581 if (fd >= 0 && fd < anfdmax)
512 fd_event (EV_A_ fd, revents); 582 fd_event (EV_A_ fd, revents);
513} 583}
514 584
515void inline_size 585void inline_size
516fd_reify (EV_P) 586fd_reify (EV_P)
517{ 587{
521 { 591 {
522 int fd = fdchanges [i]; 592 int fd = fdchanges [i];
523 ANFD *anfd = anfds + fd; 593 ANFD *anfd = anfds + fd;
524 ev_io *w; 594 ev_io *w;
525 595
526 int events = 0; 596 unsigned char events = 0;
527 597
528 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 598 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
529 events |= w->events; 599 events |= (unsigned char)w->events;
530 600
531#if EV_SELECT_IS_WINSOCKET 601#if EV_SELECT_IS_WINSOCKET
532 if (events) 602 if (events)
533 { 603 {
534 unsigned long argp; 604 unsigned long argp;
605 #ifdef EV_FD_TO_WIN32_HANDLE
606 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
607 #else
535 anfd->handle = _get_osfhandle (fd); 608 anfd->handle = _get_osfhandle (fd);
609 #endif
536 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 610 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
537 } 611 }
538#endif 612#endif
539 613
614 {
615 unsigned char o_events = anfd->events;
616 unsigned char o_reify = anfd->reify;
617
540 anfd->reify = 0; 618 anfd->reify = 0;
541
542 backend_modify (EV_A_ fd, anfd->events, events);
543 anfd->events = events; 619 anfd->events = events;
620
621 if (o_events != events || o_reify & EV_IOFDSET)
622 backend_modify (EV_A_ fd, o_events, events);
623 }
544 } 624 }
545 625
546 fdchangecnt = 0; 626 fdchangecnt = 0;
547} 627}
548 628
549void inline_size 629void inline_size
550fd_change (EV_P_ int fd) 630fd_change (EV_P_ int fd, int flags)
551{ 631{
552 if (expect_false (anfds [fd].reify)) 632 unsigned char reify = anfds [fd].reify;
553 return;
554
555 anfds [fd].reify = 1; 633 anfds [fd].reify |= flags;
556 634
635 if (expect_true (!reify))
636 {
557 ++fdchangecnt; 637 ++fdchangecnt;
558 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 638 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
559 fdchanges [fdchangecnt - 1] = fd; 639 fdchanges [fdchangecnt - 1] = fd;
640 }
560} 641}
561 642
562void inline_speed 643void inline_speed
563fd_kill (EV_P_ int fd) 644fd_kill (EV_P_ int fd)
564{ 645{
615 696
616 for (fd = 0; fd < anfdmax; ++fd) 697 for (fd = 0; fd < anfdmax; ++fd)
617 if (anfds [fd].events) 698 if (anfds [fd].events)
618 { 699 {
619 anfds [fd].events = 0; 700 anfds [fd].events = 0;
620 fd_change (EV_A_ fd); 701 fd_change (EV_A_ fd, EV_IOFDSET | 1);
621 } 702 }
622} 703}
623 704
624/*****************************************************************************/ 705/*****************************************************************************/
625 706
626void inline_speed 707void inline_speed
627upheap (WT *heap, int k) 708upheap (WT *heap, int k)
628{ 709{
629 WT w = heap [k]; 710 WT w = heap [k];
630 711
631 while (k && heap [k >> 1]->at > w->at) 712 while (k)
632 { 713 {
714 int p = (k - 1) >> 1;
715
716 if (heap [p]->at <= w->at)
717 break;
718
633 heap [k] = heap [k >> 1]; 719 heap [k] = heap [p];
634 ((W)heap [k])->active = k + 1; 720 ((W)heap [k])->active = k + 1;
635 k >>= 1; 721 k = p;
636 } 722 }
637 723
638 heap [k] = w; 724 heap [k] = w;
639 ((W)heap [k])->active = k + 1; 725 ((W)heap [k])->active = k + 1;
640
641} 726}
642 727
643void inline_speed 728void inline_speed
644downheap (WT *heap, int N, int k) 729downheap (WT *heap, int N, int k)
645{ 730{
646 WT w = heap [k]; 731 WT w = heap [k];
647 732
648 while (k < (N >> 1)) 733 for (;;)
649 { 734 {
650 int j = k << 1; 735 int c = (k << 1) + 1;
651 736
652 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 737 if (c >= N)
653 ++j;
654
655 if (w->at <= heap [j]->at)
656 break; 738 break;
657 739
740 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
741 ? 1 : 0;
742
743 if (w->at <= heap [c]->at)
744 break;
745
658 heap [k] = heap [j]; 746 heap [k] = heap [c];
659 ((W)heap [k])->active = k + 1; 747 ((W)heap [k])->active = k + 1;
748
660 k = j; 749 k = c;
661 } 750 }
662 751
663 heap [k] = w; 752 heap [k] = w;
664 ((W)heap [k])->active = k + 1; 753 ((W)heap [k])->active = k + 1;
665} 754}
747 for (signum = signalmax; signum--; ) 836 for (signum = signalmax; signum--; )
748 if (signals [signum].gotsig) 837 if (signals [signum].gotsig)
749 ev_feed_signal_event (EV_A_ signum + 1); 838 ev_feed_signal_event (EV_A_ signum + 1);
750} 839}
751 840
752void inline_size 841void inline_speed
753fd_intern (int fd) 842fd_intern (int fd)
754{ 843{
755#ifdef _WIN32 844#ifdef _WIN32
756 int arg = 1; 845 int arg = 1;
757 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 846 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
772 ev_unref (EV_A); /* child watcher should not keep loop alive */ 861 ev_unref (EV_A); /* child watcher should not keep loop alive */
773} 862}
774 863
775/*****************************************************************************/ 864/*****************************************************************************/
776 865
777static ev_child *childs [EV_PID_HASHSIZE]; 866static WL childs [EV_PID_HASHSIZE];
778 867
779#ifndef _WIN32 868#ifndef _WIN32
780 869
781static ev_signal childev; 870static ev_signal childev;
782 871
897} 986}
898 987
899unsigned int 988unsigned int
900ev_embeddable_backends (void) 989ev_embeddable_backends (void)
901{ 990{
902 return EVBACKEND_EPOLL 991 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
903 | EVBACKEND_KQUEUE 992
904 | EVBACKEND_PORT; 993 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
994 /* please fix it and tell me how to detect the fix */
995 flags &= ~EVBACKEND_EPOLL;
996
997 return flags;
905} 998}
906 999
907unsigned int 1000unsigned int
908ev_backend (EV_P) 1001ev_backend (EV_P)
909{ 1002{
912 1005
913unsigned int 1006unsigned int
914ev_loop_count (EV_P) 1007ev_loop_count (EV_P)
915{ 1008{
916 return loop_count; 1009 return loop_count;
1010}
1011
1012void
1013ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1014{
1015 io_blocktime = interval;
1016}
1017
1018void
1019ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1020{
1021 timeout_blocktime = interval;
917} 1022}
918 1023
919static void noinline 1024static void noinline
920loop_init (EV_P_ unsigned int flags) 1025loop_init (EV_P_ unsigned int flags)
921{ 1026{
932 ev_rt_now = ev_time (); 1037 ev_rt_now = ev_time ();
933 mn_now = get_clock (); 1038 mn_now = get_clock ();
934 now_floor = mn_now; 1039 now_floor = mn_now;
935 rtmn_diff = ev_rt_now - mn_now; 1040 rtmn_diff = ev_rt_now - mn_now;
936 1041
1042 io_blocktime = 0.;
1043 timeout_blocktime = 0.;
1044
937 /* pid check not overridable via env */ 1045 /* pid check not overridable via env */
938#ifndef _WIN32 1046#ifndef _WIN32
939 if (flags & EVFLAG_FORKCHECK) 1047 if (flags & EVFLAG_FORKCHECK)
940 curpid = getpid (); 1048 curpid = getpid ();
941#endif 1049#endif
1009 array_free (pending, [i]); 1117 array_free (pending, [i]);
1010#if EV_IDLE_ENABLE 1118#if EV_IDLE_ENABLE
1011 array_free (idle, [i]); 1119 array_free (idle, [i]);
1012#endif 1120#endif
1013 } 1121 }
1122
1123 ev_free (anfds); anfdmax = 0;
1014 1124
1015 /* have to use the microsoft-never-gets-it-right macro */ 1125 /* have to use the microsoft-never-gets-it-right macro */
1016 array_free (fdchange, EMPTY); 1126 array_free (fdchange, EMPTY);
1017 array_free (timer, EMPTY); 1127 array_free (timer, EMPTY);
1018#if EV_PERIODIC_ENABLE 1128#if EV_PERIODIC_ENABLE
1019 array_free (periodic, EMPTY); 1129 array_free (periodic, EMPTY);
1020#endif 1130#endif
1131#if EV_FORK_ENABLE
1132 array_free (fork, EMPTY);
1133#endif
1021 array_free (prepare, EMPTY); 1134 array_free (prepare, EMPTY);
1022 array_free (check, EMPTY); 1135 array_free (check, EMPTY);
1023 1136
1024 backend = 0; 1137 backend = 0;
1025} 1138}
1053 1166
1054 while (pipe (sigpipe)) 1167 while (pipe (sigpipe))
1055 syserr ("(libev) error creating pipe"); 1168 syserr ("(libev) error creating pipe");
1056 1169
1057 siginit (EV_A); 1170 siginit (EV_A);
1171 sigcb (EV_A_ &sigev, EV_READ);
1058 } 1172 }
1059 1173
1060 postfork = 0; 1174 postfork = 0;
1061} 1175}
1062 1176
1084} 1198}
1085 1199
1086void 1200void
1087ev_loop_fork (EV_P) 1201ev_loop_fork (EV_P)
1088{ 1202{
1089 postfork = 1; 1203 postfork = 1; // must be in line with ev_default_fork
1090} 1204}
1091 1205
1092#endif 1206#endif
1093 1207
1094#if EV_MULTIPLICITY 1208#if EV_MULTIPLICITY
1158#if EV_MULTIPLICITY 1272#if EV_MULTIPLICITY
1159 struct ev_loop *loop = ev_default_loop_ptr; 1273 struct ev_loop *loop = ev_default_loop_ptr;
1160#endif 1274#endif
1161 1275
1162 if (backend) 1276 if (backend)
1163 postfork = 1; 1277 postfork = 1; // must be in line with ev_loop_fork
1164} 1278}
1165 1279
1166/*****************************************************************************/ 1280/*****************************************************************************/
1281
1282void
1283ev_invoke (EV_P_ void *w, int revents)
1284{
1285 EV_CB_INVOKE ((W)w, revents);
1286}
1167 1287
1168void inline_speed 1288void inline_speed
1169call_pending (EV_P) 1289call_pending (EV_P)
1170{ 1290{
1171 int pri; 1291 int pri;
1188void inline_size 1308void inline_size
1189timers_reify (EV_P) 1309timers_reify (EV_P)
1190{ 1310{
1191 while (timercnt && ((WT)timers [0])->at <= mn_now) 1311 while (timercnt && ((WT)timers [0])->at <= mn_now)
1192 { 1312 {
1193 ev_timer *w = timers [0]; 1313 ev_timer *w = (ev_timer *)timers [0];
1194 1314
1195 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1315 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1196 1316
1197 /* first reschedule or stop timer */ 1317 /* first reschedule or stop timer */
1198 if (w->repeat) 1318 if (w->repeat)
1201 1321
1202 ((WT)w)->at += w->repeat; 1322 ((WT)w)->at += w->repeat;
1203 if (((WT)w)->at < mn_now) 1323 if (((WT)w)->at < mn_now)
1204 ((WT)w)->at = mn_now; 1324 ((WT)w)->at = mn_now;
1205 1325
1206 downheap ((WT *)timers, timercnt, 0); 1326 downheap (timers, timercnt, 0);
1207 } 1327 }
1208 else 1328 else
1209 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1329 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1210 1330
1211 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1331 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1216void inline_size 1336void inline_size
1217periodics_reify (EV_P) 1337periodics_reify (EV_P)
1218{ 1338{
1219 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1339 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1220 { 1340 {
1221 ev_periodic *w = periodics [0]; 1341 ev_periodic *w = (ev_periodic *)periodics [0];
1222 1342
1223 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1343 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1224 1344
1225 /* first reschedule or stop timer */ 1345 /* first reschedule or stop timer */
1226 if (w->reschedule_cb) 1346 if (w->reschedule_cb)
1227 { 1347 {
1228 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1348 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1229 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1349 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1230 downheap ((WT *)periodics, periodiccnt, 0); 1350 downheap (periodics, periodiccnt, 0);
1231 } 1351 }
1232 else if (w->interval) 1352 else if (w->interval)
1233 { 1353 {
1234 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1354 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1355 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1235 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1356 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1236 downheap ((WT *)periodics, periodiccnt, 0); 1357 downheap (periodics, periodiccnt, 0);
1237 } 1358 }
1238 else 1359 else
1239 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1360 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1240 1361
1241 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1362 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1248 int i; 1369 int i;
1249 1370
1250 /* adjust periodics after time jump */ 1371 /* adjust periodics after time jump */
1251 for (i = 0; i < periodiccnt; ++i) 1372 for (i = 0; i < periodiccnt; ++i)
1252 { 1373 {
1253 ev_periodic *w = periodics [i]; 1374 ev_periodic *w = (ev_periodic *)periodics [i];
1254 1375
1255 if (w->reschedule_cb) 1376 if (w->reschedule_cb)
1256 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1377 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1257 else if (w->interval) 1378 else if (w->interval)
1258 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1379 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1259 } 1380 }
1260 1381
1261 /* now rebuild the heap */ 1382 /* now rebuild the heap */
1262 for (i = periodiccnt >> 1; i--; ) 1383 for (i = periodiccnt >> 1; i--; )
1263 downheap ((WT *)periodics, periodiccnt, i); 1384 downheap (periodics, periodiccnt, i);
1264} 1385}
1265#endif 1386#endif
1266 1387
1267#if EV_IDLE_ENABLE 1388#if EV_IDLE_ENABLE
1268void inline_size 1389void inline_size
1285 } 1406 }
1286 } 1407 }
1287} 1408}
1288#endif 1409#endif
1289 1410
1290int inline_size 1411void inline_speed
1291time_update_monotonic (EV_P) 1412time_update (EV_P_ ev_tstamp max_block)
1292{ 1413{
1414 int i;
1415
1416#if EV_USE_MONOTONIC
1417 if (expect_true (have_monotonic))
1418 {
1419 ev_tstamp odiff = rtmn_diff;
1420
1293 mn_now = get_clock (); 1421 mn_now = get_clock ();
1294 1422
1423 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1424 /* interpolate in the meantime */
1295 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1425 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1296 { 1426 {
1297 ev_rt_now = rtmn_diff + mn_now; 1427 ev_rt_now = rtmn_diff + mn_now;
1298 return 0; 1428 return;
1299 } 1429 }
1300 else 1430
1301 {
1302 now_floor = mn_now; 1431 now_floor = mn_now;
1303 ev_rt_now = ev_time (); 1432 ev_rt_now = ev_time ();
1304 return 1;
1305 }
1306}
1307 1433
1308void inline_size 1434 /* loop a few times, before making important decisions.
1309time_update (EV_P) 1435 * on the choice of "4": one iteration isn't enough,
1310{ 1436 * in case we get preempted during the calls to
1311 int i; 1437 * ev_time and get_clock. a second call is almost guaranteed
1312 1438 * to succeed in that case, though. and looping a few more times
1313#if EV_USE_MONOTONIC 1439 * doesn't hurt either as we only do this on time-jumps or
1314 if (expect_true (have_monotonic)) 1440 * in the unlikely event of having been preempted here.
1315 { 1441 */
1316 if (time_update_monotonic (EV_A)) 1442 for (i = 4; --i; )
1317 { 1443 {
1318 ev_tstamp odiff = rtmn_diff;
1319
1320 /* loop a few times, before making important decisions.
1321 * on the choice of "4": one iteration isn't enough,
1322 * in case we get preempted during the calls to
1323 * ev_time and get_clock. a second call is almost guaranteed
1324 * to succeed in that case, though. and looping a few more times
1325 * doesn't hurt either as we only do this on time-jumps or
1326 * in the unlikely event of having been preempted here.
1327 */
1328 for (i = 4; --i; )
1329 {
1330 rtmn_diff = ev_rt_now - mn_now; 1444 rtmn_diff = ev_rt_now - mn_now;
1331 1445
1332 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1446 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1333 return; /* all is well */ 1447 return; /* all is well */
1334 1448
1335 ev_rt_now = ev_time (); 1449 ev_rt_now = ev_time ();
1336 mn_now = get_clock (); 1450 mn_now = get_clock ();
1337 now_floor = mn_now; 1451 now_floor = mn_now;
1338 } 1452 }
1339 1453
1340# if EV_PERIODIC_ENABLE 1454# if EV_PERIODIC_ENABLE
1341 periodics_reschedule (EV_A); 1455 periodics_reschedule (EV_A);
1342# endif 1456# endif
1343 /* no timer adjustment, as the monotonic clock doesn't jump */ 1457 /* no timer adjustment, as the monotonic clock doesn't jump */
1344 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1458 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1345 }
1346 } 1459 }
1347 else 1460 else
1348#endif 1461#endif
1349 { 1462 {
1350 ev_rt_now = ev_time (); 1463 ev_rt_now = ev_time ();
1351 1464
1352 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1465 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1353 { 1466 {
1354#if EV_PERIODIC_ENABLE 1467#if EV_PERIODIC_ENABLE
1355 periodics_reschedule (EV_A); 1468 periodics_reschedule (EV_A);
1356#endif 1469#endif
1357
1358 /* adjust timers. this is easy, as the offset is the same for all of them */ 1470 /* adjust timers. this is easy, as the offset is the same for all of them */
1359 for (i = 0; i < timercnt; ++i) 1471 for (i = 0; i < timercnt; ++i)
1360 ((WT)timers [i])->at += ev_rt_now - mn_now; 1472 ((WT)timers [i])->at += ev_rt_now - mn_now;
1361 } 1473 }
1362 1474
1406 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1518 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1407 call_pending (EV_A); 1519 call_pending (EV_A);
1408 } 1520 }
1409#endif 1521#endif
1410 1522
1411 /* queue check watchers (and execute them) */ 1523 /* queue prepare watchers (and execute them) */
1412 if (expect_false (preparecnt)) 1524 if (expect_false (preparecnt))
1413 { 1525 {
1414 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1526 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1415 call_pending (EV_A); 1527 call_pending (EV_A);
1416 } 1528 }
1425 /* update fd-related kernel structures */ 1537 /* update fd-related kernel structures */
1426 fd_reify (EV_A); 1538 fd_reify (EV_A);
1427 1539
1428 /* calculate blocking time */ 1540 /* calculate blocking time */
1429 { 1541 {
1430 ev_tstamp block; 1542 ev_tstamp waittime = 0.;
1543 ev_tstamp sleeptime = 0.;
1431 1544
1432 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1545 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1433 block = 0.; /* do not block at all */
1434 else
1435 { 1546 {
1436 /* update time to cancel out callback processing overhead */ 1547 /* update time to cancel out callback processing overhead */
1437#if EV_USE_MONOTONIC
1438 if (expect_true (have_monotonic))
1439 time_update_monotonic (EV_A); 1548 time_update (EV_A_ 1e100);
1440 else
1441#endif
1442 {
1443 ev_rt_now = ev_time ();
1444 mn_now = ev_rt_now;
1445 }
1446 1549
1447 block = MAX_BLOCKTIME; 1550 waittime = MAX_BLOCKTIME;
1448 1551
1449 if (timercnt) 1552 if (timercnt)
1450 { 1553 {
1451 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1554 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1452 if (block > to) block = to; 1555 if (waittime > to) waittime = to;
1453 } 1556 }
1454 1557
1455#if EV_PERIODIC_ENABLE 1558#if EV_PERIODIC_ENABLE
1456 if (periodiccnt) 1559 if (periodiccnt)
1457 { 1560 {
1458 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1561 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1459 if (block > to) block = to; 1562 if (waittime > to) waittime = to;
1460 } 1563 }
1461#endif 1564#endif
1462 1565
1463 if (expect_false (block < 0.)) block = 0.; 1566 if (expect_false (waittime < timeout_blocktime))
1567 waittime = timeout_blocktime;
1568
1569 sleeptime = waittime - backend_fudge;
1570
1571 if (expect_true (sleeptime > io_blocktime))
1572 sleeptime = io_blocktime;
1573
1574 if (sleeptime)
1575 {
1576 ev_sleep (sleeptime);
1577 waittime -= sleeptime;
1578 }
1464 } 1579 }
1465 1580
1466 ++loop_count; 1581 ++loop_count;
1467 backend_poll (EV_A_ block); 1582 backend_poll (EV_A_ waittime);
1583
1584 /* update ev_rt_now, do magic */
1585 time_update (EV_A_ waittime + sleeptime);
1468 } 1586 }
1469
1470 /* update ev_rt_now, do magic */
1471 time_update (EV_A);
1472 1587
1473 /* queue pending timers and reschedule them */ 1588 /* queue pending timers and reschedule them */
1474 timers_reify (EV_A); /* relative timers called last */ 1589 timers_reify (EV_A); /* relative timers called last */
1475#if EV_PERIODIC_ENABLE 1590#if EV_PERIODIC_ENABLE
1476 periodics_reify (EV_A); /* absolute timers called first */ 1591 periodics_reify (EV_A); /* absolute timers called first */
1523 head = &(*head)->next; 1638 head = &(*head)->next;
1524 } 1639 }
1525} 1640}
1526 1641
1527void inline_speed 1642void inline_speed
1528ev_clear_pending (EV_P_ W w) 1643clear_pending (EV_P_ W w)
1529{ 1644{
1530 if (w->pending) 1645 if (w->pending)
1531 { 1646 {
1532 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1647 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1533 w->pending = 0; 1648 w->pending = 0;
1534 } 1649 }
1650}
1651
1652int
1653ev_clear_pending (EV_P_ void *w)
1654{
1655 W w_ = (W)w;
1656 int pending = w_->pending;
1657
1658 if (expect_true (pending))
1659 {
1660 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1661 w_->pending = 0;
1662 p->w = 0;
1663 return p->events;
1664 }
1665 else
1666 return 0;
1535} 1667}
1536 1668
1537void inline_size 1669void inline_size
1538pri_adjust (EV_P_ W w) 1670pri_adjust (EV_P_ W w)
1539{ 1671{
1558 w->active = 0; 1690 w->active = 0;
1559} 1691}
1560 1692
1561/*****************************************************************************/ 1693/*****************************************************************************/
1562 1694
1563void 1695void noinline
1564ev_io_start (EV_P_ ev_io *w) 1696ev_io_start (EV_P_ ev_io *w)
1565{ 1697{
1566 int fd = w->fd; 1698 int fd = w->fd;
1567 1699
1568 if (expect_false (ev_is_active (w))) 1700 if (expect_false (ev_is_active (w)))
1570 1702
1571 assert (("ev_io_start called with negative fd", fd >= 0)); 1703 assert (("ev_io_start called with negative fd", fd >= 0));
1572 1704
1573 ev_start (EV_A_ (W)w, 1); 1705 ev_start (EV_A_ (W)w, 1);
1574 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1706 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1575 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1707 wlist_add (&anfds[fd].head, (WL)w);
1576 1708
1577 fd_change (EV_A_ fd); 1709 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1710 w->events &= ~EV_IOFDSET;
1578} 1711}
1579 1712
1580void 1713void noinline
1581ev_io_stop (EV_P_ ev_io *w) 1714ev_io_stop (EV_P_ ev_io *w)
1582{ 1715{
1583 ev_clear_pending (EV_A_ (W)w); 1716 clear_pending (EV_A_ (W)w);
1584 if (expect_false (!ev_is_active (w))) 1717 if (expect_false (!ev_is_active (w)))
1585 return; 1718 return;
1586 1719
1587 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1720 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1588 1721
1589 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1722 wlist_del (&anfds[w->fd].head, (WL)w);
1590 ev_stop (EV_A_ (W)w); 1723 ev_stop (EV_A_ (W)w);
1591 1724
1592 fd_change (EV_A_ w->fd); 1725 fd_change (EV_A_ w->fd, 1);
1593} 1726}
1594 1727
1595void 1728void noinline
1596ev_timer_start (EV_P_ ev_timer *w) 1729ev_timer_start (EV_P_ ev_timer *w)
1597{ 1730{
1598 if (expect_false (ev_is_active (w))) 1731 if (expect_false (ev_is_active (w)))
1599 return; 1732 return;
1600 1733
1601 ((WT)w)->at += mn_now; 1734 ((WT)w)->at += mn_now;
1602 1735
1603 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1736 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1604 1737
1605 ev_start (EV_A_ (W)w, ++timercnt); 1738 ev_start (EV_A_ (W)w, ++timercnt);
1606 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1739 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1607 timers [timercnt - 1] = w; 1740 timers [timercnt - 1] = (WT)w;
1608 upheap ((WT *)timers, timercnt - 1); 1741 upheap (timers, timercnt - 1);
1609 1742
1610 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1743 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1611} 1744}
1612 1745
1613void 1746void noinline
1614ev_timer_stop (EV_P_ ev_timer *w) 1747ev_timer_stop (EV_P_ ev_timer *w)
1615{ 1748{
1616 ev_clear_pending (EV_A_ (W)w); 1749 clear_pending (EV_A_ (W)w);
1617 if (expect_false (!ev_is_active (w))) 1750 if (expect_false (!ev_is_active (w)))
1618 return; 1751 return;
1619 1752
1620 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1753 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1621 1754
1622 { 1755 {
1623 int active = ((W)w)->active; 1756 int active = ((W)w)->active;
1624 1757
1625 if (expect_true (--active < --timercnt)) 1758 if (expect_true (--active < --timercnt))
1626 { 1759 {
1627 timers [active] = timers [timercnt]; 1760 timers [active] = timers [timercnt];
1628 adjustheap ((WT *)timers, timercnt, active); 1761 adjustheap (timers, timercnt, active);
1629 } 1762 }
1630 } 1763 }
1631 1764
1632 ((WT)w)->at -= mn_now; 1765 ((WT)w)->at -= mn_now;
1633 1766
1634 ev_stop (EV_A_ (W)w); 1767 ev_stop (EV_A_ (W)w);
1635} 1768}
1636 1769
1637void 1770void noinline
1638ev_timer_again (EV_P_ ev_timer *w) 1771ev_timer_again (EV_P_ ev_timer *w)
1639{ 1772{
1640 if (ev_is_active (w)) 1773 if (ev_is_active (w))
1641 { 1774 {
1642 if (w->repeat) 1775 if (w->repeat)
1643 { 1776 {
1644 ((WT)w)->at = mn_now + w->repeat; 1777 ((WT)w)->at = mn_now + w->repeat;
1645 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1778 adjustheap (timers, timercnt, ((W)w)->active - 1);
1646 } 1779 }
1647 else 1780 else
1648 ev_timer_stop (EV_A_ w); 1781 ev_timer_stop (EV_A_ w);
1649 } 1782 }
1650 else if (w->repeat) 1783 else if (w->repeat)
1653 ev_timer_start (EV_A_ w); 1786 ev_timer_start (EV_A_ w);
1654 } 1787 }
1655} 1788}
1656 1789
1657#if EV_PERIODIC_ENABLE 1790#if EV_PERIODIC_ENABLE
1658void 1791void noinline
1659ev_periodic_start (EV_P_ ev_periodic *w) 1792ev_periodic_start (EV_P_ ev_periodic *w)
1660{ 1793{
1661 if (expect_false (ev_is_active (w))) 1794 if (expect_false (ev_is_active (w)))
1662 return; 1795 return;
1663 1796
1665 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1798 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1666 else if (w->interval) 1799 else if (w->interval)
1667 { 1800 {
1668 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1801 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1669 /* this formula differs from the one in periodic_reify because we do not always round up */ 1802 /* this formula differs from the one in periodic_reify because we do not always round up */
1670 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1803 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1671 } 1804 }
1805 else
1806 ((WT)w)->at = w->offset;
1672 1807
1673 ev_start (EV_A_ (W)w, ++periodiccnt); 1808 ev_start (EV_A_ (W)w, ++periodiccnt);
1674 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1809 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1675 periodics [periodiccnt - 1] = w; 1810 periodics [periodiccnt - 1] = (WT)w;
1676 upheap ((WT *)periodics, periodiccnt - 1); 1811 upheap (periodics, periodiccnt - 1);
1677 1812
1678 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1813 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1679} 1814}
1680 1815
1681void 1816void noinline
1682ev_periodic_stop (EV_P_ ev_periodic *w) 1817ev_periodic_stop (EV_P_ ev_periodic *w)
1683{ 1818{
1684 ev_clear_pending (EV_A_ (W)w); 1819 clear_pending (EV_A_ (W)w);
1685 if (expect_false (!ev_is_active (w))) 1820 if (expect_false (!ev_is_active (w)))
1686 return; 1821 return;
1687 1822
1688 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1823 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1689 1824
1690 { 1825 {
1691 int active = ((W)w)->active; 1826 int active = ((W)w)->active;
1692 1827
1693 if (expect_true (--active < --periodiccnt)) 1828 if (expect_true (--active < --periodiccnt))
1694 { 1829 {
1695 periodics [active] = periodics [periodiccnt]; 1830 periodics [active] = periodics [periodiccnt];
1696 adjustheap ((WT *)periodics, periodiccnt, active); 1831 adjustheap (periodics, periodiccnt, active);
1697 } 1832 }
1698 } 1833 }
1699 1834
1700 ev_stop (EV_A_ (W)w); 1835 ev_stop (EV_A_ (W)w);
1701} 1836}
1702 1837
1703void 1838void noinline
1704ev_periodic_again (EV_P_ ev_periodic *w) 1839ev_periodic_again (EV_P_ ev_periodic *w)
1705{ 1840{
1706 /* TODO: use adjustheap and recalculation */ 1841 /* TODO: use adjustheap and recalculation */
1707 ev_periodic_stop (EV_A_ w); 1842 ev_periodic_stop (EV_A_ w);
1708 ev_periodic_start (EV_A_ w); 1843 ev_periodic_start (EV_A_ w);
1711 1846
1712#ifndef SA_RESTART 1847#ifndef SA_RESTART
1713# define SA_RESTART 0 1848# define SA_RESTART 0
1714#endif 1849#endif
1715 1850
1716void 1851void noinline
1717ev_signal_start (EV_P_ ev_signal *w) 1852ev_signal_start (EV_P_ ev_signal *w)
1718{ 1853{
1719#if EV_MULTIPLICITY 1854#if EV_MULTIPLICITY
1720 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1855 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1721#endif 1856#endif
1722 if (expect_false (ev_is_active (w))) 1857 if (expect_false (ev_is_active (w)))
1723 return; 1858 return;
1724 1859
1725 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1860 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1726 1861
1862 {
1863#ifndef _WIN32
1864 sigset_t full, prev;
1865 sigfillset (&full);
1866 sigprocmask (SIG_SETMASK, &full, &prev);
1867#endif
1868
1869 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1870
1871#ifndef _WIN32
1872 sigprocmask (SIG_SETMASK, &prev, 0);
1873#endif
1874 }
1875
1727 ev_start (EV_A_ (W)w, 1); 1876 ev_start (EV_A_ (W)w, 1);
1728 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1729 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1877 wlist_add (&signals [w->signum - 1].head, (WL)w);
1730 1878
1731 if (!((WL)w)->next) 1879 if (!((WL)w)->next)
1732 { 1880 {
1733#if _WIN32 1881#if _WIN32
1734 signal (w->signum, sighandler); 1882 signal (w->signum, sighandler);
1740 sigaction (w->signum, &sa, 0); 1888 sigaction (w->signum, &sa, 0);
1741#endif 1889#endif
1742 } 1890 }
1743} 1891}
1744 1892
1745void 1893void noinline
1746ev_signal_stop (EV_P_ ev_signal *w) 1894ev_signal_stop (EV_P_ ev_signal *w)
1747{ 1895{
1748 ev_clear_pending (EV_A_ (W)w); 1896 clear_pending (EV_A_ (W)w);
1749 if (expect_false (!ev_is_active (w))) 1897 if (expect_false (!ev_is_active (w)))
1750 return; 1898 return;
1751 1899
1752 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1900 wlist_del (&signals [w->signum - 1].head, (WL)w);
1753 ev_stop (EV_A_ (W)w); 1901 ev_stop (EV_A_ (W)w);
1754 1902
1755 if (!signals [w->signum - 1].head) 1903 if (!signals [w->signum - 1].head)
1756 signal (w->signum, SIG_DFL); 1904 signal (w->signum, SIG_DFL);
1757} 1905}
1764#endif 1912#endif
1765 if (expect_false (ev_is_active (w))) 1913 if (expect_false (ev_is_active (w)))
1766 return; 1914 return;
1767 1915
1768 ev_start (EV_A_ (W)w, 1); 1916 ev_start (EV_A_ (W)w, 1);
1769 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1917 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1770} 1918}
1771 1919
1772void 1920void
1773ev_child_stop (EV_P_ ev_child *w) 1921ev_child_stop (EV_P_ ev_child *w)
1774{ 1922{
1775 ev_clear_pending (EV_A_ (W)w); 1923 clear_pending (EV_A_ (W)w);
1776 if (expect_false (!ev_is_active (w))) 1924 if (expect_false (!ev_is_active (w)))
1777 return; 1925 return;
1778 1926
1779 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1927 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1780 ev_stop (EV_A_ (W)w); 1928 ev_stop (EV_A_ (W)w);
1781} 1929}
1782 1930
1783#if EV_STAT_ENABLE 1931#if EV_STAT_ENABLE
1784 1932
2016} 2164}
2017 2165
2018void 2166void
2019ev_stat_stop (EV_P_ ev_stat *w) 2167ev_stat_stop (EV_P_ ev_stat *w)
2020{ 2168{
2021 ev_clear_pending (EV_A_ (W)w); 2169 clear_pending (EV_A_ (W)w);
2022 if (expect_false (!ev_is_active (w))) 2170 if (expect_false (!ev_is_active (w)))
2023 return; 2171 return;
2024 2172
2025#if EV_USE_INOTIFY 2173#if EV_USE_INOTIFY
2026 infy_del (EV_A_ w); 2174 infy_del (EV_A_ w);
2052} 2200}
2053 2201
2054void 2202void
2055ev_idle_stop (EV_P_ ev_idle *w) 2203ev_idle_stop (EV_P_ ev_idle *w)
2056{ 2204{
2057 ev_clear_pending (EV_A_ (W)w); 2205 clear_pending (EV_A_ (W)w);
2058 if (expect_false (!ev_is_active (w))) 2206 if (expect_false (!ev_is_active (w)))
2059 return; 2207 return;
2060 2208
2061 { 2209 {
2062 int active = ((W)w)->active; 2210 int active = ((W)w)->active;
2082} 2230}
2083 2231
2084void 2232void
2085ev_prepare_stop (EV_P_ ev_prepare *w) 2233ev_prepare_stop (EV_P_ ev_prepare *w)
2086{ 2234{
2087 ev_clear_pending (EV_A_ (W)w); 2235 clear_pending (EV_A_ (W)w);
2088 if (expect_false (!ev_is_active (w))) 2236 if (expect_false (!ev_is_active (w)))
2089 return; 2237 return;
2090 2238
2091 { 2239 {
2092 int active = ((W)w)->active; 2240 int active = ((W)w)->active;
2109} 2257}
2110 2258
2111void 2259void
2112ev_check_stop (EV_P_ ev_check *w) 2260ev_check_stop (EV_P_ ev_check *w)
2113{ 2261{
2114 ev_clear_pending (EV_A_ (W)w); 2262 clear_pending (EV_A_ (W)w);
2115 if (expect_false (!ev_is_active (w))) 2263 if (expect_false (!ev_is_active (w)))
2116 return; 2264 return;
2117 2265
2118 { 2266 {
2119 int active = ((W)w)->active; 2267 int active = ((W)w)->active;
2126 2274
2127#if EV_EMBED_ENABLE 2275#if EV_EMBED_ENABLE
2128void noinline 2276void noinline
2129ev_embed_sweep (EV_P_ ev_embed *w) 2277ev_embed_sweep (EV_P_ ev_embed *w)
2130{ 2278{
2131 ev_loop (w->loop, EVLOOP_NONBLOCK); 2279 ev_loop (w->other, EVLOOP_NONBLOCK);
2132} 2280}
2133 2281
2134static void 2282static void
2135embed_cb (EV_P_ ev_io *io, int revents) 2283embed_io_cb (EV_P_ ev_io *io, int revents)
2136{ 2284{
2137 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2285 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2138 2286
2139 if (ev_cb (w)) 2287 if (ev_cb (w))
2140 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2288 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2141 else 2289 else
2142 ev_embed_sweep (loop, w); 2290 ev_loop (w->other, EVLOOP_NONBLOCK);
2143} 2291}
2292
2293static void
2294embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2295{
2296 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2297
2298 {
2299 struct ev_loop *loop = w->other;
2300
2301 while (fdchangecnt)
2302 {
2303 fd_reify (EV_A);
2304 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2305 }
2306 }
2307}
2308
2309#if 0
2310static void
2311embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2312{
2313 ev_idle_stop (EV_A_ idle);
2314}
2315#endif
2144 2316
2145void 2317void
2146ev_embed_start (EV_P_ ev_embed *w) 2318ev_embed_start (EV_P_ ev_embed *w)
2147{ 2319{
2148 if (expect_false (ev_is_active (w))) 2320 if (expect_false (ev_is_active (w)))
2149 return; 2321 return;
2150 2322
2151 { 2323 {
2152 struct ev_loop *loop = w->loop; 2324 struct ev_loop *loop = w->other;
2153 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2325 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2154 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2326 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2155 } 2327 }
2156 2328
2157 ev_set_priority (&w->io, ev_priority (w)); 2329 ev_set_priority (&w->io, ev_priority (w));
2158 ev_io_start (EV_A_ &w->io); 2330 ev_io_start (EV_A_ &w->io);
2159 2331
2332 ev_prepare_init (&w->prepare, embed_prepare_cb);
2333 ev_set_priority (&w->prepare, EV_MINPRI);
2334 ev_prepare_start (EV_A_ &w->prepare);
2335
2336 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2337
2160 ev_start (EV_A_ (W)w, 1); 2338 ev_start (EV_A_ (W)w, 1);
2161} 2339}
2162 2340
2163void 2341void
2164ev_embed_stop (EV_P_ ev_embed *w) 2342ev_embed_stop (EV_P_ ev_embed *w)
2165{ 2343{
2166 ev_clear_pending (EV_A_ (W)w); 2344 clear_pending (EV_A_ (W)w);
2167 if (expect_false (!ev_is_active (w))) 2345 if (expect_false (!ev_is_active (w)))
2168 return; 2346 return;
2169 2347
2170 ev_io_stop (EV_A_ &w->io); 2348 ev_io_stop (EV_A_ &w->io);
2349 ev_prepare_stop (EV_A_ &w->prepare);
2171 2350
2172 ev_stop (EV_A_ (W)w); 2351 ev_stop (EV_A_ (W)w);
2173} 2352}
2174#endif 2353#endif
2175 2354
2186} 2365}
2187 2366
2188void 2367void
2189ev_fork_stop (EV_P_ ev_fork *w) 2368ev_fork_stop (EV_P_ ev_fork *w)
2190{ 2369{
2191 ev_clear_pending (EV_A_ (W)w); 2370 clear_pending (EV_A_ (W)w);
2192 if (expect_false (!ev_is_active (w))) 2371 if (expect_false (!ev_is_active (w)))
2193 return; 2372 return;
2194 2373
2195 { 2374 {
2196 int active = ((W)w)->active; 2375 int active = ((W)w)->active;
2264 ev_timer_set (&once->to, timeout, 0.); 2443 ev_timer_set (&once->to, timeout, 0.);
2265 ev_timer_start (EV_A_ &once->to); 2444 ev_timer_start (EV_A_ &once->to);
2266 } 2445 }
2267} 2446}
2268 2447
2448#if EV_MULTIPLICITY
2449 #include "ev_wrap.h"
2450#endif
2451
2269#ifdef __cplusplus 2452#ifdef __cplusplus
2270} 2453}
2271#endif 2454#endif
2272 2455

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines