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

Comparing libev/ev.c (file contents):
Revision 1.357 by root, Sat Oct 23 22:25:44 2010 UTC vs.
Revision 1.377 by root, Wed Jun 8 13:11:55 2011 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008,2009,2010 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010,2011 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
10 * 1. Redistributions of source code must retain the above copyright notice, 10 * 1. Redistributions of source code must retain the above copyright notice,
11 * this list of conditions and the following disclaimer. 11 * this list of conditions and the following disclaimer.
12 * 12 *
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution. 15 * documentation and/or other materials provided with the distribution.
16 * 16 *
17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER- 18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE- 20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
… …
42# ifdef EV_CONFIG_H 42# ifdef EV_CONFIG_H
43# include EV_CONFIG_H 43# include EV_CONFIG_H
44# else 44# else
45# include "config.h" 45# include "config.h"
46# endif 46# endif
47
48#if HAVE_FLOOR
49# ifndef EV_USE_FLOOR
50# define EV_USE_FLOOR 1
51# endif
52#endif
47 53
48# if HAVE_CLOCK_SYSCALL 54# if HAVE_CLOCK_SYSCALL
49# ifndef EV_USE_CLOCK_SYSCALL 55# ifndef EV_USE_CLOCK_SYSCALL
50# define EV_USE_CLOCK_SYSCALL 1 56# define EV_USE_CLOCK_SYSCALL 1
51# ifndef EV_USE_REALTIME 57# ifndef EV_USE_REALTIME
… …
156# define EV_USE_EVENTFD 0 162# define EV_USE_EVENTFD 0
157# endif 163# endif
158 164
159#endif 165#endif
160 166
161#include <math.h>
162#include <stdlib.h> 167#include <stdlib.h>
163#include <string.h> 168#include <string.h>
164#include <fcntl.h> 169#include <fcntl.h>
165#include <stddef.h> 170#include <stddef.h>
166 171
… …
232/* to make it compile regardless, just remove the above line, */ 237/* to make it compile regardless, just remove the above line, */
233/* but consider reporting it, too! :) */ 238/* but consider reporting it, too! :) */
234# define EV_NSIG 65 239# define EV_NSIG 65
235#endif 240#endif
236 241
242#ifndef EV_USE_FLOOR
243# define EV_USE_FLOOR 0
244#endif
245
237#ifndef EV_USE_CLOCK_SYSCALL 246#ifndef EV_USE_CLOCK_SYSCALL
238# if __linux && __GLIBC__ >= 2 247# if __linux && __GLIBC__ >= 2
239# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS 248# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
240# else 249# else
241# define EV_USE_CLOCK_SYSCALL 0 250# define EV_USE_CLOCK_SYSCALL 0
… …
376# undef EV_USE_INOTIFY 385# undef EV_USE_INOTIFY
377# define EV_USE_INOTIFY 0 386# define EV_USE_INOTIFY 0
378#endif 387#endif
379 388
380#if !EV_USE_NANOSLEEP 389#if !EV_USE_NANOSLEEP
381# ifndef _WIN32 390/* hp-ux has it in sys/time.h, which we unconditionally include above */
391# if !defined(_WIN32) && !defined(__hpux)
382# include <sys/select.h> 392# include <sys/select.h>
383# endif 393# endif
384#endif 394#endif
385 395
386#if EV_USE_INOTIFY 396#if EV_USE_INOTIFY
… …
442#else 452#else
443# define EV_FREQUENT_CHECK do { } while (0) 453# define EV_FREQUENT_CHECK do { } while (0)
444#endif 454#endif
445 455
446/* 456/*
447 * This is used to avoid floating point rounding problems. 457 * This is used to work around floating point rounding problems.
448 * It is added to ev_rt_now when scheduling periodics
449 * to ensure progress, time-wise, even when rounding
450 * errors are against us.
451 * This value is good at least till the year 4000. 458 * This value is good at least till the year 4000.
452 * Better solutions welcome.
453 */ 459 */
454#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 460#define MIN_INTERVAL 0.0001220703125 /* 1/2**13, good till 4000 */
461/*#define MIN_INTERVAL 0.00000095367431640625 /* 1/2**20, good till 2200 */
455 462
456#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 463#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
457#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 464#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
458 465
459#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0) 466#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
… …
522# include "ev_win32.c" 529# include "ev_win32.c"
523#endif 530#endif
524 531
525/*****************************************************************************/ 532/*****************************************************************************/
526 533
534/* define a suitable floor function (only used by periodics atm) */
535
536#if EV_USE_FLOOR
537# include <math.h>
538# define ev_floor(v) floor (v)
539#else
540
541#include <float.h>
542
543/* a floor() replacement function, should be independent of ev_tstamp type */
544static ev_tstamp noinline
545ev_floor (ev_tstamp v)
546{
547 /* the choice of shift factor is not terribly important */
548#if FLT_RADIX != 2 /* assume FLT_RADIX == 10 */
549 const ev_tstamp shift = sizeof (unsigned long) >= 8 ? 10000000000000000000. : 1000000000.;
550#else
551 const ev_tstamp shift = sizeof (unsigned long) >= 8 ? 18446744073709551616. : 4294967296.;
552#endif
553
554 /* argument too large for an unsigned long? */
555 if (expect_false (v >= shift))
556 {
557 ev_tstamp f;
558
559 if (v == v - 1.)
560 return v; /* very large number */
561
562 f = shift * ev_floor (v * (1. / shift));
563 return f + ev_floor (v - f);
564 }
565
566 /* special treatment for negative args? */
567 if (expect_false (v < 0.))
568 {
569 ev_tstamp f = -ev_floor (-v);
570
571 return f - (f == v ? 0 : 1);
572 }
573
574 /* fits into an unsigned long */
575 return (unsigned long)v;
576}
577
578#endif
579
580/*****************************************************************************/
581
527#ifdef __linux 582#ifdef __linux
528# include <sys/utsname.h> 583# include <sys/utsname.h>
529#endif 584#endif
530 585
531static unsigned int noinline 586static unsigned int noinline
532ev_linux_version (void) 587ev_linux_version (void)
533{ 588{
534#ifdef __linux 589#ifdef __linux
590 unsigned int v = 0;
535 struct utsname buf; 591 struct utsname buf;
536 unsigned int v;
537 int i; 592 int i;
538 char *p = buf.release; 593 char *p = buf.release;
539 594
540 if (uname (&buf)) 595 if (uname (&buf))
541 return 0; 596 return 0;
… …
591 if (syserr_cb) 646 if (syserr_cb)
592 syserr_cb (msg); 647 syserr_cb (msg);
593 else 648 else
594 { 649 {
595#if EV_AVOID_STDIO 650#if EV_AVOID_STDIO
596 const char *err = strerror (errno);
597
598 ev_printerr (msg); 651 ev_printerr (msg);
599 ev_printerr (": "); 652 ev_printerr (": ");
600 ev_printerr (err); 653 ev_printerr (strerror (errno));
601 ev_printerr ("\n"); 654 ev_printerr ("\n");
602#else 655#else
603 perror (msg); 656 perror (msg);
604#endif 657#endif
605 abort (); 658 abort ();
… …
639 ptr = alloc (ptr, size); 692 ptr = alloc (ptr, size);
640 693
641 if (!ptr && size) 694 if (!ptr && size)
642 { 695 {
643#if EV_AVOID_STDIO 696#if EV_AVOID_STDIO
644 ev_printerr ("libev: memory allocation failed, aborting.\n"); 697 ev_printerr ("(libev) memory allocation failed, aborting.\n");
645#else 698#else
646 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 699 fprintf (stderr, "(libev) cannot allocate %ld bytes, aborting.", size);
647#endif 700#endif
648 abort (); 701 abort ();
649 } 702 }
650 703
651 return ptr; 704 return ptr;
… …
967inline_size void 1020inline_size void
968fd_reify (EV_P) 1021fd_reify (EV_P)
969{ 1022{
970 int i; 1023 int i;
971 1024
1025#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
1026 for (i = 0; i < fdchangecnt; ++i)
1027 {
1028 int fd = fdchanges [i];
1029 ANFD *anfd = anfds + fd;
1030
1031 if (anfd->reify & EV__IOFDSET && anfd->head)
1032 {
1033 SOCKET handle = EV_FD_TO_WIN32_HANDLE (fd);
1034
1035 if (handle != anfd->handle)
1036 {
1037 unsigned long arg;
1038
1039 assert (("libev: only socket fds supported in this configuration", ioctlsocket (handle, FIONREAD, &arg) == 0));
1040
1041 /* handle changed, but fd didn't - we need to do it in two steps */
1042 backend_modify (EV_A_ fd, anfd->events, 0);
1043 anfd->events = 0;
1044 anfd->handle = handle;
1045 }
1046 }
1047 }
1048#endif
1049
972 for (i = 0; i < fdchangecnt; ++i) 1050 for (i = 0; i < fdchangecnt; ++i)
973 { 1051 {
974 int fd = fdchanges [i]; 1052 int fd = fdchanges [i];
975 ANFD *anfd = anfds + fd; 1053 ANFD *anfd = anfds + fd;
976 ev_io *w; 1054 ev_io *w;
977 1055
978 unsigned char o_events = anfd->events; 1056 unsigned char o_events = anfd->events;
979 unsigned char o_reify = anfd->reify; 1057 unsigned char o_reify = anfd->reify;
980 1058
981 anfd->reify = 0; 1059 anfd->reify = 0;
982
983#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
984 if (o_reify & EV__IOFDSET)
985 {
986 unsigned long arg;
987 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
988 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
989 printf ("oi %d %x\n", fd, anfd->handle);//D
990 }
991#endif
992 1060
993 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */ 1061 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
994 { 1062 {
995 anfd->events = 0; 1063 anfd->events = 0;
996 1064
… …
1345 char dummy; 1413 char dummy;
1346 /* see discussion in evpipe_write when you think this read should be recv in win32 */ 1414 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1347 read (evpipe [0], &dummy, 1); 1415 read (evpipe [0], &dummy, 1);
1348 } 1416 }
1349 1417
1418#if EV_SIGNAL_ENABLE
1350 if (sig_pending) 1419 if (sig_pending)
1351 { 1420 {
1352 sig_pending = 0; 1421 sig_pending = 0;
1353 1422
1354 for (i = EV_NSIG - 1; i--; ) 1423 for (i = EV_NSIG - 1; i--; )
1355 if (expect_false (signals [i].pending)) 1424 if (expect_false (signals [i].pending))
1356 ev_feed_signal_event (EV_A_ i + 1); 1425 ev_feed_signal_event (EV_A_ i + 1);
1357 } 1426 }
1427#endif
1358 1428
1359#if EV_ASYNC_ENABLE 1429#if EV_ASYNC_ENABLE
1360 if (async_pending) 1430 if (async_pending)
1361 { 1431 {
1362 async_pending = 0; 1432 async_pending = 0;
… …
1371#endif 1441#endif
1372} 1442}
1373 1443
1374/*****************************************************************************/ 1444/*****************************************************************************/
1375 1445
1446void
1447ev_feed_signal (int signum)
1448{
1449#if EV_MULTIPLICITY
1450 EV_P = signals [signum - 1].loop;
1451
1452 if (!EV_A)
1453 return;
1454#endif
1455
1456 signals [signum - 1].pending = 1;
1457 evpipe_write (EV_A_ &sig_pending);
1458}
1459
1376static void 1460static void
1377ev_sighandler (int signum) 1461ev_sighandler (int signum)
1378{ 1462{
1379#if EV_MULTIPLICITY
1380 EV_P = signals [signum - 1].loop;
1381#endif
1382
1383#ifdef _WIN32 1463#ifdef _WIN32
1384 signal (signum, ev_sighandler); 1464 signal (signum, ev_sighandler);
1385#endif 1465#endif
1386 1466
1387 signals [signum - 1].pending = 1; 1467 ev_feed_signal (signum);
1388 evpipe_write (EV_A_ &sig_pending);
1389} 1468}
1390 1469
1391void noinline 1470void noinline
1392ev_feed_signal_event (EV_P_ int signum) 1471ev_feed_signal_event (EV_P_ int signum)
1393{ 1472{
… …
1645static void noinline 1724static void noinline
1646loop_init (EV_P_ unsigned int flags) 1725loop_init (EV_P_ unsigned int flags)
1647{ 1726{
1648 if (!backend) 1727 if (!backend)
1649 { 1728 {
1729 origflags = flags;
1730
1650#if EV_USE_REALTIME 1731#if EV_USE_REALTIME
1651 if (!have_realtime) 1732 if (!have_realtime)
1652 { 1733 {
1653 struct timespec ts; 1734 struct timespec ts;
1654 1735
… …
1699#endif 1780#endif
1700#if EV_USE_SIGNALFD 1781#if EV_USE_SIGNALFD
1701 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 1782 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1702#endif 1783#endif
1703 1784
1704 if (!(flags & 0x0000ffffU)) 1785 if (!(flags & EVBACKEND_MASK))
1705 flags |= ev_recommended_backends (); 1786 flags |= ev_recommended_backends ();
1706 1787
1707#if EV_USE_IOCP 1788#if EV_USE_IOCP
1708 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags); 1789 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1709#endif 1790#endif
… …
1731#endif 1812#endif
1732 } 1813 }
1733} 1814}
1734 1815
1735/* free up a loop structure */ 1816/* free up a loop structure */
1736static void noinline 1817void
1737loop_destroy (EV_P) 1818ev_loop_destroy (EV_P)
1738{ 1819{
1739 int i; 1820 int i;
1821
1822#if EV_MULTIPLICITY
1823 /* mimic free (0) */
1824 if (!EV_A)
1825 return;
1826#endif
1827
1828#if EV_CLEANUP_ENABLE
1829 /* queue cleanup watchers (and execute them) */
1830 if (expect_false (cleanupcnt))
1831 {
1832 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1833 EV_INVOKE_PENDING;
1834 }
1835#endif
1836
1837#if EV_CHILD_ENABLE
1838 if (ev_is_active (&childev))
1839 {
1840 ev_ref (EV_A); /* child watcher */
1841 ev_signal_stop (EV_A_ &childev);
1842 }
1843#endif
1740 1844
1741 if (ev_is_active (&pipe_w)) 1845 if (ev_is_active (&pipe_w))
1742 { 1846 {
1743 /*ev_ref (EV_A);*/ 1847 /*ev_ref (EV_A);*/
1744 /*ev_io_stop (EV_A_ &pipe_w);*/ 1848 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1805 array_free (periodic, EMPTY); 1909 array_free (periodic, EMPTY);
1806#endif 1910#endif
1807#if EV_FORK_ENABLE 1911#if EV_FORK_ENABLE
1808 array_free (fork, EMPTY); 1912 array_free (fork, EMPTY);
1809#endif 1913#endif
1914#if EV_CLEANUP_ENABLE
1915 array_free (cleanup, EMPTY);
1916#endif
1810 array_free (prepare, EMPTY); 1917 array_free (prepare, EMPTY);
1811 array_free (check, EMPTY); 1918 array_free (check, EMPTY);
1812#if EV_ASYNC_ENABLE 1919#if EV_ASYNC_ENABLE
1813 array_free (async, EMPTY); 1920 array_free (async, EMPTY);
1814#endif 1921#endif
1815 1922
1816 backend = 0; 1923 backend = 0;
1924
1925#if EV_MULTIPLICITY
1926 if (ev_is_default_loop (EV_A))
1927#endif
1928 ev_default_loop_ptr = 0;
1929#if EV_MULTIPLICITY
1930 else
1931 ev_free (EV_A);
1932#endif
1817} 1933}
1818 1934
1819#if EV_USE_INOTIFY 1935#if EV_USE_INOTIFY
1820inline_size void infy_fork (EV_P); 1936inline_size void infy_fork (EV_P);
1821#endif 1937#endif
… …
1880 loop_init (EV_A_ flags); 1996 loop_init (EV_A_ flags);
1881 1997
1882 if (ev_backend (EV_A)) 1998 if (ev_backend (EV_A))
1883 return EV_A; 1999 return EV_A;
1884 2000
2001 ev_free (EV_A);
1885 return 0; 2002 return 0;
1886} 2003}
1887 2004
1888void
1889ev_loop_destroy (EV_P)
1890{
1891 loop_destroy (EV_A);
1892 ev_free (loop);
1893}
1894
1895void
1896ev_loop_fork (EV_P)
1897{
1898 postfork = 1; /* must be in line with ev_default_fork */
1899}
1900#endif /* multiplicity */ 2005#endif /* multiplicity */
1901 2006
1902#if EV_VERIFY 2007#if EV_VERIFY
1903static void noinline 2008static void noinline
1904verify_watcher (EV_P_ W w) 2009verify_watcher (EV_P_ W w)
… …
1979#if EV_FORK_ENABLE 2084#if EV_FORK_ENABLE
1980 assert (forkmax >= forkcnt); 2085 assert (forkmax >= forkcnt);
1981 array_verify (EV_A_ (W *)forks, forkcnt); 2086 array_verify (EV_A_ (W *)forks, forkcnt);
1982#endif 2087#endif
1983 2088
2089#if EV_CLEANUP_ENABLE
2090 assert (cleanupmax >= cleanupcnt);
2091 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2092#endif
2093
1984#if EV_ASYNC_ENABLE 2094#if EV_ASYNC_ENABLE
1985 assert (asyncmax >= asynccnt); 2095 assert (asyncmax >= asynccnt);
1986 array_verify (EV_A_ (W *)asyncs, asynccnt); 2096 array_verify (EV_A_ (W *)asyncs, asynccnt);
1987#endif 2097#endif
1988 2098
… …
2006} 2116}
2007#endif 2117#endif
2008 2118
2009#if EV_MULTIPLICITY 2119#if EV_MULTIPLICITY
2010struct ev_loop * 2120struct ev_loop *
2011ev_default_loop_init (unsigned int flags)
2012#else 2121#else
2013int 2122int
2123#endif
2014ev_default_loop (unsigned int flags) 2124ev_default_loop (unsigned int flags)
2015#endif
2016{ 2125{
2017 if (!ev_default_loop_ptr) 2126 if (!ev_default_loop_ptr)
2018 { 2127 {
2019#if EV_MULTIPLICITY 2128#if EV_MULTIPLICITY
2020 EV_P = ev_default_loop_ptr = &default_loop_struct; 2129 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
2039 2148
2040 return ev_default_loop_ptr; 2149 return ev_default_loop_ptr;
2041} 2150}
2042 2151
2043void 2152void
2044ev_default_destroy (void) 2153ev_loop_fork (EV_P)
2045{ 2154{
2046#if EV_MULTIPLICITY
2047 EV_P = ev_default_loop_ptr;
2048#endif
2049
2050 ev_default_loop_ptr = 0;
2051
2052#if EV_CHILD_ENABLE
2053 ev_ref (EV_A); /* child watcher */
2054 ev_signal_stop (EV_A_ &childev);
2055#endif
2056
2057 loop_destroy (EV_A);
2058}
2059
2060void
2061ev_default_fork (void)
2062{
2063#if EV_MULTIPLICITY
2064 EV_P = ev_default_loop_ptr;
2065#endif
2066
2067 postfork = 1; /* must be in line with ev_loop_fork */ 2155 postfork = 1; /* must be in line with ev_default_fork */
2068} 2156}
2069 2157
2070/*****************************************************************************/ 2158/*****************************************************************************/
2071 2159
2072void 2160void
… …
2094 2182
2095 for (pri = NUMPRI; pri--; ) 2183 for (pri = NUMPRI; pri--; )
2096 while (pendingcnt [pri]) 2184 while (pendingcnt [pri])
2097 { 2185 {
2098 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2186 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
2099
2100 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
2101 /* ^ this is no longer true, as pending_w could be here */
2102 2187
2103 p->w->pending = 0; 2188 p->w->pending = 0;
2104 EV_CB_INVOKE (p->w, p->events); 2189 EV_CB_INVOKE (p->w, p->events);
2105 EV_FREQUENT_CHECK; 2190 EV_FREQUENT_CHECK;
2106 } 2191 }
… …
2168 feed_reverse_done (EV_A_ EV_TIMER); 2253 feed_reverse_done (EV_A_ EV_TIMER);
2169 } 2254 }
2170} 2255}
2171 2256
2172#if EV_PERIODIC_ENABLE 2257#if EV_PERIODIC_ENABLE
2258
2259static void noinline
2260periodic_recalc (EV_P_ ev_periodic *w)
2261{
2262 ev_tstamp interval = w->interval > MIN_INTERVAL ? w->interval : MIN_INTERVAL;
2263 ev_tstamp at = w->offset + interval * ev_floor ((ev_rt_now - w->offset) / interval);
2264
2265 /* the above almost always errs on the low side */
2266 while (at <= ev_rt_now)
2267 {
2268 ev_tstamp nat = at + w->interval;
2269
2270 /* when resolution fails us, we use ev_rt_now */
2271 if (expect_false (nat == at))
2272 {
2273 at = ev_rt_now;
2274 break;
2275 }
2276
2277 at = nat;
2278 }
2279
2280 ev_at (w) = at;
2281}
2282
2173/* make periodics pending */ 2283/* make periodics pending */
2174inline_size void 2284inline_size void
2175periodics_reify (EV_P) 2285periodics_reify (EV_P)
2176{ 2286{
2177 EV_FREQUENT_CHECK; 2287 EV_FREQUENT_CHECK;
… …
2196 ANHE_at_cache (periodics [HEAP0]); 2306 ANHE_at_cache (periodics [HEAP0]);
2197 downheap (periodics, periodiccnt, HEAP0); 2307 downheap (periodics, periodiccnt, HEAP0);
2198 } 2308 }
2199 else if (w->interval) 2309 else if (w->interval)
2200 { 2310 {
2201 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2311 periodic_recalc (EV_A_ w);
2202 /* if next trigger time is not sufficiently in the future, put it there */
2203 /* this might happen because of floating point inexactness */
2204 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2205 {
2206 ev_at (w) += w->interval;
2207
2208 /* if interval is unreasonably low we might still have a time in the past */
2209 /* so correct this. this will make the periodic very inexact, but the user */
2210 /* has effectively asked to get triggered more often than possible */
2211 if (ev_at (w) < ev_rt_now)
2212 ev_at (w) = ev_rt_now;
2213 }
2214
2215 ANHE_at_cache (periodics [HEAP0]); 2312 ANHE_at_cache (periodics [HEAP0]);
2216 downheap (periodics, periodiccnt, HEAP0); 2313 downheap (periodics, periodiccnt, HEAP0);
2217 } 2314 }
2218 else 2315 else
2219 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 2316 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
… …
2240 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]); 2337 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
2241 2338
2242 if (w->reschedule_cb) 2339 if (w->reschedule_cb)
2243 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2340 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2244 else if (w->interval) 2341 else if (w->interval)
2245 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2342 periodic_recalc (EV_A_ w);
2246 2343
2247 ANHE_at_cache (periodics [i]); 2344 ANHE_at_cache (periodics [i]);
2248 } 2345 }
2249 2346
2250 reheap (periodics, periodiccnt); 2347 reheap (periodics, periodiccnt);
… …
2297 * doesn't hurt either as we only do this on time-jumps or 2394 * doesn't hurt either as we only do this on time-jumps or
2298 * in the unlikely event of having been preempted here. 2395 * in the unlikely event of having been preempted here.
2299 */ 2396 */
2300 for (i = 4; --i; ) 2397 for (i = 4; --i; )
2301 { 2398 {
2399 ev_tstamp diff;
2302 rtmn_diff = ev_rt_now - mn_now; 2400 rtmn_diff = ev_rt_now - mn_now;
2303 2401
2402 diff = odiff - rtmn_diff;
2403
2304 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)) 2404 if (expect_true ((diff < 0. ? -diff : diff) < MIN_TIMEJUMP))
2305 return; /* all is well */ 2405 return; /* all is well */
2306 2406
2307 ev_rt_now = ev_time (); 2407 ev_rt_now = ev_time ();
2308 mn_now = get_clock (); 2408 mn_now = get_clock ();
2309 now_floor = mn_now; 2409 now_floor = mn_now;
… …
2405 { 2505 {
2406 waittime = MAX_BLOCKTIME; 2506 waittime = MAX_BLOCKTIME;
2407 2507
2408 if (timercnt) 2508 if (timercnt)
2409 { 2509 {
2410 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2510 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now;
2411 if (waittime > to) waittime = to; 2511 if (waittime > to) waittime = to;
2412 } 2512 }
2413 2513
2414#if EV_PERIODIC_ENABLE 2514#if EV_PERIODIC_ENABLE
2415 if (periodiccnt) 2515 if (periodiccnt)
2416 { 2516 {
2417 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2517 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now;
2418 if (waittime > to) waittime = to; 2518 if (waittime > to) waittime = to;
2419 } 2519 }
2420#endif 2520#endif
2421 2521
2422 /* don't let timeouts decrease the waittime below timeout_blocktime */ 2522 /* don't let timeouts decrease the waittime below timeout_blocktime */
2423 if (expect_false (waittime < timeout_blocktime)) 2523 if (expect_false (waittime < timeout_blocktime))
2424 waittime = timeout_blocktime; 2524 waittime = timeout_blocktime;
2525
2526 /* at this point, we NEED to wait, so we have to ensure */
2527 /* to pass a minimum nonzero value to the backend */
2528 if (expect_false (waittime < backend_mintime))
2529 waittime = backend_mintime;
2425 2530
2426 /* extra check because io_blocktime is commonly 0 */ 2531 /* extra check because io_blocktime is commonly 0 */
2427 if (expect_false (io_blocktime)) 2532 if (expect_false (io_blocktime))
2428 { 2533 {
2429 sleeptime = io_blocktime - (mn_now - prev_mn_now); 2534 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2430 2535
2431 if (sleeptime > waittime - backend_fudge) 2536 if (sleeptime > waittime - backend_mintime)
2432 sleeptime = waittime - backend_fudge; 2537 sleeptime = waittime - backend_mintime;
2433 2538
2434 if (expect_true (sleeptime > 0.)) 2539 if (expect_true (sleeptime > 0.))
2435 { 2540 {
2436 ev_sleep (sleeptime); 2541 ev_sleep (sleeptime);
2437 waittime -= sleeptime; 2542 waittime -= sleeptime;
… …
2742 if (w->reschedule_cb) 2847 if (w->reschedule_cb)
2743 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2848 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2744 else if (w->interval) 2849 else if (w->interval)
2745 { 2850 {
2746 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.)); 2851 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2747 /* this formula differs from the one in periodic_reify because we do not always round up */ 2852 periodic_recalc (EV_A_ w);
2748 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2749 } 2853 }
2750 else 2854 else
2751 ev_at (w) = w->offset; 2855 ev_at (w) = w->offset;
2752 2856
2753 EV_FREQUENT_CHECK; 2857 EV_FREQUENT_CHECK;
… …
2874 sa.sa_handler = ev_sighandler; 2978 sa.sa_handler = ev_sighandler;
2875 sigfillset (&sa.sa_mask); 2979 sigfillset (&sa.sa_mask);
2876 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2980 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2877 sigaction (w->signum, &sa, 0); 2981 sigaction (w->signum, &sa, 0);
2878 2982
2983 if (origflags & EVFLAG_NOSIGMASK)
2984 {
2879 sigemptyset (&sa.sa_mask); 2985 sigemptyset (&sa.sa_mask);
2880 sigaddset (&sa.sa_mask, w->signum); 2986 sigaddset (&sa.sa_mask, w->signum);
2881 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0); 2987 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2988 }
2882#endif 2989#endif
2883 } 2990 }
2884 2991
2885 EV_FREQUENT_CHECK; 2992 EV_FREQUENT_CHECK;
2886} 2993}
… …
3027 if (!pend || pend == path) 3134 if (!pend || pend == path)
3028 break; 3135 break;
3029 3136
3030 *pend = 0; 3137 *pend = 0;
3031 w->wd = inotify_add_watch (fs_fd, path, mask); 3138 w->wd = inotify_add_watch (fs_fd, path, mask);
3032 } 3139 }
3033 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3140 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
3034 } 3141 }
3035 } 3142 }
3036 3143
3037 if (w->wd >= 0) 3144 if (w->wd >= 0)
… …
3578 3685
3579 EV_FREQUENT_CHECK; 3686 EV_FREQUENT_CHECK;
3580} 3687}
3581#endif 3688#endif
3582 3689
3690#if EV_CLEANUP_ENABLE
3691void
3692ev_cleanup_start (EV_P_ ev_cleanup *w)
3693{
3694 if (expect_false (ev_is_active (w)))
3695 return;
3696
3697 EV_FREQUENT_CHECK;
3698
3699 ev_start (EV_A_ (W)w, ++cleanupcnt);
3700 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3701 cleanups [cleanupcnt - 1] = w;
3702
3703 /* cleanup watchers should never keep a refcount on the loop */
3704 ev_unref (EV_A);
3705 EV_FREQUENT_CHECK;
3706}
3707
3708void
3709ev_cleanup_stop (EV_P_ ev_cleanup *w)
3710{
3711 clear_pending (EV_A_ (W)w);
3712 if (expect_false (!ev_is_active (w)))
3713 return;
3714
3715 EV_FREQUENT_CHECK;
3716 ev_ref (EV_A);
3717
3718 {
3719 int active = ev_active (w);
3720
3721 cleanups [active - 1] = cleanups [--cleanupcnt];
3722 ev_active (cleanups [active - 1]) = active;
3723 }
3724
3725 ev_stop (EV_A_ (W)w);
3726
3727 EV_FREQUENT_CHECK;
3728}
3729#endif
3730
3583#if EV_ASYNC_ENABLE 3731#if EV_ASYNC_ENABLE
3584void 3732void
3585ev_async_start (EV_P_ ev_async *w) 3733ev_async_start (EV_P_ ev_async *w)
3586{ 3734{
3587 if (expect_false (ev_is_active (w))) 3735 if (expect_false (ev_is_active (w)))

Diff Legend

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