From 4da02d16337fc8ff37bfbc0a19b36be544df50d0 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@schedmd.com>
Date: Wed, 28 Dec 2011 13:34:56 -0800
Subject: [PATCH] SVIEW - fix convert number of cpus per node instead of raw
number
---
src/sview/node_info.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/sview/node_info.c b/src/sview/node_info.c
index 068db49362a..814112226a7 100644
--- a/src/sview/node_info.c
+++ b/src/sview/node_info.c
@@ -94,8 +94,8 @@ static display_data_t display_data_node[] = {
create_model_node, admin_edit_node},
{G_TYPE_INT, SORTID_STATE_NUM, NULL, FALSE, EDIT_NONE, refresh_node,
create_model_node, admin_edit_node},
- {G_TYPE_INT, SORTID_CPUS, "CPU Count", FALSE, EDIT_NONE, refresh_node,
- create_model_node, admin_edit_node},
+ {G_TYPE_STRING, SORTID_CPUS, "CPU Count", FALSE,
+ EDIT_NONE, refresh_node, create_model_node, admin_edit_node},
{G_TYPE_STRING, SORTID_USED_CPUS, "Used CPU Count", FALSE,
EDIT_NONE, refresh_node, create_model_node, admin_edit_node},
{G_TYPE_STRING, SORTID_ERR_CPUS, "Error CPU Count", FALSE,
@@ -314,9 +314,13 @@ static void _update_node_record(sview_node_info_t *sview_node_info_ptr,
{
uint16_t alloc_cpus = 0, err_cpus = 0, idle_cpus;
node_info_t *node_ptr = sview_node_info_ptr->node_ptr;
- char tmp_disk[20], tmp_err_cpus[20], tmp_mem[20], tmp_used_cpus[20];
+ char tmp_disk[20], tmp_cpus[20], tmp_err_cpus[20],
+ tmp_mem[20], tmp_used_cpus[20];
char *tmp_state_lower, *tmp_state_upper;
+ convert_num_unit((float)node_ptr->cpus, tmp_cpus,
+ sizeof(tmp_cpus), UNIT_NONE);
+
select_g_select_nodeinfo_get(node_ptr->select_nodeinfo,
SELECT_NODEDATA_SUBCNT,
NODE_STATE_ALLOCATED,
@@ -369,7 +373,7 @@ static void _update_node_record(sview_node_info_t *sview_node_info_ptr,
sview_colors[sview_node_info_ptr->pos
% sview_colors_cnt],
SORTID_CORES, node_ptr->cores,
- SORTID_CPUS, node_ptr->cpus,
+ SORTID_CPUS, tmp_cpus,
SORTID_DISK, tmp_disk,
SORTID_ERR_CPUS, tmp_err_cpus,
SORTID_FEATURES, node_ptr->features,
--
GitLab