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

Comparing libev/ev.c (file contents):
Revision 1.287 by root, Mon Apr 20 19:45:58 2009 UTC vs.
Revision 1.293 by root, Mon Jun 29 18:46:52 2009 UTC

… …
57# endif 57# endif
58# ifndef EV_USE_MONOTONIC 58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1 59# define EV_USE_MONOTONIC 1
60# endif 60# endif
61# endif 61# endif
62# elif !defined(EV_USE_CLOCK_SYSCALL)
63# define EV_USE_CLOCK_SYSCALL 0
62# endif 64# endif
63 65
64# if HAVE_CLOCK_GETTIME 66# if HAVE_CLOCK_GETTIME
65# ifndef EV_USE_MONOTONIC 67# ifndef EV_USE_MONOTONIC
66# define EV_USE_MONOTONIC 1 68# define EV_USE_MONOTONIC 1
… …
282 284
283#ifndef EV_HEAP_CACHE_AT 285#ifndef EV_HEAP_CACHE_AT
284# define EV_HEAP_CACHE_AT !EV_MINIMAL 286# define EV_HEAP_CACHE_AT !EV_MINIMAL
285#endif 287#endif
286 288
289/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
290/* which makes programs even slower. might work on other unices, too. */
291#if EV_USE_CLOCK_SYSCALL
292# include <syscall.h>
293# ifdef SYS_clock_gettime
294# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
295# undef EV_USE_MONOTONIC
296# define EV_USE_MONOTONIC 1
297# else
298# undef EV_USE_CLOCK_SYSCALL
299# define EV_USE_CLOCK_SYSCALL 0
300# endif
301#endif
302
287/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 303/* this block fixes any misconfiguration where we know we run into trouble otherwise */
288 304
289#ifndef CLOCK_MONOTONIC 305#ifndef CLOCK_MONOTONIC
290# undef EV_USE_MONOTONIC 306# undef EV_USE_MONOTONIC
291# define EV_USE_MONOTONIC 0 307# define EV_USE_MONOTONIC 0
… …
320 336
321#if EV_SELECT_IS_WINSOCKET 337#if EV_SELECT_IS_WINSOCKET
322# include <winsock.h> 338# include <winsock.h>
323#endif 339#endif
324 340
325/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
326/* which makes programs even slower. might work on other unices, too. */
327#if EV_USE_CLOCK_SYSCALL
328# include <syscall.h>
329# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
330# undef EV_USE_MONOTONIC
331# define EV_USE_MONOTONIC 1
332#endif
333
334#if EV_USE_EVENTFD 341#if EV_USE_EVENTFD
335/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 342/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
336# include <stdint.h> 343# include <stdint.h>
337# ifdef __cplusplus 344# ifdef __cplusplus
338extern "C" { 345extern "C" {
… …
478#define ev_malloc(size) ev_realloc (0, (size)) 485#define ev_malloc(size) ev_realloc (0, (size))
479#define ev_free(ptr) ev_realloc ((ptr), 0) 486#define ev_free(ptr) ev_realloc ((ptr), 0)
480 487
481/*****************************************************************************/ 488/*****************************************************************************/
482 489
490/* file descriptor info structure */
483typedef struct 491typedef struct
484{ 492{
485 WL head; 493 WL head;
486 unsigned char events; 494 unsigned char events; /* the events watched for */
487 unsigned char reify; 495 unsigned char reify; /* flag set when this ANFD needs reification */
488 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 496 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
489 unsigned char unused; 497 unsigned char unused;
490#if EV_USE_EPOLL 498#if EV_USE_EPOLL
491 unsigned int egen; /* generation counter to counter epoll bugs */ 499 unsigned int egen; /* generation counter to counter epoll bugs */
492#endif 500#endif
493#if EV_SELECT_IS_WINSOCKET 501#if EV_SELECT_IS_WINSOCKET
494 SOCKET handle; 502 SOCKET handle;
495#endif 503#endif
496} ANFD; 504} ANFD;
497 505
506/* stores the pending event set for a given watcher */
498typedef struct 507typedef struct
499{ 508{
500 W w; 509 W w;
501 int events; 510 int events; /* the pending event set for the given watcher */
502} ANPENDING; 511} ANPENDING;
503 512
504#if EV_USE_INOTIFY 513#if EV_USE_INOTIFY
505/* hash table entry per inotify-id */ 514/* hash table entry per inotify-id */
506typedef struct 515typedef struct
… …
509} ANFS; 518} ANFS;
510#endif 519#endif
511 520
512/* Heap Entry */ 521/* Heap Entry */
513#if EV_HEAP_CACHE_AT 522#if EV_HEAP_CACHE_AT
523 /* a heap element */
514 typedef struct { 524 typedef struct {
515 ev_tstamp at; 525 ev_tstamp at;
516 WT w; 526 WT w;
517 } ANHE; 527 } ANHE;
518 528
519 #define ANHE_w(he) (he).w /* access watcher, read-write */ 529 #define ANHE_w(he) (he).w /* access watcher, read-write */
520 #define ANHE_at(he) (he).at /* access cached at, read-only */ 530 #define ANHE_at(he) (he).at /* access cached at, read-only */
521 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */ 531 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
522#else 532#else
533 /* a heap element */
523 typedef WT ANHE; 534 typedef WT ANHE;
524 535
525 #define ANHE_w(he) (he) 536 #define ANHE_w(he) (he)
526 #define ANHE_at(he) (he)->at 537 #define ANHE_at(he) (he)->at
527 #define ANHE_at_cache(he) 538 #define ANHE_at_cache(he)
… …
553 564
554#endif 565#endif
555 566
556/*****************************************************************************/ 567/*****************************************************************************/
557 568
569#ifndef EV_HAVE_EV_TIME
558ev_tstamp 570ev_tstamp
559ev_time (void) 571ev_time (void)
560{ 572{
561#if EV_USE_REALTIME 573#if EV_USE_REALTIME
562 if (expect_true (have_realtime)) 574 if (expect_true (have_realtime))
… …
569 581
570 struct timeval tv; 582 struct timeval tv;
571 gettimeofday (&tv, 0); 583 gettimeofday (&tv, 0);
572 return tv.tv_sec + tv.tv_usec * 1e-6; 584 return tv.tv_sec + tv.tv_usec * 1e-6;
573} 585}
586#endif
574 587
575inline_size ev_tstamp 588inline_size ev_tstamp
576get_clock (void) 589get_clock (void)
577{ 590{
578#if EV_USE_MONOTONIC 591#if EV_USE_MONOTONIC
… …
614 627
615 tv.tv_sec = (time_t)delay; 628 tv.tv_sec = (time_t)delay;
616 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 629 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
617 630
618 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 631 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
619 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 632 /* somehting not guaranteed by newer posix versions, but guaranteed */
620 /* by older ones */ 633 /* by older ones */
621 select (0, 0, 0, 0, &tv); 634 select (0, 0, 0, 0, &tv);
622#endif 635#endif
623 } 636 }
624} 637}
625 638
626/*****************************************************************************/ 639/*****************************************************************************/
627 640
628#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 641#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
629 642
643/* find a suitable new size for the given array, */
644/* hopefully by rounding to a ncie-to-malloc size */
630inline_size int 645inline_size int
631array_nextsize (int elem, int cur, int cnt) 646array_nextsize (int elem, int cur, int cnt)
632{ 647{
633 int ncur = cur + 1; 648 int ncur = cur + 1;
634 649
… …
680#define array_free(stem, idx) \ 695#define array_free(stem, idx) \
681 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0 696 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
682 697
683/*****************************************************************************/ 698/*****************************************************************************/
684 699
700/* dummy callback for pending events */
701static void noinline
702pendingcb (EV_P_ ev_prepare *w, int revents)
703{
704}
705
685void noinline 706void noinline
686ev_feed_event (EV_P_ void *w, int revents) 707ev_feed_event (EV_P_ void *w, int revents)
687{ 708{
688 W w_ = (W)w; 709 W w_ = (W)w;
689 int pri = ABSPRI (w_); 710 int pri = ABSPRI (w_);
… …
745{ 766{
746 if (fd >= 0 && fd < anfdmax) 767 if (fd >= 0 && fd < anfdmax)
747 fd_event (EV_A_ fd, revents); 768 fd_event (EV_A_ fd, revents);
748} 769}
749 770
771/* make sure the external fd watch events are in-sync */
772/* with the kernel/libev internal state */
750inline_size void 773inline_size void
751fd_reify (EV_P) 774fd_reify (EV_P)
752{ 775{
753 int i; 776 int i;
754 777
… …
789 } 812 }
790 813
791 fdchangecnt = 0; 814 fdchangecnt = 0;
792} 815}
793 816
817/* something about the given fd changed */
794inline_size void 818inline_size void
795fd_change (EV_P_ int fd, int flags) 819fd_change (EV_P_ int fd, int flags)
796{ 820{
797 unsigned char reify = anfds [fd].reify; 821 unsigned char reify = anfds [fd].reify;
798 anfds [fd].reify |= flags; 822 anfds [fd].reify |= flags;
… …
803 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 827 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
804 fdchanges [fdchangecnt - 1] = fd; 828 fdchanges [fdchangecnt - 1] = fd;
805 } 829 }
806} 830}
807 831
832/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
808inline_speed void 833inline_speed void
809fd_kill (EV_P_ int fd) 834fd_kill (EV_P_ int fd)
810{ 835{
811 ev_io *w; 836 ev_io *w;
812 837
… …
815 ev_io_stop (EV_A_ w); 840 ev_io_stop (EV_A_ w);
816 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 841 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
817 } 842 }
818} 843}
819 844
845/* check whether the given fd is atcually valid, for error recovery */
820inline_size int 846inline_size int
821fd_valid (int fd) 847fd_valid (int fd)
822{ 848{
823#ifdef _WIN32 849#ifdef _WIN32
824 return _get_osfhandle (fd) != -1; 850 return _get_osfhandle (fd) != -1;
… …
989 1015
990 heap [k] = he; 1016 heap [k] = he;
991 ev_active (ANHE_w (he)) = k; 1017 ev_active (ANHE_w (he)) = k;
992} 1018}
993 1019
1020/* move an element suitably so it is in a correct place */
994inline_size void 1021inline_size void
995adjustheap (ANHE *heap, int N, int k) 1022adjustheap (ANHE *heap, int N, int k)
996{ 1023{
997 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1024 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
998 upheap (heap, k); 1025 upheap (heap, k);
… …
1012 upheap (heap, i + HEAP0); 1039 upheap (heap, i + HEAP0);
1013} 1040}
1014 1041
1015/*****************************************************************************/ 1042/*****************************************************************************/
1016 1043
1044/* associate signal watchers to a signal signal */
1017typedef struct 1045typedef struct
1018{ 1046{
1019 WL head; 1047 WL head;
1020 EV_ATOMIC_T gotsig; 1048 EV_ATOMIC_T gotsig;
1021} ANSIG; 1049} ANSIG;
… …
1025 1053
1026static EV_ATOMIC_T gotsig; 1054static EV_ATOMIC_T gotsig;
1027 1055
1028/*****************************************************************************/ 1056/*****************************************************************************/
1029 1057
1058/* used to prepare libev internal fd's */
1059/* this is not fork-safe */
1030inline_speed void 1060inline_speed void
1031fd_intern (int fd) 1061fd_intern (int fd)
1032{ 1062{
1033#ifdef _WIN32 1063#ifdef _WIN32
1034 unsigned long arg = 1; 1064 unsigned long arg = 1;
… …
1040} 1070}
1041 1071
1042static void noinline 1072static void noinline
1043evpipe_init (EV_P) 1073evpipe_init (EV_P)
1044{ 1074{
1045 if (!ev_is_active (&pipeev)) 1075 if (!ev_is_active (&pipe_w))
1046 { 1076 {
1047#if EV_USE_EVENTFD 1077#if EV_USE_EVENTFD
1048 if ((evfd = eventfd (0, 0)) >= 0) 1078 if ((evfd = eventfd (0, 0)) >= 0)
1049 { 1079 {
1050 evpipe [0] = -1; 1080 evpipe [0] = -1;
1051 fd_intern (evfd); 1081 fd_intern (evfd);
1052 ev_io_set (&pipeev, evfd, EV_READ); 1082 ev_io_set (&pipe_w, evfd, EV_READ);
1053 } 1083 }
1054 else 1084 else
1055#endif 1085#endif
1056 { 1086 {
1057 while (pipe (evpipe)) 1087 while (pipe (evpipe))
1058 ev_syserr ("(libev) error creating signal/async pipe"); 1088 ev_syserr ("(libev) error creating signal/async pipe");
1059 1089
1060 fd_intern (evpipe [0]); 1090 fd_intern (evpipe [0]);
1061 fd_intern (evpipe [1]); 1091 fd_intern (evpipe [1]);
1062 ev_io_set (&pipeev, evpipe [0], EV_READ); 1092 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1063 } 1093 }
1064 1094
1065 ev_io_start (EV_A_ &pipeev); 1095 ev_io_start (EV_A_ &pipe_w);
1066 ev_unref (EV_A); /* watcher should not keep loop alive */ 1096 ev_unref (EV_A); /* watcher should not keep loop alive */
1067 } 1097 }
1068} 1098}
1069 1099
1070inline_size void 1100inline_size void
… …
1088 1118
1089 errno = old_errno; 1119 errno = old_errno;
1090 } 1120 }
1091} 1121}
1092 1122
1123/* called whenever the libev signal pipe */
1124/* got some events (signal, async) */
1093static void 1125static void
1094pipecb (EV_P_ ev_io *iow, int revents) 1126pipecb (EV_P_ ev_io *iow, int revents)
1095{ 1127{
1096#if EV_USE_EVENTFD 1128#if EV_USE_EVENTFD
1097 if (evfd >= 0) 1129 if (evfd >= 0)
… …
1179 1211
1180#ifndef WIFCONTINUED 1212#ifndef WIFCONTINUED
1181# define WIFCONTINUED(status) 0 1213# define WIFCONTINUED(status) 0
1182#endif 1214#endif
1183 1215
1216/* handle a single child status event */
1184inline_speed void 1217inline_speed void
1185child_reap (EV_P_ int chain, int pid, int status) 1218child_reap (EV_P_ int chain, int pid, int status)
1186{ 1219{
1187 ev_child *w; 1220 ev_child *w;
1188 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1221 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
… …
1202 1235
1203#ifndef WCONTINUED 1236#ifndef WCONTINUED
1204# define WCONTINUED 0 1237# define WCONTINUED 0
1205#endif 1238#endif
1206 1239
1240/* called on sigchld etc., calls waitpid */
1207static void 1241static void
1208childcb (EV_P_ ev_signal *sw, int revents) 1242childcb (EV_P_ ev_signal *sw, int revents)
1209{ 1243{
1210 int pid, status; 1244 int pid, status;
1211 1245
… …
1336ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1370ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1337{ 1371{
1338 timeout_blocktime = interval; 1372 timeout_blocktime = interval;
1339} 1373}
1340 1374
1375/* initialise a loop structure, must be zero-initialised */
1341static void noinline 1376static void noinline
1342loop_init (EV_P_ unsigned int flags) 1377loop_init (EV_P_ unsigned int flags)
1343{ 1378{
1344 if (!backend) 1379 if (!backend)
1345 { 1380 {
… …
1405#endif 1440#endif
1406#if EV_USE_SELECT 1441#if EV_USE_SELECT
1407 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1442 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1408#endif 1443#endif
1409 1444
1445 ev_prepare_init (&pending_w, pendingcb);
1446
1410 ev_init (&pipeev, pipecb); 1447 ev_init (&pipe_w, pipecb);
1411 ev_set_priority (&pipeev, EV_MAXPRI); 1448 ev_set_priority (&pipe_w, EV_MAXPRI);
1412 } 1449 }
1413} 1450}
1414 1451
1452/* free up a loop structure */
1415static void noinline 1453static void noinline
1416loop_destroy (EV_P) 1454loop_destroy (EV_P)
1417{ 1455{
1418 int i; 1456 int i;
1419 1457
1420 if (ev_is_active (&pipeev)) 1458 if (ev_is_active (&pipe_w))
1421 { 1459 {
1422 ev_ref (EV_A); /* signal watcher */ 1460 ev_ref (EV_A); /* signal watcher */
1423 ev_io_stop (EV_A_ &pipeev); 1461 ev_io_stop (EV_A_ &pipe_w);
1424 1462
1425#if EV_USE_EVENTFD 1463#if EV_USE_EVENTFD
1426 if (evfd >= 0) 1464 if (evfd >= 0)
1427 close (evfd); 1465 close (evfd);
1428#endif 1466#endif
… …
1505#endif 1543#endif
1506#if EV_USE_INOTIFY 1544#if EV_USE_INOTIFY
1507 infy_fork (EV_A); 1545 infy_fork (EV_A);
1508#endif 1546#endif
1509 1547
1510 if (ev_is_active (&pipeev)) 1548 if (ev_is_active (&pipe_w))
1511 { 1549 {
1512 /* this "locks" the handlers against writing to the pipe */ 1550 /* this "locks" the handlers against writing to the pipe */
1513 /* while we modify the fd vars */ 1551 /* while we modify the fd vars */
1514 gotsig = 1; 1552 gotsig = 1;
1515#if EV_ASYNC_ENABLE 1553#if EV_ASYNC_ENABLE
1516 gotasync = 1; 1554 gotasync = 1;
1517#endif 1555#endif
1518 1556
1519 ev_ref (EV_A); 1557 ev_ref (EV_A);
1520 ev_io_stop (EV_A_ &pipeev); 1558 ev_io_stop (EV_A_ &pipe_w);
1521 1559
1522#if EV_USE_EVENTFD 1560#if EV_USE_EVENTFD
1523 if (evfd >= 0) 1561 if (evfd >= 0)
1524 close (evfd); 1562 close (evfd);
1525#endif 1563#endif
… …
1530 close (evpipe [1]); 1568 close (evpipe [1]);
1531 } 1569 }
1532 1570
1533 evpipe_init (EV_A); 1571 evpipe_init (EV_A);
1534 /* now iterate over everything, in case we missed something */ 1572 /* now iterate over everything, in case we missed something */
1535 pipecb (EV_A_ &pipeev, EV_READ); 1573 pipecb (EV_A_ &pipe_w, EV_READ);
1536 } 1574 }
1537 1575
1538 postfork = 0; 1576 postfork = 0;
1539} 1577}
1540 1578
… …
1746 for (pri = NUMPRI; pri--; ) 1784 for (pri = NUMPRI; pri--; )
1747 while (pendingcnt [pri]) 1785 while (pendingcnt [pri])
1748 { 1786 {
1749 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1787 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1750 1788
1751 if (expect_true (p->w))
1752 {
1753 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/ 1789 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1790 /* ^ this is no longer true, as pending_w could be here */
1754 1791
1755 p->w->pending = 0; 1792 p->w->pending = 0;
1756 EV_CB_INVOKE (p->w, p->events); 1793 EV_CB_INVOKE (p->w, p->events);
1757 EV_FREQUENT_CHECK; 1794 EV_FREQUENT_CHECK;
1758 }
1759 } 1795 }
1760} 1796}
1761 1797
1762#if EV_IDLE_ENABLE 1798#if EV_IDLE_ENABLE
1799/* make idle watchers pending. this handles the "call-idle */
1800/* only when higher priorities are idle" logic */
1763inline_size void 1801inline_size void
1764idle_reify (EV_P) 1802idle_reify (EV_P)
1765{ 1803{
1766 if (expect_false (idleall)) 1804 if (expect_false (idleall))
1767 { 1805 {
… …
1780 } 1818 }
1781 } 1819 }
1782} 1820}
1783#endif 1821#endif
1784 1822
1823/* make timers pending */
1785inline_size void 1824inline_size void
1786timers_reify (EV_P) 1825timers_reify (EV_P)
1787{ 1826{
1788 EV_FREQUENT_CHECK; 1827 EV_FREQUENT_CHECK;
1789 1828
… …
1818 feed_reverse_done (EV_A_ EV_TIMEOUT); 1857 feed_reverse_done (EV_A_ EV_TIMEOUT);
1819 } 1858 }
1820} 1859}
1821 1860
1822#if EV_PERIODIC_ENABLE 1861#if EV_PERIODIC_ENABLE
1862/* make periodics pending */
1823inline_size void 1863inline_size void
1824periodics_reify (EV_P) 1864periodics_reify (EV_P)
1825{ 1865{
1826 EV_FREQUENT_CHECK; 1866 EV_FREQUENT_CHECK;
1827 1867
… …
1874 1914
1875 feed_reverse_done (EV_A_ EV_PERIODIC); 1915 feed_reverse_done (EV_A_ EV_PERIODIC);
1876 } 1916 }
1877} 1917}
1878 1918
1919/* simply recalculate all periodics */
1920/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1879static void noinline 1921static void noinline
1880periodics_reschedule (EV_P) 1922periodics_reschedule (EV_P)
1881{ 1923{
1882 int i; 1924 int i;
1883 1925
… …
1896 1938
1897 reheap (periodics, periodiccnt); 1939 reheap (periodics, periodiccnt);
1898} 1940}
1899#endif 1941#endif
1900 1942
1943/* adjust all timers by a given offset */
1901static void noinline 1944static void noinline
1902timers_reschedule (EV_P_ ev_tstamp adjust) 1945timers_reschedule (EV_P_ ev_tstamp adjust)
1903{ 1946{
1904 int i; 1947 int i;
1905 1948
… …
1909 ANHE_w (*he)->at += adjust; 1952 ANHE_w (*he)->at += adjust;
1910 ANHE_at_cache (*he); 1953 ANHE_at_cache (*he);
1911 } 1954 }
1912} 1955}
1913 1956
1957/* fetch new monotonic and realtime times from the kernel */
1958/* also detetc if there was a timejump, and act accordingly */
1914inline_speed void 1959inline_speed void
1915time_update (EV_P_ ev_tstamp max_block) 1960time_update (EV_P_ ev_tstamp max_block)
1916{ 1961{
1917 int i;
1918
1919#if EV_USE_MONOTONIC 1962#if EV_USE_MONOTONIC
1920 if (expect_true (have_monotonic)) 1963 if (expect_true (have_monotonic))
1921 { 1964 {
1965 int i;
1922 ev_tstamp odiff = rtmn_diff; 1966 ev_tstamp odiff = rtmn_diff;
1923 1967
1924 mn_now = get_clock (); 1968 mn_now = get_clock ();
1925 1969
1926 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 1970 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
2031 ev_tstamp waittime = 0.; 2075 ev_tstamp waittime = 0.;
2032 ev_tstamp sleeptime = 0.; 2076 ev_tstamp sleeptime = 0.;
2033 2077
2034 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2078 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2035 { 2079 {
2080 /* remember old timestamp for io_blocktime calculation */
2081 ev_tstamp prev_mn_now = mn_now;
2082
2036 /* update time to cancel out callback processing overhead */ 2083 /* update time to cancel out callback processing overhead */
2037 time_update (EV_A_ 1e100); 2084 time_update (EV_A_ 1e100);
2038 2085
2039 waittime = MAX_BLOCKTIME; 2086 waittime = MAX_BLOCKTIME;
2040 2087
… …
2050 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2097 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2051 if (waittime > to) waittime = to; 2098 if (waittime > to) waittime = to;
2052 } 2099 }
2053#endif 2100#endif
2054 2101
2102 /* don't let timeouts decrease the waittime below timeout_blocktime */
2055 if (expect_false (waittime < timeout_blocktime)) 2103 if (expect_false (waittime < timeout_blocktime))
2056 waittime = timeout_blocktime; 2104 waittime = timeout_blocktime;
2057 2105
2058 sleeptime = waittime - backend_fudge; 2106 /* extra check because io_blocktime is commonly 0 */
2059
2060 if (expect_true (sleeptime > io_blocktime)) 2107 if (expect_false (io_blocktime))
2061 sleeptime = io_blocktime;
2062
2063 if (sleeptime)
2064 { 2108 {
2109 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2110
2111 if (sleeptime > waittime - backend_fudge)
2112 sleeptime = waittime - backend_fudge;
2113
2114 if (expect_true (sleeptime > 0.))
2115 {
2065 ev_sleep (sleeptime); 2116 ev_sleep (sleeptime);
2066 waittime -= sleeptime; 2117 waittime -= sleeptime;
2118 }
2067 } 2119 }
2068 } 2120 }
2069 2121
2070 ++loop_count; 2122 ++loop_count;
2071 backend_poll (EV_A_ waittime); 2123 backend_poll (EV_A_ waittime);
… …
2137 ev_tstamp mn_prev = mn_now; 2189 ev_tstamp mn_prev = mn_now;
2138 2190
2139 ev_now_update (EV_A); 2191 ev_now_update (EV_A);
2140 timers_reschedule (EV_A_ mn_now - mn_prev); 2192 timers_reschedule (EV_A_ mn_now - mn_prev);
2141#if EV_PERIODIC_ENABLE 2193#if EV_PERIODIC_ENABLE
2194 /* TODO: really do this? */
2142 periodics_reschedule (EV_A); 2195 periodics_reschedule (EV_A);
2143#endif 2196#endif
2144} 2197}
2145 2198
2146/*****************************************************************************/ 2199/*****************************************************************************/
2200/* singly-linked list management, used when the expected list length is short */
2147 2201
2148inline_size void 2202inline_size void
2149wlist_add (WL *head, WL elem) 2203wlist_add (WL *head, WL elem)
2150{ 2204{
2151 elem->next = *head; 2205 elem->next = *head;
… …
2165 2219
2166 head = &(*head)->next; 2220 head = &(*head)->next;
2167 } 2221 }
2168} 2222}
2169 2223
2224/* internal, faster, version of ev_clear_pending */
2170inline_speed void 2225inline_speed void
2171clear_pending (EV_P_ W w) 2226clear_pending (EV_P_ W w)
2172{ 2227{
2173 if (w->pending) 2228 if (w->pending)
2174 { 2229 {
2175 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2230 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2176 w->pending = 0; 2231 w->pending = 0;
2177 } 2232 }
2178} 2233}
2179 2234
2180int 2235int
… …
2184 int pending = w_->pending; 2239 int pending = w_->pending;
2185 2240
2186 if (expect_true (pending)) 2241 if (expect_true (pending))
2187 { 2242 {
2188 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2243 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2244 p->w = (W)&pending_w;
2189 w_->pending = 0; 2245 w_->pending = 0;
2190 p->w = 0;
2191 return p->events; 2246 return p->events;
2192 } 2247 }
2193 else 2248 else
2194 return 0; 2249 return 0;
2195} 2250}
… …
3201 } 3256 }
3202} 3257}
3203 3258
3204/*****************************************************************************/ 3259/*****************************************************************************/
3205 3260
3206#if 0 3261#if EV_WALK_ENABLE
3207void 3262void
3208ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 3263ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3209{ 3264{
3210 int i, j; 3265 int i, j;
3211 ev_watcher_list *wl, *wn; 3266 ev_watcher_list *wl, *wn;
… …
3227#if EV_USE_INOTIFY 3282#if EV_USE_INOTIFY
3228 if (ev_cb ((ev_io *)wl) == infy_cb) 3283 if (ev_cb ((ev_io *)wl) == infy_cb)
3229 ; 3284 ;
3230 else 3285 else
3231#endif 3286#endif
3232 if ((ev_io *)wl != &pipeev) 3287 if ((ev_io *)wl != &pipe_w)
3233 if (types & EV_IO) 3288 if (types & EV_IO)
3234 cb (EV_A_ EV_IO, wl); 3289 cb (EV_A_ EV_IO, wl);
3235 3290
3236 wl = wn; 3291 wl = wn;
3237 } 3292 }

Diff Legend

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