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

Comparing libev/ev.c (file contents):
Revision 1.366 by root, Mon Jan 10 01:58:54 2011 UTC vs.
Revision 1.378 by root, Mon Jun 13 09:52:36 2011 UTC

… …
4 * Copyright (c) 2007,2008,2009,2010,2011 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
… …
965inline_size void 1020inline_size void
966fd_reify (EV_P) 1021fd_reify (EV_P)
967{ 1022{
968 int i; 1023 int i;
969 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
970 for (i = 0; i < fdchangecnt; ++i) 1050 for (i = 0; i < fdchangecnt; ++i)
971 { 1051 {
972 int fd = fdchanges [i]; 1052 int fd = fdchanges [i];
973 ANFD *anfd = anfds + fd; 1053 ANFD *anfd = anfds + fd;
974 ev_io *w; 1054 ev_io *w;
975 1055
976 unsigned char o_events = anfd->events; 1056 unsigned char o_events = anfd->events;
977 unsigned char o_reify = anfd->reify; 1057 unsigned char o_reify = anfd->reify;
978 1058
979 anfd->reify = 0; 1059 anfd->reify = 0;
980
981#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
982 if (o_reify & EV__IOFDSET)
983 {
984 unsigned long arg;
985 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
986 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
987 printf ("oi %d %x\n", fd, anfd->handle);//D
988 }
989#endif
990 1060
991 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */ 1061 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
992 { 1062 {
993 anfd->events = 0; 1063 anfd->events = 0;
994 1064
… …
1298inline_size void 1368inline_size void
1299evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1369evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1300{ 1370{
1301 if (!*flag) 1371 if (!*flag)
1302 { 1372 {
1303 int old_errno = errno; /* save errno because write might clobber it */
1304 char dummy;
1305
1306 *flag = 1; 1373 *flag = 1;
1307 1374
1375 pipe_write_skipped = 1;
1376
1377 if (pipe_write_wanted)
1378 {
1379 int old_errno = errno; /* save errno because write will clobber it */
1380 char dummy;
1381
1382 pipe_write_skipped = 0;
1383
1308#if EV_USE_EVENTFD 1384#if EV_USE_EVENTFD
1309 if (evfd >= 0) 1385 if (evfd >= 0)
1310 { 1386 {
1311 uint64_t counter = 1; 1387 uint64_t counter = 1;
1312 write (evfd, &counter, sizeof (uint64_t)); 1388 write (evfd, &counter, sizeof (uint64_t));
1389 }
1390 else
1391#endif
1392 {
1393 /* win32 people keep sending patches that change this write() to send() */
1394 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1395 /* so when you think this write should be a send instead, please find out */
1396 /* where your send() is from - it's definitely not the microsoft send, and */
1397 /* tell me. thank you. */
1398 write (evpipe [1], &dummy, 1);
1399 }
1400
1401 errno = old_errno;
1313 } 1402 }
1314 else
1315#endif
1316 /* win32 people keep sending patches that change this write() to send() */
1317 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1318 /* so when you think this write should be a send instead, please find out */
1319 /* where your send() is from - it's definitely not the microsoft send, and */
1320 /* tell me. thank you. */
1321 write (evpipe [1], &dummy, 1);
1322
1323 errno = old_errno;
1324 } 1403 }
1325} 1404}
1326 1405
1327/* called whenever the libev signal pipe */ 1406/* called whenever the libev signal pipe */
1328/* got some events (signal, async) */ 1407/* got some events (signal, async) */
1329static void 1408static void
1330pipecb (EV_P_ ev_io *iow, int revents) 1409pipecb (EV_P_ ev_io *iow, int revents)
1331{ 1410{
1332 int i; 1411 int i;
1333 1412
1413 if (revents & EV_READ)
1414 {
1334#if EV_USE_EVENTFD 1415#if EV_USE_EVENTFD
1335 if (evfd >= 0) 1416 if (evfd >= 0)
1336 { 1417 {
1337 uint64_t counter; 1418 uint64_t counter;
1338 read (evfd, &counter, sizeof (uint64_t)); 1419 read (evfd, &counter, sizeof (uint64_t));
1339 } 1420 }
1340 else 1421 else
1341#endif 1422#endif
1342 { 1423 {
1343 char dummy; 1424 char dummy;
1344 /* see discussion in evpipe_write when you think this read should be recv in win32 */ 1425 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1345 read (evpipe [0], &dummy, 1); 1426 read (evpipe [0], &dummy, 1);
1427 }
1346 } 1428 }
1347 1429
1430 pipe_write_skipped = 0;
1431
1432#if EV_SIGNAL_ENABLE
1348 if (sig_pending) 1433 if (sig_pending)
1349 { 1434 {
1350 sig_pending = 0; 1435 sig_pending = 0;
1351 1436
1352 for (i = EV_NSIG - 1; i--; ) 1437 for (i = EV_NSIG - 1; i--; )
1353 if (expect_false (signals [i].pending)) 1438 if (expect_false (signals [i].pending))
1354 ev_feed_signal_event (EV_A_ i + 1); 1439 ev_feed_signal_event (EV_A_ i + 1);
1355 } 1440 }
1441#endif
1356 1442
1357#if EV_ASYNC_ENABLE 1443#if EV_ASYNC_ENABLE
1358 if (async_pending) 1444 if (async_pending)
1359 { 1445 {
1360 async_pending = 0; 1446 async_pending = 0;
… …
1378 EV_P = signals [signum - 1].loop; 1464 EV_P = signals [signum - 1].loop;
1379 1465
1380 if (!EV_A) 1466 if (!EV_A)
1381 return; 1467 return;
1382#endif 1468#endif
1469
1470 evpipe_init (EV_A);
1383 1471
1384 signals [signum - 1].pending = 1; 1472 signals [signum - 1].pending = 1;
1385 evpipe_write (EV_A_ &sig_pending); 1473 evpipe_write (EV_A_ &sig_pending);
1386} 1474}
1387 1475
… …
1685 if (!(flags & EVFLAG_NOENV) 1773 if (!(flags & EVFLAG_NOENV)
1686 && !enable_secure () 1774 && !enable_secure ()
1687 && getenv ("LIBEV_FLAGS")) 1775 && getenv ("LIBEV_FLAGS"))
1688 flags = atoi (getenv ("LIBEV_FLAGS")); 1776 flags = atoi (getenv ("LIBEV_FLAGS"));
1689 1777
1690 ev_rt_now = ev_time (); 1778 ev_rt_now = ev_time ();
1691 mn_now = get_clock (); 1779 mn_now = get_clock ();
1692 now_floor = mn_now; 1780 now_floor = mn_now;
1693 rtmn_diff = ev_rt_now - mn_now; 1781 rtmn_diff = ev_rt_now - mn_now;
1694#if EV_FEATURE_API 1782#if EV_FEATURE_API
1695 invoke_cb = ev_invoke_pending; 1783 invoke_cb = ev_invoke_pending;
1696#endif 1784#endif
1697 1785
1698 io_blocktime = 0.; 1786 io_blocktime = 0.;
1699 timeout_blocktime = 0.; 1787 timeout_blocktime = 0.;
1700 backend = 0; 1788 backend = 0;
1701 backend_fd = -1; 1789 backend_fd = -1;
1702 sig_pending = 0; 1790 sig_pending = 0;
1703#if EV_ASYNC_ENABLE 1791#if EV_ASYNC_ENABLE
1704 async_pending = 0; 1792 async_pending = 0;
1705#endif 1793#endif
1794 pipe_write_skipped = 0;
1795 pipe_write_wanted = 0;
1706#if EV_USE_INOTIFY 1796#if EV_USE_INOTIFY
1707 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1797 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1708#endif 1798#endif
1709#if EV_USE_SIGNALFD 1799#if EV_USE_SIGNALFD
1710 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 1800 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1711#endif 1801#endif
1712 1802
1713 if (!(flags & EVBACKEND_MASK)) 1803 if (!(flags & EVBACKEND_MASK))
1714 flags |= ev_recommended_backends (); 1804 flags |= ev_recommended_backends ();
1715 1805
… …
1880 infy_fork (EV_A); 1970 infy_fork (EV_A);
1881#endif 1971#endif
1882 1972
1883 if (ev_is_active (&pipe_w)) 1973 if (ev_is_active (&pipe_w))
1884 { 1974 {
1885 /* this "locks" the handlers against writing to the pipe */ 1975 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */
1886 /* while we modify the fd vars */
1887 sig_pending = 1;
1888#if EV_ASYNC_ENABLE
1889 async_pending = 1;
1890#endif
1891 1976
1892 ev_ref (EV_A); 1977 ev_ref (EV_A);
1893 ev_io_stop (EV_A_ &pipe_w); 1978 ev_io_stop (EV_A_ &pipe_w);
1894 1979
1895#if EV_USE_EVENTFD 1980#if EV_USE_EVENTFD
… …
2111 for (pri = NUMPRI; pri--; ) 2196 for (pri = NUMPRI; pri--; )
2112 while (pendingcnt [pri]) 2197 while (pendingcnt [pri])
2113 { 2198 {
2114 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2199 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
2115 2200
2116 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
2117 /* ^ this is no longer true, as pending_w could be here */
2118
2119 p->w->pending = 0; 2201 p->w->pending = 0;
2120 EV_CB_INVOKE (p->w, p->events); 2202 EV_CB_INVOKE (p->w, p->events);
2121 EV_FREQUENT_CHECK; 2203 EV_FREQUENT_CHECK;
2122 } 2204 }
2123} 2205}
… …
2184 feed_reverse_done (EV_A_ EV_TIMER); 2266 feed_reverse_done (EV_A_ EV_TIMER);
2185 } 2267 }
2186} 2268}
2187 2269
2188#if EV_PERIODIC_ENABLE 2270#if EV_PERIODIC_ENABLE
2271
2272static void noinline
2273periodic_recalc (EV_P_ ev_periodic *w)
2274{
2275 ev_tstamp interval = w->interval > MIN_INTERVAL ? w->interval : MIN_INTERVAL;
2276 ev_tstamp at = w->offset + interval * ev_floor ((ev_rt_now - w->offset) / interval);
2277
2278 /* the above almost always errs on the low side */
2279 while (at <= ev_rt_now)
2280 {
2281 ev_tstamp nat = at + w->interval;
2282
2283 /* when resolution fails us, we use ev_rt_now */
2284 if (expect_false (nat == at))
2285 {
2286 at = ev_rt_now;
2287 break;
2288 }
2289
2290 at = nat;
2291 }
2292
2293 ev_at (w) = at;
2294}
2295
2189/* make periodics pending */ 2296/* make periodics pending */
2190inline_size void 2297inline_size void
2191periodics_reify (EV_P) 2298periodics_reify (EV_P)
2192{ 2299{
2193 EV_FREQUENT_CHECK; 2300 EV_FREQUENT_CHECK;
… …
2212 ANHE_at_cache (periodics [HEAP0]); 2319 ANHE_at_cache (periodics [HEAP0]);
2213 downheap (periodics, periodiccnt, HEAP0); 2320 downheap (periodics, periodiccnt, HEAP0);
2214 } 2321 }
2215 else if (w->interval) 2322 else if (w->interval)
2216 { 2323 {
2217 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2324 periodic_recalc (EV_A_ w);
2218 /* if next trigger time is not sufficiently in the future, put it there */
2219 /* this might happen because of floating point inexactness */
2220 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2221 {
2222 ev_at (w) += w->interval;
2223
2224 /* if interval is unreasonably low we might still have a time in the past */
2225 /* so correct this. this will make the periodic very inexact, but the user */
2226 /* has effectively asked to get triggered more often than possible */
2227 if (ev_at (w) < ev_rt_now)
2228 ev_at (w) = ev_rt_now;
2229 }
2230
2231 ANHE_at_cache (periodics [HEAP0]); 2325 ANHE_at_cache (periodics [HEAP0]);
2232 downheap (periodics, periodiccnt, HEAP0); 2326 downheap (periodics, periodiccnt, HEAP0);
2233 } 2327 }
2234 else 2328 else
2235 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 2329 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
… …
2256 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]); 2350 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
2257 2351
2258 if (w->reschedule_cb) 2352 if (w->reschedule_cb)
2259 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2353 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2260 else if (w->interval) 2354 else if (w->interval)
2261 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2355 periodic_recalc (EV_A_ w);
2262 2356
2263 ANHE_at_cache (periodics [i]); 2357 ANHE_at_cache (periodics [i]);
2264 } 2358 }
2265 2359
2266 reheap (periodics, periodiccnt); 2360 reheap (periodics, periodiccnt);
… …
2313 * doesn't hurt either as we only do this on time-jumps or 2407 * doesn't hurt either as we only do this on time-jumps or
2314 * in the unlikely event of having been preempted here. 2408 * in the unlikely event of having been preempted here.
2315 */ 2409 */
2316 for (i = 4; --i; ) 2410 for (i = 4; --i; )
2317 { 2411 {
2412 ev_tstamp diff;
2318 rtmn_diff = ev_rt_now - mn_now; 2413 rtmn_diff = ev_rt_now - mn_now;
2319 2414
2415 diff = odiff - rtmn_diff;
2416
2320 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)) 2417 if (expect_true ((diff < 0. ? -diff : diff) < MIN_TIMEJUMP))
2321 return; /* all is well */ 2418 return; /* all is well */
2322 2419
2323 ev_rt_now = ev_time (); 2420 ev_rt_now = ev_time ();
2324 mn_now = get_clock (); 2421 mn_now = get_clock ();
2325 now_floor = mn_now; 2422 now_floor = mn_now;
… …
2415 ev_tstamp prev_mn_now = mn_now; 2512 ev_tstamp prev_mn_now = mn_now;
2416 2513
2417 /* update time to cancel out callback processing overhead */ 2514 /* update time to cancel out callback processing overhead */
2418 time_update (EV_A_ 1e100); 2515 time_update (EV_A_ 1e100);
2419 2516
2517 /* from now on, we want a pipe-wake-up */
2518 pipe_write_wanted = 1;
2519
2420 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt))) 2520 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt || pipe_write_skipped)))
2421 { 2521 {
2422 waittime = MAX_BLOCKTIME; 2522 waittime = MAX_BLOCKTIME;
2423 2523
2424 if (timercnt) 2524 if (timercnt)
2425 { 2525 {
2426 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2526 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now;
2427 if (waittime > to) waittime = to; 2527 if (waittime > to) waittime = to;
2428 } 2528 }
2429 2529
2430#if EV_PERIODIC_ENABLE 2530#if EV_PERIODIC_ENABLE
2431 if (periodiccnt) 2531 if (periodiccnt)
2432 { 2532 {
2433 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2533 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now;
2434 if (waittime > to) waittime = to; 2534 if (waittime > to) waittime = to;
2435 } 2535 }
2436#endif 2536#endif
2437 2537
2438 /* don't let timeouts decrease the waittime below timeout_blocktime */ 2538 /* don't let timeouts decrease the waittime below timeout_blocktime */
2439 if (expect_false (waittime < timeout_blocktime)) 2539 if (expect_false (waittime < timeout_blocktime))
2440 waittime = timeout_blocktime; 2540 waittime = timeout_blocktime;
2541
2542 /* at this point, we NEED to wait, so we have to ensure */
2543 /* to pass a minimum nonzero value to the backend */
2544 if (expect_false (waittime < backend_mintime))
2545 waittime = backend_mintime;
2441 2546
2442 /* extra check because io_blocktime is commonly 0 */ 2547 /* extra check because io_blocktime is commonly 0 */
2443 if (expect_false (io_blocktime)) 2548 if (expect_false (io_blocktime))
2444 { 2549 {
2445 sleeptime = io_blocktime - (mn_now - prev_mn_now); 2550 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2446 2551
2447 if (sleeptime > waittime - backend_fudge) 2552 if (sleeptime > waittime - backend_mintime)
2448 sleeptime = waittime - backend_fudge; 2553 sleeptime = waittime - backend_mintime;
2449 2554
2450 if (expect_true (sleeptime > 0.)) 2555 if (expect_true (sleeptime > 0.))
2451 { 2556 {
2452 ev_sleep (sleeptime); 2557 ev_sleep (sleeptime);
2453 waittime -= sleeptime; 2558 waittime -= sleeptime;
… …
2459 ++loop_count; 2564 ++loop_count;
2460#endif 2565#endif
2461 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */ 2566 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2462 backend_poll (EV_A_ waittime); 2567 backend_poll (EV_A_ waittime);
2463 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */ 2568 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2569
2570 pipe_write_wanted = 0;
2571
2572 if (pipe_write_skipped)
2573 {
2574 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w)));
2575 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
2576 }
2577
2464 2578
2465 /* update ev_rt_now, do magic */ 2579 /* update ev_rt_now, do magic */
2466 time_update (EV_A_ waittime + sleeptime); 2580 time_update (EV_A_ waittime + sleeptime);
2467 } 2581 }
2468 2582
… …
2758 if (w->reschedule_cb) 2872 if (w->reschedule_cb)
2759 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2873 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2760 else if (w->interval) 2874 else if (w->interval)
2761 { 2875 {
2762 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.)); 2876 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2763 /* this formula differs from the one in periodic_reify because we do not always round up */ 2877 periodic_recalc (EV_A_ w);
2764 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2765 } 2878 }
2766 else 2879 else
2767 ev_at (w) = w->offset; 2880 ev_at (w) = w->offset;
2768 2881
2769 EV_FREQUENT_CHECK; 2882 EV_FREQUENT_CHECK;
… …
3046 if (!pend || pend == path) 3159 if (!pend || pend == path)
3047 break; 3160 break;
3048 3161
3049 *pend = 0; 3162 *pend = 0;
3050 w->wd = inotify_add_watch (fs_fd, path, mask); 3163 w->wd = inotify_add_watch (fs_fd, path, mask);
3051 } 3164 }
3052 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3165 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
3053 } 3166 }
3054 } 3167 }
3055 3168
3056 if (w->wd >= 0) 3169 if (w->wd >= 0)

Diff Legend

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