[openib-general] [PATCH] osm: cosmetic changes in osmtest multicast flow
Yevgeny Kliteynik
kliteyn at dev.mellanox.co.il
Mon Sep 25 06:12:00 PDT 2006
Hi Hal
This patch is all about cosmetics - it improves
the osmtest log readability, and it also has some
cosmetic additions in the code.
Yevgeny
Signed-off-by: Yevgeny Kliteynik <kliteyn at dev.mellanox.co.il>
Index: osmtest/osmt_multicast.c
===================================================================
--- osmtest/osmt_multicast.c (revision 9622)
+++ osmtest/osmt_multicast.c (working copy)
@@ -54,6 +54,9 @@
#include <complib/cl_map.h>
#include "osmtest.h"
+/**********************************************************************
+ **********************************************************************/
+
static
cl_status_t
__match_mgids(
@@ -76,6 +79,9 @@ __match_mgids(
}
+/**********************************************************************
+ **********************************************************************/
+
ib_api_status_t
osmt_query_mcast( IN osmtest_t * const p_osmt ) {
ib_api_status_t status = IB_SUCCESS;
@@ -219,6 +225,9 @@ osmt_query_mcast( IN osmtest_t * const p
return ( status );
}
+/**********************************************************************
+ **********************************************************************/
+
/* given a multicast request send and wait for response. */
ib_api_status_t
osmt_send_mcast_request( IN osmtest_t * const p_osmt,
@@ -334,6 +343,9 @@ osmt_send_mcast_request( IN osmtest_t *
}
+/**********************************************************************
+ **********************************************************************/
+
void
osmt_init_mc_query_rec(IN osmtest_t * const p_osmt,
IN OUT ib_member_rec_t *p_mc_req) {
@@ -702,9 +714,8 @@ osmt_run_mcast_flow( IN osmtest_t * cons
);
osm_log( &p_osmt->log, OSM_LOG_ERROR,
- "osmt_run_mcast_flow: "
- " Expecting Errors: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"
- );
+ "osmt_run_mcast_flow: " EXPECTING_ERRORS_START "\n" );
+
/* no MGID */
memset(&mc_req_rec.mgid, 0, sizeof(ib_gid_t));
/* Request Join */
@@ -727,9 +738,8 @@ osmt_run_mcast_flow( IN osmtest_t * cons
comp_mask,
&res_sa_mad );
osm_log( &p_osmt->log, OSM_LOG_ERROR,
- "osmt_run_mcast_flow: "
- " Expected Errors: vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv\n"
- );
+ "osmt_run_mcast_flow: " EXPECTING_ERRORS_END "\n" );
+
if (status != IB_REMOTE_ERROR ||
(( ib_net16_t ) (res_sa_mad.status & IB_SMP_STATUS_MASK )) !=
IB_SA_MAD_STATUS_INSUF_COMPS) {
@@ -749,9 +759,8 @@ osmt_run_mcast_flow( IN osmtest_t * cons
);
osm_log( &p_osmt->log, OSM_LOG_ERROR,
- "osmt_run_mcast_flow: "
- " Expecting Errors: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"
- );
+ "osmt_run_mcast_flow: " EXPECTING_ERRORS_START "\n" );
+
/* no MGID */
memset(&mc_req_rec.mgid, 0, sizeof(ib_gid_t));
/* Request Join */
@@ -774,9 +783,8 @@ osmt_run_mcast_flow( IN osmtest_t * cons
comp_mask,
&res_sa_mad );
osm_log( &p_osmt->log, OSM_LOG_ERROR,
- "osmt_run_mcast_flow: "
- " Expected Errors: vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv\n"
- );
+ "osmt_run_mcast_flow: " EXPECTING_ERRORS_START "\n" );
+
if (status != IB_REMOTE_ERROR ||
(( ib_net16_t ) (res_sa_mad.status & IB_SMP_STATUS_MASK )) !=
IB_SA_MAD_STATUS_INSUF_COMPS) {
@@ -803,10 +811,8 @@ osmt_run_mcast_flow( IN osmtest_t * cons
"Checking Join with insufficient comp mask - flow label (o15.0.1.3)...\n"
);
- osm_log( &p_osmt->log, OSM_LOG_ERROR,
- "osmt_run_mcast_flow: "
- " Expecting Errors: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"
- );
+ osm_log( &p_osmt->log, OSM_LOG_ERROR,
+ "osmt_run_mcast_flow: " EXPECTING_ERRORS_START "\n" );
/* Request Join */
ib_member_set_join_state(&mc_req_rec, IB_MC_REC_STATE_FULL_MEMBER);
@@ -828,9 +834,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons
comp_mask,
&res_sa_mad );
osm_log( &p_osmt->log, OSM_LOG_ERROR,
- "osmt_run_mcast_flow: "
- " Expected Errors: vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv\n"
- );
+ "osmt_run_mcast_flow: " EXPECTING_ERRORS_END "\n" );
if (status != IB_REMOTE_ERROR ||
(( ib_net16_t ) (res_sa_mad.status & IB_SMP_STATUS_MASK )) !=
IB_SA_MAD_STATUS_INSUF_COMPS) {
@@ -854,9 +858,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons
);
osm_log( &p_osmt->log, OSM_LOG_ERROR,
- "osmt_run_mcast_flow: "
- " Expecting Errors: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"
- );
+ "osmt_run_mcast_flow: " EXPECTING_ERRORS_START "\n" );
/* Request Join */
ib_member_set_join_state(&mc_req_rec, IB_MC_REC_STATE_FULL_MEMBER) ;
@@ -878,9 +880,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons
comp_mask,
&res_sa_mad );
osm_log( &p_osmt->log, OSM_LOG_ERROR,
- "osmt_run_mcast_flow: "
- " Expected Errors: vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv\n"
- );
+ "osmt_run_mcast_flow: " EXPECTING_ERRORS_END "\n" );
if (status != IB_REMOTE_ERROR ||
(( ib_net16_t ) (res_sa_mad.status & IB_SMP_STATUS_MASK )) !=
@@ -905,9 +905,8 @@ osmt_run_mcast_flow( IN osmtest_t * cons
);
osm_log( &p_osmt->log, OSM_LOG_ERROR,
- "osmt_run_mcast_flow: "
- " Expecting Errors: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"
- );
+ "osmt_run_mcast_flow: " EXPECTING_ERRORS_START "\n" );
+
/* no MGID */
/* memset(&mc_req_rec.mgid, 0, sizeof(ib_gid_t)); */
/* Request Join */
@@ -930,9 +929,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons
comp_mask,
&res_sa_mad );
osm_log( &p_osmt->log, OSM_LOG_ERROR,
- "osmt_run_mcast_flow: "
- " Expected Errors: vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv\n"
- );
+ "osmt_run_mcast_flow: " EXPECTING_ERRORS_END "\n" );
if (status != IB_REMOTE_ERROR ||
(( ib_net16_t ) (res_sa_mad.status & IB_SMP_STATUS_MASK )) !=
@@ -1228,9 +1225,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons
"Checking Create given MGID=0 skip service level (o15.0.1.4)...\n"
);
osm_log( &p_osmt->log, OSM_LOG_ERROR,
- "osmt_run_mcast_flow: "
- " Expecting Errors: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"
- );
+ "osmt_run_mcast_flow: " EXPECTING_ERRORS_START "\n" );
osmt_init_mc_query_rec(p_osmt, &mc_req_rec);
@@ -1258,9 +1253,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons
comp_mask,
&res_sa_mad );
osm_log( &p_osmt->log, OSM_LOG_ERROR,
- "osmt_run_mcast_flow: "
- " Expected Errors: vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv\n"
- );
+ "osmt_run_mcast_flow: " EXPECTING_ERRORS_END "\n" );
if (status != IB_REMOTE_ERROR ||
(( ib_net16_t ) (res_sa_mad.status & IB_SMP_STATUS_MASK )) !=
@@ -1311,9 +1304,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons
);
osm_log( &p_osmt->log, OSM_LOG_ERROR,
- "osmt_run_mcast_flow: "
- " Expecting Errors: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"
- );
+ "osmt_run_mcast_flow: " EXPECTING_ERRORS_START "\n" );
osmt_init_mc_query_rec(p_osmt, &mc_req_rec);
@@ -1342,9 +1333,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons
&res_sa_mad );
osm_log( &p_osmt->log, OSM_LOG_ERROR,
- "osmt_run_mcast_flow: "
- " Expected Errors: vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv\n"
- );
+ "osmt_run_mcast_flow: " EXPECTING_ERRORS_END "\n" );
if (status != IB_REMOTE_ERROR ||
(( ib_net16_t ) (res_sa_mad.status & IB_SMP_STATUS_MASK )) !=
@@ -1368,9 +1357,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons
"Checking Create given MGID=0 skip TClass (o15.0.1.4)...\n"
);
osm_log( &p_osmt->log, OSM_LOG_ERROR,
- "osmt_run_mcast_flow: "
- " Expecting Errors: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"
- );
+ "osmt_run_mcast_flow: " EXPECTING_ERRORS_START "\n" );
osmt_init_mc_query_rec(p_osmt, &mc_req_rec);
@@ -1400,9 +1387,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons
&res_sa_mad );
osm_log( &p_osmt->log, OSM_LOG_ERROR,
- "osmt_run_mcast_flow: "
- " Expected Errors: vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv\n"
- );
+ "osmt_run_mcast_flow: " EXPECTING_ERRORS_END "\n" );
if (status != IB_REMOTE_ERROR ||
(( ib_net16_t ) (res_sa_mad.status & IB_SMP_STATUS_MASK )) !=
@@ -1887,18 +1872,15 @@ osmt_run_mcast_flow( IN osmtest_t * cons
);
osm_log( &p_osmt->log, OSM_LOG_ERROR,
- "osmt_run_mcast_flow: "
- " Expecting Errors: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"
- );
+ "osmt_run_mcast_flow: " EXPECTING_ERRORS_START "\n" );
+
mc_req_rec.mgid.raw[0] = 0xFA;
status = osmt_send_mcast_request( p_osmt, 1,
&mc_req_rec,
comp_mask,
&res_sa_mad );
osm_log( &p_osmt->log, OSM_LOG_ERROR,
- "osmt_run_mcast_flow: "
- " Expected Errors: vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv\n"
- );
+ "osmt_run_mcast_flow: " EXPECTING_ERRORS_END "\n" );
if ((status != IB_REMOTE_ERROR) ||
(res_sa_mad.status != IB_SA_MAD_STATUS_REQ_INVALID)) {
@@ -1919,9 +1901,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons
);
osm_log( &p_osmt->log, OSM_LOG_ERROR,
- "osmt_run_mcast_flow: "
- " Expecting Errors: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"
- );
+ "osmt_run_mcast_flow: " EXPECTING_ERRORS_START "\n" );
mc_req_rec.mgid.raw[0] = 0xFF;
mc_req_rec.mgid.raw[3] = 0x1B;
comp_mask = comp_mask | IB_MCR_COMPMASK_SCOPE;
@@ -1932,9 +1912,8 @@ osmt_run_mcast_flow( IN osmtest_t * cons
comp_mask,
&res_sa_mad );
osm_log( &p_osmt->log, OSM_LOG_ERROR,
- "osmt_run_mcast_flow: "
- " Expected Errors: vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv\n"
- );
+ "osmt_run_mcast_flow: " EXPECTING_ERRORS_END "\n" );
+
if ((status != IB_REMOTE_ERROR) ||
(res_sa_mad.status != IB_SA_MAD_STATUS_REQ_INVALID)) {
osm_log( &p_osmt->log, OSM_LOG_ERROR,
@@ -1955,9 +1934,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons
);
osm_log( &p_osmt->log, OSM_LOG_ERROR,
- "osmt_run_mcast_flow: "
- " Expecting Errors: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"
- );
+ "osmt_run_mcast_flow: " EXPECTING_ERRORS_START "\n" );
mc_req_rec.mgid = good_mgid;
@@ -1969,9 +1946,8 @@ osmt_run_mcast_flow( IN osmtest_t * cons
comp_mask,
&res_sa_mad );
osm_log( &p_osmt->log, OSM_LOG_ERROR,
- "osmt_run_mcast_flow: "
- " Expected Errors: vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv\n"
- );
+ "osmt_run_mcast_flow: " EXPECTING_ERRORS_END "\n" );
+
if ((status != IB_REMOTE_ERROR) ||
(res_sa_mad.status != IB_SA_MAD_STATUS_REQ_INVALID)) {
osm_log( &p_osmt->log, OSM_LOG_ERROR,
@@ -2034,9 +2010,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons
);
osm_log( &p_osmt->log, OSM_LOG_ERROR,
- "osmt_run_mcast_flow: "
- " Expecting Errors: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"
- );
+ "osmt_run_mcast_flow: " EXPECTING_ERRORS_START "\n" );
mc_req_rec.mgid = good_mgid;
@@ -2048,9 +2022,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons
&res_sa_mad );
osm_log( &p_osmt->log, OSM_LOG_ERROR,
- "osmt_run_mcast_flow: "
- " Expected Errors: vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv\n"
- );
+ "osmt_run_mcast_flow: " EXPECTING_ERRORS_END "\n" );
if ((status != IB_REMOTE_ERROR) ||
(res_sa_mad.status != IB_SA_MAD_STATUS_REQ_INVALID)) {
@@ -2112,9 +2084,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons
);
osm_log( &p_osmt->log, OSM_LOG_ERROR,
- "osmt_run_mcast_flow: "
- " Expecting Errors: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"
- );
+ "osmt_run_mcast_flow: " EXPECTING_ERRORS_START "\n" );
mc_req_rec.mgid = good_mgid;
mc_req_rec.mgid.raw[12] = 0xFF;
mc_req_rec.scope_state = 0x22; /* link-local scope */
@@ -2124,9 +2094,8 @@ osmt_run_mcast_flow( IN osmtest_t * cons
comp_mask,
&res_sa_mad );
osm_log( &p_osmt->log, OSM_LOG_ERROR,
- "osmt_run_mcast_flow: "
- " Expected Errors: vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv\n"
- );
+ "osmt_run_mcast_flow: " EXPECTING_ERRORS_END "\n" );
+
if ((status != IB_REMOTE_ERROR) ||
(res_sa_mad.status != IB_SA_MAD_STATUS_REQ_INVALID)) {
osm_log( &p_osmt->log, OSM_LOG_ERROR,
@@ -2171,9 +2140,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons
);
osm_log( &p_osmt->log, OSM_LOG_ERROR,
- "osmt_run_mcast_flow: "
- " Expecting Errors: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"
- );
+ "osmt_run_mcast_flow: " EXPECTING_ERRORS_START "\n" );
/* We have created a new MCG so now we need different mgid when cresting group otherwise it will be counted as join request .*/
mc_req_rec.mgid = good_mgid;
mc_req_rec.mgid.raw[12] = 0xFC;
@@ -2185,9 +2152,8 @@ osmt_run_mcast_flow( IN osmtest_t * cons
comp_mask,
&res_sa_mad );
osm_log( &p_osmt->log, OSM_LOG_ERROR,
- "osmt_run_mcast_flow: "
- " Expected Errors: vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv\n"
- );
+ "osmt_run_mcast_flow: " EXPECTING_ERRORS_END "\n" );
+
if ((status != IB_REMOTE_ERROR) ||
(res_sa_mad.status != IB_SA_MAD_STATUS_REQ_INVALID)) {
osm_log( &p_osmt->log, OSM_LOG_ERROR,
@@ -2462,9 +2428,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons
"Checking BAD RATE when connecting to existing MGID (o15.0.1.13)...\n"
);
osm_log( &p_osmt->log, OSM_LOG_ERROR,
- "osmt_run_mcast_flow: "
- " Expecting Errors: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n"
- );
+ "osmt_run_mcast_flow: " EXPECTING_ERRORS_START "\n" );
mc_req_rec.mgid = good_mgid;
mc_req_rec.rate =
@@ -2487,9 +2451,8 @@ osmt_run_mcast_flow( IN osmtest_t * cons
comp_mask,
&res_sa_mad );
osm_log( &p_osmt->log, OSM_LOG_ERROR,
- "osmt_run_mcast_flow: "
- " Expected Errors: vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv\n"
- );
+ "osmt_run_mcast_flow: " EXPECTING_ERRORS_END "\n" );
+
if ((status != IB_REMOTE_ERROR) ||
(res_sa_mad.status != IB_SA_MAD_STATUS_REQ_INVALID)) {
osm_log( &p_osmt->log, OSM_LOG_ERROR,
@@ -2509,9 +2472,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons
"existing MGID (o15.0.1.13)...\n"
);
osm_log( &p_osmt->log, OSM_LOG_ERROR,
- "osmt_run_mcast_flow: "
- " Expecting Errors: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"
- );
+ "osmt_run_mcast_flow: " EXPECTING_ERRORS_START "\n" );
mc_req_rec.mgid = osm_ipoib_mgid;
mc_req_rec.mtu =
@@ -2534,9 +2495,8 @@ osmt_run_mcast_flow( IN osmtest_t * cons
comp_mask,
&res_sa_mad );
osm_log( &p_osmt->log, OSM_LOG_ERROR,
- "osmt_run_mcast_flow: "
- " Expected Errors: vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv\n"
- );
+ "osmt_run_mcast_flow: " EXPECTING_ERRORS_END "\n" );
+
if ((status != IB_REMOTE_ERROR) ||
(res_sa_mad.status != IB_SA_MAD_STATUS_REQ_INVALID)) {
osm_log( &p_osmt->log, OSM_LOG_ERROR,
@@ -2556,9 +2516,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons
"to existing MGID (o15.0.1.13)...\n"
);
osm_log( &p_osmt->log, OSM_LOG_ERROR,
- "osmt_run_mcast_flow: "
- " Expecting Errors: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"
- );
+ "osmt_run_mcast_flow: " EXPECTING_ERRORS_START "\n" );
mc_req_rec.mgid = osm_ipoib_mgid;
mc_req_rec.mtu =
@@ -2581,9 +2539,8 @@ osmt_run_mcast_flow( IN osmtest_t * cons
comp_mask,
&res_sa_mad );
osm_log( &p_osmt->log, OSM_LOG_ERROR,
- "osmt_run_mcast_flow: "
- " Expected Errors: vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv\n"
- );
+ "osmt_run_mcast_flow: " EXPECTING_ERRORS_END "\n" );
+
if ((status != IB_REMOTE_ERROR) ||
(res_sa_mad.status != IB_SA_MAD_STATUS_REQ_INVALID)) {
osm_log( &p_osmt->log, OSM_LOG_ERROR,
@@ -2697,18 +2654,16 @@ osmt_run_mcast_flow( IN osmtest_t * cons
"Checking Delete by trying to Join deleted group (o15.0.1.14)...\n"
);
osm_log( &p_osmt->log, OSM_LOG_ERROR,
- "osmt_run_mcast_flow: "
- " Expecting Errors: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"
- );
+ "osmt_run_mcast_flow: " EXPECTING_ERRORS_START "\n" );
+
mc_req_rec.scope_state = 0x22; /* use non member - so if no group fail */
status = osmt_send_mcast_request( p_osmt, 1, /* join */
&mc_req_rec,
comp_mask,
&res_sa_mad );
osm_log( &p_osmt->log, OSM_LOG_ERROR,
- "osmt_run_mcast_flow: "
- " Expected Errors: vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv\n"
- );
+ "osmt_run_mcast_flow: " EXPECTING_ERRORS_END "\n" );
+
if (status != IB_REMOTE_ERROR)
{
osm_log( &p_osmt->log, OSM_LOG_ERROR,
@@ -2727,9 +2682,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons
"Checking BAD Delete of Mgid membership (no prev join) (o15.0.1.15)...\n"
);
osm_log( &p_osmt->log, OSM_LOG_ERROR,
- "osmt_run_mcast_flow: "
- " Expecting Errors: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"
- );
+ "osmt_run_mcast_flow: " EXPECTING_ERRORS_START "\n" );
mc_req_rec.mgid = osm_ipoib_mgid;
mc_req_rec.rate =
@@ -2742,9 +2695,8 @@ osmt_run_mcast_flow( IN osmtest_t * cons
comp_mask,
&res_sa_mad );
osm_log( &p_osmt->log, OSM_LOG_ERROR,
- "osmt_run_mcast_flow: "
- " Expected Errors: vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv\n"
- );
+ "osmt_run_mcast_flow: " EXPECTING_ERRORS_END "\n" );
+
if ((status != IB_REMOTE_ERROR) ||
(res_sa_mad.status != IB_SA_MAD_STATUS_REQ_INVALID)) {
osm_log( &p_osmt->log, OSM_LOG_ERROR,
@@ -2821,9 +2773,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons
"Checking BAD Delete of IPoIB membership (no prev join) (o15.0.1.15)...\n"
);
osm_log( &p_osmt->log, OSM_LOG_ERROR,
- "osmt_run_mcast_flow: "
- " Expecting Errors: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"
- );
+ "osmt_run_mcast_flow: " EXPECTING_ERRORS_START "\n" );
mc_req_rec.mgid = osm_ipoib_mgid;
mc_req_rec.rate =
@@ -2836,9 +2786,8 @@ osmt_run_mcast_flow( IN osmtest_t * cons
comp_mask,
&res_sa_mad );
osm_log( &p_osmt->log, OSM_LOG_ERROR,
- "osmt_run_mcast_flow: "
- " Expected Errors: vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv\n"
- );
+ "osmt_run_mcast_flow: " EXPECTING_ERRORS_END "\n" );
+
if ((status != IB_REMOTE_ERROR) ||
(res_sa_mad.status != IB_SA_MAD_STATUS_REQ_INVALID)) {
osm_log( &p_osmt->log, OSM_LOG_ERROR,
@@ -2896,9 +2845,8 @@ osmt_run_mcast_flow( IN osmtest_t * cons
/* impossible requested mtu always greater than exist in MCG */
osm_log( &p_osmt->log, OSM_LOG_ERROR,
- "osmt_run_mcast_flow: "
- " Expecting Errors: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"
- );
+ "osmt_run_mcast_flow: " EXPECTING_ERRORS_START "\n" );
+
mc_req_rec.mtu = IB_MTU_LEN_4096 | IB_PATH_SELECTOR_GREATER_THAN << 6;
memcpy(&mc_req_rec.mgid,&tmp_mgid,sizeof(ib_gid_t));
ib_member_set_join_state(&mc_req_rec, IB_MC_REC_STATE_FULL_MEMBER);
@@ -2914,9 +2862,8 @@ osmt_run_mcast_flow( IN osmtest_t * cons
comp_mask,
&res_sa_mad );
osm_log( &p_osmt->log, OSM_LOG_ERROR,
- "osmt_run_mcast_flow: "
- " Expected Errors: vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv\n"
- );
+ "osmt_run_mcast_flow: " EXPECTING_ERRORS_END "\n" );
+
if (status == IB_SUCCESS)
{
osm_log( &p_osmt->log, OSM_LOG_ERROR,
More information about the general
mailing list