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

Comparing libev/ev.c (file contents):
Revision 1.290 by root, Mon Jun 29 04:41:34 2009 UTC vs.
Revision 1.293 by root, Mon Jun 29 18:46:52 2009 UTC

… …
284 284
285#ifndef EV_HEAP_CACHE_AT 285#ifndef EV_HEAP_CACHE_AT
286# define EV_HEAP_CACHE_AT !EV_MINIMAL 286# define EV_HEAP_CACHE_AT !EV_MINIMAL
287#endif 287#endif
288 288
289/* this block fixes any misconfiguration where we know we run into trouble otherwise */
290
291#ifndef CLOCK_MONOTONIC
292# undef EV_USE_MONOTONIC
293# define EV_USE_MONOTONIC 0
294#endif
295
296#ifndef CLOCK_REALTIME
297# undef EV_USE_REALTIME
298# define EV_USE_REALTIME 0
299#endif
300
301#if !EV_STAT_ENABLE
302# undef EV_USE_INOTIFY
303# define EV_USE_INOTIFY 0
304#endif
305
306#if !EV_USE_NANOSLEEP
307# ifndef _WIN32
308# include <sys/select.h>
309# endif
310#endif
311
312#if EV_USE_INOTIFY
313# include <sys/utsname.h>
314# include <sys/statfs.h>
315# include <sys/inotify.h>
316/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
317# ifndef IN_DONT_FOLLOW
318# undef EV_USE_INOTIFY
319# define EV_USE_INOTIFY 0
320# endif
321#endif
322
323#if EV_SELECT_IS_WINSOCKET
324# include <winsock.h>
325#endif
326
327/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 289/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
328/* which makes programs even slower. might work on other unices, too. */ 290/* which makes programs even slower. might work on other unices, too. */
329#if EV_USE_CLOCK_SYSCALL 291#if EV_USE_CLOCK_SYSCALL
330# include <syscall.h> 292# include <syscall.h>
331# ifdef SYS_clock_gettime 293# ifdef SYS_clock_gettime
… …
336# undef EV_USE_CLOCK_SYSCALL 298# undef EV_USE_CLOCK_SYSCALL
337# define EV_USE_CLOCK_SYSCALL 0 299# define EV_USE_CLOCK_SYSCALL 0
338# endif 300# endif
339#endif 301#endif
340 302
303/* this block fixes any misconfiguration where we know we run into trouble otherwise */
304
305#ifndef CLOCK_MONOTONIC
306# undef EV_USE_MONOTONIC
307# define EV_USE_MONOTONIC 0
308#endif
309
310#ifndef CLOCK_REALTIME
311# undef EV_USE_REALTIME
312# define EV_USE_REALTIME 0
313#endif
314
315#if !EV_STAT_ENABLE
316# undef EV_USE_INOTIFY
317# define EV_USE_INOTIFY 0
318#endif
319
320#if !EV_USE_NANOSLEEP
321# ifndef _WIN32
322# include <sys/select.h>
323# endif
324#endif
325
326#if EV_USE_INOTIFY
327# include <sys/utsname.h>
328# include <sys/statfs.h>
329# include <sys/inotify.h>
330/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
331# ifndef IN_DONT_FOLLOW
332# undef EV_USE_INOTIFY
333# define EV_USE_INOTIFY 0
334# endif
335#endif
336
337#if EV_SELECT_IS_WINSOCKET
338# include <winsock.h>
339#endif
340
341#if EV_USE_EVENTFD 341#if EV_USE_EVENTFD
342/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 342/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
343# include <stdint.h> 343# include <stdint.h>
344# ifdef __cplusplus 344# ifdef __cplusplus
345extern "C" { 345extern "C" {
… …
564 564
565#endif 565#endif
566 566
567/*****************************************************************************/ 567/*****************************************************************************/
568 568
569#ifndef EV_HAVE_EV_TIME
569ev_tstamp 570ev_tstamp
570ev_time (void) 571ev_time (void)
571{ 572{
572#if EV_USE_REALTIME 573#if EV_USE_REALTIME
573 if (expect_true (have_realtime)) 574 if (expect_true (have_realtime))
… …
580 581
581 struct timeval tv; 582 struct timeval tv;
582 gettimeofday (&tv, 0); 583 gettimeofday (&tv, 0);
583 return tv.tv_sec + tv.tv_usec * 1e-6; 584 return tv.tv_sec + tv.tv_usec * 1e-6;
584} 585}
586#endif
585 587
586inline_size ev_tstamp 588inline_size ev_tstamp
587get_clock (void) 589get_clock (void)
588{ 590{
589#if EV_USE_MONOTONIC 591#if EV_USE_MONOTONIC
… …
625 627
626 tv.tv_sec = (time_t)delay; 628 tv.tv_sec = (time_t)delay;
627 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 629 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
628 630
629 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 631 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
630 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 632 /* somehting not guaranteed by newer posix versions, but guaranteed */
631 /* by older ones */ 633 /* by older ones */
632 select (0, 0, 0, 0, &tv); 634 select (0, 0, 0, 0, &tv);
633#endif 635#endif
634 } 636 }
635} 637}
… …
2073 ev_tstamp waittime = 0.; 2075 ev_tstamp waittime = 0.;
2074 ev_tstamp sleeptime = 0.; 2076 ev_tstamp sleeptime = 0.;
2075 2077
2076 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2078 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2077 { 2079 {
2080 /* remember old timestamp for io_blocktime calculation */
2081 ev_tstamp prev_mn_now = mn_now;
2082
2078 /* update time to cancel out callback processing overhead */ 2083 /* update time to cancel out callback processing overhead */
2079 time_update (EV_A_ 1e100); 2084 time_update (EV_A_ 1e100);
2080 2085
2081 waittime = MAX_BLOCKTIME; 2086 waittime = MAX_BLOCKTIME;
2082 2087
… …
2092 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2097 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2093 if (waittime > to) waittime = to; 2098 if (waittime > to) waittime = to;
2094 } 2099 }
2095#endif 2100#endif
2096 2101
2102 /* don't let timeouts decrease the waittime below timeout_blocktime */
2097 if (expect_false (waittime < timeout_blocktime)) 2103 if (expect_false (waittime < timeout_blocktime))
2098 waittime = timeout_blocktime; 2104 waittime = timeout_blocktime;
2099 2105
2100 sleeptime = waittime - backend_fudge; 2106 /* extra check because io_blocktime is commonly 0 */
2101
2102 if (expect_true (sleeptime > io_blocktime)) 2107 if (expect_false (io_blocktime))
2103 sleeptime = io_blocktime;
2104
2105 if (sleeptime)
2106 { 2108 {
2109 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2110
2111 if (sleeptime > waittime - backend_fudge)
2112 sleeptime = waittime - backend_fudge;
2113
2114 if (expect_true (sleeptime > 0.))
2115 {
2107 ev_sleep (sleeptime); 2116 ev_sleep (sleeptime);
2108 waittime -= sleeptime; 2117 waittime -= sleeptime;
2118 }
2109 } 2119 }
2110 } 2120 }
2111 2121
2112 ++loop_count; 2122 ++loop_count;
2113 backend_poll (EV_A_ waittime); 2123 backend_poll (EV_A_ waittime);

Diff Legend

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