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

Comparing libev/ev.c (file contents):
Revision 1.192 by root, Fri Dec 21 07:55:29 2007 UTC vs.
Revision 1.194 by root, Sat Dec 22 07:03:31 2007 UTC

… …
51# ifndef EV_USE_MONOTONIC 51# ifndef EV_USE_MONOTONIC
52# define EV_USE_MONOTONIC 0 52# define EV_USE_MONOTONIC 0
53# endif 53# endif
54# ifndef EV_USE_REALTIME 54# ifndef EV_USE_REALTIME
55# define EV_USE_REALTIME 0 55# define EV_USE_REALTIME 0
56# endif
57# endif
58
59# ifndef EV_USE_NANOSLEEP
60# if HAVE_NANOSLEEP
61# define EV_USE_NANOSLEEP 1
62# else
63# define EV_USE_NANOSLEEP 0
56# endif 64# endif
57# endif 65# endif
58 66
59# ifndef EV_USE_SELECT 67# ifndef EV_USE_SELECT
60# if HAVE_SELECT && HAVE_SYS_SELECT_H 68# if HAVE_SELECT && HAVE_SYS_SELECT_H
… …
146 154
147#ifndef EV_USE_REALTIME 155#ifndef EV_USE_REALTIME
148# define EV_USE_REALTIME 0 156# define EV_USE_REALTIME 0
149#endif 157#endif
150 158
159#ifndef EV_USE_NANOSLEEP
160# define EV_USE_NANOSLEEP 0
161#endif
162
151#ifndef EV_USE_SELECT 163#ifndef EV_USE_SELECT
152# define EV_USE_SELECT 1 164# define EV_USE_SELECT 1
153#endif 165#endif
154 166
155#ifndef EV_USE_POLL 167#ifndef EV_USE_POLL
… …
205#endif 217#endif
206 218
207#if !EV_STAT_ENABLE 219#if !EV_STAT_ENABLE
208# undef EV_USE_INOTIFY 220# undef EV_USE_INOTIFY
209# define EV_USE_INOTIFY 0 221# define EV_USE_INOTIFY 0
222#endif
223
224#if !EV_USE_NANOSLEEP
225# ifndef _WIN32
226# include <sys/select.h>
227# endif
210#endif 228#endif
211 229
212#if EV_USE_INOTIFY 230#if EV_USE_INOTIFY
213# include <sys/inotify.h> 231# include <sys/inotify.h>
214#endif 232#endif
… …
262 280
263typedef ev_watcher *W; 281typedef ev_watcher *W;
264typedef ev_watcher_list *WL; 282typedef ev_watcher_list *WL;
265typedef ev_watcher_time *WT; 283typedef ev_watcher_time *WT;
266 284
285/* sig_atomic_t is used to avoid per-thread variables or locking but still */
286/* giving it a reasonably high chance of working on typical architetcures */
267static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 287static sig_atomic_t have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
268 288
269#ifdef _WIN32 289#ifdef _WIN32
270# include "ev_win32.c" 290# include "ev_win32.c"
271#endif 291#endif
272 292
… …
408{ 428{
409 return ev_rt_now; 429 return ev_rt_now;
410} 430}
411#endif 431#endif
412 432
433void
434ev_sleep (ev_tstamp delay)
435{
436 if (delay > 0.)
437 {
438#if EV_USE_NANOSLEEP
439 struct timespec ts;
440
441 ts.tv_sec = (time_t)delay;
442 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
443
444 nanosleep (&ts, 0);
445#elif defined(_WIN32)
446 Sleep (delay * 1e3);
447#else
448 struct timeval tv;
449
450 tv.tv_sec = (time_t)delay;
451 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
452
453 select (0, 0, 0, 0, &tv);
454#endif
455 }
456}
457
458/*****************************************************************************/
459
413int inline_size 460int inline_size
414array_nextsize (int elem, int cur, int cnt) 461array_nextsize (int elem, int cur, int cnt)
415{ 462{
416 int ncur = cur + 1; 463 int ncur = cur + 1;
417 464
… …
942ev_loop_count (EV_P) 989ev_loop_count (EV_P)
943{ 990{
944 return loop_count; 991 return loop_count;
945} 992}
946 993
994void
995ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
996{
997 io_blocktime = interval;
998}
999
1000void
1001ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1002{
1003 timeout_blocktime = interval;
1004}
1005
947static void noinline 1006static void noinline
948loop_init (EV_P_ unsigned int flags) 1007loop_init (EV_P_ unsigned int flags)
949{ 1008{
950 if (!backend) 1009 if (!backend)
951 { 1010 {
… …
959 1018
960 ev_rt_now = ev_time (); 1019 ev_rt_now = ev_time ();
961 mn_now = get_clock (); 1020 mn_now = get_clock ();
962 now_floor = mn_now; 1021 now_floor = mn_now;
963 rtmn_diff = ev_rt_now - mn_now; 1022 rtmn_diff = ev_rt_now - mn_now;
1023
1024 io_blocktime = 0.;
1025 timeout_blocktime = 0.;
964 1026
965 /* pid check not overridable via env */ 1027 /* pid check not overridable via env */
966#ifndef _WIN32 1028#ifndef _WIN32
967 if (flags & EVFLAG_FORKCHECK) 1029 if (flags & EVFLAG_FORKCHECK)
968 curpid = getpid (); 1030 curpid = getpid ();
… …
1456 /* update fd-related kernel structures */ 1518 /* update fd-related kernel structures */
1457 fd_reify (EV_A); 1519 fd_reify (EV_A);
1458 1520
1459 /* calculate blocking time */ 1521 /* calculate blocking time */
1460 { 1522 {
1461 ev_tstamp block; 1523 ev_tstamp waittime = 0.;
1524 ev_tstamp sleeptime = 0.;
1462 1525
1463 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1526 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1464 block = 0.; /* do not block at all */
1465 else
1466 { 1527 {
1467 /* update time to cancel out callback processing overhead */ 1528 /* update time to cancel out callback processing overhead */
1468 time_update (EV_A_ 1e100); 1529 time_update (EV_A_ 1e100);
1469 1530
1470 block = MAX_BLOCKTIME; 1531 waittime = MAX_BLOCKTIME;
1471 1532
1472 if (timercnt) 1533 if (timercnt)
1473 { 1534 {
1474 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1535 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1475 if (block > to) block = to; 1536 if (waittime > to) waittime = to;
1476 } 1537 }
1477 1538
1478#if EV_PERIODIC_ENABLE 1539#if EV_PERIODIC_ENABLE
1479 if (periodiccnt) 1540 if (periodiccnt)
1480 { 1541 {
1481 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1542 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1482 if (block > to) block = to; 1543 if (waittime > to) waittime = to;
1483 } 1544 }
1484#endif 1545#endif
1485 1546
1486 if (expect_false (block < 0.)) block = 0.; 1547 if (expect_false (waittime < timeout_blocktime))
1548 waittime = timeout_blocktime;
1549
1550 sleeptime = waittime - backend_fudge;
1551
1552 if (expect_true (sleeptime > io_blocktime))
1553 sleeptime = io_blocktime;
1554
1555 if (sleeptime)
1556 {
1557 ev_sleep (sleeptime);
1558 waittime -= sleeptime;
1559 }
1487 } 1560 }
1488 1561
1489 ++loop_count; 1562 ++loop_count;
1490 backend_poll (EV_A_ block); 1563 backend_poll (EV_A_ waittime);
1491 1564
1492 /* update ev_rt_now, do magic */ 1565 /* update ev_rt_now, do magic */
1493 time_update (EV_A_ block); 1566 time_update (EV_A_ waittime + sleeptime);
1494 } 1567 }
1495 1568
1496 /* queue pending timers and reschedule them */ 1569 /* queue pending timers and reschedule them */
1497 timers_reify (EV_A); /* relative timers called last */ 1570 timers_reify (EV_A); /* relative timers called last */
1498#if EV_PERIODIC_ENABLE 1571#if EV_PERIODIC_ENABLE

Diff Legend

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