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

Comparing libev/ev.c (file contents):
Revision 1.216 by root, Sat Mar 8 07:04:55 2008 UTC vs.
Revision 1.228 by root, Fri May 2 08:07:37 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_at(w) ((WT)(w))->at
331
293#if EV_USE_MONOTONIC 332#if EV_USE_MONOTONIC
294/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 333/* 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 */ 334/* giving it a reasonably high chance of working on typical architetcures */
296static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 335static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
297#endif 336#endif
… …
323 perror (msg); 362 perror (msg);
324 abort (); 363 abort ();
325 } 364 }
326} 365}
327 366
367static void *
368ev_realloc_emul (void *ptr, long size)
369{
370 /* some systems, notably openbsd and darwin, fail to properly
371 * implement realloc (x, 0) (as required by both ansi c-98 and
372 * the single unix specification, so work around them here.
373 */
374
375 if (size)
376 return realloc (ptr, size);
377
378 free (ptr);
379 return 0;
380}
381
328static void *(*alloc)(void *ptr, long size); 382static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
329 383
330void 384void
331ev_set_allocator (void *(*cb)(void *ptr, long size)) 385ev_set_allocator (void *(*cb)(void *ptr, long size))
332{ 386{
333 alloc = cb; 387 alloc = cb;
334} 388}
335 389
336inline_speed void * 390inline_speed void *
337ev_realloc (void *ptr, long size) 391ev_realloc (void *ptr, long size)
338{ 392{
339 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 393 ptr = alloc (ptr, size);
340 394
341 if (!ptr && size) 395 if (!ptr && size)
342 { 396 {
343 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 397 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
344 abort (); 398 abort ();
… …
451 ts.tv_sec = (time_t)delay; 505 ts.tv_sec = (time_t)delay;
452 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9); 506 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
453 507
454 nanosleep (&ts, 0); 508 nanosleep (&ts, 0);
455#elif defined(_WIN32) 509#elif defined(_WIN32)
456 Sleep (delay * 1e3); 510 Sleep ((unsigned long)(delay * 1e3));
457#else 511#else
458 struct timeval tv; 512 struct timeval tv;
459 513
460 tv.tv_sec = (time_t)delay; 514 tv.tv_sec = (time_t)delay;
461 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 515 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
… …
702 } 756 }
703} 757}
704 758
705/*****************************************************************************/ 759/*****************************************************************************/
706 760
761/* towards the root */
707void inline_speed 762void inline_speed
708upheap (WT *heap, int k) 763upheap (WT *heap, int k)
709{ 764{
710 WT w = heap [k]; 765 WT w = heap [k];
711 766
712 while (k) 767 for (;;)
713 { 768 {
714 int p = (k - 1) >> 1; 769 int p = k >> 1;
715 770
771 /* maybe we could use a dummy element at heap [0]? */
716 if (heap [p]->at <= w->at) 772 if (!p || heap [p]->at <= w->at)
717 break; 773 break;
718 774
719 heap [k] = heap [p]; 775 heap [k] = heap [p];
720 ((W)heap [k])->active = k + 1; 776 ((W)heap [k])->active = k;
721 k = p; 777 k = p;
722 } 778 }
723 779
724 heap [k] = w; 780 heap [k] = w;
725 ((W)heap [k])->active = k + 1; 781 ((W)heap [k])->active = k;
726} 782}
727 783
784/* away from the root */
728void inline_speed 785void inline_speed
729downheap (WT *heap, int N, int k) 786downheap (WT *heap, int N, int k)
730{ 787{
731 WT w = heap [k]; 788 WT w = heap [k];
732 789
733 for (;;) 790 for (;;)
734 { 791 {
735 int c = (k << 1) + 1; 792 int c = k << 1;
736 793
737 if (c >= N) 794 if (c > N)
738 break; 795 break;
739 796
740 c += c + 1 < N && heap [c]->at > heap [c + 1]->at 797 c += c < N && heap [c]->at > heap [c + 1]->at
741 ? 1 : 0; 798 ? 1 : 0;
742 799
743 if (w->at <= heap [c]->at) 800 if (w->at <= heap [c]->at)
744 break; 801 break;
745 802
746 heap [k] = heap [c]; 803 heap [k] = heap [c];
747 ((W)heap [k])->active = k + 1; 804 ((W)heap [k])->active = k;
748 805
749 k = c; 806 k = c;
750 } 807 }
751 808
752 heap [k] = w; 809 heap [k] = w;
753 ((W)heap [k])->active = k + 1; 810 ((W)heap [k])->active = k;
754} 811}
755 812
756void inline_size 813void inline_size
757adjustheap (WT *heap, int N, int k) 814adjustheap (WT *heap, int N, int k)
758{ 815{
… …
802static void noinline 859static void noinline
803evpipe_init (EV_P) 860evpipe_init (EV_P)
804{ 861{
805 if (!ev_is_active (&pipeev)) 862 if (!ev_is_active (&pipeev))
806 { 863 {
864#if EV_USE_EVENTFD
865 if ((evfd = eventfd (0, 0)) >= 0)
866 {
867 evpipe [0] = -1;
868 fd_intern (evfd);
869 ev_io_set (&pipeev, evfd, EV_READ);
870 }
871 else
872#endif
873 {
807 while (pipe (evpipe)) 874 while (pipe (evpipe))
808 syserr ("(libev) error creating signal/async pipe"); 875 syserr ("(libev) error creating signal/async pipe");
809 876
810 fd_intern (evpipe [0]); 877 fd_intern (evpipe [0]);
811 fd_intern (evpipe [1]); 878 fd_intern (evpipe [1]);
812
813 ev_io_set (&pipeev, evpipe [0], EV_READ); 879 ev_io_set (&pipeev, evpipe [0], EV_READ);
880 }
881
814 ev_io_start (EV_A_ &pipeev); 882 ev_io_start (EV_A_ &pipeev);
815 ev_unref (EV_A); /* watcher should not keep loop alive */ 883 ev_unref (EV_A); /* watcher should not keep loop alive */
816 } 884 }
817} 885}
818 886
… …
822 if (!*flag) 890 if (!*flag)
823 { 891 {
824 int old_errno = errno; /* save errno because write might clobber it */ 892 int old_errno = errno; /* save errno because write might clobber it */
825 893
826 *flag = 1; 894 *flag = 1;
895
896#if EV_USE_EVENTFD
897 if (evfd >= 0)
898 {
899 uint64_t counter = 1;
900 write (evfd, &counter, sizeof (uint64_t));
901 }
902 else
903#endif
827 write (evpipe [1], &old_errno, 1); 904 write (evpipe [1], &old_errno, 1);
828 905
829 errno = old_errno; 906 errno = old_errno;
830 } 907 }
831} 908}
832 909
833static void 910static void
834pipecb (EV_P_ ev_io *iow, int revents) 911pipecb (EV_P_ ev_io *iow, int revents)
835{ 912{
913#if EV_USE_EVENTFD
914 if (evfd >= 0)
836 { 915 {
837 int dummy; 916 uint64_t counter = 1;
917 read (evfd, &counter, sizeof (uint64_t));
918 }
919 else
920#endif
921 {
922 char dummy;
838 read (evpipe [0], &dummy, 1); 923 read (evpipe [0], &dummy, 1);
839 } 924 }
840 925
841 if (gotsig && ev_is_default_loop (EV_A)) 926 if (gotsig && ev_is_default_loop (EV_A))
842 { 927 {
843 int signum; 928 int signum;
844 gotsig = 0; 929 gotsig = 0;
… …
865} 950}
866 951
867/*****************************************************************************/ 952/*****************************************************************************/
868 953
869static void 954static void
870sighandler (int signum) 955ev_sighandler (int signum)
871{ 956{
872#if EV_MULTIPLICITY 957#if EV_MULTIPLICITY
873 struct ev_loop *loop = &default_loop_struct; 958 struct ev_loop *loop = &default_loop_struct;
874#endif 959#endif
875 960
876#if _WIN32 961#if _WIN32
877 signal (signum, sighandler); 962 signal (signum, ev_sighandler);
878#endif 963#endif
879 964
880 signals [signum - 1].gotsig = 1; 965 signals [signum - 1].gotsig = 1;
881 evpipe_write (EV_A_ &gotsig); 966 evpipe_write (EV_A_ &gotsig);
882} 967}
… …
1105 if (!(flags & EVFLAG_NOENV) 1190 if (!(flags & EVFLAG_NOENV)
1106 && !enable_secure () 1191 && !enable_secure ()
1107 && getenv ("LIBEV_FLAGS")) 1192 && getenv ("LIBEV_FLAGS"))
1108 flags = atoi (getenv ("LIBEV_FLAGS")); 1193 flags = atoi (getenv ("LIBEV_FLAGS"));
1109 1194
1110 if (!(flags & 0x0000ffffUL)) 1195 if (!(flags & 0x0000ffffU))
1111 flags |= ev_recommended_backends (); 1196 flags |= ev_recommended_backends ();
1112 1197
1113#if EV_USE_PORT 1198#if EV_USE_PORT
1114 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1199 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1115#endif 1200#endif
… …
1139 if (ev_is_active (&pipeev)) 1224 if (ev_is_active (&pipeev))
1140 { 1225 {
1141 ev_ref (EV_A); /* signal watcher */ 1226 ev_ref (EV_A); /* signal watcher */
1142 ev_io_stop (EV_A_ &pipeev); 1227 ev_io_stop (EV_A_ &pipeev);
1143 1228
1144 close (evpipe [0]); evpipe [0] = 0; 1229#if EV_USE_EVENTFD
1145 close (evpipe [1]); evpipe [1] = 0; 1230 if (evfd >= 0)
1231 close (evfd);
1232#endif
1233
1234 if (evpipe [0] >= 0)
1235 {
1236 close (evpipe [0]);
1237 close (evpipe [1]);
1238 }
1146 } 1239 }
1147 1240
1148#if EV_USE_INOTIFY 1241#if EV_USE_INOTIFY
1149 if (fs_fd >= 0) 1242 if (fs_fd >= 0)
1150 close (fs_fd); 1243 close (fs_fd);
… …
1195#endif 1288#endif
1196 1289
1197 backend = 0; 1290 backend = 0;
1198} 1291}
1199 1292
1293#if EV_USE_INOTIFY
1200void inline_size infy_fork (EV_P); 1294void inline_size infy_fork (EV_P);
1295#endif
1201 1296
1202void inline_size 1297void inline_size
1203loop_fork (EV_P) 1298loop_fork (EV_P)
1204{ 1299{
1205#if EV_USE_PORT 1300#if EV_USE_PORT
… …
1224 gotasync = 1; 1319 gotasync = 1;
1225#endif 1320#endif
1226 1321
1227 ev_ref (EV_A); 1322 ev_ref (EV_A);
1228 ev_io_stop (EV_A_ &pipeev); 1323 ev_io_stop (EV_A_ &pipeev);
1324
1325#if EV_USE_EVENTFD
1326 if (evfd >= 0)
1327 close (evfd);
1328#endif
1329
1330 if (evpipe [0] >= 0)
1331 {
1229 close (evpipe [0]); 1332 close (evpipe [0]);
1230 close (evpipe [1]); 1333 close (evpipe [1]);
1334 }
1231 1335
1232 evpipe_init (EV_A); 1336 evpipe_init (EV_A);
1233 /* now iterate over everything, in case we missed something */ 1337 /* now iterate over everything, in case we missed something */
1234 pipecb (EV_A_ &pipeev, EV_READ); 1338 pipecb (EV_A_ &pipeev, EV_READ);
1235 } 1339 }
… …
1357} 1461}
1358 1462
1359void inline_size 1463void inline_size
1360timers_reify (EV_P) 1464timers_reify (EV_P)
1361{ 1465{
1362 while (timercnt && ((WT)timers [0])->at <= mn_now) 1466 while (timercnt && ev_at (timers [1]) <= mn_now)
1363 { 1467 {
1364 ev_timer *w = (ev_timer *)timers [0]; 1468 ev_timer *w = (ev_timer *)timers [1];
1365 1469
1366 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1470 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1367 1471
1368 /* first reschedule or stop timer */ 1472 /* first reschedule or stop timer */
1369 if (w->repeat) 1473 if (w->repeat)
1370 { 1474 {
1371 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1475 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1372 1476
1373 ((WT)w)->at += w->repeat; 1477 ev_at (w) += w->repeat;
1374 if (((WT)w)->at < mn_now) 1478 if (ev_at (w) < mn_now)
1375 ((WT)w)->at = mn_now; 1479 ev_at (w) = mn_now;
1376 1480
1377 downheap (timers, timercnt, 0); 1481 downheap (timers, timercnt, 1);
1378 } 1482 }
1379 else 1483 else
1380 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1484 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1381 1485
1382 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1486 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1385 1489
1386#if EV_PERIODIC_ENABLE 1490#if EV_PERIODIC_ENABLE
1387void inline_size 1491void inline_size
1388periodics_reify (EV_P) 1492periodics_reify (EV_P)
1389{ 1493{
1390 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1494 while (periodiccnt && ev_at (periodics [1]) <= ev_rt_now)
1391 { 1495 {
1392 ev_periodic *w = (ev_periodic *)periodics [0]; 1496 ev_periodic *w = (ev_periodic *)periodics [1];
1393 1497
1394 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1498 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1395 1499
1396 /* first reschedule or stop timer */ 1500 /* first reschedule or stop timer */
1397 if (w->reschedule_cb) 1501 if (w->reschedule_cb)
1398 { 1502 {
1399 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON); 1503 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)); 1504 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now));
1401 downheap (periodics, periodiccnt, 0); 1505 downheap (periodics, periodiccnt, 1);
1402 } 1506 }
1403 else if (w->interval) 1507 else if (w->interval)
1404 { 1508 {
1405 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1509 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; 1510 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)); 1511 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now));
1408 downheap (periodics, periodiccnt, 0); 1512 downheap (periodics, periodiccnt, 1);
1409 } 1513 }
1410 else 1514 else
1411 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1515 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1412 1516
1413 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1517 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1423 for (i = 0; i < periodiccnt; ++i) 1527 for (i = 0; i < periodiccnt; ++i)
1424 { 1528 {
1425 ev_periodic *w = (ev_periodic *)periodics [i]; 1529 ev_periodic *w = (ev_periodic *)periodics [i];
1426 1530
1427 if (w->reschedule_cb) 1531 if (w->reschedule_cb)
1428 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1532 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1429 else if (w->interval) 1533 else if (w->interval)
1430 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1534 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1431 } 1535 }
1432 1536
1433 /* now rebuild the heap */ 1537 /* now rebuild the heap */
1434 for (i = periodiccnt >> 1; i--; ) 1538 for (i = periodiccnt >> 1; i--; )
1435 downheap (periodics, periodiccnt, i); 1539 downheap (periodics, periodiccnt, i);
… …
1517 { 1621 {
1518#if EV_PERIODIC_ENABLE 1622#if EV_PERIODIC_ENABLE
1519 periodics_reschedule (EV_A); 1623 periodics_reschedule (EV_A);
1520#endif 1624#endif
1521 /* adjust timers. this is easy, as the offset is the same for all of them */ 1625 /* adjust timers. this is easy, as the offset is the same for all of them */
1522 for (i = 0; i < timercnt; ++i) 1626 for (i = 1; i <= timercnt; ++i)
1523 ((WT)timers [i])->at += ev_rt_now - mn_now; 1627 ev_at (timers [i]) += ev_rt_now - mn_now;
1524 } 1628 }
1525 1629
1526 mn_now = ev_rt_now; 1630 mn_now = ev_rt_now;
1527 } 1631 }
1528} 1632}
… …
1542static int loop_done; 1646static int loop_done;
1543 1647
1544void 1648void
1545ev_loop (EV_P_ int flags) 1649ev_loop (EV_P_ int flags)
1546{ 1650{
1547 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1651 loop_done = EVUNLOOP_CANCEL;
1548 ? EVUNLOOP_ONE
1549 : EVUNLOOP_CANCEL;
1550 1652
1551 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1653 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1552 1654
1553 do 1655 do
1554 { 1656 {
… …
1600 1702
1601 waittime = MAX_BLOCKTIME; 1703 waittime = MAX_BLOCKTIME;
1602 1704
1603 if (timercnt) 1705 if (timercnt)
1604 { 1706 {
1605 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1707 ev_tstamp to = ev_at (timers [1]) - mn_now + backend_fudge;
1606 if (waittime > to) waittime = to; 1708 if (waittime > to) waittime = to;
1607 } 1709 }
1608 1710
1609#if EV_PERIODIC_ENABLE 1711#if EV_PERIODIC_ENABLE
1610 if (periodiccnt) 1712 if (periodiccnt)
1611 { 1713 {
1612 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1714 ev_tstamp to = ev_at (periodics [1]) - ev_rt_now + backend_fudge;
1613 if (waittime > to) waittime = to; 1715 if (waittime > to) waittime = to;
1614 } 1716 }
1615#endif 1717#endif
1616 1718
1617 if (expect_false (waittime < timeout_blocktime)) 1719 if (expect_false (waittime < timeout_blocktime))
… …
1650 /* queue check watchers, to be executed first */ 1752 /* queue check watchers, to be executed first */
1651 if (expect_false (checkcnt)) 1753 if (expect_false (checkcnt))
1652 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1754 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1653 1755
1654 call_pending (EV_A); 1756 call_pending (EV_A);
1655
1656 } 1757 }
1657 while (expect_true (activecnt && !loop_done)); 1758 while (expect_true (
1759 activecnt
1760 && !loop_done
1761 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1762 ));
1658 1763
1659 if (loop_done == EVUNLOOP_ONE) 1764 if (loop_done == EVUNLOOP_ONE)
1660 loop_done = EVUNLOOP_CANCEL; 1765 loop_done = EVUNLOOP_CANCEL;
1661} 1766}
1662 1767
… …
1780ev_timer_start (EV_P_ ev_timer *w) 1885ev_timer_start (EV_P_ ev_timer *w)
1781{ 1886{
1782 if (expect_false (ev_is_active (w))) 1887 if (expect_false (ev_is_active (w)))
1783 return; 1888 return;
1784 1889
1785 ((WT)w)->at += mn_now; 1890 ev_at (w) += mn_now;
1786 1891
1787 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1892 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1788 1893
1789 ev_start (EV_A_ (W)w, ++timercnt); 1894 ev_start (EV_A_ (W)w, ++timercnt);
1790 array_needsize (WT, timers, timermax, timercnt, EMPTY2); 1895 array_needsize (WT, timers, timermax, timercnt + 1, EMPTY2);
1791 timers [timercnt - 1] = (WT)w; 1896 timers [timercnt] = (WT)w;
1792 upheap (timers, timercnt - 1); 1897 upheap (timers, timercnt);
1793 1898
1794 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1899 /*assert (("internal timer heap corruption", timers [((W)w)->active] == w));*/
1795} 1900}
1796 1901
1797void noinline 1902void noinline
1798ev_timer_stop (EV_P_ ev_timer *w) 1903ev_timer_stop (EV_P_ ev_timer *w)
1799{ 1904{
1800 clear_pending (EV_A_ (W)w); 1905 clear_pending (EV_A_ (W)w);
1801 if (expect_false (!ev_is_active (w))) 1906 if (expect_false (!ev_is_active (w)))
1802 return; 1907 return;
1803 1908
1804 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w)); 1909 assert (("internal timer heap corruption", timers [((W)w)->active] == (WT)w));
1805 1910
1806 { 1911 {
1807 int active = ((W)w)->active; 1912 int active = ((W)w)->active;
1808 1913
1809 if (expect_true (--active < --timercnt)) 1914 if (expect_true (active < timercnt))
1810 { 1915 {
1811 timers [active] = timers [timercnt]; 1916 timers [active] = timers [timercnt];
1812 adjustheap (timers, timercnt, active); 1917 adjustheap (timers, timercnt, active);
1813 } 1918 }
1919
1920 --timercnt;
1814 } 1921 }
1815 1922
1816 ((WT)w)->at -= mn_now; 1923 ev_at (w) -= mn_now;
1817 1924
1818 ev_stop (EV_A_ (W)w); 1925 ev_stop (EV_A_ (W)w);
1819} 1926}
1820 1927
1821void noinline 1928void noinline
… …
1823{ 1930{
1824 if (ev_is_active (w)) 1931 if (ev_is_active (w))
1825 { 1932 {
1826 if (w->repeat) 1933 if (w->repeat)
1827 { 1934 {
1828 ((WT)w)->at = mn_now + w->repeat; 1935 ev_at (w) = mn_now + w->repeat;
1829 adjustheap (timers, timercnt, ((W)w)->active - 1); 1936 adjustheap (timers, timercnt, ((W)w)->active);
1830 } 1937 }
1831 else 1938 else
1832 ev_timer_stop (EV_A_ w); 1939 ev_timer_stop (EV_A_ w);
1833 } 1940 }
1834 else if (w->repeat) 1941 else if (w->repeat)
… …
1844{ 1951{
1845 if (expect_false (ev_is_active (w))) 1952 if (expect_false (ev_is_active (w)))
1846 return; 1953 return;
1847 1954
1848 if (w->reschedule_cb) 1955 if (w->reschedule_cb)
1849 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1956 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1850 else if (w->interval) 1957 else if (w->interval)
1851 { 1958 {
1852 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1959 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 */ 1960 /* 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; 1961 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1855 } 1962 }
1856 else 1963 else
1857 ((WT)w)->at = w->offset; 1964 ev_at (w) = w->offset;
1858 1965
1859 ev_start (EV_A_ (W)w, ++periodiccnt); 1966 ev_start (EV_A_ (W)w, ++periodiccnt);
1860 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2); 1967 array_needsize (WT, periodics, periodicmax, periodiccnt + 1, EMPTY2);
1861 periodics [periodiccnt - 1] = (WT)w; 1968 periodics [periodiccnt] = (WT)w;
1862 upheap (periodics, periodiccnt - 1); 1969 upheap (periodics, periodiccnt);
1863 1970
1864 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1971 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1865} 1972}
1866 1973
1867void noinline 1974void noinline
… …
1869{ 1976{
1870 clear_pending (EV_A_ (W)w); 1977 clear_pending (EV_A_ (W)w);
1871 if (expect_false (!ev_is_active (w))) 1978 if (expect_false (!ev_is_active (w)))
1872 return; 1979 return;
1873 1980
1874 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w)); 1981 assert (("internal periodic heap corruption", periodics [((W)w)->active] == (WT)w));
1875 1982
1876 { 1983 {
1877 int active = ((W)w)->active; 1984 int active = ((W)w)->active;
1878 1985
1879 if (expect_true (--active < --periodiccnt)) 1986 if (expect_true (active < periodiccnt))
1880 { 1987 {
1881 periodics [active] = periodics [periodiccnt]; 1988 periodics [active] = periodics [periodiccnt];
1882 adjustheap (periodics, periodiccnt, active); 1989 adjustheap (periodics, periodiccnt, active);
1883 } 1990 }
1991
1992 --periodiccnt;
1884 } 1993 }
1885 1994
1886 ev_stop (EV_A_ (W)w); 1995 ev_stop (EV_A_ (W)w);
1887} 1996}
1888 1997
… …
1930 wlist_add (&signals [w->signum - 1].head, (WL)w); 2039 wlist_add (&signals [w->signum - 1].head, (WL)w);
1931 2040
1932 if (!((WL)w)->next) 2041 if (!((WL)w)->next)
1933 { 2042 {
1934#if _WIN32 2043#if _WIN32
1935 signal (w->signum, sighandler); 2044 signal (w->signum, ev_sighandler);
1936#else 2045#else
1937 struct sigaction sa; 2046 struct sigaction sa;
1938 sa.sa_handler = sighandler; 2047 sa.sa_handler = ev_sighandler;
1939 sigfillset (&sa.sa_mask); 2048 sigfillset (&sa.sa_mask);
1940 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2049 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1941 sigaction (w->signum, &sa, 0); 2050 sigaction (w->signum, &sa, 0);
1942#endif 2051#endif
1943 } 2052 }

Diff Legend

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