d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bugs in the elapsed time calculation in ctlstat_standard()

Browse Source 
pointed out by bde:

- Casting to long double isn't needed.
- The division isn't needed, multiplication can be used.
  "When 1 nanosecond is in a floating point literal, the whole
  expression is automatically promoted correctly."
- non-KNF indentation (1 tab) for the newly split line
- different non-KNF indentation (5 spaces) for the previously split
  line
- exessive parentheses around the division operation
- bogus blank line which splits up the etime initialization
- general verboseness from the above.

Submitted by:	bde
MFC after:	3 days
This commit is contained in:
ken 2013-04-11 21:18:04 +00:00
parent fb2d6a2d06
commit 8737a976bf
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.bin/ctlstat/ctlstat.c
View File

@ -404,7 +404,7 @@ ctlstat_json(struct ctlstat_context *ctx) {
static void
ctlstat_standard(struct ctlstat_context *ctx) {
long double cur_secs, prev_secs, etime;
long double etime;
uint64_t delta_jiffies, delta_idle;
uint32_t port;
long double cpu_percentage;
@ -416,12 +416,8 @@ ctlstat_standard(struct ctlstat_context *ctx) {
if (F_CPU(ctx) && (getcpu(&ctx->cur_cpu) != 0))
errx(1, "error returned from getcpu()");
cur_secs = ctx->cur_time.tv_sec +
((long double)ctx->cur_time.tv_nsec / 1000000000);
prev_secs = ctx->prev_time.tv_sec +
((long double)ctx->prev_time.tv_nsec / 1000000000);
etime = cur_secs - prev_secs;
etime = ctx->cur_time.tv_sec - ctx->prev_time.tv_sec +
(ctx->prev_time.tv_nsec - ctx->cur_time.tv_nsec) * 1e-9;
if (F_CPU(ctx)) {
ctx->prev_total_jiffies = ctx->cur_total_jiffies;