[ofa-general] [PATCH] opensm/libvendor: convert osm_log() to OSM_LOG() macro
Sasha Khapyorsky
sashak at voltaire.com
Sat Jul 26 19:04:53 PDT 2008
Convert logging to use OSM_LOG() macro.
Signed-off-by: Sasha Khapyorsky <sashak at voltaire.com>
---
opensm/libvendor/osm_pkt_randomizer.c | 21 ++---
opensm/libvendor/osm_vendor_ibumad.c | 151 ++++++++++++-------------------
opensm/libvendor/osm_vendor_ibumad_sa.c | 93 ++++++-------------
3 files changed, 92 insertions(+), 173 deletions(-)
diff --git a/opensm/libvendor/osm_pkt_randomizer.c b/opensm/libvendor/osm_pkt_randomizer.c
index 5d800b4..4f80934 100644
--- a/opensm/libvendor/osm_pkt_randomizer.c
+++ b/opensm/libvendor/osm_pkt_randomizer.c
@@ -91,8 +91,7 @@ __osm_pkt_randomizer_is_path_in_fault_paths(IN osm_log_t * p_log,
/* If found_path is TRUE then there is a full match of the path */
if (found_path == TRUE) {
- osm_log(p_log, OSM_LOG_VERBOSE,
- "__osm_pkt_randomizer_is_path_in_fault_paths: "
+ OSM_LOG(p_log, OSM_LOG_VERBOSE,
"Given path is in a fault path\n");
res = TRUE;
break;
@@ -179,8 +178,7 @@ __osm_pkt_randomizer_process_path(IN osm_log_t * p_log,
if to update it there or not. */
if (rand_value %
(p_pkt_rand->osm_pkt_unstable_link_rate) == 0) {
- osm_log(p_log, OSM_LOG_VERBOSE,
- "__osm_pkt_randomizer_process_path: "
+ OSM_LOG(p_log, OSM_LOG_VERBOSE,
"%s added to the fault_dr_paths list\n"
"\t\t\t rand_value:%u, unstable_link_rate:%u \n",
buf, rand_value,
@@ -200,9 +198,7 @@ __osm_pkt_randomizer_process_path(IN osm_log_t * p_log,
if (in_fault_paths == FALSE) {
/* If in_fault_paths is FALSE - just ignore the path */
- osm_log(p_log, OSM_LOG_VERBOSE,
- "__osm_pkt_randomizer_process_path: "
- "%s not in fault paths\n", buf);
+ OSM_LOG(p_log, OSM_LOG_VERBOSE, "%s not in fault paths\n", buf);
goto Exit;
}
@@ -213,9 +209,7 @@ __osm_pkt_randomizer_process_path(IN osm_log_t * p_log,
if (rand_value % (p_pkt_rand->osm_pkt_drop_rate) == 0) {
/* drop the current packet */
res = TRUE;
- osm_log(p_log, OSM_LOG_VERBOSE,
- "__osm_pkt_randomizer_process_path: "
- "Dropping path:%s\n", buf);
+ OSM_LOG(p_log, OSM_LOG_VERBOSE, "Dropping path:%s\n", buf);
}
Exit:
@@ -248,8 +242,7 @@ osm_pkt_randomizer_mad_drop(IN osm_log_t * p_log,
if (__osm_pkt_randomizer_process_path
(p_log, p_pkt_randomizer, &dr_path)) {
/* the mad should be dropped o */
- osm_log(p_log, OSM_LOG_VERBOSE,
- "osm_pkt_randomizer_mad_drop: "
+ OSM_LOG(p_log, OSM_LOG_VERBOSE,
"mad TID: 0x%" PRIx64 " is being dropped\n",
cl_ntoh64(p_smp->trans_id));
res = TRUE;
@@ -294,9 +287,7 @@ osm_pkt_randomizer_init(IN OUT osm_pkt_randomizer_t ** pp_pkt_randomizer,
else
(*pp_pkt_randomizer)->osm_pkt_unstable_link_rate = 20;
- osm_log(p_log, OSM_LOG_VERBOSE,
- "osm_pkt_randomizer_init: "
- "Using OSM_PKT_DROP_RATE=%u \n"
+ OSM_LOG(p_log, OSM_LOG_VERBOSE, "Using OSM_PKT_DROP_RATE=%u \n"
"\t\t\t\t OSM_PKT_NUM_UNSTABLE_LINKS=%u \n"
"\t\t\t\t OSM_PKT_UNSTABLE_LINK_RATE=%u \n",
(*pp_pkt_randomizer)->osm_pkt_drop_rate,
diff --git a/opensm/libvendor/osm_vendor_ibumad.c b/opensm/libvendor/osm_vendor_ibumad.c
index a1fc140..96fd01b 100644
--- a/opensm/libvendor/osm_vendor_ibumad.c
+++ b/opensm/libvendor/osm_vendor_ibumad.c
@@ -112,8 +112,7 @@ static void clear_madw(osm_vendor_t * p_vend)
*) ((osm_madw_t *) m->v)->h_bind)->
p_mad_pool, m->v);
pthread_mutex_unlock(&p_vend->match_tbl_mutex);
- osm_log(p_vend->p_log, OSM_LOG_ERROR,
- "clear_madw: ERR 5401: "
+ OSM_LOG(p_vend->p_log, OSM_LOG_ERROR, "ERR 5401: "
"evicting entry %p (tid was 0x%" PRIx64 ")\n",
old_m, old_tid);
goto Exit;
@@ -192,8 +191,7 @@ put_madw(osm_vendor_t * p_vend, osm_madw_t * p_madw, ib_net64_t tid)
lru->version =
cl_atomic_inc((atomic32_t *) & p_vend->mtbl.last_version);
pthread_mutex_unlock(&p_vend->match_tbl_mutex);
- osm_log(p_vend->p_log, OSM_LOG_ERROR,
- "put_madw: ERR 5402: "
+ OSM_LOG(p_vend->p_log, OSM_LOG_ERROR, "ERR 5402: "
"evicting entry %p (tid was 0x%" PRIx64 ")\n", old_lru,
cl_ntoh64(old_tid));
}
@@ -255,8 +253,7 @@ static void *umad_receiver(void *p_ptr)
for (;;) {
if (!umad &&
!(umad = umad_alloc(1, umad_size() + MAD_BLOCK_SIZE))) {
- osm_log(p_ur->p_log, OSM_LOG_ERROR,
- "umad_receiver: ERR 5403: "
+ OSM_LOG(p_ur->p_log, OSM_LOG_ERROR, "ERR 5403: "
"can't alloc MAD sized umad\n");
break;
}
@@ -265,8 +262,7 @@ static void *umad_receiver(void *p_ptr)
if ((mad_agent = umad_recv(p_vend->umad_port_id, umad,
&length, -1)) < 0) {
if (length <= MAD_BLOCK_SIZE) {
- osm_log(p_ur->p_log, OSM_LOG_ERROR,
- "umad_receiver: ERR 5404: "
+ OSM_LOG(p_ur->p_log, OSM_LOG_ERROR, "ERR 5404: "
"recv error on MAD sized umad (%m)\n");
continue;
} else {
@@ -274,8 +270,8 @@ static void *umad_receiver(void *p_ptr)
/* Need a larger buffer for RMPP */
umad = umad_alloc(1, umad_size() + length);
if (!umad) {
- osm_log(p_ur->p_log, OSM_LOG_ERROR,
- "umad_receiver: ERR 5405: "
+ OSM_LOG(p_ur->p_log, OSM_LOG_ERROR,
+ "ERR 5405: "
"can't alloc umad length %d\n",
length);
continue;
@@ -284,8 +280,8 @@ static void *umad_receiver(void *p_ptr)
if ((mad_agent = umad_recv(p_vend->umad_port_id,
umad, &length,
-1)) < 0) {
- osm_log(p_ur->p_log, OSM_LOG_ERROR,
- "umad_receiver: ERR 5406: "
+ OSM_LOG(p_ur->p_log, OSM_LOG_ERROR,
+ "ERR 5406: "
"recv error on umad length %d (%m)\n",
length);
continue;
@@ -295,8 +291,7 @@ static void *umad_receiver(void *p_ptr)
if (mad_agent >= UMAD_CA_MAX_AGENTS ||
!(p_bind = p_vend->agents[mad_agent])) {
- osm_log(p_ur->p_log, OSM_LOG_ERROR,
- "umad_receiver: ERR 5407: "
+ OSM_LOG(p_ur->p_log, OSM_LOG_ERROR, "ERR 5407: "
"invalid mad agent %d - dropping\n", mad_agent);
continue;
}
@@ -312,8 +307,7 @@ static void *umad_receiver(void *p_ptr)
(osm_bind_handle_t) p_bind,
MAX(length, MAD_BLOCK_SIZE),
&osm_addr))) {
- osm_log(p_vend->p_log, OSM_LOG_ERROR,
- "umad_receiver: ERR 5408: "
+ OSM_LOG(p_vend->p_log, OSM_LOG_ERROR, "ERR 5408: "
"request for a new madw failed -- dropping packet\n");
continue;
}
@@ -330,8 +324,7 @@ static void *umad_receiver(void *p_ptr)
/* if status != 0 then we are handling recv timeout on send */
if (umad_status(p_madw->vend_wrap.umad)) {
- osm_log(p_vend->p_log, OSM_LOG_ERROR,
- "umad_receiver: ERR 5409: "
+ OSM_LOG(p_vend->p_log, OSM_LOG_ERROR, "ERR 5409: "
"send completed with error"
" (method=0x%X attr=0x%X trans_id=0x%" PRIx64
") -- dropping\n",
@@ -339,9 +332,8 @@ static void *umad_receiver(void *p_ptr)
cl_ntoh64(mad->trans_id));
if (mad->mgmt_class != IB_MCLASS_SUBN_DIR) {
/* LID routed */
- osm_log(p_vend->p_log, OSM_LOG_ERROR,
- "umad_receiver: ERR 5410: "
- "class 0x%x LID 0x%x\n",
+ OSM_LOG(p_vend->p_log, OSM_LOG_ERROR,
+ "ERR 5410: class 0x%x LID 0x%x\n",
mad->mgmt_class,
cl_ntoh16(ib_mad_addr->lid));
} else {
@@ -349,16 +341,16 @@ static void *umad_receiver(void *p_ptr)
/* Direct routed SMP */
smp = (ib_smp_t *) mad;
- osm_log(p_vend->p_log, OSM_LOG_ERROR,
- "umad_receiver: ERR 5411: DR SMP Hop Ptr: 0x%X\n",
+ OSM_LOG(p_vend->p_log, OSM_LOG_ERROR,
+ "ERR 5411: DR SMP Hop Ptr: 0x%X\n",
smp->hop_ptr);
osm_dump_smp_dr_path(p_vend->p_log, smp,
OSM_LOG_ERROR);
}
if (!(p_req_madw = get_madw(p_vend, &mad->trans_id))) {
- osm_log(p_vend->p_log, OSM_LOG_ERROR,
- "umad_receiver: ERR 5412: "
+ OSM_LOG(p_vend->p_log, OSM_LOG_ERROR,
+ "ERR 5412: "
"Failed to obtain request madw for timed out MAD"
"(method=0x%X attr=0x%X tid=0x%"PRIx64") -- dropping\n",
mad->method, cl_ntoh16(mad->attr_id),
@@ -382,8 +374,7 @@ static void *umad_receiver(void *p_ptr)
p_req_madw = 0;
if (ib_mad_is_response(mad) &&
!(p_req_madw = get_madw(p_vend, &mad->trans_id))) {
- osm_log(p_vend->p_log, OSM_LOG_ERROR,
- "umad_receiver: ERR 5413: "
+ OSM_LOG(p_vend->p_log, OSM_LOG_ERROR, "ERR 5413: "
"Failed to obtain request madw for received MAD"
"(method=0x%X attr=0x%X tid=0x%"PRIx64") -- dropping\n",
mad->method, cl_ntoh16((mad)->attr_id),
@@ -396,13 +387,10 @@ static void *umad_receiver(void *p_ptr)
(mad->mgmt_class != IB_MCLASS_SUBN_LID) &&
(ib_rmpp_is_flag_set((ib_rmpp_mad_t *) mad,
IB_RMPP_FLAG_ACTIVE))) {
- osm_log(p_vend->p_log, OSM_LOG_ERROR,
- "umad_receiver: ERR 5414: "
- "class 0x%x method 0x%x"
- " RMPP version %d type %d flags 0x%x"
- " received -- dropping\n",
- mad->mgmt_class,
- mad->method,
+ OSM_LOG(p_vend->p_log, OSM_LOG_ERROR, "ERR 5414: "
+ "class 0x%x method 0x%x RMPP version %d type "
+ "%d flags 0x%x received -- dropping\n",
+ mad->mgmt_class, mad->method,
((ib_rmpp_mad_t *) mad)->rmpp_version,
((ib_rmpp_mad_t *) mad)->rmpp_type,
((ib_rmpp_mad_t *) mad)->rmpp_flags);
@@ -468,14 +456,14 @@ osm_vendor_init(IN osm_vendor_t * const p_vend,
* Open our instance of UMAD.
*/
if ((r = umad_init()) < 0) {
- osm_log(p_vend->p_log, OSM_LOG_ERROR,
- "osm_vendor_init: ERR 5415: Error opening UMAD\n");
+ OSM_LOG(p_vend->p_log, OSM_LOG_ERROR,
+ "ERR 5415: Error opening UMAD\n");
}
if ((n_cas = umad_get_cas_names(p_vend->ca_names,
OSM_UMAD_MAX_CAS)) < 0) {
- osm_log(p_vend->p_log, OSM_LOG_ERROR,
- "osm_vendor_init: ERR 5416: umad_get_cas_names failed\n");
+ OSM_LOG(p_vend->p_log, OSM_LOG_ERROR,
+ "ERR 5416: umad_get_cas_names failed\n");
r = n_cas;
goto Exit;
}
@@ -488,20 +476,17 @@ osm_vendor_init(IN osm_vendor_t * const p_vend,
if (tmp > 0)
p_vend->mtbl.max = tmp;
else
- osm_log(p_vend->p_log, OSM_LOG_ERROR,
- "osm_vendor_init: Error:"
+ OSM_LOG(p_vend->p_log, OSM_LOG_ERROR, "Error:"
"OSM_UMAD_MAX_PENDING=%d is invalid",
tmp);
}
- osm_log(p_vend->p_log, OSM_LOG_INFO,
- "osm_vendor_init: %d pending umads specified\n",
+ OSM_LOG(p_vend->p_log, OSM_LOG_INFO, "%d pending umads specified\n",
p_vend->mtbl.max);
p_vend->mtbl.tbl = calloc(p_vend->mtbl.max, sizeof(*(p_vend->mtbl.tbl)));
if (!p_vend->mtbl.tbl) {
- osm_log(p_vend->p_log, OSM_LOG_ERROR,
- "osm_vendor_init: Error:"
+ OSM_LOG(p_vend->p_log, OSM_LOG_ERROR, "Error:"
"failed to allocate vendor match table\n");
r = IB_INSUFFICIENT_MEMORY;
goto Exit;
@@ -522,16 +507,14 @@ osm_vendor_t *osm_vendor_new(IN osm_log_t * const p_log,
OSM_LOG_ENTER(p_log);
if (!timeout) {
- osm_log(p_log, OSM_LOG_ERROR,
- "osm_vendor_new: ERR 5433: "
+ OSM_LOG(p_log, OSM_LOG_ERROR, "ERR 5433: "
"transaction timeout cannot be 0\n");
goto Exit;
}
p_vend = malloc(sizeof(*p_vend));
if (p_vend == NULL) {
- osm_log(p_log, OSM_LOG_ERROR,
- "osm_vendor_new: ERR 5417: "
+ OSM_LOG(p_log, OSM_LOG_ERROR, "ERR 5417: "
"Unable to allocate vendor object\n");
goto Exit;
}
@@ -583,8 +566,7 @@ osm_vendor_get_all_port_attr(IN osm_vendor_t * const p_vend,
if (!*p_num_ports) {
r = IB_INVALID_PARAMETER;
- osm_log(p_vend->p_log, OSM_LOG_ERROR,
- "osm_vendor_get_all_port_attr: ERR 5418: "
+ OSM_LOG(p_vend->p_log, OSM_LOG_ERROR, "ERR 5418: "
"Ports in should be > 0\n");
goto Exit;
}
@@ -659,8 +641,7 @@ osm_vendor_open_port(IN osm_vendor_t * const p_vend,
if ((r = umad_get_ca_portguids(p_vend->ca_names[ca],
portguids,
OSM_UMAD_MAX_CAS)) < 0) {
- osm_log(p_vend->p_log, OSM_LOG_ERROR,
- "osm_vendor_open_port: ERR 5421: "
+ OSM_LOG(p_vend->p_log, OSM_LOG_ERROR, "ERR 5421: "
"Unable to get CA %s port guids (%s)\n",
p_vend->ca_names[ca], strerror(r));
goto Exit;
@@ -675,8 +656,7 @@ osm_vendor_open_port(IN osm_vendor_t * const p_vend,
/*
* No local CA owns this guid!
*/
- osm_log(p_vend->p_log, OSM_LOG_ERROR,
- "osm_vendor_open_port: ERR 5422: "
+ OSM_LOG(p_vend->p_log, OSM_LOG_ERROR, "ERR 5422: "
"Unable to find requested CA guid 0x%" PRIx64 "\n",
cl_ntoh64(port_guid));
goto Exit;
@@ -684,15 +664,13 @@ osm_vendor_open_port(IN osm_vendor_t * const p_vend,
_found:
/* Validate that node is an IB node type (not iWARP) */
if (umad_get_ca(name, &umad_ca) < 0) {
- osm_log(p_vend->p_log, OSM_LOG_ERROR,
- "osm_vendor_open_port: ERR 542A: "
+ OSM_LOG(p_vend->p_log, OSM_LOG_ERROR, "ERR 542A: "
"umad_get_ca() failed\n");
goto Exit;
}
if (umad_ca.node_type < 1 || umad_ca.node_type > 3) {
- osm_log(p_vend->p_log, OSM_LOG_ERROR,
- "osm_vendor_open_port: ERR 542D: "
+ OSM_LOG(p_vend->p_log, OSM_LOG_ERROR, "ERR 542D: "
"Type %d of node \'%s\' is not an IB node type\n",
umad_ca.node_type, umad_ca.ca_name);
fprintf(stderr,
@@ -705,16 +683,14 @@ _found:
/* Port found, try to open it */
if (umad_get_port(name, i, &p_vend->umad_port) < 0) {
- osm_log(p_vend->p_log, OSM_LOG_ERROR,
- "osm_vendor_open_port: ERR 542B: "
+ OSM_LOG(p_vend->p_log, OSM_LOG_ERROR, "ERR 542B: "
"umad_get_port() failed\n");
goto Exit;
}
if ((umad_port_id = umad_open_port(p_vend->umad_port.ca_name,
p_vend->umad_port.portnum)) < 0) {
- osm_log(p_vend->p_log, OSM_LOG_ERROR,
- "osm_vendor_open_port: ERR 542C: "
+ OSM_LOG(p_vend->p_log, OSM_LOG_ERROR, "ERR 542C: "
"umad_open_port() failed\n");
goto Exit;
}
@@ -723,8 +699,7 @@ _found:
/* start receiver thread */
if (!(p_vend->receiver = calloc(1, sizeof(umad_receiver_t)))) {
- osm_log(p_vend->p_log, OSM_LOG_ERROR,
- "osm_vendor_open_port: ERR 5423: "
+ OSM_LOG(p_vend->p_log, OSM_LOG_ERROR, "ERR 5423: "
"Unable to alloc receiver struct\n");
umad_close_port(umad_port_id);
umad_release_port(&p_vend->umad_port);
@@ -733,8 +708,7 @@ _found:
goto Exit;
}
if (umad_receiver_start(p_vend) != 0) {
- osm_log(p_vend->p_log, OSM_LOG_ERROR,
- "osm_vendor_open_port: ERR 5420: "
+ OSM_LOG(p_vend->p_log, OSM_LOG_ERROR, "ERR 5420: "
"umad_receiver_init failed\n");
umad_close_port(umad_port_id);
umad_release_port(&p_vend->umad_port);
@@ -807,12 +781,11 @@ osm_vendor_bind(IN osm_vendor_t * const p_vend,
port_guid = p_user_bind->port_guid;
- osm_log(p_vend->p_log, OSM_LOG_INFO, "osm_vendor_bind: "
+ OSM_LOG(p_vend->p_log, OSM_LOG_INFO,
"Binding to port 0x%" PRIx64 "\n", cl_ntoh64(port_guid));
if ((umad_port_id = osm_vendor_open_port(p_vend, port_guid)) < 0) {
- osm_log(p_vend->p_log, OSM_LOG_ERROR,
- "osm_vendor_bind: ERR 5424: "
+ OSM_LOG(p_vend->p_log, OSM_LOG_ERROR, "ERR 5424: "
"Unable to open port 0x%" PRIx64 "\n",
cl_ntoh64(port_guid));
goto Exit;
@@ -822,16 +795,14 @@ osm_vendor_bind(IN osm_vendor_t * const p_vend,
p_vend->umad_port.portnum,
p_vend->issm_path,
sizeof(p_vend->issm_path)) < 0) {
- osm_log(p_vend->p_log, OSM_LOG_ERROR,
- "osm_vendor_bind: ERR 542E: "
+ OSM_LOG(p_vend->p_log, OSM_LOG_ERROR, "ERR 542E: "
"Cannot resolve issm path for port %s:%u\n",
p_vend->umad_port.ca_name, p_vend->umad_port.portnum);
goto Exit;
}
if (!(p_bind = malloc(sizeof(*p_bind)))) {
- osm_log(p_vend->p_log, OSM_LOG_ERROR,
- "osm_vendor_bind: ERR 5425: "
+ OSM_LOG(p_vend->p_log, OSM_LOG_ERROR, "ERR 5425: "
"Unable to allocate internal bind object\n");
goto Exit;
}
@@ -879,8 +850,7 @@ osm_vendor_bind(IN osm_vendor_t * const p_vend,
p_user_bind->mad_class,
p_user_bind->class_version,
rmpp_version, method_mask)) < 0) {
- osm_log(p_vend->p_log, OSM_LOG_ERROR,
- "osm_vendor_bind: ERR 5426: "
+ OSM_LOG(p_vend->p_log, OSM_LOG_ERROR, "ERR 5426: "
"Unable to register class %u version %u\n",
p_user_bind->mad_class, p_user_bind->class_version);
free(p_bind);
@@ -890,8 +860,7 @@ osm_vendor_bind(IN osm_vendor_t * const p_vend,
if (p_bind->agent_id >= UMAD_CA_MAX_AGENTS ||
p_vend->agents[p_bind->agent_id]) {
- osm_log(p_vend->p_log, OSM_LOG_ERROR,
- "osm_vendor_bind: ERR 5427: "
+ OSM_LOG(p_vend->p_log, OSM_LOG_ERROR, "ERR 5427: "
"bad agent id %u or duplicate agent for class %u vers %u\n",
p_bind->agent_id, p_user_bind->mad_class,
p_user_bind->class_version);
@@ -909,8 +878,7 @@ osm_vendor_bind(IN osm_vendor_t * const p_vend,
p_user_bind->
class_version, 0,
method_mask)) < 0) {
- osm_log(p_vend->p_log, OSM_LOG_ERROR,
- "osm_vendor_bind: ERR 5428: "
+ OSM_LOG(p_vend->p_log, OSM_LOG_ERROR, "ERR 5428: "
"Unable to register class 1 version %u\n",
p_user_bind->class_version);
free(p_bind);
@@ -920,8 +888,7 @@ osm_vendor_bind(IN osm_vendor_t * const p_vend,
if (p_bind->agent_id1 >= UMAD_CA_MAX_AGENTS ||
p_vend->agents[p_bind->agent_id1]) {
- osm_log(p_vend->p_log, OSM_LOG_ERROR,
- "osm_vendor_bind: ERR 5429: "
+ OSM_LOG(p_vend->p_log, OSM_LOG_ERROR, "ERR 5429: "
"bad agent id %u or duplicate agent for class 1 vers %u\n",
p_bind->agent_id1, p_user_bind->class_version);
free(p_bind);
@@ -989,7 +956,7 @@ ib_mad_t *osm_vendor_get(IN osm_bind_handle_t h_bind,
OSM_LOG_ENTER(p_vend->p_log);
- osm_log(p_vend->p_log, OSM_LOG_DEBUG, "osm_vendor_get: "
+ OSM_LOG(p_vend->p_log, OSM_LOG_DEBUG,
"Acquiring UMAD for p_madw = %p, size = %u\n", p_vw, mad_size);
CL_ASSERT(p_vw);
p_vw->size = mad_size;
@@ -998,7 +965,7 @@ ib_mad_t *osm_vendor_get(IN osm_bind_handle_t h_bind,
/* track locally */
p_vw->h_bind = h_bind;
- osm_log(p_vend->p_log, OSM_LOG_DEBUG, "osm_vendor_get: "
+ OSM_LOG(p_vend->p_log, OSM_LOG_DEBUG,
"Acquired UMAD %p, size = %u\n", p_vw->umad, p_vw->size);
OSM_LOG_EXIT(p_vend->p_log);
@@ -1018,8 +985,7 @@ osm_vendor_put(IN osm_bind_handle_t h_bind, IN osm_vend_wrap_t * const p_vw)
CL_ASSERT(p_vw);
- osm_log(p_vend->p_log, OSM_LOG_DEBUG, "osm_vendor_put: "
- "Retiring UMAD %p\n", p_vw->umad);
+ OSM_LOG(p_vend->p_log, OSM_LOG_DEBUG, "Retiring UMAD %p\n", p_vw->umad);
/*
* We moved the removal of the transaction to immediately after
@@ -1087,8 +1053,7 @@ osm_vendor_send(IN osm_bind_handle_t h_bind,
#ifdef VENDOR_RMPP_SUPPORT
} else
is_rmpp = 1;
- osm_log(p_vend->p_log, OSM_LOG_VERBOSE,
- "osm_vendor_send: RMPP %d length %d\n",
+ OSM_LOG(p_vend->p_log, OSM_LOG_VERBOSE, "RMPP %d length %d\n",
ib_rmpp_is_flag_set((ib_rmpp_mad_t *) p_sa,
IB_RMPP_FLAG_ACTIVE),
p_madw->mad_size);
@@ -1119,8 +1084,7 @@ Resp:
sent_mad_size,
resp_expected ? p_vend->timeout : 0,
p_vend->max_retries)) < 0) {
- osm_log(p_vend->p_log, OSM_LOG_ERROR,
- "osm_vendor_send: ERR 5430: "
+ OSM_LOG(p_vend->p_log, OSM_LOG_ERROR, "ERR 5430: "
"Send p_madw = %p of size %d failed %d (%m)\n",
p_madw, sent_mad_size, ret);
if (resp_expected) {
@@ -1137,8 +1101,7 @@ Resp:
if (!resp_expected)
osm_mad_pool_put(p_bind->p_mad_pool, p_madw);
- osm_log(p_vend->p_log, OSM_LOG_DEBUG, "osm_vendor_send: "
- "Completed sending %s p_madw = %p\n",
+ OSM_LOG(p_vend->p_log, OSM_LOG_DEBUG, "Completed sending %s p_madw = %p\n",
resp_expected ? "request" : "response or unsolicited", p_madw);
Exit:
OSM_LOG_EXIT(p_vend->p_log);
@@ -1169,8 +1132,7 @@ void osm_vendor_set_sm(IN osm_bind_handle_t h_bind, IN boolean_t is_sm_val)
if (TRUE == is_sm_val) {
p_vend->issmfd = open(p_vend->issm_path, O_NONBLOCK);
if (p_vend->issmfd < 0) {
- osm_log(p_vend->p_log, OSM_LOG_ERROR,
- "osm_vendor_set_sm: ERR 5431: "
+ OSM_LOG(p_vend->p_log, OSM_LOG_ERROR, "ERR 5431: "
"setting IS_SM capmask: cannot open file "
"\'%s\': %s\n",
p_vend->issm_path, strerror(errno));
@@ -1178,8 +1140,7 @@ void osm_vendor_set_sm(IN osm_bind_handle_t h_bind, IN boolean_t is_sm_val)
}
} else if (p_vend->issmfd != -1) {
if (0 != close(p_vend->issmfd))
- osm_log(p_vend->p_log, OSM_LOG_ERROR,
- "osm_vendor_set_sm: ERR 5432: "
+ OSM_LOG(p_vend->p_log, OSM_LOG_ERROR, "ERR 5432: "
"clearing IS_SM capmask: cannot close: %s\n",
strerror(errno));
p_vend->issmfd = -1;
diff --git a/opensm/libvendor/osm_vendor_ibumad_sa.c b/opensm/libvendor/osm_vendor_ibumad_sa.c
index cef20aa..b9a1923 100644
--- a/opensm/libvendor/osm_vendor_ibumad_sa.c
+++ b/opensm/libvendor/osm_vendor_ibumad_sa.c
@@ -82,8 +82,7 @@ __osmv_sa_mad_rcv_cb(IN osm_madw_t * p_madw,
OSM_LOG_ENTER(p_bind->p_log);
if (!p_req_madw) {
- osm_log(p_bind->p_log, OSM_LOG_DEBUG,
- "__osmv_sa_mad_rcv_cb: "
+ OSM_LOG(p_bind->p_log, OSM_LOG_DEBUG,
"Ignoring a non-response mad\n");
osm_mad_pool_put(p_bind->p_mad_pool, p_madw);
goto Exit;
@@ -106,8 +105,7 @@ __osmv_sa_mad_rcv_cb(IN osm_madw_t * p_madw,
/* if we got a remote error track it in the status */
mad_status = (ib_net16_t) (p_sa_mad->status & IB_SMP_STATUS_MASK);
if (mad_status != IB_SUCCESS) {
- osm_log(p_bind->p_log, OSM_LOG_ERROR,
- "__osmv_sa_mad_rcv_cb: ERR 5501: "
+ OSM_LOG(p_bind->p_log, OSM_LOG_ERROR, "ERR 5501: "
"Remote error:0x%04X\n", mad_status);
query_res.status = IB_REMOTE_ERROR;
} else
@@ -115,8 +113,7 @@ __osmv_sa_mad_rcv_cb(IN osm_madw_t * p_madw,
/* what if we have got back an empty mad ? */
if (!p_madw->mad_size) {
- osm_log(p_bind->p_log, OSM_LOG_ERROR,
- "__osmv_sa_mad_rcv_cb: ERR 5502: "
+ OSM_LOG(p_bind->p_log, OSM_LOG_ERROR, "ERR 5502: "
"Got an empty mad\n");
query_res.status = IB_ERROR;
}
@@ -140,8 +137,8 @@ __osmv_sa_mad_rcv_cb(IN osm_madw_t * p_madw,
query_res.result_cnt = (uintn_t)
((p_madw->mad_size - IB_SA_MAD_HDR_SIZE) /
ib_get_attr_size(p_sa_mad->attr_offset));
- osm_log(p_bind->p_log, OSM_LOG_DEBUG,
- "__osmv_sa_mad_rcv_cb: Count = %u = %zu / %u (%zu)\n",
+ OSM_LOG(p_bind->p_log, OSM_LOG_DEBUG,
+ "Count = %u = %zu / %u (%zu)\n",
query_res.result_cnt,
p_madw->mad_size - IB_SA_MAD_HDR_SIZE,
ib_get_attr_size(p_sa_mad->attr_offset),
@@ -242,8 +239,7 @@ osmv_bind_sa(IN osm_vendor_t * const p_vend,
OSM_LOG_ENTER(p_log);
- osm_log(p_log, OSM_LOG_DEBUG,
- "osmv_bind_sa: "
+ OSM_LOG(p_log, OSM_LOG_DEBUG,
"Binding to port 0x%" PRIx64 "\n", cl_ntoh64(port_guid));
bind_info.port_guid = port_guid;
@@ -259,8 +255,7 @@ osmv_bind_sa(IN osm_vendor_t * const p_vend,
p_sa_bind_info =
(osmv_sa_bind_info_t *) malloc(sizeof(osmv_sa_bind_info_t));
if (!p_sa_bind_info) {
- osm_log(p_log, OSM_LOG_ERROR,
- "osmv_bind_sa: ERR 5505: "
+ OSM_LOG(p_log, OSM_LOG_ERROR, "ERR 5505: "
"Failed to allocate new bind structure\n");
p_sa_bind_info = OSM_BIND_INVALID_HANDLE;
goto Exit;
@@ -277,8 +272,7 @@ osmv_bind_sa(IN osm_vendor_t * const p_vend,
if (p_sa_bind_info->h_bind == OSM_BIND_INVALID_HANDLE) {
free(p_sa_bind_info);
p_sa_bind_info = OSM_BIND_INVALID_HANDLE;
- osm_log(p_log, OSM_LOG_ERROR,
- "osmv_bind_sa: ERR 5506: "
+ OSM_LOG(p_log, OSM_LOG_ERROR, "ERR 5506: "
"Failed to bind to vendor GSI\n");
goto Exit;
}
@@ -290,8 +284,7 @@ osmv_bind_sa(IN osm_vendor_t * const p_vend,
cl_event_construct(&p_sa_bind_info->sync_event);
cl_status = cl_event_init(&p_sa_bind_info->sync_event, TRUE);
if (cl_status != CL_SUCCESS) {
- osm_log(p_log, OSM_LOG_ERROR,
- "osmv_bind_sa: ERR 5508: "
+ OSM_LOG(p_log, OSM_LOG_ERROR, "ERR 5508: "
"cl_init_event failed: %s\n", ib_get_err_str(cl_status));
free(p_sa_bind_info);
p_sa_bind_info = OSM_BIND_INVALID_HANDLE;
@@ -372,8 +365,7 @@ __osmv_send_sa_req(IN osmv_sa_bind_info_t * p_bind,
if (time(NULL) > p_bind->last_lids_update_sec + 30) {
status = update_umad_port(p_bind->p_vendor);
if (status != IB_SUCCESS) {
- osm_log(p_log, OSM_LOG_ERROR,
- "__osmv_send_sa_req: ERR 5509: "
+ OSM_LOG(p_log, OSM_LOG_ERROR, "ERR 5509: "
"Failed to obtain the SM lid\n");
goto Exit;
}
@@ -385,8 +377,7 @@ __osmv_send_sa_req(IN osmv_sa_bind_info_t * p_bind,
p_bind->h_bind, MAD_BLOCK_SIZE, NULL);
if (p_madw == NULL) {
- osm_log(p_log, OSM_LOG_ERROR,
- "__osmv_send_sa_req: ERR 5510: "
+ OSM_LOG(p_log, OSM_LOG_ERROR, "ERR 5510: "
"Unable to acquire MAD\n");
status = IB_INSUFFICIENT_RESOURCES;
goto Exit;
@@ -459,8 +450,7 @@ __osmv_send_sa_req(IN osmv_sa_bind_info_t * p_bind,
/* if synchronous - wait on the event */
if (sync) {
- osm_log(p_log, OSM_LOG_DEBUG,
- "__osmv_send_sa_req: Waiting for async event\n");
+ OSM_LOG(p_log, OSM_LOG_DEBUG, "Waiting for async event\n");
cl_event_wait_on(&p_bind->sync_event, EVENT_NO_TIMEOUT, FALSE);
cl_event_reset(&p_bind->sync_event);
status = p_madw->status;
@@ -506,8 +496,7 @@ osmv_query_sa(IN osm_bind_handle_t h_bind,
switch (p_query_req->query_type) {
case OSMV_QUERY_USER_DEFINED:
- osm_log(p_log, OSM_LOG_DEBUG,
- "osmv_query_sa DBG:001 %s", "USER_DEFINED\n");
+ OSM_LOG(p_log, OSM_LOG_DEBUG, "DBG:001 USER_DEFINED\n");
p_user_query = (osmv_user_query_t *) p_query_req->p_query_input;
if (p_user_query->method)
sa_mad_data.method = p_user_query->method;
@@ -519,8 +508,7 @@ osmv_query_sa(IN osm_bind_handle_t h_bind,
break;
case OSMV_QUERY_ALL_SVC_RECS:
- osm_log(p_log, OSM_LOG_DEBUG,
- "osmv_query_sa DBG:001 %s", "SVC_REC_BY_NAME\n");
+ OSM_LOG(p_log, OSM_LOG_DEBUG, "DBG:001 SVC_REC_BY_NAME\n");
sa_mad_data.attr_id = IB_MAD_ATTR_SERVICE_RECORD;
sa_mad_data.attr_offset =
ib_get_attr_offset(sizeof(ib_service_record_t));
@@ -529,8 +517,7 @@ osmv_query_sa(IN osm_bind_handle_t h_bind,
break;
case OSMV_QUERY_SVC_REC_BY_NAME:
- osm_log(p_log, OSM_LOG_DEBUG,
- "osmv_query_sa DBG:001 %s", "SVC_REC_BY_NAME\n");
+ OSM_LOG(p_log, OSM_LOG_DEBUG, "DBG:001 SVC_REC_BY_NAME\n");
sa_mad_data.method = IB_MAD_METHOD_GET;
sa_mad_data.attr_id = IB_MAD_ATTR_SERVICE_RECORD;
sa_mad_data.comp_mask = IB_SR_COMPMASK_SNAME;
@@ -542,8 +529,7 @@ osmv_query_sa(IN osm_bind_handle_t h_bind,
break;
case OSMV_QUERY_SVC_REC_BY_ID:
- osm_log(p_log, OSM_LOG_DEBUG,
- "osmv_query_sa DBG:001 %s", "SVC_REC_BY_ID\n");
+ OSM_LOG(p_log, OSM_LOG_DEBUG, "DBG:001 SVC_REC_BY_ID\n");
sa_mad_data.attr_id = IB_MAD_ATTR_SERVICE_RECORD;
sa_mad_data.comp_mask = IB_SR_COMPMASK_SID;
sa_mad_data.attr_offset =
@@ -554,8 +540,7 @@ osmv_query_sa(IN osm_bind_handle_t h_bind,
break;
case OSMV_QUERY_CLASS_PORT_INFO:
- osm_log(p_log, OSM_LOG_DEBUG,
- "osmv_query_sa DBG:001 %s", "CLASS_PORT_INFO\n");
+ OSM_LOG(p_log, OSM_LOG_DEBUG, "DBG:001 CLASS_PORT_INFO\n");
sa_mad_data.method = IB_MAD_METHOD_GET;
sa_mad_data.attr_id = IB_MAD_ATTR_CLASS_PORT_INFO;
sa_mad_data.attr_offset =
@@ -565,8 +550,7 @@ osmv_query_sa(IN osm_bind_handle_t h_bind,
break;
case OSMV_QUERY_NODE_REC_BY_NODE_GUID:
- osm_log(p_log, OSM_LOG_DEBUG,
- "osmv_query_sa DBG:001 %s", "NODE_REC_BY_NODE_GUID\n");
+ OSM_LOG(p_log, OSM_LOG_DEBUG, "DBG:001 NODE_REC_BY_NODE_GUID\n");
sa_mad_data.attr_id = IB_MAD_ATTR_NODE_RECORD;
sa_mad_data.attr_offset =
ib_get_attr_offset(sizeof(ib_node_record_t));
@@ -577,8 +561,7 @@ osmv_query_sa(IN osm_bind_handle_t h_bind,
break;
case OSMV_QUERY_PORT_REC_BY_LID:
- osm_log(p_log, OSM_LOG_DEBUG,
- "osmv_query_sa DBG:001 %s", "PORT_REC_BY_LID\n");
+ OSM_LOG(p_log, OSM_LOG_DEBUG, "DBG:001 PORT_REC_BY_LID\n");
sa_mad_data.attr_id = IB_MAD_ATTR_PORTINFO_RECORD;
sa_mad_data.attr_offset =
ib_get_attr_offset(sizeof(ib_portinfo_record_t));
@@ -590,9 +573,7 @@ osmv_query_sa(IN osm_bind_handle_t h_bind,
case OSMV_QUERY_PORT_REC_BY_LID_AND_NUM:
sa_mad_data.method = IB_MAD_METHOD_GET;
p_user_query = (osmv_user_query_t *) p_query_req->p_query_input;
- osm_log(p_log, OSM_LOG_DEBUG,
- "osmv_query_sa DBG:001 %s",
- "PORT_REC_BY_LID_AND_NUM\n");
+ OSM_LOG(p_log, OSM_LOG_DEBUG, "DBG:001 PORT_REC_BY_LID_AND_NUM\n");
sa_mad_data.attr_id = IB_MAD_ATTR_PORTINFO_RECORD;
sa_mad_data.attr_offset =
ib_get_attr_offset(sizeof(ib_portinfo_record_t));
@@ -604,9 +585,7 @@ osmv_query_sa(IN osm_bind_handle_t h_bind,
case OSMV_QUERY_VLARB_BY_LID_PORT_BLOCK:
sa_mad_data.method = IB_MAD_METHOD_GET;
p_user_query = (osmv_user_query_t *) p_query_req->p_query_input;
- osm_log(p_log, OSM_LOG_DEBUG,
- "osmv_query_sa DBG:001 %s",
- "OSMV_QUERY_VLARB_BY_LID_PORT_BLOCK\n");
+ OSM_LOG(p_log, OSM_LOG_DEBUG, "DBG:001 OSMV_QUERY_VLARB_BY_LID_PORT_BLOCK\n");
sa_mad_data.attr_id = IB_MAD_ATTR_VLARB_RECORD;
sa_mad_data.attr_offset =
ib_get_attr_offset(sizeof(ib_vl_arb_table_record_t));
@@ -619,9 +598,7 @@ osmv_query_sa(IN osm_bind_handle_t h_bind,
case OSMV_QUERY_SLVL_BY_LID_AND_PORTS:
sa_mad_data.method = IB_MAD_METHOD_GET;
p_user_query = (osmv_user_query_t *) p_query_req->p_query_input;
- osm_log(p_log, OSM_LOG_DEBUG,
- "osmv_query_sa DBG:001 %s",
- "OSMV_QUERY_VLARB_BY_LID_PORT_BLOCK\n");
+ OSM_LOG(p_log, OSM_LOG_DEBUG, "DBG:001 OSMV_QUERY_VLARB_BY_LID_PORT_BLOCK\n");
sa_mad_data.attr_id = IB_MAD_ATTR_SLVL_RECORD;
sa_mad_data.attr_offset =
ib_get_attr_offset(sizeof(ib_slvl_table_record_t));
@@ -632,8 +609,7 @@ osmv_query_sa(IN osm_bind_handle_t h_bind,
break;
case OSMV_QUERY_PATH_REC_BY_PORT_GUIDS:
- osm_log(p_log, OSM_LOG_DEBUG,
- "osmv_query_sa DBG:001 %s", "PATH_REC_BY_PORT_GUIDS\n");
+ OSM_LOG(p_log, OSM_LOG_DEBUG, "DBG:001 PATH_REC_BY_PORT_GUIDS\n");
memset(&path_rec, 0, sizeof(ib_path_rec_t));
sa_mad_data.attr_id = IB_MAD_ATTR_PATH_RECORD;
sa_mad_data.attr_offset =
@@ -652,8 +628,7 @@ osmv_query_sa(IN osm_bind_handle_t h_bind,
break;
case OSMV_QUERY_PATH_REC_BY_GIDS:
- osm_log(p_log, OSM_LOG_DEBUG,
- "osmv_query_sa DBG:001 %s", "PATH_REC_BY_GIDS\n");
+ OSM_LOG(p_log, OSM_LOG_DEBUG, "DBG:001 PATH_REC_BY_GIDS\n");
memset(&path_rec, 0, sizeof(ib_path_rec_t));
sa_mad_data.attr_id = IB_MAD_ATTR_PATH_RECORD;
sa_mad_data.attr_offset =
@@ -670,8 +645,7 @@ osmv_query_sa(IN osm_bind_handle_t h_bind,
break;
case OSMV_QUERY_PATH_REC_BY_LIDS:
- osm_log(p_log, OSM_LOG_DEBUG,
- "osmv_query_sa DBG:001 %s", "PATH_REC_BY_LIDS\n");
+ OSM_LOG(p_log, OSM_LOG_DEBUG, "DBG:001 PATH_REC_BY_LIDS\n");
memset(&path_rec, 0, sizeof(ib_path_rec_t));
sa_mad_data.method = IB_MAD_METHOD_GET;
sa_mad_data.attr_id = IB_MAD_ATTR_PATH_RECORD;
@@ -690,9 +664,7 @@ osmv_query_sa(IN osm_bind_handle_t h_bind,
case OSMV_QUERY_UD_MULTICAST_SET:
sa_mad_data.method = IB_MAD_METHOD_SET;
p_user_query = (osmv_user_query_t *) p_query_req->p_query_input;
- osm_log(p_log, OSM_LOG_DEBUG,
- "osmv_query_sa DBG:001 %s",
- "OSMV_QUERY_UD_MULTICAST_SET\n");
+ OSM_LOG(p_log, OSM_LOG_DEBUG, "DBG:001 OSMV_QUERY_UD_MULTICAST_SET\n");
sa_mad_data.attr_id = IB_MAD_ATTR_MCMEMBER_RECORD;
sa_mad_data.attr_offset =
ib_get_attr_offset(sizeof(ib_member_rec_t));
@@ -703,9 +675,7 @@ osmv_query_sa(IN osm_bind_handle_t h_bind,
case OSMV_QUERY_UD_MULTICAST_DELETE:
sa_mad_data.method = IB_MAD_METHOD_DELETE;
p_user_query = (osmv_user_query_t *) p_query_req->p_query_input;
- osm_log(p_log, OSM_LOG_DEBUG,
- "osmv_query_sa DBG:001 %s",
- "OSMV_QUERY_UD_MULTICAST_DELETE\n");
+ OSM_LOG(p_log, OSM_LOG_DEBUG, "DBG:001 OSMV_QUERY_UD_MULTICAST_DELETE\n");
sa_mad_data.attr_id = IB_MAD_ATTR_MCMEMBER_RECORD;
sa_mad_data.attr_offset =
ib_get_attr_offset(sizeof(ib_member_rec_t));
@@ -715,14 +685,12 @@ osmv_query_sa(IN osm_bind_handle_t h_bind,
#ifdef DUAL_SIDED_RMPP
case OSMV_QUERY_MULTIPATH_REC:
- osm_log(p_log, OSM_LOG_DEBUG,
- "osmv_query_sa DBG:001 %s", "MULTIPATH_REC\n");
+ OSM_LOG(p_log, OSM_LOG_DEBUG, "DBG:001 MULTIPATH_REC\n");
/* Validate sgid/dgid counts against SA client limit */
p_mpr_req = (osmv_multipath_req_t *) p_query_req->p_query_input;
if (p_mpr_req->sgid_count + p_mpr_req->dgid_count >
IB_MULTIPATH_MAX_GIDS) {
- osm_log(p_log, OSM_LOG_ERROR,
- "osmv_query_sa DBG:001 MULTIPATH_REC "
+ OSM_LOG(p_log, OSM_LOG_ERROR, "DBG:001 MULTIPATH_REC "
"SGID count %d DGID count %d max count %d\n",
p_mpr_req->sgid_count, p_mpr_req->dgid_count,
IB_MULTIPATH_MAX_GIDS);
@@ -756,8 +724,7 @@ osmv_query_sa(IN osm_bind_handle_t h_bind,
#endif
default:
- osm_log(p_log, OSM_LOG_ERROR,
- "osmv_query_sa DBG:001 %s", "UNKNOWN\n");
+ OSM_LOG(p_log, OSM_LOG_ERROR, "DBG:001 UNKNOWN\n");
CL_ASSERT(0);
return IB_ERROR;
}
--
1.5.5.1.178.g1f811
More information about the general
mailing list