Split logic overflowed function print_multicast_group_records() to two -
print_multicast_group_records() and print_multicast_member_records().
Simplify the code as for another print_*_records() functions.
Signed-off-by: Sasha Khapyorsky <[EMAIL PROTECTED]>
---
infiniband-diags/src/saquery.c | 60 ++++++++++++++++++++++------------------
1 files changed, 33 insertions(+), 27 deletions(-)
diff --git a/infiniband-diags/src/saquery.c b/infiniband-diags/src/saquery.c
index f1780fa..1594cad 100644
--- a/infiniband-diags/src/saquery.c
+++ b/infiniband-diags/src/saquery.c
@@ -324,9 +324,9 @@ static void dump_portinfo_record(void *data)
);
}
-static void
-print_multicast_group_record(ib_member_rec_t *p_mcmr)
+static void dump_multicast_group_record(void *data)
{
+ ib_member_rec_t *p_mcmr = data;
uint8_t sl;
ib_member_get_sl_flow_hop(p_mcmr->sl_flow_hop, &sl, NULL, NULL);
printf("MCMemberRecord group dump:\n"
@@ -348,9 +348,9 @@ print_multicast_group_record(ib_member_rec_t *p_mcmr)
);
}
-static void
-print_multicast_member_record(ib_member_rec_t *p_mcmr)
+static void dump_multicast_member_record(void *data)
{
+ ib_member_rec_t *p_mcmr = data;
uint64_t gid_prefix = cl_ntoh64( p_mcmr->port_gid.unicast.prefix );
uint64_t gid_interface_id = cl_ntoh64(
p_mcmr->port_gid.unicast.interface_id );
uint16_t mlid = cl_ntoh16( p_mcmr->mlid );
@@ -1039,37 +1039,25 @@ print_portinfo_records(osm_bind_handle_t bind_handle)
}
static ib_api_status_t
-print_multicast_group_records(osm_bind_handle_t bind_handle, int members)
+print_multicast_member_records(osm_bind_handle_t bind_handle)
{
- int i = 0;
- ib_member_rec_t *mcast_record = NULL;
- ib_net16_t mc_group_attr_offset =
ib_get_attr_offset(sizeof(*mcast_record));
osmv_query_res_t mc_group_result;
- ib_net16_t node_attr_offset =
ib_get_attr_offset(sizeof(ib_node_record_t));
ib_api_status_t status;
- status = get_all_records(bind_handle, IB_MAD_ATTR_MCMEMBER_RECORD,
mc_group_attr_offset, members);
+ status = get_all_records(bind_handle, IB_MAD_ATTR_MCMEMBER_RECORD,
+ ib_get_attr_offset(sizeof(ib_member_rec_t)),
1);
if (status != IB_SUCCESS)
return (status);
- mc_group_result = result;
- if (members) {
- status = get_all_records(bind_handle, IB_MAD_ATTR_NODE_RECORD,
- node_attr_offset, 0);
- if (status != IB_SUCCESS)
- goto return_mc;
- }
+ mc_group_result = result;
- for (i = 0; i < mc_group_result.result_cnt; i++) {
- mcast_record =
osmv_get_query_mc_rec(mc_group_result.p_result_madw, i);
- if (members == 0)
- print_multicast_group_record(mcast_record);
- else
- print_multicast_member_record(mcast_record);
- }
+ status = get_all_records(bind_handle, IB_MAD_ATTR_NODE_RECORD,
+ ib_get_attr_offset(sizeof(ib_node_record_t)),
0);
+ if (status != IB_SUCCESS)
+ goto return_mc;
- if (members)
- return_mad();
+ dump_results(&mc_group_result, dump_multicast_member_record);
+ return_mad();
return_mc:
/* return_mad for the mc_group_result */
@@ -1082,6 +1070,21 @@ return_mc:
}
static ib_api_status_t
+print_multicast_group_records(osm_bind_handle_t bind_handle)
+{
+ ib_api_status_t status;
+
+ status = get_all_records(bind_handle, IB_MAD_ATTR_MCMEMBER_RECORD,
+ ib_get_attr_offset(sizeof(ib_member_rec_t)),
0);
+ if (status != IB_SUCCESS)
+ return (status);
+
+ dump_results(&result, dump_multicast_group_record);
+ return_mad();
+ return (status);
+}
+
+static ib_api_status_t
print_service_records(osm_bind_handle_t bind_handle)
{
ib_net16_t attr_offset =
ib_get_attr_offset(sizeof(ib_service_record_t));
@@ -1693,7 +1696,10 @@ main(int argc, char **argv)
status = print_portinfo_records(bind_handle);
break;
case IB_MAD_ATTR_MCMEMBER_RECORD:
- status = print_multicast_group_records(bind_handle, members);
+ if (members)
+ status = print_multicast_member_records(bind_handle);
+ else
+ status = print_multicast_group_records(bind_handle);
break;
case IB_MAD_ATTR_SERVICE_RECORD:
status = print_service_records(bind_handle);
--
1.5.5.1.178.g1f811
_______________________________________________
general mailing list
[email protected]
http://lists.openfabrics.org/cgi-bin/mailman/listinfo/general
To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general
