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

Comparing libev/ev.c (file contents):
Revision 1.359 by root, Sun Oct 24 17:58:41 2010 UTC vs.
Revision 1.374 by root, Sat Feb 26 15:21:01 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)
… …
518# define EV_WIN32_CLOSE_FD(fd) close (fd) 525# define EV_WIN32_CLOSE_FD(fd) close (fd)
519#endif 526#endif
520 527
521#ifdef _WIN32 528#ifdef _WIN32
522# include "ev_win32.c" 529# include "ev_win32.c"
530#endif
531
532/*****************************************************************************/
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
523#endif 578#endif
524 579
525/*****************************************************************************/ 580/*****************************************************************************/
526 581
527#ifdef __linux 582#ifdef __linux
… …
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;
… …
817 select (0, 0, 0, 0, &tv); 870 select (0, 0, 0, 0, &tv);
818#endif 871#endif
819 } 872 }
820} 873}
821 874
875inline_speed int
876ev_timeout_to_ms (ev_tstamp timeout)
877{
878 int ms = timeout * 1000. + .999999;
879
880 return expect_true (ms) ? ms : timeout < 1e-6 ? 0 : 1;
881}
882
822/*****************************************************************************/ 883/*****************************************************************************/
823 884
824#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 885#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
825 886
826/* find a suitable new size for the given array, */ 887/* find a suitable new size for the given array, */
… …
967inline_size void 1028inline_size void
968fd_reify (EV_P) 1029fd_reify (EV_P)
969{ 1030{
970 int i; 1031 int i;
971 1032
1033#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
1034 for (i = 0; i < fdchangecnt; ++i)
1035 {
1036 int fd = fdchanges [i];
1037 ANFD *anfd = anfds + fd;
1038
1039 if (anfd->reify & EV__IOFDSET && anfd->head)
1040 {
1041 SOCKET handle = EV_FD_TO_WIN32_HANDLE (fd);
1042
1043 if (handle != anfd->handle)
1044 {
1045 unsigned long arg;
1046
1047 assert (("libev: only socket fds supported in this configuration", ioctlsocket (handle, FIONREAD, &arg) == 0));
1048
1049 /* handle changed, but fd didn't - we need to do it in two steps */
1050 backend_modify (EV_A_ fd, anfd->events, 0);
1051 anfd->events = 0;
1052 anfd->handle = handle;
1053 }
1054 }
1055 }
1056#endif
1057
972 for (i = 0; i < fdchangecnt; ++i) 1058 for (i = 0; i < fdchangecnt; ++i)
973 { 1059 {
974 int fd = fdchanges [i]; 1060 int fd = fdchanges [i];
975 ANFD *anfd = anfds + fd; 1061 ANFD *anfd = anfds + fd;
976 ev_io *w; 1062 ev_io *w;
977 1063
978 unsigned char o_events = anfd->events; 1064 unsigned char o_events = anfd->events;
979 unsigned char o_reify = anfd->reify; 1065 unsigned char o_reify = anfd->reify;
980 1066
981 anfd->reify = 0; 1067 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 1068
993 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */ 1069 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
994 { 1070 {
995 anfd->events = 0; 1071 anfd->events = 0;
996 1072
… …
1345 char dummy; 1421 char dummy;
1346 /* see discussion in evpipe_write when you think this read should be recv in win32 */ 1422 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1347 read (evpipe [0], &dummy, 1); 1423 read (evpipe [0], &dummy, 1);
1348 } 1424 }
1349 1425
1426#if EV_SIGNAL_ENABLE
1350 if (sig_pending) 1427 if (sig_pending)
1351 { 1428 {
1352 sig_pending = 0; 1429 sig_pending = 0;
1353 1430
1354 for (i = EV_NSIG - 1; i--; ) 1431 for (i = EV_NSIG - 1; i--; )
1355 if (expect_false (signals [i].pending)) 1432 if (expect_false (signals [i].pending))
1356 ev_feed_signal_event (EV_A_ i + 1); 1433 ev_feed_signal_event (EV_A_ i + 1);
1357 } 1434 }
1435#endif
1358 1436
1359#if EV_ASYNC_ENABLE 1437#if EV_ASYNC_ENABLE
1360 if (async_pending) 1438 if (async_pending)
1361 { 1439 {
1362 async_pending = 0; 1440 async_pending = 0;
… …
1371#endif 1449#endif
1372} 1450}
1373 1451
1374/*****************************************************************************/ 1452/*****************************************************************************/
1375 1453
1454void
1455ev_feed_signal (int signum)
1456{
1457#if EV_MULTIPLICITY
1458 EV_P = signals [signum - 1].loop;
1459
1460 if (!EV_A)
1461 return;
1462#endif
1463
1464 signals [signum - 1].pending = 1;
1465 evpipe_write (EV_A_ &sig_pending);
1466}
1467
1376static void 1468static void
1377ev_sighandler (int signum) 1469ev_sighandler (int signum)
1378{ 1470{
1379#if EV_MULTIPLICITY
1380 EV_P = signals [signum - 1].loop;
1381#endif
1382
1383#ifdef _WIN32 1471#ifdef _WIN32
1384 signal (signum, ev_sighandler); 1472 signal (signum, ev_sighandler);
1385#endif 1473#endif
1386 1474
1387 signals [signum - 1].pending = 1; 1475 ev_feed_signal (signum);
1388 evpipe_write (EV_A_ &sig_pending);
1389} 1476}
1390 1477
1391void noinline 1478void noinline
1392ev_feed_signal_event (EV_P_ int signum) 1479ev_feed_signal_event (EV_P_ int signum)
1393{ 1480{
… …
1645static void noinline 1732static void noinline
1646loop_init (EV_P_ unsigned int flags) 1733loop_init (EV_P_ unsigned int flags)
1647{ 1734{
1648 if (!backend) 1735 if (!backend)
1649 { 1736 {
1737 origflags = flags;
1738
1650#if EV_USE_REALTIME 1739#if EV_USE_REALTIME
1651 if (!have_realtime) 1740 if (!have_realtime)
1652 { 1741 {
1653 struct timespec ts; 1742 struct timespec ts;
1654 1743
… …
1699#endif 1788#endif
1700#if EV_USE_SIGNALFD 1789#if EV_USE_SIGNALFD
1701 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 1790 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1702#endif 1791#endif
1703 1792
1704 if (!(flags & 0x0000ffffU)) 1793 if (!(flags & EVBACKEND_MASK))
1705 flags |= ev_recommended_backends (); 1794 flags |= ev_recommended_backends ();
1706 1795
1707#if EV_USE_IOCP 1796#if EV_USE_IOCP
1708 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags); 1797 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1709#endif 1798#endif
… …
1735/* free up a loop structure */ 1824/* free up a loop structure */
1736void 1825void
1737ev_loop_destroy (EV_P) 1826ev_loop_destroy (EV_P)
1738{ 1827{
1739 int i; 1828 int i;
1829
1830#if EV_MULTIPLICITY
1831 /* mimic free (0) */
1832 if (!EV_A)
1833 return;
1834#endif
1835
1836#if EV_CLEANUP_ENABLE
1837 /* queue cleanup watchers (and execute them) */
1838 if (expect_false (cleanupcnt))
1839 {
1840 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1841 EV_INVOKE_PENDING;
1842 }
1843#endif
1740 1844
1741#if EV_CHILD_ENABLE 1845#if EV_CHILD_ENABLE
1742 if (ev_is_active (&childev)) 1846 if (ev_is_active (&childev))
1743 { 1847 {
1744 ev_ref (EV_A); /* child watcher */ 1848 ev_ref (EV_A); /* child watcher */
… …
1812#if EV_PERIODIC_ENABLE 1916#if EV_PERIODIC_ENABLE
1813 array_free (periodic, EMPTY); 1917 array_free (periodic, EMPTY);
1814#endif 1918#endif
1815#if EV_FORK_ENABLE 1919#if EV_FORK_ENABLE
1816 array_free (fork, EMPTY); 1920 array_free (fork, EMPTY);
1921#endif
1922#if EV_CLEANUP_ENABLE
1923 array_free (cleanup, EMPTY);
1817#endif 1924#endif
1818 array_free (prepare, EMPTY); 1925 array_free (prepare, EMPTY);
1819 array_free (check, EMPTY); 1926 array_free (check, EMPTY);
1820#if EV_ASYNC_ENABLE 1927#if EV_ASYNC_ENABLE
1821 array_free (async, EMPTY); 1928 array_free (async, EMPTY);
… …
1985#if EV_FORK_ENABLE 2092#if EV_FORK_ENABLE
1986 assert (forkmax >= forkcnt); 2093 assert (forkmax >= forkcnt);
1987 array_verify (EV_A_ (W *)forks, forkcnt); 2094 array_verify (EV_A_ (W *)forks, forkcnt);
1988#endif 2095#endif
1989 2096
2097#if EV_CLEANUP_ENABLE
2098 assert (cleanupmax >= cleanupcnt);
2099 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2100#endif
2101
1990#if EV_ASYNC_ENABLE 2102#if EV_ASYNC_ENABLE
1991 assert (asyncmax >= asynccnt); 2103 assert (asyncmax >= asynccnt);
1992 array_verify (EV_A_ (W *)asyncs, asynccnt); 2104 array_verify (EV_A_ (W *)asyncs, asynccnt);
1993#endif 2105#endif
1994 2106
… …
2079 for (pri = NUMPRI; pri--; ) 2191 for (pri = NUMPRI; pri--; )
2080 while (pendingcnt [pri]) 2192 while (pendingcnt [pri])
2081 { 2193 {
2082 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2194 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
2083 2195
2084 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
2085 /* ^ this is no longer true, as pending_w could be here */
2086
2087 p->w->pending = 0; 2196 p->w->pending = 0;
2088 EV_CB_INVOKE (p->w, p->events); 2197 EV_CB_INVOKE (p->w, p->events);
2089 EV_FREQUENT_CHECK; 2198 EV_FREQUENT_CHECK;
2090 } 2199 }
2091} 2200}
… …
2152 feed_reverse_done (EV_A_ EV_TIMER); 2261 feed_reverse_done (EV_A_ EV_TIMER);
2153 } 2262 }
2154} 2263}
2155 2264
2156#if EV_PERIODIC_ENABLE 2265#if EV_PERIODIC_ENABLE
2266
2267static void noinline
2268periodic_recalc (EV_P_ ev_periodic *w)
2269{
2270 ev_tstamp interval = w->interval > MIN_INTERVAL ? w->interval : MIN_INTERVAL;
2271 ev_tstamp at = w->offset + interval * ev_floor ((ev_rt_now - w->offset) / interval);
2272
2273 /* the above almost always errs on the low side */
2274 while (at <= ev_rt_now)
2275 {
2276 ev_tstamp nat = at + w->interval;
2277
2278 /* when resolution fails us, we use ev_rt_now */
2279 if (expect_false (nat == at))
2280 {
2281 at = ev_rt_now;
2282 break;
2283 }
2284
2285 at = nat;
2286 }
2287
2288 ev_at (w) = at;
2289}
2290
2157/* make periodics pending */ 2291/* make periodics pending */
2158inline_size void 2292inline_size void
2159periodics_reify (EV_P) 2293periodics_reify (EV_P)
2160{ 2294{
2161 EV_FREQUENT_CHECK; 2295 EV_FREQUENT_CHECK;
… …
2180 ANHE_at_cache (periodics [HEAP0]); 2314 ANHE_at_cache (periodics [HEAP0]);
2181 downheap (periodics, periodiccnt, HEAP0); 2315 downheap (periodics, periodiccnt, HEAP0);
2182 } 2316 }
2183 else if (w->interval) 2317 else if (w->interval)
2184 { 2318 {
2185 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2319 periodic_recalc (EV_A_ w);
2186 /* if next trigger time is not sufficiently in the future, put it there */
2187 /* this might happen because of floating point inexactness */
2188 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2189 {
2190 ev_at (w) += w->interval;
2191
2192 /* if interval is unreasonably low we might still have a time in the past */
2193 /* so correct this. this will make the periodic very inexact, but the user */
2194 /* has effectively asked to get triggered more often than possible */
2195 if (ev_at (w) < ev_rt_now)
2196 ev_at (w) = ev_rt_now;
2197 }
2198
2199 ANHE_at_cache (periodics [HEAP0]); 2320 ANHE_at_cache (periodics [HEAP0]);
2200 downheap (periodics, periodiccnt, HEAP0); 2321 downheap (periodics, periodiccnt, HEAP0);
2201 } 2322 }
2202 else 2323 else
2203 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 2324 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
… …
2224 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]); 2345 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
2225 2346
2226 if (w->reschedule_cb) 2347 if (w->reschedule_cb)
2227 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2348 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2228 else if (w->interval) 2349 else if (w->interval)
2229 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2350 periodic_recalc (EV_A_ w);
2230 2351
2231 ANHE_at_cache (periodics [i]); 2352 ANHE_at_cache (periodics [i]);
2232 } 2353 }
2233 2354
2234 reheap (periodics, periodiccnt); 2355 reheap (periodics, periodiccnt);
… …
2281 * doesn't hurt either as we only do this on time-jumps or 2402 * doesn't hurt either as we only do this on time-jumps or
2282 * in the unlikely event of having been preempted here. 2403 * in the unlikely event of having been preempted here.
2283 */ 2404 */
2284 for (i = 4; --i; ) 2405 for (i = 4; --i; )
2285 { 2406 {
2407 ev_tstamp diff;
2286 rtmn_diff = ev_rt_now - mn_now; 2408 rtmn_diff = ev_rt_now - mn_now;
2287 2409
2410 diff = odiff - rtmn_diff;
2411
2288 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)) 2412 if (expect_true ((diff < 0. ? -diff : diff) < MIN_TIMEJUMP))
2289 return; /* all is well */ 2413 return; /* all is well */
2290 2414
2291 ev_rt_now = ev_time (); 2415 ev_rt_now = ev_time ();
2292 mn_now = get_clock (); 2416 mn_now = get_clock ();
2293 now_floor = mn_now; 2417 now_floor = mn_now;
… …
2726 if (w->reschedule_cb) 2850 if (w->reschedule_cb)
2727 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2851 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2728 else if (w->interval) 2852 else if (w->interval)
2729 { 2853 {
2730 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.)); 2854 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2731 /* this formula differs from the one in periodic_reify because we do not always round up */ 2855 periodic_recalc (EV_A_ w);
2732 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2733 } 2856 }
2734 else 2857 else
2735 ev_at (w) = w->offset; 2858 ev_at (w) = w->offset;
2736 2859
2737 EV_FREQUENT_CHECK; 2860 EV_FREQUENT_CHECK;
… …
2858 sa.sa_handler = ev_sighandler; 2981 sa.sa_handler = ev_sighandler;
2859 sigfillset (&sa.sa_mask); 2982 sigfillset (&sa.sa_mask);
2860 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2983 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2861 sigaction (w->signum, &sa, 0); 2984 sigaction (w->signum, &sa, 0);
2862 2985
2986 if (origflags & EVFLAG_NOSIGMASK)
2987 {
2863 sigemptyset (&sa.sa_mask); 2988 sigemptyset (&sa.sa_mask);
2864 sigaddset (&sa.sa_mask, w->signum); 2989 sigaddset (&sa.sa_mask, w->signum);
2865 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0); 2990 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2991 }
2866#endif 2992#endif
2867 } 2993 }
2868 2994
2869 EV_FREQUENT_CHECK; 2995 EV_FREQUENT_CHECK;
2870} 2996}
… …
3011 if (!pend || pend == path) 3137 if (!pend || pend == path)
3012 break; 3138 break;
3013 3139
3014 *pend = 0; 3140 *pend = 0;
3015 w->wd = inotify_add_watch (fs_fd, path, mask); 3141 w->wd = inotify_add_watch (fs_fd, path, mask);
3016 } 3142 }
3017 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3143 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
3018 } 3144 }
3019 } 3145 }
3020 3146
3021 if (w->wd >= 0) 3147 if (w->wd >= 0)
… …
3562 3688
3563 EV_FREQUENT_CHECK; 3689 EV_FREQUENT_CHECK;
3564} 3690}
3565#endif 3691#endif
3566 3692
3693#if EV_CLEANUP_ENABLE
3694void
3695ev_cleanup_start (EV_P_ ev_cleanup *w)
3696{
3697 if (expect_false (ev_is_active (w)))
3698 return;
3699
3700 EV_FREQUENT_CHECK;
3701
3702 ev_start (EV_A_ (W)w, ++cleanupcnt);
3703 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3704 cleanups [cleanupcnt - 1] = w;
3705
3706 /* cleanup watchers should never keep a refcount on the loop */
3707 ev_unref (EV_A);
3708 EV_FREQUENT_CHECK;
3709}
3710
3711void
3712ev_cleanup_stop (EV_P_ ev_cleanup *w)
3713{
3714 clear_pending (EV_A_ (W)w);
3715 if (expect_false (!ev_is_active (w)))
3716 return;
3717
3718 EV_FREQUENT_CHECK;
3719 ev_ref (EV_A);
3720
3721 {
3722 int active = ev_active (w);
3723
3724 cleanups [active - 1] = cleanups [--cleanupcnt];
3725 ev_active (cleanups [active - 1]) = active;
3726 }
3727
3728 ev_stop (EV_A_ (W)w);
3729
3730 EV_FREQUENT_CHECK;
3731}
3732#endif
3733
3567#if EV_ASYNC_ENABLE 3734#if EV_ASYNC_ENABLE
3568void 3735void
3569ev_async_start (EV_P_ ev_async *w) 3736ev_async_start (EV_P_ ev_async *w)
3570{ 3737{
3571 if (expect_false (ev_is_active (w))) 3738 if (expect_false (ev_is_active (w)))

Diff Legend

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