From b5a2ceaa7cebd7a4138cc8002dcf39075a190d92 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Thu, 19 Jun 2014 18:46:27 +0000 Subject: [PATCH] Minor cleanup to node_stat packing routine This commit was SVN r32049. --- opal/dss/dss_pack.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/opal/dss/dss_pack.c b/opal/dss/dss_pack.c index 22d42fb87b..83e8c8a9e0 100644 --- a/opal/dss/dss_pack.c +++ b/opal/dss/dss_pack.c @@ -595,7 +595,6 @@ int opal_dss_pack_node_stat(opal_buffer_t *buffer, const void *src, opal_node_stats_t **ptr; int32_t i, j; int ret; - opal_list_item_t *item; opal_diskstats_t *ds; opal_netstats_t *ns; @@ -643,13 +642,12 @@ int opal_dss_pack_node_stat(opal_buffer_t *buffer, const void *src, if (OPAL_SUCCESS != (ret = opal_dss_pack_buffer(buffer, &j, 1, OPAL_INT32))) { return ret; } - /* pack them */ - for (item = opal_list_get_first(&ptr[i]->diskstats); - item != opal_list_get_end(&ptr[i]->diskstats); - item = opal_list_get_next(item)) { - ds = (opal_diskstats_t*)item; - if (OPAL_SUCCESS != (ret = pack_disk_stats(buffer, ds))) { - return ret; + if (0 < j) { + /* pack them */ + OPAL_LIST_FOREACH(ds, &ptr[i]->diskstats, opal_diskstats_t) { + if (OPAL_SUCCESS != (ret = pack_disk_stats(buffer, ds))) { + return ret; + } } } /* pack the number of net stat objects on the list */ @@ -657,13 +655,12 @@ int opal_dss_pack_node_stat(opal_buffer_t *buffer, const void *src, if (OPAL_SUCCESS != (ret = opal_dss_pack_buffer(buffer, &j, 1, OPAL_INT32))) { return ret; } - /* pack them */ - for (item = opal_list_get_first(&ptr[i]->netstats); - item != opal_list_get_end(&ptr[i]->netstats); - item = opal_list_get_next(item)) { - ns = (opal_netstats_t*)item; - if (OPAL_SUCCESS != (ret = pack_net_stats(buffer, ns))) { - return ret; + if (0 < j) { + /* pack them */ + OPAL_LIST_FOREACH(ns, &ptr[i]->netstats, opal_netstats_t) { + if (OPAL_SUCCESS != (ret = pack_net_stats(buffer, ns))) { + return ret; + } } } }