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

Comparing libev/ev.c (file contents):
Revision 1.365 by root, Sun Oct 31 22:01:20 2010 UTC vs.
Revision 1.370 by root, Sun Jan 30 19:05:41 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 *
… …
376# undef EV_USE_INOTIFY 376# undef EV_USE_INOTIFY
377# define EV_USE_INOTIFY 0 377# define EV_USE_INOTIFY 0
378#endif 378#endif
379 379
380#if !EV_USE_NANOSLEEP 380#if !EV_USE_NANOSLEEP
381# ifndef _WIN32 381/* hp-ux has it in sys/time.h, which we unconditionally include above */
382# if !defined(_WIN32) && !defined(__hpux)
382# include <sys/select.h> 383# include <sys/select.h>
383# endif 384# endif
384#endif 385#endif
385 386
386#if EV_USE_INOTIFY 387#if EV_USE_INOTIFY
… …
813 /* by older ones */ 814 /* by older ones */
814 EV_TV_SET (tv, delay); 815 EV_TV_SET (tv, delay);
815 select (0, 0, 0, 0, &tv); 816 select (0, 0, 0, 0, &tv);
816#endif 817#endif
817 } 818 }
819}
820
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;
818} 827}
819 828
820/*****************************************************************************/ 829/*****************************************************************************/
821 830
822#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 831#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
… …
1343 char dummy; 1352 char dummy;
1344 /* see discussion in evpipe_write when you think this read should be recv in win32 */ 1353 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1345 read (evpipe [0], &dummy, 1); 1354 read (evpipe [0], &dummy, 1);
1346 } 1355 }
1347 1356
1357#if EV_SIGNAL_ENABLE
1348 if (sig_pending) 1358 if (sig_pending)
1349 { 1359 {
1350 sig_pending = 0; 1360 sig_pending = 0;
1351 1361
1352 for (i = EV_NSIG - 1; i--; ) 1362 for (i = EV_NSIG - 1; i--; )
1353 if (expect_false (signals [i].pending)) 1363 if (expect_false (signals [i].pending))
1354 ev_feed_signal_event (EV_A_ i + 1); 1364 ev_feed_signal_event (EV_A_ i + 1);
1355 } 1365 }
1366#endif
1356 1367
1357#if EV_ASYNC_ENABLE 1368#if EV_ASYNC_ENABLE
1358 if (async_pending) 1369 if (async_pending)
1359 { 1370 {
1360 async_pending = 0; 1371 async_pending = 0;
… …
1369#endif 1380#endif
1370} 1381}
1371 1382
1372/*****************************************************************************/ 1383/*****************************************************************************/
1373 1384
1385void
1386ev_feed_signal (int signum)
1387{
1388#if EV_MULTIPLICITY
1389 EV_P = signals [signum - 1].loop;
1390
1391 if (!EV_A)
1392 return;
1393#endif
1394
1395 signals [signum - 1].pending = 1;
1396 evpipe_write (EV_A_ &sig_pending);
1397}
1398
1374static void 1399static void
1375ev_sighandler (int signum) 1400ev_sighandler (int signum)
1376{ 1401{
1377#if EV_MULTIPLICITY
1378 EV_P = signals [signum - 1].loop;
1379#endif
1380
1381#ifdef _WIN32 1402#ifdef _WIN32
1382 signal (signum, ev_sighandler); 1403 signal (signum, ev_sighandler);
1383#endif 1404#endif
1384 1405
1385 signals [signum - 1].pending = 1; 1406 ev_feed_signal (signum);
1386 evpipe_write (EV_A_ &sig_pending);
1387} 1407}
1388 1408
1389void noinline 1409void noinline
1390ev_feed_signal_event (EV_P_ int signum) 1410ev_feed_signal_event (EV_P_ int signum)
1391{ 1411{
… …
1643static void noinline 1663static void noinline
1644loop_init (EV_P_ unsigned int flags) 1664loop_init (EV_P_ unsigned int flags)
1645{ 1665{
1646 if (!backend) 1666 if (!backend)
1647 { 1667 {
1668 origflags = flags;
1669
1648#if EV_USE_REALTIME 1670#if EV_USE_REALTIME
1649 if (!have_realtime) 1671 if (!have_realtime)
1650 { 1672 {
1651 struct timespec ts; 1673 struct timespec ts;
1652 1674
… …
1697#endif 1719#endif
1698#if EV_USE_SIGNALFD 1720#if EV_USE_SIGNALFD
1699 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 1721 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1700#endif 1722#endif
1701 1723
1702 if (!(flags & 0x0000ffffU)) 1724 if (!(flags & EVBACKEND_MASK))
1703 flags |= ev_recommended_backends (); 1725 flags |= ev_recommended_backends ();
1704 1726
1705#if EV_USE_IOCP 1727#if EV_USE_IOCP
1706 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags); 1728 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1707#endif 1729#endif
… …
2100 for (pri = NUMPRI; pri--; ) 2122 for (pri = NUMPRI; pri--; )
2101 while (pendingcnt [pri]) 2123 while (pendingcnt [pri])
2102 { 2124 {
2103 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2125 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
2104 2126
2105 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
2106 /* ^ this is no longer true, as pending_w could be here */
2107
2108 p->w->pending = 0; 2127 p->w->pending = 0;
2109 EV_CB_INVOKE (p->w, p->events); 2128 EV_CB_INVOKE (p->w, p->events);
2110 EV_FREQUENT_CHECK; 2129 EV_FREQUENT_CHECK;
2111 } 2130 }
2112} 2131}
… …
2173 feed_reverse_done (EV_A_ EV_TIMER); 2192 feed_reverse_done (EV_A_ EV_TIMER);
2174 } 2193 }
2175} 2194}
2176 2195
2177#if EV_PERIODIC_ENABLE 2196#if EV_PERIODIC_ENABLE
2197
2198inline_speed
2199periodic_recalc (EV_P_ ev_periodic *w)
2200{
2201 /* TODO: use slow but potentially more correct incremental algo, */
2202 /* also do not rely on ceil */
2203 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2204}
2205
2178/* make periodics pending */ 2206/* make periodics pending */
2179inline_size void 2207inline_size void
2180periodics_reify (EV_P) 2208periodics_reify (EV_P)
2181{ 2209{
2182 EV_FREQUENT_CHECK; 2210 EV_FREQUENT_CHECK;
… …
2201 ANHE_at_cache (periodics [HEAP0]); 2229 ANHE_at_cache (periodics [HEAP0]);
2202 downheap (periodics, periodiccnt, HEAP0); 2230 downheap (periodics, periodiccnt, HEAP0);
2203 } 2231 }
2204 else if (w->interval) 2232 else if (w->interval)
2205 { 2233 {
2206 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2234 periodic_recalc (EV_A_ w);
2235
2207 /* if next trigger time is not sufficiently in the future, put it there */ 2236 /* if next trigger time is not sufficiently in the future, put it there */
2208 /* this might happen because of floating point inexactness */ 2237 /* this might happen because of floating point inexactness */
2209 if (ev_at (w) - ev_rt_now < TIME_EPSILON) 2238 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2210 { 2239 {
2211 ev_at (w) += w->interval; 2240 ev_at (w) += w->interval;
… …
2245 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]); 2274 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
2246 2275
2247 if (w->reschedule_cb) 2276 if (w->reschedule_cb)
2248 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2277 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2249 else if (w->interval) 2278 else if (w->interval)
2250 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2279 periodic_recalc (EV_A_ w);
2251 2280
2252 ANHE_at_cache (periodics [i]); 2281 ANHE_at_cache (periodics [i]);
2253 } 2282 }
2254 2283
2255 reheap (periodics, periodiccnt); 2284 reheap (periodics, periodiccnt);
… …
2747 if (w->reschedule_cb) 2776 if (w->reschedule_cb)
2748 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2777 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2749 else if (w->interval) 2778 else if (w->interval)
2750 { 2779 {
2751 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.)); 2780 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2752 /* this formula differs from the one in periodic_reify because we do not always round up */ 2781 periodic_recalc (EV_A_ w);
2753 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2754 } 2782 }
2755 else 2783 else
2756 ev_at (w) = w->offset; 2784 ev_at (w) = w->offset;
2757 2785
2758 EV_FREQUENT_CHECK; 2786 EV_FREQUENT_CHECK;
… …
2879 sa.sa_handler = ev_sighandler; 2907 sa.sa_handler = ev_sighandler;
2880 sigfillset (&sa.sa_mask); 2908 sigfillset (&sa.sa_mask);
2881 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2909 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2882 sigaction (w->signum, &sa, 0); 2910 sigaction (w->signum, &sa, 0);
2883 2911
2912 if (origflags & EVFLAG_NOSIGMASK)
2913 {
2884 sigemptyset (&sa.sa_mask); 2914 sigemptyset (&sa.sa_mask);
2885 sigaddset (&sa.sa_mask, w->signum); 2915 sigaddset (&sa.sa_mask, w->signum);
2886 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0); 2916 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2917 }
2887#endif 2918#endif
2888 } 2919 }
2889 2920
2890 EV_FREQUENT_CHECK; 2921 EV_FREQUENT_CHECK;
2891} 2922}

Diff Legend

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