[ofa-general] [PATCH RFC] opensm: drop unused parameter in OSM_LOG_ENTER macro
Sasha Khapyorsky
sashak at voltaire.com
Tue Feb 12 10:18:06 PST 2008
__func__ macro is used in the OSM_LOG_ENTER() to show an actual function
name, so the second parameter is not really useful here. OTOH it makes
it harder to grep over OpenSM source code, when searches are by function
names it generates a lot of unrelated matches. If so what about to
remove this second parameter (like in this patch)?
Signed-off-by: Sasha Khapyorsky <sashak at voltaire.com>
---
opensm/include/opensm/osm_log.h | 2 +-
opensm/libvendor/osm_pkt_randomizer.c | 10 +-
opensm/libvendor/osm_vendor_al.c | 42 +++---
opensm/libvendor/osm_vendor_ibumad.c | 26 ++--
opensm/libvendor/osm_vendor_ibumad_sa.c | 10 +-
opensm/libvendor/osm_vendor_mlx.c | 22 ++--
opensm/libvendor/osm_vendor_mlx_anafa.c | 22 ++--
opensm/libvendor/osm_vendor_mlx_dispatcher.c | 12 +-
opensm/libvendor/osm_vendor_mlx_hca.c | 10 +-
opensm/libvendor/osm_vendor_mlx_hca_anafa.c | 4 +-
opensm/libvendor/osm_vendor_mlx_hca_pfs.c | 14 +-
opensm/libvendor/osm_vendor_mlx_hca_sim.c | 16 +-
opensm/libvendor/osm_vendor_mlx_ibmgt.c | 4 +-
opensm/libvendor/osm_vendor_mlx_rmpp_ctx.c | 4 +-
opensm/libvendor/osm_vendor_mlx_sa.c | 12 +-
opensm/libvendor/osm_vendor_mlx_sender.c | 6 +-
opensm/libvendor/osm_vendor_mlx_sim.c | 7 +-
opensm/libvendor/osm_vendor_mlx_ts.c | 6 +-
opensm/libvendor/osm_vendor_mlx_ts_anafa.c | 4 +-
opensm/libvendor/osm_vendor_mlx_txn.c | 14 +-
opensm/libvendor/osm_vendor_mtl.c | 26 ++--
opensm/libvendor/osm_vendor_mtl_hca_guid.c | 10 +-
opensm/libvendor/osm_vendor_mtl_transaction_mgr.c | 12 +-
opensm/libvendor/osm_vendor_test.c | 16 +-
opensm/libvendor/osm_vendor_ts.c | 28 ++--
opensm/libvendor/osm_vendor_umadt.c | 12 +-
opensm/opensm/main.c | 2 +-
opensm/opensm/osm_db_files.c | 10 +-
opensm/opensm/osm_drop_mgr.c | 10 +-
opensm/opensm/osm_inform.c | 16 +-
opensm/opensm/osm_lid_mgr.c | 18 ++--
opensm/opensm/osm_lin_fwd_rcv.c | 2 +-
opensm/opensm/osm_link_mgr.c | 6 +-
opensm/opensm/osm_mad_pool.c | 10 +-
opensm/opensm/osm_mcast_fwd_rcv.c | 2 +-
opensm/opensm/osm_mcast_mgr.c | 34 +++---
opensm/opensm/osm_multicast.c | 4 +-
opensm/opensm/osm_node_desc_rcv.c | 4 +-
opensm/opensm/osm_node_info_rcv.c | 22 ++--
opensm/opensm/osm_opensm.c | 2 +-
opensm/opensm/osm_perfmgr.c | 24 ++--
opensm/opensm/osm_pkey.c | 6 +-
opensm/opensm/osm_pkey_mgr.c | 2 +-
opensm/opensm/osm_pkey_rcv.c | 2 +-
opensm/opensm/osm_port.c | 6 +-
opensm/opensm/osm_port_info_rcv.c | 16 +-
opensm/opensm/osm_qos.c | 2 +-
opensm/opensm/osm_qos_parser.y | 4 +-
opensm/opensm/osm_qos_policy.c | 5 +-
opensm/opensm/osm_req.c | 4 +-
opensm/opensm/osm_resp.c | 4 +-
opensm/opensm/osm_sa.c | 8 +-
opensm/opensm/osm_sa_class_port_info.c | 4 +-
opensm/opensm/osm_sa_guidinfo_record.c | 8 +-
opensm/opensm/osm_sa_informinfo.c | 16 +-
opensm/opensm/osm_sa_lft_record.c | 4 +-
opensm/opensm/osm_sa_link_record.c | 10 +-
opensm/opensm/osm_sa_mad_ctrl.c | 14 +-
opensm/opensm/osm_sa_mcmember_record.c | 22 ++--
opensm/opensm/osm_sa_mft_record.c | 4 +-
opensm/opensm/osm_sa_multipath_record.c | 22 ++--
opensm/opensm/osm_sa_node_record.c | 8 +-
opensm/opensm/osm_sa_path_record.c | 26 ++--
opensm/opensm/osm_sa_pkey_record.c | 8 +-
opensm/opensm/osm_sa_portinfo_record.c | 10 +-
opensm/opensm/osm_sa_response.c | 2 +-
opensm/opensm/osm_sa_service_record.c | 14 +-
opensm/opensm/osm_sa_slvl_record.c | 6 +-
opensm/opensm/osm_sa_sminfo_record.c | 6 +-
opensm/opensm/osm_sa_sw_info_record.c | 8 +-
opensm/opensm/osm_sa_vlarb_record.c | 8 +-
opensm/opensm/osm_service.c | 6 +-
opensm/opensm/osm_slvl_map_rcv.c | 2 +-
opensm/opensm/osm_sm.c | 16 +-
opensm/opensm/osm_sm_mad_ctrl.c | 22 ++--
opensm/opensm/osm_sm_state_mgr.c | 14 +-
opensm/opensm/osm_sminfo_rcv.c | 12 +-
opensm/opensm/osm_state_mgr.c | 28 ++--
opensm/opensm/osm_sw_info_rcv.c | 12 +-
opensm/opensm/osm_sweep_fail_ctrl.c | 4 +-
opensm/opensm/osm_trap_rcv.c | 10 +-
opensm/opensm/osm_ucast_ftree.c | 39 +++---
opensm/opensm/osm_ucast_lash.c | 12 +-
opensm/opensm/osm_ucast_mgr.c | 18 ++--
opensm/opensm/osm_ucast_updn.c | 18 ++--
opensm/opensm/osm_vl15intf.c | 12 +-
opensm/opensm/osm_vl_arb_rcv.c | 2 +-
opensm/osmtest/osmt_inform.c | 14 +-
opensm/osmtest/osmt_multicast.c | 6 +-
opensm/osmtest/osmt_service.c | 20 ++--
opensm/osmtest/osmt_slvl_vl_arb.c | 14 +-
opensm/osmtest/osmtest.c | 142 ++++++++++----------
92 files changed, 596 insertions(+), 603 deletions(-)
diff --git a/opensm/include/opensm/osm_log.h b/opensm/include/opensm/osm_log.h
index a024f66..bfd2e96 100644
--- a/opensm/include/opensm/osm_log.h
+++ b/opensm/include/opensm/osm_log.h
@@ -74,7 +74,7 @@ BEGIN_C_DECLS
#define LOG_ENTRY_SIZE_MAX 4096
#define BUF_SIZE LOG_ENTRY_SIZE_MAX
#define __func__ __FUNCTION__
-#define OSM_LOG_ENTER( OSM_LOG_PTR, NAME ) \
+#define OSM_LOG_ENTER( OSM_LOG_PTR ) \
osm_log( OSM_LOG_PTR, OSM_LOG_FUNCS, \
"%s: [\n", __func__);
#define OSM_LOG_EXIT( OSM_LOG_PTR ) \
diff --git a/opensm/libvendor/osm_pkt_randomizer.c b/opensm/libvendor/osm_pkt_randomizer.c
index 2fce57f..092700b 100644
--- a/opensm/libvendor/osm_pkt_randomizer.c
+++ b/opensm/libvendor/osm_pkt_randomizer.c
@@ -75,7 +75,7 @@ __osm_pkt_randomizer_is_path_in_fault_paths(IN osm_log_t * p_log,
osm_dr_path_t *p_found_dr_path;
uint8_t ind1, ind2;
- OSM_LOG_ENTER(p_log, __osm_pkt_randomizer_is_path_in_fault_paths);
+ OSM_LOG_ENTER(p_log);
for (ind1 = 0; ind1 < p_pkt_rand->num_paths_initialized; ind1++) {
found_path = TRUE;
@@ -131,7 +131,7 @@ __osm_pkt_randomizer_process_path(IN osm_log_t * p_log,
char buf[BUF_SIZE];
char line[BUF_SIZE];
- OSM_LOG_ENTER(p_log, __osm_pkt_randomizer_process_path);
+ OSM_LOG_ENTER(p_log);
if (rand_value_init == FALSE) {
int seed;
@@ -238,7 +238,7 @@ osm_pkt_randomizer_mad_drop(IN osm_log_t * p_log,
boolean_t res = FALSE;
osm_dr_path_t dr_path;
- OSM_LOG_ENTER(p_log, osm_pkt_randomizer_mad_drop);
+ OSM_LOG_ENTER(p_log);
p_smp = (ib_smp_t *) p_mad;
@@ -273,7 +273,7 @@ osm_pkt_randomizer_init(IN OUT osm_pkt_randomizer_t ** pp_pkt_randomizer,
uint8_t tmp;
ib_api_status_t res = IB_SUCCESS;
- OSM_LOG_ENTER(p_log, osm_pkt_randomizer_init);
+ OSM_LOG_ENTER(p_log);
*pp_pkt_randomizer = malloc(sizeof(osm_pkt_randomizer_t));
if (*pp_pkt_randomizer == NULL) {
@@ -332,7 +332,7 @@ void
osm_pkt_randomizer_destroy(IN OUT osm_pkt_randomizer_t ** pp_pkt_randomizer,
IN osm_log_t * p_log)
{
- OSM_LOG_ENTER(p_log, osm_pkt_randomizer_destroy);
+ OSM_LOG_ENTER(p_log);
if (*pp_pkt_randomizer != NULL) {
free((*pp_pkt_randomizer)->fault_dr_paths);
diff --git a/opensm/libvendor/osm_vendor_al.c b/opensm/libvendor/osm_vendor_al.c
index 7d497c5..6694eb9 100644
--- a/opensm/libvendor/osm_vendor_al.c
+++ b/opensm/libvendor/osm_vendor_al.c
@@ -139,7 +139,7 @@ __osm_al_convert_wcs(IN ib_wc_status_t const wc_status)
static void __osm_al_ca_err_callback(IN ib_async_event_rec_t * p_async_rec)
{
osm_vendor_t *p_vend = (osm_vendor_t *) p_async_rec->context;
- OSM_LOG_ENTER(p_vend->p_log, __osm_al_ca_err_callback);
+ OSM_LOG_ENTER(p_vend->p_log);
osm_log(p_vend->p_log, OSM_LOG_ERROR,
"__osm_al_ca_err_callback: ERR 3B01: "
@@ -155,7 +155,7 @@ static void __osm_al_ca_destroy_callback(IN void *context)
{
osm_al_bind_info_t *p_bind = (osm_al_bind_info_t *) context;
osm_vendor_t *p_vend = p_bind->p_vend;
- OSM_LOG_ENTER(p_vend->p_log, __osm_al_ca_destroy_callback);
+ OSM_LOG_ENTER(p_vend->p_log);
osm_log(p_vend->p_log, OSM_LOG_INFO,
"__osm_al_ca_destroy_callback: "
@@ -171,7 +171,7 @@ static void __osm_al_err_callback(IN ib_async_event_rec_t * p_async_rec)
osm_al_bind_info_t *p_bind =
(osm_al_bind_info_t *) p_async_rec->context;
osm_vendor_t *p_vend = p_bind->p_vend;
- OSM_LOG_ENTER(p_vend->p_log, __osm_al_err_callback);
+ OSM_LOG_ENTER(p_vend->p_log);
osm_log(p_vend->p_log, OSM_LOG_ERROR,
"__osm_al_err_callback: ERR 3B02: "
@@ -193,7 +193,7 @@ __osm_al_send_callback(IN void *mad_svc_context, IN ib_mad_element_t * p_elem)
osm_vend_wrap_t *const p_vw = osm_madw_get_vend_ptr(p_madw);
ib_mad_t *p_mad;
- OSM_LOG_ENTER(p_vend->p_log, __osm_al_send_callback);
+ OSM_LOG_ENTER(p_vend->p_log);
CL_ASSERT(p_vw);
CL_ASSERT(p_vw->h_av);
@@ -271,7 +271,7 @@ __osm_al_rcv_callback(IN void *mad_svc_context, IN ib_mad_element_t * p_elem)
ib_mad_t *p_new_mad;
osm_mad_addr_t mad_addr;
- OSM_LOG_ENTER(p_vend->p_log, __osm_al_rcv_callback);
+ OSM_LOG_ENTER(p_vend->p_log);
CL_ASSERT(p_elem->context1 == NULL);
CL_ASSERT(p_elem->context2 == NULL);
@@ -352,7 +352,7 @@ osm_vendor_init(IN osm_vendor_t * const p_vend,
IN osm_log_t * const p_log, IN const uint32_t timeout)
{
ib_api_status_t status;
- OSM_LOG_ENTER(p_log, osm_vendor_init);
+ OSM_LOG_ENTER(p_log);
p_vend->p_log = p_log;
@@ -383,7 +383,7 @@ osm_vendor_t *osm_vendor_new(IN osm_log_t * const p_log,
ib_api_status_t status;
osm_vendor_t *p_vend;
- OSM_LOG_ENTER(p_log, osm_vendor_new);
+ OSM_LOG_ENTER(p_log);
p_vend = malloc(sizeof(*p_vend));
if (p_vend == NULL) {
@@ -425,7 +425,7 @@ __osm_ca_info_init(IN osm_vendor_t * const p_vend,
{
ib_api_status_t status;
- OSM_LOG_ENTER(p_vend->p_log, __osm_ca_info_init);
+ OSM_LOG_ENTER(p_vend->p_log);
p_ca_info->guid = ca_guid;
@@ -476,7 +476,7 @@ void
osm_ca_info_destroy(IN osm_vendor_t * const p_vend,
IN osm_ca_info_t * const p_ca_info)
{
- OSM_LOG_ENTER(p_vend->p_log, osm_ca_info_destroy);
+ OSM_LOG_ENTER(p_vend->p_log);
if (p_ca_info->p_attr)
free(p_ca_info->p_attr);
@@ -494,7 +494,7 @@ osm_ca_info_t *osm_ca_info_new(IN osm_vendor_t * const p_vend,
ib_api_status_t status;
osm_ca_info_t *p_ca_info;
- OSM_LOG_ENTER(p_vend->p_log, osm_ca_info_new);
+ OSM_LOG_ENTER(p_vend->p_log);
CL_ASSERT(ca_guid);
@@ -525,7 +525,7 @@ __osm_vendor_get_ca_guids(IN osm_vendor_t * const p_vend,
{
ib_api_status_t status;
- OSM_LOG_ENTER(p_vend->p_log, __osm_vendor_get_ca_guids);
+ OSM_LOG_ENTER(p_vend->p_log);
CL_ASSERT(p_guids);
CL_ASSERT(p_num_guids);
@@ -622,7 +622,7 @@ osm_vendor_get_all_port_attr(IN osm_vendor_t * const p_vend,
ib_net64_t *p_ca_guid = NULL;
osm_ca_info_t *p_ca_info;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_get_all_port_attr);
+ OSM_LOG_ENTER(p_vend->p_log);
CL_ASSERT(p_vend);
CL_ASSERT(p_vend->p_ca_info == NULL);
@@ -708,7 +708,7 @@ osm_vendor_get_ca_guid(IN osm_vendor_t * const p_vend,
osm_ca_info_t *p_ca_info;
uint32_t ca;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_get_ca_guid);
+ OSM_LOG_ENTER(p_vend->p_log);
CL_ASSERT(port_guid);
/*
@@ -763,7 +763,7 @@ osm_vendor_get_port_num(IN osm_vendor_t * const p_vend,
osm_ca_info_t *p_ca_info;
uint32_t ca;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_get_port_num);
+ OSM_LOG_ENTER(p_vend->p_log);
CL_ASSERT(port_guid);
/*
@@ -816,7 +816,7 @@ __osm_vendor_open_ca(IN osm_vendor_t * const p_vend,
ib_net64_t ca_guid;
ib_api_status_t status;
- OSM_LOG_ENTER(p_vend->p_log, __osm_vendor_open_ca);
+ OSM_LOG_ENTER(p_vend->p_log);
ca_guid = osm_vendor_get_ca_guid(p_vend, port_guid);
if (ca_guid == 0) {
@@ -891,7 +891,7 @@ osm_vendor_bind(IN osm_vendor_t * const p_vend,
ib_mad_svc_t mad_svc;
ib_av_attr_t av;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_bind);
+ OSM_LOG_ENTER(p_vend->p_log);
CL_ASSERT(p_user_bind);
CL_ASSERT(p_mad_pool);
@@ -1038,7 +1038,7 @@ ib_mad_t *osm_vendor_get(IN osm_bind_handle_t h_bind,
osm_vendor_t *p_vend = p_bind->p_vend;
ib_api_status_t status;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_get);
+ OSM_LOG_ENTER(p_vend->p_log);
CL_ASSERT(p_vw);
@@ -1083,7 +1083,7 @@ osm_vendor_put(IN osm_bind_handle_t h_bind, IN osm_vend_wrap_t * const p_vw)
osm_vendor_t *p_vend = p_bind->p_vend;
ib_api_status_t status;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_put);
+ OSM_LOG_ENTER(p_vend->p_log);
CL_ASSERT(p_vw);
CL_ASSERT(p_vw->p_elem);
@@ -1120,7 +1120,7 @@ osm_vendor_send(IN osm_bind_handle_t h_bind,
ib_mad_element_t *p_elem;
ib_av_attr_t av;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_send);
+ OSM_LOG_ENTER(p_vend->p_log);
CL_ASSERT(p_vw->h_bind == h_bind);
CL_ASSERT(p_vw->p_elem);
@@ -1255,7 +1255,7 @@ ib_api_status_t osm_vendor_local_lid_change(IN osm_bind_handle_t h_bind)
ib_av_attr_t av;
ib_api_status_t status;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_local_lid_change);
+ OSM_LOG_ENTER(p_vend->p_log);
/*
The only thing we need to do is refresh the directed
@@ -1297,7 +1297,7 @@ void osm_vendor_set_sm(IN osm_bind_handle_t h_bind, IN boolean_t is_sm_val)
ib_api_status_t status;
ib_port_attr_mod_t attr_mod;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_set_sm);
+ OSM_LOG_ENTER(p_vend->p_log);
memset(&attr_mod, 0, sizeof(attr_mod));
diff --git a/opensm/libvendor/osm_vendor_ibumad.c b/opensm/libvendor/osm_vendor_ibumad.c
index 38c6628..061e5b8 100644
--- a/opensm/libvendor/osm_vendor_ibumad.c
+++ b/opensm/libvendor/osm_vendor_ibumad.c
@@ -101,7 +101,7 @@ static void clear_madw(osm_vendor_t * p_vend)
umad_match_t *m, *e, *old_m;
ib_net64_t old_tid;
- OSM_LOG_ENTER(p_vend->p_log, clear_madw);
+ OSM_LOG_ENTER(p_vend->p_log);
pthread_mutex_lock(&p_vend->match_tbl_mutex);
for (m = p_vend->mtbl.tbl, e = m + p_vend->mtbl.max; m < e; m++) {
if (m->tid) {
@@ -250,7 +250,7 @@ static void *umad_receiver(void *p_ptr)
void *umad = 0;
int mad_agent, length;
- OSM_LOG_ENTER(p_ur->p_log, umad_receiver);
+ OSM_LOG_ENTER(p_ur->p_log);
for (;;) {
if (!umad &&
@@ -451,7 +451,7 @@ osm_vendor_init(IN osm_vendor_t * const p_vend,
{
int r, n_cas;
- OSM_LOG_ENTER(p_log, osm_vendor_init);
+ OSM_LOG_ENTER(p_log);
p_vend->p_log = p_log;
p_vend->timeout = timeout;
@@ -492,7 +492,7 @@ osm_vendor_t *osm_vendor_new(IN osm_log_t * const p_log,
{
osm_vendor_t *p_vend = NULL;
- OSM_LOG_ENTER(p_log, osm_vendor_new);
+ OSM_LOG_ENTER(p_log);
if (!timeout) {
osm_log(p_log, OSM_LOG_ERROR,
@@ -549,7 +549,7 @@ osm_vendor_get_all_port_attr(IN osm_vendor_t * const p_vend,
unsigned done = 0;
int r, i, j;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_get_all_port_attr);
+ OSM_LOG_ENTER(p_vend->p_log);
CL_ASSERT(p_vend && p_num_ports);
@@ -614,7 +614,7 @@ osm_vendor_open_port(IN osm_vendor_t * const p_vend,
CL_ASSERT(p_vend);
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_open_port);
+ OSM_LOG_ENTER(p_vend->p_log);
if (p_vend->umad_port_id >= 0) {
umad_port_id = p_vend->umad_port_id;
@@ -770,7 +770,7 @@ osm_vendor_bind(IN osm_vendor_t * const p_vend,
int umad_port_id;
uint8_t rmpp_version;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_bind);
+ OSM_LOG_ENTER(p_vend->p_log);
CL_ASSERT(p_user_bind);
CL_ASSERT(p_mad_pool);
@@ -940,7 +940,7 @@ void osm_vendor_unbind(IN osm_bind_handle_t h_bind)
osm_umad_bind_info_t *p_bind = (osm_umad_bind_info_t *) h_bind;
osm_vendor_t *p_vend = p_bind->p_vend;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_unbind);
+ OSM_LOG_ENTER(p_vend->p_log);
pthread_mutex_lock(&p_vend->cb_mutex);
p_bind->mad_recv_callback = __osm_vendor_recv_dummy_cb;
@@ -959,7 +959,7 @@ ib_mad_t *osm_vendor_get(IN osm_bind_handle_t h_bind,
osm_umad_bind_info_t *p_bind = (osm_umad_bind_info_t *) h_bind;
osm_vendor_t *p_vend = p_bind->p_vend;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_get);
+ OSM_LOG_ENTER(p_vend->p_log);
osm_log(p_vend->p_log, OSM_LOG_DEBUG, "osm_vendor_get: "
"Acquiring UMAD for p_madw = %p, size = %u\n", p_vw, mad_size);
@@ -986,7 +986,7 @@ osm_vendor_put(IN osm_bind_handle_t h_bind, IN osm_vend_wrap_t * const p_vw)
osm_vendor_t *p_vend = p_bind->p_vend;
osm_madw_t *p_madw;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_put);
+ OSM_LOG_ENTER(p_vend->p_log);
CL_ASSERT(p_vw);
@@ -1026,7 +1026,7 @@ osm_vendor_send(IN osm_bind_handle_t h_bind,
uint32_t paylen = 0;
#endif
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_send);
+ OSM_LOG_ENTER(p_vend->p_log);
CL_ASSERT(p_vw->h_bind == h_bind);
CL_ASSERT(p_mad == umad_get_mad(p_vw->umad));
@@ -1124,7 +1124,7 @@ ib_api_status_t osm_vendor_local_lid_change(IN osm_bind_handle_t h_bind)
osm_umad_bind_info_t *p_bind = (osm_umad_bind_info_t *) h_bind;
osm_vendor_t *p_vend = p_bind->p_vend;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_local_lid_change);
+ OSM_LOG_ENTER(p_vend->p_log);
;
OSM_LOG_EXIT(p_vend->p_log);
return (0);
@@ -1137,7 +1137,7 @@ void osm_vendor_set_sm(IN osm_bind_handle_t h_bind, IN boolean_t is_sm_val)
osm_umad_bind_info_t *p_bind = (osm_umad_bind_info_t *) h_bind;
osm_vendor_t *p_vend = p_bind->p_vend;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_set_sm);
+ OSM_LOG_ENTER(p_vend->p_log);
if (TRUE == is_sm_val) {
p_vend->issmfd = open(p_vend->issm_path, O_NONBLOCK);
if (p_vend->issmfd < 0) {
diff --git a/opensm/libvendor/osm_vendor_ibumad_sa.c b/opensm/libvendor/osm_vendor_ibumad_sa.c
index 24f70bb..837d782 100644
--- a/opensm/libvendor/osm_vendor_ibumad_sa.c
+++ b/opensm/libvendor/osm_vendor_ibumad_sa.c
@@ -81,7 +81,7 @@ __osmv_sa_mad_rcv_cb(IN osm_madw_t * p_madw,
ib_sa_mad_t *p_sa_mad;
ib_net16_t mad_status;
- OSM_LOG_ENTER(p_bind->p_log, __osmv_sa_mad_rcv_cb);
+ OSM_LOG_ENTER(p_bind->p_log);
if (!p_req_madw) {
osm_log(p_bind->p_log, OSM_LOG_DEBUG,
@@ -191,7 +191,7 @@ static void __osmv_sa_mad_err_cb(IN void *bind_context, IN osm_madw_t * p_madw)
osmv_query_req_t *p_query_req_copy = NULL;
osmv_query_res_t query_res;
- OSM_LOG_ENTER(p_bind->p_log, __osmv_sa_mad_err_cb);
+ OSM_LOG_ENTER(p_bind->p_log);
/* Obtain the sent context etc */
p_query_req_copy =
@@ -244,7 +244,7 @@ osmv_bind_sa(IN osm_vendor_t * const p_vend,
osmv_sa_bind_info_t *p_sa_bind_info;
cl_status_t cl_status;
- OSM_LOG_ENTER(p_log, osmv_bind_sa);
+ OSM_LOG_ENTER(p_log);
osm_log(p_log, OSM_LOG_DEBUG,
"osmv_bind_sa: "
@@ -367,7 +367,7 @@ __osmv_send_sa_req(IN osmv_sa_bind_info_t * p_bind,
boolean_t sync;
osmv_query_req_t *p_query_req_copy;
- OSM_LOG_ENTER(p_log, __osmv_send_sa_req);
+ OSM_LOG_ENTER(p_log);
/*
since the sm_lid might change we obtain it every send
@@ -502,7 +502,7 @@ osmv_query_sa(IN osm_bind_handle_t h_bind,
osm_log_t *p_log = p_bind->p_log;
ib_api_status_t status;
- OSM_LOG_ENTER(p_log, osmv_query_sa);
+ OSM_LOG_ENTER(p_log);
/* Set the request information. */
sa_mad_data.method = IB_MAD_METHOD_GETTABLE;
diff --git a/opensm/libvendor/osm_vendor_mlx.c b/opensm/libvendor/osm_vendor_mlx.c
index 0b49689..683f56d 100644
--- a/opensm/libvendor/osm_vendor_mlx.c
+++ b/opensm/libvendor/osm_vendor_mlx.c
@@ -69,7 +69,7 @@ osm_vendor_t *osm_vendor_new(IN osm_log_t * const p_log,
ib_api_status_t status;
osm_vendor_t *p_vend;
- OSM_LOG_ENTER(p_log, osm_vendor_new);
+ OSM_LOG_ENTER(p_log);
CL_ASSERT(p_log);
@@ -104,7 +104,7 @@ void osm_vendor_delete(IN osm_vendor_t ** const pp_vend)
osm_bind_handle_t bind_h;
osm_log_t *p_log;
- OSM_LOG_ENTER((*pp_vend)->p_log, osm_vendor_delete);
+ OSM_LOG_ENTER((*pp_vend)->p_log);
p_log = (*pp_vend)->p_log;
/* go over the bind handles , unbind them and remove from list */
@@ -151,7 +151,7 @@ osm_vendor_init(IN osm_vendor_t * const p_vend,
{
ib_api_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(p_log, osm_vendor_init);
+ OSM_LOG_ENTER(p_log);
p_vend->p_transport_info = NULL;
p_vend->p_log = p_log;
@@ -324,7 +324,7 @@ void osm_vendor_unbind(IN osm_bind_handle_t h_bind)
cl_qlist_t *const p_bh_list =
(cl_qlist_t * const)&p_bo->p_vendor->bind_handles;
- OSM_LOG_ENTER(p_log, osm_vendor_unbind);
+ OSM_LOG_ENTER(p_log);
/* go over all the items in the list and remove the specific item */
p_item = cl_qlist_head(p_bh_list);
@@ -365,7 +365,7 @@ ib_mad_t *osm_vendor_get(IN osm_bind_handle_t h_bind,
osm_vendor_t const *p_vend = p_bo->p_vendor;
uint32_t act_mad_size;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_get);
+ OSM_LOG_ENTER(p_vend->p_log);
CL_ASSERT(p_vw);
@@ -422,7 +422,7 @@ osm_vendor_send(IN osm_bind_handle_t h_bind,
ib_mad_t *p_mad;
osm_log_t *p_log = p_bo->p_vendor->p_log;
osm_mad_pool_t *p_mad_pool = p_bo->p_osm_pool;
- OSM_LOG_ENTER(p_log, osm_vendor_send);
+ OSM_LOG_ENTER(p_log);
if (NULL == h_bind || NULL == p_madw ||
NULL == (p_mad = osm_madw_get_mad_ptr(p_madw)) ||
@@ -534,7 +534,7 @@ osm_vendor_put(IN osm_bind_handle_t h_bind, IN osm_vend_wrap_t * const p_vw)
osm_vendor_t const *p_vend = p_bo->p_vendor;
if (p_bo->is_closing != TRUE) {
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_put);
+ OSM_LOG_ENTER(p_vend->p_log);
CL_ASSERT(p_vw);
CL_ASSERT(p_vw->p_mad);
@@ -563,7 +563,7 @@ osm_vendor_put(IN osm_bind_handle_t h_bind, IN osm_vend_wrap_t * const p_vw)
ib_api_status_t osm_vendor_local_lid_change(IN osm_bind_handle_t h_bind)
{
osm_vendor_t const *p_vend = ((osmv_bind_obj_t *) h_bind)->p_vendor;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_local_lid_change);
+ OSM_LOG_ENTER(p_vend->p_log);
osm_log(p_vend->p_log, OSM_LOG_DEBUG,
"osm_vendor_local_lid_change: " "Change of LID.\n");
@@ -589,7 +589,7 @@ void osm_vendor_set_sm(IN osm_bind_handle_t h_bind, IN boolean_t is_sm_val)
VAPI_hca_attr_t attr_mod;
VAPI_hca_attr_mask_t attr_mask;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_set_sm);
+ OSM_LOG_ENTER(p_vend->p_log);
memset(&attr_mod, 0, sizeof(attr_mod));
memset(&attr_mask, 0, sizeof(attr_mask));
@@ -625,7 +625,7 @@ static void __osm_vendor_internal_unbind(osm_bind_handle_t h_bind)
osmv_bind_obj_t *p_bo = (osmv_bind_obj_t *) h_bind;
osm_log_t *p_log = p_bo->p_vendor->p_log;
- OSM_LOG_ENTER(p_log, __osm_vendor_internal_unbind);
+ OSM_LOG_ENTER(p_log);
/* "notifying" all that from now on no new sends can be done */
p_bo->txn_mgr.p_event_wheel->closing = TRUE;
@@ -687,7 +687,7 @@ __osmv_get_send_txn(IN osm_bind_handle_t h_bind,
osmv_bind_obj_t *p_bo = (osmv_bind_obj_t *) h_bind;
ib_mad_t *p_mad = osm_madw_get_mad_ptr(p_madw);
- OSM_LOG_ENTER(p_bo->p_vendor->p_log, __osmv_get_send_txn);
+ OSM_LOG_ENTER(p_bo->p_vendor->p_log);
CL_ASSERT(NULL != pp_txn);
key = tid = cl_ntoh64(p_mad->trans_id);
diff --git a/opensm/libvendor/osm_vendor_mlx_anafa.c b/opensm/libvendor/osm_vendor_mlx_anafa.c
index 447e488..bb04530 100644
--- a/opensm/libvendor/osm_vendor_mlx_anafa.c
+++ b/opensm/libvendor/osm_vendor_mlx_anafa.c
@@ -76,7 +76,7 @@ osm_vendor_t *osm_vendor_new(IN osm_log_t * const p_log,
ib_api_status_t status;
osm_vendor_t *p_vend;
- OSM_LOG_ENTER(p_log, osm_vendor_new);
+ OSM_LOG_ENTER(p_log);
CL_ASSERT(p_log);
@@ -110,7 +110,7 @@ void osm_vendor_delete(IN osm_vendor_t ** const pp_vend)
osm_bind_handle_t bind_h;
osm_log_t *p_log;
- OSM_LOG_ENTER((*pp_vend)->p_log, osm_vendor_delete);
+ OSM_LOG_ENTER((*pp_vend)->p_log);
p_log = (*pp_vend)->p_log;
/* go over the bind handles , unbind them and remove from list */
@@ -165,7 +165,7 @@ osm_vendor_init(IN osm_vendor_t * const p_vend,
char device_file[16];
int device_fd;
- OSM_LOG_ENTER(p_log, osm_vendor_init);
+ OSM_LOG_ENTER(p_log);
p_vend->p_log = p_log;
p_vend->resp_timeout = timeout;
@@ -341,7 +341,7 @@ void osm_vendor_unbind(IN osm_bind_handle_t h_bind)
cl_qlist_t *const p_bh_list =
(cl_qlist_t * const)&p_bo->p_vendor->bind_handles;
- OSM_LOG_ENTER(p_log, osm_vendor_unbind);
+ OSM_LOG_ENTER(p_log);
/* go over all the items in the list and remove the specific item */
p_item = cl_qlist_head(&p_bo->p_vendor->bind_handles);
@@ -379,7 +379,7 @@ ib_mad_t *osm_vendor_get(IN osm_bind_handle_t h_bind,
osm_vendor_t const *p_vend = p_bo->p_vendor;
uint32_t act_mad_size;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_get);
+ OSM_LOG_ENTER(p_vend->p_log);
CL_ASSERT(p_vw);
@@ -435,7 +435,7 @@ osm_vendor_send(IN osm_bind_handle_t h_bind,
osmv_txn_ctx_t *p_txn = NULL;
ib_mad_t *p_mad;
- OSM_LOG_ENTER(p_bo->p_vendor->p_log, osm_vendor_send);
+ OSM_LOG_ENTER(p_bo->p_vendor->p_log);
if (NULL == h_bind || NULL == p_madw ||
NULL == (p_mad = osm_madw_get_mad_ptr(p_madw)) ||
@@ -539,7 +539,7 @@ osm_vendor_put(IN osm_bind_handle_t h_bind, IN osm_vend_wrap_t * const p_vw)
osmv_bind_obj_t *p_bo = (osmv_bind_obj_t *) h_bind;
osm_vendor_t const *p_vend = p_bo->p_vendor;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_put);
+ OSM_LOG_ENTER(p_vend->p_log);
CL_ASSERT(p_vw);
CL_ASSERT(p_vw->p_mad);
@@ -566,7 +566,7 @@ osm_vendor_put(IN osm_bind_handle_t h_bind, IN osm_vend_wrap_t * const p_vw)
ib_api_status_t osm_vendor_local_lid_change(IN osm_bind_handle_t h_bind)
{
osm_vendor_t const *p_vend = ((osmv_bind_obj_t *) h_bind)->p_vendor;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_local_lid_change);
+ OSM_LOG_ENTER(p_vend->p_log);
osm_log(p_vend->p_log, OSM_LOG_DEBUG,
"osm_vendor_local_lid_change: " "Change of LID.\n");
@@ -591,7 +591,7 @@ void osm_vendor_set_sm(IN osm_bind_handle_t h_bind, IN boolean_t is_sm_val)
int ioctl_ret;
osm_ts_set_port_info_ioctl port_info;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_set_sm);
+ OSM_LOG_ENTER(p_vend->p_log);
port_info.port = 0; /* anafa has only 1 port */
port_info.port_info.valid_fields = IB_PORT_IS_SM;
@@ -623,7 +623,7 @@ static void __osm_vendor_internal_unbind(osm_bind_handle_t h_bind)
osmv_bind_obj_t *p_bo = (osmv_bind_obj_t *) h_bind;
osm_log_t *p_log = p_bo->p_vendor->p_log;
- OSM_LOG_ENTER(p_log, __osm_vendor_internal_unbind);
+ OSM_LOG_ENTER(p_log);
/* "notifying" all that from now on no new sends can be done */
p_bo->txn_mgr.p_event_wheel->closing = TRUE;
@@ -678,7 +678,7 @@ __osmv_get_send_txn(IN osm_bind_handle_t h_bind,
osmv_bind_obj_t *p_bo = (osmv_bind_obj_t *) h_bind;
ib_mad_t *p_mad = osm_madw_get_mad_ptr(p_madw);
- OSM_LOG_ENTER(p_bo->p_vendor->p_log, __osmv_get_send_txn);
+ OSM_LOG_ENTER(p_bo->p_vendor->p_log);
CL_ASSERT(NULL != pp_txn);
key = tid = cl_ntoh64(p_mad->trans_id);
diff --git a/opensm/libvendor/osm_vendor_mlx_dispatcher.c b/opensm/libvendor/osm_vendor_mlx_dispatcher.c
index 3956234..d476382 100644
--- a/opensm/libvendor/osm_vendor_mlx_dispatcher.c
+++ b/opensm/libvendor/osm_vendor_mlx_dispatcher.c
@@ -123,7 +123,7 @@ osmv_dispatch_mad(IN osm_bind_handle_t h_bind,
osmv_txn_ctx_t *p_txn = NULL;
osm_log_t *p_log = p_bo->p_vendor->p_log;
- OSM_LOG_ENTER(p_bo->p_vendor->p_log, osmv_dispatch_mad);
+ OSM_LOG_ENTER(p_bo->p_vendor->p_log);
CL_ASSERT(NULL != h_bind && NULL != p_mad && NULL != p_mad_addr);
@@ -243,7 +243,7 @@ __osmv_dispatch_simple_mad(IN osm_bind_handle_t h_bind,
osm_madw_t *p_req_madw = NULL;
osmv_bind_obj_t *p_bo = (osmv_bind_obj_t *) h_bind;
- OSM_LOG_ENTER(p_bo->p_vendor->p_log, __osmv_dispatch_simple_mad);
+ OSM_LOG_ENTER(p_bo->p_vendor->p_log);
/* Build the MAD wrapper to be returned to the user.
* The actual storage for the MAD is allocated there.
@@ -306,7 +306,7 @@ __osmv_dispatch_rmpp_mad(IN osm_bind_handle_t h_bind,
osmv_bind_obj_t *p_bo = (osmv_bind_obj_t *) h_bind;
osm_madw_t *p_madw;
- OSM_LOG_ENTER(p_bo->p_vendor->p_log, __osmv_dispatch_rmpp_mad);
+ OSM_LOG_ENTER(p_bo->p_vendor->p_log);
if (NULL == p_txn) {
if (FALSE == osmv_rmpp_is_data(p_mad)
@@ -397,7 +397,7 @@ __osmv_dispatch_rmpp_snd(IN osm_bind_handle_t h_bind,
uint32_t new_wl = cl_ntoh32(((ib_rmpp_mad_t *) p_mad)->paylen_newwin);
osmv_bind_obj_t *p_bo = (osmv_bind_obj_t *) h_bind;
- OSM_LOG_ENTER(p_bo->p_vendor->p_log, __osmv_dispatch_rmpp_snd);
+ OSM_LOG_ENTER(p_bo->p_vendor->p_log);
if (TRUE == osmv_rmpp_is_abort_stop(p_mad)) {
@@ -496,7 +496,7 @@ __osmv_dispatch_rmpp_rcv(IN osm_bind_handle_t h_bind,
uint64_t key = osmv_txn_get_key(p_txn);
uint64_t tid = osmv_txn_get_tid(p_txn);
- OSM_LOG_ENTER(p_bo->p_vendor->p_log, __osmv_dispatch_rmpp_rcv);
+ OSM_LOG_ENTER(p_bo->p_vendor->p_log);
if (TRUE == osmv_rmpp_is_ack(p_mad)) {
osm_log(p_bo->p_vendor->p_log, OSM_LOG_DEBUG,
@@ -653,7 +653,7 @@ __osmv_dispatch_accept_seg(IN osm_bind_handle_t h_bind,
osmv_bind_obj_t *p_bo = (osmv_bind_obj_t *) h_bind;
uint64_t tid = osmv_txn_get_tid(p_txn);
- OSM_LOG_ENTER(p_bo->p_vendor->p_log, __osmv_dispatch_accept_seg);
+ OSM_LOG_ENTER(p_bo->p_vendor->p_log);
if (seg_num != p_recv_ctx->expected_seg) {
osm_log(p_bo->p_vendor->p_log, OSM_LOG_DEBUG,
diff --git a/opensm/libvendor/osm_vendor_mlx_hca.c b/opensm/libvendor/osm_vendor_mlx_hca.c
index d1cf762..e98e272 100644
--- a/opensm/libvendor/osm_vendor_mlx_hca.c
+++ b/opensm/libvendor/osm_vendor_mlx_hca.c
@@ -94,7 +94,7 @@ __osm_vendor_get_ca_ids(IN osm_vendor_t * const p_vend,
ib_api_status_t status;
VAPI_ret_t vapi_res;
- OSM_LOG_ENTER(p_vend->p_log, __osm_vendor_get_ca_ids);
+ OSM_LOG_ENTER(p_vend->p_log);
CL_ASSERT(p_hca_ids);
CL_ASSERT(p_num_guids);
@@ -177,7 +177,7 @@ __osm_ca_info_init(IN osm_vendor_t * const p_vend,
IB_gid_t *p_port_gid;
uint16_t maxNumGids;
- OSM_LOG_ENTER(p_vend->p_log, __osm_ca_info_init);
+ OSM_LOG_ENTER(p_vend->p_log);
/* get the HCA handle */
vapi_res = EVAPI_get_hca_hndl(ca_id, &hca_hndl);
@@ -271,7 +271,7 @@ osm_ca_info_destroy(IN osm_vendor_t * const p_vend,
osm_ca_info_t *p_ca;
uint8_t i;
- OSM_LOG_ENTER(p_vend->p_log, osm_ca_info_destroy);
+ OSM_LOG_ENTER(p_vend->p_log);
for (i = 0; i < num_ca; i++) {
p_ca = &p_ca_info[i];
@@ -312,7 +312,7 @@ osm_vendor_get_all_port_attr(IN osm_vendor_t * const p_vend,
osm_ca_info_t *p_ca_infos = NULL;
uint32_t attr_array_sz = *p_num_ports;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_get_all_port_attr);
+ OSM_LOG_ENTER(p_vend->p_log);
CL_ASSERT(p_vend);
@@ -418,7 +418,7 @@ osm_vendor_get_guid_ca_and_port(IN osm_vendor_t * const p_vend,
ib_net64_t port_guid;
uint32_t ca, portIdx, ca_count;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_get_guid_ca_and_port);
+ OSM_LOG_ENTER(p_vend->p_log);
CL_ASSERT(p_vend);
diff --git a/opensm/libvendor/osm_vendor_mlx_hca_anafa.c b/opensm/libvendor/osm_vendor_mlx_hca_anafa.c
index 3a0b404..81506e4 100644
--- a/opensm/libvendor/osm_vendor_mlx_hca_anafa.c
+++ b/opensm/libvendor/osm_vendor_mlx_hca_anafa.c
@@ -89,7 +89,7 @@ __osm_ca_info_init(IN osm_vendor_t * const p_vend,
osm_ts_get_port_info_ioctl port_info;
struct ib_get_dev_info_ioctl dev_info;
- OSM_LOG_ENTER(p_vend->p_log, __osm_ca_info_init);
+ OSM_LOG_ENTER(p_vend->p_log);
/* query HCA guid */
ioctl_ret = ioctl(p_tpot_info->device_fd, TS_IB_IOCGDEVINFO, &dev_info);
@@ -159,7 +159,7 @@ osm_vendor_get_all_port_attr(IN osm_vendor_t * const p_vend,
osm_ca_info_t ca_info;
uint32_t attr_array_sz = *p_num_ports;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_get_all_port_attr);
+ OSM_LOG_ENTER(p_vend->p_log);
CL_ASSERT(p_vend);
/* anafa has one port - the user didnt supply enough storage space */
diff --git a/opensm/libvendor/osm_vendor_mlx_hca_pfs.c b/opensm/libvendor/osm_vendor_mlx_hca_pfs.c
index de86496..512b7bf 100644
--- a/opensm/libvendor/osm_vendor_mlx_hca_pfs.c
+++ b/opensm/libvendor/osm_vendor_mlx_hca_pfs.c
@@ -137,7 +137,7 @@ __parse_ca_info_file(IN osm_vendor_t * const p_vend,
int num_ports;
uint32_t len;
- OSM_LOG_ENTER(p_vend->p_log, __parse_ca_info_file);
+ OSM_LOG_ENTER(p_vend->p_log);
osm_log(p_vend->p_log, OSM_LOG_DEBUG,
"__parse_ca_info_file: " "Querying CA %d.\n", idx);
@@ -268,7 +268,7 @@ __parse_port_info_file(IN osm_vendor_t * const p_vend,
int lid, sm_lid, lmc, sm_sl;
uint32_t len;
- OSM_LOG_ENTER(p_vend->p_log, __parse_port_info_file);
+ OSM_LOG_ENTER(p_vend->p_log);
osm_log(p_vend->p_log, OSM_LOG_DEBUG,
"__parse_port_info_file: "
@@ -419,7 +419,7 @@ __get_port_guid_from_port_gid_tbl(IN osm_vendor_t * const p_vend,
int g[8];
uint32_t len;
- OSM_LOG_ENTER(p_vend->p_log, __get_port_guid_from_port_gid_tbl);
+ OSM_LOG_ENTER(p_vend->p_log);
osm_log(p_vend->p_log, OSM_LOG_DEBUG,
"__get_port_guid_from_port_gid_tbl: "
@@ -486,7 +486,7 @@ __osm_ca_info_init(IN osm_vendor_t * const p_vend,
pfs_ca_info_t pfs_ca_info;
- OSM_LOG_ENTER(p_vend->p_log, __osm_ca_info_init);
+ OSM_LOG_ENTER(p_vend->p_log);
/* parse the CA info file */
if (__parse_ca_info_file(p_vend, idx, &pfs_ca_info) != IB_SUCCESS)
@@ -556,7 +556,7 @@ osm_ca_info_destroy(IN osm_vendor_t * const p_vend,
osm_ca_info_t *p_ca;
uint8_t i;
- OSM_LOG_ENTER(p_vend->p_log, osm_ca_info_destroy);
+ OSM_LOG_ENTER(p_vend->p_log);
for (i = 0; i < num_ca; i++) {
p_ca = &p_ca_info[i];
@@ -594,7 +594,7 @@ osm_vendor_get_all_port_attr(IN osm_vendor_t * const p_vend,
osm_ca_info_t *p_ca_infos = NULL;
uint32_t attr_array_sz = *p_num_ports;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_get_all_port_attr);
+ OSM_LOG_ENTER(p_vend->p_log);
CL_ASSERT(p_vend);
@@ -691,7 +691,7 @@ osm_vendor_get_guid_ca_and_port(IN osm_vendor_t * const p_vend,
uint8_t port_num;
ib_api_status_t status = IB_ERROR;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_get_guid_ca_and_port);
+ OSM_LOG_ENTER(p_vend->p_log);
CL_ASSERT(p_vend);
diff --git a/opensm/libvendor/osm_vendor_mlx_hca_sim.c b/opensm/libvendor/osm_vendor_mlx_hca_sim.c
index 975c94f..b6c0193 100644
--- a/opensm/libvendor/osm_vendor_mlx_hca_sim.c
+++ b/opensm/libvendor/osm_vendor_mlx_hca_sim.c
@@ -183,7 +183,7 @@ __parse_ca_info_file(IN osm_vendor_t * const p_vend,
int num_ports;
uint32_t len;
- OSM_LOG_ENTER(p_vend->p_log, __parse_ca_info_file);
+ OSM_LOG_ENTER(p_vend->p_log);
osm_log(p_vend->p_log, OSM_LOG_DEBUG,
"__parse_ca_info_file: " "Querying CA %d.\n", idx);
@@ -314,7 +314,7 @@ __parse_port_info_file(IN osm_vendor_t * const p_vend,
int lid, sm_lid, lmc, sm_sl;
uint32_t len;
- OSM_LOG_ENTER(p_vend->p_log, __parse_port_info_file);
+ OSM_LOG_ENTER(p_vend->p_log);
osm_log(p_vend->p_log, OSM_LOG_DEBUG,
"__parse_port_info_file: "
@@ -465,7 +465,7 @@ __get_port_guid_from_port_gid_tbl(IN osm_vendor_t * const p_vend,
int g[8];
uint32_t len;
- OSM_LOG_ENTER(p_vend->p_log, __get_port_guid_from_port_gid_tbl);
+ OSM_LOG_ENTER(p_vend->p_log);
osm_log(p_vend->p_log, OSM_LOG_DEBUG,
"__get_port_guid_from_port_gid_tbl: "
@@ -532,7 +532,7 @@ __osm_ca_info_init(IN osm_vendor_t * const p_vend,
sim_ca_info_t sim_ca_info;
- OSM_LOG_ENTER(p_vend->p_log, __osm_ca_info_init);
+ OSM_LOG_ENTER(p_vend->p_log);
/* parse the CA info file */
if (__parse_ca_info_file(p_vend, idx, &sim_ca_info) != IB_SUCCESS)
@@ -602,7 +602,7 @@ osm_ca_info_destroy(IN osm_vendor_t * const p_vend,
osm_ca_info_t *p_ca;
uint8_t i;
- OSM_LOG_ENTER(p_vend->p_log, osm_ca_info_destroy);
+ OSM_LOG_ENTER(p_vend->p_log);
for (i = 0; i < num_ca; i++) {
p_ca = &p_ca_info[i];
@@ -640,7 +640,7 @@ osm_vendor_get_all_port_attr(IN osm_vendor_t * const p_vend,
osm_ca_info_t *p_ca_infos = NULL;
uint32_t attr_array_sz = *p_num_ports;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_get_all_port_attr);
+ OSM_LOG_ENTER(p_vend->p_log);
CL_ASSERT(p_vend);
@@ -737,7 +737,7 @@ osm_vendor_get_guid_ca_and_port(IN osm_vendor_t * const p_vend,
uint8_t port_num;
ib_api_status_t status = IB_ERROR;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_get_guid_ca_and_port);
+ OSM_LOG_ENTER(p_vend->p_log);
CL_ASSERT(p_vend);
@@ -809,7 +809,7 @@ osm_vendor_get_guid_by_ca_and_port(IN osm_vendor_t * const p_vend,
uint32_t ca_count = 0;
ib_api_status_t status = IB_ERROR;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_get_guid_by_ca_and_port);
+ OSM_LOG_ENTER(p_vend->p_log);
CL_ASSERT(p_vend);
diff --git a/opensm/libvendor/osm_vendor_mlx_ibmgt.c b/opensm/libvendor/osm_vendor_mlx_ibmgt.c
index b3d72f7..3bdc08a 100644
--- a/opensm/libvendor/osm_vendor_mlx_ibmgt.c
+++ b/opensm/libvendor/osm_vendor_mlx_ibmgt.c
@@ -375,7 +375,7 @@ osmv_transport_mad_send(IN const osm_bind_handle_t h_bind,
IB_MGT_ret_t ret;
ib_mad_t *p_mad = p_ib_mad;
- OSM_LOG_ENTER(p_vend->p_log, osmv_transport_mad_send);
+ OSM_LOG_ENTER(p_vend->p_log);
CL_ASSERT(p_bo->p_vendor->p_transport_info);
@@ -482,7 +482,7 @@ void osmv_transport_done(IN const osm_bind_handle_t h_bind)
int i;
cl_qlist_t *p_list = NULL;
- OSM_LOG_ENTER(p_log, osmv_transport_done);
+ OSM_LOG_ENTER(p_log);
CL_ASSERT(p_bo);
diff --git a/opensm/libvendor/osm_vendor_mlx_rmpp_ctx.c b/opensm/libvendor/osm_vendor_mlx_rmpp_ctx.c
index af1fd23..bbd42c3 100644
--- a/opensm/libvendor/osm_vendor_mlx_rmpp_ctx.c
+++ b/opensm/libvendor/osm_vendor_mlx_rmpp_ctx.c
@@ -120,7 +120,7 @@ osmv_rmpp_send_ctx_get_seg(IN osmv_rmpp_send_ctx_t * p_send_ctx,
uint32_t num_segs, paylen = 0;
ib_rmpp_mad_t *p_rmpp_mad;
- OSM_LOG_ENTER(p_send_ctx->p_log, osmv_rmpp_send_ctx_get_seg);
+ OSM_LOG_ENTER(p_send_ctx->p_log);
CL_ASSERT(p_send_ctx);
st = osmv_rmpp_sar_get_mad_seg(&p_send_ctx->sar, seg_idx, p_buf);
@@ -236,7 +236,7 @@ osmv_rmpp_recv_ctx_store_mad_seg(IN osmv_rmpp_recv_ctx_t * p_recv_ctx,
cl_list_obj_t *p_obj = NULL;
void *p_list_mad;
- OSM_LOG_ENTER(p_recv_ctx->p_log, osmv_rmpp_recv_ctx_store_mad_seg);
+ OSM_LOG_ENTER(p_recv_ctx->p_log);
CL_ASSERT(p_recv_ctx);
p_list_mad = malloc(MAD_BLOCK_SIZE);
diff --git a/opensm/libvendor/osm_vendor_mlx_sa.c b/opensm/libvendor/osm_vendor_mlx_sa.c
index aeb8542..efd04bd 100644
--- a/opensm/libvendor/osm_vendor_mlx_sa.c
+++ b/opensm/libvendor/osm_vendor_mlx_sa.c
@@ -83,7 +83,7 @@ __osmv_sa_mad_rcv_cb(IN osm_madw_t * p_madw,
ib_sa_mad_t *p_sa_mad;
ib_net16_t mad_status;
- OSM_LOG_ENTER(p_bind->p_log, __osmv_sa_mad_rcv_cb);
+ OSM_LOG_ENTER(p_bind->p_log);
if (!p_req_madw) {
osm_log(p_bind->p_log, OSM_LOG_DEBUG,
@@ -189,7 +189,7 @@ void __osmv_sa_mad_err_cb(IN void *bind_context, IN osm_madw_t * p_madw)
osmv_query_req_t *p_query_req_copy = NULL;
osmv_query_res_t query_res;
- OSM_LOG_ENTER(p_bind->p_log, __osmv_sa_mad_err_cb);
+ OSM_LOG_ENTER(p_bind->p_log);
/* Obtain the sent context etc */
p_query_req_copy =
@@ -237,7 +237,7 @@ __osmv_get_lid_and_sm_lid_by_port_guid(IN osm_vendor_t * const p_vend,
uint32_t num_ports;
uint32_t port_num;
- OSM_LOG_ENTER(p_vend->p_log, __osmv_get_lid_and_sm_lid_by_port_guid);
+ OSM_LOG_ENTER(p_vend->p_log);
/* use prevous values if current time is close enough to previous query */
if (cl_get_time_stamp_sec() <= *p_lids_update_time_sec + 30) {
@@ -319,7 +319,7 @@ osmv_bind_sa(IN osm_vendor_t * const p_vend,
osmv_sa_bind_info_t *p_sa_bind_info;
cl_status_t cl_status;
- OSM_LOG_ENTER(p_log, osmv_bind_sa);
+ OSM_LOG_ENTER(p_log);
osm_log(p_log, OSM_LOG_DEBUG,
"osmv_bind_sa: "
@@ -457,7 +457,7 @@ __osmv_send_sa_req(IN osmv_sa_bind_info_t * p_bind,
boolean_t sync;
osmv_query_req_t *p_query_req_copy;
- OSM_LOG_ENTER(p_log, __osmv_send_sa_req);
+ OSM_LOG_ENTER(p_log);
/*
since the sm_lid might change we obtain it every send
@@ -590,7 +590,7 @@ osmv_query_sa(IN osm_bind_handle_t h_bind,
osm_log_t *p_log = p_bind->p_log;
ib_api_status_t status;
- OSM_LOG_ENTER(p_log, osmv_query_sa);
+ OSM_LOG_ENTER(p_log);
/* Set the request information. */
sa_mad_data.method = IB_MAD_METHOD_GETTABLE;
diff --git a/opensm/libvendor/osm_vendor_mlx_sender.c b/opensm/libvendor/osm_vendor_mlx_sender.c
index 6e3fc3c..a0bdef8 100644
--- a/opensm/libvendor/osm_vendor_mlx_sender.c
+++ b/opensm/libvendor/osm_vendor_mlx_sender.c
@@ -71,7 +71,7 @@ osmv_simple_send_madw(IN osm_bind_handle_t h_bind,
ib_mad_t *p_mad = (ib_mad_t *) mad_buf;
uint64_t key = 0;
- OSM_LOG_ENTER(p_bo->p_vendor->p_log, osmv_simple_send_madw);
+ OSM_LOG_ENTER(p_bo->p_vendor->p_log);
CL_ASSERT(p_madw->mad_size <= MAD_BLOCK_SIZE);
@@ -144,7 +144,7 @@ osmv_rmpp_send_madw(IN osm_bind_handle_t h_bind,
osmv_rmpp_send_ctx_t *p_send_ctx = osmv_txn_get_rmpp_send_ctx(p_txn);
osmv_bind_obj_t *p_bo = (osmv_bind_obj_t *) h_bind;
- OSM_LOG_ENTER(p_bo->p_vendor->p_log, osmv_rmpp_send_madw);
+ OSM_LOG_ENTER(p_bo->p_vendor->p_log);
total_segs = osmv_rmpp_send_ctx_get_num_segs(p_send_ctx);
CL_ASSERT(total_segs >= 1);
@@ -317,7 +317,7 @@ __osmv_rmpp_send_segment(IN osm_bind_handle_t h_bind,
uint32_t timeout = p_bo->p_vendor->resp_timeout;
uint64_t key;
- OSM_LOG_ENTER(p_bo->p_vendor->p_log, __osmv_rmpp_send_segment);
+ OSM_LOG_ENTER(p_bo->p_vendor->p_log);
#ifdef OSMV_RANDOM_DROP
if (TRUE == osmv_random_drop()) {
diff --git a/opensm/libvendor/osm_vendor_mlx_sim.c b/opensm/libvendor/osm_vendor_mlx_sim.c
index c700759..3ec4ac4 100644
--- a/opensm/libvendor/osm_vendor_mlx_sim.c
+++ b/opensm/libvendor/osm_vendor_mlx_sim.c
@@ -92,8 +92,7 @@ void __osmv_ibms_receiver_callback(void *p_ctx, ibms_mad_msg_t * p_mad)
return;
{
- OSM_LOG_ENTER(p_bo->p_vendor->p_log,
- __osmv_ibms_receiver_callback);
+ OSM_LOG_ENTER(p_bo->p_vendor->p_log);
/* some logging */
osm_log(p_bo->p_vendor->p_log, OSM_LOG_DEBUG,
@@ -253,7 +252,7 @@ osmv_transport_mad_send(IN const osm_bind_handle_t h_bind,
const ib_mad_t *p_mad_hdr = p_mad;
- OSM_LOG_ENTER(p_vend->p_log, osmv_transport_mad_send);
+ OSM_LOG_ENTER(p_vend->p_log);
memset(&mad_msg, 0, sizeof(mad_msg));
@@ -418,7 +417,7 @@ void osm_vendor_set_sm(IN osm_bind_handle_t h_bind, IN boolean_t is_sm_val)
int ret;
ibms_cap_msg_t cap_msg;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_set_sm);
+ OSM_LOG_ENTER(p_vend->p_log);
cap_msg.mask = IB_PORT_CAP_IS_SM;
if (is_sm_val)
diff --git a/opensm/libvendor/osm_vendor_mlx_ts.c b/opensm/libvendor/osm_vendor_mlx_ts.c
index f5ca136..e9c50e3 100644
--- a/opensm/libvendor/osm_vendor_mlx_ts.c
+++ b/opensm/libvendor/osm_vendor_mlx_ts.c
@@ -84,7 +84,7 @@ void __osmv_TOPSPIN_receiver_thr(void *p_ctx)
osmv_bind_obj_t *const p_bo = (osmv_bind_obj_t *) p_ctx;
ib_api_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(p_bo->p_vendor->p_log, __osmv_TOPSPIN_receiver_thr);
+ OSM_LOG_ENTER(p_bo->p_vendor->p_log);
/* Make sure the p_bo object is still relevant */
if ((p_bo->magic_ptr != p_bo) || p_bo->is_closing)
@@ -285,7 +285,7 @@ osmv_transport_mad_send(IN const osm_bind_handle_t h_bind,
const ib_mad_t *p_mad_hdr = p_mad;
- OSM_LOG_ENTER(p_vend->p_log, osmv_transport_mad_send);
+ OSM_LOG_ENTER(p_vend->p_log);
memset(&ts_mad, 0, sizeof(ts_mad));
@@ -484,7 +484,7 @@ void osm_vendor_set_sm(IN osm_bind_handle_t h_bind, IN boolean_t is_sm_val)
((osmv_TOPSPIN_transport_mgr_t *) (p_bo->p_transp_mgr))->device_fd;
struct ib_set_port_info_ioctl set_port_data;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_set_sm);
+ OSM_LOG_ENTER(p_vend->p_log);
memset(&set_port_data, 0, sizeof(set_port_data));
diff --git a/opensm/libvendor/osm_vendor_mlx_ts_anafa.c b/opensm/libvendor/osm_vendor_mlx_ts_anafa.c
index 9cbe1b6..1acd706 100644
--- a/opensm/libvendor/osm_vendor_mlx_ts_anafa.c
+++ b/opensm/libvendor/osm_vendor_mlx_ts_anafa.c
@@ -80,7 +80,7 @@ void __osmv_TOPSPIN_ANAFA_receiver_thr(void *p_ctx)
osmv_bind_obj_t *const p_bo = (osmv_bind_obj_t *) p_ctx;
ib_api_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(p_bo->p_vendor->p_log, __osmv_TOPSPIN_ANAFA_receiver_thr);
+ OSM_LOG_ENTER(p_bo->p_vendor->p_log);
/* Make sure the p_bo object is still relevant */
if ((p_bo->magic_ptr != p_bo) || p_bo->is_closing)
@@ -272,7 +272,7 @@ osmv_transport_mad_send(IN const osm_bind_handle_t h_bind,
const ib_mad_t *p_mad_hdr = p_mad;
- OSM_LOG_ENTER(p_vend->p_log, osmv_transport_mad_send);
+ OSM_LOG_ENTER(p_vend->p_log);
/* Make sure the p_bo object is still relevant */
if (p_bo->magic_ptr != p_bo)
diff --git a/opensm/libvendor/osm_vendor_mlx_txn.c b/opensm/libvendor/osm_vendor_mlx_txn.c
index c158b9d..a2da75a 100644
--- a/opensm/libvendor/osm_vendor_mlx_txn.c
+++ b/opensm/libvendor/osm_vendor_mlx_txn.c
@@ -71,7 +71,7 @@ osmv_txn_init(IN osm_bind_handle_t h_bind,
osmv_txn_ctx_t *p_txn;
osmv_bind_obj_t *p_bo = (osmv_bind_obj_t *) h_bind;
- OSM_LOG_ENTER(p_bo->p_vendor->p_log, osmv_txn_init);
+ OSM_LOG_ENTER(p_bo->p_vendor->p_log);
CL_ASSERT(NULL != h_bind && NULL != pp_txn);
@@ -227,7 +227,7 @@ osmv_txn_done(IN osm_bind_handle_t h_bind,
osmv_txn_ctx_t *p_ctx;
osmv_bind_obj_t *const p_bo = (osmv_bind_obj_t *) h_bind;
- OSM_LOG_ENTER(p_bo->p_vendor->p_log, osmv_txn_done);
+ OSM_LOG_ENTER(p_bo->p_vendor->p_log);
CL_ASSERT(h_bind);
@@ -280,7 +280,7 @@ void osmv_txn_abort_rmpp_txns(osm_bind_handle_t h_bind)
osmv_rmpp_send_ctx_t *p_send_ctx;
cl_qmap_t *p_map = p_bo->txn_mgr.p_txn_map;
- OSM_LOG_ENTER(p_bo->p_vendor->p_log, osmv_txn_abort_rmpp_txns);
+ OSM_LOG_ENTER(p_bo->p_vendor->p_log);
while (FALSE == cl_is_qmap_empty(p_map)) {
@@ -364,7 +364,7 @@ __osmv_txnmgr_lookup(IN osmv_txn_mgr_t * p_tx_mgr,
uint64_t tmp_key;
- OSM_LOG_ENTER(p_tx_mgr->p_log, __osmv_txnmgr_lookup);
+ OSM_LOG_ENTER(p_tx_mgr->p_log);
CL_ASSERT(p_tx_mgr);
CL_ASSERT(pp_txn);
@@ -441,7 +441,7 @@ __osmv_txnmgr_remove_txn(IN osmv_txn_mgr_t * p_tx_mgr,
cl_map_obj_t *p_obj;
cl_map_item_t *p_item;
- OSM_LOG_ENTER(p_tx_mgr->p_log, __osmv_txnmgr_remove_txn);
+ OSM_LOG_ENTER(p_tx_mgr->p_log);
CL_ASSERT(p_tx_mgr);
CL_ASSERT(pp_txn);
@@ -474,7 +474,7 @@ void __osmv_txn_all_done(osm_bind_handle_t h_bind)
cl_map_obj_t *p_obj;
osmv_txn_ctx_t *p_txn;
- OSM_LOG_ENTER(p_bo->p_vendor->p_log, __osmv_txn_all_done);
+ OSM_LOG_ENTER(p_bo->p_vendor->p_log);
p_item = cl_qmap_head(p_bo->txn_mgr.p_txn_map);
while (p_item != cl_qmap_end(p_bo->txn_mgr.p_txn_map)) {
@@ -535,7 +535,7 @@ __osmv_txn_timeout_cb(IN uint64_t key,
osm_mad_addr_t *p_mad_addr;
boolean_t invoke_err_cb = FALSE;
- OSM_LOG_ENTER(p_bo->p_vendor->p_log, __osmv_txn_timeout_cb);
+ OSM_LOG_ENTER(p_bo->p_vendor->p_log);
/* Don't try to acquire a lock on the Bind Object -
* it's taken by the mechanism that drives the timeout based events!
diff --git a/opensm/libvendor/osm_vendor_mtl.c b/opensm/libvendor/osm_vendor_mtl.c
index d8f6715..7f6c0cd 100644
--- a/opensm/libvendor/osm_vendor_mtl.c
+++ b/opensm/libvendor/osm_vendor_mtl.c
@@ -186,7 +186,7 @@ void __osm_vendor_clear_sm(IN osm_bind_handle_t h_bind)
VAPI_hca_attr_t attr_mod;
VAPI_hca_attr_mask_t attr_mask;
- OSM_LOG_ENTER(p_vend->p_log, __osm_vendor_clear_sm);
+ OSM_LOG_ENTER(p_vend->p_log);
memset(&attr_mod, 0, sizeof(attr_mod));
memset(&attr_mask, 0, sizeof(attr_mask));
@@ -222,7 +222,7 @@ void osm_vendor_destroy(IN osm_vendor_t * const p_vend)
{
osm_vendor_mgt_bind_t *vendor_mgt_bind_p;
IB_MGT_ret_t mgt_ret;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_destroy);
+ OSM_LOG_ENTER(p_vend->p_log);
if (p_vend->h_al != NULL) {
vendor_mgt_bind_p = (osm_vendor_mgt_bind_t *) p_vend->h_al;
@@ -312,7 +312,7 @@ osm_vendor_init(IN osm_vendor_t * const p_vend,
osm_vendor_mgt_bind_t *ib_mgt_hdl_p;
ib_api_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(p_log, osm_vendor_init);
+ OSM_LOG_ENTER(p_log);
p_vend->p_log = p_log;
@@ -352,7 +352,7 @@ osm_vendor_t *osm_vendor_new(IN osm_log_t * const p_log,
ib_api_status_t status;
osm_vendor_t *p_vend;
- OSM_LOG_ENTER(p_log, osm_vendor_new);
+ OSM_LOG_ENTER(p_log);
CL_ASSERT(p_log);
@@ -392,7 +392,7 @@ __osm_mtl_rcv_callback(IN IB_MGT_mad_hndl_t mad_hndl,
ib_mad_t *mad_buf_p;
osm_log_t *const p_log = bind_info_p->p_vend->p_log;
- OSM_LOG_ENTER(p_log, __osm_mtl_rcv_callback);
+ OSM_LOG_ENTER(p_log);
/* if it is a response MAD we mustbe able to get the request */
if (ib_mad_is_response((ib_mad_t *) payload_p)) {
@@ -525,7 +525,7 @@ __osm_mtl_send_callback(IN IB_MGT_mad_hndl_t mad_hndl,
osm_vend_wrap_t *p_vw;
uint8_t is_resp;
- OSM_LOG_ENTER(p_log, __osm_mtl_send_callback);
+ OSM_LOG_ENTER(p_log);
/* obtain the madp from the wrid */
__osm_set_p_madw_and_resp_by_wrid(wrid, &is_resp, &madw_p);
@@ -609,7 +609,7 @@ osm_vendor_bind(IN osm_vendor_t * const p_vend,
osm_vendor_mgt_bind_t *ib_mgt_hdl_p;
IB_MGT_ret_t mgt_ret;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_bind);
+ OSM_LOG_ENTER(p_vend->p_log);
CL_ASSERT(p_user_bind);
CL_ASSERT(p_mad_pool);
@@ -819,7 +819,7 @@ ib_mad_t *osm_vendor_get(IN osm_bind_handle_t h_bind,
osm_mtl_bind_info_t *p_bind = (osm_mtl_bind_info_t *) h_bind;
osm_vendor_t *p_vend = p_bind->p_vend;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_get);
+ OSM_LOG_ENTER(p_vend->p_log);
CL_ASSERT(p_vw);
/* HACK: We know we can not send through IB_MGT */
@@ -865,7 +865,7 @@ osm_vendor_put(IN osm_bind_handle_t h_bind, IN osm_vend_wrap_t * const p_vw)
osm_vendor_t *p_vend = p_bind->p_vend;
osm_madw_t *p_madw;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_put);
+ OSM_LOG_ENTER(p_vend->p_log);
CL_ASSERT(p_vw);
CL_ASSERT(p_vw->mad_buf_p);
@@ -909,7 +909,7 @@ osm_mtl_send_mad(IN osm_mtl_bind_info_t * p_bind, IN osm_madw_t * const p_madw)
uint64_t wrid;
uint32_t qpn;
- OSM_LOG_ENTER(p_vend->p_log, osm_mtl_send_mad);
+ OSM_LOG_ENTER(p_vend->p_log);
/*
* For all sends other than directed route SM MADs,
@@ -1004,7 +1004,7 @@ osm_vendor_send(IN osm_bind_handle_t h_bind,
osm_vend_wrap_t *const p_vw = osm_madw_get_vend_ptr(p_madw);
ib_api_status_t status;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_send);
+ OSM_LOG_ENTER(p_vend->p_log);
/*
* If a response is expected to this MAD, then preallocate
@@ -1056,7 +1056,7 @@ ib_api_status_t osm_vendor_local_lid_change(IN osm_bind_handle_t h_bind)
{
osm_vendor_t *p_vend = ((osm_mtl_bind_info_t *) h_bind)->p_vend;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_local_lid_change);
+ OSM_LOG_ENTER(p_vend->p_log);
osm_log(p_vend->p_log, OSM_LOG_DEBUG,
"osm_vendor_local_lid_change: DEBUG 2202: " "Change of LID.\n");
@@ -1076,7 +1076,7 @@ void osm_vendor_set_sm(IN osm_bind_handle_t h_bind, IN boolean_t is_sm_val)
VAPI_hca_attr_t attr_mod;
VAPI_hca_attr_mask_t attr_mask;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_set_sm);
+ OSM_LOG_ENTER(p_vend->p_log);
memset(&attr_mod, 0, sizeof(attr_mod));
memset(&attr_mask, 0, sizeof(attr_mask));
diff --git a/opensm/libvendor/osm_vendor_mtl_hca_guid.c b/opensm/libvendor/osm_vendor_mtl_hca_guid.c
index 34e7ad0..d78af31 100644
--- a/opensm/libvendor/osm_vendor_mtl_hca_guid.c
+++ b/opensm/libvendor/osm_vendor_mtl_hca_guid.c
@@ -114,7 +114,7 @@ __osm_vendor_get_ca_ids(IN osm_vendor_t * const p_vend,
ib_api_status_t status;
VAPI_ret_t vapi_res;
- OSM_LOG_ENTER(p_vend->p_log, __osm_vendor_get_ca_ids);
+ OSM_LOG_ENTER(p_vend->p_log);
CL_ASSERT(p_hca_ids);
CL_ASSERT(p_num_guids);
@@ -197,7 +197,7 @@ __osm_ca_info_init(IN osm_vendor_t * const p_vend,
IB_gid_t *p_port_gid;
uint16_t maxNumGids;
- OSM_LOG_ENTER(p_vend->p_log, __osm_ca_info_init);
+ OSM_LOG_ENTER(p_vend->p_log);
/* get the HCA handle */
vapi_res = EVAPI_get_hca_hndl(ca_id, &hca_hndl);
@@ -288,7 +288,7 @@ void
osm_ca_info_destroy(IN osm_vendor_t * const p_vend,
IN osm_ca_info_t * const p_ca_info)
{
- OSM_LOG_ENTER(p_vend->p_log, osm_ca_info_destroy);
+ OSM_LOG_ENTER(p_vend->p_log);
if (p_ca_info->p_attr) {
if (p_ca_info->p_attr->num_ports) {
@@ -323,7 +323,7 @@ osm_vendor_get_all_port_attr(IN osm_vendor_t * const p_vend,
VAPI_hca_id_t *p_ca_ids = NULL;
osm_ca_info_t *p_ca_info;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_get_all_port_attr);
+ OSM_LOG_ENTER(p_vend->p_log);
CL_ASSERT(p_vend);
@@ -436,7 +436,7 @@ osm_vendor_get_guid_ca_and_port(IN osm_vendor_t * const p_vend,
ib_net64_t port_guid;
uint32_t ca, portIdx, ca_count;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_get_guid_ca_and_port);
+ OSM_LOG_ENTER(p_vend->p_log);
CL_ASSERT(p_vend);
diff --git a/opensm/libvendor/osm_vendor_mtl_transaction_mgr.c b/opensm/libvendor/osm_vendor_mtl_transaction_mgr.c
index 30d8bd0..6e8afb0 100644
--- a/opensm/libvendor/osm_vendor_mtl_transaction_mgr.c
+++ b/opensm/libvendor/osm_vendor_mtl_transaction_mgr.c
@@ -73,7 +73,7 @@ void __osm_transaction_mgr_callback(IN void *context)
cl_list_t retry_madw_p_list; /* this list will include all the madw_p that were retried and need to be removed. */
osm_madw_t *madw_p;
- OSM_LOG_ENTER(p_vend->p_log, __osm_transaction_mgr_callback);
+ OSM_LOG_ENTER(p_vend->p_log);
trans_mgr_p = (osm_transaction_mgr_t *) p_vend->p_transaction_mgr;
@@ -273,7 +273,7 @@ void osm_transaction_mgr_init(IN osm_vendor_t * const p_vend)
{
cl_status_t cl_status;
osm_transaction_mgr_t *trans_mgr_p;
- OSM_LOG_ENTER(p_vend->p_log, osm_transaction_mgr_init);
+ OSM_LOG_ENTER(p_vend->p_log);
CL_ASSERT(p_vend->p_transaction_mgr == NULL);
@@ -319,7 +319,7 @@ void osm_transaction_mgr_destroy(IN osm_vendor_t * const p_vend)
cl_map_item_t *p_map_item;
osm_madw_req_t *osm_madw_req_p;
- OSM_LOG_ENTER(p_vend->p_log, osm_transaction_mgr_destroy);
+ OSM_LOG_ENTER(p_vend->p_log);
trans_mgr_p = (osm_transaction_mgr_t *) p_vend->p_transaction_mgr;
@@ -390,7 +390,7 @@ osm_transaction_mgr_insert_madw(IN osm_bind_handle_t * const p_bind,
uint64_t key;
const ib_mad_t *mad_p = p_madw->p_mad;
- OSM_LOG_ENTER(p_vend->p_log, osm_transaction_mgr_insert_madw);
+ OSM_LOG_ENTER(p_vend->p_log);
CL_ASSERT(mad_p);
@@ -450,7 +450,7 @@ osm_transaction_mgr_erase_madw(IN osm_vendor_t * const p_vend,
osm_madw_req_t *osm_madw_req_p;
uint64_t key;
cl_map_item_t *p_map_item;
- OSM_LOG_ENTER(p_vend->p_log, osm_transaction_mgr_erase_madw);
+ OSM_LOG_ENTER(p_vend->p_log);
trans_mgr_p = (osm_transaction_mgr_t *) p_vend->p_transaction_mgr;
@@ -501,7 +501,7 @@ osm_transaction_mgr_get_madw_for_tid(IN osm_vendor_t * const p_vend,
osm_madw_req_t *osm_madw_req_p;
cl_map_item_t *p_map_item;
uint64_t key;
- OSM_LOG_ENTER(p_vend->p_log, osm_transaction_mgr_get_madw_for_tid);
+ OSM_LOG_ENTER(p_vend->p_log);
trans_mgr_p = (osm_transaction_mgr_t *) p_vend->p_transaction_mgr;
diff --git a/opensm/libvendor/osm_vendor_test.c b/opensm/libvendor/osm_vendor_test.c
index 30a43f9..cda8cf7 100644
--- a/opensm/libvendor/osm_vendor_test.c
+++ b/opensm/libvendor/osm_vendor_test.c
@@ -91,7 +91,7 @@ ib_api_status_t
osm_vendor_init(IN osm_vendor_t * const p_vend,
IN osm_log_t * const p_log, IN const uint32_t timeout)
{
- OSM_LOG_ENTER(p_log, osm_vendor_init);
+ OSM_LOG_ENTER(p_log);
CL_ASSERT(p_vend);
CL_ASSERT(p_log);
@@ -109,7 +109,7 @@ osm_vendor_t *osm_vendor_new(IN osm_log_t * const p_log,
{
ib_api_status_t status;
osm_vendor_t *p_vend;
- OSM_LOG_ENTER(p_log, osm_vendor_new);
+ OSM_LOG_ENTER(p_log);
CL_ASSERT(p_log);
@@ -135,7 +135,7 @@ ib_mad_t *osm_vendor_get(IN osm_bind_handle_t h_bind,
{
osm_vendor_t *p_vend;
ib_mad_t *p_mad;
- OSM_LOG_ENTER(h_bind->p_vend->p_log, osm_vendor_get);
+ OSM_LOG_ENTER(h_bind->p_vend->p_log);
UNUSED_PARAM(p_vend_wrap);
@@ -165,7 +165,7 @@ osm_vendor_put(IN osm_bind_handle_t h_bind,
{
osm_vendor_t *p_vend;
- OSM_LOG_ENTER(h_bind->p_vend->p_log, osm_vendor_put);
+ OSM_LOG_ENTER(h_bind->p_vend->p_log);
UNUSED_PARAM(p_vend_wrap);
@@ -193,7 +193,7 @@ osm_vendor_send(IN osm_bind_handle_t h_bind,
{
osm_vendor_t *p_vend = h_bind->p_vend;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_send);
+ OSM_LOG_ENTER(p_vend->p_log);
UNUSED_PARAM(p_vend_wrap);
UNUSED_PARAM(p_mad_addr);
@@ -218,7 +218,7 @@ osm_vendor_bind(IN osm_vendor_t * const p_vend,
{
osm_bind_handle_t h_bind;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_bind);
+ OSM_LOG_ENTER(p_vend->p_log);
CL_ASSERT(p_vend);
CL_ASSERT(p_bind_info);
@@ -256,7 +256,7 @@ osm_vendor_get_ports(IN osm_vendor_t * const p_vend,
IN ib_net64_t * const p_guids,
IN uint32_t * const num_guids)
{
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_get_ports);
+ OSM_LOG_ENTER(p_vend->p_log);
*p_guids = CL_NTOH64(0x0000000000001234);
*num_guids = 1;
@@ -271,7 +271,7 @@ ib_api_status_t osm_vendor_local_lid_change(IN osm_bind_handle_t h_bind)
{
osm_vendor_t *p_vend = h_bind->p_vend;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_local_lid_change);
+ OSM_LOG_ENTER(p_vend->p_log);
OSM_LOG_EXIT(p_vend->p_log);
diff --git a/opensm/libvendor/osm_vendor_ts.c b/opensm/libvendor/osm_vendor_ts.c
index 365d609..6f20b82 100644
--- a/opensm/libvendor/osm_vendor_ts.c
+++ b/opensm/libvendor/osm_vendor_ts.c
@@ -148,7 +148,7 @@ void __osm_vendor_clear_sm(IN osm_bind_handle_t h_bind)
VAPI_hca_attr_t attr_mod;
VAPI_hca_attr_mask_t attr_mask;
- OSM_LOG_ENTER(p_vend->p_log, __osm_vendor_clear_sm);
+ OSM_LOG_ENTER(p_vend->p_log);
memset(&attr_mod, 0, sizeof(attr_mod));
memset(&attr_mask, 0, sizeof(attr_mask));
@@ -184,7 +184,7 @@ void osm_vendor_construct(IN osm_vendor_t * const p_vend)
**********************************************************************/
void osm_vendor_destroy(IN osm_vendor_t * const p_vend)
{
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_destroy);
+ OSM_LOG_ENTER(p_vend->p_log);
osm_transaction_mgr_destroy(p_vend);
/* Destroy the poller threads */
@@ -218,7 +218,7 @@ osm_vendor_init(IN osm_vendor_t * const p_vend,
{
ib_api_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(p_log, osm_vendor_init);
+ OSM_LOG_ENTER(p_log);
p_vend->p_log = p_log;
p_vend->p_transaction_mgr = NULL;
@@ -242,7 +242,7 @@ osm_vendor_t *osm_vendor_new(IN osm_log_t * const p_log,
ib_api_status_t status;
osm_vendor_t *p_vend;
- OSM_LOG_ENTER(p_log, osm_vendor_new);
+ OSM_LOG_ENTER(p_log);
CL_ASSERT(p_log);
@@ -280,7 +280,7 @@ __osm_ts_rcv_callback(IN osm_ts_bind_info_t * p_bind,
ib_mad_t *p_mad_buf;
osm_log_t *const p_log = p_bind->p_vend->p_log;
- OSM_LOG_ENTER(p_log, __osm_ts_rcv_callback);
+ OSM_LOG_ENTER(p_log);
/* if it is a response MAD we mustbe able to get the request */
if (ib_mad_is_response((ib_mad_t *) p_mad)) {
@@ -381,7 +381,7 @@ __osm_ts_send_callback(IN osm_ts_bind_info_t * bind_info_p,
osm_log_t *const p_log = bind_info_p->p_vend->p_log;
osm_vend_wrap_t *p_vw;
- OSM_LOG_ENTER(p_log, __osm_ts_send_callback);
+ OSM_LOG_ENTER(p_log);
osm_log(p_log, OSM_LOG_DEBUG,
"__osm_ts_send_callback: INFO 1008: "
@@ -452,7 +452,7 @@ void __osm_vendor_ts_poller(IN void *p_ptr)
osm_mad_addr_t mad_addr;
osm_ts_bind_info_t *const p_bind = (osm_ts_bind_info_t *) p_ptr;
- OSM_LOG_ENTER(p_bind->p_vend->p_log, __osm_vendor_ts_poller);
+ OSM_LOG_ENTER(p_bind->p_vend->p_log);
/* we set the type of cancelation for this thread */
pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
@@ -525,7 +525,7 @@ osm_vendor_bind(IN osm_vendor_t * const p_vend,
int ts_ioctl_ret;
int qpn;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_bind);
+ OSM_LOG_ENTER(p_vend->p_log);
CL_ASSERT(p_mad_pool);
@@ -650,7 +650,7 @@ ib_mad_t *osm_vendor_get(IN osm_bind_handle_t h_bind,
osm_ts_bind_info_t *p_bind = (osm_ts_bind_info_t *) h_bind;
osm_vendor_t *p_vend = p_bind->p_vend;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_get);
+ OSM_LOG_ENTER(p_vend->p_log);
CL_ASSERT(p_vw);
@@ -693,7 +693,7 @@ osm_vendor_put(IN osm_bind_handle_t h_bind, IN osm_vend_wrap_t * const p_vw)
osm_vendor_t *p_vend = p_bind->p_vend;
osm_madw_t *p_madw;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_put);
+ OSM_LOG_ENTER(p_vend->p_log);
CL_ASSERT(p_vw);
CL_ASSERT(p_vw->p_mad_buf);
@@ -735,7 +735,7 @@ osm_ts_send_mad(IN osm_ts_bind_info_t * p_bind, IN osm_madw_t * const p_madw)
int ret;
ib_api_status_t status;
- OSM_LOG_ENTER(p_vend->p_log, osm_ts_send_mad);
+ OSM_LOG_ENTER(p_vend->p_log);
/*
* Copy the MAD over to the sent mad
@@ -799,7 +799,7 @@ osm_vendor_send(IN osm_bind_handle_t h_bind,
osm_vend_wrap_t *const p_vw = osm_madw_get_vend_ptr(p_madw);
ib_api_status_t status;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_send);
+ OSM_LOG_ENTER(p_vend->p_log);
/*
* If a response is expected to this MAD, then preallocate
@@ -855,7 +855,7 @@ ib_api_status_t osm_vendor_local_lid_change(IN osm_bind_handle_t h_bind)
{
osm_vendor_t *p_vend = ((osm_ts_bind_info_t *) h_bind)->p_vend;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_local_lid_change);
+ OSM_LOG_ENTER(p_vend->p_log);
osm_log(p_vend->p_log, OSM_LOG_DEBUG,
"osm_vendor_local_lid_change: DEBUG 2202: " "Change of LID.\n");
@@ -875,7 +875,7 @@ void osm_vendor_set_sm(IN osm_bind_handle_t h_bind, IN boolean_t is_sm_val)
VAPI_hca_attr_t attr_mod;
VAPI_hca_attr_mask_t attr_mask;
- OSM_LOG_ENTER(p_vend->p_log, osm_vendor_set_sm);
+ OSM_LOG_ENTER(p_vend->p_log);
memset(&attr_mod, 0, sizeof(attr_mod));
memset(&attr_mask, 0, sizeof(attr_mask));
diff --git a/opensm/libvendor/osm_vendor_umadt.c b/opensm/libvendor/osm_vendor_umadt.c
index b68d6c1..7a11eef 100644
--- a/opensm/libvendor/osm_vendor_umadt.c
+++ b/opensm/libvendor/osm_vendor_umadt.c
@@ -137,7 +137,7 @@ osm_vendor_t *osm_vendor_new(IN osm_log_t * const p_log,
ib_api_status_t status;
umadt_obj_t *p_umadt_obj;
- OSM_LOG_ENTER(p_log, osm_vendor_new);
+ OSM_LOG_ENTER(p_log);
p_umadt_obj = malloc(sizeof(umadt_obj_t));
if (p_umadt_obj) {
@@ -165,7 +165,7 @@ void osm_vendor_delete(IN osm_vendor_t ** const pp_vend)
uint32_t count, i;
mad_bind_info_t *p_mad_bind_info;
- OSM_LOG_ENTER(p_umadt_obj->p_log, osm_vendor_delete);
+ OSM_LOG_ENTER(p_umadt_obj->p_log);
cl_spinlock_acquire(&p_umadt_obj->register_lock);
p_mad_bind_info =
@@ -202,7 +202,7 @@ osm_vendor_init(IN osm_vendor_t * const p_vend,
char *error;
umadt_obj_t *p_umadt_obj = (umadt_obj_t *) p_vend;
- OSM_LOG_ENTER(p_log, osm_vendor_init);
+ OSM_LOG_ENTER(p_log);
p_umadt_obj->p_log = p_log;
p_umadt_obj->timeout = timeout;
@@ -265,7 +265,7 @@ osm_vendor_get_ports(IN osm_vendor_t * const p_vend,
umadt_obj_t *p_umadt_obj = (umadt_obj_t *) p_vend;
- OSM_LOG_ENTER(p_umadt_obj->p_log, osm_vendor_get_ports);
+ OSM_LOG_ENTER(p_umadt_obj->p_log);
CL_ASSERT(p_guids);
CL_ASSERT(p_num_guids);
@@ -388,7 +388,7 @@ ib_mad_t *osm_vendor_get(IN osm_bind_handle_t h_bind,
mad_bind_info_t *p_mad_bind_info = (mad_bind_info_t *) h_bind;
umadt_obj_t *p_umadt_obj = p_mad_bind_info->p_umadt_obj;
ib_mad_t *p_mad;
- OSM_LOG_ENTER(p_umadt_obj->p_log, osm_vendor_get);
+ OSM_LOG_ENTER(p_umadt_obj->p_log);
CL_ASSERT(h_bind);
@@ -743,7 +743,7 @@ osm_vendor_bind(IN osm_vendor_t * const p_vend,
RegisterClassStruct *p_umadt_reg_class;
umadt_obj_t *p_umadt_obj;
- OSM_LOG_ENTER(((umadt_obj_t *) p_vend)->p_log, osm_vendor_bind);
+ OSM_LOG_ENTER(((umadt_obj_t *) p_vend)->p_log);
CL_ASSERT(p_vend);
diff --git a/opensm/opensm/main.c b/opensm/opensm/main.c
index 187bc47..38608be 100644
--- a/opensm/opensm/main.c
+++ b/opensm/opensm/main.c
@@ -453,7 +453,7 @@ parse_ignore_guids_file(IN char *guids_file_name, IN osm_opensm_t * p_osm)
ib_api_status_t status = IB_SUCCESS;
unsigned int port_num;
- OSM_LOG_ENTER(&p_osm->log, parse_ignore_guids_file);
+ OSM_LOG_ENTER(&p_osm->log);
fh = fopen(guids_file_name, "r");
if (fh == NULL) {
diff --git a/opensm/opensm/osm_db_files.c b/opensm/opensm/osm_db_files.c
index cce26be..05e085f 100644
--- a/opensm/opensm/osm_db_files.c
+++ b/opensm/opensm/osm_db_files.c
@@ -164,7 +164,7 @@ int osm_db_init(IN osm_db_t * const p_db, IN osm_log_t * p_log)
osm_db_imp_t *p_db_imp;
struct stat dstat;
- OSM_LOG_ENTER(p_log, osm_db_init);
+ OSM_LOG_ENTER(p_log);
p_db_imp = (osm_db_imp_t *) malloc(sizeof(osm_db_imp_t));
CL_ASSERT(p_db_imp != NULL);
@@ -213,7 +213,7 @@ osm_db_domain_t *osm_db_domain_init(IN osm_db_t * const p_db,
osm_log_t *p_log = p_db->p_log;
FILE *p_file;
- OSM_LOG_ENTER(p_log, osm_db_domain_init);
+ OSM_LOG_ENTER(p_log);
/* allocate a new domain object */
p_domain = (osm_db_domain_t *) malloc(sizeof(osm_db_domain_t));
@@ -281,7 +281,7 @@ int osm_db_restore(IN osm_db_domain_t * p_domain)
char *endptr = NULL;
unsigned int line_num;
- OSM_LOG_ENTER(p_log, osm_db_restore);
+ OSM_LOG_ENTER(p_log);
/* take the lock on the domain */
cl_spinlock_acquire(&p_domain_imp->lock);
@@ -452,7 +452,7 @@ int osm_db_store(IN osm_db_domain_t * p_domain)
int status = 0;
char *p_tmp_file_name;
- OSM_LOG_ENTER(p_log, osm_db_store);
+ OSM_LOG_ENTER(p_log);
p_domain_imp = (osm_db_domain_imp_t *) p_domain->p_domain_imp;
p_tmp_file_name =
@@ -622,7 +622,7 @@ int osm_db_delete(IN osm_db_domain_t * p_domain, IN char *const p_key)
char *p_prev_val = NULL;
int res;
- OSM_LOG_ENTER(p_log, osm_db_delete);
+ OSM_LOG_ENTER(p_log);
cl_spinlock_acquire(&p_domain_imp->lock);
if (st_delete(p_domain_imp->p_hash,
diff --git a/opensm/opensm/osm_drop_mgr.c b/opensm/opensm/osm_drop_mgr.c
index 0956d17..785e9ec 100644
--- a/opensm/opensm/osm_drop_mgr.c
+++ b/opensm/opensm/osm_drop_mgr.c
@@ -173,7 +173,7 @@ static void __osm_drop_mgr_remove_port(osm_sm_t * sm, IN osm_port_t * p_port)
ib_mad_notice_attr_t notice;
ib_api_status_t status;
- OSM_LOG_ENTER(sm->p_log, __osm_drop_mgr_remove_port);
+ OSM_LOG_ENTER(sm->p_log);
port_guid = osm_port_get_guid(p_port);
osm_log(sm->p_log, OSM_LOG_VERBOSE,
@@ -289,7 +289,7 @@ static void __osm_drop_mgr_remove_switch(osm_sm_t * sm, IN osm_node_t * p_node)
cl_qmap_t *p_sw_guid_tbl;
ib_net64_t node_guid;
- OSM_LOG_ENTER(sm->p_log, __osm_drop_mgr_remove_switch);
+ OSM_LOG_ENTER(sm->p_log);
node_guid = osm_node_get_node_guid(p_node);
p_sw_guid_tbl = &sm->p_subn->sw_guid_tbl;
@@ -321,7 +321,7 @@ __osm_drop_mgr_process_node(osm_sm_t * sm, IN osm_node_t * p_node)
ib_net64_t port_guid;
boolean_t return_val = FALSE;
- OSM_LOG_ENTER(sm->p_log, __osm_drop_mgr_process_node);
+ OSM_LOG_ENTER(sm->p_log);
osm_log(sm->p_log, OSM_LOG_VERBOSE,
"__osm_drop_mgr_process_node: "
@@ -378,7 +378,7 @@ static void __osm_drop_mgr_check_node(osm_sm_t * sm, IN osm_node_t * p_node)
osm_port_t *p_port;
ib_net64_t port_guid;
- OSM_LOG_ENTER(sm->p_log, __osm_drop_mgr_check_node);
+ OSM_LOG_ENTER(sm->p_log);
node_guid = osm_node_get_node_guid(p_node);
@@ -458,7 +458,7 @@ void osm_drop_mgr_process(osm_sm_t * sm)
CL_ASSERT(sm);
- OSM_LOG_ENTER(sm->p_log, osm_drop_mgr_process);
+ OSM_LOG_ENTER(sm->p_log);
p_node_guid_tbl = &sm->p_subn->node_guid_tbl;
p_port_guid_tbl = &sm->p_subn->port_guid_tbl;
diff --git a/opensm/opensm/osm_inform.c b/opensm/opensm/osm_inform.c
index 151b1dc..9ed9b73 100644
--- a/opensm/opensm/osm_inform.c
+++ b/opensm/opensm/osm_inform.c
@@ -89,7 +89,7 @@ static void dump_all_informs(IN osm_subn_t const *p_subn, IN osm_log_t * p_log)
{
cl_list_item_t *p_list_item;
- OSM_LOG_ENTER(p_log, dump_all_informs);
+ OSM_LOG_ENTER(p_log);
if (!osm_log_is_active(p_log, OSM_LOG_DEBUG))
goto Exit;
@@ -118,7 +118,7 @@ __match_inf_rec(IN const cl_list_item_t * const p_list_item, IN void *context)
cl_status_t status = CL_NOT_FOUND;
ib_gid_t all_zero_gid;
- OSM_LOG_ENTER(p_log, __match_inf_rec);
+ OSM_LOG_ENTER(p_log);
if (memcmp(&p_infr->report_addr,
&p_infr_rec->report_addr, sizeof(p_infr_rec->report_addr))) {
@@ -241,7 +241,7 @@ osm_infr_t *osm_infr_get_by_rec(IN osm_subn_t const *p_subn,
{
cl_list_item_t *p_list_item;
- OSM_LOG_ENTER(p_log, osm_infr_get_by_rec);
+ OSM_LOG_ENTER(p_log);
dump_all_informs(p_subn, p_log);
@@ -270,7 +270,7 @@ void
osm_infr_insert_to_db(IN osm_subn_t * p_subn,
IN osm_log_t * p_log, IN osm_infr_t * p_infr)
{
- OSM_LOG_ENTER(p_log, osm_infr_insert_to_db);
+ OSM_LOG_ENTER(p_log);
osm_log(p_log, OSM_LOG_DEBUG,
"osm_infr_insert_to_db: "
@@ -303,7 +303,7 @@ void
osm_infr_remove_from_db(IN osm_subn_t * p_subn,
IN osm_log_t * p_log, IN osm_infr_t * p_infr)
{
- OSM_LOG_ENTER(p_log, osm_infr_remove_from_db);
+ OSM_LOG_ENTER(p_log);
osm_log(p_log, OSM_LOG_DEBUG,
"osm_infr_remove_from_db: "
@@ -340,7 +340,7 @@ static ib_api_status_t __osm_send_report(IN osm_infr_t * p_infr_rec, /* the info
ib_api_status_t status;
osm_log_t *p_log = p_infr_rec->sa->p_log;
- OSM_LOG_ENTER(p_log, __osm_send_report);
+ OSM_LOG_ENTER(p_log);
/* HACK: who switches or uses the src and dest GIDs in the grh_info ?? */
@@ -421,7 +421,7 @@ __match_notice_to_inf_rec(IN cl_list_item_t * const p_list_item,
osm_port_t *p_src_port;
osm_port_t *p_dest_port;
- OSM_LOG_ENTER(p_log, __match_notice_to_inf_rec);
+ OSM_LOG_ENTER(p_log);
/* matching rules
* InformInfo Notice
@@ -616,7 +616,7 @@ osm_report_notice(IN osm_log_t * const p_log,
osm_infr_t *p_infr_rec;
osm_infr_t *p_next_infr_rec;
- OSM_LOG_ENTER(p_log, osm_report_notice);
+ OSM_LOG_ENTER(p_log);
/*
* we must make sure we are ready for this...
diff --git a/opensm/opensm/osm_lid_mgr.c b/opensm/opensm/osm_lid_mgr.c
index 3ceb145..557131e 100644
--- a/opensm/opensm/osm_lid_mgr.c
+++ b/opensm/opensm/osm_lid_mgr.c
@@ -123,7 +123,7 @@ void osm_lid_mgr_destroy(IN osm_lid_mgr_t * const p_mgr)
{
cl_list_item_t *p_item;
- OSM_LOG_ENTER(p_mgr->p_log, osm_lid_mgr_destroy);
+ OSM_LOG_ENTER(p_mgr->p_log);
cl_ptr_vector_destroy(&p_mgr->used_lids);
p_item = cl_qlist_remove_head(&p_mgr->free_ranges);
@@ -149,7 +149,7 @@ static void __osm_lid_mgr_validate_db(IN osm_lid_mgr_t * p_mgr)
uint16_t lmc_mask;
boolean_t lids_ok;
- OSM_LOG_ENTER(p_mgr->p_log, __osm_lid_mgr_validate_db);
+ OSM_LOG_ENTER(p_mgr->p_log);
if (p_mgr->p_subn->opt.lmc)
lmc_mask = ~((1 << p_mgr->p_subn->opt.lmc) - 1);
@@ -245,7 +245,7 @@ osm_lid_mgr_init(IN osm_lid_mgr_t * const p_mgr, IN osm_sm_t *sm)
{
ib_api_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(sm->p_log, osm_lid_mgr_init);
+ OSM_LOG_ENTER(sm->p_log);
osm_lid_mgr_construct(p_mgr);
@@ -327,7 +327,7 @@ static int __osm_lid_mgr_init_sweep(IN osm_lid_mgr_t * const p_mgr)
uint16_t lmc_mask;
uint16_t req_lid, num_lids;
- OSM_LOG_ENTER(p_mgr->p_log, __osm_lid_mgr_init_sweep);
+ OSM_LOG_ENTER(p_mgr->p_log);
if (p_mgr->p_subn->opt.lmc)
lmc_mask = ~((1 << p_mgr->p_subn->opt.lmc) - 1);
@@ -763,7 +763,7 @@ __osm_lid_mgr_get_port_lid(IN osm_lid_mgr_t * const p_mgr,
int lid_changed = 0;
uint16_t lmc_mask;
- OSM_LOG_ENTER(p_mgr->p_log, __osm_lid_mgr_get_port_lid);
+ OSM_LOG_ENTER(p_mgr->p_log);
if (p_mgr->p_subn->opt.lmc)
lmc_mask = ~((1 << p_mgr->p_subn->opt.lmc) - 1);
@@ -906,7 +906,7 @@ __osm_lid_mgr_set_physp_pi(IN osm_lid_mgr_t * const p_mgr,
uint8_t port_num;
boolean_t send_set = FALSE;
- OSM_LOG_ENTER(p_mgr->p_log, __osm_lid_mgr_set_physp_pi);
+ OSM_LOG_ENTER(p_mgr->p_log);
/*
Don't bother doing anything if this Physical Port is not valid.
@@ -1172,7 +1172,7 @@ __osm_lid_mgr_process_our_sm_node(IN osm_lid_mgr_t * const p_mgr)
uint16_t max_lid_ho;
boolean_t res = TRUE;
- OSM_LOG_ENTER(p_mgr->p_log, __osm_lid_mgr_process_our_sm_node);
+ OSM_LOG_ENTER(p_mgr->p_log);
/*
Acquire our own port object.
@@ -1231,7 +1231,7 @@ osm_signal_t osm_lid_mgr_process_sm(IN osm_lid_mgr_t * const p_mgr)
{
osm_signal_t signal = OSM_SIGNAL_DONE_PENDING;
- OSM_LOG_ENTER(p_mgr->p_log, osm_lid_mgr_process_sm);
+ OSM_LOG_ENTER(p_mgr->p_log);
CL_ASSERT(p_mgr->p_subn->sm_port_guid);
@@ -1283,7 +1283,7 @@ osm_signal_t osm_lid_mgr_process_subnet(IN osm_lid_mgr_t * const p_mgr)
CL_ASSERT(p_mgr);
- OSM_LOG_ENTER(p_mgr->p_log, osm_lid_mgr_process_subnet);
+ OSM_LOG_ENTER(p_mgr->p_log);
CL_PLOCK_EXCL_ACQUIRE(p_mgr->p_lock);
diff --git a/opensm/opensm/osm_lin_fwd_rcv.c b/opensm/opensm/osm_lin_fwd_rcv.c
index 7d9d1af..09edd1a 100644
--- a/opensm/opensm/osm_lin_fwd_rcv.c
+++ b/opensm/opensm/osm_lin_fwd_rcv.c
@@ -70,7 +70,7 @@ void osm_lft_rcv_process(IN void *context, IN void *data)
CL_ASSERT(sm);
- OSM_LOG_ENTER(sm->p_log, osm_lft_rcv_process);
+ OSM_LOG_ENTER(sm->p_log);
CL_ASSERT(p_madw);
diff --git a/opensm/opensm/osm_link_mgr.c b/opensm/opensm/osm_link_mgr.c
index c810b56..8ca5786 100644
--- a/opensm/opensm/osm_link_mgr.c
+++ b/opensm/opensm/osm_link_mgr.c
@@ -77,7 +77,7 @@ __osm_link_mgr_set_physp_pi(osm_sm_t * sm,
boolean_t send_set = FALSE;
osm_physp_t *p_remote_physp;
- OSM_LOG_ENTER(sm->p_log, __osm_link_mgr_set_physp_pi);
+ OSM_LOG_ENTER(sm->p_log);
p_node = osm_physp_get_node_ptr(p_physp);
@@ -352,7 +352,7 @@ __osm_link_mgr_process_node(osm_sm_t * sm,
uint8_t current_state;
osm_signal_t signal = OSM_SIGNAL_DONE;
- OSM_LOG_ENTER(sm->p_log, __osm_link_mgr_process_node);
+ OSM_LOG_ENTER(sm->p_log);
if (osm_log_is_active(sm->p_log, OSM_LOG_DEBUG))
osm_log(sm->p_log, OSM_LOG_DEBUG,
@@ -409,7 +409,7 @@ osm_signal_t osm_link_mgr_process(osm_sm_t * sm, IN const uint8_t link_state)
osm_node_t *p_node;
osm_signal_t signal = OSM_SIGNAL_DONE;
- OSM_LOG_ENTER(sm->p_log, osm_link_mgr_process);
+ OSM_LOG_ENTER(sm->p_log);
p_node_guid_tbl = &sm->p_subn->node_guid_tbl;
diff --git a/opensm/opensm/osm_mad_pool.c b/opensm/opensm/osm_mad_pool.c
index f9ef54c..8af3d2a 100644
--- a/opensm/opensm/osm_mad_pool.c
+++ b/opensm/opensm/osm_mad_pool.c
@@ -77,7 +77,7 @@ void osm_mad_pool_destroy(IN osm_mad_pool_t * const p_pool)
ib_api_status_t
osm_mad_pool_init(IN osm_mad_pool_t * const p_pool, IN osm_log_t * const p_log)
{
- OSM_LOG_ENTER(p_log, osm_mad_pool_init);
+ OSM_LOG_ENTER(p_log);
p_pool->p_log = p_log;
@@ -95,7 +95,7 @@ osm_madw_t *osm_mad_pool_get(IN osm_mad_pool_t * const p_pool,
osm_madw_t *p_madw;
ib_mad_t *p_mad;
- OSM_LOG_ENTER(p_pool->p_log, osm_mad_pool_get);
+ OSM_LOG_ENTER(p_pool->p_log);
CL_ASSERT(h_bind != OSM_BIND_INVALID_HANDLE);
CL_ASSERT(total_size);
@@ -153,7 +153,7 @@ osm_madw_t *osm_mad_pool_get_wrapper(IN osm_mad_pool_t * const p_pool,
{
osm_madw_t *p_madw;
- OSM_LOG_ENTER(p_pool->p_log, osm_mad_pool_get_wrapper);
+ OSM_LOG_ENTER(p_pool->p_log);
CL_ASSERT(h_bind != OSM_BIND_INVALID_HANDLE);
CL_ASSERT(total_size);
@@ -192,7 +192,7 @@ osm_madw_t *osm_mad_pool_get_wrapper_raw(IN osm_mad_pool_t * const p_pool)
{
osm_madw_t *p_madw;
- OSM_LOG_ENTER(p_pool->p_log, osm_mad_pool_get_wrapper_raw);
+ OSM_LOG_ENTER(p_pool->p_log);
p_madw = malloc(sizeof(*p_madw));
if (!p_madw)
@@ -215,7 +215,7 @@ osm_madw_t *osm_mad_pool_get_wrapper_raw(IN osm_mad_pool_t * const p_pool)
void
osm_mad_pool_put(IN osm_mad_pool_t * const p_pool, IN osm_madw_t * const p_madw)
{
- OSM_LOG_ENTER(p_pool->p_log, osm_mad_pool_put);
+ OSM_LOG_ENTER(p_pool->p_log);
CL_ASSERT(p_madw);
diff --git a/opensm/opensm/osm_mcast_fwd_rcv.c b/opensm/opensm/osm_mcast_fwd_rcv.c
index 3233def..2c97945 100644
--- a/opensm/opensm/osm_mcast_fwd_rcv.c
+++ b/opensm/opensm/osm_mcast_fwd_rcv.c
@@ -77,7 +77,7 @@ void osm_mft_rcv_process(IN void *context, IN void *data)
CL_ASSERT(sm);
- OSM_LOG_ENTER(sm->p_log, osm_mft_rcv_process);
+ OSM_LOG_ENTER(sm->p_log);
CL_ASSERT(p_madw);
diff --git a/opensm/opensm/osm_mcast_mgr.c b/opensm/opensm/osm_mcast_mgr.c
index 3b6d05a..1a62ce5 100644
--- a/opensm/opensm/osm_mcast_mgr.c
+++ b/opensm/opensm/osm_mcast_mgr.c
@@ -122,7 +122,7 @@ static void __osm_mcast_mgr_purge_tree_node(IN osm_mtree_node_t * p_mtn)
static void
__osm_mcast_mgr_purge_tree(osm_sm_t * sm, IN osm_mgrp_t * const p_mgrp)
{
- OSM_LOG_ENTER(sm->p_log, __osm_mcast_mgr_purge_tree);
+ OSM_LOG_ENTER(sm->p_log);
if (p_mgrp->p_root)
__osm_mcast_mgr_purge_tree_node(p_mgrp->p_root);
@@ -146,7 +146,7 @@ osm_mcast_mgr_compute_avg_hops(osm_sm_t * sm,
const osm_mcm_port_t *p_mcm_port;
const cl_qmap_t *p_mcm_tbl;
- OSM_LOG_ENTER(sm->p_log, osm_mcast_mgr_compute_avg_hops);
+ OSM_LOG_ENTER(sm->p_log);
p_mcm_tbl = &p_mgrp->mcm_port_tbl;
@@ -206,7 +206,7 @@ osm_mcast_mgr_compute_max_hops(osm_sm_t * sm,
const osm_mcm_port_t *p_mcm_port;
const cl_qmap_t *p_mcm_tbl;
- OSM_LOG_ENTER(sm->p_log, osm_mcast_mgr_compute_max_hops);
+ OSM_LOG_ENTER(sm->p_log);
p_mcm_tbl = &p_mgrp->mcm_port_tbl;
@@ -273,7 +273,7 @@ static osm_switch_t *__osm_mcast_mgr_find_optimal_switch(osm_sm_t * sm,
boolean_t use_avg_hops = FALSE; /* use max hops for root */
#endif
- OSM_LOG_ENTER(sm->p_log, __osm_mcast_mgr_find_optimal_switch);
+ OSM_LOG_ENTER(sm->p_log);
p_sw_tbl = &sm->p_subn->sw_guid_tbl;
@@ -334,7 +334,7 @@ static osm_switch_t *__osm_mcast_mgr_find_root_switch(osm_sm_t * sm,
{
const osm_switch_t *p_sw = NULL;
- OSM_LOG_ENTER(sm->p_log, __osm_mcast_mgr_find_root_switch);
+ OSM_LOG_ENTER(sm->p_log);
/*
We always look for the best multicast tree root switch.
@@ -367,7 +367,7 @@ __osm_mcast_mgr_set_tbl(osm_sm_t * sm, IN osm_switch_t * const p_sw)
CL_ASSERT(sm);
- OSM_LOG_ENTER(sm->p_log, __osm_mcast_mgr_set_tbl);
+ OSM_LOG_ENTER(sm->p_log);
CL_ASSERT(p_sw);
@@ -443,7 +443,7 @@ __osm_mcast_mgr_subdivide(osm_sm_t * sm,
boolean_t ignore_existing;
osm_mcast_work_obj_t *p_wobj;
- OSM_LOG_ENTER(sm->p_log, __osm_mcast_mgr_subdivide);
+ OSM_LOG_ENTER(sm->p_log);
mlid_ho = cl_ntoh16(osm_mgrp_get_mlid(p_mgrp));
@@ -517,7 +517,7 @@ static void __osm_mcast_mgr_purge_list(osm_sm_t * sm, cl_qlist_t * const p_list)
{
osm_mcast_work_obj_t *p_wobj;
- OSM_LOG_ENTER(sm->p_log, __osm_mcast_mgr_purge_list);
+ OSM_LOG_ENTER(sm->p_log);
while ((p_wobj = (osm_mcast_work_obj_t *) cl_qlist_remove_head(p_list))
!= (osm_mcast_work_obj_t *) cl_qlist_end(p_list)) {
@@ -558,7 +558,7 @@ static osm_mtree_node_t *__osm_mcast_mgr_branch(osm_sm_t * sm,
uint16_t mlid_ho;
osm_mcast_tbl_t *p_tbl;
- OSM_LOG_ENTER(sm->p_log, __osm_mcast_mgr_branch);
+ OSM_LOG_ENTER(sm->p_log);
CL_ASSERT(p_sw);
CL_ASSERT(p_list);
@@ -779,7 +779,7 @@ __osm_mcast_mgr_build_spanning_tree(osm_sm_t * sm, osm_mgrp_t * const p_mgrp)
uint8_t max_depth = 0;
uint32_t count;
- OSM_LOG_ENTER(sm->p_log, __osm_mcast_mgr_build_spanning_tree);
+ OSM_LOG_ENTER(sm->p_log);
cl_qlist_init(&port_list);
@@ -895,7 +895,7 @@ osm_mcast_mgr_set_table(osm_sm_t * sm,
osm_mcast_tbl_t *p_tbl;
osm_switch_t *p_sw;
- OSM_LOG_ENTER(sm->p_log, osm_mcast_mgr_set_table);
+ OSM_LOG_ENTER(sm->p_log);
mlid_ho = cl_ntoh16(osm_mgrp_get_mlid(p_mgrp));
p_sw = osm_mtree_node_get_switch_ptr(p_mtn);
@@ -940,7 +940,7 @@ static void __osm_mcast_mgr_clear(osm_sm_t * sm, IN osm_mgrp_t * const p_mgrp)
cl_qmap_t *p_sw_tbl;
osm_mcast_tbl_t *p_mcast_tbl;
- OSM_LOG_ENTER(sm->p_log, __osm_mcast_mgr_clear);
+ OSM_LOG_ENTER(sm->p_log);
/*
Walk the switches and clear the routing entries for
@@ -978,7 +978,7 @@ osm_mcast_mgr_process_single(osm_sm_t * sm,
osm_mcast_tbl_t *p_mcast_tbl;
ib_api_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(sm->p_log, osm_mcast_mgr_process_single);
+ OSM_LOG_ENTER(sm->p_log);
CL_ASSERT(mlid);
CL_ASSERT(port_guid);
@@ -1111,7 +1111,7 @@ osm_mcast_mgr_process_tree(osm_sm_t * sm,
ib_net16_t mlid;
boolean_t ui_mcast_fdb_assign_func_defined;
- OSM_LOG_ENTER(sm->p_log, osm_mcast_mgr_process_tree);
+ OSM_LOG_ENTER(sm->p_log);
mlid = osm_mgrp_get_mlid(p_mgrp);
@@ -1192,7 +1192,7 @@ mcast_mgr_process_mgrp(osm_sm_t * sm,
{
ib_api_status_t status;
- OSM_LOG_ENTER(sm->p_log, osm_mcast_mgr_process_mgrp);
+ OSM_LOG_ENTER(sm->p_log);
status = osm_mcast_mgr_process_tree(sm, p_mgrp, req_type, port_guid);
if (status != IB_SUCCESS) {
@@ -1238,7 +1238,7 @@ osm_signal_t osm_mcast_mgr_process(osm_sm_t * sm)
osm_mgrp_t *p_next_mgrp;
boolean_t pending_transactions = FALSE;
- OSM_LOG_ENTER(sm->p_log, osm_mcast_mgr_process);
+ OSM_LOG_ENTER(sm->p_log);
p_sw_tbl = &sm->p_subn->sw_guid_tbl;
p_mcast_tbl = &sm->p_subn->mgrp_mlid_tbl;
@@ -1317,7 +1317,7 @@ osm_signal_t osm_mcast_mgr_process_mgroups(osm_sm_t * sm)
osm_mcast_req_type_t req_type;
ib_net64_t port_guid;
- OSM_LOG_ENTER(sm->p_log, osm_mcast_mgr_process_mgroups);
+ OSM_LOG_ENTER(sm->p_log);
/* we need a lock to make sure the p_mgrp is not change other ways */
CL_PLOCK_EXCL_ACQUIRE(sm->p_lock);
diff --git a/opensm/opensm/osm_multicast.c b/opensm/opensm/osm_multicast.c
index 72a9e74..77e436f 100644
--- a/opensm/opensm/osm_multicast.c
+++ b/opensm/opensm/osm_multicast.c
@@ -288,7 +288,7 @@ osm_mgrp_send_delete_notice(IN osm_subn_t * const p_subn,
ib_mad_notice_attr_t notice;
ib_api_status_t status;
- OSM_LOG_ENTER(p_log, osm_mgrp_send_delete_notice);
+ OSM_LOG_ENTER(p_log);
/* prepare the needed info */
@@ -330,7 +330,7 @@ osm_mgrp_send_create_notice(IN osm_subn_t * const p_subn,
ib_mad_notice_attr_t notice;
ib_api_status_t status;
- OSM_LOG_ENTER(p_log, osm_mgrp_send_create_notice);
+ OSM_LOG_ENTER(p_log);
/* prepare the needed info */
diff --git a/opensm/opensm/osm_node_desc_rcv.c b/opensm/opensm/osm_node_desc_rcv.c
index 6c9c8ea..4268526 100644
--- a/opensm/opensm/osm_node_desc_rcv.c
+++ b/opensm/opensm/osm_node_desc_rcv.c
@@ -70,7 +70,7 @@ __osm_nd_rcv_process_nd(IN osm_sm_t * sm,
char *tmp_desc;
char print_desc[IB_NODE_DESCRIPTION_SIZE + 1];
- OSM_LOG_ENTER(sm->p_log, __osm_nd_rcv_process_nd);
+ OSM_LOG_ENTER(sm->p_log);
memcpy(&p_node->node_desc.description, p_nd, sizeof(*p_nd));
@@ -110,7 +110,7 @@ void osm_nd_rcv_process(IN void *context, IN void *data)
CL_ASSERT(sm);
- OSM_LOG_ENTER(sm->p_log, osm_nd_rcv_process);
+ OSM_LOG_ENTER(sm->p_log);
CL_ASSERT(p_madw);
diff --git a/opensm/opensm/osm_node_info_rcv.c b/opensm/opensm/osm_node_info_rcv.c
index 844dfcf..776539b 100644
--- a/opensm/opensm/osm_node_info_rcv.c
+++ b/opensm/opensm/osm_node_info_rcv.c
@@ -137,7 +137,7 @@ __osm_ni_rcv_set_links(IN osm_sm_t * sm,
osm_node_t *p_neighbor_node;
osm_physp_t *p_physp;
- OSM_LOG_ENTER(sm->p_log, __osm_ni_rcv_set_links);
+ OSM_LOG_ENTER(sm->p_log);
/*
A special case exists in which the node we're trying to
@@ -279,7 +279,7 @@ __osm_ni_rcv_process_new_node(IN osm_sm_t * sm,
ib_smp_t *p_smp;
uint8_t port_num;
- OSM_LOG_ENTER(sm->p_log, __osm_ni_rcv_process_new_node);
+ OSM_LOG_ENTER(sm->p_log);
p_smp = osm_madw_get_smp_ptr(p_madw);
p_ni = (ib_node_info_t *) ib_smp_get_payload_ptr(p_smp);
@@ -329,7 +329,7 @@ __osm_ni_rcv_get_node_desc(IN osm_sm_t * sm,
ib_smp_t *p_smp;
uint8_t port_num;
- OSM_LOG_ENTER(sm->p_log, __osm_ni_rcv_get_node_desc);
+ OSM_LOG_ENTER(sm->p_log);
p_smp = osm_madw_get_smp_ptr(p_madw);
p_ni = (ib_node_info_t *) ib_smp_get_payload_ptr(p_smp);
@@ -367,7 +367,7 @@ __osm_ni_rcv_process_new_ca_or_router(IN osm_sm_t * sm,
IN osm_node_t * const p_node,
IN const osm_madw_t * const p_madw)
{
- OSM_LOG_ENTER(sm->p_log, __osm_ni_rcv_process_new_ca_or_router);
+ OSM_LOG_ENTER(sm->p_log);
__osm_ni_rcv_process_new_node(sm, p_node, p_madw);
@@ -401,7 +401,7 @@ __osm_ni_rcv_process_existing_ca_or_router(IN osm_sm_t * sm,
osm_dr_path_t *p_dr_path;
osm_bind_handle_t h_bind;
- OSM_LOG_ENTER(sm->p_log, __osm_ni_rcv_process_existing_ca_or_router);
+ OSM_LOG_ENTER(sm->p_log);
p_smp = osm_madw_get_smp_ptr(p_madw);
p_ni = (ib_node_info_t *) ib_smp_get_payload_ptr(p_smp);
@@ -506,7 +506,7 @@ __osm_ni_rcv_process_switch(IN osm_sm_t * sm,
osm_dr_path_t dr_path;
ib_smp_t *p_smp;
- OSM_LOG_ENTER(sm->p_log, __osm_ni_rcv_process_switch);
+ OSM_LOG_ENTER(sm->p_log);
p_smp = osm_madw_get_smp_ptr(p_madw);
@@ -539,7 +539,7 @@ __osm_ni_rcv_process_existing_switch(IN osm_sm_t * sm,
IN osm_node_t * const p_node,
IN const osm_madw_t * const p_madw)
{
- OSM_LOG_ENTER(sm->p_log, __osm_ni_rcv_process_existing_switch);
+ OSM_LOG_ENTER(sm->p_log);
/*
If this switch has already been probed during this sweep,
@@ -571,7 +571,7 @@ __osm_ni_rcv_process_new_switch(IN osm_sm_t * sm,
IN osm_node_t * const p_node,
IN const osm_madw_t * const p_madw)
{
- OSM_LOG_ENTER(sm->p_log, __osm_ni_rcv_process_new_switch);
+ OSM_LOG_ENTER(sm->p_log);
__osm_ni_rcv_process_switch(sm, p_node, p_madw);
@@ -605,7 +605,7 @@ __osm_ni_rcv_process_new(IN osm_sm_t * sm,
osm_ni_context_t *p_ni_context;
uint8_t port_num;
- OSM_LOG_ENTER(sm->p_log, __osm_ni_rcv_process_new);
+ OSM_LOG_ENTER(sm->p_log);
p_smp = osm_madw_get_smp_ptr(p_madw);
p_ni = (ib_node_info_t *) ib_smp_get_payload_ptr(p_smp);
@@ -759,7 +759,7 @@ __osm_ni_rcv_process_existing(IN osm_sm_t * sm,
osm_ni_context_t *p_ni_context;
uint8_t port_num;
- OSM_LOG_ENTER(sm->p_log, __osm_ni_rcv_process_existing);
+ OSM_LOG_ENTER(sm->p_log);
p_smp = osm_madw_get_smp_ptr(p_madw);
p_ni = (ib_node_info_t *) ib_smp_get_payload_ptr(p_smp);
@@ -817,7 +817,7 @@ void osm_ni_rcv_process(IN void *context, IN void *data)
CL_ASSERT(sm);
- OSM_LOG_ENTER(sm->p_log, osm_ni_rcv_process);
+ OSM_LOG_ENTER(sm->p_log);
CL_ASSERT(p_madw);
diff --git a/opensm/opensm/osm_opensm.c b/opensm/opensm/osm_opensm.c
index fa517d0..1760f22 100644
--- a/opensm/opensm/osm_opensm.c
+++ b/opensm/opensm/osm_opensm.c
@@ -394,7 +394,7 @@ osm_opensm_bind(IN osm_opensm_t * const p_osm, IN const ib_net64_t guid)
{
ib_api_status_t status;
- OSM_LOG_ENTER(&p_osm->log, osm_opensm_bind);
+ OSM_LOG_ENTER(&p_osm->log);
status = osm_sm_bind(&p_osm->sm, guid);
if (status != IB_SUCCESS)
diff --git a/opensm/opensm/osm_perfmgr.c b/opensm/opensm/osm_perfmgr.c
index 8375396..a959782 100644
--- a/opensm/opensm/osm_perfmgr.c
+++ b/opensm/opensm/osm_perfmgr.c
@@ -173,7 +173,7 @@ osm_perfmgr_mad_recv_callback(osm_madw_t * p_madw, void *bind_context,
{
osm_perfmgr_t *pm = (osm_perfmgr_t *) bind_context;
- OSM_LOG_ENTER(pm->log, osm_perfmgr_mad_recv_callback);
+ OSM_LOG_ENTER(pm->log);
osm_madw_copy_context(p_madw, p_req_madw);
osm_mad_pool_put(pm->mad_pool, p_req_madw);
@@ -204,7 +204,7 @@ osm_perfmgr_mad_send_err_callback(void *bind_context, osm_madw_t * p_madw)
cl_map_item_t *p_node;
__monitored_node_t *p_mon_node;
- OSM_LOG_ENTER(pm->log, osm_perfmgr_mad_send_err_callback);
+ OSM_LOG_ENTER(pm->log);
/* go ahead and get the monitored node struct to have the printable
* name if needed in messages
@@ -258,7 +258,7 @@ osm_perfmgr_bind(osm_perfmgr_t * const pm, const ib_net64_t port_guid)
osm_bind_info_t bind_info;
ib_api_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(pm->log, osm_perfmgr_bind);
+ OSM_LOG_ENTER(pm->log);
if (pm->bind_handle != OSM_BIND_INVALID_HANDLE) {
osm_log(pm->log, OSM_LOG_ERROR,
@@ -305,7 +305,7 @@ osm_perfmgr_bind(osm_perfmgr_t * const pm, const ib_net64_t port_guid)
**********************************************************************/
static void osm_perfmgr_mad_unbind(osm_perfmgr_t * const pm)
{
- OSM_LOG_ENTER(pm->log, osm_sa_mad_ctrl_unbind);
+ OSM_LOG_ENTER(pm->log);
if (pm->bind_handle == OSM_BIND_INVALID_HANDLE) {
osm_log(pm->log, OSM_LOG_ERROR,
"osm_perfmgr_mad_unbind: ERR 4C05: No previous bind\n");
@@ -368,7 +368,7 @@ osm_perfmgr_send_pc_mad(osm_perfmgr_t * perfmgr, ib_net16_t dest_lid,
ib_perfmgt_mad_t *pm_mad = NULL;
osm_madw_t *p_madw = NULL;
- OSM_LOG_ENTER(perfmgr->log, osm_perfmgr_send_pc_mad);
+ OSM_LOG_ENTER(perfmgr->log);
p_madw =
osm_mad_pool_get(perfmgr->mad_pool, perfmgr->bind_handle,
@@ -438,7 +438,7 @@ static void __collect_guids(cl_map_item_t * const p_map_item, void *context)
__monitored_node_t *mon_node = NULL;
uint32_t size;
- OSM_LOG_ENTER(pm->log, __collect_guids);
+ OSM_LOG_ENTER(pm->log);
if (cl_qmap_get(&(pm->monitored_map), node_guid)
== cl_qmap_end(&(pm->monitored_map))) {
@@ -479,7 +479,7 @@ __osm_perfmgr_query_counters(cl_map_item_t * const p_map_item, void *context)
uint64_t node_guid = 0;
ib_net32_t remote_qp;
- OSM_LOG_ENTER(pm->log, __osm_perfmgr_query_counters);
+ OSM_LOG_ENTER(pm->log);
cl_plock_acquire(pm->lock);
node = osm_get_node_by_guid(pm->subn, cl_hton64(mon_node->guid));
@@ -857,7 +857,7 @@ static void perfmgr_sweep(void *arg)
**********************************************************************/
void osm_perfmgr_shutdown(osm_perfmgr_t * const pm)
{
- OSM_LOG_ENTER(pm->log, osm_perfmgr_shutdown);
+ OSM_LOG_ENTER(pm->log);
cl_timer_stop(&pm->sweep_timer);
osm_perfmgr_mad_unbind(pm);
OSM_LOG_EXIT(pm->log);
@@ -867,7 +867,7 @@ void osm_perfmgr_shutdown(osm_perfmgr_t * const pm)
**********************************************************************/
void osm_perfmgr_destroy(osm_perfmgr_t * const pm)
{
- OSM_LOG_ENTER(pm->log, osm_perfmgr_destroy);
+ OSM_LOG_ENTER(pm->log);
free(pm->event_db_dump_file);
perfmgr_db_destroy(pm->db);
cl_timer_destroy(&pm->sweep_timer);
@@ -976,7 +976,7 @@ osm_perfmgr_check_overflow(osm_perfmgr_t * pm, __monitored_node_t *mon_node,
ib_api_status_t status;
ib_net32_t remote_qp;
- OSM_LOG_ENTER(pm->log, osm_perfmgr_check_overflow);
+ OSM_LOG_ENTER(pm->log);
if (counter_overflow_16(pc->symbol_err_cnt) ||
counter_overflow_8(pc->link_err_recover) ||
@@ -1104,7 +1104,7 @@ static void osm_pc_rcv_process(void *context, void *data)
cl_map_item_t *p_node;
__monitored_node_t *p_mon_node;
- OSM_LOG_ENTER(pm->log, osm_pc_rcv_process);
+ OSM_LOG_ENTER(pm->log);
/* go ahead and get the monitored node struct to have the printable
* name if needed in messages
@@ -1245,7 +1245,7 @@ osm_perfmgr_init(osm_perfmgr_t * const pm,
{
ib_api_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(log, osm_perfmgr_init);
+ OSM_LOG_ENTER(log);
osm_log(log, OSM_LOG_VERBOSE, "Initializing PerfMgr\n");
diff --git a/opensm/opensm/osm_pkey.c b/opensm/opensm/osm_pkey.c
index 04d009b..1d5df93 100644
--- a/opensm/opensm/osm_pkey.c
+++ b/opensm/opensm/osm_pkey.c
@@ -404,7 +404,7 @@ osm_port_share_pkey(IN osm_log_t * p_log,
osm_physp_t *p_physp1, *p_physp2;
boolean_t ret;
- OSM_LOG_ENTER(p_log, osm_port_share_pkey);
+ OSM_LOG_ENTER(p_log);
if (!p_port_1 || !p_port_2) {
ret = FALSE;
@@ -441,7 +441,7 @@ osm_lid_share_pkey(IN osm_log_t * p_log,
osm_node_t *p_node1, *p_node2;
const cl_ptr_vector_t *const p_port_lid_tbl = &(p_subn->port_lid_tbl);
- OSM_LOG_ENTER(p_log, osm_lid_share_pkey);
+ OSM_LOG_ENTER(p_log);
p_port1 = cl_ptr_vector_get(p_port_lid_tbl, lid1);
p_port2 = cl_ptr_vector_get(p_port_lid_tbl, lid2);
@@ -476,7 +476,7 @@ osm_physp_has_pkey(IN osm_log_t * p_log,
const osm_pkey_tbl_t *pkey_tbl;
boolean_t res = FALSE;
- OSM_LOG_ENTER(p_log, osm_physp_has_pkey);
+ OSM_LOG_ENTER(p_log);
osm_log(p_log, OSM_LOG_DEBUG,
"osm_physp_has_pkey: "
diff --git a/opensm/opensm/osm_pkey_mgr.c b/opensm/opensm/osm_pkey_mgr.c
index 33eeb8b..8c8deec 100644
--- a/opensm/opensm/osm_pkey_mgr.c
+++ b/opensm/opensm/osm_pkey_mgr.c
@@ -508,7 +508,7 @@ osm_signal_t osm_pkey_mgr_process(IN osm_opensm_t * p_osm)
CL_ASSERT(p_osm);
- OSM_LOG_ENTER(&p_osm->log, osm_pkey_mgr_process);
+ OSM_LOG_ENTER(&p_osm->log);
CL_PLOCK_EXCL_ACQUIRE(&p_osm->lock);
diff --git a/opensm/opensm/osm_pkey_rcv.c b/opensm/opensm/osm_pkey_rcv.c
index a827e28..851f540 100644
--- a/opensm/opensm/osm_pkey_rcv.c
+++ b/opensm/opensm/osm_pkey_rcv.c
@@ -70,7 +70,7 @@ void osm_pkey_rcv_process(IN void *context, IN void *data)
CL_ASSERT(sm);
- OSM_LOG_ENTER(sm->p_log, osm_pkey_rcv_process);
+ OSM_LOG_ENTER(sm->p_log);
CL_ASSERT(p_madw);
diff --git a/opensm/opensm/osm_port.c b/opensm/opensm/osm_port.c
index 653212a..33152d2 100644
--- a/opensm/opensm/osm_port.c
+++ b/opensm/opensm/osm_port.c
@@ -315,7 +315,7 @@ osm_physp_calc_link_mtu(IN osm_log_t * p_log, IN const osm_physp_t * p_physp)
uint8_t mtu;
uint8_t remote_mtu;
- OSM_LOG_ENTER(p_log, osm_physp_calc_link_mtu);
+ OSM_LOG_ENTER(p_log);
p_remote_physp = osm_physp_get_remote(p_physp);
if (p_remote_physp) {
@@ -380,7 +380,7 @@ osm_physp_calc_link_op_vls(IN osm_log_t * p_log,
uint8_t op_vls;
uint8_t remote_op_vls;
- OSM_LOG_ENTER(p_log, osm_physp_calc_link_op_vls);
+ OSM_LOG_ENTER(p_log);
p_remote_physp = osm_physp_get_remote(p_physp);
if (p_remote_physp) {
@@ -471,7 +471,7 @@ __osm_physp_get_dr_physp_set(IN osm_log_t * p_log,
uint8_t hop;
cl_status_t status = CL_SUCCESS;
- OSM_LOG_ENTER(p_log, __osm_physp_get_dr_physp_set);
+ OSM_LOG_ENTER(p_log);
/* find the OSM node */
p_port = osm_get_port_by_guid(p_subn, p_subn->sm_port_guid);
diff --git a/opensm/opensm/osm_port_info_rcv.c b/opensm/opensm/osm_port_info_rcv.c
index 356cd56..be4fcca 100644
--- a/opensm/opensm/osm_port_info_rcv.c
+++ b/opensm/opensm/osm_port_info_rcv.c
@@ -75,7 +75,7 @@ __osm_pi_rcv_set_sm(IN osm_sm_t * sm,
osm_bind_handle_t h_bind;
osm_dr_path_t *p_dr_path;
- OSM_LOG_ENTER(sm->p_log, __osm_pi_rcv_set_sm);
+ OSM_LOG_ENTER(sm->p_log);
if (osm_log_is_active(sm->p_log, OSM_LOG_DEBUG))
osm_log(sm->p_log, OSM_LOG_DEBUG,
@@ -122,7 +122,7 @@ __osm_pi_rcv_process_endport(IN osm_sm_t * sm,
cl_qmap_t *p_sm_tbl;
osm_remote_sm_t *p_sm;
- OSM_LOG_ENTER(sm->p_log, __osm_pi_rcv_process_endport);
+ OSM_LOG_ENTER(sm->p_log);
port_guid = osm_physp_get_port_guid(p_physp);
@@ -226,7 +226,7 @@ __osm_pi_rcv_process_switch_port(IN osm_sm_t * sm,
uint8_t remote_port_num;
osm_dr_path_t path;
- OSM_LOG_ENTER(sm->p_log, __osm_pi_rcv_process_switch_port);
+ OSM_LOG_ENTER(sm->p_log);
/*
Check the state of the physical port.
@@ -354,7 +354,7 @@ __osm_pi_rcv_process_ca_or_router_port(IN osm_sm_t * sm,
IN osm_physp_t * const p_physp,
IN ib_port_info_t * const p_pi)
{
- OSM_LOG_ENTER(sm->p_log, __osm_pi_rcv_process_ca_or_router_port);
+ OSM_LOG_ENTER(sm->p_log);
UNUSED_PARAM(p_node);
@@ -383,7 +383,7 @@ static void get_pkey_table(IN osm_log_t * p_log,
uint16_t block_num, max_blocks;
uint32_t attr_mod_ho;
- OSM_LOG_ENTER(p_log, get_pkey_table);
+ OSM_LOG_ENTER(p_log);
path = *osm_physp_get_dr_path_ptr(p_physp);
@@ -447,7 +447,7 @@ __osm_pi_rcv_get_pkey_slvl_vla_tables(IN osm_sm_t * sm,
IN osm_node_t * const p_node,
IN osm_physp_t * const p_physp)
{
- OSM_LOG_ENTER(sm->p_log, __osm_pi_rcv_get_pkey_slvl_vla_tables);
+ OSM_LOG_ENTER(sm->p_log);
get_pkey_table(sm->p_log, sm, p_node, p_physp);
@@ -467,7 +467,7 @@ osm_pi_rcv_process_set(IN osm_sm_t * sm, IN osm_node_t * const p_node,
osm_pi_context_t *p_context;
osm_log_level_t level;
- OSM_LOG_ENTER(sm->p_log, osm_pi_rcv_process_set);
+ OSM_LOG_ENTER(sm->p_log);
p_context = osm_madw_get_pi_context_ptr(p_madw);
@@ -537,7 +537,7 @@ void osm_pi_rcv_process(IN void *context, IN void *data)
ib_net64_t node_guid;
uint8_t port_num;
- OSM_LOG_ENTER(sm->p_log, osm_pi_rcv_process);
+ OSM_LOG_ENTER(sm->p_log);
CL_ASSERT(sm);
CL_ASSERT(p_madw);
diff --git a/opensm/opensm/osm_qos.c b/opensm/opensm/osm_qos.c
index 1a6cc05..675189a 100644
--- a/opensm/opensm/osm_qos.c
+++ b/opensm/opensm/osm_qos.c
@@ -284,7 +284,7 @@ osm_signal_t osm_qos_setup(osm_opensm_t * p_osm)
if (!p_osm->subn.opt.qos)
return OSM_SIGNAL_DONE;
- OSM_LOG_ENTER(&p_osm->log, osm_qos_setup);
+ OSM_LOG_ENTER(&p_osm->log);
qos_build_config(&ca_config, &p_osm->subn.opt.qos_ca_options,
&p_osm->subn.opt.qos_options);
diff --git a/opensm/opensm/osm_qos_parser.y b/opensm/opensm/osm_qos_parser.y
index a98a60f..11da30b 100644
--- a/opensm/opensm/osm_qos_parser.y
+++ b/opensm/opensm/osm_qos_parser.y
@@ -2272,7 +2272,7 @@ int osm_qos_parse_policy_file(IN osm_subn_t * const p_subn)
static boolean_t first_time = TRUE;
p_qos_parser_osm_log = &p_subn->p_osm->log;
- OSM_LOG_ENTER(p_qos_parser_osm_log, osm_qos_parse_policy_file);
+ OSM_LOG_ENTER(p_qos_parser_osm_log);
osm_qos_policy_destroy(p_subn->p_qos_policy);
p_subn->p_qos_policy = NULL;
@@ -2378,7 +2378,7 @@ static void __qos_parser_error(const char *format, ...)
char s[256];
va_list pvar;
- OSM_LOG_ENTER(p_qos_parser_osm_log, __qos_parser_error);
+ OSM_LOG_ENTER(p_qos_parser_osm_log);
va_start(pvar, format);
vsnprintf(s, 256, format, pvar);
diff --git a/opensm/opensm/osm_qos_policy.c b/opensm/opensm/osm_qos_policy.c
index bde1e7e..e01e55f 100644
--- a/opensm/opensm/osm_qos_policy.c
+++ b/opensm/opensm/osm_qos_policy.c
@@ -777,7 +777,7 @@ int osm_qos_policy_validate(osm_qos_policy_t * p_qos_policy,
ib_net16_t pkey;
osm_prtn_t * p_prtn;
- OSM_LOG_ENTER(p_log, osm_qos_policy_validate);
+ OSM_LOG_ENTER(p_log);
/* set default qos level */
@@ -962,8 +962,7 @@ static osm_qos_level_t * __qos_policy_get_qos_level_by_params(
osm_qos_match_rule_t *p_qos_match_rule = NULL;
osm_qos_level_t *p_qos_level = NULL;
- OSM_LOG_ENTER(&p_qos_policy->p_subn->p_osm->log,
- __qos_policy_get_qos_level_by_params);
+ OSM_LOG_ENTER(&p_qos_policy->p_subn->p_osm->log);
if (!p_qos_policy)
goto Exit;
diff --git a/opensm/opensm/osm_req.c b/opensm/opensm/osm_req.c
index 0524ce2..e839f12 100644
--- a/opensm/opensm/osm_req.c
+++ b/opensm/opensm/osm_req.c
@@ -78,7 +78,7 @@ osm_req_get(IN osm_sm_t * sm,
CL_ASSERT(sm);
- OSM_LOG_ENTER(sm->p_log, osm_req_get);
+ OSM_LOG_ENTER(sm->p_log);
CL_ASSERT(p_path);
CL_ASSERT(attr_id);
@@ -159,7 +159,7 @@ osm_req_set(IN osm_sm_t * sm,
CL_ASSERT(sm);
- OSM_LOG_ENTER(sm->p_log, osm_req_set);
+ OSM_LOG_ENTER(sm->p_log);
CL_ASSERT(p_path);
CL_ASSERT(attr_id);
diff --git a/opensm/opensm/osm_resp.c b/opensm/opensm/osm_resp.c
index 285559a..6d56fa0 100644
--- a/opensm/opensm/osm_resp.c
+++ b/opensm/opensm/osm_resp.c
@@ -70,7 +70,7 @@ osm_resp_make_resp_smp(IN osm_sm_t * sm,
IN const uint8_t * const p_payload,
OUT ib_smp_t * const p_dest_smp)
{
- OSM_LOG_ENTER(sm->p_log, osm_resp_make_resp_smp);
+ OSM_LOG_ENTER(sm->p_log);
CL_ASSERT(p_dest_smp);
CL_ASSERT(p_src_smp);
@@ -115,7 +115,7 @@ osm_resp_send(IN osm_sm_t * sm,
osm_madw_t *p_madw;
ib_api_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(sm->p_log, osm_resp_send);
+ OSM_LOG_ENTER(sm->p_log);
CL_ASSERT(p_req_madw);
CL_ASSERT(p_payload);
diff --git a/opensm/opensm/osm_sa.c b/opensm/opensm/osm_sa.c
index c286259..82afa6d 100644
--- a/opensm/opensm/osm_sa.c
+++ b/opensm/opensm/osm_sa.c
@@ -108,7 +108,7 @@ void osm_sa_construct(IN osm_sa_t * const p_sa)
void osm_sa_shutdown(IN osm_sa_t * const p_sa)
{
ib_api_status_t status;
- OSM_LOG_ENTER(p_sa->p_log, osm_sa_shutdown);
+ OSM_LOG_ENTER(p_sa->p_log);
cl_timer_stop(&p_sa->sr_timer);
@@ -144,7 +144,7 @@ void osm_sa_shutdown(IN osm_sa_t * const p_sa)
**********************************************************************/
void osm_sa_destroy(IN osm_sa_t * const p_sa)
{
- OSM_LOG_ENTER(p_sa->p_log, osm_sa_destroy);
+ OSM_LOG_ENTER(p_sa->p_log);
p_sa->state = OSM_SA_STATE_INIT;
@@ -167,7 +167,7 @@ osm_sa_init(IN osm_sm_t * const p_sm,
{
ib_api_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(p_log, osm_sa_init);
+ OSM_LOG_ENTER(p_log);
p_sa->sm = p_sm;
p_sa->p_subn = p_subn;
@@ -301,7 +301,7 @@ osm_sa_bind(IN osm_sa_t * const p_sa, IN const ib_net64_t port_guid)
{
ib_api_status_t status;
- OSM_LOG_ENTER(p_sa->p_log, osm_sa_bind);
+ OSM_LOG_ENTER(p_sa->p_log);
status = osm_sa_mad_ctrl_bind(&p_sa->mad_ctrl, port_guid);
diff --git a/opensm/opensm/osm_sa_class_port_info.c b/opensm/opensm/osm_sa_class_port_info.c
index 4f62761..e5574bf 100644
--- a/opensm/opensm/osm_sa_class_port_info.c
+++ b/opensm/opensm/osm_sa_class_port_info.c
@@ -84,7 +84,7 @@ __osm_cpi_rcv_respond(IN osm_sa_t * sa,
ib_gid_t zero_gid;
uint8_t rtv;
- OSM_LOG_ENTER(sa->p_log, __osm_cpi_rcv_respond);
+ OSM_LOG_ENTER(sa->p_log);
memset(&zero_gid, 0, sizeof(ib_gid_t));
@@ -200,7 +200,7 @@ void osm_cpi_rcv_process(IN void *context, IN void *data)
osm_madw_t *p_madw = data;
const ib_sa_mad_t *p_sa_mad;
- OSM_LOG_ENTER(sa->p_log, osm_cpi_rcv_process);
+ OSM_LOG_ENTER(sa->p_log);
CL_ASSERT(p_madw);
diff --git a/opensm/opensm/osm_sa_guidinfo_record.c b/opensm/opensm/osm_sa_guidinfo_record.c
index af8ba6e..bfbe63b 100644
--- a/opensm/opensm/osm_sa_guidinfo_record.c
+++ b/opensm/opensm/osm_sa_guidinfo_record.c
@@ -88,7 +88,7 @@ __osm_gir_rcv_new_gir(IN osm_sa_t * sa,
osm_gir_item_t *p_rec_item;
ib_api_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(sa->p_log, __osm_gir_rcv_new_gir);
+ OSM_LOG_ENTER(sa->p_log);
p_rec_item = malloc(sizeof(*p_rec_item));
if (p_rec_item == NULL) {
@@ -142,7 +142,7 @@ __osm_sa_gir_create_gir(IN osm_sa_t * sa,
ib_net64_t port_guid;
uint8_t block_num, start_block_num, end_block_num, num_blocks;
- OSM_LOG_ENTER(sa->p_log, __osm_sa_gir_create_gir);
+ OSM_LOG_ENTER(sa->p_log);
if (osm_log_is_active(sa->p_log, OSM_LOG_DEBUG)) {
osm_log(sa->p_log, OSM_LOG_DEBUG,
@@ -249,7 +249,7 @@ __osm_sa_gir_by_comp_mask_cb(IN cl_map_item_t * const p_map_item,
ib_net16_t match_lid = 0;
uint8_t match_block_num = 255;
- OSM_LOG_ENTER(p_ctxt->sa->p_log, __osm_sa_gir_by_comp_mask_cb);
+ OSM_LOG_ENTER(p_ctxt->sa->p_log);
if (comp_mask & IB_GIR_COMPMASK_LID)
match_lid = p_rcvd_rec->lid;
@@ -333,7 +333,7 @@ void osm_gir_rcv_process(IN void *ctx, IN void *data)
CL_ASSERT(sa);
- OSM_LOG_ENTER(sa->p_log, osm_gir_rcv_process);
+ OSM_LOG_ENTER(sa->p_log);
CL_ASSERT(p_madw);
diff --git a/opensm/opensm/osm_sa_informinfo.c b/opensm/opensm/osm_sa_informinfo.c
index 92a7fa1..a0cd050 100644
--- a/opensm/opensm/osm_sa_informinfo.c
+++ b/opensm/opensm/osm_sa_informinfo.c
@@ -101,7 +101,7 @@ __validate_ports_access_rights(IN osm_sa_t * sa,
const cl_ptr_vector_t *p_tbl;
ib_gid_t zero_gid;
- OSM_LOG_ENTER(sa->p_log, __validate_ports_access_rights);
+ OSM_LOG_ENTER(sa->p_log);
/* get the requester physp from the request address */
p_requester_physp = osm_get_physp_by_mad_addr(sa->p_log,
@@ -202,7 +202,7 @@ __validate_infr(IN osm_sa_t * sa, IN osm_infr_t * p_infr_rec)
{
boolean_t valid = TRUE;
- OSM_LOG_ENTER(sa->p_log, __validate_infr);
+ OSM_LOG_ENTER(sa->p_log);
valid = __validate_ports_access_rights(sa, p_infr_rec);
if (!valid) {
@@ -230,7 +230,7 @@ __osm_infr_rcv_respond(IN osm_sa_t * sa,
ib_inform_info_t *p_resp_infr;
ib_api_status_t status;
- OSM_LOG_ENTER(sa->p_log, __osm_infr_rcv_respond);
+ OSM_LOG_ENTER(sa->p_log);
if (osm_log_is_active(sa->p_log, OSM_LOG_DEBUG)) {
osm_log(sa->p_log, OSM_LOG_DEBUG,
@@ -293,7 +293,7 @@ __osm_sa_inform_info_rec_by_comp_mask(IN osm_sa_t * sa,
const osm_physp_t *p_req_physp;
osm_iir_item_t *p_rec_item;
- OSM_LOG_ENTER(sa->p_log, __osm_sa_inform_info_rec_by_comp_mask);
+ OSM_LOG_ENTER(sa->p_log);
p_rcvd_rec = p_ctxt->p_rcvd_rec;
comp_mask = p_ctxt->comp_mask;
@@ -388,7 +388,7 @@ osm_infr_rcv_process_get_method(IN osm_sa_t * sa,
ib_api_status_t status = IB_SUCCESS;
osm_physp_t *p_req_physp;
- OSM_LOG_ENTER(sa->p_log, osm_infr_rcv_process_get_method);
+ OSM_LOG_ENTER(sa->p_log);
CL_ASSERT(p_madw);
p_rcvd_mad = osm_madw_get_sa_mad_ptr(p_madw);
@@ -597,7 +597,7 @@ osm_infr_rcv_process_set_method(IN osm_sa_t * sa,
uint8_t resp_time_val;
ib_api_status_t res;
- OSM_LOG_ENTER(sa->p_log, osm_infr_rcv_process_set_method);
+ OSM_LOG_ENTER(sa->p_log);
CL_ASSERT(p_madw);
@@ -774,7 +774,7 @@ void osm_infr_rcv_process(IN void *context, IN void *data)
osm_madw_t *p_madw = data;
ib_sa_mad_t *p_sa_mad;
- OSM_LOG_ENTER(sa->p_log, osm_infr_rcv_process);
+ OSM_LOG_ENTER(sa->p_log);
CL_ASSERT(p_madw);
@@ -806,7 +806,7 @@ void osm_infir_rcv_process(IN void *context, IN void *data)
osm_madw_t *p_madw = data;
ib_sa_mad_t *p_sa_mad;
- OSM_LOG_ENTER(sa->p_log, osm_infr_rcv_process);
+ OSM_LOG_ENTER(sa->p_log);
CL_ASSERT(p_madw);
diff --git a/opensm/opensm/osm_sa_lft_record.c b/opensm/opensm/osm_sa_lft_record.c
index b6a86d5..6e88945 100644
--- a/opensm/opensm/osm_sa_lft_record.c
+++ b/opensm/opensm/osm_sa_lft_record.c
@@ -83,7 +83,7 @@ __osm_lftr_rcv_new_lftr(IN osm_sa_t * sa,
osm_lftr_item_t *p_rec_item;
ib_api_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(sa->p_log, __osm_lftr_rcv_new_lftr);
+ OSM_LOG_ENTER(sa->p_log);
p_rec_item = malloc(sizeof(*p_rec_item));
if (p_rec_item == NULL) {
@@ -241,7 +241,7 @@ void osm_lftr_rcv_process(IN void *ctx, IN void *data)
CL_ASSERT(sa);
- OSM_LOG_ENTER(sa->p_log, osm_lftr_rcv_process);
+ OSM_LOG_ENTER(sa->p_log);
CL_ASSERT(p_madw);
diff --git a/opensm/opensm/osm_sa_link_record.c b/opensm/opensm/osm_sa_link_record.c
index 8c7e2e7..9b484e8 100644
--- a/opensm/opensm/osm_sa_link_record.c
+++ b/opensm/opensm/osm_sa_link_record.c
@@ -128,7 +128,7 @@ __osm_lr_rcv_get_physp_link(IN osm_sa_t * sa,
ib_net16_t to_base_lid;
ib_net16_t lmc_mask;
- OSM_LOG_ENTER(sa->p_log, __osm_lr_rcv_get_physp_link);
+ OSM_LOG_ENTER(sa->p_log);
/*
If only one end of the link is specified, determine
@@ -241,7 +241,7 @@ __osm_lr_rcv_get_port_links(IN osm_sa_t * sa,
uint8_t dest_num_ports;
uint8_t dest_port_num;
- OSM_LOG_ENTER(sa->p_log, __osm_lr_rcv_get_port_links);
+ OSM_LOG_ENTER(sa->p_log);
if (p_src_port) {
if (p_dest_port) {
@@ -391,7 +391,7 @@ __osm_lr_rcv_get_end_points(IN osm_sa_t * sa,
ib_api_status_t status;
ib_net16_t sa_status = IB_SA_MAD_STATUS_SUCCESS;
- OSM_LOG_ENTER(sa->p_log, __osm_lr_rcv_get_end_points);
+ OSM_LOG_ENTER(sa->p_log);
/*
Determine what fields are valid and then get a pointer
@@ -468,7 +468,7 @@ __osm_lr_rcv_respond(IN osm_sa_t * sa,
osm_lr_item_t *p_lr_item;
const ib_sa_mad_t *p_rcvd_mad = osm_madw_get_sa_mad_ptr(p_madw);
- OSM_LOG_ENTER(sa->p_log, __osm_lr_rcv_respond);
+ OSM_LOG_ENTER(sa->p_log);
num_rec = cl_qlist_count(p_list);
/*
@@ -613,7 +613,7 @@ void osm_lr_rcv_process(IN void *context, IN void *data)
ib_net16_t sa_status;
osm_physp_t *p_req_physp;
- OSM_LOG_ENTER(sa->p_log, osm_lr_rcv_process);
+ OSM_LOG_ENTER(sa->p_log);
CL_ASSERT(p_madw);
diff --git a/opensm/opensm/osm_sa_mad_ctrl.c b/opensm/opensm/osm_sa_mad_ctrl.c
index 9a9b4c2..da594ab 100644
--- a/opensm/opensm/osm_sa_mad_ctrl.c
+++ b/opensm/opensm/osm_sa_mad_ctrl.c
@@ -73,7 +73,7 @@ __osm_sa_mad_ctrl_disp_done_callback(IN void *context, IN void *p_data)
osm_sa_mad_ctrl_t *const p_ctrl = (osm_sa_mad_ctrl_t *) context;
osm_madw_t *const p_madw = (osm_madw_t *) p_data;
- OSM_LOG_ENTER(p_ctrl->p_log, __osm_sa_mad_ctrl_disp_done_callback);
+ OSM_LOG_ENTER(p_ctrl->p_log);
CL_ASSERT(p_madw);
/*
@@ -104,7 +104,7 @@ __osm_sa_mad_ctrl_process(IN osm_sa_mad_ctrl_t * const p_ctrl,
uint64_t last_dispatched_msg_queue_time_msec;
uint32_t num_messages;
- OSM_LOG_ENTER(p_ctrl->p_log, __osm_sa_mad_ctrl_process);
+ OSM_LOG_ENTER(p_ctrl->p_log);
/*
If the dispatcher is showing us that it is overloaded
@@ -296,7 +296,7 @@ __osm_sa_mad_ctrl_rcv_callback(IN osm_madw_t * p_madw,
osm_sa_mad_ctrl_t *p_ctrl = (osm_sa_mad_ctrl_t *) bind_context;
ib_sa_mad_t *p_sa_mad;
- OSM_LOG_ENTER(p_ctrl->p_log, __osm_sa_mad_ctrl_rcv_callback);
+ OSM_LOG_ENTER(p_ctrl->p_log);
CL_ASSERT(p_madw);
@@ -422,7 +422,7 @@ __osm_sa_mad_ctrl_send_err_callback(IN void *bind_context,
osm_sa_mad_ctrl_t *p_ctrl = (osm_sa_mad_ctrl_t *) bind_context;
cl_status_t status;
- OSM_LOG_ENTER(p_ctrl->p_log, __osm_sa_mad_ctrl_send_err_callback);
+ OSM_LOG_ENTER(p_ctrl->p_log);
osm_log(p_ctrl->p_log, OSM_LOG_ERROR,
"__osm_sa_mad_ctrl_send_err_callback: ERR 1A06: "
@@ -516,7 +516,7 @@ osm_sa_mad_ctrl_init(IN osm_sa_mad_ctrl_t * const p_ctrl,
{
ib_api_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(p_log, osm_sa_mad_ctrl_init);
+ OSM_LOG_ENTER(p_log);
osm_sa_mad_ctrl_construct(p_ctrl);
@@ -553,7 +553,7 @@ osm_sa_mad_ctrl_bind(IN osm_sa_mad_ctrl_t * const p_ctrl,
osm_bind_info_t bind_info;
ib_api_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(p_ctrl->p_log, osm_sa_mad_ctrl_bind);
+ OSM_LOG_ENTER(p_ctrl->p_log);
if (p_ctrl->h_bind != OSM_BIND_INVALID_HANDLE) {
osm_log(p_ctrl->p_log, OSM_LOG_ERROR,
@@ -603,7 +603,7 @@ ib_api_status_t osm_sa_mad_ctrl_unbind(IN osm_sa_mad_ctrl_t * const p_ctrl)
{
ib_api_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(p_ctrl->p_log, osm_sa_mad_ctrl_unbind);
+ OSM_LOG_ENTER(p_ctrl->p_log);
if (p_ctrl->h_bind == OSM_BIND_INVALID_HANDLE) {
osm_log(p_ctrl->p_log, OSM_LOG_ERROR,
diff --git a/opensm/opensm/osm_sa_mcmember_record.c b/opensm/opensm/osm_sa_mcmember_record.c
index d057207..1cec9e1 100644
--- a/opensm/opensm/osm_sa_mcmember_record.c
+++ b/opensm/opensm/osm_sa_mcmember_record.c
@@ -156,7 +156,7 @@ __get_new_mlid(IN osm_sa_t * sa, IN ib_net16_t requested_mlid)
uint16_t mlid; /* the result */
uint16_t max_num_mlids;
- OSM_LOG_ENTER(sa->p_log, __get_new_mlid);
+ OSM_LOG_ENTER(sa->p_log);
if (requested_mlid && cl_ntoh16(requested_mlid) >= IB_LID_MCAST_START_HO
&& cl_ntoh16(requested_mlid) < p_subn->max_multicast_lid_ho
@@ -358,7 +358,7 @@ __osm_mcmr_rcv_respond(IN osm_sa_t * sa,
ib_member_rec_t *p_resp_mcmember_rec;
ib_api_status_t status;
- OSM_LOG_ENTER(sa->p_log, __osm_mcmr_rcv_respond);
+ OSM_LOG_ENTER(sa->p_log);
/*
* Get a MAD to reply. Address of Mad is in the received mad_wrapper
@@ -771,7 +771,7 @@ __validate_requested_mgid(IN osm_sa_t * sa,
uint16_t signature;
boolean_t valid = TRUE;
- OSM_LOG_ENTER(sa->p_log, __validate_requested_mgid);
+ OSM_LOG_ENTER(sa->p_log);
/* 14-a: mcast GID must start with 0xFF */
if (p_mcm_rec->mgid.multicast.header[0] != 0xFF) {
@@ -869,7 +869,7 @@ __mgrp_request_is_realizable(IN osm_sa_t * sa,
uint8_t rate_required, rate, port_rate;
osm_log_t *p_log = sa->p_log;
- OSM_LOG_ENTER(sa->p_log, __mgrp_request_is_realizable);
+ OSM_LOG_ENTER(sa->p_log);
/*
* End of o15-0.2.3 specifies:
@@ -1002,7 +1002,7 @@ osm_mcmr_rcv_create_new_mgrp(IN osm_sa_t * sa,
ib_api_status_t status = IB_SUCCESS;
ib_member_rec_t mcm_rec = *p_recvd_mcmember_rec; /* copy for modifications */
- OSM_LOG_ENTER(sa->p_log, osm_mcmr_rcv_create_new_mgrp);
+ OSM_LOG_ENTER(sa->p_log);
/* but what if the given MGID was not 0 ? */
zero_mgid = 1;
@@ -1268,7 +1268,7 @@ __osm_mcmr_rcv_leave_mgrp(IN osm_sa_t * sa,
uint8_t port_join_state;
uint8_t new_join_state;
- OSM_LOG_ENTER(sa->p_log, __osm_mcmr_rcv_leave_mgrp);
+ OSM_LOG_ENTER(sa->p_log);
p_mgrp = NULL;
p_sa_mad = osm_madw_get_sa_mad_ptr(p_madw);
@@ -1400,7 +1400,7 @@ __osm_mcmr_rcv_join_mgrp(IN osm_sa_t * sa,
osm_mcast_req_type_t req_type;
uint8_t join_state;
- OSM_LOG_ENTER(sa->p_log, __osm_mcmr_rcv_join_mgrp);
+ OSM_LOG_ENTER(sa->p_log);
p_mgrp = NULL;
p_sa_mad = osm_madw_get_sa_mad_ptr(p_madw);
@@ -1693,7 +1693,7 @@ __osm_mcmr_rcv_new_mcmr(IN osm_sa_t * sa,
osm_mcmr_item_t *p_rec_item;
ib_api_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(sa->p_log, __osm_mcmr_rcv_new_mcmr);
+ OSM_LOG_ENTER(sa->p_log);
p_rec_item = malloc(sizeof(*p_rec_item));
if (p_rec_item == NULL) {
@@ -1742,7 +1742,7 @@ __osm_sa_mcm_by_comp_mask_cb(IN cl_map_item_t * const p_map_item,
ib_gid_t port_gid;
boolean_t proxy_join = FALSE;
- OSM_LOG_ENTER(sa->p_log, __osm_sa_mcm_by_comp_mask_cb);
+ OSM_LOG_ENTER(sa->p_log);
osm_log(sa->p_log, OSM_LOG_DEBUG,
"__osm_sa_mcm_by_comp_mask_cb: "
@@ -1930,7 +1930,7 @@ __osm_mcmr_query_mgrp(IN osm_sa_t * sa,
osm_physp_t *p_req_physp;
boolean_t trusted_req;
- OSM_LOG_ENTER(sa->p_log, __osm_mcmr_query_mgrp);
+ OSM_LOG_ENTER(sa->p_log);
p_rcvd_mad = osm_madw_get_sa_mad_ptr(p_madw);
p_rcvd_rec = (ib_member_rec_t *) ib_sa_mad_get_payload_ptr(p_rcvd_mad);
@@ -2134,7 +2134,7 @@ void osm_mcmr_rcv_process(IN void *context, IN void *data)
CL_ASSERT(sa);
- OSM_LOG_ENTER(sa->p_log, osm_mcmr_rcv_process);
+ OSM_LOG_ENTER(sa->p_log);
CL_ASSERT(p_madw);
diff --git a/opensm/opensm/osm_sa_mft_record.c b/opensm/opensm/osm_sa_mft_record.c
index 30506a6..039282f 100644
--- a/opensm/opensm/osm_sa_mft_record.c
+++ b/opensm/opensm/osm_sa_mft_record.c
@@ -84,7 +84,7 @@ __osm_mftr_rcv_new_mftr(IN osm_sa_t * sa,
ib_api_status_t status = IB_SUCCESS;
uint16_t position_block_num;
- OSM_LOG_ENTER(sa->p_log, __osm_mftr_rcv_new_mftr);
+ OSM_LOG_ENTER(sa->p_log);
p_rec_item = malloc(sizeof(*p_rec_item));
if (p_rec_item == NULL) {
@@ -272,7 +272,7 @@ void osm_mftr_rcv_process(IN void *ctx, IN void *data)
CL_ASSERT(sa);
- OSM_LOG_ENTER(sa->p_log, osm_mftr_rcv_process);
+ OSM_LOG_ENTER(sa->p_log);
CL_ASSERT(p_madw);
diff --git a/opensm/opensm/osm_sa_multipath_record.c b/opensm/opensm/osm_sa_multipath_record.c
index 032c297..a92fdc1 100644
--- a/opensm/opensm/osm_sa_multipath_record.c
+++ b/opensm/opensm/osm_sa_multipath_record.c
@@ -192,7 +192,7 @@ __osm_mpr_rcv_get_path_parms(IN osm_sa_t * sa,
osm_qos_level_t *p_qos_level = NULL;
uint16_t valid_sl_mask = 0xffff;
- OSM_LOG_ENTER(sa->p_log, __osm_mpr_rcv_get_path_parms);
+ OSM_LOG_ENTER(sa->p_log);
dest_lid = cl_hton16(dest_lid_ho);
@@ -786,7 +786,7 @@ __osm_mpr_rcv_build_pr(IN osm_sa_t * sa,
const osm_physp_t *p_src_physp;
const osm_physp_t *p_dest_physp;
- OSM_LOG_ENTER(sa->p_log, __osm_mpr_rcv_build_pr);
+ OSM_LOG_ENTER(sa->p_log);
p_src_physp = p_src_port->p_physp;
p_dest_physp = p_dest_port->p_physp;
@@ -841,7 +841,7 @@ __osm_mpr_rcv_get_lid_pair_path(IN osm_sa_t * sa,
osm_mpr_item_t *p_pr_item;
ib_api_status_t status, rev_path_status;
- OSM_LOG_ENTER(sa->p_log, __osm_mpr_rcv_get_lid_pair_path);
+ OSM_LOG_ENTER(sa->p_log);
if (osm_log_is_active(sa->p_log, OSM_LOG_DEBUG))
osm_log(sa->p_log, OSM_LOG_DEBUG,
@@ -930,7 +930,7 @@ __osm_mpr_rcv_get_port_pair_paths(IN osm_sa_t * sa,
uintn_t src_offset;
uintn_t dest_offset;
- OSM_LOG_ENTER(sa->p_log, __osm_mpr_rcv_get_port_pair_paths);
+ OSM_LOG_ENTER(sa->p_log);
if (osm_log_is_active(sa->p_log, OSM_LOG_DEBUG))
osm_log(sa->p_log, OSM_LOG_DEBUG,
@@ -1128,7 +1128,7 @@ __osm_mpr_rcv_get_apm_port_pair_paths(IN osm_sa_t * sa,
uintn_t iterations;
int src_lids, dest_lids;
- OSM_LOG_ENTER(sa->p_log, __osm_mpr_rcv_get_apm_port_pair_paths);
+ OSM_LOG_ENTER(sa->p_log);
if (osm_log_is_active(sa->p_log, OSM_LOG_DEBUG))
osm_log(sa->p_log, OSM_LOG_DEBUG,
@@ -1201,7 +1201,7 @@ __osm_mpr_rcv_get_gids(IN osm_sa_t * sa,
ib_net16_t ib_status = IB_SUCCESS;
int i;
- OSM_LOG_ENTER(sa->p_log, __osm_mpr_rcv_get_gids);
+ OSM_LOG_ENTER(sa->p_log);
for (i = 0; i < ngids; i++, gids++) {
if (!ib_gid_is_link_local(gids)) {
@@ -1266,7 +1266,7 @@ __osm_mpr_rcv_get_end_points(IN osm_sa_t * sa,
ib_net16_t sa_status = IB_SA_MAD_STATUS_SUCCESS;
ib_gid_t *gids;
- OSM_LOG_ENTER(sa->p_log, __osm_mpr_rcv_get_end_points);
+ OSM_LOG_ENTER(sa->p_log);
/*
Determine what fields are valid and then get a pointer
@@ -1326,7 +1326,7 @@ __osm_mpr_rcv_get_apm_paths(IN osm_sa_t * sa,
int base_offs, src_lid_ho, dest_lid_ho;
int sumA, sumB, minA, minB;
- OSM_LOG_ENTER(sa->p_log, __osm_mpr_rcv_get_apm_paths);
+ OSM_LOG_ENTER(sa->p_log);
/*
* We want to:
@@ -1450,7 +1450,7 @@ __osm_mpr_rcv_process_pairs(IN osm_sa_t * sa,
osm_port_t **pp_dest_port, **pp_ed;
uint32_t max_paths, num_paths, total_paths = 0;
- OSM_LOG_ENTER(sa->p_log, __osm_mpr_rcv_process_pairs);
+ OSM_LOG_ENTER(sa->p_log);
if (comp_mask & IB_MPR_COMPMASK_NUMBPATH)
max_paths = p_mpr->num_path & 0x7F;
@@ -1503,7 +1503,7 @@ __osm_mpr_rcv_respond(IN osm_sa_t * sa,
osm_mpr_item_t *p_mpr_item;
uint32_t i;
- OSM_LOG_ENTER(sa->p_log, __osm_mpr_rcv_respond);
+ OSM_LOG_ENTER(sa->p_log);
p_sa_mad = osm_madw_get_sa_mad_ptr(p_madw);
p_mpr = (ib_multipath_rec_t *) ib_sa_mad_get_payload_ptr(p_sa_mad);
@@ -1601,7 +1601,7 @@ void osm_mpr_rcv_process(IN void *context, IN void *data)
ib_net16_t sa_status;
int nsrc, ndest;
- OSM_LOG_ENTER(sa->p_log, osm_mpr_rcv_process);
+ OSM_LOG_ENTER(sa->p_log);
CL_ASSERT(p_madw);
diff --git a/opensm/opensm/osm_sa_node_record.c b/opensm/opensm/osm_sa_node_record.c
index 4af8e58..07c85f3 100644
--- a/opensm/opensm/osm_sa_node_record.c
+++ b/opensm/opensm/osm_sa_node_record.c
@@ -83,7 +83,7 @@ __osm_nr_rcv_new_nr(IN osm_sa_t * sa,
osm_nr_item_t *p_rec_item;
ib_api_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(sa->p_log, __osm_nr_rcv_new_nr);
+ OSM_LOG_ENTER(sa->p_log);
p_rec_item = malloc(sizeof(*p_rec_item));
if (p_rec_item == NULL) {
@@ -138,7 +138,7 @@ __osm_nr_rcv_create_nr(IN osm_sa_t * sa,
uint8_t lmc;
ib_net64_t port_guid;
- OSM_LOG_ENTER(sa->p_log, __osm_nr_rcv_create_nr);
+ OSM_LOG_ENTER(sa->p_log);
if (osm_log_is_active(sa->p_log, OSM_LOG_DEBUG)) {
osm_log(sa->p_log, OSM_LOG_DEBUG,
@@ -217,7 +217,7 @@ __osm_nr_rcv_by_comp_mask(IN cl_map_item_t * const p_map_item, IN void *context)
ib_net64_t match_port_guid = 0;
ib_net16_t match_lid = 0;
- OSM_LOG_ENTER(p_ctxt->sa->p_log, __osm_nr_rcv_by_comp_mask);
+ OSM_LOG_ENTER(p_ctxt->sa->p_log);
osm_dump_node_info(p_ctxt->sa->p_log,
&p_node->node_info, OSM_LOG_VERBOSE);
@@ -336,7 +336,7 @@ void osm_nr_rcv_process(IN void *ctx, IN void *data)
CL_ASSERT(sa);
- OSM_LOG_ENTER(sa->p_log, osm_nr_rcv_process);
+ OSM_LOG_ENTER(sa->p_log);
CL_ASSERT(p_madw);
diff --git a/opensm/opensm/osm_sa_path_record.c b/opensm/opensm/osm_sa_path_record.c
index cc87bc7..fcbc5fd 100644
--- a/opensm/opensm/osm_sa_path_record.c
+++ b/opensm/opensm/osm_sa_path_record.c
@@ -199,7 +199,7 @@ __osm_pr_rcv_get_path_parms(IN osm_sa_t * sa,
uint16_t valid_sl_mask = 0xffff;
int is_lash;
- OSM_LOG_ENTER(sa->p_log, __osm_pr_rcv_get_path_parms);
+ OSM_LOG_ENTER(sa->p_log);
dest_lid = cl_hton16(dest_lid_ho);
@@ -795,7 +795,7 @@ __osm_pr_rcv_build_pr(IN osm_sa_t * sa,
const osm_physp_t *p_dest_physp;
boolean_t is_nonzero_gid = 0;
- OSM_LOG_ENTER(sa->p_log, __osm_pr_rcv_build_pr);
+ OSM_LOG_ENTER(sa->p_log);
p_src_physp = p_src_port->p_physp;
@@ -867,7 +867,7 @@ __osm_pr_rcv_get_lid_pair_path(IN osm_sa_t * sa,
osm_pr_item_t *p_pr_item;
ib_api_status_t status, rev_path_status;
- OSM_LOG_ENTER(sa->p_log, __osm_pr_rcv_get_lid_pair_path);
+ OSM_LOG_ENTER(sa->p_log);
if (osm_log_is_active(sa->p_log, OSM_LOG_DEBUG))
osm_log(sa->p_log, OSM_LOG_DEBUG,
@@ -955,7 +955,7 @@ __osm_pr_rcv_get_port_pair_paths(IN osm_sa_t * sa,
uintn_t src_offset;
uintn_t dest_offset;
- OSM_LOG_ENTER(sa->p_log, __osm_pr_rcv_get_port_pair_paths);
+ OSM_LOG_ENTER(sa->p_log);
if (osm_log_is_active(sa->p_log, OSM_LOG_DEBUG))
osm_log(sa->p_log, OSM_LOG_DEBUG,
@@ -1187,7 +1187,7 @@ __osm_pr_rcv_get_end_points(IN osm_sa_t * sa,
osm_router_t *p_rtr;
osm_port_t *p_rtr_port;
- OSM_LOG_ENTER(sa->p_log, __osm_pr_rcv_get_end_points);
+ OSM_LOG_ENTER(sa->p_log);
/*
Determine what fields are valid and then get a pointer
@@ -1398,7 +1398,7 @@ __osm_pr_rcv_process_world(IN osm_sa_t * sa,
const osm_port_t *p_dest_port;
const osm_port_t *p_src_port;
- OSM_LOG_ENTER(sa->p_log, __osm_pr_rcv_process_world);
+ OSM_LOG_ENTER(sa->p_log);
/*
Iterate the entire port space over itself.
@@ -1446,7 +1446,7 @@ __osm_pr_rcv_process_half(IN osm_sa_t * sa,
const cl_qmap_t *p_tbl;
const osm_port_t *p_port;
- OSM_LOG_ENTER(sa->p_log, __osm_pr_rcv_process_half);
+ OSM_LOG_ENTER(sa->p_log);
/*
Iterate over every port, looking for matches...
@@ -1497,7 +1497,7 @@ __osm_pr_rcv_process_pair(IN osm_sa_t * sa,
IN const ib_net64_t comp_mask,
IN cl_qlist_t * const p_list)
{
- OSM_LOG_ENTER(sa->p_log, __osm_pr_rcv_process_pair);
+ OSM_LOG_ENTER(sa->p_log);
__osm_pr_rcv_get_port_pair_paths(sa, p_madw, requester_port,
p_src_port, p_dest_port, p_dgid,
@@ -1532,7 +1532,7 @@ __osm_pr_get_mgrp(IN osm_sa_t * sa,
ib_net64_t comp_mask;
ib_api_status_t status;
- OSM_LOG_ENTER(sa->p_log, __osm_pr_get_mgrp);
+ OSM_LOG_ENTER(sa->p_log);
p_sa_mad = osm_madw_get_sa_mad_ptr(p_madw);
p_pr = (ib_path_rec_t *) ib_sa_mad_get_payload_ptr(p_sa_mad);
@@ -1589,7 +1589,7 @@ __osm_pr_match_mgrp_attributes(IN osm_sa_t * sa,
uint8_t sl;
uint8_t hop_limit;
- OSM_LOG_ENTER(sa->p_log, __osm_pr_match_mgrp_attributes);
+ OSM_LOG_ENTER(sa->p_log);
p_sa_mad = osm_madw_get_sa_mad_ptr(p_madw);
p_pr = (ib_path_rec_t *) ib_sa_mad_get_payload_ptr(p_sa_mad);
@@ -1651,7 +1651,7 @@ __osm_pr_rcv_check_mcast_dest(IN osm_sa_t * sa,
ib_net64_t comp_mask;
int is_multicast = 0;
- OSM_LOG_ENTER(sa->p_log, __osm_pr_rcv_check_mcast_dest);
+ OSM_LOG_ENTER(sa->p_log);
p_sa_mad = osm_madw_get_sa_mad_ptr(p_madw);
p_pr = (ib_path_rec_t *) ib_sa_mad_get_payload_ptr(p_sa_mad);
@@ -1701,7 +1701,7 @@ __osm_pr_rcv_respond(IN osm_sa_t * sa,
osm_pr_item_t *p_pr_item;
uint32_t i;
- OSM_LOG_ENTER(sa->p_log, __osm_pr_rcv_respond);
+ OSM_LOG_ENTER(sa->p_log);
num_rec = cl_qlist_count(p_list);
@@ -1849,7 +1849,7 @@ void osm_pr_rcv_process(IN void *context, IN void *data)
osm_port_t *requester_port;
int ret;
- OSM_LOG_ENTER(sa->p_log, osm_pr_rcv_process);
+ OSM_LOG_ENTER(sa->p_log);
CL_ASSERT(p_madw);
diff --git a/opensm/opensm/osm_sa_pkey_record.c b/opensm/opensm/osm_sa_pkey_record.c
index e21c8a8..d8c8e62 100644
--- a/opensm/opensm/osm_sa_pkey_record.c
+++ b/opensm/opensm/osm_sa_pkey_record.c
@@ -76,7 +76,7 @@ __osm_sa_pkey_create(IN osm_sa_t * sa,
uint16_t lid;
ib_api_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(sa->p_log, __osm_sa_pkey_create);
+ OSM_LOG_ENTER(sa->p_log);
p_rec_item = malloc(sizeof(*p_rec_item));
if (p_rec_item == NULL) {
@@ -125,7 +125,7 @@ __osm_sa_pkey_check_physp(IN osm_sa_t * sa,
ib_net64_t comp_mask = p_ctxt->comp_mask;
uint16_t block, num_blocks;
- OSM_LOG_ENTER(sa->p_log, __osm_sa_pkey_check_physp);
+ OSM_LOG_ENTER(sa->p_log);
/* we got here with the phys port - all is left is to get the right block */
if (comp_mask & IB_PKEY_COMPMASK_BLOCK) {
@@ -156,7 +156,7 @@ __osm_sa_pkey_by_comp_mask(IN osm_sa_t * sa,
uint8_t num_ports;
const osm_physp_t *p_req_physp;
- OSM_LOG_ENTER(sa->p_log, __osm_sa_pkey_by_comp_mask);
+ OSM_LOG_ENTER(sa->p_log);
p_rcvd_rec = p_ctxt->p_rcvd_rec;
comp_mask = p_ctxt->comp_mask;
@@ -256,7 +256,7 @@ void osm_pkey_rec_rcv_process(IN void *ctx, IN void *data)
CL_ASSERT(sa);
- OSM_LOG_ENTER(sa->p_log, osm_pkey_rec_rcv_process);
+ OSM_LOG_ENTER(sa->p_log);
CL_ASSERT(p_madw);
diff --git a/opensm/opensm/osm_sa_portinfo_record.c b/opensm/opensm/osm_sa_portinfo_record.c
index 0cac69c..3e830bd 100644
--- a/opensm/opensm/osm_sa_portinfo_record.c
+++ b/opensm/opensm/osm_sa_portinfo_record.c
@@ -87,7 +87,7 @@ __osm_pir_rcv_new_pir(IN osm_sa_t * sa,
osm_pir_item_t *p_rec_item;
ib_api_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(sa->p_log, __osm_pir_rcv_new_pir);
+ OSM_LOG_ENTER(sa->p_log);
p_rec_item = malloc(sizeof(*p_rec_item));
if (p_rec_item == NULL) {
@@ -132,7 +132,7 @@ __osm_sa_pir_create(IN osm_sa_t * sa,
uint16_t match_lid_ho;
osm_physp_t *p_node_physp;
- OSM_LOG_ENTER(sa->p_log, __osm_sa_pir_create);
+ OSM_LOG_ENTER(sa->p_log);
if (p_physp->p_node->sw) {
p_node_physp = osm_node_get_physp_ptr(p_physp->p_node, 0);
@@ -183,7 +183,7 @@ __osm_sa_pir_check_physp(IN osm_sa_t * sa,
const ib_port_info_t *p_comp_pi;
const ib_port_info_t *p_pi;
- OSM_LOG_ENTER(sa->p_log, __osm_sa_pir_check_physp);
+ OSM_LOG_ENTER(sa->p_log);
p_rcvd_rec = p_ctxt->p_rcvd_rec;
comp_mask = p_ctxt->comp_mask;
@@ -417,7 +417,7 @@ __osm_sa_pir_by_comp_mask(IN osm_sa_t * sa,
uint8_t num_ports;
const osm_physp_t *p_req_physp;
- OSM_LOG_ENTER(sa->p_log, __osm_sa_pir_by_comp_mask);
+ OSM_LOG_ENTER(sa->p_log);
p_rcvd_rec = p_ctxt->p_rcvd_rec;
comp_mask = p_ctxt->comp_mask;
@@ -499,7 +499,7 @@ void osm_pir_rcv_process(IN void *ctx, IN void *data)
CL_ASSERT(sa);
- OSM_LOG_ENTER(sa->p_log, osm_pir_rcv_process);
+ OSM_LOG_ENTER(sa->p_log);
CL_ASSERT(p_madw);
diff --git a/opensm/opensm/osm_sa_response.c b/opensm/opensm/osm_sa_response.c
index d63fa70..554eff3 100644
--- a/opensm/opensm/osm_sa_response.c
+++ b/opensm/opensm/osm_sa_response.c
@@ -69,7 +69,7 @@ osm_sa_send_error(IN osm_sa_t * sa,
ib_sa_mad_t *p_sa_mad;
ib_api_status_t status;
- OSM_LOG_ENTER(sa->p_log, osm_sa_send_error);
+ OSM_LOG_ENTER(sa->p_log);
/* avoid races - if we are exiting - exit */
if (osm_exit_flag) {
diff --git a/opensm/opensm/osm_sa_service_record.c b/opensm/opensm/osm_sa_service_record.c
index 19de389..ce6a11a 100644
--- a/opensm/opensm/osm_sa_service_record.c
+++ b/opensm/opensm/osm_sa_service_record.c
@@ -175,7 +175,7 @@ __validate_sr(IN osm_sa_t * sa, IN const osm_madw_t * const p_madw)
ib_sa_mad_t *p_sa_mad;
ib_service_record_t *p_recvd_service_rec;
- OSM_LOG_ENTER(sa->p_log, __validate_sr);
+ OSM_LOG_ENTER(sa->p_log);
p_sa_mad = osm_madw_get_sa_mad_ptr(p_madw);
p_recvd_service_rec =
@@ -230,7 +230,7 @@ __osm_sr_rcv_respond(IN osm_sa_t * sa,
const ib_sa_mad_t *p_rcvd_mad = osm_madw_get_sa_mad_ptr(p_madw);
boolean_t trusted_req = TRUE;
- OSM_LOG_ENTER(sa->p_log, __osm_sr_rcv_respond);
+ OSM_LOG_ENTER(sa->p_log);
num_rec = cl_qlist_count(p_list);
@@ -627,7 +627,7 @@ osm_sr_rcv_process_get_method(IN osm_sa_t * sa,
osm_sr_search_ctxt_t context;
osm_physp_t *p_req_physp;
- OSM_LOG_ENTER(sa->p_log, osm_sr_rcv_process_get_method);
+ OSM_LOG_ENTER(sa->p_log);
CL_ASSERT(p_madw);
@@ -700,7 +700,7 @@ osm_sr_rcv_process_set_method(IN osm_sa_t * sa,
osm_sr_item_t *p_sr_item;
cl_qlist_t sr_list;
- OSM_LOG_ENTER(sa->p_log, osm_sr_rcv_process_set_method);
+ OSM_LOG_ENTER(sa->p_log);
CL_ASSERT(p_madw);
@@ -816,7 +816,7 @@ osm_sr_rcv_process_delete_method(IN osm_sa_t * sa,
osm_sr_item_t *p_sr_item;
cl_qlist_t sr_list;
- OSM_LOG_ENTER(sa->p_log, osm_sr_rcv_process_delete_method);
+ OSM_LOG_ENTER(sa->p_log);
CL_ASSERT(p_madw);
@@ -888,7 +888,7 @@ void osm_sr_rcv_process(IN void *context, IN void *data)
ib_net16_t sa_status = IB_SA_MAD_STATUS_REQ_INVALID;
boolean_t valid;
- OSM_LOG_ENTER(sa->p_log, osm_sr_rcv_process);
+ OSM_LOG_ENTER(sa->p_log);
CL_ASSERT(p_madw);
@@ -950,7 +950,7 @@ void osm_sr_rcv_lease_cb(IN void *context)
uint32_t elapsed_time;
uint32_t trim_time = 20; /* maxiaml timer refresh is 20 seconds */
- OSM_LOG_ENTER(sa->p_log, osm_sr_rcv_lease_cb);
+ OSM_LOG_ENTER(sa->p_log);
cl_plock_excl_acquire(sa->p_lock);
diff --git a/opensm/opensm/osm_sa_slvl_record.c b/opensm/opensm/osm_sa_slvl_record.c
index ba13010..4f4cc03 100644
--- a/opensm/opensm/osm_sa_slvl_record.c
+++ b/opensm/opensm/osm_sa_slvl_record.c
@@ -88,7 +88,7 @@ __osm_sa_slvl_create(IN osm_sa_t * sa,
uint16_t lid;
ib_api_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(sa->p_log, __osm_sa_slvl_create);
+ OSM_LOG_ENTER(sa->p_log);
p_rec_item = malloc(sizeof(*p_rec_item));
if (p_rec_item == NULL) {
@@ -143,7 +143,7 @@ __osm_sa_slvl_by_comp_mask(IN osm_sa_t * sa,
uint8_t out_port_start, out_port_end;
const osm_physp_t *p_req_physp;
- OSM_LOG_ENTER(sa->p_log, __osm_sa_slvl_by_comp_mask);
+ OSM_LOG_ENTER(sa->p_log);
p_rcvd_rec = p_ctxt->p_rcvd_rec;
comp_mask = p_ctxt->comp_mask;
@@ -246,7 +246,7 @@ void osm_slvl_rec_rcv_process(IN void *ctx, IN void *data)
CL_ASSERT(sa);
- OSM_LOG_ENTER(sa->p_log, osm_slvl_rec_rcv_process);
+ OSM_LOG_ENTER(sa->p_log);
CL_ASSERT(p_madw);
diff --git a/opensm/opensm/osm_sa_sminfo_record.c b/opensm/opensm/osm_sa_sminfo_record.c
index b89173c..dddf8ca 100644
--- a/opensm/opensm/osm_sa_sminfo_record.c
+++ b/opensm/opensm/osm_sa_sminfo_record.c
@@ -93,7 +93,7 @@ __osm_smir_rcv_new_smir(IN osm_sa_t * sa,
osm_smir_item_t *p_rec_item;
ib_api_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(sa->p_log, __osm_smir_rcv_new_smir);
+ OSM_LOG_ENTER(sa->p_log);
p_rec_item = malloc(sizeof(*p_rec_item));
if (p_rec_item == NULL) {
@@ -135,7 +135,7 @@ __osm_sa_smir_by_comp_mask(IN osm_sa_t * sa,
const osm_physp_t *const p_req_physp = p_ctxt->p_req_physp;
ib_net64_t const comp_mask = p_ctxt->comp_mask;
- OSM_LOG_ENTER(sa->p_log, __osm_sa_smir_by_comp_mask);
+ OSM_LOG_ENTER(sa->p_log);
if (comp_mask & IB_SMIR_COMPMASK_GUID) {
if (p_rem_sm->smi.guid != p_rcvd_rec->sm_info.guid)
@@ -211,7 +211,7 @@ void osm_smir_rcv_process(IN void *ctx, IN void *data)
CL_ASSERT(sa);
- OSM_LOG_ENTER(sa->p_log, osm_smir_rcv_process);
+ OSM_LOG_ENTER(sa->p_log);
CL_ASSERT(p_madw);
diff --git a/opensm/opensm/osm_sa_sw_info_record.c b/opensm/opensm/osm_sa_sw_info_record.c
index f1eddda..01dae81 100644
--- a/opensm/opensm/osm_sa_sw_info_record.c
+++ b/opensm/opensm/osm_sa_sw_info_record.c
@@ -81,7 +81,7 @@ __osm_sir_rcv_new_sir(IN osm_sa_t * sa,
osm_sir_item_t *p_rec_item;
ib_api_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(sa->p_log, __osm_sir_rcv_new_sir);
+ OSM_LOG_ENTER(sa->p_log);
p_rec_item = malloc(sizeof(*p_rec_item));
if (p_rec_item == NULL) {
@@ -146,7 +146,7 @@ __osm_sir_rcv_create_sir(IN osm_sa_t * sa,
ib_net16_t min_lid_ho;
ib_net16_t max_lid_ho;
- OSM_LOG_ENTER(sa->p_log, __osm_sir_rcv_create_sir);
+ OSM_LOG_ENTER(sa->p_log);
if (osm_log_is_active(sa->p_log, OSM_LOG_DEBUG)) {
osm_log(sa->p_log, OSM_LOG_DEBUG,
@@ -226,7 +226,7 @@ __osm_sir_rcv_by_comp_mask(IN cl_map_item_t * const p_map_item,
ib_net64_t const comp_mask = p_ctxt->comp_mask;
ib_net16_t match_lid = 0;
- OSM_LOG_ENTER(p_ctxt->sa->p_log, __osm_sir_rcv_by_comp_mask);
+ OSM_LOG_ENTER(p_ctxt->sa->p_log);
osm_dump_switch_info(p_ctxt->sa->p_log,
&p_sw->switch_info, OSM_LOG_VERBOSE);
@@ -268,7 +268,7 @@ void osm_sir_rcv_process(IN void *ctx, IN void *data)
CL_ASSERT(sa);
- OSM_LOG_ENTER(sa->p_log, osm_sir_rcv_process);
+ OSM_LOG_ENTER(sa->p_log);
CL_ASSERT(p_madw);
diff --git a/opensm/opensm/osm_sa_vlarb_record.c b/opensm/opensm/osm_sa_vlarb_record.c
index 3ada071..34b017e 100644
--- a/opensm/opensm/osm_sa_vlarb_record.c
+++ b/opensm/opensm/osm_sa_vlarb_record.c
@@ -88,7 +88,7 @@ __osm_sa_vl_arb_create(IN osm_sa_t * sa,
uint16_t lid;
ib_api_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(sa->p_log, __osm_sa_vl_arb_create);
+ OSM_LOG_ENTER(sa->p_log);
p_rec_item = malloc(sizeof(*p_rec_item));
if (p_rec_item == NULL) {
@@ -135,7 +135,7 @@ __osm_sa_vl_arb_check_physp(IN osm_sa_t * sa,
ib_net64_t comp_mask = p_ctxt->comp_mask;
uint8_t block;
- OSM_LOG_ENTER(sa->p_log, __osm_sa_vl_arb_check_physp);
+ OSM_LOG_ENTER(sa->p_log);
/* we got here with the phys port - all that's left is to get the right block */
for (block = 1; block <= 4; block++) {
@@ -162,7 +162,7 @@ __osm_sa_vl_arb_by_comp_mask(IN osm_sa_t * sa,
uint8_t num_ports;
const osm_physp_t *p_req_physp;
- OSM_LOG_ENTER(sa->p_log, __osm_sa_vl_arb_by_comp_mask);
+ OSM_LOG_ENTER(sa->p_log);
p_rcvd_rec = p_ctxt->p_rcvd_rec;
comp_mask = p_ctxt->comp_mask;
@@ -262,7 +262,7 @@ void osm_vlarb_rec_rcv_process(IN void *ctx, IN void *data)
CL_ASSERT(sa);
- OSM_LOG_ENTER(sa->p_log, osm_vlarb_rec_rcv_process);
+ OSM_LOG_ENTER(sa->p_log);
CL_ASSERT(p_madw);
diff --git a/opensm/opensm/osm_service.c b/opensm/opensm/osm_service.c
index fcbdee3..1c5c127 100644
--- a/opensm/opensm/osm_service.c
+++ b/opensm/opensm/osm_service.c
@@ -125,7 +125,7 @@ osm_svcr_t *osm_svcr_get_by_rid(IN osm_subn_t const *p_subn,
{
cl_list_item_t *p_list_item;
- OSM_LOG_ENTER(p_log, osm_svcr_get_by_rid);
+ OSM_LOG_ENTER(p_log);
p_list_item = cl_qlist_find_from_head(&p_subn->sa_sr_list,
__match_rid_of_svc_rec,
@@ -144,7 +144,7 @@ void
osm_svcr_insert_to_db(IN osm_subn_t * p_subn,
IN osm_log_t * p_log, IN osm_svcr_t * p_svcr)
{
- OSM_LOG_ENTER(p_log, osm_svcr_insert_to_db);
+ OSM_LOG_ENTER(p_log);
osm_log(p_log, OSM_LOG_DEBUG,
"osm_svcr_insert_to_db: "
@@ -159,7 +159,7 @@ void
osm_svcr_remove_from_db(IN osm_subn_t * p_subn,
IN osm_log_t * p_log, IN osm_svcr_t * p_svcr)
{
- OSM_LOG_ENTER(p_log, osm_svcr_remove_from_db);
+ OSM_LOG_ENTER(p_log);
osm_log(p_log, OSM_LOG_DEBUG,
"osm_svcr_remove_from_db: "
diff --git a/opensm/opensm/osm_slvl_map_rcv.c b/opensm/opensm/osm_slvl_map_rcv.c
index 2af9be2..dcbd7e8 100644
--- a/opensm/opensm/osm_slvl_map_rcv.c
+++ b/opensm/opensm/osm_slvl_map_rcv.c
@@ -81,7 +81,7 @@ void osm_slvl_rcv_process(IN void *context, IN void *p_data)
CL_ASSERT(sm);
- OSM_LOG_ENTER(sm->p_log, osm_slvl_rcv_process);
+ OSM_LOG_ENTER(sm->p_log);
CL_ASSERT(p_madw);
diff --git a/opensm/opensm/osm_sm.c b/opensm/opensm/osm_sm.c
index b576c26..b991f38 100644
--- a/opensm/opensm/osm_sm.c
+++ b/opensm/opensm/osm_sm.c
@@ -100,7 +100,7 @@ static void __osm_sm_sweeper(IN void *p_ptr)
osm_sm_t *const p_sm = (osm_sm_t *) p_ptr;
unsigned signals, i;
- OSM_LOG_ENTER(p_sm->p_log, __osm_sm_sweeper);
+ OSM_LOG_ENTER(p_sm->p_log);
while (p_sm->thread_state == OSM_THREAD_STATE_RUN) {
/*
@@ -177,7 +177,7 @@ void osm_sm_shutdown(IN osm_sm_t * const p_sm)
{
boolean_t signal_event = FALSE;
- OSM_LOG_ENTER(p_sm->p_log, osm_sm_shutdown);
+ OSM_LOG_ENTER(p_sm->p_log);
/*
* Signal our threads that we're leaving.
@@ -224,7 +224,7 @@ void osm_sm_shutdown(IN osm_sm_t * const p_sm)
**********************************************************************/
void osm_sm_destroy(IN osm_sm_t * const p_sm)
{
- OSM_LOG_ENTER(p_sm->p_log, osm_sm_destroy);
+ OSM_LOG_ENTER(p_sm->p_log);
osm_lid_mgr_destroy(&p_sm->lid_mgr);
osm_ucast_mgr_destroy(&p_sm->ucast_mgr);
cl_event_wheel_destroy(&p_sm->trap_aging_tracker);
@@ -255,7 +255,7 @@ osm_sm_init(IN osm_sm_t * const p_sm,
{
ib_api_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(p_log, osm_sm_init);
+ OSM_LOG_ENTER(p_log);
p_sm->p_subn = p_subn;
p_sm->p_db = p_db;
@@ -414,7 +414,7 @@ void osm_sm_signal(osm_sm_t * p_sm, osm_signal_t signal)
**********************************************************************/
void osm_sm_sweep(IN osm_sm_t * const p_sm)
{
- OSM_LOG_ENTER(p_sm->p_log, osm_sm_sweep);
+ OSM_LOG_ENTER(p_sm->p_log);
osm_sm_signal(p_sm, OSM_SIGNAL_SWEEP);
OSM_LOG_EXIT(p_sm->p_log);
}
@@ -426,7 +426,7 @@ osm_sm_bind(IN osm_sm_t * const p_sm, IN const ib_net64_t port_guid)
{
ib_api_status_t status;
- OSM_LOG_ENTER(p_sm->p_log, osm_sm_bind);
+ OSM_LOG_ENTER(p_sm->p_log);
status = osm_sm_mad_ctrl_bind(&p_sm->mad_ctrl, port_guid);
@@ -509,7 +509,7 @@ osm_sm_mcgrp_join(IN osm_sm_t * const p_sm,
ib_api_status_t status = IB_SUCCESS;
osm_mcm_info_t *p_mcm;
- OSM_LOG_ENTER(p_sm->p_log, osm_sm_mcgrp_join);
+ OSM_LOG_ENTER(p_sm->p_log);
osm_log(p_sm->p_log, OSM_LOG_VERBOSE,
"osm_sm_mcgrp_join: "
@@ -620,7 +620,7 @@ osm_sm_mcgrp_leave(IN osm_sm_t * const p_sm,
cl_qmap_t *p_tbl;
ib_api_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(p_sm->p_log, osm_sm_mcgrp_leave);
+ OSM_LOG_ENTER(p_sm->p_log);
osm_log(p_sm->p_log, OSM_LOG_VERBOSE,
"osm_sm_mcgrp_leave: "
diff --git a/opensm/opensm/osm_sm_mad_ctrl.c b/opensm/opensm/osm_sm_mad_ctrl.c
index efbe97a..6806ab1 100644
--- a/opensm/opensm/osm_sm_mad_ctrl.c
+++ b/opensm/opensm/osm_sm_mad_ctrl.c
@@ -75,7 +75,7 @@ __osm_sm_mad_ctrl_retire_trans_mad(IN osm_sm_mad_ctrl_t * const p_ctrl,
{
uint32_t outstanding;
- OSM_LOG_ENTER(p_ctrl->p_log, __osm_sm_mad_ctrl_retire_trans_mad);
+ OSM_LOG_ENTER(p_ctrl->p_log);
CL_ASSERT(p_madw);
/*
@@ -133,7 +133,7 @@ __osm_sm_mad_ctrl_disp_done_callback(IN void *context, IN void *p_data)
osm_madw_t *const p_madw = (osm_madw_t *) p_data;
ib_smp_t *p_smp;
- OSM_LOG_ENTER(p_ctrl->p_log, __osm_sm_mad_ctrl_disp_done_callback);
+ OSM_LOG_ENTER(p_ctrl->p_log);
/*
If the MAD that just finished processing was a response,
@@ -173,7 +173,7 @@ __osm_sm_mad_ctrl_update_wire_stats(IN osm_sm_mad_ctrl_t * const p_ctrl)
{
uint32_t mads_on_wire;
- OSM_LOG_ENTER(p_ctrl->p_log, __osm_sm_mad_ctrl_update_wire_stats);
+ OSM_LOG_ENTER(p_ctrl->p_log);
mads_on_wire =
cl_atomic_dec(&p_ctrl->p_stats->qp0_mads_outstanding_on_wire);
@@ -212,7 +212,7 @@ __osm_sm_mad_ctrl_process_get_resp(IN osm_sm_mad_ctrl_t * const p_ctrl,
osm_madw_t *p_old_madw;
cl_disp_msgid_t msg_id = CL_DISP_MSGID_NONE;
- OSM_LOG_ENTER(p_ctrl->p_log, __osm_sm_mad_ctrl_process_get_resp);
+ OSM_LOG_ENTER(p_ctrl->p_log);
CL_ASSERT(p_madw);
CL_ASSERT(transaction_context);
@@ -336,7 +336,7 @@ __osm_sm_mad_ctrl_process_get(IN osm_sm_mad_ctrl_t * const p_ctrl,
cl_status_t status;
cl_disp_msgid_t msg_id = CL_DISP_MSGID_NONE;
- OSM_LOG_ENTER(p_ctrl->p_log, __osm_sm_mad_ctrl_process_get);
+ OSM_LOG_ENTER(p_ctrl->p_log);
p_smp = osm_madw_get_smp_ptr(p_madw);
@@ -420,7 +420,7 @@ __osm_sm_mad_ctrl_process_set(IN osm_sm_mad_ctrl_t * const p_ctrl,
cl_status_t status;
cl_disp_msgid_t msg_id = CL_DISP_MSGID_NONE;
- OSM_LOG_ENTER(p_ctrl->p_log, __osm_sm_mad_ctrl_process_set);
+ OSM_LOG_ENTER(p_ctrl->p_log);
p_smp = osm_madw_get_smp_ptr(p_madw);
@@ -505,7 +505,7 @@ __osm_sm_mad_ctrl_process_trap(IN osm_sm_mad_ctrl_t * const p_ctrl,
cl_status_t status;
cl_disp_msgid_t msg_id = CL_DISP_MSGID_NONE;
- OSM_LOG_ENTER(p_ctrl->p_log, __osm_sm_mad_ctrl_process_trap);
+ OSM_LOG_ENTER(p_ctrl->p_log);
p_smp = osm_madw_get_smp_ptr(p_madw);
@@ -601,7 +601,7 @@ __osm_sm_mad_ctrl_rcv_callback(IN osm_madw_t * p_madw,
ib_smp_t *p_smp;
ib_net16_t status;
- OSM_LOG_ENTER(p_ctrl->p_log, __osm_sm_mad_ctrl_rcv_callback);
+ OSM_LOG_ENTER(p_ctrl->p_log);
CL_ASSERT(p_madw);
@@ -720,7 +720,7 @@ __osm_sm_mad_ctrl_send_err_cb(IN void *bind_context, IN osm_madw_t * p_madw)
ib_api_status_t status;
ib_smp_t *p_smp;
- OSM_LOG_ENTER(p_ctrl->p_log, __osm_sm_mad_ctrl_send_err_cb);
+ OSM_LOG_ENTER(p_ctrl->p_log);
CL_ASSERT(p_madw);
@@ -856,7 +856,7 @@ osm_sm_mad_ctrl_init(IN osm_sm_mad_ctrl_t * const p_ctrl,
{
ib_api_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(p_log, osm_sm_mad_ctrl_init);
+ OSM_LOG_ENTER(p_log);
osm_sm_mad_ctrl_construct(p_ctrl);
@@ -894,7 +894,7 @@ osm_sm_mad_ctrl_bind(IN osm_sm_mad_ctrl_t * const p_ctrl,
osm_bind_info_t bind_info;
ib_api_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(p_ctrl->p_log, osm_sm_mad_ctrl_bind);
+ OSM_LOG_ENTER(p_ctrl->p_log);
if (p_ctrl->h_bind != OSM_BIND_INVALID_HANDLE) {
osm_log(p_ctrl->p_log, OSM_LOG_ERROR,
diff --git a/opensm/opensm/osm_sm_state_mgr.c b/opensm/opensm/osm_sm_state_mgr.c
index eff9f19..a318323 100644
--- a/opensm/opensm/osm_sm_state_mgr.c
+++ b/opensm/opensm/osm_sm_state_mgr.c
@@ -88,7 +88,7 @@ static void __osm_sm_state_mgr_send_local_port_info_req(osm_sm_t *sm)
ib_net64_t port_guid = sm->p_subn->sm_port_guid;
ib_api_status_t status;
- OSM_LOG_ENTER(sm->p_log, __osm_sm_state_mgr_send_local_port_info_req);
+ OSM_LOG_ENTER(sm->p_log);
/*
* Send a query of SubnGet(PortInfo) to our own port, in order to
* update the master_sm_base_lid of the subnet.
@@ -136,7 +136,7 @@ static void __osm_sm_state_mgr_send_master_sm_info_req(osm_sm_t *sm)
const osm_port_t *p_port;
ib_api_status_t status;
- OSM_LOG_ENTER(sm->p_log, __osm_sm_state_mgr_send_master_sm_info_req);
+ OSM_LOG_ENTER(sm->p_log);
memset(&context, 0, sizeof(context));
if (sm->p_subn->sm_state == IB_SMINFO_STATE_STANDBY) {
@@ -186,7 +186,7 @@ static void __osm_sm_state_mgr_start_polling(osm_sm_t *sm)
uint32_t timeout = sm->p_subn->opt.sminfo_polling_timeout;
cl_status_t cl_status;
- OSM_LOG_ENTER(sm->p_log, __osm_sm_state_mgr_start_polling);
+ OSM_LOG_ENTER(sm->p_log);
/*
* Init the retry_number back to zero - need to restart counting
@@ -220,7 +220,7 @@ void osm_sm_state_mgr_polling_callback(IN void *context)
uint32_t timeout = sm->p_subn->opt.sminfo_polling_timeout;
cl_status_t cl_status;
- OSM_LOG_ENTER(sm->p_log, osm_sm_state_mgr_polling_callback);
+ OSM_LOG_ENTER(sm->p_log);
/*
* We can be here in one of two cases:
@@ -298,7 +298,7 @@ static void __osm_sm_state_mgr_signal_error(osm_sm_t *sm,
**********************************************************************/
void osm_sm_state_mgr_signal_master_is_alive(osm_sm_t *sm)
{
- OSM_LOG_ENTER(sm->p_log, osm_sm_state_mgr_signal_master_is_alive);
+ OSM_LOG_ENTER(sm->p_log);
sm->retry_number = 0;
OSM_LOG_EXIT(sm->p_log);
}
@@ -312,7 +312,7 @@ ib_api_status_t osm_sm_state_mgr_process(osm_sm_t *sm,
CL_ASSERT(sm);
- OSM_LOG_ENTER(sm->p_log, osm_sm_state_mgr_process);
+ OSM_LOG_ENTER(sm->p_log);
/*
* The state lock prevents many race conditions from screwing
@@ -534,7 +534,7 @@ ib_api_status_t osm_sm_state_mgr_check_legality(osm_sm_t *sm,
CL_ASSERT(sm);
- OSM_LOG_ENTER(sm->p_log, osm_sm_state_mgr_check_legality);
+ OSM_LOG_ENTER(sm->p_log);
/*
* The state lock prevents many race conditions from screwing
diff --git a/opensm/opensm/osm_sminfo_rcv.c b/opensm/opensm/osm_sminfo_rcv.c
index e179385..7606b5b 100644
--- a/opensm/opensm/osm_sminfo_rcv.c
+++ b/opensm/opensm/osm_sminfo_rcv.c
@@ -93,7 +93,7 @@ __osm_sminfo_rcv_process_get_request(IN osm_sm_t * sm,
ib_api_status_t status;
ib_sm_info_t *p_remote_smi;
- OSM_LOG_ENTER(sm->p_log, __osm_sminfo_rcv_process_get_request);
+ OSM_LOG_ENTER(sm->p_log);
CL_ASSERT(p_madw);
@@ -186,7 +186,7 @@ __osm_sminfo_rcv_process_set_request(IN osm_sm_t * sm,
osm_sm_signal_t sm_signal;
ib_sm_info_t *p_remote_smi;
- OSM_LOG_ENTER(sm->p_log, __osm_sminfo_rcv_process_set_request);
+ OSM_LOG_ENTER(sm->p_log);
CL_ASSERT(p_madw);
@@ -342,7 +342,7 @@ __osm_sminfo_rcv_process_get_sm(IN osm_sm_t * sm,
{
const ib_sm_info_t *p_smi;
- OSM_LOG_ENTER(sm->p_log, __osm_sminfo_rcv_process_get_sm);
+ OSM_LOG_ENTER(sm->p_log);
p_smi = &p_sm->smi;
@@ -462,7 +462,7 @@ __osm_sminfo_rcv_process_get_response(IN osm_sm_t * sm,
ib_net64_t port_guid;
osm_remote_sm_t *p_sm;
- OSM_LOG_ENTER(sm->p_log, __osm_sminfo_rcv_process_get_response);
+ OSM_LOG_ENTER(sm->p_log);
CL_ASSERT(p_madw);
@@ -565,7 +565,7 @@ __osm_sminfo_rcv_process_set_response(IN osm_sm_t * sm,
const ib_smp_t *p_smp;
const ib_sm_info_t *p_smi;
- OSM_LOG_ENTER(sm->p_log, __osm_sminfo_rcv_process_set_response);
+ OSM_LOG_ENTER(sm->p_log);
CL_ASSERT(p_madw);
@@ -608,7 +608,7 @@ void osm_sminfo_rcv_process(IN void *context, IN void *data)
ib_smp_t *p_smp;
osm_smi_context_t *p_smi_context;
- OSM_LOG_ENTER(sm->p_log, osm_sminfo_rcv_process);
+ OSM_LOG_ENTER(sm->p_log);
CL_ASSERT(p_madw);
diff --git a/opensm/opensm/osm_state_mgr.c b/opensm/opensm/osm_state_mgr.c
index fb60f4d..fa9a273 100644
--- a/opensm/opensm/osm_state_mgr.c
+++ b/opensm/opensm/osm_state_mgr.c
@@ -165,7 +165,7 @@ static void __osm_state_mgr_get_sw_info(IN cl_map_item_t * const p_object,
osm_sm_t *sm = context;
ib_api_status_t status;
- OSM_LOG_ENTER(sm->p_log, __osm_state_mgr_get_sw_info);
+ OSM_LOG_ENTER(sm->p_log);
p_node = p_sw->p_node;
p_dr_path = osm_node_get_any_dr_path_ptr(p_node);
@@ -200,7 +200,7 @@ __osm_state_mgr_get_remote_port_info(IN osm_sm_t * sm,
osm_madw_context_t mad_context;
ib_api_status_t status;
- OSM_LOG_ENTER(sm->p_log, __osm_state_mgr_get_remote_port_info);
+ OSM_LOG_ENTER(sm->p_log);
/* generate a dr path leaving on the physp to the remote node */
p_dr_path = osm_physp_get_dr_path_ptr(p_physp);
@@ -244,7 +244,7 @@ static ib_api_status_t __osm_state_mgr_sweep_hop_0(IN osm_sm_t * sm)
osm_bind_handle_t h_bind;
uint8_t path_array[IB_SUBNET_PATH_HOPS_MAX];
- OSM_LOG_ENTER(sm->p_log, __osm_state_mgr_sweep_hop_0);
+ OSM_LOG_ENTER(sm->p_log);
memset(path_array, 0, sizeof(path_array));
@@ -310,7 +310,7 @@ static ib_api_status_t __osm_state_mgr_clean_known_lids(IN osm_sm_t * sm)
cl_ptr_vector_t *p_vec = &(sm->p_subn->port_lid_tbl);
uint32_t i;
- OSM_LOG_ENTER(sm->p_log, __osm_state_mgr_clean_known_lids);
+ OSM_LOG_ENTER(sm->p_log);
/* we need a lock here! */
CL_PLOCK_ACQUIRE(sm->p_lock);
@@ -333,7 +333,7 @@ static ib_api_status_t __osm_state_mgr_notify_lid_change(IN osm_sm_t * sm)
ib_api_status_t status;
osm_bind_handle_t h_bind;
- OSM_LOG_ENTER(sm->p_log, __osm_state_mgr_notify_lid_change);
+ OSM_LOG_ENTER(sm->p_log);
/*
* First, get the bind handle.
@@ -374,7 +374,7 @@ static boolean_t __osm_state_mgr_is_sm_port_down(IN osm_sm_t * sm)
osm_physp_t *p_physp;
uint8_t state;
- OSM_LOG_ENTER(sm->p_log, __osm_state_mgr_is_sm_port_down);
+ OSM_LOG_ENTER(sm->p_log);
port_guid = sm->p_subn->sm_port_guid;
@@ -438,7 +438,7 @@ static ib_api_status_t __osm_state_mgr_sweep_hop_1(IN osm_sm_t * sm)
uint8_t num_ports;
osm_physp_t *p_ext_physp;
- OSM_LOG_ENTER(sm->p_log, __osm_state_mgr_sweep_hop_1);
+ OSM_LOG_ENTER(sm->p_log);
/*
* First, get our own port and node objects.
@@ -568,7 +568,7 @@ static ib_api_status_t __osm_state_mgr_light_sweep_start(IN osm_sm_t * sm)
osm_physp_t *p_physp;
uint8_t port_num;
- OSM_LOG_ENTER(sm->p_log, __osm_state_mgr_light_sweep_start);
+ OSM_LOG_ENTER(sm->p_log);
p_sw_tbl = &sm->p_subn->sw_guid_tbl;
@@ -642,7 +642,7 @@ static osm_remote_sm_t *__osm_state_mgr_exists_other_master_sm(IN osm_sm_t * sm)
osm_remote_sm_t *p_sm;
osm_remote_sm_t *p_sm_res = NULL;
- OSM_LOG_ENTER(sm->p_log, __osm_state_mgr_exists_other_master_sm);
+ OSM_LOG_ENTER(sm->p_log);
p_sm_tbl = &sm->p_subn->sm_guid_tbl;
@@ -682,7 +682,7 @@ static osm_remote_sm_t *__osm_state_mgr_get_highest_sm(IN osm_sm_t * sm)
uint8_t highest_sm_priority;
ib_net64_t highest_sm_guid;
- OSM_LOG_ENTER(sm->p_log, __osm_state_mgr_get_highest_sm);
+ OSM_LOG_ENTER(sm->p_log);
p_sm_tbl = &sm->p_subn->sm_guid_tbl;
@@ -740,7 +740,7 @@ __osm_state_mgr_send_handover(IN osm_sm_t * const sm,
const osm_port_t *p_port;
ib_api_status_t status;
- OSM_LOG_ENTER(sm->p_log, __osm_state_mgr_send_handover);
+ OSM_LOG_ENTER(sm->p_log);
/*
* Send a query of SubnSet(SMInfo) HANDOVER to the remote sm given.
@@ -819,7 +819,7 @@ static void __osm_state_mgr_report_new_ports(IN osm_sm_t * sm)
uint16_t min_lid_ho;
uint16_t max_lid_ho;
- OSM_LOG_ENTER(sm->p_log, __osm_state_mgr_report_new_ports);
+ OSM_LOG_ENTER(sm->p_log);
CL_PLOCK_ACQUIRE(sm->p_lock);
p_next = cl_qmap_head(&sm->p_subn->port_guid_tbl);
@@ -902,7 +902,7 @@ static void __osm_state_mgr_check_tbl_consistency(IN osm_sm_t * sm)
uint16_t max_lid_ho;
uint16_t lid_ho;
- OSM_LOG_ENTER(sm->p_log, __osm_state_mgr_check_tbl_consistency);
+ OSM_LOG_ENTER(sm->p_log);
cl_ptr_vector_construct(&ref_port_lid_tbl);
cl_ptr_vector_init(&ref_port_lid_tbl,
@@ -1295,7 +1295,7 @@ void osm_state_mgr_process(IN osm_sm_t * sm, IN osm_signal_t signal)
{
CL_ASSERT(sm);
- OSM_LOG_ENTER(sm->p_log, osm_state_mgr_process);
+ OSM_LOG_ENTER(sm->p_log);
if (osm_log_is_active(sm->p_log, OSM_LOG_DEBUG))
osm_log(sm->p_log, OSM_LOG_DEBUG,
diff --git a/opensm/opensm/osm_sw_info_rcv.c b/opensm/opensm/osm_sw_info_rcv.c
index 2cc887a..fb92e6f 100644
--- a/opensm/opensm/osm_sw_info_rcv.c
+++ b/opensm/opensm/osm_sw_info_rcv.c
@@ -77,7 +77,7 @@ __osm_si_rcv_get_port_info(IN osm_sm_t * sm,
const ib_smp_t *p_smp;
ib_api_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(sm->p_log, __osm_si_rcv_get_port_info);
+ OSM_LOG_ENTER(sm->p_log);
CL_ASSERT(p_sw);
@@ -140,7 +140,7 @@ __osm_si_rcv_get_fwd_tbl(IN osm_sm_t * sm,
uint32_t max_block_id_ho;
ib_api_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(sm->p_log, __osm_si_rcv_get_fwd_tbl);
+ OSM_LOG_ENTER(sm->p_log);
CL_ASSERT(p_sw);
@@ -200,7 +200,7 @@ __osm_si_rcv_get_mcast_fwd_tbl(IN osm_sm_t * sm,
uint32_t attr_mod_ho;
ib_api_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(sm->p_log, __osm_si_rcv_get_mcast_fwd_tbl);
+ OSM_LOG_ENTER(sm->p_log);
CL_ASSERT(p_sw);
@@ -297,7 +297,7 @@ __osm_si_rcv_process_new(IN osm_sm_t * sm,
CL_ASSERT(sm);
- OSM_LOG_ENTER(sm->p_log, __osm_si_rcv_process_new);
+ OSM_LOG_ENTER(sm->p_log);
CL_ASSERT(p_madw);
@@ -406,7 +406,7 @@ __osm_si_rcv_process_existing(IN osm_sm_t * sm,
ib_smp_t *p_smp;
boolean_t is_change_detected = FALSE;
- OSM_LOG_ENTER(sm->p_log, __osm_si_rcv_process_existing);
+ OSM_LOG_ENTER(sm->p_log);
CL_ASSERT(p_madw);
@@ -499,7 +499,7 @@ void osm_si_rcv_process(IN void *context, IN void *data)
CL_ASSERT(sm);
- OSM_LOG_ENTER(sm->p_log, osm_si_rcv_process);
+ OSM_LOG_ENTER(sm->p_log);
CL_ASSERT(p_madw);
diff --git a/opensm/opensm/osm_sweep_fail_ctrl.c b/opensm/opensm/osm_sweep_fail_ctrl.c
index 3a5190f..7e80fe0 100644
--- a/opensm/opensm/osm_sweep_fail_ctrl.c
+++ b/opensm/opensm/osm_sweep_fail_ctrl.c
@@ -59,7 +59,7 @@ static void __osm_sweep_fail_ctrl_disp_callback(IN void *context,
{
osm_sweep_fail_ctrl_t *const p_ctrl = (osm_sweep_fail_ctrl_t *) context;
- OSM_LOG_ENTER(p_ctrl->sm->p_log, __osm_sweep_fail_ctrl_disp_callback);
+ OSM_LOG_ENTER(p_ctrl->sm->p_log);
UNUSED_PARAM(p_data);
/*
@@ -94,7 +94,7 @@ osm_sweep_fail_ctrl_init(IN osm_sweep_fail_ctrl_t * const p_ctrl,
{
ib_api_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(sm->p_log, osm_sweep_fail_ctrl_init);
+ OSM_LOG_ENTER(sm->p_log);
osm_sweep_fail_ctrl_construct(p_ctrl);
p_ctrl->sm = sm;
diff --git a/opensm/opensm/osm_trap_rcv.c b/opensm/opensm/osm_trap_rcv.c
index c896be4..b89f9b9 100644
--- a/opensm/opensm/osm_trap_rcv.c
+++ b/opensm/opensm/osm_trap_rcv.c
@@ -120,7 +120,7 @@ osm_trap_rcv_aging_tracker_callback(IN uint64_t key,
uint8_t port_num;
osm_physp_t *p_physp;
- OSM_LOG_ENTER(sm->p_log, osm_trap_rcv_aging_tracker_callback);
+ OSM_LOG_ENTER(sm->p_log);
if (osm_exit_flag)
/* We got an exit flag - do nothing */
@@ -260,7 +260,7 @@ __osm_trap_rcv_process_request(IN osm_sm_t * sm,
uint64_t event_wheel_timeout = OSM_DEFAULT_TRAP_SUPRESSION_TIMEOUT;
boolean_t run_heavy_sweep = FALSE;
- OSM_LOG_ENTER(sm->p_log, __osm_trap_rcv_process_request);
+ OSM_LOG_ENTER(sm->p_log);
CL_ASSERT(p_madw);
@@ -694,7 +694,7 @@ __osm_trap_rcv_process_sm(IN osm_sm_t * sm,
{
/* const ib_sm_info_t* p_smi; */
- OSM_LOG_ENTER(sm->p_log, __osm_trap_rcv_process_sm);
+ OSM_LOG_ENTER(sm->p_log);
osm_log(sm->p_log, OSM_LOG_ERROR,
"__osm_trap_rcv_process_sm: ERR 3807: "
@@ -712,7 +712,7 @@ __osm_trap_rcv_process_response(IN osm_sm_t * sm,
IN const osm_madw_t * const p_madw)
{
- OSM_LOG_ENTER(sm->p_log, __osm_trap_rcv_process_response);
+ OSM_LOG_ENTER(sm->p_log);
osm_log(sm->p_log, OSM_LOG_ERROR,
"__osm_trap_rcv_process_response: ERR 3808: "
@@ -729,7 +729,7 @@ void osm_trap_rcv_process(IN void *context, IN void *data)
osm_madw_t *p_madw = data;
ib_smp_t *p_smp;
- OSM_LOG_ENTER(sm->p_log, osm_trap_rcv_process);
+ OSM_LOG_ENTER(sm->p_log);
CL_ASSERT(p_madw);
diff --git a/opensm/opensm/osm_ucast_ftree.c b/opensm/opensm/osm_ucast_ftree.c
index bada08e..411d59c 100644
--- a/opensm/opensm/osm_ucast_ftree.c
+++ b/opensm/opensm/osm_ucast_ftree.c
@@ -1471,8 +1471,7 @@ static int __osm_ftree_fabric_mark_leaf_switches(IN ftree_fabric_t * p_ftree)
unsigned i;
int res = 0;
- OSM_LOG_ENTER(&p_ftree->p_osm->log,
- __osm_ftree_fabric_mark_leaf_switches);
+ OSM_LOG_ENTER(&p_ftree->p_osm->log);
osm_log(&p_ftree->p_osm->log, OSM_LOG_VERBOSE,
"__osm_ftree_fabric_mark_leaf_switches: "
@@ -1539,7 +1538,7 @@ static void __osm_ftree_fabric_make_indexing(IN ftree_fabric_t * p_ftree)
cl_list_t bfs_list;
ftree_sw_tbl_element_t *p_sw_tbl_element;
- OSM_LOG_ENTER(&p_ftree->p_osm->log, __osm_ftree_fabric_make_indexing);
+ OSM_LOG_ENTER(&p_ftree->p_osm->log);
osm_log(&p_ftree->p_osm->log, OSM_LOG_VERBOSE,
"__osm_ftree_fabric_make_indexing: "
@@ -1701,8 +1700,7 @@ static int __osm_ftree_fabric_create_leaf_switch_array(IN ftree_fabric_t *
unsigned last_leaf_idx;
int res = 0;
- OSM_LOG_ENTER(&p_ftree->p_osm->log,
- __osm_ftree_fabric_create_leaf_switch_array);
+ OSM_LOG_ENTER(&p_ftree->p_osm->log);
/* create array of ALL the switches that have leaf rank */
all_switches_at_leaf_level = (ftree_sw_t **)
@@ -1824,8 +1822,7 @@ static boolean_t __osm_ftree_fabric_validate_topology(IN ftree_fabric_t *
boolean_t res = TRUE;
uint8_t i;
- OSM_LOG_ENTER(&p_ftree->p_osm->log,
- __osm_ftree_fabric_validate_topology);
+ OSM_LOG_ENTER(&p_ftree->p_osm->log);
osm_log(&p_ftree->p_osm->log, OSM_LOG_VERBOSE,
"__osm_ftree_fabric_validate_topology: "
@@ -2516,7 +2513,7 @@ static void __osm_ftree_fabric_route_to_cns(IN ftree_fabric_t * p_ftree)
ib_net16_t hca_lid;
unsigned routed_targets_on_leaf;
- OSM_LOG_ENTER(&p_ftree->p_osm->log, __osm_ftree_fabric_route_to_cns);
+ OSM_LOG_ENTER(&p_ftree->p_osm->log);
/* for each leaf switch (in indexing order) */
for (i = 0; i < p_ftree->leaf_switches_num; i++) {
@@ -2640,8 +2637,7 @@ static void __osm_ftree_fabric_route_to_non_cns(IN ftree_fabric_t * p_ftree)
unsigned port_num_on_switch;
unsigned i;
- OSM_LOG_ENTER(&p_ftree->p_osm->log,
- __osm_ftree_fabric_route_to_non_cns);
+ OSM_LOG_ENTER(&p_ftree->p_osm->log);
p_next_hca = (ftree_hca_t *) cl_qmap_head(&p_ftree->hca_tbl);
while (p_next_hca != (ftree_hca_t *) cl_qmap_end(&p_ftree->hca_tbl)) {
@@ -2718,8 +2714,7 @@ static void __osm_ftree_fabric_route_to_switches(IN ftree_fabric_t * p_ftree)
ftree_sw_t *p_sw;
ftree_sw_t *p_next_sw;
- OSM_LOG_ENTER(&p_ftree->p_osm->log,
- __osm_ftree_fabric_route_to_switches);
+ OSM_LOG_ENTER(&p_ftree->p_osm->log);
p_next_sw = (ftree_sw_t *) cl_qmap_head(&p_ftree->sw_tbl);
while (p_next_sw != (ftree_sw_t *) cl_qmap_end(&p_ftree->sw_tbl)) {
@@ -2761,7 +2756,7 @@ static int __osm_ftree_fabric_populate_nodes(IN ftree_fabric_t * p_ftree)
osm_node_t *p_osm_node;
osm_node_t *p_next_osm_node;
- OSM_LOG_ENTER(&p_ftree->p_osm->log, __osm_ftree_fabric_populate_nodes);
+ OSM_LOG_ENTER(&p_ftree->p_osm->log);
p_next_osm_node =
(osm_node_t *) cl_qmap_head(&p_ftree->p_osm->subn.node_guid_tbl);
@@ -2879,7 +2874,7 @@ __osm_ftree_rank_leaf_switches(IN ftree_fabric_t * p_ftree,
static uint8_t i = 0;
int res = 0;
- OSM_LOG_ENTER(&p_ftree->p_osm->log, __osm_ftree_rank_leaf_switches);
+ OSM_LOG_ENTER(&p_ftree->p_osm->log);
for (i = 0; i < osm_node_get_num_physp(p_osm_node); i++) {
p_osm_port = osm_node_get_physp_ptr(p_osm_node, i);
@@ -3243,7 +3238,7 @@ static int __osm_ftree_fabric_rank_from_roots(IN ftree_fabric_t * p_ftree)
unsigned i;
cl_list_iterator_t guid_iterator;
- OSM_LOG_ENTER(&p_ftree->p_osm->log, __osm_ftree_fabric_rank_from_roots);
+ OSM_LOG_ENTER(&p_ftree->p_osm->log);
cl_list_init(&ranking_bfs_list, 10);
/* Rank all the roots and add them to list */
@@ -3353,7 +3348,7 @@ static int __osm_ftree_fabric_rank_from_hcas(IN ftree_fabric_t * p_ftree)
cl_list_t ranking_bfs_list;
int res = 0;
- OSM_LOG_ENTER(&p_ftree->p_osm->log, __osm_ftree_fabric_rank_from_hcas);
+ OSM_LOG_ENTER(&p_ftree->p_osm->log);
cl_list_init(&ranking_bfs_list, 10);
@@ -3395,7 +3390,7 @@ static int __osm_ftree_fabric_rank(IN ftree_fabric_t * p_ftree)
{
int res = 0;
- OSM_LOG_ENTER(&p_ftree->p_osm->log, __osm_ftree_fabric_perform_ranking);
+ OSM_LOG_ENTER(&p_ftree->p_osm->log);
if (__osm_ftree_fabric_roots_provided(p_ftree))
res = __osm_ftree_fabric_rank_from_roots(p_ftree);
@@ -3424,7 +3419,7 @@ static void __osm_ftree_fabric_set_leaf_rank(IN ftree_fabric_t * p_ftree)
ftree_hca_t *p_hca = NULL;
ftree_hca_t *p_next_hca;
- OSM_LOG_ENTER(&p_ftree->p_osm->log, __osm_ftree_fabric_set_leaf_rank);
+ OSM_LOG_ENTER(&p_ftree->p_osm->log);
if (!__osm_ftree_fabric_roots_provided(p_ftree)) {
/* If root file is not provided, the fabric has to be pure fat-tree
@@ -3483,7 +3478,7 @@ static int __osm_ftree_fabric_populate_ports(IN ftree_fabric_t * p_ftree)
ftree_sw_t *p_next_sw;
int res = 0;
- OSM_LOG_ENTER(&p_ftree->p_osm->log, __osm_ftree_fabric_populate_ports);
+ OSM_LOG_ENTER(&p_ftree->p_osm->log);
p_next_hca = (ftree_hca_t *) cl_qmap_head(&p_ftree->hca_tbl);
while (p_next_hca != (ftree_hca_t *) cl_qmap_end(&p_ftree->hca_tbl)) {
@@ -3538,7 +3533,7 @@ static int __osm_ftree_fabric_read_guid_files(IN ftree_fabric_t * p_ftree)
{
int status = 0;
- OSM_LOG_ENTER(&p_ftree->p_osm->log, __osm_ftree_fabric_read_guid_files);
+ OSM_LOG_ENTER(&p_ftree->p_osm->log);
if (__osm_ftree_fabric_roots_provided(p_ftree)) {
osm_log(&p_ftree->p_osm->log, OSM_LOG_DEBUG,
@@ -3607,7 +3602,7 @@ static int __osm_ftree_construct_fabric(IN void *context)
ftree_fabric_t *p_ftree = context;
int status = 0;
- OSM_LOG_ENTER(&p_ftree->p_osm->log, __osm_ftree_construct_fabric);
+ OSM_LOG_ENTER(&p_ftree->p_osm->log);
__osm_ftree_fabric_clear(p_ftree);
@@ -3812,7 +3807,7 @@ static int __osm_ftree_do_routing(IN void *context)
ftree_fabric_t *p_ftree = context;
int status = 0;
- OSM_LOG_ENTER(&p_ftree->p_osm->log, __osm_ftree_do_routing);
+ OSM_LOG_ENTER(&p_ftree->p_osm->log);
if (!p_ftree->fabric_built) {
status = -1;
diff --git a/opensm/opensm/osm_ucast_lash.c b/opensm/opensm/osm_ucast_lash.c
index 65f688e..d9845c7 100644
--- a/opensm/opensm/osm_ucast_lash.c
+++ b/opensm/opensm/osm_ucast_lash.c
@@ -800,7 +800,7 @@ static void free_lash_structures(lash_t * p_lash)
unsigned num_switches = p_lash->num_switches;
osm_log_t *p_log = &p_lash->p_osm->log;
- OSM_LOG_ENTER(p_log, free_lash_structures);
+ OSM_LOG_ENTER(p_log);
// free cdg_vertex_matrix
for (i = 0; i < p_lash->vl_min; i++) {
@@ -856,7 +856,7 @@ static int init_lash_structures(lash_t * p_lash)
int status = IB_SUCCESS;
unsigned int i, j, k;
- OSM_LOG_ENTER(p_log, init_lash_structures);
+ OSM_LOG_ENTER(p_log);
// initialise cdg_vertex_matrix[num_switches][num_switches][num_switches]
p_lash->cdg_vertex_matrix =
@@ -947,7 +947,7 @@ static int lash_core(lash_t * p_lash)
int status = IB_SUCCESS;
int *switch_bitmap = NULL; /* Bitmap to check if we have processed this pair */
- OSM_LOG_ENTER(p_log, lash_core);
+ OSM_LOG_ENTER(p_log);
switch_bitmap =
(int *)malloc(num_switches * num_switches * sizeof(int));
@@ -1125,7 +1125,7 @@ static void populate_fwd_tbls(lash_t * p_lash)
osm_switch_t *p_sw, *p_next_sw, *p_dst_sw;
uint16_t max_lid_ho, lid = 0;
- OSM_LOG_ENTER(p_log, populate_fwd_tbls);
+ OSM_LOG_ENTER(p_log);
p_next_sw = (osm_switch_t *) cl_qmap_head(&p_subn->sw_guid_tbl);
@@ -1206,7 +1206,7 @@ static void osm_lash_process_switch(lash_t * p_lash, osm_switch_t * p_sw)
osm_physp_t *p_current_physp, *p_remote_physp;
unsigned switch_a_lash_id, switch_b_lash_id;
- OSM_LOG_ENTER(p_log, _osm_lash_process_switch);
+ OSM_LOG_ENTER(p_log);
switch_a_lash_id = get_lash_id(p_sw);
port_count = osm_node_get_num_physp(p_sw->p_node);
@@ -1359,7 +1359,7 @@ static int lash_process(void *context)
osm_log_t *p_log = &p_lash->p_osm->log;
int return_status = IB_SUCCESS;
- OSM_LOG_ENTER(p_log, lash_process);
+ OSM_LOG_ENTER(p_log);
p_lash->balance_limit = 6;
diff --git a/opensm/opensm/osm_ucast_mgr.c b/opensm/opensm/osm_ucast_mgr.c
index 88e29e9..0813a23 100644
--- a/opensm/opensm/osm_ucast_mgr.c
+++ b/opensm/opensm/osm_ucast_mgr.c
@@ -76,7 +76,7 @@ void osm_ucast_mgr_destroy(IN osm_ucast_mgr_t * const p_mgr)
{
CL_ASSERT(p_mgr);
- OSM_LOG_ENTER(p_mgr->p_log, osm_ucast_mgr_destroy);
+ OSM_LOG_ENTER(p_mgr->p_log);
if (p_mgr->lft_buf)
free(p_mgr->lft_buf);
@@ -91,7 +91,7 @@ osm_ucast_mgr_init(IN osm_ucast_mgr_t * const p_mgr, IN osm_sm_t * sm)
{
ib_api_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(sm->p_log, osm_ucast_mgr_init);
+ OSM_LOG_ENTER(sm->p_log);
osm_ucast_mgr_construct(p_mgr);
@@ -152,7 +152,7 @@ __osm_ucast_mgr_process_neighbor(IN osm_ucast_mgr_t * const p_mgr,
uint16_t lid_ho;
uint8_t hops;
- OSM_LOG_ENTER(p_mgr->p_log, __osm_ucast_mgr_process_neighbor);
+ OSM_LOG_ENTER(p_mgr->p_log);
if (osm_log_is_active(p_mgr->p_log, OSM_LOG_DEBUG)) {
osm_log(p_mgr->p_log, OSM_LOG_DEBUG,
@@ -216,7 +216,7 @@ __osm_ucast_mgr_process_port(IN osm_ucast_mgr_t * const p_mgr,
uint16_t num_used_sys = 0;
uint16_t num_used_nodes = 0;
- OSM_LOG_ENTER(p_mgr->p_log, __osm_ucast_mgr_process_port);
+ OSM_LOG_ENTER(p_mgr->p_log);
if (lids_per_port > 1) {
remote_sys_guids = malloc(sizeof(uint64_t) * lids_per_port);
@@ -382,7 +382,7 @@ osm_ucast_mgr_set_fwd_table(IN osm_ucast_mgr_t * const p_mgr,
CL_ASSERT(p_mgr);
- OSM_LOG_ENTER(p_mgr->p_log, osm_ucast_mgr_set_fwd_table);
+ OSM_LOG_ENTER(p_mgr->p_log);
CL_ASSERT(p_sw);
@@ -498,7 +498,7 @@ __osm_ucast_mgr_process_tbl(IN cl_map_item_t * const p_map_item,
osm_port_t *p_port;
const cl_qmap_t *p_port_tbl;
- OSM_LOG_ENTER(p_mgr->p_log, __osm_ucast_mgr_process_tbl);
+ OSM_LOG_ENTER(p_mgr->p_log);
p_node = p_sw->p_node;
@@ -548,7 +548,7 @@ __osm_ucast_mgr_process_neighbors(IN cl_map_item_t * const p_map_item,
uint32_t num_ports;
osm_physp_t *p_physp;
- OSM_LOG_ENTER(p_mgr->p_log, __osm_ucast_mgr_process_neighbors);
+ OSM_LOG_ENTER(p_mgr->p_log);
p_node = p_sw->p_node;
@@ -698,7 +698,7 @@ osm_ucast_mgr_read_guid_file(IN osm_ucast_mgr_t * const p_mgr,
char *endptr;
uint64_t *p_guid;
- OSM_LOG_ENTER(p_mgr->p_log, osm_ucast_mgr_read_guid_file);
+ OSM_LOG_ENTER(p_mgr->p_log);
guid_file = fopen(guid_file_name, "r");
if (guid_file == NULL) {
@@ -764,7 +764,7 @@ osm_signal_t osm_ucast_mgr_process(IN osm_ucast_mgr_t * const p_mgr)
int blm = 0;
int ubft = 0;
- OSM_LOG_ENTER(p_mgr->p_log, osm_ucast_mgr_process);
+ OSM_LOG_ENTER(p_mgr->p_log);
p_sw_guid_tbl = &p_mgr->p_subn->sw_guid_tbl;
p_osm = p_mgr->p_subn->p_osm;
diff --git a/opensm/opensm/osm_ucast_updn.c b/opensm/opensm/osm_ucast_updn.c
index 411e15b..3058038 100644
--- a/opensm/opensm/osm_ucast_updn.c
+++ b/opensm/opensm/osm_ucast_updn.c
@@ -134,7 +134,7 @@ __updn_bfs_by_node(IN osm_log_t * p_log,
struct updn_node *u;
updn_switch_dir_t next_dir, current_dir;
- OSM_LOG_ENTER(p_log, __updn_bfs_by_node);
+ OSM_LOG_ENTER(p_log);
lid = osm_node_get_base_lid(p_sw->p_node, 0);
lid = cl_ntoh16(lid);
@@ -256,7 +256,7 @@ static updn_t *updn_construct(osm_log_t * p_log)
{
updn_t *p_updn;
- OSM_LOG_ENTER(p_log, updn_construct);
+ OSM_LOG_ENTER(p_log);
p_updn = malloc(sizeof(updn_t));
if (p_updn)
@@ -274,7 +274,7 @@ static cl_status_t updn_init(IN updn_t * const p_updn, IN osm_opensm_t * p_osm)
cl_list_iterator_t guid_iterator;
ib_api_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(&p_osm->log, updn_init);
+ OSM_LOG_ENTER(&p_osm->log);
p_updn->p_osm = p_osm;
p_list = (cl_list_t *) malloc(sizeof(cl_list_t));
@@ -342,7 +342,7 @@ updn_subn_rank(IN unsigned num_guids,
unsigned idx = 0;
unsigned max_rank = 0;
- OSM_LOG_ENTER(p_log, updn_subn_rank);
+ OSM_LOG_ENTER(p_log);
cl_qlist_init(&list);
/* Rank all the roots and add them to list */
@@ -449,7 +449,7 @@ static int __osm_subn_set_up_down_min_hop_table(IN updn_t * p_updn)
osm_log_t *p_log = &p_updn->p_osm->log;
osm_switch_t *p_next_sw, *p_sw;
- OSM_LOG_ENTER(p_log, __osm_subn_set_up_down_min_hop_table);
+ OSM_LOG_ENTER(p_log);
/* Go over all the switches in the subnet - for each init their Min Hop
Table */
@@ -501,7 +501,7 @@ updn_build_lid_matrices(IN uint32_t num_guids,
{
int status;
- OSM_LOG_ENTER(&p_updn->p_osm->log, osm_subn_calc_up_down_min_hop_table);
+ OSM_LOG_ENTER(&p_updn->p_osm->log);
osm_log(&p_updn->p_osm->log, OSM_LOG_VERBOSE,
"updn_build_lid_matrices: "
@@ -568,7 +568,7 @@ static int __osm_updn_call(void *ctx)
osm_switch_t *p_sw;
int ret = 0;
- OSM_LOG_ENTER(&p_updn->p_osm->log, __osm_updn_call);
+ OSM_LOG_ENTER(&p_updn->p_osm->log);
p_item = cl_qmap_head(&p_updn->p_osm->subn.sw_guid_tbl);
while (p_item != cl_qmap_end(&p_updn->p_osm->subn.sw_guid_tbl)) {
@@ -627,7 +627,7 @@ static void __osm_updn_convert_list2array(IN updn_t * p_updn)
uint32_t i = 0, max_num = 0;
uint64_t *p_guid;
- OSM_LOG_ENTER(&p_updn->p_osm->log, __osm_updn_convert_list2array);
+ OSM_LOG_ENTER(&p_updn->p_osm->log);
p_updn->updn_ucast_reg_inputs.num_guids =
cl_list_count(p_updn->p_root_nodes);
@@ -675,7 +675,7 @@ static void __osm_updn_find_root_nodes_by_min_hop(OUT updn_t * p_updn)
unsigned *cas_per_sw;
uint16_t lid_ho;
- OSM_LOG_ENTER(&p_osm->log, osm_updn_find_root_nodes_by_min_hop);
+ OSM_LOG_ENTER(&p_osm->log);
osm_log(&p_osm->log, OSM_LOG_DEBUG,
"__osm_updn_find_root_nodes_by_min_hop: "
diff --git a/opensm/opensm/osm_vl15intf.c b/opensm/opensm/osm_vl15intf.c
index 5d10ed6..ac9becb 100644
--- a/opensm/opensm/osm_vl15intf.c
+++ b/opensm/opensm/osm_vl15intf.c
@@ -124,7 +124,7 @@ static void __osm_vl15_poller(IN void *p_ptr)
osm_vl15_t *const p_vl = (osm_vl15_t *) p_ptr;
cl_qlist_t *p_fifo;
- OSM_LOG_ENTER(p_vl->p_log, __osm_vl15_poller);
+ OSM_LOG_ENTER(p_vl->p_log);
if (p_vl->thread_state == OSM_THREAD_STATE_NONE)
p_vl->thread_state = OSM_THREAD_STATE_RUN;
@@ -213,7 +213,7 @@ osm_vl15_destroy(IN osm_vl15_t * const p_vl, IN struct _osm_mad_pool *p_pool)
{
osm_madw_t *p_madw;
- OSM_LOG_ENTER(p_vl->p_log, osm_vl15_destroy);
+ OSM_LOG_ENTER(p_vl->p_log);
/*
Signal our threads that we're leaving.
@@ -263,7 +263,7 @@ osm_vl15_init(IN osm_vl15_t * const p_vl,
{
ib_api_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(p_log, osm_vl15_init);
+ OSM_LOG_ENTER(p_log);
p_vl->p_vend = p_vend;
p_vl->p_log = p_log;
@@ -298,7 +298,7 @@ osm_vl15_init(IN osm_vl15_t * const p_vl,
**********************************************************************/
void osm_vl15_poll(IN osm_vl15_t * const p_vl)
{
- OSM_LOG_ENTER(p_vl->p_log, osm_vl15_poll);
+ OSM_LOG_ENTER(p_vl->p_log);
CL_ASSERT(p_vl->state == OSM_VL15_STATE_READY);
@@ -327,7 +327,7 @@ void osm_vl15_poll(IN osm_vl15_t * const p_vl)
**********************************************************************/
void osm_vl15_post(IN osm_vl15_t * const p_vl, IN osm_madw_t * const p_madw)
{
- OSM_LOG_ENTER(p_vl->p_log, osm_vl15_post);
+ OSM_LOG_ENTER(p_vl->p_log);
CL_ASSERT(p_vl->state == OSM_VL15_STATE_READY);
@@ -364,7 +364,7 @@ osm_vl15_shutdown(IN osm_vl15_t * const p_vl,
{
osm_madw_t *p_madw;
- OSM_LOG_ENTER(p_vl->p_log, osm_vl15_shutdown);
+ OSM_LOG_ENTER(p_vl->p_log);
/* we only should get here after the VL15 interface was initialized */
CL_ASSERT(p_vl->state == OSM_VL15_STATE_READY);
diff --git a/opensm/opensm/osm_vl_arb_rcv.c b/opensm/opensm/osm_vl_arb_rcv.c
index 8a5b8b4..6013855 100644
--- a/opensm/opensm/osm_vl_arb_rcv.c
+++ b/opensm/opensm/osm_vl_arb_rcv.c
@@ -81,7 +81,7 @@ void osm_vla_rcv_process(IN void *context, IN void *data)
CL_ASSERT(sm);
- OSM_LOG_ENTER(sm->p_log, osm_vla_rcv_process);
+ OSM_LOG_ENTER(sm->p_log);
CL_ASSERT(p_madw);
diff --git a/opensm/osmtest/osmt_inform.c b/opensm/osmtest/osmt_inform.c
index 4ce6e2b..3b6dce7 100644
--- a/opensm/osmtest/osmt_inform.c
+++ b/opensm/osmtest/osmt_inform.c
@@ -75,7 +75,7 @@ osmt_bind_inform_qp(IN osmtest_t * const p_osmt, OUT osmt_qp_ctx_t * p_qp_ctx)
osm_log_t *p_log = &p_osmt->log;
ib_api_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(p_log, osmt_bind_inform_qp);
+ OSM_LOG_ENTER(p_log);
port_guid = p_osmt->local_port.port_guid;
@@ -165,7 +165,7 @@ osmt_unbind_inform_qp(IN osmtest_t * const p_osmt, IN osmt_qp_ctx_t * p_qp_ctx)
{
osm_log_t *p_log = &p_osmt->log;
- OSM_LOG_ENTER(p_log, osmt_unbind_inform_qp);
+ OSM_LOG_ENTER(p_log);
osmt_mtl_mad_cleanup(&p_qp_ctx->qp_bind_hndl);
@@ -198,7 +198,7 @@ osmt_reg_unreg_inform_info(IN osmtest_t * p_osmt,
osm_log_t *p_log = &p_osmt->log;
ib_api_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(&p_osmt->log, osmt_reg_unreg_inform_info);
+ OSM_LOG_ENTER(&p_osmt->log);
/* init the MAD */
ib_mad_init_new((ib_mad_t *) p_sa_mad,
@@ -399,7 +399,7 @@ osmt_send_trap_wait_for_forward(IN osmtest_t * const p_osmt,
osm_log_t *p_log = &p_osmt->log;
ib_api_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(p_log, osmt_send_trap_wait_for_forward);
+ OSM_LOG_ENTER(p_log);
osm_log(p_log, OSM_LOG_INFO,
"osmt_send_trap_wait_for_forward: "
@@ -545,7 +545,7 @@ osmt_trap_wait(IN osmtest_t * const p_osmt, IN osmt_qp_ctx_t * p_qp_ctx)
osm_log_t *p_log = &p_osmt->log;
ib_api_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(p_log, osmt_trap_wait);
+ OSM_LOG_ENTER(p_log);
osm_log(p_log, OSM_LOG_INFO,
"osmt_trap_wait: "
@@ -659,7 +659,7 @@ ib_api_status_t osmt_run_inform_info_flow(IN osmtest_t * const p_osmt)
ib_api_status_t status;
osmt_qp_ctx_t qp_ctx;
- OSM_LOG_ENTER(&p_osmt->log, osmt_run_inform_info_flow);
+ OSM_LOG_ENTER(&p_osmt->log);
/* bind the QP */
status = osmt_bind_inform_qp(p_osmt, &qp_ctx);
@@ -746,7 +746,7 @@ ib_api_status_t osmt_run_trap64_65_flow(IN osmtest_t * const p_osmt)
ib_api_status_t status;
osmt_qp_ctx_t qp_ctx;
- OSM_LOG_ENTER(&p_osmt->log, osmt_run_trap64_65_flow);
+ OSM_LOG_ENTER(&p_osmt->log);
/* bind the QP */
status = osmt_bind_inform_qp(p_osmt, &qp_ctx);
diff --git a/opensm/osmtest/osmt_multicast.c b/opensm/osmtest/osmt_multicast.c
index 9721840..6638148 100644
--- a/opensm/osmtest/osmt_multicast.c
+++ b/opensm/osmtest/osmt_multicast.c
@@ -166,7 +166,7 @@ ib_api_status_t osmt_query_mcast(IN osmtest_t * const p_osmt)
cl_map_item_t *p_item, *p_next_item;
osmtest_mgrp_t *p_mgrp;
- OSM_LOG_ENTER(&p_osmt->log, osmt_query_mcast);
+ OSM_LOG_ENTER(&p_osmt->log);
/*
* Do a blocking query for all Multicast Records in the subnet.
@@ -301,7 +301,7 @@ osmt_send_mcast_request(IN osmtest_t * const p_osmt,
osmv_user_query_t user;
osmv_query_req_t req;
- OSM_LOG_ENTER(&p_osmt->log, osmt_send_mcast_request);
+ OSM_LOG_ENTER(&p_osmt->log);
/*
* Do a blocking query for this record in the subnet.
@@ -549,7 +549,7 @@ ib_api_status_t osmt_run_mcast_flow(IN osmtest_t * const p_osmt)
0x00, 0x00, 0x00, 0x01},
};
- OSM_LOG_ENTER(&p_osmt->log, osmt_run_mcast_flow);
+ OSM_LOG_ENTER(&p_osmt->log);
osm_log(&p_osmt->log, OSM_LOG_INFO,
"osmt_run_mcast_flow: " "GetTable of all current MCGs...\n");
diff --git a/opensm/osmtest/osmt_service.c b/opensm/osmtest/osmt_service.c
index 6d377af..920293c 100644
--- a/opensm/osmtest/osmt_service.c
+++ b/opensm/osmtest/osmt_service.c
@@ -76,7 +76,7 @@ osmt_register_service(IN osmtest_t * const p_osmt,
osm_log_t *p_log = &p_osmt->log;
ib_api_status_t status;
- OSM_LOG_ENTER(p_log, osmt_register_service);
+ OSM_LOG_ENTER(p_log);
osm_log(&p_osmt->log, OSM_LOG_INFO,
"osmt_register_service: "
@@ -187,7 +187,7 @@ osmt_register_service_with_full_key(IN osmtest_t * const p_osmt,
ib_api_status_t status;
uint8_t i, skey[16];
- OSM_LOG_ENTER(p_log, osmt_register_service_with_full_key);
+ OSM_LOG_ENTER(p_log);
osm_log(&p_osmt->log, OSM_LOG_INFO,
"osmt_register_service_with_full_key: "
@@ -320,7 +320,7 @@ osmt_register_service_with_data(IN osmtest_t * const p_osmt,
ib_api_status_t status;
/* ib_service_record_t* p_rec; */
- OSM_LOG_ENTER(p_log, osmt_register_service_with_data);
+ OSM_LOG_ENTER(p_log);
osm_log(&p_osmt->log, OSM_LOG_INFO,
"osmt_register_service_with_data: "
@@ -477,7 +477,7 @@ osmt_get_service_by_id_and_name(IN osmtest_t * const p_osmt,
uint32_t num_recs = 0;
osmv_user_query_t user;
- OSM_LOG_ENTER(&p_osmt->log, osmt_get_service_by_id);
+ OSM_LOG_ENTER(&p_osmt->log);
if (osm_log_is_active(&p_osmt->log, OSM_LOG_VERBOSE))
osm_log(&p_osmt->log, OSM_LOG_VERBOSE,
@@ -612,7 +612,7 @@ osmt_get_service_by_id(IN osmtest_t * const p_osmt,
uint32_t num_recs = 0;
osmv_user_query_t user;
- OSM_LOG_ENTER(&p_osmt->log, osmt_get_service_by_id);
+ OSM_LOG_ENTER(&p_osmt->log);
if (osm_log_is_active(&p_osmt->log, OSM_LOG_VERBOSE))
osm_log(&p_osmt->log, OSM_LOG_VERBOSE,
@@ -747,7 +747,7 @@ osmt_get_service_by_name_and_key(IN osmtest_t * const p_osmt,
uint32_t num_recs = 0, i;
osmv_user_query_t user;
- OSM_LOG_ENTER(&p_osmt->log, osmt_get_service_by_name_and_key);
+ OSM_LOG_ENTER(&p_osmt->log);
if (osm_log_is_active(&p_osmt->log, OSM_LOG_VERBOSE)) {
char buf_service_key[33];
@@ -894,7 +894,7 @@ osmt_get_service_by_name(IN osmtest_t * const p_osmt,
ib_svc_name_t service_name;
uint32_t num_recs = 0;
- OSM_LOG_ENTER(&p_osmt->log, osmt_get_service_by_name);
+ OSM_LOG_ENTER(&p_osmt->log);
if (osm_log_is_active(&p_osmt->log, OSM_LOG_VERBOSE))
osm_log(&p_osmt->log, OSM_LOG_VERBOSE,
@@ -1020,7 +1020,7 @@ osmt_get_all_services_and_check_names(IN osmtest_t * const p_osmt,
uint32_t num_recs = 0, i, j;
uint8_t *p_checked_names;
- OSM_LOG_ENTER(&p_osmt->log, osmt_get_all_services_and_check_names);
+ OSM_LOG_ENTER(&p_osmt->log);
/* Prepare tracker for the checked names */
p_checked_names =
@@ -1151,7 +1151,7 @@ osmt_delete_service_by_name(IN osmtest_t * const p_osmt,
ib_service_record_t svc_rec;
ib_api_status_t status;
- OSM_LOG_ENTER(&p_osmt->log, osmt_delete_service_by_name);
+ OSM_LOG_ENTER(&p_osmt->log);
osm_log(&p_osmt->log, OSM_LOG_INFO,
"osmt_delete_service_by_name: "
@@ -1285,7 +1285,7 @@ ib_api_status_t osmt_run_service_records_flow(IN osmtest_t * const p_osmt)
uint32_t num_recs = 0;
#endif
- OSM_LOG_ENTER(&p_osmt->log, osmt_run_service_records_flow);
+ OSM_LOG_ENTER(&p_osmt->log);
/* Init Service names */
for (i = 0; i <= 6; i++) {
diff --git a/opensm/osmtest/osmt_slvl_vl_arb.c b/opensm/osmtest/osmt_slvl_vl_arb.c
index f2125d8..1eec865 100644
--- a/opensm/osmtest/osmt_slvl_vl_arb.c
+++ b/opensm/osmtest/osmt_slvl_vl_arb.c
@@ -65,7 +65,7 @@ osmtest_write_vl_arb_table(IN osmtest_t * const p_osmt,
int result, i;
cl_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_write_vl_arb_table);
+ OSM_LOG_ENTER(&p_osmt->log);
result = fprintf(fh,
"VL_ARBITRATION_TABLE\n"
@@ -108,7 +108,7 @@ osmt_query_vl_arb(IN osmtest_t * const p_osmt,
osmv_query_req_t req;
ib_vl_arb_table_record_t record, *p_rec;
- OSM_LOG_ENTER(&p_osmt->log, osmt_query_vl_arb);
+ OSM_LOG_ENTER(&p_osmt->log);
if (osm_log_is_active(&p_osmt->log, OSM_LOG_DEBUG)) {
osm_log(&p_osmt->log, OSM_LOG_DEBUG,
@@ -199,7 +199,7 @@ osmt_query_all_ports_vl_arb(IN osmtest_t * const p_osmt, IN FILE * fh)
port_t *p_src_port;
uint8_t block, anyErr = 0;
- OSM_LOG_ENTER(&p_osmt->log, osmt_query_all_ports_vl_arb);
+ OSM_LOG_ENTER(&p_osmt->log);
osm_log(&p_osmt->log, OSM_LOG_VERBOSE,
"osmt_query_all_ports_vl_arb: "
@@ -276,7 +276,7 @@ osmtest_write_slvl_map_table(IN osmtest_t * const p_osmt,
int result, i;
cl_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_write_slvl_map_table);
+ OSM_LOG_ENTER(&p_osmt->log);
result = fprintf(fh,
"SLtoVL_MAP_TABLE\n"
@@ -316,7 +316,7 @@ osmt_query_slvl_map(IN osmtest_t * const p_osmt,
osmv_query_req_t req;
ib_slvl_table_record_t record, *p_rec;
- OSM_LOG_ENTER(&p_osmt->log, osmt_query_slvl_map);
+ OSM_LOG_ENTER(&p_osmt->log);
if (osm_log_is_active(&p_osmt->log, OSM_LOG_DEBUG)) {
osm_log(&p_osmt->log, OSM_LOG_DEBUG,
@@ -409,7 +409,7 @@ osmt_query_all_ports_slvl_map(IN osmtest_t * const p_osmt, IN FILE * fh)
node_t *p_node;
const cl_qmap_t *p_node_tbl;
- OSM_LOG_ENTER(&p_osmt->log, osmt_query_all_ports_slvl_map);
+ OSM_LOG_ENTER(&p_osmt->log);
/*
* Go over all ports that exist in the subnet
@@ -508,7 +508,7 @@ osmt_run_slvl_and_vlarb_records_flow(IN osmtest_t * const p_osmt)
ib_net16_t test_lid;
uint8_t lmc;
- OSM_LOG_ENTER(&p_osmt->log, osmt_run_slvl_and_vlarb_records_flow);
+ OSM_LOG_ENTER(&p_osmt->log);
fh = fopen("qos.txt", "w");
diff --git a/opensm/osmtest/osmtest.c b/opensm/osmtest/osmtest.c
index de54f2d..0f8cd98 100644
--- a/opensm/osmtest/osmtest.c
+++ b/opensm/osmtest/osmtest.c
@@ -555,7 +555,7 @@ void osmtest_query_res_cb(IN osmv_query_res_t * p_rec)
(osmtest_req_context_t *) p_rec->query_context;
osmtest_t *const p_osmt = p_ctxt->p_osmt;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_query_res_cb);
+ OSM_LOG_ENTER(&p_osmt->log);
p_ctxt->result = *p_rec;
@@ -580,7 +580,7 @@ osmtest_get_all_recs(IN osmtest_t * const p_osmt,
osmv_user_query_t user;
osmv_query_req_t req;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_get_all_recs);
+ OSM_LOG_ENTER(&p_osmt->log);
if (osm_log_is_active(&p_osmt->log, OSM_LOG_DEBUG)) {
osm_log(&p_osmt->log, OSM_LOG_DEBUG,
@@ -654,7 +654,7 @@ ib_api_status_t osmtest_validate_sa_class_port_info(IN osmtest_t * const p_osmt)
osmtest_req_context_t *p_context = &context;
ib_sa_mad_t *p_resp_sa_madp;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_validate_sa_class_port_info);
+ OSM_LOG_ENTER(&p_osmt->log);
if (osm_log_is_active(&p_osmt->log, OSM_LOG_VERBOSE)) {
osm_log(&p_osmt->log, OSM_LOG_VERBOSE,
@@ -750,7 +750,7 @@ osmtest_get_node_rec(IN osmtest_t * const p_osmt,
osmv_query_req_t req;
ib_node_record_t record;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_get_node_rec);
+ OSM_LOG_ENTER(&p_osmt->log);
if (osm_log_is_active(&p_osmt->log, OSM_LOG_VERBOSE)) {
osm_log(&p_osmt->log, OSM_LOG_VERBOSE,
@@ -831,7 +831,7 @@ osmtest_get_node_rec_by_lid(IN osmtest_t * const p_osmt,
ib_node_record_t record;
ib_mad_t *p_mad;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_get_node_rec_by_lid);
+ OSM_LOG_ENTER(&p_osmt->log);
if (osm_log_is_active(&p_osmt->log, OSM_LOG_VERBOSE)) {
osm_log(&p_osmt->log, OSM_LOG_VERBOSE,
@@ -913,7 +913,7 @@ osmtest_get_path_rec_by_guid_pair(IN osmtest_t * const p_osmt,
osmv_query_req_t req;
osmv_guid_pair_t guid_pair;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_get_path_rec_by_guid_pair);
+ OSM_LOG_ENTER(&p_osmt->log);
memset(&req, 0, sizeof(req));
memset(p_context, 0, sizeof(*p_context));
@@ -982,7 +982,7 @@ osmtest_get_path_rec_by_gid_pair(IN osmtest_t * const p_osmt,
osmv_query_req_t req;
osmv_gid_pair_t gid_pair;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_get_path_rec_by_gid_pair);
+ OSM_LOG_ENTER(&p_osmt->log);
memset(&req, 0, sizeof(req));
memset(p_context, 0, sizeof(*p_context));
@@ -1052,7 +1052,7 @@ osmtest_get_multipath_rec(IN osmtest_t * const p_osmt,
cl_status_t status = IB_SUCCESS;
osmv_query_req_t req;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_get_multipath_rec);
+ OSM_LOG_ENTER(&p_osmt->log);
/*
* Do a blocking query for this record in the subnet.
@@ -1119,7 +1119,7 @@ osmtest_get_port_rec(IN osmtest_t * const p_osmt,
osmv_query_req_t req;
ib_portinfo_record_t record;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_get_port_rec);
+ OSM_LOG_ENTER(&p_osmt->log);
if (osm_log_is_active(&p_osmt->log, OSM_LOG_DEBUG)) {
osm_log(&p_osmt->log, OSM_LOG_DEBUG,
@@ -1201,7 +1201,7 @@ osmtest_get_port_rec_by_num(IN osmtest_t * const p_osmt,
ib_portinfo_record_t record;
ib_mad_t *p_mad;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_get_port_rec_by_num);
+ OSM_LOG_ENTER(&p_osmt->log);
if (osm_log_is_active(&p_osmt->log, OSM_LOG_DEBUG)) {
osm_log(&p_osmt->log, OSM_LOG_DEBUG,
@@ -1283,7 +1283,7 @@ osmtest_stress_port_recs_large(IN osmtest_t * const p_osmt,
cl_status_t status;
uint32_t num_recs = 0;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_stress_port_recs_large);
+ OSM_LOG_ENTER(&p_osmt->log);
memset(&context, 0, sizeof(context));
/*
@@ -1348,7 +1348,7 @@ osmtest_stress_node_recs_large(IN osmtest_t * const p_osmt,
cl_status_t status;
uint32_t num_recs = 0;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_stress_node_recs_large);
+ OSM_LOG_ENTER(&p_osmt->log);
memset(&context, 0, sizeof(context));
@@ -1414,7 +1414,7 @@ osmtest_stress_path_recs_large(IN osmtest_t * const p_osmt,
cl_status_t status;
uint32_t num_recs = 0;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_stress_path_recs_large);
+ OSM_LOG_ENTER(&p_osmt->log);
memset(&context, 0, sizeof(context));
@@ -1481,7 +1481,7 @@ osmtest_stress_path_recs_by_guid(IN osmtest_t * const p_osmt,
node_t *p_src_node, *p_dst_node;
cl_qmap_t *p_tbl;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_stress_path_recs_by_guid);
+ OSM_LOG_ENTER(&p_osmt->log);
memset(&context, 0, sizeof(context));
@@ -1597,7 +1597,7 @@ osmtest_stress_port_recs_small(IN osmtest_t * const p_osmt,
cl_status_t status;
uint32_t num_recs = 0;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_stress_port_recs_small);
+ OSM_LOG_ENTER(&p_osmt->log);
memset(&context, 0, sizeof(context));
@@ -1663,7 +1663,7 @@ osmtest_get_local_port_lmc(IN osmtest_t * const p_osmt,
cl_status_t status;
uint32_t num_recs = 0;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_get_local_port_lmc);
+ OSM_LOG_ENTER(&p_osmt->log);
memset(&context, 0, sizeof(context));
@@ -1729,7 +1729,7 @@ ib_api_status_t osmtest_wrong_sm_key_ignored(IN osmtest_t * const p_osmt)
osmtest_req_context_t *p_context = &context;
uint8_t port_num = 1;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_wrong_sm_key_ignored);
+ OSM_LOG_ENTER(&p_osmt->log);
if (osm_log_is_active(&p_osmt->log, OSM_LOG_INFO)) {
osm_log(&p_osmt->log, OSM_LOG_INFO,
@@ -1807,7 +1807,7 @@ osmtest_write_port_info(IN osmtest_t * const p_osmt,
int result;
cl_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_write_port_info);
+ OSM_LOG_ENTER(&p_osmt->log);
result = fprintf(fh,
"DEFINE_PORT\n"
@@ -1902,7 +1902,7 @@ osmtest_write_path_info(IN osmtest_t * const p_osmt,
int result;
cl_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_write_path_info);
+ OSM_LOG_ENTER(&p_osmt->log);
result = fprintf(fh,
"DEFINE_PATH\n"
@@ -1953,7 +1953,7 @@ osmtest_write_node_info(IN osmtest_t * const p_osmt,
cl_status_t status = IB_SUCCESS;
char desc[IB_NODE_DESCRIPTION_SIZE + 1];
- OSM_LOG_ENTER(&p_osmt->log, osmtest_write_node_info);
+ OSM_LOG_ENTER(&p_osmt->log);
memcpy(desc, p_rec->node_desc.description, IB_NODE_DESCRIPTION_SIZE);
desc[IB_NODE_DESCRIPTION_SIZE] = '\0';
@@ -2012,7 +2012,7 @@ osmtest_write_link(IN osmtest_t * const p_osmt,
int result;
cl_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_write_link);
+ OSM_LOG_ENTER(&p_osmt->log);
result = fprintf(fh,
"DEFINE_LINK\n"
@@ -2049,7 +2049,7 @@ osmtest_write_all_link_recs(IN osmtest_t * const p_osmt, IN FILE * fh)
size_t num_recs;
int result;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_write_all_link_recs);
+ OSM_LOG_ENTER(&p_osmt->log);
memset(&context, 0, sizeof(context));
@@ -2122,7 +2122,7 @@ osmtest_get_path_rec_by_lid_pair(IN osmtest_t * const p_osmt,
osmv_query_req_t req;
osmv_lid_pair_t lid_pair;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_get_path_rec_by_lid_pair);
+ OSM_LOG_ENTER(&p_osmt->log);
memset(&req, 0, sizeof(req));
memset(p_context, 0, sizeof(*p_context));
@@ -2190,7 +2190,7 @@ osmtest_write_all_node_recs(IN osmtest_t * const p_osmt, IN FILE * fh)
size_t num_recs;
int result;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_write_all_node_recs);
+ OSM_LOG_ENTER(&p_osmt->log);
memset(&context, 0, sizeof(context));
@@ -2261,7 +2261,7 @@ osmtest_write_all_port_recs(IN osmtest_t * const p_osmt, IN FILE * fh)
size_t num_recs;
int result;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_write_all_port_recs);
+ OSM_LOG_ENTER(&p_osmt->log);
memset(&context, 0, sizeof(context));
@@ -2333,7 +2333,7 @@ osmtest_write_all_path_recs(IN osmtest_t * const p_osmt, IN FILE * fh)
size_t num_recs;
int result;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_write_all_path_recs);
+ OSM_LOG_ENTER(&p_osmt->log);
memset(&context, 0, sizeof(context));
@@ -2406,7 +2406,7 @@ osmtest_write_all_node_recs(IN osmtest_t * const p_osmt, IN FILE * fh)
int result;
uint16_t lid;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_write_all_node_recs);
+ OSM_LOG_ENTER(&p_osmt->log);
result = fprintf(fh, "#\n" "# Node Records\n" "#\n");
if (result < 0) {
@@ -2505,7 +2505,7 @@ osmtest_write_all_port_recs(IN osmtest_t * const p_osmt, IN FILE * fh)
port_t *p_port;
int result;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_write_all_port_recs);
+ OSM_LOG_ENTER(&p_osmt->log);
memset(&context, 0, sizeof(context));
@@ -2618,7 +2618,7 @@ osmtest_write_all_path_recs(IN osmtest_t * const p_osmt, IN FILE * fh)
node_t *p_src_node, *p_dst_node;
ib_api_status_t got_status = IB_SUCCESS;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_write_all_path_recs);
+ OSM_LOG_ENTER(&p_osmt->log);
memset(&context, 0, sizeof(context));
@@ -2717,7 +2717,7 @@ osmtest_create_inventory_file(IN osmtest_t * const p_osmt)
FILE *fh;
ib_api_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_create_inventory_file);
+ OSM_LOG_ENTER(&p_osmt->log);
fh = fopen(p_osmt->opt.file_name, "w");
if (fh == NULL) {
@@ -2769,7 +2769,7 @@ static ib_api_status_t osmtest_stress_large_rmpp_pr(IN osmtest_t * const p_osmt)
long sec_diff, usec_diff;
float ratio;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_stress_large_rmpp_pr);
+ OSM_LOG_ENTER(&p_osmt->log);
gettimeofday(&start_tv, NULL);
printf("-I- Start time is : %09ld:%06ld [sec:usec]\n", start_tv.tv_sec,
(long)start_tv.tv_usec);
@@ -2847,7 +2847,7 @@ static ib_api_status_t osmtest_stress_large_rmpp(IN osmtest_t * const p_osmt)
struct timeval start_tv, end_tv;
long sec_diff, usec_diff;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_stress_large_rmpp);
+ OSM_LOG_ENTER(&p_osmt->log);
gettimeofday(&start_tv, NULL);
printf("-I- Start time is : %09ld:%06ld [sec:usec]\n", start_tv.tv_sec,
(long)start_tv.tv_usec);
@@ -2932,7 +2932,7 @@ static ib_api_status_t osmtest_stress_small_rmpp(IN osmtest_t * const p_osmt)
struct timeval start_tv, end_tv;
long sec_diff, usec_diff;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_stress_small_rmpp);
+ OSM_LOG_ENTER(&p_osmt->log);
gettimeofday(&start_tv, NULL);
printf("-I- Start time is : %09ld:%06ld [sec:usec]\n",
start_tv.tv_sec, (long)start_tv.tv_usec);
@@ -3003,7 +3003,7 @@ osmtest_prepare_db_generic(IN osmtest_t * const p_osmt,
{
generic_t *p_generic;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_prepare_db_generic);
+ OSM_LOG_ENTER(&p_osmt->log);
p_generic = (generic_t *) cl_qmap_head(p_tbl);
@@ -3019,7 +3019,7 @@ osmtest_prepare_db_generic(IN osmtest_t * const p_osmt,
**********************************************************************/
static void osmtest_prepare_db(IN osmtest_t * const p_osmt)
{
- OSM_LOG_ENTER(&p_osmt->log, osmtest_prepare_db);
+ OSM_LOG_ENTER(&p_osmt->log);
osmtest_prepare_db_generic(p_osmt, &p_osmt->exp_subn.node_lid_tbl);
osmtest_prepare_db_generic(p_osmt, &p_osmt->exp_subn.path_tbl);
@@ -3035,7 +3035,7 @@ static ib_api_status_t osmtest_check_missing_nodes(IN osmtest_t * const p_osmt)
cl_status_t status = IB_SUCCESS;
cl_qmap_t *p_tbl;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_check_missing_nodes);
+ OSM_LOG_ENTER(&p_osmt->log);
p_tbl = &p_osmt->exp_subn.node_lid_tbl;
@@ -3068,7 +3068,7 @@ static ib_api_status_t osmtest_check_missing_ports(IN osmtest_t * const p_osmt)
cl_status_t status = IB_SUCCESS;
cl_qmap_t *p_tbl;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_check_missing_ports);
+ OSM_LOG_ENTER(&p_osmt->log);
p_tbl = &p_osmt->exp_subn.port_key_tbl;
@@ -3102,7 +3102,7 @@ static ib_api_status_t osmtest_check_missing_paths(IN osmtest_t * const p_osmt)
cl_status_t status = IB_SUCCESS;
cl_qmap_t *p_tbl;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_check_missing_paths);
+ OSM_LOG_ENTER(&p_osmt->log);
p_tbl = &p_osmt->exp_subn.path_tbl;
@@ -3163,7 +3163,7 @@ osmtest_validate_path_data(IN osmtest_t * const p_osmt,
cl_status_t status = IB_SUCCESS;
uint8_t lmc = 0;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_validate_path_data);
+ OSM_LOG_ENTER(&p_osmt->log);
if (osm_log_is_active(&p_osmt->log, OSM_LOG_DEBUG)) {
osm_log(&p_osmt->log, OSM_LOG_ERROR,
@@ -3281,7 +3281,7 @@ osmtest_validate_node_data(IN osmtest_t * const p_osmt,
{
cl_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_validate_node_data);
+ OSM_LOG_ENTER(&p_osmt->log);
if (osm_log_is_active(&p_osmt->log, OSM_LOG_DEBUG)) {
osm_log(&p_osmt->log, OSM_LOG_ERROR,
@@ -3479,7 +3479,7 @@ osmtest_validate_node_rec(IN osmtest_t * const p_osmt,
node_t *p_node;
const cl_qmap_t *p_tbl;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_validate_node_rec);
+ OSM_LOG_ENTER(&p_osmt->log);
/*
* Find proper node record in the database.
@@ -3512,7 +3512,7 @@ osmtest_validate_port_data(IN osmtest_t * const p_osmt,
{
cl_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_validate_port_data);
+ OSM_LOG_ENTER(&p_osmt->log);
if (osm_log_is_active(&p_osmt->log, OSM_LOG_DEBUG)) {
osm_log(&p_osmt->log, OSM_LOG_ERROR,
@@ -4029,7 +4029,7 @@ osmtest_validate_port_rec(IN osmtest_t * const p_osmt,
port_t *p_port;
const cl_qmap_t *p_tbl;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_validate_port_rec);
+ OSM_LOG_ENTER(&p_osmt->log);
/*
* Find proper port record in the database.
@@ -4065,7 +4065,7 @@ osmtest_validate_path_rec(IN osmtest_t * const p_osmt,
path_t *p_path;
const cl_qmap_t *p_tbl;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_validate_path_rec);
+ OSM_LOG_ENTER(&p_osmt->log);
/*
* Find proper path record in the database.
@@ -4102,7 +4102,7 @@ osmtest_validate_all_node_recs(IN osmtest_t * const p_osmt)
cl_status_t status;
size_t num_recs;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_validate_all_node_recs);
+ OSM_LOG_ENTER(&p_osmt->log);
memset(&context, 0, sizeof(context));
@@ -4182,7 +4182,7 @@ osmtest_validate_all_guidinfo_recs(IN osmtest_t * const p_osmt)
cl_status_t status;
size_t num_recs;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_validate_all_guidinfo_recs);
+ OSM_LOG_ENTER(&p_osmt->log);
memset(&context, 0, sizeof(context));
@@ -4235,7 +4235,7 @@ osmtest_validate_all_path_recs(IN osmtest_t * const p_osmt)
cl_status_t status;
size_t num_recs;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_validate_all_path_recs);
+ OSM_LOG_ENTER(&p_osmt->log);
memset(&context, 0, sizeof(context));
@@ -4318,7 +4318,7 @@ osmtest_get_link_rec_by_lid(IN osmtest_t * const p_osmt,
ib_link_record_t record;
ib_mad_t *p_mad;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_get_link_rec_by_lid);
+ OSM_LOG_ENTER(&p_osmt->log);
if (osm_log_is_active(&p_osmt->log, OSM_LOG_VERBOSE)) {
osm_log(&p_osmt->log, OSM_LOG_VERBOSE,
@@ -4406,7 +4406,7 @@ osmtest_get_guidinfo_rec_by_lid(IN osmtest_t * const p_osmt,
ib_guidinfo_record_t record;
ib_mad_t *p_mad;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_get_guidinfo_rec_by_lid);
+ OSM_LOG_ENTER(&p_osmt->log);
if (osm_log_is_active(&p_osmt->log, OSM_LOG_VERBOSE)) {
osm_log(&p_osmt->log, OSM_LOG_VERBOSE,
@@ -4492,7 +4492,7 @@ osmtest_get_pkeytbl_rec_by_lid(IN osmtest_t * const p_osmt,
ib_pkey_table_record_t record;
ib_mad_t *p_mad;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_get_pkeytbl_rec_by_lid);
+ OSM_LOG_ENTER(&p_osmt->log);
if (osm_log_is_active(&p_osmt->log, OSM_LOG_VERBOSE)) {
osm_log(&p_osmt->log, OSM_LOG_VERBOSE,
@@ -4577,7 +4577,7 @@ osmtest_get_sw_info_rec_by_lid(IN osmtest_t * const p_osmt,
ib_switch_info_record_t record;
ib_mad_t *p_mad;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_get_sw_info_rec_by_lid);
+ OSM_LOG_ENTER(&p_osmt->log);
if (osm_log_is_active(&p_osmt->log, OSM_LOG_VERBOSE)) {
osm_log(&p_osmt->log, OSM_LOG_VERBOSE,
@@ -4663,7 +4663,7 @@ osmtest_get_lft_rec_by_lid(IN osmtest_t * const p_osmt,
ib_lft_record_t record;
ib_mad_t *p_mad;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_get_lft_rec_by_lid);
+ OSM_LOG_ENTER(&p_osmt->log);
if (osm_log_is_active(&p_osmt->log, OSM_LOG_VERBOSE)) {
osm_log(&p_osmt->log, OSM_LOG_VERBOSE,
@@ -4748,7 +4748,7 @@ osmtest_get_mft_rec_by_lid(IN osmtest_t * const p_osmt,
ib_mft_record_t record;
ib_mad_t *p_mad;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_get_mft_rec_by_lid);
+ OSM_LOG_ENTER(&p_osmt->log);
if (osm_log_is_active(&p_osmt->log, OSM_LOG_VERBOSE)) {
osm_log(&p_osmt->log, OSM_LOG_VERBOSE,
@@ -4834,7 +4834,7 @@ osmtest_sminfo_record_request(IN osmtest_t * const p_osmt,
ib_mad_t *p_mad;
osmtest_sm_info_rec_t *p_sm_info_opt;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_sminfo_record_request);
+ OSM_LOG_ENTER(&p_osmt->log);
/*
* Do a blocking query for these records in the subnet.
@@ -4937,7 +4937,7 @@ osmtest_informinfo_request(IN osmtest_t * const p_osmt,
osmtest_inform_info_t *p_inform_info_opt;
osmtest_inform_info_rec_t *p_inform_info_rec_opt;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_informinfo_request);
+ OSM_LOG_ENTER(&p_osmt->log);
/*
* Do a blocking query for these records in the subnet.
@@ -5047,7 +5047,7 @@ osmtest_validate_single_path_rec_lid_pair(IN osmtest_t * const p_osmt,
cl_status_t status = IB_SUCCESS;
size_t num_recs;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_validate_single_path_rec_lid_pair);
+ OSM_LOG_ENTER(&p_osmt->log);
memset(&context, 0, sizeof(context));
@@ -5112,7 +5112,7 @@ osmtest_validate_single_node_rec_lid(IN osmtest_t * const p_osmt,
const ib_node_record_t *p_rec;
int num_recs, i;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_validate_single_node_rec_lid);
+ OSM_LOG_ENTER(&p_osmt->log);
if (osm_log_is_active(&p_osmt->log, OSM_LOG_DEBUG)) {
osm_log(&p_osmt->log, OSM_LOG_DEBUG,
@@ -5214,7 +5214,7 @@ osmtest_validate_single_port_rec_lid(IN osmtest_t * const p_osmt,
const ib_portinfo_record_t *p_rec;
cl_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_validate_single_port_rec_lid);
+ OSM_LOG_ENTER(&p_osmt->log);
memset(&context, 0, sizeof(context));
@@ -5269,7 +5269,7 @@ osmtest_validate_single_path_rec_guid_pair(IN osmtest_t * const p_osmt,
uint32_t i;
boolean_t got_error = FALSE;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_validate_single_path_rec_guid_pair);
+ OSM_LOG_ENTER(&p_osmt->log);
memset(&req, 0, sizeof(req));
memset(&context, 0, sizeof(context));
@@ -5399,7 +5399,7 @@ osmtest_validate_single_path_recs(IN osmtest_t * const p_osmt)
osmv_guid_pair_t guid_pair;
uint16_t cnt;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_validate_single_path_recs);
+ OSM_LOG_ENTER(&p_osmt->log);
if (osm_log_is_active(&p_osmt->log, OSM_LOG_VERBOSE)) {
osm_log(&p_osmt->log, OSM_LOG_VERBOSE,
@@ -5491,7 +5491,7 @@ osmtest_validate_single_node_recs(IN osmtest_t * const p_osmt)
const cl_qmap_t *p_node_lid_tbl;
uint16_t cnt = 0;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_validate_single_node_recs);
+ OSM_LOG_ENTER(&p_osmt->log);
p_node_lid_tbl = &p_osmt->exp_subn.node_lid_tbl;
@@ -5553,7 +5553,7 @@ osmtest_validate_single_port_recs(IN osmtest_t * const p_osmt)
const cl_qmap_t *p_port_key_tbl;
uint16_t cnt = 0;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_validate_single_port_recs);
+ OSM_LOG_ENTER(&p_osmt->log);
p_port_key_tbl = &p_osmt->exp_subn.port_key_tbl;
@@ -5623,7 +5623,7 @@ static ib_api_status_t osmtest_validate_against_db(IN osmtest_t * const p_osmt)
uint8_t i;
#endif
- OSM_LOG_ENTER(&p_osmt->log, osmtest_validate_against_db);
+ OSM_LOG_ENTER(&p_osmt->log);
#ifdef VENDOR_RMPP_SUPPORT
status = osmtest_validate_all_node_recs(p_osmt);
@@ -6421,7 +6421,7 @@ osmtest_parse_node(IN osmtest_t * const p_osmt,
node_t *p_guid_node;
const osmtest_token_t *p_tok;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_parse_node);
+ OSM_LOG_ENTER(&p_osmt->log);
p_node = node_new();
CL_ASSERT(p_node != NULL);
@@ -6701,7 +6701,7 @@ osmtest_parse_port(IN osmtest_t * const p_osmt,
port_t *p_port;
const osmtest_token_t *p_tok;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_parse_port);
+ OSM_LOG_ENTER(&p_osmt->log);
p_port = port_new();
CL_ASSERT(p_port != NULL);
@@ -7244,7 +7244,7 @@ osmtest_parse_path(IN osmtest_t * const p_osmt,
const osmtest_token_t *p_tok;
boolean_t got_error = FALSE;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_parse_path);
+ OSM_LOG_ENTER(&p_osmt->log);
p_path = path_new();
CL_ASSERT(p_path != NULL);
@@ -7435,7 +7435,7 @@ osmtest_parse_link(IN osmtest_t * const p_osmt,
const osmtest_token_t *p_tok;
boolean_t got_error = FALSE;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_parse_link);
+ OSM_LOG_ENTER(&p_osmt->log);
/*
* Parse the inventory file and create the database.
@@ -7522,7 +7522,7 @@ static ib_api_status_t osmtest_create_db(IN osmtest_t * const p_osmt)
const osmtest_token_t *p_tok;
boolean_t got_error = FALSE;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_create_db);
+ OSM_LOG_ENTER(&p_osmt->log);
fh = fopen(p_osmt->opt.file_name, "r");
if (fh == NULL) {
@@ -7625,7 +7625,7 @@ osmtest_get_user_port(IN osmtest_t * const p_osmt,
uint32_t choice = 0;
boolean_t done_flag = FALSE;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_get_user_port);
+ OSM_LOG_ENTER(&p_osmt->log);
/*
* User needs prompting for the local port GUID with which
@@ -7672,7 +7672,7 @@ osmtest_bind(IN osmtest_t * p_osmt,
uint32_t num_ports = GUID_ARRAY_SIZE;
ib_port_attr_t attr_array[GUID_ARRAY_SIZE];
- OSM_LOG_ENTER(&p_osmt->log, osmtest_bind);
+ OSM_LOG_ENTER(&p_osmt->log);
/*
* Call the transport layer for a list of local port
@@ -7752,7 +7752,7 @@ ib_api_status_t osmtest_run(IN osmtest_t * const p_osmt)
{
ib_api_status_t status = IB_SUCCESS;
- OSM_LOG_ENTER(&p_osmt->log, osmtest_run);
+ OSM_LOG_ENTER(&p_osmt->log);
status = osmtest_validate_sa_class_port_info(p_osmt);
if (status != IB_SUCCESS) {
--
1.5.4.rc5
More information about the general
mailing list