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

Comparing libev/ev.c (file contents):
Revision 1.208 by root, Fri Feb 1 13:22:48 2008 UTC vs.
Revision 1.231 by root, Mon May 5 20:47:33 2008 UTC

… …
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 EV_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
… …
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);
… …
702 } 757 }
703} 758}
704 759
705/*****************************************************************************/ 760/*****************************************************************************/
706 761
762/* towards the root */
707void inline_speed 763void inline_speed
708upheap (WT *heap, int k) 764upheap (WT *heap, int k)
709{ 765{
710 WT w = heap [k]; 766 WT w = heap [k];
711 767
712 while (k) 768 for (;;)
713 { 769 {
714 int p = (k - 1) >> 1; 770 int p = k >> 1;
715 771
772 /* maybe we could use a dummy element at heap [0]? */
716 if (heap [p]->at <= w->at) 773 if (!p || heap [p]->at <= w->at)
717 break; 774 break;
718 775
719 heap [k] = heap [p]; 776 heap [k] = heap [p];
720 ((W)heap [k])->active = k + 1; 777 ev_active (heap [k]) = k;
721 k = p; 778 k = p;
722 } 779 }
723 780
724 heap [k] = w; 781 heap [k] = w;
725 ((W)heap [k])->active = k + 1; 782 ev_active (heap [k]) = k;
726} 783}
727 784
785/* away from the root */
728void inline_speed 786void inline_speed
729downheap (WT *heap, int N, int k) 787downheap (WT *heap, int N, int k)
730{ 788{
731 WT w = heap [k]; 789 WT w = heap [k];
732 790
733 for (;;) 791 for (;;)
734 { 792 {
735 int c = (k << 1) + 1; 793 int c = k << 1;
736 794
737 if (c >= N) 795 if (c > N)
738 break; 796 break;
739 797
740 c += c + 1 < N && heap [c]->at > heap [c + 1]->at 798 c += c < N && heap [c]->at > heap [c + 1]->at
741 ? 1 : 0; 799 ? 1 : 0;
742 800
743 if (w->at <= heap [c]->at) 801 if (w->at <= heap [c]->at)
744 break; 802 break;
745 803
746 heap [k] = heap [c]; 804 heap [k] = heap [c];
747 ((W)heap [k])->active = k + 1; 805 ev_active (heap [k]) = k;
748 806
749 k = c; 807 k = c;
750 } 808 }
751 809
752 heap [k] = w; 810 heap [k] = w;
753 ((W)heap [k])->active = k + 1; 811 ev_active (heap [k]) = k;
754} 812}
755 813
756void inline_size 814void inline_size
757adjustheap (WT *heap, int N, int k) 815adjustheap (WT *heap, int N, int k)
758{ 816{
… …
802static void noinline 860static void noinline
803evpipe_init (EV_P) 861evpipe_init (EV_P)
804{ 862{
805 if (!ev_is_active (&pipeev)) 863 if (!ev_is_active (&pipeev))
806 { 864 {
865#if EV_USE_EVENTFD
866 if ((evfd = eventfd (0, 0)) >= 0)
867 {
868 evpipe [0] = -1;
869 fd_intern (evfd);
870 ev_io_set (&pipeev, evfd, EV_READ);
871 }
872 else
873#endif
874 {
807 while (pipe (evpipe)) 875 while (pipe (evpipe))
808 syserr ("(libev) error creating signal/async pipe"); 876 syserr ("(libev) error creating signal/async pipe");
809 877
810 fd_intern (evpipe [0]); 878 fd_intern (evpipe [0]);
811 fd_intern (evpipe [1]); 879 fd_intern (evpipe [1]);
812
813 ev_io_set (&pipeev, evpipe [0], EV_READ); 880 ev_io_set (&pipeev, evpipe [0], EV_READ);
881 }
882
814 ev_io_start (EV_A_ &pipeev); 883 ev_io_start (EV_A_ &pipeev);
815 ev_unref (EV_A); /* child watcher should not keep loop alive */ 884 ev_unref (EV_A); /* watcher should not keep loop alive */
816 } 885 }
817} 886}
818 887
819void inline_size 888void inline_size
820evpipe_write (EV_P_ int sig, int async) 889evpipe_write (EV_P_ EV_ATOMIC_T *flag)
821{ 890{
822 if (!(gotasync || gotsig)) 891 if (!*flag)
823 { 892 {
824 int old_errno = errno; 893 int old_errno = errno; /* save errno because write might clobber it */
825 894
826 if (sig) gotsig = 1; 895 *flag = 1;
827 if (async) gotasync = 1;
828 896
897#if EV_USE_EVENTFD
898 if (evfd >= 0)
899 {
900 uint64_t counter = 1;
901 write (evfd, &counter, sizeof (uint64_t));
902 }
903 else
904#endif
829 write (evpipe [1], &old_errno, 1); 905 write (evpipe [1], &old_errno, 1);
906
830 errno = old_errno; 907 errno = old_errno;
831 } 908 }
832} 909}
833 910
834static void 911static void
835pipecb (EV_P_ ev_io *iow, int revents) 912pipecb (EV_P_ ev_io *iow, int revents)
836{ 913{
914#if EV_USE_EVENTFD
915 if (evfd >= 0)
837 { 916 {
838 int dummy; 917 uint64_t counter = 1;
918 read (evfd, &counter, sizeof (uint64_t));
919 }
920 else
921#endif
922 {
923 char dummy;
839 read (evpipe [0], &dummy, 1); 924 read (evpipe [0], &dummy, 1);
840 } 925 }
841 926
842 if (gotsig) 927 if (gotsig && ev_is_default_loop (EV_A))
843 { 928 {
844 int signum; 929 int signum;
845 gotsig = 0; 930 gotsig = 0;
846 931
847 for (signum = signalmax; signum--; ) 932 for (signum = signalmax; signum--; )
848 if (signals [signum].gotsig) 933 if (signals [signum].gotsig)
849 ev_feed_signal_event (EV_A_ signum + 1); 934 ev_feed_signal_event (EV_A_ signum + 1);
850 } 935 }
851 936
937#if EV_ASYNC_ENABLE
852 if (gotasync) 938 if (gotasync)
853 { 939 {
854 int i; 940 int i;
855 gotasync = 0; 941 gotasync = 0;
856 942
… …
859 { 945 {
860 asyncs [i]->sent = 0; 946 asyncs [i]->sent = 0;
861 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC); 947 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
862 } 948 }
863 } 949 }
950#endif
864} 951}
865 952
866/*****************************************************************************/ 953/*****************************************************************************/
867 954
868static void 955static void
869sighandler (int signum) 956ev_sighandler (int signum)
870{ 957{
871#if EV_MULTIPLICITY 958#if EV_MULTIPLICITY
872 struct ev_loop *loop = &default_loop_struct; 959 struct ev_loop *loop = &default_loop_struct;
873#endif 960#endif
874 961
875#if _WIN32 962#if _WIN32
876 signal (signum, sighandler); 963 signal (signum, ev_sighandler);
877#endif 964#endif
878 965
879 signals [signum - 1].gotsig = 1; 966 signals [signum - 1].gotsig = 1;
880 evpipe_write (EV_A_ 1, 0); 967 evpipe_write (EV_A_ &gotsig);
881} 968}
882 969
883void noinline 970void noinline
884ev_feed_signal_event (EV_P_ int signum) 971ev_feed_signal_event (EV_P_ int signum)
885{ 972{
… …
911#ifndef WIFCONTINUED 998#ifndef WIFCONTINUED
912# define WIFCONTINUED(status) 0 999# define WIFCONTINUED(status) 0
913#endif 1000#endif
914 1001
915void inline_speed 1002void inline_speed
916child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1003child_reap (EV_P_ int chain, int pid, int status)
917{ 1004{
918 ev_child *w; 1005 ev_child *w;
919 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1006 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
920 1007
921 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1008 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
922 { 1009 {
923 if ((w->pid == pid || !w->pid) 1010 if ((w->pid == pid || !w->pid)
924 && (!traced || (w->flags & 1))) 1011 && (!traced || (w->flags & 1)))
925 { 1012 {
926 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 1013 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
927 w->rpid = pid; 1014 w->rpid = pid;
928 w->rstatus = status; 1015 w->rstatus = status;
929 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1016 ev_feed_event (EV_A_ (W)w, EV_CHILD);
930 } 1017 }
931 } 1018 }
… …
945 if (!WCONTINUED 1032 if (!WCONTINUED
946 || errno != EINVAL 1033 || errno != EINVAL
947 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1034 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
948 return; 1035 return;
949 1036
950 /* make sure we are called again until all childs have been reaped */ 1037 /* make sure we are called again until all children have been reaped */
951 /* we need to do it this way so that the callback gets called before we continue */ 1038 /* we need to do it this way so that the callback gets called before we continue */
952 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1039 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
953 1040
954 child_reap (EV_A_ sw, pid, pid, status); 1041 child_reap (EV_A_ pid, pid, status);
955 if (EV_PID_HASHSIZE > 1) 1042 if (EV_PID_HASHSIZE > 1)
956 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1043 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
957} 1044}
958 1045
959#endif 1046#endif
960 1047
961/*****************************************************************************/ 1048/*****************************************************************************/
… …
1079 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1166 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1080 have_monotonic = 1; 1167 have_monotonic = 1;
1081 } 1168 }
1082#endif 1169#endif
1083 1170
1084 ev_rt_now = ev_time (); 1171 ev_rt_now = ev_time ();
1085 mn_now = get_clock (); 1172 mn_now = get_clock ();
1086 now_floor = mn_now; 1173 now_floor = mn_now;
1087 rtmn_diff = ev_rt_now - mn_now; 1174 rtmn_diff = ev_rt_now - mn_now;
1088 1175
1089 io_blocktime = 0.; 1176 io_blocktime = 0.;
1090 timeout_blocktime = 0.; 1177 timeout_blocktime = 0.;
1178 backend = 0;
1179 backend_fd = -1;
1180 gotasync = 0;
1181#if EV_USE_INOTIFY
1182 fs_fd = -2;
1183#endif
1091 1184
1092 /* pid check not overridable via env */ 1185 /* pid check not overridable via env */
1093#ifndef _WIN32 1186#ifndef _WIN32
1094 if (flags & EVFLAG_FORKCHECK) 1187 if (flags & EVFLAG_FORKCHECK)
1095 curpid = getpid (); 1188 curpid = getpid ();
… …
1098 if (!(flags & EVFLAG_NOENV) 1191 if (!(flags & EVFLAG_NOENV)
1099 && !enable_secure () 1192 && !enable_secure ()
1100 && getenv ("LIBEV_FLAGS")) 1193 && getenv ("LIBEV_FLAGS"))
1101 flags = atoi (getenv ("LIBEV_FLAGS")); 1194 flags = atoi (getenv ("LIBEV_FLAGS"));
1102 1195
1103 if (!(flags & 0x0000ffffUL)) 1196 if (!(flags & 0x0000ffffU))
1104 flags |= ev_recommended_backends (); 1197 flags |= ev_recommended_backends ();
1105
1106 backend = 0;
1107 backend_fd = -1;
1108#if EV_USE_INOTIFY
1109 fs_fd = -2;
1110#endif
1111 1198
1112#if EV_USE_PORT 1199#if EV_USE_PORT
1113 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1200 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1114#endif 1201#endif
1115#if EV_USE_KQUEUE 1202#if EV_USE_KQUEUE
… …
1138 if (ev_is_active (&pipeev)) 1225 if (ev_is_active (&pipeev))
1139 { 1226 {
1140 ev_ref (EV_A); /* signal watcher */ 1227 ev_ref (EV_A); /* signal watcher */
1141 ev_io_stop (EV_A_ &pipeev); 1228 ev_io_stop (EV_A_ &pipeev);
1142 1229
1143 close (evpipe [0]); evpipe [0] = 0; 1230#if EV_USE_EVENTFD
1144 close (evpipe [1]); evpipe [1] = 0; 1231 if (evfd >= 0)
1232 close (evfd);
1233#endif
1234
1235 if (evpipe [0] >= 0)
1236 {
1237 close (evpipe [0]);
1238 close (evpipe [1]);
1239 }
1145 } 1240 }
1146 1241
1147#if EV_USE_INOTIFY 1242#if EV_USE_INOTIFY
1148 if (fs_fd >= 0) 1243 if (fs_fd >= 0)
1149 close (fs_fd); 1244 close (fs_fd);
… …
1187#if EV_FORK_ENABLE 1282#if EV_FORK_ENABLE
1188 array_free (fork, EMPTY); 1283 array_free (fork, EMPTY);
1189#endif 1284#endif
1190 array_free (prepare, EMPTY); 1285 array_free (prepare, EMPTY);
1191 array_free (check, EMPTY); 1286 array_free (check, EMPTY);
1287#if EV_ASYNC_ENABLE
1288 array_free (async, EMPTY);
1289#endif
1192 1290
1193 backend = 0; 1291 backend = 0;
1194} 1292}
1195 1293
1294#if EV_USE_INOTIFY
1196void inline_size infy_fork (EV_P); 1295void inline_size infy_fork (EV_P);
1296#endif
1197 1297
1198void inline_size 1298void inline_size
1199loop_fork (EV_P) 1299loop_fork (EV_P)
1200{ 1300{
1201#if EV_USE_PORT 1301#if EV_USE_PORT
… …
1212#endif 1312#endif
1213 1313
1214 if (ev_is_active (&pipeev)) 1314 if (ev_is_active (&pipeev))
1215 { 1315 {
1216 /* this "locks" the handlers against writing to the pipe */ 1316 /* this "locks" the handlers against writing to the pipe */
1317 /* while we modify the fd vars */
1318 gotsig = 1;
1319#if EV_ASYNC_ENABLE
1217 gotsig = gotasync = 1; 1320 gotasync = 1;
1321#endif
1218 1322
1219 ev_ref (EV_A); 1323 ev_ref (EV_A);
1220 ev_io_stop (EV_A_ &pipeev); 1324 ev_io_stop (EV_A_ &pipeev);
1325
1326#if EV_USE_EVENTFD
1327 if (evfd >= 0)
1328 close (evfd);
1329#endif
1330
1331 if (evpipe [0] >= 0)
1332 {
1221 close (evpipe [0]); 1333 close (evpipe [0]);
1222 close (evpipe [1]); 1334 close (evpipe [1]);
1335 }
1223 1336
1224 evpipe_init (EV_A); 1337 evpipe_init (EV_A);
1225 /* now iterate over everything, in case we missed something */ 1338 /* now iterate over everything, in case we missed something */
1226 pipecb (EV_A_ &pipeev, EV_READ); 1339 pipecb (EV_A_ &pipeev, EV_READ);
1227 } 1340 }
… …
1349} 1462}
1350 1463
1351void inline_size 1464void inline_size
1352timers_reify (EV_P) 1465timers_reify (EV_P)
1353{ 1466{
1354 while (timercnt && ((WT)timers [0])->at <= mn_now) 1467 while (timercnt && ev_at (timers [1]) <= mn_now)
1355 { 1468 {
1356 ev_timer *w = (ev_timer *)timers [0]; 1469 ev_timer *w = (ev_timer *)timers [1];
1357 1470
1358 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1471 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1359 1472
1360 /* first reschedule or stop timer */ 1473 /* first reschedule or stop timer */
1361 if (w->repeat) 1474 if (w->repeat)
1362 { 1475 {
1363 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1476 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1364 1477
1365 ((WT)w)->at += w->repeat; 1478 ev_at (w) += w->repeat;
1366 if (((WT)w)->at < mn_now) 1479 if (ev_at (w) < mn_now)
1367 ((WT)w)->at = mn_now; 1480 ev_at (w) = mn_now;
1368 1481
1369 downheap (timers, timercnt, 0); 1482 downheap (timers, timercnt, 1);
1370 } 1483 }
1371 else 1484 else
1372 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1485 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1373 1486
1374 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1487 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1377 1490
1378#if EV_PERIODIC_ENABLE 1491#if EV_PERIODIC_ENABLE
1379void inline_size 1492void inline_size
1380periodics_reify (EV_P) 1493periodics_reify (EV_P)
1381{ 1494{
1382 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1495 while (periodiccnt && ev_at (periodics [1]) <= ev_rt_now)
1383 { 1496 {
1384 ev_periodic *w = (ev_periodic *)periodics [0]; 1497 ev_periodic *w = (ev_periodic *)periodics [1];
1385 1498
1386 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1499 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1387 1500
1388 /* first reschedule or stop timer */ 1501 /* first reschedule or stop timer */
1389 if (w->reschedule_cb) 1502 if (w->reschedule_cb)
1390 { 1503 {
1391 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON); 1504 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1392 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1505 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now));
1393 downheap (periodics, periodiccnt, 0); 1506 downheap (periodics, periodiccnt, 1);
1394 } 1507 }
1395 else if (w->interval) 1508 else if (w->interval)
1396 { 1509 {
1397 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1510 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1398 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval; 1511 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval;
1399 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1512 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now));
1400 downheap (periodics, periodiccnt, 0); 1513 downheap (periodics, periodiccnt, 1);
1401 } 1514 }
1402 else 1515 else
1403 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1516 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1404 1517
1405 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1518 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1410periodics_reschedule (EV_P) 1523periodics_reschedule (EV_P)
1411{ 1524{
1412 int i; 1525 int i;
1413 1526
1414 /* adjust periodics after time jump */ 1527 /* adjust periodics after time jump */
1415 for (i = 0; i < periodiccnt; ++i) 1528 for (i = 1; i <= periodiccnt; ++i)
1416 { 1529 {
1417 ev_periodic *w = (ev_periodic *)periodics [i]; 1530 ev_periodic *w = (ev_periodic *)periodics [i];
1418 1531
1419 if (w->reschedule_cb) 1532 if (w->reschedule_cb)
1420 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1533 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1421 else if (w->interval) 1534 else if (w->interval)
1422 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1535 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1423 } 1536 }
1424 1537
1425 /* now rebuild the heap */ 1538 /* now rebuild the heap */
1426 for (i = periodiccnt >> 1; i--; ) 1539 for (i = periodiccnt >> 1; i--; )
1427 downheap (periodics, periodiccnt, i); 1540 downheap (periodics, periodiccnt, i);
… …
1509 { 1622 {
1510#if EV_PERIODIC_ENABLE 1623#if EV_PERIODIC_ENABLE
1511 periodics_reschedule (EV_A); 1624 periodics_reschedule (EV_A);
1512#endif 1625#endif
1513 /* adjust timers. this is easy, as the offset is the same for all of them */ 1626 /* adjust timers. this is easy, as the offset is the same for all of them */
1514 for (i = 0; i < timercnt; ++i) 1627 for (i = 1; i <= timercnt; ++i)
1515 ((WT)timers [i])->at += ev_rt_now - mn_now; 1628 ev_at (timers [i]) += ev_rt_now - mn_now;
1516 } 1629 }
1517 1630
1518 mn_now = ev_rt_now; 1631 mn_now = ev_rt_now;
1519 } 1632 }
1520} 1633}
… …
1534static int loop_done; 1647static int loop_done;
1535 1648
1536void 1649void
1537ev_loop (EV_P_ int flags) 1650ev_loop (EV_P_ int flags)
1538{ 1651{
1539 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1652 loop_done = EVUNLOOP_CANCEL;
1540 ? EVUNLOOP_ONE
1541 : EVUNLOOP_CANCEL;
1542 1653
1543 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1654 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1544 1655
1545 do 1656 do
1546 { 1657 {
… …
1592 1703
1593 waittime = MAX_BLOCKTIME; 1704 waittime = MAX_BLOCKTIME;
1594 1705
1595 if (timercnt) 1706 if (timercnt)
1596 { 1707 {
1597 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1708 ev_tstamp to = ev_at (timers [1]) - mn_now + backend_fudge;
1598 if (waittime > to) waittime = to; 1709 if (waittime > to) waittime = to;
1599 } 1710 }
1600 1711
1601#if EV_PERIODIC_ENABLE 1712#if EV_PERIODIC_ENABLE
1602 if (periodiccnt) 1713 if (periodiccnt)
1603 { 1714 {
1604 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1715 ev_tstamp to = ev_at (periodics [1]) - ev_rt_now + backend_fudge;
1605 if (waittime > to) waittime = to; 1716 if (waittime > to) waittime = to;
1606 } 1717 }
1607#endif 1718#endif
1608 1719
1609 if (expect_false (waittime < timeout_blocktime)) 1720 if (expect_false (waittime < timeout_blocktime))
… …
1642 /* queue check watchers, to be executed first */ 1753 /* queue check watchers, to be executed first */
1643 if (expect_false (checkcnt)) 1754 if (expect_false (checkcnt))
1644 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1755 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1645 1756
1646 call_pending (EV_A); 1757 call_pending (EV_A);
1647
1648 } 1758 }
1649 while (expect_true (activecnt && !loop_done)); 1759 while (expect_true (
1760 activecnt
1761 && !loop_done
1762 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1763 ));
1650 1764
1651 if (loop_done == EVUNLOOP_ONE) 1765 if (loop_done == EVUNLOOP_ONE)
1652 loop_done = EVUNLOOP_CANCEL; 1766 loop_done = EVUNLOOP_CANCEL;
1653} 1767}
1654 1768
… …
1772ev_timer_start (EV_P_ ev_timer *w) 1886ev_timer_start (EV_P_ ev_timer *w)
1773{ 1887{
1774 if (expect_false (ev_is_active (w))) 1888 if (expect_false (ev_is_active (w)))
1775 return; 1889 return;
1776 1890
1777 ((WT)w)->at += mn_now; 1891 ev_at (w) += mn_now;
1778 1892
1779 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1893 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1780 1894
1781 ev_start (EV_A_ (W)w, ++timercnt); 1895 ev_start (EV_A_ (W)w, ++timercnt);
1782 array_needsize (WT, timers, timermax, timercnt, EMPTY2); 1896 array_needsize (WT, timers, timermax, timercnt + 1, EMPTY2);
1783 timers [timercnt - 1] = (WT)w; 1897 timers [timercnt] = (WT)w;
1784 upheap (timers, timercnt - 1); 1898 upheap (timers, timercnt);
1785 1899
1786 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1900 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/
1787} 1901}
1788 1902
1789void noinline 1903void noinline
1790ev_timer_stop (EV_P_ ev_timer *w) 1904ev_timer_stop (EV_P_ ev_timer *w)
1791{ 1905{
1792 clear_pending (EV_A_ (W)w); 1906 clear_pending (EV_A_ (W)w);
1793 if (expect_false (!ev_is_active (w))) 1907 if (expect_false (!ev_is_active (w)))
1794 return; 1908 return;
1795 1909
1796 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1797
1798 { 1910 {
1799 int active = ((W)w)->active; 1911 int active = ev_active (w);
1800 1912
1913 assert (("internal timer heap corruption", timers [active] == (WT)w));
1914
1801 if (expect_true (--active < --timercnt)) 1915 if (expect_true (active < timercnt))
1802 { 1916 {
1803 timers [active] = timers [timercnt]; 1917 timers [active] = timers [timercnt];
1804 adjustheap (timers, timercnt, active); 1918 adjustheap (timers, timercnt, active);
1805 } 1919 }
1920
1921 --timercnt;
1806 } 1922 }
1807 1923
1808 ((WT)w)->at -= mn_now; 1924 ev_at (w) -= mn_now;
1809 1925
1810 ev_stop (EV_A_ (W)w); 1926 ev_stop (EV_A_ (W)w);
1811} 1927}
1812 1928
1813void noinline 1929void noinline
… …
1815{ 1931{
1816 if (ev_is_active (w)) 1932 if (ev_is_active (w))
1817 { 1933 {
1818 if (w->repeat) 1934 if (w->repeat)
1819 { 1935 {
1820 ((WT)w)->at = mn_now + w->repeat; 1936 ev_at (w) = mn_now + w->repeat;
1821 adjustheap (timers, timercnt, ((W)w)->active - 1); 1937 adjustheap (timers, timercnt, ev_active (w));
1822 } 1938 }
1823 else 1939 else
1824 ev_timer_stop (EV_A_ w); 1940 ev_timer_stop (EV_A_ w);
1825 } 1941 }
1826 else if (w->repeat) 1942 else if (w->repeat)
1827 { 1943 {
1828 w->at = w->repeat; 1944 ev_at (w) = w->repeat;
1829 ev_timer_start (EV_A_ w); 1945 ev_timer_start (EV_A_ w);
1830 } 1946 }
1831} 1947}
1832 1948
1833#if EV_PERIODIC_ENABLE 1949#if EV_PERIODIC_ENABLE
… …
1836{ 1952{
1837 if (expect_false (ev_is_active (w))) 1953 if (expect_false (ev_is_active (w)))
1838 return; 1954 return;
1839 1955
1840 if (w->reschedule_cb) 1956 if (w->reschedule_cb)
1841 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1957 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1842 else if (w->interval) 1958 else if (w->interval)
1843 { 1959 {
1844 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1960 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1845 /* this formula differs from the one in periodic_reify because we do not always round up */ 1961 /* this formula differs from the one in periodic_reify because we do not always round up */
1846 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1962 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1847 } 1963 }
1848 else 1964 else
1849 ((WT)w)->at = w->offset; 1965 ev_at (w) = w->offset;
1850 1966
1851 ev_start (EV_A_ (W)w, ++periodiccnt); 1967 ev_start (EV_A_ (W)w, ++periodiccnt);
1852 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2); 1968 array_needsize (WT, periodics, periodicmax, periodiccnt + 1, EMPTY2);
1853 periodics [periodiccnt - 1] = (WT)w; 1969 periodics [periodiccnt] = (WT)w;
1854 upheap (periodics, periodiccnt - 1); 1970 upheap (periodics, periodiccnt);
1855 1971
1856 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1972 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/
1857} 1973}
1858 1974
1859void noinline 1975void noinline
1860ev_periodic_stop (EV_P_ ev_periodic *w) 1976ev_periodic_stop (EV_P_ ev_periodic *w)
1861{ 1977{
1862 clear_pending (EV_A_ (W)w); 1978 clear_pending (EV_A_ (W)w);
1863 if (expect_false (!ev_is_active (w))) 1979 if (expect_false (!ev_is_active (w)))
1864 return; 1980 return;
1865 1981
1866 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1867
1868 { 1982 {
1869 int active = ((W)w)->active; 1983 int active = ev_active (w);
1870 1984
1985 assert (("internal periodic heap corruption", periodics [active] == (WT)w));
1986
1871 if (expect_true (--active < --periodiccnt)) 1987 if (expect_true (active < periodiccnt))
1872 { 1988 {
1873 periodics [active] = periodics [periodiccnt]; 1989 periodics [active] = periodics [periodiccnt];
1874 adjustheap (periodics, periodiccnt, active); 1990 adjustheap (periodics, periodiccnt, active);
1875 } 1991 }
1992
1993 --periodiccnt;
1876 } 1994 }
1877 1995
1878 ev_stop (EV_A_ (W)w); 1996 ev_stop (EV_A_ (W)w);
1879} 1997}
1880 1998
… …
1922 wlist_add (&signals [w->signum - 1].head, (WL)w); 2040 wlist_add (&signals [w->signum - 1].head, (WL)w);
1923 2041
1924 if (!((WL)w)->next) 2042 if (!((WL)w)->next)
1925 { 2043 {
1926#if _WIN32 2044#if _WIN32
1927 signal (w->signum, sighandler); 2045 signal (w->signum, ev_sighandler);
1928#else 2046#else
1929 struct sigaction sa; 2047 struct sigaction sa;
1930 sa.sa_handler = sighandler; 2048 sa.sa_handler = ev_sighandler;
1931 sigfillset (&sa.sa_mask); 2049 sigfillset (&sa.sa_mask);
1932 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2050 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1933 sigaction (w->signum, &sa, 0); 2051 sigaction (w->signum, &sa, 0);
1934#endif 2052#endif
1935 } 2053 }
… …
2250 clear_pending (EV_A_ (W)w); 2368 clear_pending (EV_A_ (W)w);
2251 if (expect_false (!ev_is_active (w))) 2369 if (expect_false (!ev_is_active (w)))
2252 return; 2370 return;
2253 2371
2254 { 2372 {
2255 int active = ((W)w)->active; 2373 int active = ev_active (w);
2256 2374
2257 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2375 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2258 ((W)idles [ABSPRI (w)][active - 1])->active = active; 2376 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2259 2377
2260 ev_stop (EV_A_ (W)w); 2378 ev_stop (EV_A_ (W)w);
2261 --idleall; 2379 --idleall;
2262 } 2380 }
2263} 2381}
… …
2280 clear_pending (EV_A_ (W)w); 2398 clear_pending (EV_A_ (W)w);
2281 if (expect_false (!ev_is_active (w))) 2399 if (expect_false (!ev_is_active (w)))
2282 return; 2400 return;
2283 2401
2284 { 2402 {
2285 int active = ((W)w)->active; 2403 int active = ev_active (w);
2404
2286 prepares [active - 1] = prepares [--preparecnt]; 2405 prepares [active - 1] = prepares [--preparecnt];
2287 ((W)prepares [active - 1])->active = active; 2406 ev_active (prepares [active - 1]) = active;
2288 } 2407 }
2289 2408
2290 ev_stop (EV_A_ (W)w); 2409 ev_stop (EV_A_ (W)w);
2291} 2410}
2292 2411
… …
2307 clear_pending (EV_A_ (W)w); 2426 clear_pending (EV_A_ (W)w);
2308 if (expect_false (!ev_is_active (w))) 2427 if (expect_false (!ev_is_active (w)))
2309 return; 2428 return;
2310 2429
2311 { 2430 {
2312 int active = ((W)w)->active; 2431 int active = ev_active (w);
2432
2313 checks [active - 1] = checks [--checkcnt]; 2433 checks [active - 1] = checks [--checkcnt];
2314 ((W)checks [active - 1])->active = active; 2434 ev_active (checks [active - 1]) = active;
2315 } 2435 }
2316 2436
2317 ev_stop (EV_A_ (W)w); 2437 ev_stop (EV_A_ (W)w);
2318} 2438}
2319 2439
… …
2415 clear_pending (EV_A_ (W)w); 2535 clear_pending (EV_A_ (W)w);
2416 if (expect_false (!ev_is_active (w))) 2536 if (expect_false (!ev_is_active (w)))
2417 return; 2537 return;
2418 2538
2419 { 2539 {
2420 int active = ((W)w)->active; 2540 int active = ev_active (w);
2541
2421 forks [active - 1] = forks [--forkcnt]; 2542 forks [active - 1] = forks [--forkcnt];
2422 ((W)forks [active - 1])->active = active; 2543 ev_active (forks [active - 1]) = active;
2423 } 2544 }
2424 2545
2425 ev_stop (EV_A_ (W)w); 2546 ev_stop (EV_A_ (W)w);
2426} 2547}
2427#endif 2548#endif
… …
2446 clear_pending (EV_A_ (W)w); 2567 clear_pending (EV_A_ (W)w);
2447 if (expect_false (!ev_is_active (w))) 2568 if (expect_false (!ev_is_active (w)))
2448 return; 2569 return;
2449 2570
2450 { 2571 {
2451 int active = ((W)w)->active; 2572 int active = ev_active (w);
2573
2452 asyncs [active - 1] = asyncs [--asynccnt]; 2574 asyncs [active - 1] = asyncs [--asynccnt];
2453 ((W)asyncs [active - 1])->active = active; 2575 ev_active (asyncs [active - 1]) = active;
2454 } 2576 }
2455 2577
2456 ev_stop (EV_A_ (W)w); 2578 ev_stop (EV_A_ (W)w);
2457} 2579}
2458 2580
2459void 2581void
2460ev_async_send (EV_P_ ev_async *w) 2582ev_async_send (EV_P_ ev_async *w)
2461{ 2583{
2462 w->sent = 1; 2584 w->sent = 1;
2463 evpipe_write (EV_A_ 0, 1); 2585 evpipe_write (EV_A_ &gotasync);
2464} 2586}
2465#endif 2587#endif
2466 2588
2467/*****************************************************************************/ 2589/*****************************************************************************/
2468 2590

Diff Legend

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