---
src/plm/agent/plma_api.c | 37 +++++++++++++++++++------------------
src/plm/agent/plma_comm.c | 2 +-
src/plm/agent/plma_init.c | 10 +++++-----
src/plm/agent/plma_mds.c | 10 +++++-----
4 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/src/plm/agent/plma_api.c b/src/plm/agent/plma_api.c
index 8203e2b..a72941f 100644
--- a/src/plm/agent/plma_api.c
+++ b/src/plm/agent/plma_api.c
@@ -181,7 +181,7 @@ end:
if (msg) {
plms_free_evt(msg);
}
- TRACE_LEAVE();
+ TRACE_LEAVE2("%d", proc_rc);
return proc_rc;
}
@@ -271,7 +271,7 @@ uint32_t plm_process_dispatch_all(PLMA_CLIENT_INFO
*client_info)
plms_free_evt(msg);
}
- TRACE_LEAVE();
+ TRACE_LEAVE2("%d", proc_rc);
return proc_rc;
}
@@ -360,7 +360,7 @@ uint32_t plm_process_blocking_dispatch(PLMA_CLIENT_INFO
*client_info)
plms_free_evt(msg);
}
- TRACE_LEAVE();
+ TRACE_LEAVE2("%d", proc_rc);
return proc_rc;
}
@@ -390,7 +390,7 @@ uint32_t plm_process_dispatch_cbk(PLMA_CLIENT_INFO
*client_info,
proc_rc = NCSCC_RC_FAILURE;
break;
}
- TRACE_LEAVE();
+ TRACE_LEAVE2("%d", proc_rc);
return proc_rc;
}
@@ -594,7 +594,7 @@ end:
plms_free_evt(plm_init_resp);
}
- TRACE_LEAVE();
+ TRACE_LEAVE2("%d", rc);
return rc;
}
@@ -666,7 +666,7 @@ SaUint32T saPlmSelectionObjectGet(SaPlmHandleT plmHandle,
TRACE_5("selection object got : %Lu", *selectionObject);
end:
- TRACE_LEAVE();
+ TRACE_LEAVE2("%d", rc);
return rc;
}
@@ -728,7 +728,7 @@ SaAisErrorT saPlmDispatch(SaPlmHandleT plmHandle,
SaDispatchFlagsT flags)
}
end:
- TRACE_LEAVE();
+ TRACE_LEAVE2("%d", rc);
return rc;
}
@@ -888,7 +888,7 @@ end:
plms_free_evt(plm_fin_resp);
}
- TRACE_LEAVE();
+ TRACE_LEAVE2("%d", rc);
return rc;
}
@@ -1082,7 +1082,7 @@ end:
if (plm_out_res) {
plms_free_evt(plm_out_res);
}
- TRACE_LEAVE();
+ TRACE_LEAVE2("%d", rc);
return rc;
/*return err code */
}
@@ -1114,7 +1114,7 @@ SaAisErrorT saPlmEntityGroupAdd(SaPlmEntityGroupHandleT
entityGroupHandle,
PLMA_ENTITY_GROUP_INFO *group_info;
uint32_t ii, i;
- TRACE_ENTER();
+ TRACE_ENTER2("%d", options);
if (!plma_cb) {
LOG_ER("PLMA : PLMA INITIALIZE IS NOT DONE");
rc = SA_AIS_ERR_BAD_HANDLE;
@@ -1248,7 +1248,7 @@ end:
if (plm_out_res) {
plms_free_evt(plm_out_res);
}
- TRACE_LEAVE();
+ TRACE_LEAVE2("%d", rc);
return rc;
}
@@ -1400,7 +1400,7 @@ end:
if (plm_out_res) {
plms_free_evt(plm_out_res);
}
- TRACE_LEAVE();
+ TRACE_LEAVE2("%d", rc);
/* return error */
return rc;
}
@@ -1567,7 +1567,7 @@ end:
if (plm_out_res) {
plms_free_evt(plm_out_res);
}
- TRACE_LEAVE();
+ TRACE_LEAVE2("%d", rc);
/* return error */
return rc;
}
@@ -1848,7 +1848,7 @@ end:
if (plm_out_res) {
plms_free_evt(plm_out_res);
}
- TRACE_LEAVE();
+ TRACE_LEAVE2("%d", rc);
return rc;
}
@@ -1925,6 +1925,7 @@ SaAisErrorT
saPlmReadinessTrackResponse(SaPlmEntityGroupHandleT entityGrpHdl,
plm_in_evt.req_evt.agent_track.track_cbk_res.invocation_id = invocation;
plm_in_evt.req_evt.agent_track.track_cbk_res.response = response;
+ TRACE_5("%d", response);
/* Send a mds async msg to PLMS to obtain group handle for this */
proc_rc = plms_mds_normal_send(plma_cb->mds_hdl, NCSMDS_SVC_ID_PLMA,
&plm_in_evt, plma_cb->plms_mdest_id,
@@ -1937,7 +1938,7 @@ SaAisErrorT
saPlmReadinessTrackResponse(SaPlmEntityGroupHandleT entityGrpHdl,
goto end;
}
end:
- TRACE_LEAVE();
+ TRACE_LEAVE2("%d", rc);
return rc;
}
@@ -2051,7 +2052,7 @@ end:
if (plm_out_res) {
plms_free_evt(plm_out_res);
}
- TRACE_LEAVE();
+ TRACE_LEAVE2("%d", rc);
return rc;
}
@@ -2159,7 +2160,7 @@ saPlmReadinessNotificationFree(SaPlmEntityGroupHandleT
entityGroupHandle,
}
free(entities);
end:
- TRACE_LEAVE();
+ TRACE_LEAVE2("%d", rc);
return rc;
}
@@ -2286,6 +2287,6 @@ end:
if (plm_out_res) {
free(plm_out_res);
}
- TRACE_LEAVE();
+ TRACE_LEAVE2("%d", rc);
return rc;
}
diff --git a/src/plm/agent/plma_comm.c b/src/plm/agent/plma_comm.c
index 119d496..94306be 100644
--- a/src/plm/agent/plma_comm.c
+++ b/src/plm/agent/plma_comm.c
@@ -44,7 +44,7 @@ uint32_t plma_callback_ipc_init(PLMA_CLIENT_INFO *client_info)
rc = NCSCC_RC_FAILURE;
}
- TRACE_LEAVE();
+ TRACE_LEAVE2("%d", rc);
return rc;
}
diff --git a/src/plm/agent/plma_init.c b/src/plm/agent/plma_init.c
index 1930680..64abb07 100644
--- a/src/plm/agent/plma_init.c
+++ b/src/plm/agent/plma_init.c
@@ -117,7 +117,7 @@ uint32_t plma_client_tree_destroy()
free(client_node);
}
}
- TRACE_LEAVE();
+ TRACE_LEAVE2("%d", rc);
return rc;
}
@@ -155,7 +155,7 @@ uint32_t plma_group_tree_destroy()
free(grp_info_node);
}
}
- TRACE_LEAVE();
+ TRACE_LEAVE2("%d", rc);
return rc;
}
@@ -240,7 +240,7 @@ lock_fail:
/** make reference to plma_cb obsolete */
plma_ctrlblk = NULL;
end:
- TRACE_LEAVE();
+ TRACE_LEAVE2("%d",rc);
return rc;
}
@@ -301,7 +301,7 @@ uint32_t plma_lib_req(NCS_LIB_REQ_INFO *req_info)
default:
break;
}
- TRACE_LEAVE();
+ TRACE_LEAVE2("%d", rc);
return rc;
}
@@ -367,6 +367,6 @@ uint32_t ncs_plma_shutdown()
osaf_mutex_unlock_ordie(&s_agent_startup_mutex);
- TRACE_LEAVE();
+ TRACE_LEAVE2("%d", rc);
return rc;
}
diff --git a/src/plm/agent/plma_mds.c b/src/plm/agent/plma_mds.c
index 0f60812..8a3f476 100644
--- a/src/plm/agent/plma_mds.c
+++ b/src/plm/agent/plma_mds.c
@@ -56,7 +56,7 @@ uint32_t plma_mds_get_handle()
TRACE_5("PLM agent handle got : %d", plma_cb->mds_hdl);
TRACE_5("PLM agent mdest ID got : %" PRIu64, plma_cb->mdest_id);
- TRACE_LEAVE();
+ TRACE_LEAVE2("%d", rc);
return rc;
}
@@ -114,7 +114,7 @@ uint32_t plma_mds_register()
plma_mds_unregister();
return NCSCC_RC_FAILURE;
}
- TRACE_LEAVE();
+ TRACE_LEAVE2("%d", rc);
return rc;
}
@@ -183,7 +183,7 @@ uint32_t plma_mds_callback(struct ncsmds_callback_info
*info)
rc = NCSCC_RC_FAILURE;
break;
}
- TRACE_LEAVE();
+ TRACE_LEAVE2("%d", rc);
return rc;
}
@@ -238,7 +238,7 @@ static uint32_t plma_mds_rcv(MDS_CALLBACK_RECEIVE_INFO
*rcv_info)
}
}
}
- TRACE_LEAVE();
+ TRACE_LEAVE2("%d", rc);
return rc;
}
@@ -285,7 +285,7 @@ static uint32_t
plma_mds_svc_evt(MDS_CALLBACK_SVC_EVENT_INFO *svc_evt)
break;
}
- TRACE_LEAVE();
+ TRACE_LEAVE2("%d", rc);
return rc;
}
--
2.7.4
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
