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

Comparing libev/ev.c (file contents):
Revision 1.370 by root, Sun Jan 30 19:05:41 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
… …
443#else 452#else
444# define EV_FREQUENT_CHECK do { } while (0) 453# define EV_FREQUENT_CHECK do { } while (0)
445#endif 454#endif
446 455
447/* 456/*
448 * This is used to avoid floating point rounding problems. 457 * This is used to work around floating point rounding problems.
449 * It is added to ev_rt_now when scheduling periodics
450 * to ensure progress, time-wise, even when rounding
451 * errors are against us.
452 * This value is good at least till the year 4000. 458 * This value is good at least till the year 4000.
453 * Better solutions welcome.
454 */ 459 */
455#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 */
456 462
457#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) */
458#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) */
459 465
460#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)
… …
519# define EV_WIN32_CLOSE_FD(fd) close (fd) 525# define EV_WIN32_CLOSE_FD(fd) close (fd)
520#endif 526#endif
521 527
522#ifdef _WIN32 528#ifdef _WIN32
523# 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
524#endif 578#endif
525 579
526/*****************************************************************************/ 580/*****************************************************************************/
527 581
528#ifdef __linux 582#ifdef __linux
… …
816 select (0, 0, 0, 0, &tv); 870 select (0, 0, 0, 0, &tv);
817#endif 871#endif
818 } 872 }
819} 873}
820 874
821inline_speed int
822ev_timeout_to_ms (ev_tstamp timeout)
823{
824 int ms = timeout * 1000. + .999999;
825
826 return expect_true (ms) ? ms : timeout < 1e-6 ? 0 : 1;
827}
828
829/*****************************************************************************/ 875/*****************************************************************************/
830 876
831#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 877#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
832 878
833/* find a suitable new size for the given array, */ 879/* find a suitable new size for the given array, */
… …
974inline_size void 1020inline_size void
975fd_reify (EV_P) 1021fd_reify (EV_P)
976{ 1022{
977 int i; 1023 int i;
978 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
979 for (i = 0; i < fdchangecnt; ++i) 1050 for (i = 0; i < fdchangecnt; ++i)
980 { 1051 {
981 int fd = fdchanges [i]; 1052 int fd = fdchanges [i];
982 ANFD *anfd = anfds + fd; 1053 ANFD *anfd = anfds + fd;
983 ev_io *w; 1054 ev_io *w;
984 1055
985 unsigned char o_events = anfd->events; 1056 unsigned char o_events = anfd->events;
986 unsigned char o_reify = anfd->reify; 1057 unsigned char o_reify = anfd->reify;
987 1058
988 anfd->reify = 0; 1059 anfd->reify = 0;
989
990#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
991 if (o_reify & EV__IOFDSET)
992 {
993 unsigned long arg;
994 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
995 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
996 printf ("oi %d %x\n", fd, anfd->handle);//D
997 }
998#endif
999 1060
1000 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */ 1061 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
1001 { 1062 {
1002 anfd->events = 0; 1063 anfd->events = 0;
1003 1064
… …
1307inline_size void 1368inline_size void
1308evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1369evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1309{ 1370{
1310 if (!*flag) 1371 if (!*flag)
1311 { 1372 {
1312 int old_errno = errno; /* save errno because write might clobber it */
1313 char dummy;
1314
1315 *flag = 1; 1373 *flag = 1;
1316 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
1317#if EV_USE_EVENTFD 1384#if EV_USE_EVENTFD
1318 if (evfd >= 0) 1385 if (evfd >= 0)
1319 { 1386 {
1320 uint64_t counter = 1; 1387 uint64_t counter = 1;
1321 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;
1322 } 1402 }
1323 else
1324#endif
1325 /* win32 people keep sending patches that change this write() to send() */
1326 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1327 /* so when you think this write should be a send instead, please find out */
1328 /* where your send() is from - it's definitely not the microsoft send, and */
1329 /* tell me. thank you. */
1330 write (evpipe [1], &dummy, 1);
1331
1332 errno = old_errno;
1333 } 1403 }
1334} 1404}
1335 1405
1336/* called whenever the libev signal pipe */ 1406/* called whenever the libev signal pipe */
1337/* got some events (signal, async) */ 1407/* got some events (signal, async) */
1338static void 1408static void
1339pipecb (EV_P_ ev_io *iow, int revents) 1409pipecb (EV_P_ ev_io *iow, int revents)
1340{ 1410{
1341 int i; 1411 int i;
1342 1412
1413 if (revents & EV_READ)
1414 {
1343#if EV_USE_EVENTFD 1415#if EV_USE_EVENTFD
1344 if (evfd >= 0) 1416 if (evfd >= 0)
1345 { 1417 {
1346 uint64_t counter; 1418 uint64_t counter;
1347 read (evfd, &counter, sizeof (uint64_t)); 1419 read (evfd, &counter, sizeof (uint64_t));
1348 } 1420 }
1349 else 1421 else
1350#endif 1422#endif
1351 { 1423 {
1352 char dummy; 1424 char dummy;
1353 /* 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 */
1354 read (evpipe [0], &dummy, 1); 1426 read (evpipe [0], &dummy, 1);
1427 }
1355 } 1428 }
1429
1430 pipe_write_skipped = 0;
1356 1431
1357#if EV_SIGNAL_ENABLE 1432#if EV_SIGNAL_ENABLE
1358 if (sig_pending) 1433 if (sig_pending)
1359 { 1434 {
1360 sig_pending = 0; 1435 sig_pending = 0;
1361 1436
1362 for (i = EV_NSIG - 1; i--; ) 1437 for (i = EV_NSIG - 1; i--; )
1363 if (expect_false (signals [i].pending)) 1438 if (expect_false (signals [i].pending))
1364 ev_feed_signal_event (EV_A_ i + 1); 1439 ev_feed_signal_event (EV_A_ i + 1);
… …
1389 EV_P = signals [signum - 1].loop; 1464 EV_P = signals [signum - 1].loop;
1390 1465
1391 if (!EV_A) 1466 if (!EV_A)
1392 return; 1467 return;
1393#endif 1468#endif
1469
1470 evpipe_init (EV_A);
1394 1471
1395 signals [signum - 1].pending = 1; 1472 signals [signum - 1].pending = 1;
1396 evpipe_write (EV_A_ &sig_pending); 1473 evpipe_write (EV_A_ &sig_pending);
1397} 1474}
1398 1475
… …
1696 if (!(flags & EVFLAG_NOENV) 1773 if (!(flags & EVFLAG_NOENV)
1697 && !enable_secure () 1774 && !enable_secure ()
1698 && getenv ("LIBEV_FLAGS")) 1775 && getenv ("LIBEV_FLAGS"))
1699 flags = atoi (getenv ("LIBEV_FLAGS")); 1776 flags = atoi (getenv ("LIBEV_FLAGS"));
1700 1777
1701 ev_rt_now = ev_time (); 1778 ev_rt_now = ev_time ();
1702 mn_now = get_clock (); 1779 mn_now = get_clock ();
1703 now_floor = mn_now; 1780 now_floor = mn_now;
1704 rtmn_diff = ev_rt_now - mn_now; 1781 rtmn_diff = ev_rt_now - mn_now;
1705#if EV_FEATURE_API 1782#if EV_FEATURE_API
1706 invoke_cb = ev_invoke_pending; 1783 invoke_cb = ev_invoke_pending;
1707#endif 1784#endif
1708 1785
1709 io_blocktime = 0.; 1786 io_blocktime = 0.;
1710 timeout_blocktime = 0.; 1787 timeout_blocktime = 0.;
1711 backend = 0; 1788 backend = 0;
1712 backend_fd = -1; 1789 backend_fd = -1;
1713 sig_pending = 0; 1790 sig_pending = 0;
1714#if EV_ASYNC_ENABLE 1791#if EV_ASYNC_ENABLE
1715 async_pending = 0; 1792 async_pending = 0;
1716#endif 1793#endif
1794 pipe_write_skipped = 0;
1795 pipe_write_wanted = 0;
1717#if EV_USE_INOTIFY 1796#if EV_USE_INOTIFY
1718 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1797 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1719#endif 1798#endif
1720#if EV_USE_SIGNALFD 1799#if EV_USE_SIGNALFD
1721 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 1800 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1722#endif 1801#endif
1723 1802
1724 if (!(flags & EVBACKEND_MASK)) 1803 if (!(flags & EVBACKEND_MASK))
1725 flags |= ev_recommended_backends (); 1804 flags |= ev_recommended_backends ();
1726 1805
… …
1891 infy_fork (EV_A); 1970 infy_fork (EV_A);
1892#endif 1971#endif
1893 1972
1894 if (ev_is_active (&pipe_w)) 1973 if (ev_is_active (&pipe_w))
1895 { 1974 {
1896 /* this "locks" the handlers against writing to the pipe */ 1975 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */
1897 /* while we modify the fd vars */
1898 sig_pending = 1;
1899#if EV_ASYNC_ENABLE
1900 async_pending = 1;
1901#endif
1902 1976
1903 ev_ref (EV_A); 1977 ev_ref (EV_A);
1904 ev_io_stop (EV_A_ &pipe_w); 1978 ev_io_stop (EV_A_ &pipe_w);
1905 1979
1906#if EV_USE_EVENTFD 1980#if EV_USE_EVENTFD
… …
2193 } 2267 }
2194} 2268}
2195 2269
2196#if EV_PERIODIC_ENABLE 2270#if EV_PERIODIC_ENABLE
2197 2271
2198inline_speed 2272static void noinline
2199periodic_recalc (EV_P_ ev_periodic *w) 2273periodic_recalc (EV_P_ ev_periodic *w)
2200{ 2274{
2201 /* TODO: use slow but potentially more correct incremental algo, */ 2275 ev_tstamp interval = w->interval > MIN_INTERVAL ? w->interval : MIN_INTERVAL;
2202 /* also do not rely on ceil */ 2276 ev_tstamp at = w->offset + interval * ev_floor ((ev_rt_now - w->offset) / interval);
2203 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->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;
2204} 2294}
2205 2295
2206/* make periodics pending */ 2296/* make periodics pending */
2207inline_size void 2297inline_size void
2208periodics_reify (EV_P) 2298periodics_reify (EV_P)
… …
2230 downheap (periodics, periodiccnt, HEAP0); 2320 downheap (periodics, periodiccnt, HEAP0);
2231 } 2321 }
2232 else if (w->interval) 2322 else if (w->interval)
2233 { 2323 {
2234 periodic_recalc (EV_A_ w); 2324 periodic_recalc (EV_A_ w);
2235
2236 /* if next trigger time is not sufficiently in the future, put it there */
2237 /* this might happen because of floating point inexactness */
2238 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2239 {
2240 ev_at (w) += w->interval;
2241
2242 /* if interval is unreasonably low we might still have a time in the past */
2243 /* so correct this. this will make the periodic very inexact, but the user */
2244 /* has effectively asked to get triggered more often than possible */
2245 if (ev_at (w) < ev_rt_now)
2246 ev_at (w) = ev_rt_now;
2247 }
2248
2249 ANHE_at_cache (periodics [HEAP0]); 2325 ANHE_at_cache (periodics [HEAP0]);
2250 downheap (periodics, periodiccnt, HEAP0); 2326 downheap (periodics, periodiccnt, HEAP0);
2251 } 2327 }
2252 else 2328 else
2253 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 2329 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
… …
2331 * 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
2332 * in the unlikely event of having been preempted here. 2408 * in the unlikely event of having been preempted here.
2333 */ 2409 */
2334 for (i = 4; --i; ) 2410 for (i = 4; --i; )
2335 { 2411 {
2412 ev_tstamp diff;
2336 rtmn_diff = ev_rt_now - mn_now; 2413 rtmn_diff = ev_rt_now - mn_now;
2337 2414
2415 diff = odiff - rtmn_diff;
2416
2338 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)) 2417 if (expect_true ((diff < 0. ? -diff : diff) < MIN_TIMEJUMP))
2339 return; /* all is well */ 2418 return; /* all is well */
2340 2419
2341 ev_rt_now = ev_time (); 2420 ev_rt_now = ev_time ();
2342 mn_now = get_clock (); 2421 mn_now = get_clock ();
2343 now_floor = mn_now; 2422 now_floor = mn_now;
… …
2433 ev_tstamp prev_mn_now = mn_now; 2512 ev_tstamp prev_mn_now = mn_now;
2434 2513
2435 /* update time to cancel out callback processing overhead */ 2514 /* update time to cancel out callback processing overhead */
2436 time_update (EV_A_ 1e100); 2515 time_update (EV_A_ 1e100);
2437 2516
2517 /* from now on, we want a pipe-wake-up */
2518 pipe_write_wanted = 1;
2519
2438 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt))) 2520 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt || pipe_write_skipped)))
2439 { 2521 {
2440 waittime = MAX_BLOCKTIME; 2522 waittime = MAX_BLOCKTIME;
2441 2523
2442 if (timercnt) 2524 if (timercnt)
2443 { 2525 {
2444 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2526 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now;
2445 if (waittime > to) waittime = to; 2527 if (waittime > to) waittime = to;
2446 } 2528 }
2447 2529
2448#if EV_PERIODIC_ENABLE 2530#if EV_PERIODIC_ENABLE
2449 if (periodiccnt) 2531 if (periodiccnt)
2450 { 2532 {
2451 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2533 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now;
2452 if (waittime > to) waittime = to; 2534 if (waittime > to) waittime = to;
2453 } 2535 }
2454#endif 2536#endif
2455 2537
2456 /* don't let timeouts decrease the waittime below timeout_blocktime */ 2538 /* don't let timeouts decrease the waittime below timeout_blocktime */
2457 if (expect_false (waittime < timeout_blocktime)) 2539 if (expect_false (waittime < timeout_blocktime))
2458 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;
2459 2546
2460 /* extra check because io_blocktime is commonly 0 */ 2547 /* extra check because io_blocktime is commonly 0 */
2461 if (expect_false (io_blocktime)) 2548 if (expect_false (io_blocktime))
2462 { 2549 {
2463 sleeptime = io_blocktime - (mn_now - prev_mn_now); 2550 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2464 2551
2465 if (sleeptime > waittime - backend_fudge) 2552 if (sleeptime > waittime - backend_mintime)
2466 sleeptime = waittime - backend_fudge; 2553 sleeptime = waittime - backend_mintime;
2467 2554
2468 if (expect_true (sleeptime > 0.)) 2555 if (expect_true (sleeptime > 0.))
2469 { 2556 {
2470 ev_sleep (sleeptime); 2557 ev_sleep (sleeptime);
2471 waittime -= sleeptime; 2558 waittime -= sleeptime;
… …
2477 ++loop_count; 2564 ++loop_count;
2478#endif 2565#endif
2479 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */ 2566 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2480 backend_poll (EV_A_ waittime); 2567 backend_poll (EV_A_ waittime);
2481 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
2482 2578
2483 /* update ev_rt_now, do magic */ 2579 /* update ev_rt_now, do magic */
2484 time_update (EV_A_ waittime + sleeptime); 2580 time_update (EV_A_ waittime + sleeptime);
2485 } 2581 }
2486 2582
… …
3063 if (!pend || pend == path) 3159 if (!pend || pend == path)
3064 break; 3160 break;
3065 3161
3066 *pend = 0; 3162 *pend = 0;
3067 w->wd = inotify_add_watch (fs_fd, path, mask); 3163 w->wd = inotify_add_watch (fs_fd, path, mask);
3068 } 3164 }
3069 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3165 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
3070 } 3166 }
3071 } 3167 }
3072 3168
3073 if (w->wd >= 0) 3169 if (w->wd >= 0)

Diff Legend

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