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

Comparing libev/ev.c (file contents):
Revision 1.371 by root, Mon Feb 7 21:45:32 2011 UTC vs.
Revision 1.375 by root, Sat Jun 4 05:25:03 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, */
… …
980 for (i = 0; i < fdchangecnt; ++i) 1026 for (i = 0; i < fdchangecnt; ++i)
981 { 1027 {
982 int fd = fdchanges [i]; 1028 int fd = fdchanges [i];
983 ANFD *anfd = anfds + fd; 1029 ANFD *anfd = anfds + fd;
984 1030
985 if (anfd->reify & EV__IOFDSET) 1031 if (anfd->reify & EV__IOFDSET && anfd->head)
986 { 1032 {
987 SOCKET handle = EV_FD_TO_WIN32_HANDLE (fd); 1033 SOCKET handle = EV_FD_TO_WIN32_HANDLE (fd);
988 1034
989 if (handle != anfd->handle) 1035 if (handle != anfd->handle)
990 { 1036 {
… …
1369 read (evpipe [0], &dummy, 1); 1415 read (evpipe [0], &dummy, 1);
1370 } 1416 }
1371 1417
1372#if EV_SIGNAL_ENABLE 1418#if EV_SIGNAL_ENABLE
1373 if (sig_pending) 1419 if (sig_pending)
1374 { 1420 {
1375 sig_pending = 0; 1421 sig_pending = 0;
1376 1422
1377 for (i = EV_NSIG - 1; i--; ) 1423 for (i = EV_NSIG - 1; i--; )
1378 if (expect_false (signals [i].pending)) 1424 if (expect_false (signals [i].pending))
1379 ev_feed_signal_event (EV_A_ i + 1); 1425 ev_feed_signal_event (EV_A_ i + 1);
… …
2208 } 2254 }
2209} 2255}
2210 2256
2211#if EV_PERIODIC_ENABLE 2257#if EV_PERIODIC_ENABLE
2212 2258
2213inline_speed void 2259static void noinline
2214periodic_recalc (EV_P_ ev_periodic *w) 2260periodic_recalc (EV_P_ ev_periodic *w)
2215{ 2261{
2216 /* TODO: use slow but potentially more correct incremental algo, */ 2262 ev_tstamp interval = w->interval > MIN_INTERVAL ? w->interval : MIN_INTERVAL;
2217 /* also do not rely on ceil */ 2263 ev_tstamp at = w->offset + interval * ev_floor ((ev_rt_now - w->offset) / interval);
2218 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2264
2265 /* the above almost always errs on the low side */
2266 while (at <= ev_rt_now)
2267 {
2268 ev_tstamp nat = at + w->interval;
2269
2270 /* when resolution fails us, we use ev_rt_now */
2271 if (expect_false (nat == at))
2272 {
2273 at = ev_rt_now;
2274 break;
2275 }
2276
2277 at = nat;
2278 }
2279
2280 ev_at (w) = at;
2219} 2281}
2220 2282
2221/* make periodics pending */ 2283/* make periodics pending */
2222inline_size void 2284inline_size void
2223periodics_reify (EV_P) 2285periodics_reify (EV_P)
… …
2245 downheap (periodics, periodiccnt, HEAP0); 2307 downheap (periodics, periodiccnt, HEAP0);
2246 } 2308 }
2247 else if (w->interval) 2309 else if (w->interval)
2248 { 2310 {
2249 periodic_recalc (EV_A_ w); 2311 periodic_recalc (EV_A_ w);
2250
2251 /* if next trigger time is not sufficiently in the future, put it there */
2252 /* this might happen because of floating point inexactness */
2253 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2254 {
2255 ev_at (w) += w->interval;
2256
2257 /* if interval is unreasonably low we might still have a time in the past */
2258 /* so correct this. this will make the periodic very inexact, but the user */
2259 /* has effectively asked to get triggered more often than possible */
2260 if (ev_at (w) < ev_rt_now)
2261 ev_at (w) = ev_rt_now;
2262 }
2263
2264 ANHE_at_cache (periodics [HEAP0]); 2312 ANHE_at_cache (periodics [HEAP0]);
2265 downheap (periodics, periodiccnt, HEAP0); 2313 downheap (periodics, periodiccnt, HEAP0);
2266 } 2314 }
2267 else 2315 else
2268 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 2316 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
… …
2346 * doesn't hurt either as we only do this on time-jumps or 2394 * doesn't hurt either as we only do this on time-jumps or
2347 * in the unlikely event of having been preempted here. 2395 * in the unlikely event of having been preempted here.
2348 */ 2396 */
2349 for (i = 4; --i; ) 2397 for (i = 4; --i; )
2350 { 2398 {
2399 ev_tstamp diff;
2351 rtmn_diff = ev_rt_now - mn_now; 2400 rtmn_diff = ev_rt_now - mn_now;
2352 2401
2402 diff = odiff - rtmn_diff;
2403
2353 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)) 2404 if (expect_true ((diff < 0. ? -diff : diff) < MIN_TIMEJUMP))
2354 return; /* all is well */ 2405 return; /* all is well */
2355 2406
2356 ev_rt_now = ev_time (); 2407 ev_rt_now = ev_time ();
2357 mn_now = get_clock (); 2408 mn_now = get_clock ();
2358 now_floor = mn_now; 2409 now_floor = mn_now;
… …
3078 if (!pend || pend == path) 3129 if (!pend || pend == path)
3079 break; 3130 break;
3080 3131
3081 *pend = 0; 3132 *pend = 0;
3082 w->wd = inotify_add_watch (fs_fd, path, mask); 3133 w->wd = inotify_add_watch (fs_fd, path, mask);
3083 } 3134 }
3084 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3135 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
3085 } 3136 }
3086 } 3137 }
3087 3138
3088 if (w->wd >= 0) 3139 if (w->wd >= 0)

Diff Legend

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