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

Comparing libev/ev.c (file contents):
Revision 1.203 by root, Fri Jan 18 11:31:02 2008 UTC vs.
Revision 1.234 by root, Tue May 6 23:42:16 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/* towards the root */
707void inline_speed 765void inline_speed
708upheap (WT *heap, int k) 766upheap (WT *heap, int k)
709{ 767{
710 WT w = heap [k]; 768 WT w = heap [k];
711 769
712 while (k) 770 for (;;)
713 { 771 {
714 int p = (k - 1) >> 1; 772 int p = k >> 1;
715 773
774 /* maybe we could use a dummy element at heap [0]? */
716 if (heap [p]->at <= w->at) 775 if (!p || heap [p]->at <= w->at)
717 break; 776 break;
718 777
719 heap [k] = heap [p]; 778 heap [k] = heap [p];
720 ((W)heap [k])->active = k + 1; 779 ev_active (heap [k]) = k;
721 k = p; 780 k = p;
722 } 781 }
723 782
724 heap [k] = w; 783 heap [k] = w;
725 ((W)heap [k])->active = k + 1; 784 ev_active (heap [k]) = k;
726} 785}
727 786
787/* away from the root */
728void inline_speed 788void inline_speed
729downheap (WT *heap, int N, int k) 789downheap (WT *heap, int N, int k)
730{ 790{
731 WT w = heap [k]; 791 WT w = heap [k];
732 792
733 for (;;) 793 for (;;)
734 { 794 {
735 int c = (k << 1) + 1; 795 int c = k << 1;
736 796
737 if (c >= N) 797 if (c > N)
738 break; 798 break;
739 799
740 c += c + 1 < N && heap [c]->at > heap [c + 1]->at 800 c += c < N && heap [c]->at > heap [c + 1]->at
741 ? 1 : 0; 801 ? 1 : 0;
742 802
743 if (w->at <= heap [c]->at) 803 if (w->at <= heap [c]->at)
744 break; 804 break;
745 805
746 heap [k] = heap [c]; 806 heap [k] = heap [c];
747 ((W)heap [k])->active = k + 1; 807 ev_active (heap [k]) = k;
748 808
749 k = c; 809 k = c;
750 } 810 }
751 811
752 heap [k] = w; 812 heap [k] = w;
753 ((W)heap [k])->active = k + 1; 813 ev_active (heap [k]) = k;
754} 814}
755 815
756void inline_size 816void inline_size
757adjustheap (WT *heap, int N, int k) 817adjustheap (WT *heap, int N, int k)
758{ 818{
… …
763/*****************************************************************************/ 823/*****************************************************************************/
764 824
765typedef struct 825typedef struct
766{ 826{
767 WL head; 827 WL head;
768 sig_atomic_t volatile gotsig; 828 EV_ATOMIC_T gotsig;
769} ANSIG; 829} ANSIG;
770 830
771static ANSIG *signals; 831static ANSIG *signals;
772static int signalmax; 832static int signalmax;
773 833
774static int sigpipe [2]; 834static EV_ATOMIC_T gotsig;
775static sig_atomic_t volatile gotsig;
776static ev_io sigev;
777 835
778void inline_size 836void inline_size
779signals_init (ANSIG *base, int count) 837signals_init (ANSIG *base, int count)
780{ 838{
781 while (count--) 839 while (count--)
… …
785 843
786 ++base; 844 ++base;
787 } 845 }
788} 846}
789 847
790static void 848/*****************************************************************************/
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 849
841void inline_speed 850void inline_speed
842fd_intern (int fd) 851fd_intern (int fd)
843{ 852{
844#ifdef _WIN32 853#ifdef _WIN32
… …
849 fcntl (fd, F_SETFL, O_NONBLOCK); 858 fcntl (fd, F_SETFL, O_NONBLOCK);
850#endif 859#endif
851} 860}
852 861
853static void noinline 862static void noinline
854siginit (EV_P) 863evpipe_init (EV_P)
855{ 864{
865 if (!ev_is_active (&pipeev))
866 {
867#if EV_USE_EVENTFD
868 if ((evfd = eventfd (0, 0)) >= 0)
869 {
870 evpipe [0] = -1;
871 fd_intern (evfd);
872 ev_io_set (&pipeev, evfd, EV_READ);
873 }
874 else
875#endif
876 {
877 while (pipe (evpipe))
878 syserr ("(libev) error creating signal/async pipe");
879
856 fd_intern (sigpipe [0]); 880 fd_intern (evpipe [0]);
857 fd_intern (sigpipe [1]); 881 fd_intern (evpipe [1]);
882 ev_io_set (&pipeev, evpipe [0], EV_READ);
883 }
858 884
859 ev_io_set (&sigev, sigpipe [0], EV_READ);
860 ev_io_start (EV_A_ &sigev); 885 ev_io_start (EV_A_ &pipeev);
861 ev_unref (EV_A); /* child watcher should not keep loop alive */ 886 ev_unref (EV_A); /* watcher should not keep loop alive */
887 }
888}
889
890void inline_size
891evpipe_write (EV_P_ EV_ATOMIC_T *flag)
892{
893 if (!*flag)
894 {
895 int old_errno = errno; /* save errno because write might clobber it */
896
897 *flag = 1;
898
899#if EV_USE_EVENTFD
900 if (evfd >= 0)
901 {
902 uint64_t counter = 1;
903 write (evfd, &counter, sizeof (uint64_t));
904 }
905 else
906#endif
907 write (evpipe [1], &old_errno, 1);
908
909 errno = old_errno;
910 }
911}
912
913static void
914pipecb (EV_P_ ev_io *iow, int revents)
915{
916#if EV_USE_EVENTFD
917 if (evfd >= 0)
918 {
919 uint64_t counter;
920 read (evfd, &counter, sizeof (uint64_t));
921 }
922 else
923#endif
924 {
925 char dummy;
926 read (evpipe [0], &dummy, 1);
927 }
928
929 if (gotsig && ev_is_default_loop (EV_A))
930 {
931 int signum;
932 gotsig = 0;
933
934 for (signum = signalmax; signum--; )
935 if (signals [signum].gotsig)
936 ev_feed_signal_event (EV_A_ signum + 1);
937 }
938
939#if EV_ASYNC_ENABLE
940 if (gotasync)
941 {
942 int i;
943 gotasync = 0;
944
945 for (i = asynccnt; i--; )
946 if (asyncs [i]->sent)
947 {
948 asyncs [i]->sent = 0;
949 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
950 }
951 }
952#endif
862} 953}
863 954
864/*****************************************************************************/ 955/*****************************************************************************/
865 956
957static void
958ev_sighandler (int signum)
959{
960#if EV_MULTIPLICITY
961 struct ev_loop *loop = &default_loop_struct;
962#endif
963
964#if _WIN32
965 signal (signum, ev_sighandler);
966#endif
967
968 signals [signum - 1].gotsig = 1;
969 evpipe_write (EV_A_ &gotsig);
970}
971
972void noinline
973ev_feed_signal_event (EV_P_ int signum)
974{
975 WL w;
976
977#if EV_MULTIPLICITY
978 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
979#endif
980
981 --signum;
982
983 if (signum < 0 || signum >= signalmax)
984 return;
985
986 signals [signum].gotsig = 0;
987
988 for (w = signals [signum].head; w; w = w->next)
989 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
990}
991
992/*****************************************************************************/
993
866static WL childs [EV_PID_HASHSIZE]; 994static WL childs [EV_PID_HASHSIZE];
867 995
868#ifndef _WIN32 996#ifndef _WIN32
869 997
870static ev_signal childev; 998static ev_signal childev;
871 999
1000#ifndef WIFCONTINUED
1001# define WIFCONTINUED(status) 0
1002#endif
1003
872void inline_speed 1004void inline_speed
873child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1005child_reap (EV_P_ int chain, int pid, int status)
874{ 1006{
875 ev_child *w; 1007 ev_child *w;
1008 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
876 1009
877 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1010 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1011 {
878 if (w->pid == pid || !w->pid) 1012 if ((w->pid == pid || !w->pid)
1013 && (!traced || (w->flags & 1)))
879 { 1014 {
880 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 1015 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; 1016 w->rpid = pid;
882 w->rstatus = status; 1017 w->rstatus = status;
883 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1018 ev_feed_event (EV_A_ (W)w, EV_CHILD);
884 } 1019 }
1020 }
885} 1021}
886 1022
887#ifndef WCONTINUED 1023#ifndef WCONTINUED
888# define WCONTINUED 0 1024# define WCONTINUED 0
889#endif 1025#endif
… …
898 if (!WCONTINUED 1034 if (!WCONTINUED
899 || errno != EINVAL 1035 || errno != EINVAL
900 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1036 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
901 return; 1037 return;
902 1038
903 /* make sure we are called again until all childs have been reaped */ 1039 /* 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 */ 1040 /* 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); 1041 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
906 1042
907 child_reap (EV_A_ sw, pid, pid, status); 1043 child_reap (EV_A_ pid, pid, status);
908 if (EV_PID_HASHSIZE > 1) 1044 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 */ 1045 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
910} 1046}
911 1047
912#endif 1048#endif
913 1049
914/*****************************************************************************/ 1050/*****************************************************************************/
… …
1032 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1168 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1033 have_monotonic = 1; 1169 have_monotonic = 1;
1034 } 1170 }
1035#endif 1171#endif
1036 1172
1037 ev_rt_now = ev_time (); 1173 ev_rt_now = ev_time ();
1038 mn_now = get_clock (); 1174 mn_now = get_clock ();
1039 now_floor = mn_now; 1175 now_floor = mn_now;
1040 rtmn_diff = ev_rt_now - mn_now; 1176 rtmn_diff = ev_rt_now - mn_now;
1041 1177
1042 io_blocktime = 0.; 1178 io_blocktime = 0.;
1043 timeout_blocktime = 0.; 1179 timeout_blocktime = 0.;
1180 backend = 0;
1181 backend_fd = -1;
1182 gotasync = 0;
1183#if EV_USE_INOTIFY
1184 fs_fd = -2;
1185#endif
1044 1186
1045 /* pid check not overridable via env */ 1187 /* pid check not overridable via env */
1046#ifndef _WIN32 1188#ifndef _WIN32
1047 if (flags & EVFLAG_FORKCHECK) 1189 if (flags & EVFLAG_FORKCHECK)
1048 curpid = getpid (); 1190 curpid = getpid ();
… …
1051 if (!(flags & EVFLAG_NOENV) 1193 if (!(flags & EVFLAG_NOENV)
1052 && !enable_secure () 1194 && !enable_secure ()
1053 && getenv ("LIBEV_FLAGS")) 1195 && getenv ("LIBEV_FLAGS"))
1054 flags = atoi (getenv ("LIBEV_FLAGS")); 1196 flags = atoi (getenv ("LIBEV_FLAGS"));
1055 1197
1056 if (!(flags & 0x0000ffffUL)) 1198 if (!(flags & 0x0000ffffU))
1057 flags |= ev_recommended_backends (); 1199 flags |= ev_recommended_backends ();
1058
1059 backend = 0;
1060 backend_fd = -1;
1061#if EV_USE_INOTIFY
1062 fs_fd = -2;
1063#endif
1064 1200
1065#if EV_USE_PORT 1201#if EV_USE_PORT
1066 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1202 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1067#endif 1203#endif
1068#if EV_USE_KQUEUE 1204#if EV_USE_KQUEUE
… …
1076#endif 1212#endif
1077#if EV_USE_SELECT 1213#if EV_USE_SELECT
1078 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1214 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1079#endif 1215#endif
1080 1216
1081 ev_init (&sigev, sigcb); 1217 ev_init (&pipeev, pipecb);
1082 ev_set_priority (&sigev, EV_MAXPRI); 1218 ev_set_priority (&pipeev, EV_MAXPRI);
1083 } 1219 }
1084} 1220}
1085 1221
1086static void noinline 1222static void noinline
1087loop_destroy (EV_P) 1223loop_destroy (EV_P)
1088{ 1224{
1089 int i; 1225 int i;
1226
1227 if (ev_is_active (&pipeev))
1228 {
1229 ev_ref (EV_A); /* signal watcher */
1230 ev_io_stop (EV_A_ &pipeev);
1231
1232#if EV_USE_EVENTFD
1233 if (evfd >= 0)
1234 close (evfd);
1235#endif
1236
1237 if (evpipe [0] >= 0)
1238 {
1239 close (evpipe [0]);
1240 close (evpipe [1]);
1241 }
1242 }
1090 1243
1091#if EV_USE_INOTIFY 1244#if EV_USE_INOTIFY
1092 if (fs_fd >= 0) 1245 if (fs_fd >= 0)
1093 close (fs_fd); 1246 close (fs_fd);
1094#endif 1247#endif
… …
1131#if EV_FORK_ENABLE 1284#if EV_FORK_ENABLE
1132 array_free (fork, EMPTY); 1285 array_free (fork, EMPTY);
1133#endif 1286#endif
1134 array_free (prepare, EMPTY); 1287 array_free (prepare, EMPTY);
1135 array_free (check, EMPTY); 1288 array_free (check, EMPTY);
1289#if EV_ASYNC_ENABLE
1290 array_free (async, EMPTY);
1291#endif
1136 1292
1137 backend = 0; 1293 backend = 0;
1138} 1294}
1139 1295
1296#if EV_USE_INOTIFY
1140void inline_size infy_fork (EV_P); 1297void inline_size infy_fork (EV_P);
1298#endif
1141 1299
1142void inline_size 1300void inline_size
1143loop_fork (EV_P) 1301loop_fork (EV_P)
1144{ 1302{
1145#if EV_USE_PORT 1303#if EV_USE_PORT
… …
1153#endif 1311#endif
1154#if EV_USE_INOTIFY 1312#if EV_USE_INOTIFY
1155 infy_fork (EV_A); 1313 infy_fork (EV_A);
1156#endif 1314#endif
1157 1315
1158 if (ev_is_active (&sigev)) 1316 if (ev_is_active (&pipeev))
1159 { 1317 {
1160 /* default loop */ 1318 /* this "locks" the handlers against writing to the pipe */
1319 /* while we modify the fd vars */
1320 gotsig = 1;
1321#if EV_ASYNC_ENABLE
1322 gotasync = 1;
1323#endif
1161 1324
1162 ev_ref (EV_A); 1325 ev_ref (EV_A);
1163 ev_io_stop (EV_A_ &sigev); 1326 ev_io_stop (EV_A_ &pipeev);
1327
1328#if EV_USE_EVENTFD
1329 if (evfd >= 0)
1330 close (evfd);
1331#endif
1332
1333 if (evpipe [0] >= 0)
1334 {
1164 close (sigpipe [0]); 1335 close (evpipe [0]);
1165 close (sigpipe [1]); 1336 close (evpipe [1]);
1337 }
1166 1338
1167 while (pipe (sigpipe))
1168 syserr ("(libev) error creating pipe");
1169
1170 siginit (EV_A); 1339 evpipe_init (EV_A);
1340 /* now iterate over everything, in case we missed something */
1171 sigcb (EV_A_ &sigev, EV_READ); 1341 pipecb (EV_A_ &pipeev, EV_READ);
1172 } 1342 }
1173 1343
1174 postfork = 0; 1344 postfork = 0;
1175} 1345}
1176 1346
… …
1198} 1368}
1199 1369
1200void 1370void
1201ev_loop_fork (EV_P) 1371ev_loop_fork (EV_P)
1202{ 1372{
1203 postfork = 1; 1373 postfork = 1; /* must be in line with ev_default_fork */
1204} 1374}
1205
1206#endif 1375#endif
1207 1376
1208#if EV_MULTIPLICITY 1377#if EV_MULTIPLICITY
1209struct ev_loop * 1378struct ev_loop *
1210ev_default_loop_init (unsigned int flags) 1379ev_default_loop_init (unsigned int flags)
1211#else 1380#else
1212int 1381int
1213ev_default_loop (unsigned int flags) 1382ev_default_loop (unsigned int flags)
1214#endif 1383#endif
1215{ 1384{
1216 if (sigpipe [0] == sigpipe [1])
1217 if (pipe (sigpipe))
1218 return 0;
1219
1220 if (!ev_default_loop_ptr) 1385 if (!ev_default_loop_ptr)
1221 { 1386 {
1222#if EV_MULTIPLICITY 1387#if EV_MULTIPLICITY
1223 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1388 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1224#else 1389#else
… …
1227 1392
1228 loop_init (EV_A_ flags); 1393 loop_init (EV_A_ flags);
1229 1394
1230 if (ev_backend (EV_A)) 1395 if (ev_backend (EV_A))
1231 { 1396 {
1232 siginit (EV_A);
1233
1234#ifndef _WIN32 1397#ifndef _WIN32
1235 ev_signal_init (&childev, childcb, SIGCHLD); 1398 ev_signal_init (&childev, childcb, SIGCHLD);
1236 ev_set_priority (&childev, EV_MAXPRI); 1399 ev_set_priority (&childev, EV_MAXPRI);
1237 ev_signal_start (EV_A_ &childev); 1400 ev_signal_start (EV_A_ &childev);
1238 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1401 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1255#ifndef _WIN32 1418#ifndef _WIN32
1256 ev_ref (EV_A); /* child watcher */ 1419 ev_ref (EV_A); /* child watcher */
1257 ev_signal_stop (EV_A_ &childev); 1420 ev_signal_stop (EV_A_ &childev);
1258#endif 1421#endif
1259 1422
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); 1423 loop_destroy (EV_A);
1267} 1424}
1268 1425
1269void 1426void
1270ev_default_fork (void) 1427ev_default_fork (void)
… …
1272#if EV_MULTIPLICITY 1429#if EV_MULTIPLICITY
1273 struct ev_loop *loop = ev_default_loop_ptr; 1430 struct ev_loop *loop = ev_default_loop_ptr;
1274#endif 1431#endif
1275 1432
1276 if (backend) 1433 if (backend)
1277 postfork = 1; 1434 postfork = 1; /* must be in line with ev_loop_fork */
1278} 1435}
1279 1436
1280/*****************************************************************************/ 1437/*****************************************************************************/
1281 1438
1282void 1439void
… …
1302 p->w->pending = 0; 1459 p->w->pending = 0;
1303 EV_CB_INVOKE (p->w, p->events); 1460 EV_CB_INVOKE (p->w, p->events);
1304 } 1461 }
1305 } 1462 }
1306} 1463}
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 1464
1388#if EV_IDLE_ENABLE 1465#if EV_IDLE_ENABLE
1389void inline_size 1466void inline_size
1390idle_reify (EV_P) 1467idle_reify (EV_P)
1391{ 1468{
… …
1403 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE); 1480 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1404 break; 1481 break;
1405 } 1482 }
1406 } 1483 }
1407 } 1484 }
1485}
1486#endif
1487
1488void inline_size
1489timers_reify (EV_P)
1490{
1491 while (timercnt && ev_at (timers [1]) <= mn_now)
1492 {
1493 ev_timer *w = (ev_timer *)timers [1];
1494
1495 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1496
1497 /* first reschedule or stop timer */
1498 if (w->repeat)
1499 {
1500 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1501
1502 ev_at (w) += w->repeat;
1503 if (ev_at (w) < mn_now)
1504 ev_at (w) = mn_now;
1505
1506 downheap (timers, timercnt, 1);
1507 }
1508 else
1509 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1510
1511 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1512 }
1513}
1514
1515#if EV_PERIODIC_ENABLE
1516void inline_size
1517periodics_reify (EV_P)
1518{
1519 while (periodiccnt && ev_at (periodics [1]) <= ev_rt_now)
1520 {
1521 ev_periodic *w = (ev_periodic *)periodics [1];
1522
1523 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1524
1525 /* first reschedule or stop timer */
1526 if (w->reschedule_cb)
1527 {
1528 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1529 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now));
1530 downheap (periodics, periodiccnt, 1);
1531 }
1532 else if (w->interval)
1533 {
1534 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1535 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval;
1536 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now));
1537 downheap (periodics, periodiccnt, 1);
1538 }
1539 else
1540 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1541
1542 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1543 }
1544}
1545
1546static void noinline
1547periodics_reschedule (EV_P)
1548{
1549 int i;
1550
1551 /* adjust periodics after time jump */
1552 for (i = 1; i <= periodiccnt; ++i)
1553 {
1554 ev_periodic *w = (ev_periodic *)periodics [i];
1555
1556 if (w->reschedule_cb)
1557 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1558 else if (w->interval)
1559 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1560 }
1561
1562 /* now rebuild the heap */
1563 for (i = periodiccnt >> 1; i--; )
1564 downheap (periodics, periodiccnt, i);
1408} 1565}
1409#endif 1566#endif
1410 1567
1411void inline_speed 1568void inline_speed
1412time_update (EV_P_ ev_tstamp max_block) 1569time_update (EV_P_ ev_tstamp max_block)
… …
1441 */ 1598 */
1442 for (i = 4; --i; ) 1599 for (i = 4; --i; )
1443 { 1600 {
1444 rtmn_diff = ev_rt_now - mn_now; 1601 rtmn_diff = ev_rt_now - mn_now;
1445 1602
1446 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1603 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1447 return; /* all is well */ 1604 return; /* all is well */
1448 1605
1449 ev_rt_now = ev_time (); 1606 ev_rt_now = ev_time ();
1450 mn_now = get_clock (); 1607 mn_now = get_clock ();
1451 now_floor = mn_now; 1608 now_floor = mn_now;
… …
1466 { 1623 {
1467#if EV_PERIODIC_ENABLE 1624#if EV_PERIODIC_ENABLE
1468 periodics_reschedule (EV_A); 1625 periodics_reschedule (EV_A);
1469#endif 1626#endif
1470 /* adjust timers. this is easy, as the offset is the same for all of them */ 1627 /* adjust timers. this is easy, as the offset is the same for all of them */
1471 for (i = 0; i < timercnt; ++i) 1628 for (i = 1; i <= timercnt; ++i)
1472 ((WT)timers [i])->at += ev_rt_now - mn_now; 1629 ev_at (timers [i]) += ev_rt_now - mn_now;
1473 } 1630 }
1474 1631
1475 mn_now = ev_rt_now; 1632 mn_now = ev_rt_now;
1476 } 1633 }
1477} 1634}
… …
1491static int loop_done; 1648static int loop_done;
1492 1649
1493void 1650void
1494ev_loop (EV_P_ int flags) 1651ev_loop (EV_P_ int flags)
1495{ 1652{
1496 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1653 loop_done = EVUNLOOP_CANCEL;
1497 ? EVUNLOOP_ONE
1498 : EVUNLOOP_CANCEL;
1499 1654
1500 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1655 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1501 1656
1502 do 1657 do
1503 { 1658 {
… …
1549 1704
1550 waittime = MAX_BLOCKTIME; 1705 waittime = MAX_BLOCKTIME;
1551 1706
1552 if (timercnt) 1707 if (timercnt)
1553 { 1708 {
1554 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1709 ev_tstamp to = ev_at (timers [1]) - mn_now + backend_fudge;
1555 if (waittime > to) waittime = to; 1710 if (waittime > to) waittime = to;
1556 } 1711 }
1557 1712
1558#if EV_PERIODIC_ENABLE 1713#if EV_PERIODIC_ENABLE
1559 if (periodiccnt) 1714 if (periodiccnt)
1560 { 1715 {
1561 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1716 ev_tstamp to = ev_at (periodics [1]) - ev_rt_now + backend_fudge;
1562 if (waittime > to) waittime = to; 1717 if (waittime > to) waittime = to;
1563 } 1718 }
1564#endif 1719#endif
1565 1720
1566 if (expect_false (waittime < timeout_blocktime)) 1721 if (expect_false (waittime < timeout_blocktime))
… …
1599 /* queue check watchers, to be executed first */ 1754 /* queue check watchers, to be executed first */
1600 if (expect_false (checkcnt)) 1755 if (expect_false (checkcnt))
1601 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1756 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1602 1757
1603 call_pending (EV_A); 1758 call_pending (EV_A);
1604
1605 } 1759 }
1606 while (expect_true (activecnt && !loop_done)); 1760 while (expect_true (
1761 activecnt
1762 && !loop_done
1763 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1764 ));
1607 1765
1608 if (loop_done == EVUNLOOP_ONE) 1766 if (loop_done == EVUNLOOP_ONE)
1609 loop_done = EVUNLOOP_CANCEL; 1767 loop_done = EVUNLOOP_CANCEL;
1610} 1768}
1611 1769
… …
1729ev_timer_start (EV_P_ ev_timer *w) 1887ev_timer_start (EV_P_ ev_timer *w)
1730{ 1888{
1731 if (expect_false (ev_is_active (w))) 1889 if (expect_false (ev_is_active (w)))
1732 return; 1890 return;
1733 1891
1734 ((WT)w)->at += mn_now; 1892 ev_at (w) += mn_now;
1735 1893
1736 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1894 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1737 1895
1738 ev_start (EV_A_ (W)w, ++timercnt); 1896 ev_start (EV_A_ (W)w, ++timercnt);
1739 array_needsize (WT, timers, timermax, timercnt, EMPTY2); 1897 array_needsize (WT, timers, timermax, timercnt + 1, EMPTY2);
1740 timers [timercnt - 1] = (WT)w; 1898 timers [timercnt] = (WT)w;
1741 upheap (timers, timercnt - 1); 1899 upheap (timers, timercnt);
1742 1900
1743 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1901 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/
1744} 1902}
1745 1903
1746void noinline 1904void noinline
1747ev_timer_stop (EV_P_ ev_timer *w) 1905ev_timer_stop (EV_P_ ev_timer *w)
1748{ 1906{
1749 clear_pending (EV_A_ (W)w); 1907 clear_pending (EV_A_ (W)w);
1750 if (expect_false (!ev_is_active (w))) 1908 if (expect_false (!ev_is_active (w)))
1751 return; 1909 return;
1752 1910
1753 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1754
1755 { 1911 {
1756 int active = ((W)w)->active; 1912 int active = ev_active (w);
1757 1913
1914 assert (("internal timer heap corruption", timers [active] == (WT)w));
1915
1758 if (expect_true (--active < --timercnt)) 1916 if (expect_true (active < timercnt))
1759 { 1917 {
1760 timers [active] = timers [timercnt]; 1918 timers [active] = timers [timercnt];
1761 adjustheap (timers, timercnt, active); 1919 adjustheap (timers, timercnt, active);
1762 } 1920 }
1921
1922 --timercnt;
1763 } 1923 }
1764 1924
1765 ((WT)w)->at -= mn_now; 1925 ev_at (w) -= mn_now;
1766 1926
1767 ev_stop (EV_A_ (W)w); 1927 ev_stop (EV_A_ (W)w);
1768} 1928}
1769 1929
1770void noinline 1930void noinline
… …
1772{ 1932{
1773 if (ev_is_active (w)) 1933 if (ev_is_active (w))
1774 { 1934 {
1775 if (w->repeat) 1935 if (w->repeat)
1776 { 1936 {
1777 ((WT)w)->at = mn_now + w->repeat; 1937 ev_at (w) = mn_now + w->repeat;
1778 adjustheap (timers, timercnt, ((W)w)->active - 1); 1938 adjustheap (timers, timercnt, ev_active (w));
1779 } 1939 }
1780 else 1940 else
1781 ev_timer_stop (EV_A_ w); 1941 ev_timer_stop (EV_A_ w);
1782 } 1942 }
1783 else if (w->repeat) 1943 else if (w->repeat)
1784 { 1944 {
1785 w->at = w->repeat; 1945 ev_at (w) = w->repeat;
1786 ev_timer_start (EV_A_ w); 1946 ev_timer_start (EV_A_ w);
1787 } 1947 }
1788} 1948}
1789 1949
1790#if EV_PERIODIC_ENABLE 1950#if EV_PERIODIC_ENABLE
… …
1793{ 1953{
1794 if (expect_false (ev_is_active (w))) 1954 if (expect_false (ev_is_active (w)))
1795 return; 1955 return;
1796 1956
1797 if (w->reschedule_cb) 1957 if (w->reschedule_cb)
1798 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1958 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1799 else if (w->interval) 1959 else if (w->interval)
1800 { 1960 {
1801 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1961 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 */ 1962 /* 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; 1963 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1804 } 1964 }
1805 else 1965 else
1806 ((WT)w)->at = w->offset; 1966 ev_at (w) = w->offset;
1807 1967
1808 ev_start (EV_A_ (W)w, ++periodiccnt); 1968 ev_start (EV_A_ (W)w, ++periodiccnt);
1809 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2); 1969 array_needsize (WT, periodics, periodicmax, periodiccnt + 1, EMPTY2);
1810 periodics [periodiccnt - 1] = (WT)w; 1970 periodics [periodiccnt] = (WT)w;
1811 upheap (periodics, periodiccnt - 1); 1971 upheap (periodics, periodiccnt);
1812 1972
1813 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1973 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/
1814} 1974}
1815 1975
1816void noinline 1976void noinline
1817ev_periodic_stop (EV_P_ ev_periodic *w) 1977ev_periodic_stop (EV_P_ ev_periodic *w)
1818{ 1978{
1819 clear_pending (EV_A_ (W)w); 1979 clear_pending (EV_A_ (W)w);
1820 if (expect_false (!ev_is_active (w))) 1980 if (expect_false (!ev_is_active (w)))
1821 return; 1981 return;
1822 1982
1823 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1824
1825 { 1983 {
1826 int active = ((W)w)->active; 1984 int active = ev_active (w);
1827 1985
1986 assert (("internal periodic heap corruption", periodics [active] == (WT)w));
1987
1828 if (expect_true (--active < --periodiccnt)) 1988 if (expect_true (active < periodiccnt))
1829 { 1989 {
1830 periodics [active] = periodics [periodiccnt]; 1990 periodics [active] = periodics [periodiccnt];
1831 adjustheap (periodics, periodiccnt, active); 1991 adjustheap (periodics, periodiccnt, active);
1832 } 1992 }
1993
1994 --periodiccnt;
1833 } 1995 }
1834 1996
1835 ev_stop (EV_A_ (W)w); 1997 ev_stop (EV_A_ (W)w);
1836} 1998}
1837 1999
… …
1856#endif 2018#endif
1857 if (expect_false (ev_is_active (w))) 2019 if (expect_false (ev_is_active (w)))
1858 return; 2020 return;
1859 2021
1860 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2022 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
2023
2024 evpipe_init (EV_A);
1861 2025
1862 { 2026 {
1863#ifndef _WIN32 2027#ifndef _WIN32
1864 sigset_t full, prev; 2028 sigset_t full, prev;
1865 sigfillset (&full); 2029 sigfillset (&full);
… …
1877 wlist_add (&signals [w->signum - 1].head, (WL)w); 2041 wlist_add (&signals [w->signum - 1].head, (WL)w);
1878 2042
1879 if (!((WL)w)->next) 2043 if (!((WL)w)->next)
1880 { 2044 {
1881#if _WIN32 2045#if _WIN32
1882 signal (w->signum, sighandler); 2046 signal (w->signum, ev_sighandler);
1883#else 2047#else
1884 struct sigaction sa; 2048 struct sigaction sa;
1885 sa.sa_handler = sighandler; 2049 sa.sa_handler = ev_sighandler;
1886 sigfillset (&sa.sa_mask); 2050 sigfillset (&sa.sa_mask);
1887 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2051 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1888 sigaction (w->signum, &sa, 0); 2052 sigaction (w->signum, &sa, 0);
1889#endif 2053#endif
1890 } 2054 }
… …
1951 if (w->wd < 0) 2115 if (w->wd < 0)
1952 { 2116 {
1953 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2117 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1954 2118
1955 /* monitor some parent directory for speedup hints */ 2119 /* monitor some parent directory for speedup hints */
2120 /* note that exceeding the hardcoded limit is not a correctness issue, */
2121 /* but an efficiency issue only */
1956 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2122 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1957 { 2123 {
1958 char path [4096]; 2124 char path [4096];
1959 strcpy (path, w->path); 2125 strcpy (path, w->path);
1960 2126
… …
2205 clear_pending (EV_A_ (W)w); 2371 clear_pending (EV_A_ (W)w);
2206 if (expect_false (!ev_is_active (w))) 2372 if (expect_false (!ev_is_active (w)))
2207 return; 2373 return;
2208 2374
2209 { 2375 {
2210 int active = ((W)w)->active; 2376 int active = ev_active (w);
2211 2377
2212 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2378 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2213 ((W)idles [ABSPRI (w)][active - 1])->active = active; 2379 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2214 2380
2215 ev_stop (EV_A_ (W)w); 2381 ev_stop (EV_A_ (W)w);
2216 --idleall; 2382 --idleall;
2217 } 2383 }
2218} 2384}
… …
2235 clear_pending (EV_A_ (W)w); 2401 clear_pending (EV_A_ (W)w);
2236 if (expect_false (!ev_is_active (w))) 2402 if (expect_false (!ev_is_active (w)))
2237 return; 2403 return;
2238 2404
2239 { 2405 {
2240 int active = ((W)w)->active; 2406 int active = ev_active (w);
2407
2241 prepares [active - 1] = prepares [--preparecnt]; 2408 prepares [active - 1] = prepares [--preparecnt];
2242 ((W)prepares [active - 1])->active = active; 2409 ev_active (prepares [active - 1]) = active;
2243 } 2410 }
2244 2411
2245 ev_stop (EV_A_ (W)w); 2412 ev_stop (EV_A_ (W)w);
2246} 2413}
2247 2414
… …
2262 clear_pending (EV_A_ (W)w); 2429 clear_pending (EV_A_ (W)w);
2263 if (expect_false (!ev_is_active (w))) 2430 if (expect_false (!ev_is_active (w)))
2264 return; 2431 return;
2265 2432
2266 { 2433 {
2267 int active = ((W)w)->active; 2434 int active = ev_active (w);
2435
2268 checks [active - 1] = checks [--checkcnt]; 2436 checks [active - 1] = checks [--checkcnt];
2269 ((W)checks [active - 1])->active = active; 2437 ev_active (checks [active - 1]) = active;
2270 } 2438 }
2271 2439
2272 ev_stop (EV_A_ (W)w); 2440 ev_stop (EV_A_ (W)w);
2273} 2441}
2274 2442
… …
2370 clear_pending (EV_A_ (W)w); 2538 clear_pending (EV_A_ (W)w);
2371 if (expect_false (!ev_is_active (w))) 2539 if (expect_false (!ev_is_active (w)))
2372 return; 2540 return;
2373 2541
2374 { 2542 {
2375 int active = ((W)w)->active; 2543 int active = ev_active (w);
2544
2376 forks [active - 1] = forks [--forkcnt]; 2545 forks [active - 1] = forks [--forkcnt];
2377 ((W)forks [active - 1])->active = active; 2546 ev_active (forks [active - 1]) = active;
2378 } 2547 }
2379 2548
2380 ev_stop (EV_A_ (W)w); 2549 ev_stop (EV_A_ (W)w);
2550}
2551#endif
2552
2553#if EV_ASYNC_ENABLE
2554void
2555ev_async_start (EV_P_ ev_async *w)
2556{
2557 if (expect_false (ev_is_active (w)))
2558 return;
2559
2560 evpipe_init (EV_A);
2561
2562 ev_start (EV_A_ (W)w, ++asynccnt);
2563 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2564 asyncs [asynccnt - 1] = w;
2565}
2566
2567void
2568ev_async_stop (EV_P_ ev_async *w)
2569{
2570 clear_pending (EV_A_ (W)w);
2571 if (expect_false (!ev_is_active (w)))
2572 return;
2573
2574 {
2575 int active = ev_active (w);
2576
2577 asyncs [active - 1] = asyncs [--asynccnt];
2578 ev_active (asyncs [active - 1]) = active;
2579 }
2580
2581 ev_stop (EV_A_ (W)w);
2582}
2583
2584void
2585ev_async_send (EV_P_ ev_async *w)
2586{
2587 w->sent = 1;
2588 evpipe_write (EV_A_ &gotasync);
2381} 2589}
2382#endif 2590#endif
2383 2591
2384/*****************************************************************************/ 2592/*****************************************************************************/
2385 2593

Diff Legend

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