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

Comparing libev/ev.c (file contents):
Revision 1.214 by root, Tue Feb 19 19:21:20 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); /* 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_ EV_ATOMIC_T *flag) 889evpipe_write (EV_P_ EV_ATOMIC_T *flag)
821{ 890{
822 if (!*flag) 891 if (!*flag)
823 { 892 {
824 int old_errno = errno; /* save errno becaue write might clobber it */ 893 int old_errno = errno; /* save errno because write might clobber it */
825 894
826 *flag = 1; 895 *flag = 1;
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
827 write (evpipe [1], &old_errno, 1); 905 write (evpipe [1], &old_errno, 1);
828 906
829 errno = old_errno; 907 errno = old_errno;
830 } 908 }
831} 909}
832 910
833static void 911static void
834pipecb (EV_P_ ev_io *iow, int revents) 912pipecb (EV_P_ ev_io *iow, int revents)
835{ 913{
914#if EV_USE_EVENTFD
915 if (evfd >= 0)
836 { 916 {
837 int dummy; 917 uint64_t counter = 1;
918 read (evfd, &counter, sizeof (uint64_t));
919 }
920 else
921#endif
922 {
923 char dummy;
838 read (evpipe [0], &dummy, 1); 924 read (evpipe [0], &dummy, 1);
839 } 925 }
840 926
841 if (gotsig && ev_is_default_loop (EV_A)) 927 if (gotsig && ev_is_default_loop (EV_A))
842 { 928 {
843 int signum; 929 int signum;
844 gotsig = 0; 930 gotsig = 0;
… …
865} 951}
866 952
867/*****************************************************************************/ 953/*****************************************************************************/
868 954
869static void 955static void
870sighandler (int signum) 956ev_sighandler (int signum)
871{ 957{
872#if EV_MULTIPLICITY 958#if EV_MULTIPLICITY
873 struct ev_loop *loop = &default_loop_struct; 959 struct ev_loop *loop = &default_loop_struct;
874#endif 960#endif
875 961
876#if _WIN32 962#if _WIN32
877 signal (signum, sighandler); 963 signal (signum, ev_sighandler);
878#endif 964#endif
879 965
880 signals [signum - 1].gotsig = 1; 966 signals [signum - 1].gotsig = 1;
881 evpipe_write (EV_A_ &gotsig); 967 evpipe_write (EV_A_ &gotsig);
882} 968}
… …
912#ifndef WIFCONTINUED 998#ifndef WIFCONTINUED
913# define WIFCONTINUED(status) 0 999# define WIFCONTINUED(status) 0
914#endif 1000#endif
915 1001
916void inline_speed 1002void inline_speed
917child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1003child_reap (EV_P_ int chain, int pid, int status)
918{ 1004{
919 ev_child *w; 1005 ev_child *w;
920 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1006 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
921 1007
922 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)
923 { 1009 {
924 if ((w->pid == pid || !w->pid) 1010 if ((w->pid == pid || !w->pid)
925 && (!traced || (w->flags & 1))) 1011 && (!traced || (w->flags & 1)))
926 { 1012 {
927 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 */
928 w->rpid = pid; 1014 w->rpid = pid;
929 w->rstatus = status; 1015 w->rstatus = status;
930 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1016 ev_feed_event (EV_A_ (W)w, EV_CHILD);
931 } 1017 }
932 } 1018 }
… …
946 if (!WCONTINUED 1032 if (!WCONTINUED
947 || errno != EINVAL 1033 || errno != EINVAL
948 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1034 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
949 return; 1035 return;
950 1036
951 /* 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 */
952 /* 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 */
953 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1039 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
954 1040
955 child_reap (EV_A_ sw, pid, pid, status); 1041 child_reap (EV_A_ pid, pid, status);
956 if (EV_PID_HASHSIZE > 1) 1042 if (EV_PID_HASHSIZE > 1)
957 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 */
958} 1044}
959 1045
960#endif 1046#endif
961 1047
962/*****************************************************************************/ 1048/*****************************************************************************/
… …
1105 if (!(flags & EVFLAG_NOENV) 1191 if (!(flags & EVFLAG_NOENV)
1106 && !enable_secure () 1192 && !enable_secure ()
1107 && getenv ("LIBEV_FLAGS")) 1193 && getenv ("LIBEV_FLAGS"))
1108 flags = atoi (getenv ("LIBEV_FLAGS")); 1194 flags = atoi (getenv ("LIBEV_FLAGS"));
1109 1195
1110 if (!(flags & 0x0000ffffUL)) 1196 if (!(flags & 0x0000ffffU))
1111 flags |= ev_recommended_backends (); 1197 flags |= ev_recommended_backends ();
1112 1198
1113#if EV_USE_PORT 1199#if EV_USE_PORT
1114 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1200 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1115#endif 1201#endif
… …
1139 if (ev_is_active (&pipeev)) 1225 if (ev_is_active (&pipeev))
1140 { 1226 {
1141 ev_ref (EV_A); /* signal watcher */ 1227 ev_ref (EV_A); /* signal watcher */
1142 ev_io_stop (EV_A_ &pipeev); 1228 ev_io_stop (EV_A_ &pipeev);
1143 1229
1144 close (evpipe [0]); evpipe [0] = 0; 1230#if EV_USE_EVENTFD
1145 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 }
1146 } 1240 }
1147 1241
1148#if EV_USE_INOTIFY 1242#if EV_USE_INOTIFY
1149 if (fs_fd >= 0) 1243 if (fs_fd >= 0)
1150 close (fs_fd); 1244 close (fs_fd);
… …
1195#endif 1289#endif
1196 1290
1197 backend = 0; 1291 backend = 0;
1198} 1292}
1199 1293
1294#if EV_USE_INOTIFY
1200void inline_size infy_fork (EV_P); 1295void inline_size infy_fork (EV_P);
1296#endif
1201 1297
1202void inline_size 1298void inline_size
1203loop_fork (EV_P) 1299loop_fork (EV_P)
1204{ 1300{
1205#if EV_USE_PORT 1301#if EV_USE_PORT
… …
1224 gotasync = 1; 1320 gotasync = 1;
1225#endif 1321#endif
1226 1322
1227 ev_ref (EV_A); 1323 ev_ref (EV_A);
1228 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 {
1229 close (evpipe [0]); 1333 close (evpipe [0]);
1230 close (evpipe [1]); 1334 close (evpipe [1]);
1335 }
1231 1336
1232 evpipe_init (EV_A); 1337 evpipe_init (EV_A);
1233 /* now iterate over everything, in case we missed something */ 1338 /* now iterate over everything, in case we missed something */
1234 pipecb (EV_A_ &pipeev, EV_READ); 1339 pipecb (EV_A_ &pipeev, EV_READ);
1235 } 1340 }
… …
1357} 1462}
1358 1463
1359void inline_size 1464void inline_size
1360timers_reify (EV_P) 1465timers_reify (EV_P)
1361{ 1466{
1362 while (timercnt && ((WT)timers [0])->at <= mn_now) 1467 while (timercnt && ev_at (timers [1]) <= mn_now)
1363 { 1468 {
1364 ev_timer *w = (ev_timer *)timers [0]; 1469 ev_timer *w = (ev_timer *)timers [1];
1365 1470
1366 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1471 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1367 1472
1368 /* first reschedule or stop timer */ 1473 /* first reschedule or stop timer */
1369 if (w->repeat) 1474 if (w->repeat)
1370 { 1475 {
1371 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.));
1372 1477
1373 ((WT)w)->at += w->repeat; 1478 ev_at (w) += w->repeat;
1374 if (((WT)w)->at < mn_now) 1479 if (ev_at (w) < mn_now)
1375 ((WT)w)->at = mn_now; 1480 ev_at (w) = mn_now;
1376 1481
1377 downheap (timers, timercnt, 0); 1482 downheap (timers, timercnt, 1);
1378 } 1483 }
1379 else 1484 else
1380 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1485 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1381 1486
1382 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1487 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1385 1490
1386#if EV_PERIODIC_ENABLE 1491#if EV_PERIODIC_ENABLE
1387void inline_size 1492void inline_size
1388periodics_reify (EV_P) 1493periodics_reify (EV_P)
1389{ 1494{
1390 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1495 while (periodiccnt && ev_at (periodics [1]) <= ev_rt_now)
1391 { 1496 {
1392 ev_periodic *w = (ev_periodic *)periodics [0]; 1497 ev_periodic *w = (ev_periodic *)periodics [1];
1393 1498
1394 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1499 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1395 1500
1396 /* first reschedule or stop timer */ 1501 /* first reschedule or stop timer */
1397 if (w->reschedule_cb) 1502 if (w->reschedule_cb)
1398 { 1503 {
1399 ((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);
1400 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));
1401 downheap (periodics, periodiccnt, 0); 1506 downheap (periodics, periodiccnt, 1);
1402 } 1507 }
1403 else if (w->interval) 1508 else if (w->interval)
1404 { 1509 {
1405 ((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;
1406 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;
1407 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));
1408 downheap (periodics, periodiccnt, 0); 1513 downheap (periodics, periodiccnt, 1);
1409 } 1514 }
1410 else 1515 else
1411 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1516 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1412 1517
1413 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1518 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1418periodics_reschedule (EV_P) 1523periodics_reschedule (EV_P)
1419{ 1524{
1420 int i; 1525 int i;
1421 1526
1422 /* adjust periodics after time jump */ 1527 /* adjust periodics after time jump */
1423 for (i = 0; i < periodiccnt; ++i) 1528 for (i = 1; i <= periodiccnt; ++i)
1424 { 1529 {
1425 ev_periodic *w = (ev_periodic *)periodics [i]; 1530 ev_periodic *w = (ev_periodic *)periodics [i];
1426 1531
1427 if (w->reschedule_cb) 1532 if (w->reschedule_cb)
1428 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1533 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1429 else if (w->interval) 1534 else if (w->interval)
1430 ((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;
1431 } 1536 }
1432 1537
1433 /* now rebuild the heap */ 1538 /* now rebuild the heap */
1434 for (i = periodiccnt >> 1; i--; ) 1539 for (i = periodiccnt >> 1; i--; )
1435 downheap (periodics, periodiccnt, i); 1540 downheap (periodics, periodiccnt, i);
… …
1517 { 1622 {
1518#if EV_PERIODIC_ENABLE 1623#if EV_PERIODIC_ENABLE
1519 periodics_reschedule (EV_A); 1624 periodics_reschedule (EV_A);
1520#endif 1625#endif
1521 /* 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 */
1522 for (i = 0; i < timercnt; ++i) 1627 for (i = 1; i <= timercnt; ++i)
1523 ((WT)timers [i])->at += ev_rt_now - mn_now; 1628 ev_at (timers [i]) += ev_rt_now - mn_now;
1524 } 1629 }
1525 1630
1526 mn_now = ev_rt_now; 1631 mn_now = ev_rt_now;
1527 } 1632 }
1528} 1633}
… …
1542static int loop_done; 1647static int loop_done;
1543 1648
1544void 1649void
1545ev_loop (EV_P_ int flags) 1650ev_loop (EV_P_ int flags)
1546{ 1651{
1547 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1652 loop_done = EVUNLOOP_CANCEL;
1548 ? EVUNLOOP_ONE
1549 : EVUNLOOP_CANCEL;
1550 1653
1551 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 */
1552 1655
1553 do 1656 do
1554 { 1657 {
… …
1600 1703
1601 waittime = MAX_BLOCKTIME; 1704 waittime = MAX_BLOCKTIME;
1602 1705
1603 if (timercnt) 1706 if (timercnt)
1604 { 1707 {
1605 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1708 ev_tstamp to = ev_at (timers [1]) - mn_now + backend_fudge;
1606 if (waittime > to) waittime = to; 1709 if (waittime > to) waittime = to;
1607 } 1710 }
1608 1711
1609#if EV_PERIODIC_ENABLE 1712#if EV_PERIODIC_ENABLE
1610 if (periodiccnt) 1713 if (periodiccnt)
1611 { 1714 {
1612 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;
1613 if (waittime > to) waittime = to; 1716 if (waittime > to) waittime = to;
1614 } 1717 }
1615#endif 1718#endif
1616 1719
1617 if (expect_false (waittime < timeout_blocktime)) 1720 if (expect_false (waittime < timeout_blocktime))
… …
1650 /* queue check watchers, to be executed first */ 1753 /* queue check watchers, to be executed first */
1651 if (expect_false (checkcnt)) 1754 if (expect_false (checkcnt))
1652 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1755 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1653 1756
1654 call_pending (EV_A); 1757 call_pending (EV_A);
1655
1656 } 1758 }
1657 while (expect_true (activecnt && !loop_done)); 1759 while (expect_true (
1760 activecnt
1761 && !loop_done
1762 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1763 ));
1658 1764
1659 if (loop_done == EVUNLOOP_ONE) 1765 if (loop_done == EVUNLOOP_ONE)
1660 loop_done = EVUNLOOP_CANCEL; 1766 loop_done = EVUNLOOP_CANCEL;
1661} 1767}
1662 1768
… …
1780ev_timer_start (EV_P_ ev_timer *w) 1886ev_timer_start (EV_P_ ev_timer *w)
1781{ 1887{
1782 if (expect_false (ev_is_active (w))) 1888 if (expect_false (ev_is_active (w)))
1783 return; 1889 return;
1784 1890
1785 ((WT)w)->at += mn_now; 1891 ev_at (w) += mn_now;
1786 1892
1787 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.));
1788 1894
1789 ev_start (EV_A_ (W)w, ++timercnt); 1895 ev_start (EV_A_ (W)w, ++timercnt);
1790 array_needsize (WT, timers, timermax, timercnt, EMPTY2); 1896 array_needsize (WT, timers, timermax, timercnt + 1, EMPTY2);
1791 timers [timercnt - 1] = (WT)w; 1897 timers [timercnt] = (WT)w;
1792 upheap (timers, timercnt - 1); 1898 upheap (timers, timercnt);
1793 1899
1794 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1900 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/
1795} 1901}
1796 1902
1797void noinline 1903void noinline
1798ev_timer_stop (EV_P_ ev_timer *w) 1904ev_timer_stop (EV_P_ ev_timer *w)
1799{ 1905{
1800 clear_pending (EV_A_ (W)w); 1906 clear_pending (EV_A_ (W)w);
1801 if (expect_false (!ev_is_active (w))) 1907 if (expect_false (!ev_is_active (w)))
1802 return; 1908 return;
1803 1909
1804 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1805
1806 { 1910 {
1807 int active = ((W)w)->active; 1911 int active = ev_active (w);
1808 1912
1913 assert (("internal timer heap corruption", timers [active] == (WT)w));
1914
1809 if (expect_true (--active < --timercnt)) 1915 if (expect_true (active < timercnt))
1810 { 1916 {
1811 timers [active] = timers [timercnt]; 1917 timers [active] = timers [timercnt];
1812 adjustheap (timers, timercnt, active); 1918 adjustheap (timers, timercnt, active);
1813 } 1919 }
1920
1921 --timercnt;
1814 } 1922 }
1815 1923
1816 ((WT)w)->at -= mn_now; 1924 ev_at (w) -= mn_now;
1817 1925
1818 ev_stop (EV_A_ (W)w); 1926 ev_stop (EV_A_ (W)w);
1819} 1927}
1820 1928
1821void noinline 1929void noinline
… …
1823{ 1931{
1824 if (ev_is_active (w)) 1932 if (ev_is_active (w))
1825 { 1933 {
1826 if (w->repeat) 1934 if (w->repeat)
1827 { 1935 {
1828 ((WT)w)->at = mn_now + w->repeat; 1936 ev_at (w) = mn_now + w->repeat;
1829 adjustheap (timers, timercnt, ((W)w)->active - 1); 1937 adjustheap (timers, timercnt, ev_active (w));
1830 } 1938 }
1831 else 1939 else
1832 ev_timer_stop (EV_A_ w); 1940 ev_timer_stop (EV_A_ w);
1833 } 1941 }
1834 else if (w->repeat) 1942 else if (w->repeat)
1835 { 1943 {
1836 w->at = w->repeat; 1944 ev_at (w) = w->repeat;
1837 ev_timer_start (EV_A_ w); 1945 ev_timer_start (EV_A_ w);
1838 } 1946 }
1839} 1947}
1840 1948
1841#if EV_PERIODIC_ENABLE 1949#if EV_PERIODIC_ENABLE
… …
1844{ 1952{
1845 if (expect_false (ev_is_active (w))) 1953 if (expect_false (ev_is_active (w)))
1846 return; 1954 return;
1847 1955
1848 if (w->reschedule_cb) 1956 if (w->reschedule_cb)
1849 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1957 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1850 else if (w->interval) 1958 else if (w->interval)
1851 { 1959 {
1852 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.));
1853 /* 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 */
1854 ((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;
1855 } 1963 }
1856 else 1964 else
1857 ((WT)w)->at = w->offset; 1965 ev_at (w) = w->offset;
1858 1966
1859 ev_start (EV_A_ (W)w, ++periodiccnt); 1967 ev_start (EV_A_ (W)w, ++periodiccnt);
1860 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2); 1968 array_needsize (WT, periodics, periodicmax, periodiccnt + 1, EMPTY2);
1861 periodics [periodiccnt - 1] = (WT)w; 1969 periodics [periodiccnt] = (WT)w;
1862 upheap (periodics, periodiccnt - 1); 1970 upheap (periodics, periodiccnt);
1863 1971
1864 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1972 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/
1865} 1973}
1866 1974
1867void noinline 1975void noinline
1868ev_periodic_stop (EV_P_ ev_periodic *w) 1976ev_periodic_stop (EV_P_ ev_periodic *w)
1869{ 1977{
1870 clear_pending (EV_A_ (W)w); 1978 clear_pending (EV_A_ (W)w);
1871 if (expect_false (!ev_is_active (w))) 1979 if (expect_false (!ev_is_active (w)))
1872 return; 1980 return;
1873 1981
1874 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1875
1876 { 1982 {
1877 int active = ((W)w)->active; 1983 int active = ev_active (w);
1878 1984
1985 assert (("internal periodic heap corruption", periodics [active] == (WT)w));
1986
1879 if (expect_true (--active < --periodiccnt)) 1987 if (expect_true (active < periodiccnt))
1880 { 1988 {
1881 periodics [active] = periodics [periodiccnt]; 1989 periodics [active] = periodics [periodiccnt];
1882 adjustheap (periodics, periodiccnt, active); 1990 adjustheap (periodics, periodiccnt, active);
1883 } 1991 }
1992
1993 --periodiccnt;
1884 } 1994 }
1885 1995
1886 ev_stop (EV_A_ (W)w); 1996 ev_stop (EV_A_ (W)w);
1887} 1997}
1888 1998
… …
1930 wlist_add (&signals [w->signum - 1].head, (WL)w); 2040 wlist_add (&signals [w->signum - 1].head, (WL)w);
1931 2041
1932 if (!((WL)w)->next) 2042 if (!((WL)w)->next)
1933 { 2043 {
1934#if _WIN32 2044#if _WIN32
1935 signal (w->signum, sighandler); 2045 signal (w->signum, ev_sighandler);
1936#else 2046#else
1937 struct sigaction sa; 2047 struct sigaction sa;
1938 sa.sa_handler = sighandler; 2048 sa.sa_handler = ev_sighandler;
1939 sigfillset (&sa.sa_mask); 2049 sigfillset (&sa.sa_mask);
1940 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 */
1941 sigaction (w->signum, &sa, 0); 2051 sigaction (w->signum, &sa, 0);
1942#endif 2052#endif
1943 } 2053 }
… …
2258 clear_pending (EV_A_ (W)w); 2368 clear_pending (EV_A_ (W)w);
2259 if (expect_false (!ev_is_active (w))) 2369 if (expect_false (!ev_is_active (w)))
2260 return; 2370 return;
2261 2371
2262 { 2372 {
2263 int active = ((W)w)->active; 2373 int active = ev_active (w);
2264 2374
2265 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2375 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2266 ((W)idles [ABSPRI (w)][active - 1])->active = active; 2376 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2267 2377
2268 ev_stop (EV_A_ (W)w); 2378 ev_stop (EV_A_ (W)w);
2269 --idleall; 2379 --idleall;
2270 } 2380 }
2271} 2381}
… …
2288 clear_pending (EV_A_ (W)w); 2398 clear_pending (EV_A_ (W)w);
2289 if (expect_false (!ev_is_active (w))) 2399 if (expect_false (!ev_is_active (w)))
2290 return; 2400 return;
2291 2401
2292 { 2402 {
2293 int active = ((W)w)->active; 2403 int active = ev_active (w);
2404
2294 prepares [active - 1] = prepares [--preparecnt]; 2405 prepares [active - 1] = prepares [--preparecnt];
2295 ((W)prepares [active - 1])->active = active; 2406 ev_active (prepares [active - 1]) = active;
2296 } 2407 }
2297 2408
2298 ev_stop (EV_A_ (W)w); 2409 ev_stop (EV_A_ (W)w);
2299} 2410}
2300 2411
… …
2315 clear_pending (EV_A_ (W)w); 2426 clear_pending (EV_A_ (W)w);
2316 if (expect_false (!ev_is_active (w))) 2427 if (expect_false (!ev_is_active (w)))
2317 return; 2428 return;
2318 2429
2319 { 2430 {
2320 int active = ((W)w)->active; 2431 int active = ev_active (w);
2432
2321 checks [active - 1] = checks [--checkcnt]; 2433 checks [active - 1] = checks [--checkcnt];
2322 ((W)checks [active - 1])->active = active; 2434 ev_active (checks [active - 1]) = active;
2323 } 2435 }
2324 2436
2325 ev_stop (EV_A_ (W)w); 2437 ev_stop (EV_A_ (W)w);
2326} 2438}
2327 2439
… …
2423 clear_pending (EV_A_ (W)w); 2535 clear_pending (EV_A_ (W)w);
2424 if (expect_false (!ev_is_active (w))) 2536 if (expect_false (!ev_is_active (w)))
2425 return; 2537 return;
2426 2538
2427 { 2539 {
2428 int active = ((W)w)->active; 2540 int active = ev_active (w);
2541
2429 forks [active - 1] = forks [--forkcnt]; 2542 forks [active - 1] = forks [--forkcnt];
2430 ((W)forks [active - 1])->active = active; 2543 ev_active (forks [active - 1]) = active;
2431 } 2544 }
2432 2545
2433 ev_stop (EV_A_ (W)w); 2546 ev_stop (EV_A_ (W)w);
2434} 2547}
2435#endif 2548#endif
… …
2454 clear_pending (EV_A_ (W)w); 2567 clear_pending (EV_A_ (W)w);
2455 if (expect_false (!ev_is_active (w))) 2568 if (expect_false (!ev_is_active (w)))
2456 return; 2569 return;
2457 2570
2458 { 2571 {
2459 int active = ((W)w)->active; 2572 int active = ev_active (w);
2573
2460 asyncs [active - 1] = asyncs [--asynccnt]; 2574 asyncs [active - 1] = asyncs [--asynccnt];
2461 ((W)asyncs [active - 1])->active = active; 2575 ev_active (asyncs [active - 1]) = active;
2462 } 2576 }
2463 2577
2464 ev_stop (EV_A_ (W)w); 2578 ev_stop (EV_A_ (W)w);
2465} 2579}
2466 2580

Diff Legend

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