diff options
author | Jeremie Koenig <jk@jk.fr.eu.org> | 2010-08-23 20:21:52 +0000 |
---|---|---|
committer | Jeremie Koenig <jk@jk.fr.eu.org> | 2010-08-30 14:31:32 +0200 |
commit | 7b027a34676880bded1a05a5c47bfa85a6e79092 (patch) | |
tree | 01636581353ad02bdb86634f2d927caace705a8e /rootdir.c | |
parent | 434f79cbfa00c7370724dc25091b5a42bdf8d9e1 (diff) |
Make sure the clock never runs backwards.
* process.c, rootdir.c: When converting timeval structures
into seconds or jiffies, make sure that floating point rounding errors
don't make the clock the result jump backwards on second boundaries.
Diffstat (limited to 'rootdir.c')
-rw-r--r-- | rootdir.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -140,8 +140,8 @@ rootdir_gc_uptime (void *hook, char **contents, ssize_t *contents_len) return err; timersub (&time, &boottime, &time); - up_secs = time.tv_sec + time.tv_usec / 1000000.; - idle_secs = idletime.tv_sec + idletime.tv_usec / 1000000.; + up_secs = (time.tv_sec * 1000000. + time.tv_usec) / 1000000.; + idle_secs = (idletime.tv_sec * 1000000. + idletime.tv_usec) / 1000000.; /* The second field is the total idle time. As far as I know we don't keep track of it. However, procps uses it to compute "USER_HZ", and @@ -178,8 +178,8 @@ rootdir_gc_stat (void *hook, char **contents, ssize_t *contents_len) return EIO; timersub (&time, &boottime, &time); - up_ticks = opt_clk_tck * (time.tv_sec + time.tv_usec / 1000000.); - idle_ticks = opt_clk_tck * (idletime.tv_sec + idletime.tv_usec / 1000000.); + up_ticks = opt_clk_tck * (time.tv_sec * 1000000. + time.tv_usec) / 1000000.; + idle_ticks = opt_clk_tck * (idletime.tv_sec * 1000000. + idletime.tv_usec) / 1000000.; *contents_len = asprintf (contents, "cpu %lu 0 0 %lu 0 0 0 0 0\n" |