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

Comparing libev/ev.c (file contents):
Revision 1.204 by root, Fri Jan 18 13:45:55 2008 UTC vs.
Revision 1.238 by root, Thu May 8 20:49:12 2008 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 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;
… …
702 } 759 }
703} 760}
704 761
705/*****************************************************************************/ 762/*****************************************************************************/
706 763
764/*
765 * at the moment we allow libev the luxury of two heaps,
766 * a small-code-size 2-heap one and a ~1.5kb larger 4-heap
767 * which is more cache-efficient.
768 * the difference is about 5% with 50000+ watchers.
769 */
770#define USE_4HEAP !EV_MINIMAL
771#define USE_4HEAP 1/* they do not work corretcly */
772#if USE_4HEAP
773
774#define DHEAP 4
775#define HEAP0 (DHEAP - 1) /* index of first element in heap */
776
777/* towards the root */
707void inline_speed 778void inline_speed
708upheap (WT *heap, int k) 779upheap (WT *heap, int k)
709{ 780{
710 WT w = heap [k]; 781 WT w = heap [k];
711 782
712 while (k) 783 for (;;)
713 { 784 {
714 int p = (k - 1) >> 1; 785 int p = ((k - HEAP0 - 1) / DHEAP) + HEAP0;
715 786
716 if (heap [p]->at <= w->at) 787 if (p == k || heap [p]->at <= w->at)
717 break; 788 break;
718 789
719 heap [k] = heap [p]; 790 heap [k] = heap [p];
720 ((W)heap [k])->active = k + 1; 791 ev_active (heap [k]) = k;
721 k = p; 792 k = p;
722 } 793 }
723 794
724 heap [k] = w; 795 heap [k] = w;
725 ((W)heap [k])->active = k + 1; 796 ev_active (heap [k]) = k;
726} 797}
727 798
799/* away from the root */
728void inline_speed 800void inline_speed
729downheap (WT *heap, int N, int k) 801downheap (WT *heap, int N, int k)
730{ 802{
731 WT w = heap [k]; 803 WT w = heap [k];
804 WT *E = heap + N + HEAP0;
732 805
733 for (;;) 806 for (;;)
734 { 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 */
816 (minpos = pos + 0), (minat = (*minpos)->at);
817 if (pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at);
818 if (pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at);
819 if (pos [3]->at < minat) (minpos = pos + 3), (minat = (*minpos)->at);
820 }
821 else
822 {
823 /* slow path */
824 if (pos >= E)
825 break;
826 (minpos = pos + 0), (minat = (*minpos)->at);
827 if (pos + 1 < E && pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at);
828 if (pos + 2 < E && pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at);
829 if (pos + 3 < E && pos [3]->at < minat) (minpos = pos + 3), (minat = (*minpos)->at);
830 }
831
832 if (w->at <= minat)
833 break;
834
835 ev_active (*minpos) = k;
836 heap [k] = *minpos;
837
838 k = minpos - heap;
839 }
840
841 heap [k] = w;
842 ev_active (heap [k]) = k;
843}
844
845#else // 4HEAP
846
847#define HEAP0 1
848
849/* towards the root */
850void inline_speed
851upheap (WT *heap, int k)
852{
853 WT w = heap [k];
854
855 for (;;)
856 {
857 int p = k >> 1;
858
859 /* maybe we could use a dummy element at heap [0]? */
860 if (!p || heap [p]->at <= w->at)
861 break;
862
863 heap [k] = heap [p];
864 ev_active (heap [k]) = k;
865 k = p;
866 }
867
868 heap [k] = w;
869 ev_active (heap [k]) = k;
870}
871
872/* away from the root */
873void inline_speed
874downheap (WT *heap, int N, int k)
875{
876 WT w = heap [k];
877
878 for (;;)
879 {
735 int c = (k << 1) + 1; 880 int c = k << 1;
736 881
737 if (c >= N) 882 if (c > N)
738 break; 883 break;
739 884
740 c += c + 1 < N && heap [c]->at > heap [c + 1]->at 885 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
741 ? 1 : 0; 886 ? 1 : 0;
742 887
743 if (w->at <= heap [c]->at) 888 if (w->at <= heap [c]->at)
744 break; 889 break;
745 890
746 heap [k] = heap [c]; 891 heap [k] = heap [c];
747 ((W)heap [k])->active = k + 1; 892 ((W)heap [k])->active = k;
748 893
749 k = c; 894 k = c;
750 } 895 }
751 896
752 heap [k] = w; 897 heap [k] = w;
753 ((W)heap [k])->active = k + 1; 898 ev_active (heap [k]) = k;
754} 899}
900#endif
755 901
756void inline_size 902void inline_size
757adjustheap (WT *heap, int N, int k) 903adjustheap (WT *heap, int N, int k)
758{ 904{
759 upheap (heap, k); 905 upheap (heap, k);
… …
763/*****************************************************************************/ 909/*****************************************************************************/
764 910
765typedef struct 911typedef struct
766{ 912{
767 WL head; 913 WL head;
768 sig_atomic_t volatile gotsig; 914 EV_ATOMIC_T gotsig;
769} ANSIG; 915} ANSIG;
770 916
771static ANSIG *signals; 917static ANSIG *signals;
772static int signalmax; 918static int signalmax;
773 919
774static int sigpipe [2]; 920static EV_ATOMIC_T gotsig;
775static sig_atomic_t volatile gotsig;
776static ev_io sigev;
777 921
778void inline_size 922void inline_size
779signals_init (ANSIG *base, int count) 923signals_init (ANSIG *base, int count)
780{ 924{
781 while (count--) 925 while (count--)
… …
785 929
786 ++base; 930 ++base;
787 } 931 }
788} 932}
789 933
790static void 934/*****************************************************************************/
791sighandler (int signum)
792{
793#if _WIN32
794 signal (signum, sighandler);
795#endif
796
797 signals [signum - 1].gotsig = 1;
798
799 if (!gotsig)
800 {
801 int old_errno = errno;
802 gotsig = 1;
803 write (sigpipe [1], &signum, 1);
804 errno = old_errno;
805 }
806}
807
808void noinline
809ev_feed_signal_event (EV_P_ int signum)
810{
811 WL w;
812
813#if EV_MULTIPLICITY
814 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
815#endif
816
817 --signum;
818
819 if (signum < 0 || signum >= signalmax)
820 return;
821
822 signals [signum].gotsig = 0;
823
824 for (w = signals [signum].head; w; w = w->next)
825 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
826}
827
828static void
829sigcb (EV_P_ ev_io *iow, int revents)
830{
831 int signum;
832
833 read (sigpipe [0], &revents, 1);
834 gotsig = 0;
835
836 for (signum = signalmax; signum--; )
837 if (signals [signum].gotsig)
838 ev_feed_signal_event (EV_A_ signum + 1);
839}
840 935
841void inline_speed 936void inline_speed
842fd_intern (int fd) 937fd_intern (int fd)
843{ 938{
844#ifdef _WIN32 939#ifdef _WIN32
… …
849 fcntl (fd, F_SETFL, O_NONBLOCK); 944 fcntl (fd, F_SETFL, O_NONBLOCK);
850#endif 945#endif
851} 946}
852 947
853static void noinline 948static void noinline
854siginit (EV_P) 949evpipe_init (EV_P)
855{ 950{
951 if (!ev_is_active (&pipeev))
952 {
953#if EV_USE_EVENTFD
954 if ((evfd = eventfd (0, 0)) >= 0)
955 {
956 evpipe [0] = -1;
957 fd_intern (evfd);
958 ev_io_set (&pipeev, evfd, EV_READ);
959 }
960 else
961#endif
962 {
963 while (pipe (evpipe))
964 syserr ("(libev) error creating signal/async pipe");
965
856 fd_intern (sigpipe [0]); 966 fd_intern (evpipe [0]);
857 fd_intern (sigpipe [1]); 967 fd_intern (evpipe [1]);
968 ev_io_set (&pipeev, evpipe [0], EV_READ);
969 }
858 970
859 ev_io_set (&sigev, sigpipe [0], EV_READ);
860 ev_io_start (EV_A_ &sigev); 971 ev_io_start (EV_A_ &pipeev);
861 ev_unref (EV_A); /* child watcher should not keep loop alive */ 972 ev_unref (EV_A); /* watcher should not keep loop alive */
973 }
974}
975
976void inline_size
977evpipe_write (EV_P_ EV_ATOMIC_T *flag)
978{
979 if (!*flag)
980 {
981 int old_errno = errno; /* save errno because write might clobber it */
982
983 *flag = 1;
984
985#if EV_USE_EVENTFD
986 if (evfd >= 0)
987 {
988 uint64_t counter = 1;
989 write (evfd, &counter, sizeof (uint64_t));
990 }
991 else
992#endif
993 write (evpipe [1], &old_errno, 1);
994
995 errno = old_errno;
996 }
997}
998
999static void
1000pipecb (EV_P_ ev_io *iow, int revents)
1001{
1002#if EV_USE_EVENTFD
1003 if (evfd >= 0)
1004 {
1005 uint64_t counter;
1006 read (evfd, &counter, sizeof (uint64_t));
1007 }
1008 else
1009#endif
1010 {
1011 char dummy;
1012 read (evpipe [0], &dummy, 1);
1013 }
1014
1015 if (gotsig && ev_is_default_loop (EV_A))
1016 {
1017 int signum;
1018 gotsig = 0;
1019
1020 for (signum = signalmax; signum--; )
1021 if (signals [signum].gotsig)
1022 ev_feed_signal_event (EV_A_ signum + 1);
1023 }
1024
1025#if EV_ASYNC_ENABLE
1026 if (gotasync)
1027 {
1028 int i;
1029 gotasync = 0;
1030
1031 for (i = asynccnt; i--; )
1032 if (asyncs [i]->sent)
1033 {
1034 asyncs [i]->sent = 0;
1035 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
1036 }
1037 }
1038#endif
862} 1039}
863 1040
864/*****************************************************************************/ 1041/*****************************************************************************/
865 1042
1043static void
1044ev_sighandler (int signum)
1045{
1046#if EV_MULTIPLICITY
1047 struct ev_loop *loop = &default_loop_struct;
1048#endif
1049
1050#if _WIN32
1051 signal (signum, ev_sighandler);
1052#endif
1053
1054 signals [signum - 1].gotsig = 1;
1055 evpipe_write (EV_A_ &gotsig);
1056}
1057
1058void noinline
1059ev_feed_signal_event (EV_P_ int signum)
1060{
1061 WL w;
1062
1063#if EV_MULTIPLICITY
1064 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
1065#endif
1066
1067 --signum;
1068
1069 if (signum < 0 || signum >= signalmax)
1070 return;
1071
1072 signals [signum].gotsig = 0;
1073
1074 for (w = signals [signum].head; w; w = w->next)
1075 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1076}
1077
1078/*****************************************************************************/
1079
866static WL childs [EV_PID_HASHSIZE]; 1080static WL childs [EV_PID_HASHSIZE];
867 1081
868#ifndef _WIN32 1082#ifndef _WIN32
869 1083
870static ev_signal childev; 1084static ev_signal childev;
871 1085
1086#ifndef WIFCONTINUED
1087# define WIFCONTINUED(status) 0
1088#endif
1089
872void inline_speed 1090void inline_speed
873child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1091child_reap (EV_P_ int chain, int pid, int status)
874{ 1092{
875 ev_child *w; 1093 ev_child *w;
1094 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
876 1095
877 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1096 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1097 {
878 if (w->pid == pid || !w->pid) 1098 if ((w->pid == pid || !w->pid)
1099 && (!traced || (w->flags & 1)))
879 { 1100 {
880 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 1101 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
881 w->rpid = pid; 1102 w->rpid = pid;
882 w->rstatus = status; 1103 w->rstatus = status;
883 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1104 ev_feed_event (EV_A_ (W)w, EV_CHILD);
884 } 1105 }
1106 }
885} 1107}
886 1108
887#ifndef WCONTINUED 1109#ifndef WCONTINUED
888# define WCONTINUED 0 1110# define WCONTINUED 0
889#endif 1111#endif
… …
898 if (!WCONTINUED 1120 if (!WCONTINUED
899 || errno != EINVAL 1121 || errno != EINVAL
900 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1122 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
901 return; 1123 return;
902 1124
903 /* make sure we are called again until all childs have been reaped */ 1125 /* make sure we are called again until all children have been reaped */
904 /* we need to do it this way so that the callback gets called before we continue */ 1126 /* we need to do it this way so that the callback gets called before we continue */
905 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1127 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
906 1128
907 child_reap (EV_A_ sw, pid, pid, status); 1129 child_reap (EV_A_ pid, pid, status);
908 if (EV_PID_HASHSIZE > 1) 1130 if (EV_PID_HASHSIZE > 1)
909 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1131 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
910} 1132}
911 1133
912#endif 1134#endif
913 1135
914/*****************************************************************************/ 1136/*****************************************************************************/
… …
1032 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1254 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1033 have_monotonic = 1; 1255 have_monotonic = 1;
1034 } 1256 }
1035#endif 1257#endif
1036 1258
1037 ev_rt_now = ev_time (); 1259 ev_rt_now = ev_time ();
1038 mn_now = get_clock (); 1260 mn_now = get_clock ();
1039 now_floor = mn_now; 1261 now_floor = mn_now;
1040 rtmn_diff = ev_rt_now - mn_now; 1262 rtmn_diff = ev_rt_now - mn_now;
1041 1263
1042 io_blocktime = 0.; 1264 io_blocktime = 0.;
1043 timeout_blocktime = 0.; 1265 timeout_blocktime = 0.;
1266 backend = 0;
1267 backend_fd = -1;
1268 gotasync = 0;
1269#if EV_USE_INOTIFY
1270 fs_fd = -2;
1271#endif
1044 1272
1045 /* pid check not overridable via env */ 1273 /* pid check not overridable via env */
1046#ifndef _WIN32 1274#ifndef _WIN32
1047 if (flags & EVFLAG_FORKCHECK) 1275 if (flags & EVFLAG_FORKCHECK)
1048 curpid = getpid (); 1276 curpid = getpid ();
… …
1051 if (!(flags & EVFLAG_NOENV) 1279 if (!(flags & EVFLAG_NOENV)
1052 && !enable_secure () 1280 && !enable_secure ()
1053 && getenv ("LIBEV_FLAGS")) 1281 && getenv ("LIBEV_FLAGS"))
1054 flags = atoi (getenv ("LIBEV_FLAGS")); 1282 flags = atoi (getenv ("LIBEV_FLAGS"));
1055 1283
1056 if (!(flags & 0x0000ffffUL)) 1284 if (!(flags & 0x0000ffffU))
1057 flags |= ev_recommended_backends (); 1285 flags |= ev_recommended_backends ();
1058
1059 backend = 0;
1060 backend_fd = -1;
1061#if EV_USE_INOTIFY
1062 fs_fd = -2;
1063#endif
1064 1286
1065#if EV_USE_PORT 1287#if EV_USE_PORT
1066 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1288 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1067#endif 1289#endif
1068#if EV_USE_KQUEUE 1290#if EV_USE_KQUEUE
… …
1076#endif 1298#endif
1077#if EV_USE_SELECT 1299#if EV_USE_SELECT
1078 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1300 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1079#endif 1301#endif
1080 1302
1081 ev_init (&sigev, sigcb); 1303 ev_init (&pipeev, pipecb);
1082 ev_set_priority (&sigev, EV_MAXPRI); 1304 ev_set_priority (&pipeev, EV_MAXPRI);
1083 } 1305 }
1084} 1306}
1085 1307
1086static void noinline 1308static void noinline
1087loop_destroy (EV_P) 1309loop_destroy (EV_P)
1088{ 1310{
1089 int i; 1311 int i;
1312
1313 if (ev_is_active (&pipeev))
1314 {
1315 ev_ref (EV_A); /* signal watcher */
1316 ev_io_stop (EV_A_ &pipeev);
1317
1318#if EV_USE_EVENTFD
1319 if (evfd >= 0)
1320 close (evfd);
1321#endif
1322
1323 if (evpipe [0] >= 0)
1324 {
1325 close (evpipe [0]);
1326 close (evpipe [1]);
1327 }
1328 }
1090 1329
1091#if EV_USE_INOTIFY 1330#if EV_USE_INOTIFY
1092 if (fs_fd >= 0) 1331 if (fs_fd >= 0)
1093 close (fs_fd); 1332 close (fs_fd);
1094#endif 1333#endif
… …
1131#if EV_FORK_ENABLE 1370#if EV_FORK_ENABLE
1132 array_free (fork, EMPTY); 1371 array_free (fork, EMPTY);
1133#endif 1372#endif
1134 array_free (prepare, EMPTY); 1373 array_free (prepare, EMPTY);
1135 array_free (check, EMPTY); 1374 array_free (check, EMPTY);
1375#if EV_ASYNC_ENABLE
1376 array_free (async, EMPTY);
1377#endif
1136 1378
1137 backend = 0; 1379 backend = 0;
1138} 1380}
1139 1381
1382#if EV_USE_INOTIFY
1140void inline_size infy_fork (EV_P); 1383void inline_size infy_fork (EV_P);
1384#endif
1141 1385
1142void inline_size 1386void inline_size
1143loop_fork (EV_P) 1387loop_fork (EV_P)
1144{ 1388{
1145#if EV_USE_PORT 1389#if EV_USE_PORT
… …
1153#endif 1397#endif
1154#if EV_USE_INOTIFY 1398#if EV_USE_INOTIFY
1155 infy_fork (EV_A); 1399 infy_fork (EV_A);
1156#endif 1400#endif
1157 1401
1158 if (ev_is_active (&sigev)) 1402 if (ev_is_active (&pipeev))
1159 { 1403 {
1160 /* default loop */ 1404 /* this "locks" the handlers against writing to the pipe */
1405 /* while we modify the fd vars */
1406 gotsig = 1;
1407#if EV_ASYNC_ENABLE
1408 gotasync = 1;
1409#endif
1161 1410
1162 ev_ref (EV_A); 1411 ev_ref (EV_A);
1163 ev_io_stop (EV_A_ &sigev); 1412 ev_io_stop (EV_A_ &pipeev);
1413
1414#if EV_USE_EVENTFD
1415 if (evfd >= 0)
1416 close (evfd);
1417#endif
1418
1419 if (evpipe [0] >= 0)
1420 {
1164 close (sigpipe [0]); 1421 close (evpipe [0]);
1165 close (sigpipe [1]); 1422 close (evpipe [1]);
1423 }
1166 1424
1167 while (pipe (sigpipe))
1168 syserr ("(libev) error creating pipe");
1169
1170 siginit (EV_A); 1425 evpipe_init (EV_A);
1426 /* now iterate over everything, in case we missed something */
1171 sigcb (EV_A_ &sigev, EV_READ); 1427 pipecb (EV_A_ &pipeev, EV_READ);
1172 } 1428 }
1173 1429
1174 postfork = 0; 1430 postfork = 0;
1175} 1431}
1176 1432
… …
1198} 1454}
1199 1455
1200void 1456void
1201ev_loop_fork (EV_P) 1457ev_loop_fork (EV_P)
1202{ 1458{
1203 postfork = 1; // must be in line with ev_default_fork 1459 postfork = 1; /* must be in line with ev_default_fork */
1204} 1460}
1205
1206#endif 1461#endif
1207 1462
1208#if EV_MULTIPLICITY 1463#if EV_MULTIPLICITY
1209struct ev_loop * 1464struct ev_loop *
1210ev_default_loop_init (unsigned int flags) 1465ev_default_loop_init (unsigned int flags)
1211#else 1466#else
1212int 1467int
1213ev_default_loop (unsigned int flags) 1468ev_default_loop (unsigned int flags)
1214#endif 1469#endif
1215{ 1470{
1216 if (sigpipe [0] == sigpipe [1])
1217 if (pipe (sigpipe))
1218 return 0;
1219
1220 if (!ev_default_loop_ptr) 1471 if (!ev_default_loop_ptr)
1221 { 1472 {
1222#if EV_MULTIPLICITY 1473#if EV_MULTIPLICITY
1223 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1474 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1224#else 1475#else
… …
1227 1478
1228 loop_init (EV_A_ flags); 1479 loop_init (EV_A_ flags);
1229 1480
1230 if (ev_backend (EV_A)) 1481 if (ev_backend (EV_A))
1231 { 1482 {
1232 siginit (EV_A);
1233
1234#ifndef _WIN32 1483#ifndef _WIN32
1235 ev_signal_init (&childev, childcb, SIGCHLD); 1484 ev_signal_init (&childev, childcb, SIGCHLD);
1236 ev_set_priority (&childev, EV_MAXPRI); 1485 ev_set_priority (&childev, EV_MAXPRI);
1237 ev_signal_start (EV_A_ &childev); 1486 ev_signal_start (EV_A_ &childev);
1238 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1487 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1255#ifndef _WIN32 1504#ifndef _WIN32
1256 ev_ref (EV_A); /* child watcher */ 1505 ev_ref (EV_A); /* child watcher */
1257 ev_signal_stop (EV_A_ &childev); 1506 ev_signal_stop (EV_A_ &childev);
1258#endif 1507#endif
1259 1508
1260 ev_ref (EV_A); /* signal watcher */
1261 ev_io_stop (EV_A_ &sigev);
1262
1263 close (sigpipe [0]); sigpipe [0] = 0;
1264 close (sigpipe [1]); sigpipe [1] = 0;
1265
1266 loop_destroy (EV_A); 1509 loop_destroy (EV_A);
1267} 1510}
1268 1511
1269void 1512void
1270ev_default_fork (void) 1513ev_default_fork (void)
… …
1272#if EV_MULTIPLICITY 1515#if EV_MULTIPLICITY
1273 struct ev_loop *loop = ev_default_loop_ptr; 1516 struct ev_loop *loop = ev_default_loop_ptr;
1274#endif 1517#endif
1275 1518
1276 if (backend) 1519 if (backend)
1277 postfork = 1; // must be in line with ev_loop_fork 1520 postfork = 1; /* must be in line with ev_loop_fork */
1278} 1521}
1279 1522
1280/*****************************************************************************/ 1523/*****************************************************************************/
1281 1524
1282void 1525void
… …
1302 p->w->pending = 0; 1545 p->w->pending = 0;
1303 EV_CB_INVOKE (p->w, p->events); 1546 EV_CB_INVOKE (p->w, p->events);
1304 } 1547 }
1305 } 1548 }
1306} 1549}
1307
1308void inline_size
1309timers_reify (EV_P)
1310{
1311 while (timercnt && ((WT)timers [0])->at <= mn_now)
1312 {
1313 ev_timer *w = (ev_timer *)timers [0];
1314
1315 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1316
1317 /* first reschedule or stop timer */
1318 if (w->repeat)
1319 {
1320 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1321
1322 ((WT)w)->at += w->repeat;
1323 if (((WT)w)->at < mn_now)
1324 ((WT)w)->at = mn_now;
1325
1326 downheap (timers, timercnt, 0);
1327 }
1328 else
1329 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1330
1331 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1332 }
1333}
1334
1335#if EV_PERIODIC_ENABLE
1336void inline_size
1337periodics_reify (EV_P)
1338{
1339 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1340 {
1341 ev_periodic *w = (ev_periodic *)periodics [0];
1342
1343 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1344
1345 /* first reschedule or stop timer */
1346 if (w->reschedule_cb)
1347 {
1348 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1349 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1350 downheap (periodics, periodiccnt, 0);
1351 }
1352 else if (w->interval)
1353 {
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;
1356 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1357 downheap (periodics, periodiccnt, 0);
1358 }
1359 else
1360 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1361
1362 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1363 }
1364}
1365
1366static void noinline
1367periodics_reschedule (EV_P)
1368{
1369 int i;
1370
1371 /* adjust periodics after time jump */
1372 for (i = 0; i < periodiccnt; ++i)
1373 {
1374 ev_periodic *w = (ev_periodic *)periodics [i];
1375
1376 if (w->reschedule_cb)
1377 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1378 else if (w->interval)
1379 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1380 }
1381
1382 /* now rebuild the heap */
1383 for (i = periodiccnt >> 1; i--; )
1384 downheap (periodics, periodiccnt, i);
1385}
1386#endif
1387 1550
1388#if EV_IDLE_ENABLE 1551#if EV_IDLE_ENABLE
1389void inline_size 1552void inline_size
1390idle_reify (EV_P) 1553idle_reify (EV_P)
1391{ 1554{
… …
1403 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE); 1566 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1404 break; 1567 break;
1405 } 1568 }
1406 } 1569 }
1407 } 1570 }
1571}
1572#endif
1573
1574void inline_size
1575timers_reify (EV_P)
1576{
1577 while (timercnt && ev_at (timers [HEAP0]) <= mn_now)
1578 {
1579 ev_timer *w = (ev_timer *)timers [HEAP0];
1580
1581 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1582
1583 /* first reschedule or stop timer */
1584 if (w->repeat)
1585 {
1586 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1587
1588 ev_at (w) += w->repeat;
1589 if (ev_at (w) < mn_now)
1590 ev_at (w) = mn_now;
1591
1592 downheap (timers, timercnt, HEAP0);
1593 }
1594 else
1595 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1596
1597 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1598 }
1599}
1600
1601#if EV_PERIODIC_ENABLE
1602void inline_size
1603periodics_reify (EV_P)
1604{
1605 while (periodiccnt && ev_at (periodics [HEAP0]) <= ev_rt_now)
1606 {
1607 ev_periodic *w = (ev_periodic *)periodics [HEAP0];
1608
1609 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1610
1611 /* first reschedule or stop timer */
1612 if (w->reschedule_cb)
1613 {
1614 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1615 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now));
1616 downheap (periodics, periodiccnt, 1);
1617 }
1618 else if (w->interval)
1619 {
1620 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1621 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval;
1622 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now));
1623 downheap (periodics, periodiccnt, HEAP0);
1624 }
1625 else
1626 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1627
1628 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1629 }
1630}
1631
1632static void noinline
1633periodics_reschedule (EV_P)
1634{
1635 int i;
1636
1637 /* adjust periodics after time jump */
1638 for (i = 1; i <= periodiccnt; ++i)
1639 {
1640 ev_periodic *w = (ev_periodic *)periodics [i];
1641
1642 if (w->reschedule_cb)
1643 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1644 else if (w->interval)
1645 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1646 }
1647
1648 /* now rebuild the heap */
1649 for (i = periodiccnt >> 1; --i; )
1650 downheap (periodics, periodiccnt, i + HEAP0);
1408} 1651}
1409#endif 1652#endif
1410 1653
1411void inline_speed 1654void inline_speed
1412time_update (EV_P_ ev_tstamp max_block) 1655time_update (EV_P_ ev_tstamp max_block)
… …
1441 */ 1684 */
1442 for (i = 4; --i; ) 1685 for (i = 4; --i; )
1443 { 1686 {
1444 rtmn_diff = ev_rt_now - mn_now; 1687 rtmn_diff = ev_rt_now - mn_now;
1445 1688
1446 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1689 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1447 return; /* all is well */ 1690 return; /* all is well */
1448 1691
1449 ev_rt_now = ev_time (); 1692 ev_rt_now = ev_time ();
1450 mn_now = get_clock (); 1693 mn_now = get_clock ();
1451 now_floor = mn_now; 1694 now_floor = mn_now;
… …
1466 { 1709 {
1467#if EV_PERIODIC_ENABLE 1710#if EV_PERIODIC_ENABLE
1468 periodics_reschedule (EV_A); 1711 periodics_reschedule (EV_A);
1469#endif 1712#endif
1470 /* adjust timers. this is easy, as the offset is the same for all of them */ 1713 /* adjust timers. this is easy, as the offset is the same for all of them */
1471 for (i = 0; i < timercnt; ++i) 1714 for (i = 1; i <= timercnt; ++i)
1472 ((WT)timers [i])->at += ev_rt_now - mn_now; 1715 ev_at (timers [i]) += ev_rt_now - mn_now;
1473 } 1716 }
1474 1717
1475 mn_now = ev_rt_now; 1718 mn_now = ev_rt_now;
1476 } 1719 }
1477} 1720}
… …
1491static int loop_done; 1734static int loop_done;
1492 1735
1493void 1736void
1494ev_loop (EV_P_ int flags) 1737ev_loop (EV_P_ int flags)
1495{ 1738{
1496 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1739 loop_done = EVUNLOOP_CANCEL;
1497 ? EVUNLOOP_ONE
1498 : EVUNLOOP_CANCEL;
1499 1740
1500 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1741 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1501 1742
1502 do 1743 do
1503 { 1744 {
… …
1549 1790
1550 waittime = MAX_BLOCKTIME; 1791 waittime = MAX_BLOCKTIME;
1551 1792
1552 if (timercnt) 1793 if (timercnt)
1553 { 1794 {
1554 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1795 ev_tstamp to = ev_at (timers [HEAP0]) - mn_now + backend_fudge;
1555 if (waittime > to) waittime = to; 1796 if (waittime > to) waittime = to;
1556 } 1797 }
1557 1798
1558#if EV_PERIODIC_ENABLE 1799#if EV_PERIODIC_ENABLE
1559 if (periodiccnt) 1800 if (periodiccnt)
1560 { 1801 {
1561 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1802 ev_tstamp to = ev_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1562 if (waittime > to) waittime = to; 1803 if (waittime > to) waittime = to;
1563 } 1804 }
1564#endif 1805#endif
1565 1806
1566 if (expect_false (waittime < timeout_blocktime)) 1807 if (expect_false (waittime < timeout_blocktime))
… …
1599 /* queue check watchers, to be executed first */ 1840 /* queue check watchers, to be executed first */
1600 if (expect_false (checkcnt)) 1841 if (expect_false (checkcnt))
1601 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1842 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1602 1843
1603 call_pending (EV_A); 1844 call_pending (EV_A);
1604
1605 } 1845 }
1606 while (expect_true (activecnt && !loop_done)); 1846 while (expect_true (
1847 activecnt
1848 && !loop_done
1849 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1850 ));
1607 1851
1608 if (loop_done == EVUNLOOP_ONE) 1852 if (loop_done == EVUNLOOP_ONE)
1609 loop_done = EVUNLOOP_CANCEL; 1853 loop_done = EVUNLOOP_CANCEL;
1610} 1854}
1611 1855
… …
1729ev_timer_start (EV_P_ ev_timer *w) 1973ev_timer_start (EV_P_ ev_timer *w)
1730{ 1974{
1731 if (expect_false (ev_is_active (w))) 1975 if (expect_false (ev_is_active (w)))
1732 return; 1976 return;
1733 1977
1734 ((WT)w)->at += mn_now; 1978 ev_at (w) += mn_now;
1735 1979
1736 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1980 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1737 1981
1738 ev_start (EV_A_ (W)w, ++timercnt); 1982 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1);
1739 array_needsize (WT, timers, timermax, timercnt, EMPTY2); 1983 array_needsize (WT, timers, timermax, timercnt + HEAP0, EMPTY2);
1740 timers [timercnt - 1] = (WT)w; 1984 timers [ev_active (w)] = (WT)w;
1741 upheap (timers, timercnt - 1); 1985 upheap (timers, ev_active (w));
1742 1986
1743 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1987 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/
1744} 1988}
1745 1989
1746void noinline 1990void noinline
1747ev_timer_stop (EV_P_ ev_timer *w) 1991ev_timer_stop (EV_P_ ev_timer *w)
1748{ 1992{
1749 clear_pending (EV_A_ (W)w); 1993 clear_pending (EV_A_ (W)w);
1750 if (expect_false (!ev_is_active (w))) 1994 if (expect_false (!ev_is_active (w)))
1751 return; 1995 return;
1752 1996
1753 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1754
1755 { 1997 {
1756 int active = ((W)w)->active; 1998 int active = ev_active (w);
1757 1999
2000 assert (("internal timer heap corruption", timers [active] == (WT)w));
2001
1758 if (expect_true (--active < --timercnt)) 2002 if (expect_true (active < timercnt + HEAP0 - 1))
1759 { 2003 {
1760 timers [active] = timers [timercnt]; 2004 timers [active] = timers [timercnt + HEAP0 - 1];
1761 adjustheap (timers, timercnt, active); 2005 adjustheap (timers, timercnt, active);
1762 } 2006 }
2007
2008 --timercnt;
1763 } 2009 }
1764 2010
1765 ((WT)w)->at -= mn_now; 2011 ev_at (w) -= mn_now;
1766 2012
1767 ev_stop (EV_A_ (W)w); 2013 ev_stop (EV_A_ (W)w);
1768} 2014}
1769 2015
1770void noinline 2016void noinline
… …
1772{ 2018{
1773 if (ev_is_active (w)) 2019 if (ev_is_active (w))
1774 { 2020 {
1775 if (w->repeat) 2021 if (w->repeat)
1776 { 2022 {
1777 ((WT)w)->at = mn_now + w->repeat; 2023 ev_at (w) = mn_now + w->repeat;
1778 adjustheap (timers, timercnt, ((W)w)->active - 1); 2024 adjustheap (timers, timercnt, ev_active (w));
1779 } 2025 }
1780 else 2026 else
1781 ev_timer_stop (EV_A_ w); 2027 ev_timer_stop (EV_A_ w);
1782 } 2028 }
1783 else if (w->repeat) 2029 else if (w->repeat)
1784 { 2030 {
1785 w->at = w->repeat; 2031 ev_at (w) = w->repeat;
1786 ev_timer_start (EV_A_ w); 2032 ev_timer_start (EV_A_ w);
1787 } 2033 }
1788} 2034}
1789 2035
1790#if EV_PERIODIC_ENABLE 2036#if EV_PERIODIC_ENABLE
… …
1793{ 2039{
1794 if (expect_false (ev_is_active (w))) 2040 if (expect_false (ev_is_active (w)))
1795 return; 2041 return;
1796 2042
1797 if (w->reschedule_cb) 2043 if (w->reschedule_cb)
1798 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 2044 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1799 else if (w->interval) 2045 else if (w->interval)
1800 { 2046 {
1801 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2047 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1802 /* this formula differs from the one in periodic_reify because we do not always round up */ 2048 /* this formula differs from the one in periodic_reify because we do not always round up */
1803 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2049 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1804 } 2050 }
1805 else 2051 else
1806 ((WT)w)->at = w->offset; 2052 ev_at (w) = w->offset;
1807 2053
1808 ev_start (EV_A_ (W)w, ++periodiccnt); 2054 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1);
1809 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2); 2055 array_needsize (WT, periodics, periodicmax, periodiccnt + HEAP0, EMPTY2);
1810 periodics [periodiccnt - 1] = (WT)w; 2056 periodics [ev_active (w)] = (WT)w;
1811 upheap (periodics, periodiccnt - 1); 2057 upheap (periodics, ev_active (w));
1812 2058
1813 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 2059 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/
1814} 2060}
1815 2061
1816void noinline 2062void noinline
1817ev_periodic_stop (EV_P_ ev_periodic *w) 2063ev_periodic_stop (EV_P_ ev_periodic *w)
1818{ 2064{
1819 clear_pending (EV_A_ (W)w); 2065 clear_pending (EV_A_ (W)w);
1820 if (expect_false (!ev_is_active (w))) 2066 if (expect_false (!ev_is_active (w)))
1821 return; 2067 return;
1822 2068
1823 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1824
1825 { 2069 {
1826 int active = ((W)w)->active; 2070 int active = ev_active (w);
1827 2071
2072 assert (("internal periodic heap corruption", periodics [active] == (WT)w));
2073
1828 if (expect_true (--active < --periodiccnt)) 2074 if (expect_true (active < periodiccnt + HEAP0 - 1))
1829 { 2075 {
1830 periodics [active] = periodics [periodiccnt]; 2076 periodics [active] = periodics [periodiccnt + HEAP0 - 1];
1831 adjustheap (periodics, periodiccnt, active); 2077 adjustheap (periodics, periodiccnt, active);
1832 } 2078 }
2079
2080 --periodiccnt;
1833 } 2081 }
1834 2082
1835 ev_stop (EV_A_ (W)w); 2083 ev_stop (EV_A_ (W)w);
1836} 2084}
1837 2085
… …
1856#endif 2104#endif
1857 if (expect_false (ev_is_active (w))) 2105 if (expect_false (ev_is_active (w)))
1858 return; 2106 return;
1859 2107
1860 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2108 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
2109
2110 evpipe_init (EV_A);
1861 2111
1862 { 2112 {
1863#ifndef _WIN32 2113#ifndef _WIN32
1864 sigset_t full, prev; 2114 sigset_t full, prev;
1865 sigfillset (&full); 2115 sigfillset (&full);
… …
1877 wlist_add (&signals [w->signum - 1].head, (WL)w); 2127 wlist_add (&signals [w->signum - 1].head, (WL)w);
1878 2128
1879 if (!((WL)w)->next) 2129 if (!((WL)w)->next)
1880 { 2130 {
1881#if _WIN32 2131#if _WIN32
1882 signal (w->signum, sighandler); 2132 signal (w->signum, ev_sighandler);
1883#else 2133#else
1884 struct sigaction sa; 2134 struct sigaction sa;
1885 sa.sa_handler = sighandler; 2135 sa.sa_handler = ev_sighandler;
1886 sigfillset (&sa.sa_mask); 2136 sigfillset (&sa.sa_mask);
1887 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2137 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1888 sigaction (w->signum, &sa, 0); 2138 sigaction (w->signum, &sa, 0);
1889#endif 2139#endif
1890 } 2140 }
… …
1951 if (w->wd < 0) 2201 if (w->wd < 0)
1952 { 2202 {
1953 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2203 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1954 2204
1955 /* monitor some parent directory for speedup hints */ 2205 /* monitor some parent directory for speedup hints */
2206 /* note that exceeding the hardcoded limit is not a correctness issue, */
2207 /* but an efficiency issue only */
1956 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2208 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1957 { 2209 {
1958 char path [4096]; 2210 char path [4096];
1959 strcpy (path, w->path); 2211 strcpy (path, w->path);
1960 2212
… …
2205 clear_pending (EV_A_ (W)w); 2457 clear_pending (EV_A_ (W)w);
2206 if (expect_false (!ev_is_active (w))) 2458 if (expect_false (!ev_is_active (w)))
2207 return; 2459 return;
2208 2460
2209 { 2461 {
2210 int active = ((W)w)->active; 2462 int active = ev_active (w);
2211 2463
2212 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2464 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2213 ((W)idles [ABSPRI (w)][active - 1])->active = active; 2465 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2214 2466
2215 ev_stop (EV_A_ (W)w); 2467 ev_stop (EV_A_ (W)w);
2216 --idleall; 2468 --idleall;
2217 } 2469 }
2218} 2470}
… …
2235 clear_pending (EV_A_ (W)w); 2487 clear_pending (EV_A_ (W)w);
2236 if (expect_false (!ev_is_active (w))) 2488 if (expect_false (!ev_is_active (w)))
2237 return; 2489 return;
2238 2490
2239 { 2491 {
2240 int active = ((W)w)->active; 2492 int active = ev_active (w);
2493
2241 prepares [active - 1] = prepares [--preparecnt]; 2494 prepares [active - 1] = prepares [--preparecnt];
2242 ((W)prepares [active - 1])->active = active; 2495 ev_active (prepares [active - 1]) = active;
2243 } 2496 }
2244 2497
2245 ev_stop (EV_A_ (W)w); 2498 ev_stop (EV_A_ (W)w);
2246} 2499}
2247 2500
… …
2262 clear_pending (EV_A_ (W)w); 2515 clear_pending (EV_A_ (W)w);
2263 if (expect_false (!ev_is_active (w))) 2516 if (expect_false (!ev_is_active (w)))
2264 return; 2517 return;
2265 2518
2266 { 2519 {
2267 int active = ((W)w)->active; 2520 int active = ev_active (w);
2521
2268 checks [active - 1] = checks [--checkcnt]; 2522 checks [active - 1] = checks [--checkcnt];
2269 ((W)checks [active - 1])->active = active; 2523 ev_active (checks [active - 1]) = active;
2270 } 2524 }
2271 2525
2272 ev_stop (EV_A_ (W)w); 2526 ev_stop (EV_A_ (W)w);
2273} 2527}
2274 2528
… …
2370 clear_pending (EV_A_ (W)w); 2624 clear_pending (EV_A_ (W)w);
2371 if (expect_false (!ev_is_active (w))) 2625 if (expect_false (!ev_is_active (w)))
2372 return; 2626 return;
2373 2627
2374 { 2628 {
2375 int active = ((W)w)->active; 2629 int active = ev_active (w);
2630
2376 forks [active - 1] = forks [--forkcnt]; 2631 forks [active - 1] = forks [--forkcnt];
2377 ((W)forks [active - 1])->active = active; 2632 ev_active (forks [active - 1]) = active;
2378 } 2633 }
2379 2634
2380 ev_stop (EV_A_ (W)w); 2635 ev_stop (EV_A_ (W)w);
2636}
2637#endif
2638
2639#if EV_ASYNC_ENABLE
2640void
2641ev_async_start (EV_P_ ev_async *w)
2642{
2643 if (expect_false (ev_is_active (w)))
2644 return;
2645
2646 evpipe_init (EV_A);
2647
2648 ev_start (EV_A_ (W)w, ++asynccnt);
2649 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2650 asyncs [asynccnt - 1] = w;
2651}
2652
2653void
2654ev_async_stop (EV_P_ ev_async *w)
2655{
2656 clear_pending (EV_A_ (W)w);
2657 if (expect_false (!ev_is_active (w)))
2658 return;
2659
2660 {
2661 int active = ev_active (w);
2662
2663 asyncs [active - 1] = asyncs [--asynccnt];
2664 ev_active (asyncs [active - 1]) = active;
2665 }
2666
2667 ev_stop (EV_A_ (W)w);
2668}
2669
2670void
2671ev_async_send (EV_P_ ev_async *w)
2672{
2673 w->sent = 1;
2674 evpipe_write (EV_A_ &gotasync);
2381} 2675}
2382#endif 2676#endif
2383 2677
2384/*****************************************************************************/ 2678/*****************************************************************************/
2385 2679

Diff Legend

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