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

Comparing libev/ev.c (file contents):
Revision 1.199 by root, Tue Dec 25 07:05:45 2007 UTC vs.
Revision 1.240 by root, Thu May 8 21:21:41 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 modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
39 39
40#ifdef __cplusplus 40#ifdef __cplusplus
41extern "C" { 41extern "C" {
42#endif 42#endif
43 43
44/* this big block deduces configuration from config.h */
44#ifndef EV_STANDALONE 45#ifndef EV_STANDALONE
45# ifdef EV_CONFIG_H 46# ifdef EV_CONFIG_H
46# include EV_CONFIG_H 47# include EV_CONFIG_H
47# else 48# else
48# include "config.h" 49# include "config.h"
… …
118# else 119# else
119# define EV_USE_INOTIFY 0 120# define EV_USE_INOTIFY 0
120# endif 121# endif
121# endif 122# endif
122 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
123#endif 132#endif
124 133
125#include <math.h> 134#include <math.h>
126#include <stdlib.h> 135#include <stdlib.h>
127#include <fcntl.h> 136#include <fcntl.h>
… …
152# ifndef EV_SELECT_IS_WINSOCKET 161# ifndef EV_SELECT_IS_WINSOCKET
153# define EV_SELECT_IS_WINSOCKET 1 162# define EV_SELECT_IS_WINSOCKET 1
154# endif 163# endif
155#endif 164#endif
156 165
157/**/ 166/* this block tries to deduce configuration from header-defined symbols and defaults */
158 167
159#ifndef EV_USE_MONOTONIC 168#ifndef EV_USE_MONOTONIC
160# define EV_USE_MONOTONIC 0 169# define EV_USE_MONOTONIC 0
161#endif 170#endif
162 171
… …
179# define EV_USE_POLL 1 188# define EV_USE_POLL 1
180# endif 189# endif
181#endif 190#endif
182 191
183#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
184# define EV_USE_EPOLL 0 196# define EV_USE_EPOLL 0
197# endif
185#endif 198#endif
186 199
187#ifndef EV_USE_KQUEUE 200#ifndef EV_USE_KQUEUE
188# define EV_USE_KQUEUE 0 201# define EV_USE_KQUEUE 0
189#endif 202#endif
… …
191#ifndef EV_USE_PORT 204#ifndef EV_USE_PORT
192# define EV_USE_PORT 0 205# define EV_USE_PORT 0
193#endif 206#endif
194 207
195#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
196# define EV_USE_INOTIFY 0 212# define EV_USE_INOTIFY 0
213# endif
197#endif 214#endif
198 215
199#ifndef EV_PID_HASHSIZE 216#ifndef EV_PID_HASHSIZE
200# if EV_MINIMAL 217# if EV_MINIMAL
201# define EV_PID_HASHSIZE 1 218# define EV_PID_HASHSIZE 1
… …
210# else 227# else
211# define EV_INOTIFY_HASHSIZE 16 228# define EV_INOTIFY_HASHSIZE 16
212# endif 229# endif
213#endif 230#endif
214 231
215/**/ 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 */
216 241
217#ifndef CLOCK_MONOTONIC 242#ifndef CLOCK_MONOTONIC
218# undef EV_USE_MONOTONIC 243# undef EV_USE_MONOTONIC
219# define EV_USE_MONOTONIC 0 244# define EV_USE_MONOTONIC 0
220#endif 245#endif
… …
239# include <sys/inotify.h> 264# include <sys/inotify.h>
240#endif 265#endif
241 266
242#if EV_SELECT_IS_WINSOCKET 267#if EV_SELECT_IS_WINSOCKET
243# include <winsock.h> 268# include <winsock.h>
269#endif
270
271#if EV_USE_EVENTFD
272/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
273# include <stdint.h>
274# ifdef __cplusplus
275extern "C" {
276# endif
277int eventfd (unsigned int initval, int flags);
278# ifdef __cplusplus
279}
280# endif
244#endif 281#endif
245 282
246/**/ 283/**/
247 284
248/* 285/*
… …
263# define expect(expr,value) __builtin_expect ((expr),(value)) 300# define expect(expr,value) __builtin_expect ((expr),(value))
264# define noinline __attribute__ ((noinline)) 301# define noinline __attribute__ ((noinline))
265#else 302#else
266# define expect(expr,value) (expr) 303# define expect(expr,value) (expr)
267# define noinline 304# define noinline
268# if __STDC_VERSION__ < 199901L 305# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
269# define inline 306# define inline
270# endif 307# endif
271#endif 308#endif
272 309
273#define expect_false(expr) expect ((expr) != 0, 0) 310#define expect_false(expr) expect ((expr) != 0, 0)
… …
288 325
289typedef ev_watcher *W; 326typedef ev_watcher *W;
290typedef ev_watcher_list *WL; 327typedef ev_watcher_list *WL;
291typedef ev_watcher_time *WT; 328typedef ev_watcher_time *WT;
292 329
330#define ev_active(w) ((W)(w))->active
331#define ev_at(w) ((WT)(w))->at
332
293#if EV_USE_MONOTONIC 333#if EV_USE_MONOTONIC
294/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 334/* 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 */ 335/* giving it a reasonably high chance of working on typical architetcures */
296static sig_atomic_t have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 336static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
297#endif 337#endif
298 338
299#ifdef _WIN32 339#ifdef _WIN32
300# include "ev_win32.c" 340# include "ev_win32.c"
301#endif 341#endif
… …
323 perror (msg); 363 perror (msg);
324 abort (); 364 abort ();
325 } 365 }
326} 366}
327 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
328static void *(*alloc)(void *ptr, long size); 383static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
329 384
330void 385void
331ev_set_allocator (void *(*cb)(void *ptr, long size)) 386ev_set_allocator (void *(*cb)(void *ptr, long size))
332{ 387{
333 alloc = cb; 388 alloc = cb;
334} 389}
335 390
336inline_speed void * 391inline_speed void *
337ev_realloc (void *ptr, long size) 392ev_realloc (void *ptr, long size)
338{ 393{
339 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 394 ptr = alloc (ptr, size);
340 395
341 if (!ptr && size) 396 if (!ptr && size)
342 { 397 {
343 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 398 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
344 abort (); 399 abort ();
… …
451 ts.tv_sec = (time_t)delay; 506 ts.tv_sec = (time_t)delay;
452 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9); 507 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
453 508
454 nanosleep (&ts, 0); 509 nanosleep (&ts, 0);
455#elif defined(_WIN32) 510#elif defined(_WIN32)
456 Sleep (delay * 1e3); 511 Sleep ((unsigned long)(delay * 1e3));
457#else 512#else
458 struct timeval tv; 513 struct timeval tv;
459 514
460 tv.tv_sec = (time_t)delay; 515 tv.tv_sec = (time_t)delay;
461 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 516 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
… …
464#endif 519#endif
465 } 520 }
466} 521}
467 522
468/*****************************************************************************/ 523/*****************************************************************************/
524
525#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
469 526
470int inline_size 527int inline_size
471array_nextsize (int elem, int cur, int cnt) 528array_nextsize (int elem, int cur, int cnt)
472{ 529{
473 int ncur = cur + 1; 530 int ncur = cur + 1;
474 531
475 do 532 do
476 ncur <<= 1; 533 ncur <<= 1;
477 while (cnt > ncur); 534 while (cnt > ncur);
478 535
479 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */ 536 /* if size is large, round to MALLOC_ROUND - 4 * longs to accomodate malloc overhead */
480 if (elem * ncur > 4096) 537 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
481 { 538 {
482 ncur *= elem; 539 ncur *= elem;
483 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095; 540 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
484 ncur = ncur - sizeof (void *) * 4; 541 ncur = ncur - sizeof (void *) * 4;
485 ncur /= elem; 542 ncur /= elem;
486 } 543 }
487 544
488 return ncur; 545 return ncur;
… …
600 657
601#if EV_SELECT_IS_WINSOCKET 658#if EV_SELECT_IS_WINSOCKET
602 if (events) 659 if (events)
603 { 660 {
604 unsigned long argp; 661 unsigned long argp;
662 #ifdef EV_FD_TO_WIN32_HANDLE
663 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
664 #else
605 anfd->handle = _get_osfhandle (fd); 665 anfd->handle = _get_osfhandle (fd);
666 #endif
606 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 667 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
607 } 668 }
608#endif 669#endif
609 670
610 { 671 {
… …
698 } 759 }
699} 760}
700 761
701/*****************************************************************************/ 762/*****************************************************************************/
702 763
764/*
765 * at the moment we allow libev the luxury of two heaps,
766 * a small-code-size 2-heap one and a ~1.5kb larger 4-heap
767 * which is more cache-efficient.
768 * the difference is about 5% with 50000+ watchers.
769 */
770#define USE_4HEAP !EV_MINIMAL
771#if USE_4HEAP
772
773#define DHEAP 4
774#define HEAP0 (DHEAP - 1) /* index of first element in heap */
775
776/* towards the root */
703void inline_speed 777void inline_speed
704upheap (WT *heap, int k) 778upheap (WT *heap, int k)
705{ 779{
706 WT w = heap [k]; 780 WT w = heap [k];
781 ev_tstamp w_at = w->at;
707 782
708 while (k) 783 for (;;)
709 { 784 {
710 int p = (k - 1) >> 1; 785 int p = ((k - HEAP0 - 1) / DHEAP) + HEAP0;
711 786
712 if (heap [p]->at <= w->at) 787 if (p == k || heap [p]->at <= w_at)
713 break; 788 break;
714 789
715 heap [k] = heap [p]; 790 heap [k] = heap [p];
716 ((W)heap [k])->active = k + 1; 791 ev_active (heap [k]) = k;
717 k = p; 792 k = p;
718 } 793 }
719 794
720 heap [k] = w; 795 heap [k] = w;
721 ((W)heap [k])->active = k + 1; 796 ev_active (heap [k]) = k;
722} 797}
723 798
799/* away from the root */
724void inline_speed 800void inline_speed
725downheap (WT *heap, int N, int k) 801downheap (WT *heap, int N, int k)
726{ 802{
727 WT w = heap [k]; 803 WT w = heap [k];
804 WT *E = heap + N + HEAP0;
728 805
729 for (;;) 806 for (;;)
730 { 807 {
808 ev_tstamp minat;
809 WT *minpos;
810 WT *pos = heap + DHEAP * (k - HEAP0) + HEAP0;
811
812 // find minimum child
813 if (expect_true (pos + DHEAP - 1 < E))
814 {
815 /* fast path */ (minpos = pos + 0), (minat = (*minpos)->at);
816 if (pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at);
817 if (pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at);
818 if (pos [3]->at < minat) (minpos = pos + 3), (minat = (*minpos)->at);
819 }
820 else if (pos < E)
821 {
822 /* slow path */ (minpos = pos + 0), (minat = (*minpos)->at);
823 if (pos + 1 < E && pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at);
824 if (pos + 2 < E && pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at);
825 if (pos + 3 < E && pos [3]->at < minat) (minpos = pos + 3), (minat = (*minpos)->at);
826 }
827 else
828 break;
829
830 if (w->at <= minat)
831 break;
832
833 ev_active (*minpos) = k;
834 heap [k] = *minpos;
835
836 k = minpos - heap;
837 }
838
839 heap [k] = w;
840 ev_active (heap [k]) = k;
841}
842
843#else // 4HEAP
844
845#define HEAP0 1
846
847/* towards the root */
848void inline_speed
849upheap (WT *heap, int k)
850{
851 WT w = heap [k];
852
853 for (;;)
854 {
855 int p = k >> 1;
856
857 /* maybe we could use a dummy element at heap [0]? */
858 if (!p || heap [p]->at <= w->at)
859 break;
860
861 heap [k] = heap [p];
862 ev_active (heap [k]) = k;
863 k = p;
864 }
865
866 heap [k] = w;
867 ev_active (heap [k]) = k;
868}
869
870/* away from the root */
871void inline_speed
872downheap (WT *heap, int N, int k)
873{
874 WT w = heap [k];
875
876 for (;;)
877 {
731 int c = (k << 1) + 1; 878 int c = k << 1;
732 879
733 if (c >= N) 880 if (c > N)
734 break; 881 break;
735 882
736 c += c + 1 < N && heap [c]->at > heap [c + 1]->at 883 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
737 ? 1 : 0; 884 ? 1 : 0;
738 885
739 if (w->at <= heap [c]->at) 886 if (w->at <= heap [c]->at)
740 break; 887 break;
741 888
742 heap [k] = heap [c]; 889 heap [k] = heap [c];
743 ((W)heap [k])->active = k + 1; 890 ((W)heap [k])->active = k;
744 891
745 k = c; 892 k = c;
746 } 893 }
747 894
748 heap [k] = w; 895 heap [k] = w;
749 ((W)heap [k])->active = k + 1; 896 ev_active (heap [k]) = k;
750} 897}
898#endif
751 899
752void inline_size 900void inline_size
753adjustheap (WT *heap, int N, int k) 901adjustheap (WT *heap, int N, int k)
754{ 902{
755 upheap (heap, k); 903 upheap (heap, k);
… …
759/*****************************************************************************/ 907/*****************************************************************************/
760 908
761typedef struct 909typedef struct
762{ 910{
763 WL head; 911 WL head;
764 sig_atomic_t volatile gotsig; 912 EV_ATOMIC_T gotsig;
765} ANSIG; 913} ANSIG;
766 914
767static ANSIG *signals; 915static ANSIG *signals;
768static int signalmax; 916static int signalmax;
769 917
770static int sigpipe [2]; 918static EV_ATOMIC_T gotsig;
771static sig_atomic_t volatile gotsig;
772static ev_io sigev;
773 919
774void inline_size 920void inline_size
775signals_init (ANSIG *base, int count) 921signals_init (ANSIG *base, int count)
776{ 922{
777 while (count--) 923 while (count--)
… …
781 927
782 ++base; 928 ++base;
783 } 929 }
784} 930}
785 931
786static void 932/*****************************************************************************/
787sighandler (int signum)
788{
789#if _WIN32
790 signal (signum, sighandler);
791#endif
792
793 signals [signum - 1].gotsig = 1;
794
795 if (!gotsig)
796 {
797 int old_errno = errno;
798 gotsig = 1;
799 write (sigpipe [1], &signum, 1);
800 errno = old_errno;
801 }
802}
803
804void noinline
805ev_feed_signal_event (EV_P_ int signum)
806{
807 WL w;
808
809#if EV_MULTIPLICITY
810 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
811#endif
812
813 --signum;
814
815 if (signum < 0 || signum >= signalmax)
816 return;
817
818 signals [signum].gotsig = 0;
819
820 for (w = signals [signum].head; w; w = w->next)
821 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
822}
823
824static void
825sigcb (EV_P_ ev_io *iow, int revents)
826{
827 int signum;
828
829 read (sigpipe [0], &revents, 1);
830 gotsig = 0;
831
832 for (signum = signalmax; signum--; )
833 if (signals [signum].gotsig)
834 ev_feed_signal_event (EV_A_ signum + 1);
835}
836 933
837void inline_speed 934void inline_speed
838fd_intern (int fd) 935fd_intern (int fd)
839{ 936{
840#ifdef _WIN32 937#ifdef _WIN32
… …
845 fcntl (fd, F_SETFL, O_NONBLOCK); 942 fcntl (fd, F_SETFL, O_NONBLOCK);
846#endif 943#endif
847} 944}
848 945
849static void noinline 946static void noinline
850siginit (EV_P) 947evpipe_init (EV_P)
851{ 948{
949 if (!ev_is_active (&pipeev))
950 {
951#if EV_USE_EVENTFD
952 if ((evfd = eventfd (0, 0)) >= 0)
953 {
954 evpipe [0] = -1;
955 fd_intern (evfd);
956 ev_io_set (&pipeev, evfd, EV_READ);
957 }
958 else
959#endif
960 {
961 while (pipe (evpipe))
962 syserr ("(libev) error creating signal/async pipe");
963
852 fd_intern (sigpipe [0]); 964 fd_intern (evpipe [0]);
853 fd_intern (sigpipe [1]); 965 fd_intern (evpipe [1]);
966 ev_io_set (&pipeev, evpipe [0], EV_READ);
967 }
854 968
855 ev_io_set (&sigev, sigpipe [0], EV_READ);
856 ev_io_start (EV_A_ &sigev); 969 ev_io_start (EV_A_ &pipeev);
857 ev_unref (EV_A); /* child watcher should not keep loop alive */ 970 ev_unref (EV_A); /* watcher should not keep loop alive */
971 }
972}
973
974void inline_size
975evpipe_write (EV_P_ EV_ATOMIC_T *flag)
976{
977 if (!*flag)
978 {
979 int old_errno = errno; /* save errno because write might clobber it */
980
981 *flag = 1;
982
983#if EV_USE_EVENTFD
984 if (evfd >= 0)
985 {
986 uint64_t counter = 1;
987 write (evfd, &counter, sizeof (uint64_t));
988 }
989 else
990#endif
991 write (evpipe [1], &old_errno, 1);
992
993 errno = old_errno;
994 }
995}
996
997static void
998pipecb (EV_P_ ev_io *iow, int revents)
999{
1000#if EV_USE_EVENTFD
1001 if (evfd >= 0)
1002 {
1003 uint64_t counter;
1004 read (evfd, &counter, sizeof (uint64_t));
1005 }
1006 else
1007#endif
1008 {
1009 char dummy;
1010 read (evpipe [0], &dummy, 1);
1011 }
1012
1013 if (gotsig && ev_is_default_loop (EV_A))
1014 {
1015 int signum;
1016 gotsig = 0;
1017
1018 for (signum = signalmax; signum--; )
1019 if (signals [signum].gotsig)
1020 ev_feed_signal_event (EV_A_ signum + 1);
1021 }
1022
1023#if EV_ASYNC_ENABLE
1024 if (gotasync)
1025 {
1026 int i;
1027 gotasync = 0;
1028
1029 for (i = asynccnt; i--; )
1030 if (asyncs [i]->sent)
1031 {
1032 asyncs [i]->sent = 0;
1033 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
1034 }
1035 }
1036#endif
858} 1037}
859 1038
860/*****************************************************************************/ 1039/*****************************************************************************/
861 1040
1041static void
1042ev_sighandler (int signum)
1043{
1044#if EV_MULTIPLICITY
1045 struct ev_loop *loop = &default_loop_struct;
1046#endif
1047
1048#if _WIN32
1049 signal (signum, ev_sighandler);
1050#endif
1051
1052 signals [signum - 1].gotsig = 1;
1053 evpipe_write (EV_A_ &gotsig);
1054}
1055
1056void noinline
1057ev_feed_signal_event (EV_P_ int signum)
1058{
1059 WL w;
1060
1061#if EV_MULTIPLICITY
1062 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
1063#endif
1064
1065 --signum;
1066
1067 if (signum < 0 || signum >= signalmax)
1068 return;
1069
1070 signals [signum].gotsig = 0;
1071
1072 for (w = signals [signum].head; w; w = w->next)
1073 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1074}
1075
1076/*****************************************************************************/
1077
862static WL childs [EV_PID_HASHSIZE]; 1078static WL childs [EV_PID_HASHSIZE];
863 1079
864#ifndef _WIN32 1080#ifndef _WIN32
865 1081
866static ev_signal childev; 1082static ev_signal childev;
867 1083
1084#ifndef WIFCONTINUED
1085# define WIFCONTINUED(status) 0
1086#endif
1087
868void inline_speed 1088void inline_speed
869child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1089child_reap (EV_P_ int chain, int pid, int status)
870{ 1090{
871 ev_child *w; 1091 ev_child *w;
1092 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
872 1093
873 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1094 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1095 {
874 if (w->pid == pid || !w->pid) 1096 if ((w->pid == pid || !w->pid)
1097 && (!traced || (w->flags & 1)))
875 { 1098 {
876 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 1099 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
877 w->rpid = pid; 1100 w->rpid = pid;
878 w->rstatus = status; 1101 w->rstatus = status;
879 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1102 ev_feed_event (EV_A_ (W)w, EV_CHILD);
880 } 1103 }
1104 }
881} 1105}
882 1106
883#ifndef WCONTINUED 1107#ifndef WCONTINUED
884# define WCONTINUED 0 1108# define WCONTINUED 0
885#endif 1109#endif
… …
894 if (!WCONTINUED 1118 if (!WCONTINUED
895 || errno != EINVAL 1119 || errno != EINVAL
896 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1120 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
897 return; 1121 return;
898 1122
899 /* make sure we are called again until all childs have been reaped */ 1123 /* make sure we are called again until all children have been reaped */
900 /* we need to do it this way so that the callback gets called before we continue */ 1124 /* we need to do it this way so that the callback gets called before we continue */
901 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1125 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
902 1126
903 child_reap (EV_A_ sw, pid, pid, status); 1127 child_reap (EV_A_ pid, pid, status);
904 if (EV_PID_HASHSIZE > 1) 1128 if (EV_PID_HASHSIZE > 1)
905 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1129 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
906} 1130}
907 1131
908#endif 1132#endif
909 1133
910/*****************************************************************************/ 1134/*****************************************************************************/
… …
1028 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1252 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1029 have_monotonic = 1; 1253 have_monotonic = 1;
1030 } 1254 }
1031#endif 1255#endif
1032 1256
1033 ev_rt_now = ev_time (); 1257 ev_rt_now = ev_time ();
1034 mn_now = get_clock (); 1258 mn_now = get_clock ();
1035 now_floor = mn_now; 1259 now_floor = mn_now;
1036 rtmn_diff = ev_rt_now - mn_now; 1260 rtmn_diff = ev_rt_now - mn_now;
1037 1261
1038 io_blocktime = 0.; 1262 io_blocktime = 0.;
1039 timeout_blocktime = 0.; 1263 timeout_blocktime = 0.;
1264 backend = 0;
1265 backend_fd = -1;
1266 gotasync = 0;
1267#if EV_USE_INOTIFY
1268 fs_fd = -2;
1269#endif
1040 1270
1041 /* pid check not overridable via env */ 1271 /* pid check not overridable via env */
1042#ifndef _WIN32 1272#ifndef _WIN32
1043 if (flags & EVFLAG_FORKCHECK) 1273 if (flags & EVFLAG_FORKCHECK)
1044 curpid = getpid (); 1274 curpid = getpid ();
… …
1047 if (!(flags & EVFLAG_NOENV) 1277 if (!(flags & EVFLAG_NOENV)
1048 && !enable_secure () 1278 && !enable_secure ()
1049 && getenv ("LIBEV_FLAGS")) 1279 && getenv ("LIBEV_FLAGS"))
1050 flags = atoi (getenv ("LIBEV_FLAGS")); 1280 flags = atoi (getenv ("LIBEV_FLAGS"));
1051 1281
1052 if (!(flags & 0x0000ffffUL)) 1282 if (!(flags & 0x0000ffffU))
1053 flags |= ev_recommended_backends (); 1283 flags |= ev_recommended_backends ();
1054
1055 backend = 0;
1056 backend_fd = -1;
1057#if EV_USE_INOTIFY
1058 fs_fd = -2;
1059#endif
1060 1284
1061#if EV_USE_PORT 1285#if EV_USE_PORT
1062 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1286 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1063#endif 1287#endif
1064#if EV_USE_KQUEUE 1288#if EV_USE_KQUEUE
… …
1072#endif 1296#endif
1073#if EV_USE_SELECT 1297#if EV_USE_SELECT
1074 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1298 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1075#endif 1299#endif
1076 1300
1077 ev_init (&sigev, sigcb); 1301 ev_init (&pipeev, pipecb);
1078 ev_set_priority (&sigev, EV_MAXPRI); 1302 ev_set_priority (&pipeev, EV_MAXPRI);
1079 } 1303 }
1080} 1304}
1081 1305
1082static void noinline 1306static void noinline
1083loop_destroy (EV_P) 1307loop_destroy (EV_P)
1084{ 1308{
1085 int i; 1309 int i;
1310
1311 if (ev_is_active (&pipeev))
1312 {
1313 ev_ref (EV_A); /* signal watcher */
1314 ev_io_stop (EV_A_ &pipeev);
1315
1316#if EV_USE_EVENTFD
1317 if (evfd >= 0)
1318 close (evfd);
1319#endif
1320
1321 if (evpipe [0] >= 0)
1322 {
1323 close (evpipe [0]);
1324 close (evpipe [1]);
1325 }
1326 }
1086 1327
1087#if EV_USE_INOTIFY 1328#if EV_USE_INOTIFY
1088 if (fs_fd >= 0) 1329 if (fs_fd >= 0)
1089 close (fs_fd); 1330 close (fs_fd);
1090#endif 1331#endif
… …
1127#if EV_FORK_ENABLE 1368#if EV_FORK_ENABLE
1128 array_free (fork, EMPTY); 1369 array_free (fork, EMPTY);
1129#endif 1370#endif
1130 array_free (prepare, EMPTY); 1371 array_free (prepare, EMPTY);
1131 array_free (check, EMPTY); 1372 array_free (check, EMPTY);
1373#if EV_ASYNC_ENABLE
1374 array_free (async, EMPTY);
1375#endif
1132 1376
1133 backend = 0; 1377 backend = 0;
1134} 1378}
1135 1379
1380#if EV_USE_INOTIFY
1136void inline_size infy_fork (EV_P); 1381void inline_size infy_fork (EV_P);
1382#endif
1137 1383
1138void inline_size 1384void inline_size
1139loop_fork (EV_P) 1385loop_fork (EV_P)
1140{ 1386{
1141#if EV_USE_PORT 1387#if EV_USE_PORT
… …
1149#endif 1395#endif
1150#if EV_USE_INOTIFY 1396#if EV_USE_INOTIFY
1151 infy_fork (EV_A); 1397 infy_fork (EV_A);
1152#endif 1398#endif
1153 1399
1154 if (ev_is_active (&sigev)) 1400 if (ev_is_active (&pipeev))
1155 { 1401 {
1156 /* default loop */ 1402 /* this "locks" the handlers against writing to the pipe */
1403 /* while we modify the fd vars */
1404 gotsig = 1;
1405#if EV_ASYNC_ENABLE
1406 gotasync = 1;
1407#endif
1157 1408
1158 ev_ref (EV_A); 1409 ev_ref (EV_A);
1159 ev_io_stop (EV_A_ &sigev); 1410 ev_io_stop (EV_A_ &pipeev);
1411
1412#if EV_USE_EVENTFD
1413 if (evfd >= 0)
1414 close (evfd);
1415#endif
1416
1417 if (evpipe [0] >= 0)
1418 {
1160 close (sigpipe [0]); 1419 close (evpipe [0]);
1161 close (sigpipe [1]); 1420 close (evpipe [1]);
1421 }
1162 1422
1163 while (pipe (sigpipe))
1164 syserr ("(libev) error creating pipe");
1165
1166 siginit (EV_A); 1423 evpipe_init (EV_A);
1424 /* now iterate over everything, in case we missed something */
1425 pipecb (EV_A_ &pipeev, EV_READ);
1167 } 1426 }
1168 1427
1169 postfork = 0; 1428 postfork = 0;
1170} 1429}
1171 1430
… …
1193} 1452}
1194 1453
1195void 1454void
1196ev_loop_fork (EV_P) 1455ev_loop_fork (EV_P)
1197{ 1456{
1198 postfork = 1; 1457 postfork = 1; /* must be in line with ev_default_fork */
1199} 1458}
1200
1201#endif 1459#endif
1202 1460
1203#if EV_MULTIPLICITY 1461#if EV_MULTIPLICITY
1204struct ev_loop * 1462struct ev_loop *
1205ev_default_loop_init (unsigned int flags) 1463ev_default_loop_init (unsigned int flags)
1206#else 1464#else
1207int 1465int
1208ev_default_loop (unsigned int flags) 1466ev_default_loop (unsigned int flags)
1209#endif 1467#endif
1210{ 1468{
1211 if (sigpipe [0] == sigpipe [1])
1212 if (pipe (sigpipe))
1213 return 0;
1214
1215 if (!ev_default_loop_ptr) 1469 if (!ev_default_loop_ptr)
1216 { 1470 {
1217#if EV_MULTIPLICITY 1471#if EV_MULTIPLICITY
1218 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1472 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1219#else 1473#else
… …
1222 1476
1223 loop_init (EV_A_ flags); 1477 loop_init (EV_A_ flags);
1224 1478
1225 if (ev_backend (EV_A)) 1479 if (ev_backend (EV_A))
1226 { 1480 {
1227 siginit (EV_A);
1228
1229#ifndef _WIN32 1481#ifndef _WIN32
1230 ev_signal_init (&childev, childcb, SIGCHLD); 1482 ev_signal_init (&childev, childcb, SIGCHLD);
1231 ev_set_priority (&childev, EV_MAXPRI); 1483 ev_set_priority (&childev, EV_MAXPRI);
1232 ev_signal_start (EV_A_ &childev); 1484 ev_signal_start (EV_A_ &childev);
1233 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1485 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1250#ifndef _WIN32 1502#ifndef _WIN32
1251 ev_ref (EV_A); /* child watcher */ 1503 ev_ref (EV_A); /* child watcher */
1252 ev_signal_stop (EV_A_ &childev); 1504 ev_signal_stop (EV_A_ &childev);
1253#endif 1505#endif
1254 1506
1255 ev_ref (EV_A); /* signal watcher */
1256 ev_io_stop (EV_A_ &sigev);
1257
1258 close (sigpipe [0]); sigpipe [0] = 0;
1259 close (sigpipe [1]); sigpipe [1] = 0;
1260
1261 loop_destroy (EV_A); 1507 loop_destroy (EV_A);
1262} 1508}
1263 1509
1264void 1510void
1265ev_default_fork (void) 1511ev_default_fork (void)
… …
1267#if EV_MULTIPLICITY 1513#if EV_MULTIPLICITY
1268 struct ev_loop *loop = ev_default_loop_ptr; 1514 struct ev_loop *loop = ev_default_loop_ptr;
1269#endif 1515#endif
1270 1516
1271 if (backend) 1517 if (backend)
1272 postfork = 1; 1518 postfork = 1; /* must be in line with ev_loop_fork */
1273} 1519}
1274 1520
1275/*****************************************************************************/ 1521/*****************************************************************************/
1276 1522
1277void 1523void
… …
1297 p->w->pending = 0; 1543 p->w->pending = 0;
1298 EV_CB_INVOKE (p->w, p->events); 1544 EV_CB_INVOKE (p->w, p->events);
1299 } 1545 }
1300 } 1546 }
1301} 1547}
1302
1303void inline_size
1304timers_reify (EV_P)
1305{
1306 while (timercnt && ((WT)timers [0])->at <= mn_now)
1307 {
1308 ev_timer *w = (ev_timer *)timers [0];
1309
1310 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1311
1312 /* first reschedule or stop timer */
1313 if (w->repeat)
1314 {
1315 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1316
1317 ((WT)w)->at += w->repeat;
1318 if (((WT)w)->at < mn_now)
1319 ((WT)w)->at = mn_now;
1320
1321 downheap (timers, timercnt, 0);
1322 }
1323 else
1324 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1325
1326 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1327 }
1328}
1329
1330#if EV_PERIODIC_ENABLE
1331void inline_size
1332periodics_reify (EV_P)
1333{
1334 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1335 {
1336 ev_periodic *w = (ev_periodic *)periodics [0];
1337
1338 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1339
1340 /* first reschedule or stop timer */
1341 if (w->reschedule_cb)
1342 {
1343 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1344 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1345 downheap (periodics, periodiccnt, 0);
1346 }
1347 else if (w->interval)
1348 {
1349 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1350 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1351 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1352 downheap (periodics, periodiccnt, 0);
1353 }
1354 else
1355 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1356
1357 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1358 }
1359}
1360
1361static void noinline
1362periodics_reschedule (EV_P)
1363{
1364 int i;
1365
1366 /* adjust periodics after time jump */
1367 for (i = 0; i < periodiccnt; ++i)
1368 {
1369 ev_periodic *w = (ev_periodic *)periodics [i];
1370
1371 if (w->reschedule_cb)
1372 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1373 else if (w->interval)
1374 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1375 }
1376
1377 /* now rebuild the heap */
1378 for (i = periodiccnt >> 1; i--; )
1379 downheap (periodics, periodiccnt, i);
1380}
1381#endif
1382 1548
1383#if EV_IDLE_ENABLE 1549#if EV_IDLE_ENABLE
1384void inline_size 1550void inline_size
1385idle_reify (EV_P) 1551idle_reify (EV_P)
1386{ 1552{
… …
1398 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE); 1564 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1399 break; 1565 break;
1400 } 1566 }
1401 } 1567 }
1402 } 1568 }
1569}
1570#endif
1571
1572void inline_size
1573timers_reify (EV_P)
1574{
1575 while (timercnt && ev_at (timers [HEAP0]) <= mn_now)
1576 {
1577 ev_timer *w = (ev_timer *)timers [HEAP0];
1578
1579 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1580
1581 /* first reschedule or stop timer */
1582 if (w->repeat)
1583 {
1584 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1585
1586 ev_at (w) += w->repeat;
1587 if (ev_at (w) < mn_now)
1588 ev_at (w) = mn_now;
1589
1590 downheap (timers, timercnt, HEAP0);
1591 }
1592 else
1593 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1594
1595 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1596 }
1597}
1598
1599#if EV_PERIODIC_ENABLE
1600void inline_size
1601periodics_reify (EV_P)
1602{
1603 while (periodiccnt && ev_at (periodics [HEAP0]) <= ev_rt_now)
1604 {
1605 ev_periodic *w = (ev_periodic *)periodics [HEAP0];
1606
1607 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1608
1609 /* first reschedule or stop timer */
1610 if (w->reschedule_cb)
1611 {
1612 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1613 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now));
1614 downheap (periodics, periodiccnt, 1);
1615 }
1616 else if (w->interval)
1617 {
1618 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1619 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval;
1620 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now));
1621 downheap (periodics, periodiccnt, HEAP0);
1622 }
1623 else
1624 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1625
1626 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1627 }
1628}
1629
1630static void noinline
1631periodics_reschedule (EV_P)
1632{
1633 int i;
1634
1635 /* adjust periodics after time jump */
1636 for (i = 1; i <= periodiccnt; ++i)
1637 {
1638 ev_periodic *w = (ev_periodic *)periodics [i];
1639
1640 if (w->reschedule_cb)
1641 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1642 else if (w->interval)
1643 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1644 }
1645
1646 /* now rebuild the heap */
1647 for (i = periodiccnt >> 1; --i; )
1648 downheap (periodics, periodiccnt, i + HEAP0);
1403} 1649}
1404#endif 1650#endif
1405 1651
1406void inline_speed 1652void inline_speed
1407time_update (EV_P_ ev_tstamp max_block) 1653time_update (EV_P_ ev_tstamp max_block)
… …
1436 */ 1682 */
1437 for (i = 4; --i; ) 1683 for (i = 4; --i; )
1438 { 1684 {
1439 rtmn_diff = ev_rt_now - mn_now; 1685 rtmn_diff = ev_rt_now - mn_now;
1440 1686
1441 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1687 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1442 return; /* all is well */ 1688 return; /* all is well */
1443 1689
1444 ev_rt_now = ev_time (); 1690 ev_rt_now = ev_time ();
1445 mn_now = get_clock (); 1691 mn_now = get_clock ();
1446 now_floor = mn_now; 1692 now_floor = mn_now;
… …
1461 { 1707 {
1462#if EV_PERIODIC_ENABLE 1708#if EV_PERIODIC_ENABLE
1463 periodics_reschedule (EV_A); 1709 periodics_reschedule (EV_A);
1464#endif 1710#endif
1465 /* adjust timers. this is easy, as the offset is the same for all of them */ 1711 /* adjust timers. this is easy, as the offset is the same for all of them */
1466 for (i = 0; i < timercnt; ++i) 1712 for (i = 1; i <= timercnt; ++i)
1467 ((WT)timers [i])->at += ev_rt_now - mn_now; 1713 ev_at (timers [i]) += ev_rt_now - mn_now;
1468 } 1714 }
1469 1715
1470 mn_now = ev_rt_now; 1716 mn_now = ev_rt_now;
1471 } 1717 }
1472} 1718}
… …
1486static int loop_done; 1732static int loop_done;
1487 1733
1488void 1734void
1489ev_loop (EV_P_ int flags) 1735ev_loop (EV_P_ int flags)
1490{ 1736{
1491 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1737 loop_done = EVUNLOOP_CANCEL;
1492 ? EVUNLOOP_ONE
1493 : EVUNLOOP_CANCEL;
1494 1738
1495 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1739 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1496 1740
1497 do 1741 do
1498 { 1742 {
… …
1544 1788
1545 waittime = MAX_BLOCKTIME; 1789 waittime = MAX_BLOCKTIME;
1546 1790
1547 if (timercnt) 1791 if (timercnt)
1548 { 1792 {
1549 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1793 ev_tstamp to = ev_at (timers [HEAP0]) - mn_now + backend_fudge;
1550 if (waittime > to) waittime = to; 1794 if (waittime > to) waittime = to;
1551 } 1795 }
1552 1796
1553#if EV_PERIODIC_ENABLE 1797#if EV_PERIODIC_ENABLE
1554 if (periodiccnt) 1798 if (periodiccnt)
1555 { 1799 {
1556 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1800 ev_tstamp to = ev_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1557 if (waittime > to) waittime = to; 1801 if (waittime > to) waittime = to;
1558 } 1802 }
1559#endif 1803#endif
1560 1804
1561 if (expect_false (waittime < timeout_blocktime)) 1805 if (expect_false (waittime < timeout_blocktime))
… …
1594 /* queue check watchers, to be executed first */ 1838 /* queue check watchers, to be executed first */
1595 if (expect_false (checkcnt)) 1839 if (expect_false (checkcnt))
1596 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1840 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1597 1841
1598 call_pending (EV_A); 1842 call_pending (EV_A);
1599
1600 } 1843 }
1601 while (expect_true (activecnt && !loop_done)); 1844 while (expect_true (
1845 activecnt
1846 && !loop_done
1847 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1848 ));
1602 1849
1603 if (loop_done == EVUNLOOP_ONE) 1850 if (loop_done == EVUNLOOP_ONE)
1604 loop_done = EVUNLOOP_CANCEL; 1851 loop_done = EVUNLOOP_CANCEL;
1605} 1852}
1606 1853
… …
1724ev_timer_start (EV_P_ ev_timer *w) 1971ev_timer_start (EV_P_ ev_timer *w)
1725{ 1972{
1726 if (expect_false (ev_is_active (w))) 1973 if (expect_false (ev_is_active (w)))
1727 return; 1974 return;
1728 1975
1729 ((WT)w)->at += mn_now; 1976 ev_at (w) += mn_now;
1730 1977
1731 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1978 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1732 1979
1733 ev_start (EV_A_ (W)w, ++timercnt); 1980 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1);
1734 array_needsize (WT, timers, timermax, timercnt, EMPTY2); 1981 array_needsize (WT, timers, timermax, timercnt + HEAP0, EMPTY2);
1735 timers [timercnt - 1] = (WT)w; 1982 timers [ev_active (w)] = (WT)w;
1736 upheap (timers, timercnt - 1); 1983 upheap (timers, ev_active (w));
1737 1984
1738 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1985 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/
1739} 1986}
1740 1987
1741void noinline 1988void noinline
1742ev_timer_stop (EV_P_ ev_timer *w) 1989ev_timer_stop (EV_P_ ev_timer *w)
1743{ 1990{
1744 clear_pending (EV_A_ (W)w); 1991 clear_pending (EV_A_ (W)w);
1745 if (expect_false (!ev_is_active (w))) 1992 if (expect_false (!ev_is_active (w)))
1746 return; 1993 return;
1747 1994
1748 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1749
1750 { 1995 {
1751 int active = ((W)w)->active; 1996 int active = ev_active (w);
1752 1997
1998 assert (("internal timer heap corruption", timers [active] == (WT)w));
1999
1753 if (expect_true (--active < --timercnt)) 2000 if (expect_true (active < timercnt + HEAP0 - 1))
1754 { 2001 {
1755 timers [active] = timers [timercnt]; 2002 timers [active] = timers [timercnt + HEAP0 - 1];
1756 adjustheap (timers, timercnt, active); 2003 adjustheap (timers, timercnt, active);
1757 } 2004 }
2005
2006 --timercnt;
1758 } 2007 }
1759 2008
1760 ((WT)w)->at -= mn_now; 2009 ev_at (w) -= mn_now;
1761 2010
1762 ev_stop (EV_A_ (W)w); 2011 ev_stop (EV_A_ (W)w);
1763} 2012}
1764 2013
1765void noinline 2014void noinline
… …
1767{ 2016{
1768 if (ev_is_active (w)) 2017 if (ev_is_active (w))
1769 { 2018 {
1770 if (w->repeat) 2019 if (w->repeat)
1771 { 2020 {
1772 ((WT)w)->at = mn_now + w->repeat; 2021 ev_at (w) = mn_now + w->repeat;
1773 adjustheap (timers, timercnt, ((W)w)->active - 1); 2022 adjustheap (timers, timercnt, ev_active (w));
1774 } 2023 }
1775 else 2024 else
1776 ev_timer_stop (EV_A_ w); 2025 ev_timer_stop (EV_A_ w);
1777 } 2026 }
1778 else if (w->repeat) 2027 else if (w->repeat)
1779 { 2028 {
1780 w->at = w->repeat; 2029 ev_at (w) = w->repeat;
1781 ev_timer_start (EV_A_ w); 2030 ev_timer_start (EV_A_ w);
1782 } 2031 }
1783} 2032}
1784 2033
1785#if EV_PERIODIC_ENABLE 2034#if EV_PERIODIC_ENABLE
… …
1788{ 2037{
1789 if (expect_false (ev_is_active (w))) 2038 if (expect_false (ev_is_active (w)))
1790 return; 2039 return;
1791 2040
1792 if (w->reschedule_cb) 2041 if (w->reschedule_cb)
1793 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 2042 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1794 else if (w->interval) 2043 else if (w->interval)
1795 { 2044 {
1796 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2045 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1797 /* this formula differs from the one in periodic_reify because we do not always round up */ 2046 /* this formula differs from the one in periodic_reify because we do not always round up */
1798 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2047 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1799 } 2048 }
1800 else 2049 else
1801 ((WT)w)->at = w->offset; 2050 ev_at (w) = w->offset;
1802 2051
1803 ev_start (EV_A_ (W)w, ++periodiccnt); 2052 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1);
1804 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2); 2053 array_needsize (WT, periodics, periodicmax, periodiccnt + HEAP0, EMPTY2);
1805 periodics [periodiccnt - 1] = (WT)w; 2054 periodics [ev_active (w)] = (WT)w;
1806 upheap (periodics, periodiccnt - 1); 2055 upheap (periodics, ev_active (w));
1807 2056
1808 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 2057 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/
1809} 2058}
1810 2059
1811void noinline 2060void noinline
1812ev_periodic_stop (EV_P_ ev_periodic *w) 2061ev_periodic_stop (EV_P_ ev_periodic *w)
1813{ 2062{
1814 clear_pending (EV_A_ (W)w); 2063 clear_pending (EV_A_ (W)w);
1815 if (expect_false (!ev_is_active (w))) 2064 if (expect_false (!ev_is_active (w)))
1816 return; 2065 return;
1817 2066
1818 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1819
1820 { 2067 {
1821 int active = ((W)w)->active; 2068 int active = ev_active (w);
1822 2069
2070 assert (("internal periodic heap corruption", periodics [active] == (WT)w));
2071
1823 if (expect_true (--active < --periodiccnt)) 2072 if (expect_true (active < periodiccnt + HEAP0 - 1))
1824 { 2073 {
1825 periodics [active] = periodics [periodiccnt]; 2074 periodics [active] = periodics [periodiccnt + HEAP0 - 1];
1826 adjustheap (periodics, periodiccnt, active); 2075 adjustheap (periodics, periodiccnt, active);
1827 } 2076 }
2077
2078 --periodiccnt;
1828 } 2079 }
1829 2080
1830 ev_stop (EV_A_ (W)w); 2081 ev_stop (EV_A_ (W)w);
1831} 2082}
1832 2083
… …
1851#endif 2102#endif
1852 if (expect_false (ev_is_active (w))) 2103 if (expect_false (ev_is_active (w)))
1853 return; 2104 return;
1854 2105
1855 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2106 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
2107
2108 evpipe_init (EV_A);
1856 2109
1857 { 2110 {
1858#ifndef _WIN32 2111#ifndef _WIN32
1859 sigset_t full, prev; 2112 sigset_t full, prev;
1860 sigfillset (&full); 2113 sigfillset (&full);
… …
1872 wlist_add (&signals [w->signum - 1].head, (WL)w); 2125 wlist_add (&signals [w->signum - 1].head, (WL)w);
1873 2126
1874 if (!((WL)w)->next) 2127 if (!((WL)w)->next)
1875 { 2128 {
1876#if _WIN32 2129#if _WIN32
1877 signal (w->signum, sighandler); 2130 signal (w->signum, ev_sighandler);
1878#else 2131#else
1879 struct sigaction sa; 2132 struct sigaction sa;
1880 sa.sa_handler = sighandler; 2133 sa.sa_handler = ev_sighandler;
1881 sigfillset (&sa.sa_mask); 2134 sigfillset (&sa.sa_mask);
1882 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2135 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1883 sigaction (w->signum, &sa, 0); 2136 sigaction (w->signum, &sa, 0);
1884#endif 2137#endif
1885 } 2138 }
… …
1946 if (w->wd < 0) 2199 if (w->wd < 0)
1947 { 2200 {
1948 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2201 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1949 2202
1950 /* monitor some parent directory for speedup hints */ 2203 /* monitor some parent directory for speedup hints */
2204 /* note that exceeding the hardcoded limit is not a correctness issue, */
2205 /* but an efficiency issue only */
1951 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2206 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1952 { 2207 {
1953 char path [4096]; 2208 char path [4096];
1954 strcpy (path, w->path); 2209 strcpy (path, w->path);
1955 2210
… …
2200 clear_pending (EV_A_ (W)w); 2455 clear_pending (EV_A_ (W)w);
2201 if (expect_false (!ev_is_active (w))) 2456 if (expect_false (!ev_is_active (w)))
2202 return; 2457 return;
2203 2458
2204 { 2459 {
2205 int active = ((W)w)->active; 2460 int active = ev_active (w);
2206 2461
2207 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2462 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2208 ((W)idles [ABSPRI (w)][active - 1])->active = active; 2463 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2209 2464
2210 ev_stop (EV_A_ (W)w); 2465 ev_stop (EV_A_ (W)w);
2211 --idleall; 2466 --idleall;
2212 } 2467 }
2213} 2468}
… …
2230 clear_pending (EV_A_ (W)w); 2485 clear_pending (EV_A_ (W)w);
2231 if (expect_false (!ev_is_active (w))) 2486 if (expect_false (!ev_is_active (w)))
2232 return; 2487 return;
2233 2488
2234 { 2489 {
2235 int active = ((W)w)->active; 2490 int active = ev_active (w);
2491
2236 prepares [active - 1] = prepares [--preparecnt]; 2492 prepares [active - 1] = prepares [--preparecnt];
2237 ((W)prepares [active - 1])->active = active; 2493 ev_active (prepares [active - 1]) = active;
2238 } 2494 }
2239 2495
2240 ev_stop (EV_A_ (W)w); 2496 ev_stop (EV_A_ (W)w);
2241} 2497}
2242 2498
… …
2257 clear_pending (EV_A_ (W)w); 2513 clear_pending (EV_A_ (W)w);
2258 if (expect_false (!ev_is_active (w))) 2514 if (expect_false (!ev_is_active (w)))
2259 return; 2515 return;
2260 2516
2261 { 2517 {
2262 int active = ((W)w)->active; 2518 int active = ev_active (w);
2519
2263 checks [active - 1] = checks [--checkcnt]; 2520 checks [active - 1] = checks [--checkcnt];
2264 ((W)checks [active - 1])->active = active; 2521 ev_active (checks [active - 1]) = active;
2265 } 2522 }
2266 2523
2267 ev_stop (EV_A_ (W)w); 2524 ev_stop (EV_A_ (W)w);
2268} 2525}
2269 2526
… …
2365 clear_pending (EV_A_ (W)w); 2622 clear_pending (EV_A_ (W)w);
2366 if (expect_false (!ev_is_active (w))) 2623 if (expect_false (!ev_is_active (w)))
2367 return; 2624 return;
2368 2625
2369 { 2626 {
2370 int active = ((W)w)->active; 2627 int active = ev_active (w);
2628
2371 forks [active - 1] = forks [--forkcnt]; 2629 forks [active - 1] = forks [--forkcnt];
2372 ((W)forks [active - 1])->active = active; 2630 ev_active (forks [active - 1]) = active;
2373 } 2631 }
2374 2632
2375 ev_stop (EV_A_ (W)w); 2633 ev_stop (EV_A_ (W)w);
2634}
2635#endif
2636
2637#if EV_ASYNC_ENABLE
2638void
2639ev_async_start (EV_P_ ev_async *w)
2640{
2641 if (expect_false (ev_is_active (w)))
2642 return;
2643
2644 evpipe_init (EV_A);
2645
2646 ev_start (EV_A_ (W)w, ++asynccnt);
2647 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2648 asyncs [asynccnt - 1] = w;
2649}
2650
2651void
2652ev_async_stop (EV_P_ ev_async *w)
2653{
2654 clear_pending (EV_A_ (W)w);
2655 if (expect_false (!ev_is_active (w)))
2656 return;
2657
2658 {
2659 int active = ev_active (w);
2660
2661 asyncs [active - 1] = asyncs [--asynccnt];
2662 ev_active (asyncs [active - 1]) = active;
2663 }
2664
2665 ev_stop (EV_A_ (W)w);
2666}
2667
2668void
2669ev_async_send (EV_P_ ev_async *w)
2670{
2671 w->sent = 1;
2672 evpipe_write (EV_A_ &gotasync);
2376} 2673}
2377#endif 2674#endif
2378 2675
2379/*****************************************************************************/ 2676/*****************************************************************************/
2380 2677

Diff Legend

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