1
1

Minor cleanup to node_stat packing routine

This commit was SVN r32049.
Этот коммит содержится в:
Ralph Castain 2014-06-19 18:46:27 +00:00
родитель 8935e0a5e0
Коммит b5a2ceaa7c

Просмотреть файл

@ -595,7 +595,6 @@ int opal_dss_pack_node_stat(opal_buffer_t *buffer, const void *src,
opal_node_stats_t **ptr; opal_node_stats_t **ptr;
int32_t i, j; int32_t i, j;
int ret; int ret;
opal_list_item_t *item;
opal_diskstats_t *ds; opal_diskstats_t *ds;
opal_netstats_t *ns; opal_netstats_t *ns;
@ -643,30 +642,28 @@ 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))) { if (OPAL_SUCCESS != (ret = opal_dss_pack_buffer(buffer, &j, 1, OPAL_INT32))) {
return ret; return ret;
} }
if (0 < j) {
/* pack them */ /* pack them */
for (item = opal_list_get_first(&ptr[i]->diskstats); OPAL_LIST_FOREACH(ds, &ptr[i]->diskstats, opal_diskstats_t) {
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))) { if (OPAL_SUCCESS != (ret = pack_disk_stats(buffer, ds))) {
return ret; return ret;
} }
} }
}
/* pack the number of net stat objects on the list */ /* pack the number of net stat objects on the list */
j = opal_list_get_size(&ptr[i]->netstats); j = opal_list_get_size(&ptr[i]->netstats);
if (OPAL_SUCCESS != (ret = opal_dss_pack_buffer(buffer, &j, 1, OPAL_INT32))) { if (OPAL_SUCCESS != (ret = opal_dss_pack_buffer(buffer, &j, 1, OPAL_INT32))) {
return ret; return ret;
} }
if (0 < j) {
/* pack them */ /* pack them */
for (item = opal_list_get_first(&ptr[i]->netstats); OPAL_LIST_FOREACH(ns, &ptr[i]->netstats, opal_netstats_t) {
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))) { if (OPAL_SUCCESS != (ret = pack_net_stats(buffer, ns))) {
return ret; return ret;
} }
} }
} }
}
return OPAL_SUCCESS; return OPAL_SUCCESS;
} }