From 460236c781ec5e719537598be7ef2d858166c8e3 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Mon, 4 Jan 2010 12:00:51 +0100 Subject: [PATCH] src/system_resource.c: Convert kilbytes to bytes and MHz to Hz. --- src/system_resource.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/system_resource.c b/src/system_resource.c index da3d102..f3472b7 100644 --- a/src/system_resource.c +++ b/src/system_resource.c @@ -71,13 +71,15 @@ static int rt_reply_to_system_resource (const ros_reply_t *r, /* {{{ */ ret->cpu_model = ros_reply_param_val_by_key (r, "cpu"); ret->cpu_count = sstrtoui (ros_reply_param_val_by_key (r, "cpu-count")); ret->cpu_load = sstrtoui (ros_reply_param_val_by_key (r, "cpu-load")); - ret->cpu_frequency = sstrtoui64 (ros_reply_param_val_by_key (r, "cpu-frequency")); + ret->cpu_frequency = sstrtoui64 (ros_reply_param_val_by_key (r, "cpu-frequency")) * 1000000; - ret->free_memory = sstrtoui64 (ros_reply_param_val_by_key (r, "free-memory")); - ret->total_memory = sstrtoui64 (ros_reply_param_val_by_key (r, "total-memory")); + /* One "kilobyte" is 1024 bytes, according to "janisk", see + * */ + ret->free_memory = sstrtoui64 (ros_reply_param_val_by_key (r, "free-memory")) * 1024; + ret->total_memory = sstrtoui64 (ros_reply_param_val_by_key (r, "total-memory")) * 1024; - ret->free_hdd_space = sstrtoui64 (ros_reply_param_val_by_key (r, "free-hdd-space")); - ret->total_hdd_space = sstrtoui64 (ros_reply_param_val_by_key (r, "total-hdd-space")); + ret->free_hdd_space = sstrtoui64 (ros_reply_param_val_by_key (r, "free-hdd-space")) * 1024; + ret->total_hdd_space = sstrtoui64 (ros_reply_param_val_by_key (r, "total-hdd-space")) * 1024; ret->write_sect_since_reboot = sstrtoui64 (ros_reply_param_val_by_key (r, "write-sect-since-reboot")); ret->write_sect_total = sstrtoui64 (ros_reply_param_val_by_key (r, "write-sect-total")); -- 2.11.0