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

Comparing libev/ev.c (file contents):
Revision 1.218 by root, Sun Mar 23 00:05:03 2008 UTC vs.
Revision 1.234 by root, Tue May 6 23:42:16 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 ();
… …
465 } 520 }
466} 521}
467 522
468/*****************************************************************************/ 523/*****************************************************************************/
469 524
525#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
526
470int inline_size 527int inline_size
471array_nextsize (int elem, int cur, int cnt) 528array_nextsize (int elem, int cur, int cnt)
472{ 529{
473 int ncur = cur + 1; 530 int ncur = cur + 1;
474 531
475 do 532 do
476 ncur <<= 1; 533 ncur <<= 1;
477 while (cnt > ncur); 534 while (cnt > ncur);
478 535
479 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */ 536 /* if size is large, round to MALLOC_ROUND - 4 * longs to accomodate malloc overhead */
480 if (elem * ncur > 4096) 537 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
481 { 538 {
482 ncur *= elem; 539 ncur *= elem;
483 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095; 540 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
484 ncur = ncur - sizeof (void *) * 4; 541 ncur = ncur - sizeof (void *) * 4;
485 ncur /= elem; 542 ncur /= elem;
486 } 543 }
487 544
488 return ncur; 545 return ncur;
… …
702 } 759 }
703} 760}
704 761
705/*****************************************************************************/ 762/*****************************************************************************/
706 763
764/* towards the root */
707void inline_speed 765void inline_speed
708upheap (WT *heap, int k) 766upheap (WT *heap, int k)
709{ 767{
710 WT w = heap [k]; 768 WT w = heap [k];
711 769
712 while (k) 770 for (;;)
713 { 771 {
714 int p = (k - 1) >> 1; 772 int p = k >> 1;
715 773
774 /* maybe we could use a dummy element at heap [0]? */
716 if (heap [p]->at <= w->at) 775 if (!p || heap [p]->at <= w->at)
717 break; 776 break;
718 777
719 heap [k] = heap [p]; 778 heap [k] = heap [p];
720 ((W)heap [k])->active = k + 1; 779 ev_active (heap [k]) = k;
721 k = p; 780 k = p;
722 } 781 }
723 782
724 heap [k] = w; 783 heap [k] = w;
725 ((W)heap [k])->active = k + 1; 784 ev_active (heap [k]) = k;
726} 785}
727 786
787/* away from the root */
728void inline_speed 788void inline_speed
729downheap (WT *heap, int N, int k) 789downheap (WT *heap, int N, int k)
730{ 790{
731 WT w = heap [k]; 791 WT w = heap [k];
732 792
733 for (;;) 793 for (;;)
734 { 794 {
735 int c = (k << 1) + 1; 795 int c = k << 1;
736 796
737 if (c >= N) 797 if (c > N)
738 break; 798 break;
739 799
740 c += c + 1 < N && heap [c]->at > heap [c + 1]->at 800 c += c < N && heap [c]->at > heap [c + 1]->at
741 ? 1 : 0; 801 ? 1 : 0;
742 802
743 if (w->at <= heap [c]->at) 803 if (w->at <= heap [c]->at)
744 break; 804 break;
745 805
746 heap [k] = heap [c]; 806 heap [k] = heap [c];
747 ((W)heap [k])->active = k + 1; 807 ev_active (heap [k]) = k;
748 808
749 k = c; 809 k = c;
750 } 810 }
751 811
752 heap [k] = w; 812 heap [k] = w;
753 ((W)heap [k])->active = k + 1; 813 ev_active (heap [k]) = k;
754} 814}
755 815
756void inline_size 816void inline_size
757adjustheap (WT *heap, int N, int k) 817adjustheap (WT *heap, int N, int k)
758{ 818{
… …
802static void noinline 862static void noinline
803evpipe_init (EV_P) 863evpipe_init (EV_P)
804{ 864{
805 if (!ev_is_active (&pipeev)) 865 if (!ev_is_active (&pipeev))
806 { 866 {
867#if EV_USE_EVENTFD
868 if ((evfd = eventfd (0, 0)) >= 0)
869 {
870 evpipe [0] = -1;
871 fd_intern (evfd);
872 ev_io_set (&pipeev, evfd, EV_READ);
873 }
874 else
875#endif
876 {
807 while (pipe (evpipe)) 877 while (pipe (evpipe))
808 syserr ("(libev) error creating signal/async pipe"); 878 syserr ("(libev) error creating signal/async pipe");
809 879
810 fd_intern (evpipe [0]); 880 fd_intern (evpipe [0]);
811 fd_intern (evpipe [1]); 881 fd_intern (evpipe [1]);
812
813 ev_io_set (&pipeev, evpipe [0], EV_READ); 882 ev_io_set (&pipeev, evpipe [0], EV_READ);
883 }
884
814 ev_io_start (EV_A_ &pipeev); 885 ev_io_start (EV_A_ &pipeev);
815 ev_unref (EV_A); /* watcher should not keep loop alive */ 886 ev_unref (EV_A); /* watcher should not keep loop alive */
816 } 887 }
817} 888}
818 889
… …
822 if (!*flag) 893 if (!*flag)
823 { 894 {
824 int old_errno = errno; /* save errno because write might clobber it */ 895 int old_errno = errno; /* save errno because write might clobber it */
825 896
826 *flag = 1; 897 *flag = 1;
898
899#if EV_USE_EVENTFD
900 if (evfd >= 0)
901 {
902 uint64_t counter = 1;
903 write (evfd, &counter, sizeof (uint64_t));
904 }
905 else
906#endif
827 write (evpipe [1], &old_errno, 1); 907 write (evpipe [1], &old_errno, 1);
828 908
829 errno = old_errno; 909 errno = old_errno;
830 } 910 }
831} 911}
832 912
833static void 913static void
834pipecb (EV_P_ ev_io *iow, int revents) 914pipecb (EV_P_ ev_io *iow, int revents)
835{ 915{
916#if EV_USE_EVENTFD
917 if (evfd >= 0)
836 { 918 {
837 int dummy; 919 uint64_t counter;
920 read (evfd, &counter, sizeof (uint64_t));
921 }
922 else
923#endif
924 {
925 char dummy;
838 read (evpipe [0], &dummy, 1); 926 read (evpipe [0], &dummy, 1);
839 } 927 }
840 928
841 if (gotsig && ev_is_default_loop (EV_A)) 929 if (gotsig && ev_is_default_loop (EV_A))
842 { 930 {
843 int signum; 931 int signum;
844 gotsig = 0; 932 gotsig = 0;
… …
1105 if (!(flags & EVFLAG_NOENV) 1193 if (!(flags & EVFLAG_NOENV)
1106 && !enable_secure () 1194 && !enable_secure ()
1107 && getenv ("LIBEV_FLAGS")) 1195 && getenv ("LIBEV_FLAGS"))
1108 flags = atoi (getenv ("LIBEV_FLAGS")); 1196 flags = atoi (getenv ("LIBEV_FLAGS"));
1109 1197
1110 if (!(flags & 0x0000ffffUL)) 1198 if (!(flags & 0x0000ffffU))
1111 flags |= ev_recommended_backends (); 1199 flags |= ev_recommended_backends ();
1112 1200
1113#if EV_USE_PORT 1201#if EV_USE_PORT
1114 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1202 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1115#endif 1203#endif
… …
1139 if (ev_is_active (&pipeev)) 1227 if (ev_is_active (&pipeev))
1140 { 1228 {
1141 ev_ref (EV_A); /* signal watcher */ 1229 ev_ref (EV_A); /* signal watcher */
1142 ev_io_stop (EV_A_ &pipeev); 1230 ev_io_stop (EV_A_ &pipeev);
1143 1231
1144 close (evpipe [0]); evpipe [0] = 0; 1232#if EV_USE_EVENTFD
1145 close (evpipe [1]); evpipe [1] = 0; 1233 if (evfd >= 0)
1234 close (evfd);
1235#endif
1236
1237 if (evpipe [0] >= 0)
1238 {
1239 close (evpipe [0]);
1240 close (evpipe [1]);
1241 }
1146 } 1242 }
1147 1243
1148#if EV_USE_INOTIFY 1244#if EV_USE_INOTIFY
1149 if (fs_fd >= 0) 1245 if (fs_fd >= 0)
1150 close (fs_fd); 1246 close (fs_fd);
… …
1195#endif 1291#endif
1196 1292
1197 backend = 0; 1293 backend = 0;
1198} 1294}
1199 1295
1296#if EV_USE_INOTIFY
1200void inline_size infy_fork (EV_P); 1297void inline_size infy_fork (EV_P);
1298#endif
1201 1299
1202void inline_size 1300void inline_size
1203loop_fork (EV_P) 1301loop_fork (EV_P)
1204{ 1302{
1205#if EV_USE_PORT 1303#if EV_USE_PORT
… …
1224 gotasync = 1; 1322 gotasync = 1;
1225#endif 1323#endif
1226 1324
1227 ev_ref (EV_A); 1325 ev_ref (EV_A);
1228 ev_io_stop (EV_A_ &pipeev); 1326 ev_io_stop (EV_A_ &pipeev);
1327
1328#if EV_USE_EVENTFD
1329 if (evfd >= 0)
1330 close (evfd);
1331#endif
1332
1333 if (evpipe [0] >= 0)
1334 {
1229 close (evpipe [0]); 1335 close (evpipe [0]);
1230 close (evpipe [1]); 1336 close (evpipe [1]);
1337 }
1231 1338
1232 evpipe_init (EV_A); 1339 evpipe_init (EV_A);
1233 /* now iterate over everything, in case we missed something */ 1340 /* now iterate over everything, in case we missed something */
1234 pipecb (EV_A_ &pipeev, EV_READ); 1341 pipecb (EV_A_ &pipeev, EV_READ);
1235 } 1342 }
… …
1263void 1370void
1264ev_loop_fork (EV_P) 1371ev_loop_fork (EV_P)
1265{ 1372{
1266 postfork = 1; /* must be in line with ev_default_fork */ 1373 postfork = 1; /* must be in line with ev_default_fork */
1267} 1374}
1268
1269#endif 1375#endif
1270 1376
1271#if EV_MULTIPLICITY 1377#if EV_MULTIPLICITY
1272struct ev_loop * 1378struct ev_loop *
1273ev_default_loop_init (unsigned int flags) 1379ev_default_loop_init (unsigned int flags)
… …
1354 EV_CB_INVOKE (p->w, p->events); 1460 EV_CB_INVOKE (p->w, p->events);
1355 } 1461 }
1356 } 1462 }
1357} 1463}
1358 1464
1359void inline_size
1360timers_reify (EV_P)
1361{
1362 while (timercnt && ((WT)timers [0])->at <= mn_now)
1363 {
1364 ev_timer *w = (ev_timer *)timers [0];
1365
1366 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1367
1368 /* first reschedule or stop timer */
1369 if (w->repeat)
1370 {
1371 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1372
1373 ((WT)w)->at += w->repeat;
1374 if (((WT)w)->at < mn_now)
1375 ((WT)w)->at = mn_now;
1376
1377 downheap (timers, timercnt, 0);
1378 }
1379 else
1380 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1381
1382 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1383 }
1384}
1385
1386#if EV_PERIODIC_ENABLE
1387void inline_size
1388periodics_reify (EV_P)
1389{
1390 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1391 {
1392 ev_periodic *w = (ev_periodic *)periodics [0];
1393
1394 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1395
1396 /* first reschedule or stop timer */
1397 if (w->reschedule_cb)
1398 {
1399 ((WT)w)->at = 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));
1401 downheap (periodics, periodiccnt, 0);
1402 }
1403 else if (w->interval)
1404 {
1405 ((WT)w)->at = 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;
1407 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1408 downheap (periodics, periodiccnt, 0);
1409 }
1410 else
1411 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1412
1413 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1414 }
1415}
1416
1417static void noinline
1418periodics_reschedule (EV_P)
1419{
1420 int i;
1421
1422 /* adjust periodics after time jump */
1423 for (i = 0; i < periodiccnt; ++i)
1424 {
1425 ev_periodic *w = (ev_periodic *)periodics [i];
1426
1427 if (w->reschedule_cb)
1428 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1429 else if (w->interval)
1430 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1431 }
1432
1433 /* now rebuild the heap */
1434 for (i = periodiccnt >> 1; i--; )
1435 downheap (periodics, periodiccnt, i);
1436}
1437#endif
1438
1439#if EV_IDLE_ENABLE 1465#if EV_IDLE_ENABLE
1440void inline_size 1466void inline_size
1441idle_reify (EV_P) 1467idle_reify (EV_P)
1442{ 1468{
1443 if (expect_false (idleall)) 1469 if (expect_false (idleall))
… …
1454 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE); 1480 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1455 break; 1481 break;
1456 } 1482 }
1457 } 1483 }
1458 } 1484 }
1485}
1486#endif
1487
1488void inline_size
1489timers_reify (EV_P)
1490{
1491 while (timercnt && ev_at (timers [1]) <= mn_now)
1492 {
1493 ev_timer *w = (ev_timer *)timers [1];
1494
1495 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1496
1497 /* first reschedule or stop timer */
1498 if (w->repeat)
1499 {
1500 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1501
1502 ev_at (w) += w->repeat;
1503 if (ev_at (w) < mn_now)
1504 ev_at (w) = mn_now;
1505
1506 downheap (timers, timercnt, 1);
1507 }
1508 else
1509 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1510
1511 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1512 }
1513}
1514
1515#if EV_PERIODIC_ENABLE
1516void inline_size
1517periodics_reify (EV_P)
1518{
1519 while (periodiccnt && ev_at (periodics [1]) <= ev_rt_now)
1520 {
1521 ev_periodic *w = (ev_periodic *)periodics [1];
1522
1523 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1524
1525 /* first reschedule or stop timer */
1526 if (w->reschedule_cb)
1527 {
1528 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1529 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now));
1530 downheap (periodics, periodiccnt, 1);
1531 }
1532 else if (w->interval)
1533 {
1534 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1535 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval;
1536 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now));
1537 downheap (periodics, periodiccnt, 1);
1538 }
1539 else
1540 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1541
1542 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1543 }
1544}
1545
1546static void noinline
1547periodics_reschedule (EV_P)
1548{
1549 int i;
1550
1551 /* adjust periodics after time jump */
1552 for (i = 1; i <= periodiccnt; ++i)
1553 {
1554 ev_periodic *w = (ev_periodic *)periodics [i];
1555
1556 if (w->reschedule_cb)
1557 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1558 else if (w->interval)
1559 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1560 }
1561
1562 /* now rebuild the heap */
1563 for (i = periodiccnt >> 1; i--; )
1564 downheap (periodics, periodiccnt, i);
1459} 1565}
1460#endif 1566#endif
1461 1567
1462void inline_speed 1568void inline_speed
1463time_update (EV_P_ ev_tstamp max_block) 1569time_update (EV_P_ ev_tstamp max_block)
… …
1492 */ 1598 */
1493 for (i = 4; --i; ) 1599 for (i = 4; --i; )
1494 { 1600 {
1495 rtmn_diff = ev_rt_now - mn_now; 1601 rtmn_diff = ev_rt_now - mn_now;
1496 1602
1497 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1603 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1498 return; /* all is well */ 1604 return; /* all is well */
1499 1605
1500 ev_rt_now = ev_time (); 1606 ev_rt_now = ev_time ();
1501 mn_now = get_clock (); 1607 mn_now = get_clock ();
1502 now_floor = mn_now; 1608 now_floor = mn_now;
… …
1517 { 1623 {
1518#if EV_PERIODIC_ENABLE 1624#if EV_PERIODIC_ENABLE
1519 periodics_reschedule (EV_A); 1625 periodics_reschedule (EV_A);
1520#endif 1626#endif
1521 /* adjust timers. this is easy, as the offset is the same for all of them */ 1627 /* adjust timers. this is easy, as the offset is the same for all of them */
1522 for (i = 0; i < timercnt; ++i) 1628 for (i = 1; i <= timercnt; ++i)
1523 ((WT)timers [i])->at += ev_rt_now - mn_now; 1629 ev_at (timers [i]) += ev_rt_now - mn_now;
1524 } 1630 }
1525 1631
1526 mn_now = ev_rt_now; 1632 mn_now = ev_rt_now;
1527 } 1633 }
1528} 1634}
… …
1542static int loop_done; 1648static int loop_done;
1543 1649
1544void 1650void
1545ev_loop (EV_P_ int flags) 1651ev_loop (EV_P_ int flags)
1546{ 1652{
1547 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1653 loop_done = EVUNLOOP_CANCEL;
1548 ? EVUNLOOP_ONE
1549 : EVUNLOOP_CANCEL;
1550 1654
1551 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1655 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1552 1656
1553 do 1657 do
1554 { 1658 {
… …
1600 1704
1601 waittime = MAX_BLOCKTIME; 1705 waittime = MAX_BLOCKTIME;
1602 1706
1603 if (timercnt) 1707 if (timercnt)
1604 { 1708 {
1605 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1709 ev_tstamp to = ev_at (timers [1]) - mn_now + backend_fudge;
1606 if (waittime > to) waittime = to; 1710 if (waittime > to) waittime = to;
1607 } 1711 }
1608 1712
1609#if EV_PERIODIC_ENABLE 1713#if EV_PERIODIC_ENABLE
1610 if (periodiccnt) 1714 if (periodiccnt)
1611 { 1715 {
1612 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1716 ev_tstamp to = ev_at (periodics [1]) - ev_rt_now + backend_fudge;
1613 if (waittime > to) waittime = to; 1717 if (waittime > to) waittime = to;
1614 } 1718 }
1615#endif 1719#endif
1616 1720
1617 if (expect_false (waittime < timeout_blocktime)) 1721 if (expect_false (waittime < timeout_blocktime))
… …
1650 /* queue check watchers, to be executed first */ 1754 /* queue check watchers, to be executed first */
1651 if (expect_false (checkcnt)) 1755 if (expect_false (checkcnt))
1652 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1756 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1653 1757
1654 call_pending (EV_A); 1758 call_pending (EV_A);
1655
1656 } 1759 }
1657 while (expect_true (activecnt && !loop_done)); 1760 while (expect_true (
1761 activecnt
1762 && !loop_done
1763 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1764 ));
1658 1765
1659 if (loop_done == EVUNLOOP_ONE) 1766 if (loop_done == EVUNLOOP_ONE)
1660 loop_done = EVUNLOOP_CANCEL; 1767 loop_done = EVUNLOOP_CANCEL;
1661} 1768}
1662 1769
… …
1780ev_timer_start (EV_P_ ev_timer *w) 1887ev_timer_start (EV_P_ ev_timer *w)
1781{ 1888{
1782 if (expect_false (ev_is_active (w))) 1889 if (expect_false (ev_is_active (w)))
1783 return; 1890 return;
1784 1891
1785 ((WT)w)->at += mn_now; 1892 ev_at (w) += mn_now;
1786 1893
1787 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1894 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1788 1895
1789 ev_start (EV_A_ (W)w, ++timercnt); 1896 ev_start (EV_A_ (W)w, ++timercnt);
1790 array_needsize (WT, timers, timermax, timercnt, EMPTY2); 1897 array_needsize (WT, timers, timermax, timercnt + 1, EMPTY2);
1791 timers [timercnt - 1] = (WT)w; 1898 timers [timercnt] = (WT)w;
1792 upheap (timers, timercnt - 1); 1899 upheap (timers, timercnt);
1793 1900
1794 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1901 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/
1795} 1902}
1796 1903
1797void noinline 1904void noinline
1798ev_timer_stop (EV_P_ ev_timer *w) 1905ev_timer_stop (EV_P_ ev_timer *w)
1799{ 1906{
1800 clear_pending (EV_A_ (W)w); 1907 clear_pending (EV_A_ (W)w);
1801 if (expect_false (!ev_is_active (w))) 1908 if (expect_false (!ev_is_active (w)))
1802 return; 1909 return;
1803 1910
1804 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1805
1806 { 1911 {
1807 int active = ((W)w)->active; 1912 int active = ev_active (w);
1808 1913
1914 assert (("internal timer heap corruption", timers [active] == (WT)w));
1915
1809 if (expect_true (--active < --timercnt)) 1916 if (expect_true (active < timercnt))
1810 { 1917 {
1811 timers [active] = timers [timercnt]; 1918 timers [active] = timers [timercnt];
1812 adjustheap (timers, timercnt, active); 1919 adjustheap (timers, timercnt, active);
1813 } 1920 }
1921
1922 --timercnt;
1814 } 1923 }
1815 1924
1816 ((WT)w)->at -= mn_now; 1925 ev_at (w) -= mn_now;
1817 1926
1818 ev_stop (EV_A_ (W)w); 1927 ev_stop (EV_A_ (W)w);
1819} 1928}
1820 1929
1821void noinline 1930void noinline
… …
1823{ 1932{
1824 if (ev_is_active (w)) 1933 if (ev_is_active (w))
1825 { 1934 {
1826 if (w->repeat) 1935 if (w->repeat)
1827 { 1936 {
1828 ((WT)w)->at = mn_now + w->repeat; 1937 ev_at (w) = mn_now + w->repeat;
1829 adjustheap (timers, timercnt, ((W)w)->active - 1); 1938 adjustheap (timers, timercnt, ev_active (w));
1830 } 1939 }
1831 else 1940 else
1832 ev_timer_stop (EV_A_ w); 1941 ev_timer_stop (EV_A_ w);
1833 } 1942 }
1834 else if (w->repeat) 1943 else if (w->repeat)
1835 { 1944 {
1836 w->at = w->repeat; 1945 ev_at (w) = w->repeat;
1837 ev_timer_start (EV_A_ w); 1946 ev_timer_start (EV_A_ w);
1838 } 1947 }
1839} 1948}
1840 1949
1841#if EV_PERIODIC_ENABLE 1950#if EV_PERIODIC_ENABLE
… …
1844{ 1953{
1845 if (expect_false (ev_is_active (w))) 1954 if (expect_false (ev_is_active (w)))
1846 return; 1955 return;
1847 1956
1848 if (w->reschedule_cb) 1957 if (w->reschedule_cb)
1849 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1958 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1850 else if (w->interval) 1959 else if (w->interval)
1851 { 1960 {
1852 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1961 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1853 /* this formula differs from the one in periodic_reify because we do not always round up */ 1962 /* this formula differs from the one in periodic_reify because we do not always round up */
1854 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1963 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1855 } 1964 }
1856 else 1965 else
1857 ((WT)w)->at = w->offset; 1966 ev_at (w) = w->offset;
1858 1967
1859 ev_start (EV_A_ (W)w, ++periodiccnt); 1968 ev_start (EV_A_ (W)w, ++periodiccnt);
1860 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2); 1969 array_needsize (WT, periodics, periodicmax, periodiccnt + 1, EMPTY2);
1861 periodics [periodiccnt - 1] = (WT)w; 1970 periodics [periodiccnt] = (WT)w;
1862 upheap (periodics, periodiccnt - 1); 1971 upheap (periodics, periodiccnt);
1863 1972
1864 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1973 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/
1865} 1974}
1866 1975
1867void noinline 1976void noinline
1868ev_periodic_stop (EV_P_ ev_periodic *w) 1977ev_periodic_stop (EV_P_ ev_periodic *w)
1869{ 1978{
1870 clear_pending (EV_A_ (W)w); 1979 clear_pending (EV_A_ (W)w);
1871 if (expect_false (!ev_is_active (w))) 1980 if (expect_false (!ev_is_active (w)))
1872 return; 1981 return;
1873 1982
1874 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1875
1876 { 1983 {
1877 int active = ((W)w)->active; 1984 int active = ev_active (w);
1878 1985
1986 assert (("internal periodic heap corruption", periodics [active] == (WT)w));
1987
1879 if (expect_true (--active < --periodiccnt)) 1988 if (expect_true (active < periodiccnt))
1880 { 1989 {
1881 periodics [active] = periodics [periodiccnt]; 1990 periodics [active] = periodics [periodiccnt];
1882 adjustheap (periodics, periodiccnt, active); 1991 adjustheap (periodics, periodiccnt, active);
1883 } 1992 }
1993
1994 --periodiccnt;
1884 } 1995 }
1885 1996
1886 ev_stop (EV_A_ (W)w); 1997 ev_stop (EV_A_ (W)w);
1887} 1998}
1888 1999
… …
2004 if (w->wd < 0) 2115 if (w->wd < 0)
2005 { 2116 {
2006 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2117 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2007 2118
2008 /* monitor some parent directory for speedup hints */ 2119 /* monitor some parent directory for speedup hints */
2120 /* note that exceeding the hardcoded limit is not a correctness issue, */
2121 /* but an efficiency issue only */
2009 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2122 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2010 { 2123 {
2011 char path [4096]; 2124 char path [4096];
2012 strcpy (path, w->path); 2125 strcpy (path, w->path);
2013 2126
… …
2258 clear_pending (EV_A_ (W)w); 2371 clear_pending (EV_A_ (W)w);
2259 if (expect_false (!ev_is_active (w))) 2372 if (expect_false (!ev_is_active (w)))
2260 return; 2373 return;
2261 2374
2262 { 2375 {
2263 int active = ((W)w)->active; 2376 int active = ev_active (w);
2264 2377
2265 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2378 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2266 ((W)idles [ABSPRI (w)][active - 1])->active = active; 2379 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2267 2380
2268 ev_stop (EV_A_ (W)w); 2381 ev_stop (EV_A_ (W)w);
2269 --idleall; 2382 --idleall;
2270 } 2383 }
2271} 2384}
… …
2288 clear_pending (EV_A_ (W)w); 2401 clear_pending (EV_A_ (W)w);
2289 if (expect_false (!ev_is_active (w))) 2402 if (expect_false (!ev_is_active (w)))
2290 return; 2403 return;
2291 2404
2292 { 2405 {
2293 int active = ((W)w)->active; 2406 int active = ev_active (w);
2407
2294 prepares [active - 1] = prepares [--preparecnt]; 2408 prepares [active - 1] = prepares [--preparecnt];
2295 ((W)prepares [active - 1])->active = active; 2409 ev_active (prepares [active - 1]) = active;
2296 } 2410 }
2297 2411
2298 ev_stop (EV_A_ (W)w); 2412 ev_stop (EV_A_ (W)w);
2299} 2413}
2300 2414
… …
2315 clear_pending (EV_A_ (W)w); 2429 clear_pending (EV_A_ (W)w);
2316 if (expect_false (!ev_is_active (w))) 2430 if (expect_false (!ev_is_active (w)))
2317 return; 2431 return;
2318 2432
2319 { 2433 {
2320 int active = ((W)w)->active; 2434 int active = ev_active (w);
2435
2321 checks [active - 1] = checks [--checkcnt]; 2436 checks [active - 1] = checks [--checkcnt];
2322 ((W)checks [active - 1])->active = active; 2437 ev_active (checks [active - 1]) = active;
2323 } 2438 }
2324 2439
2325 ev_stop (EV_A_ (W)w); 2440 ev_stop (EV_A_ (W)w);
2326} 2441}
2327 2442
… …
2423 clear_pending (EV_A_ (W)w); 2538 clear_pending (EV_A_ (W)w);
2424 if (expect_false (!ev_is_active (w))) 2539 if (expect_false (!ev_is_active (w)))
2425 return; 2540 return;
2426 2541
2427 { 2542 {
2428 int active = ((W)w)->active; 2543 int active = ev_active (w);
2544
2429 forks [active - 1] = forks [--forkcnt]; 2545 forks [active - 1] = forks [--forkcnt];
2430 ((W)forks [active - 1])->active = active; 2546 ev_active (forks [active - 1]) = active;
2431 } 2547 }
2432 2548
2433 ev_stop (EV_A_ (W)w); 2549 ev_stop (EV_A_ (W)w);
2434} 2550}
2435#endif 2551#endif
… …
2454 clear_pending (EV_A_ (W)w); 2570 clear_pending (EV_A_ (W)w);
2455 if (expect_false (!ev_is_active (w))) 2571 if (expect_false (!ev_is_active (w)))
2456 return; 2572 return;
2457 2573
2458 { 2574 {
2459 int active = ((W)w)->active; 2575 int active = ev_active (w);
2576
2460 asyncs [active - 1] = asyncs [--asynccnt]; 2577 asyncs [active - 1] = asyncs [--asynccnt];
2461 ((W)asyncs [active - 1])->active = active; 2578 ev_active (asyncs [active - 1]) = active;
2462 } 2579 }
2463 2580
2464 ev_stop (EV_A_ (W)w); 2581 ev_stop (EV_A_ (W)w);
2465} 2582}
2466 2583

Diff Legend

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