osaf/services/saf/amf/amfd/app.cc | 1 +
osaf/services/saf/amf/amfd/apptype.cc | 2 ++
osaf/services/saf/amf/amfd/chkop.cc | 2 ++
osaf/services/saf/amf/amfd/ckpt_enc.cc | 3 +++
osaf/services/saf/amf/amfd/comp.cc | 5 ++++-
osaf/services/saf/amf/amfd/compcstype.cc | 2 ++
osaf/services/saf/amf/amfd/comptype.cc | 1 +
osaf/services/saf/amf/amfd/csi.cc | 2 ++
osaf/services/saf/amf/amfd/cstype.cc | 1 +
osaf/services/saf/amf/amfd/ctcstype.cc | 1 +
osaf/services/saf/amf/amfd/ndfsm.cc | 2 ++
osaf/services/saf/amf/amfd/ndmsg.cc | 3 +++
osaf/services/saf/amf/amfd/node.cc | 1 +
osaf/services/saf/amf/amfd/nodegroup.cc | 2 ++
osaf/services/saf/amf/amfd/ntf.cc | 6 ++++++
osaf/services/saf/amf/amfd/sg.cc | 4 ++++
osaf/services/saf/amf/amfd/sgtype.cc | 1 +
osaf/services/saf/amf/amfd/si.cc | 2 ++
osaf/services/saf/amf/amfd/siass.cc | 3 ++-
osaf/services/saf/amf/amfd/su.cc | 2 ++
osaf/services/saf/amf/amfd/sutcomptype.cc | 1 +
osaf/services/saf/amf/amfd/sutype.cc | 2 ++
osaf/services/saf/amf/amfd/svctypecstypes.cc | 1 +
osaf/services/saf/amf/amfd/timer.cc | 8 +++++++-
osaf/services/saf/amf/amfd/util.cc | 23 +++++++++++++++++++++--
25 files changed, 76 insertions(+), 5 deletions(-)
diff --git a/osaf/services/saf/amf/amfd/app.cc
b/osaf/services/saf/amf/amfd/app.cc
--- a/osaf/services/saf/amf/amfd/app.cc
+++ b/osaf/services/saf/amf/amfd/app.cc
@@ -223,6 +223,7 @@ AVD_APP *avd_app_create(const SaNameT *d
app->saAmfApplicationAdminState = SA_AMF_ADMIN_UNLOCKED;
}
+ TRACE_LEAVE();
return app;
}
diff --git a/osaf/services/saf/amf/amfd/apptype.cc
b/osaf/services/saf/amf/amfd/apptype.cc
--- a/osaf/services/saf/amf/amfd/apptype.cc
+++ b/osaf/services/saf/amf/amfd/apptype.cc
@@ -136,6 +136,8 @@ static AVD_APP_TYPE *apptype_create(SaNa
if (rc != 0)
apptype_delete(&app_type);
+ TRACE_LEAVE();
+
return app_type;
}
diff --git a/osaf/services/saf/amf/amfd/chkop.cc
b/osaf/services/saf/amf/amfd/chkop.cc
--- a/osaf/services/saf/amf/amfd/chkop.cc
+++ b/osaf/services/saf/amf/amfd/chkop.cc
@@ -770,12 +770,14 @@ uint32_t avd_avnd_send_role_change(AVD_C
--(node->snd_msg_id);
LOG_ER("%s: avd_d2n_msg_snd failed", __FUNCTION__);
//TODO(UABHANO)d2n_msg_free(d2n_msg);
+ TRACE_LEAVE();
return NCSCC_RC_FAILURE;
}
m_AVSV_SEND_CKPT_UPDT_ASYNC_UPDT(cb, node, AVSV_CKPT_AVND_SND_MSG_ID);
done:
+ TRACE_LEAVE();
return NCSCC_RC_SUCCESS;
}
diff --git a/osaf/services/saf/amf/amfd/ckpt_enc.cc
b/osaf/services/saf/amf/amfd/ckpt_enc.cc
--- a/osaf/services/saf/amf/amfd/ckpt_enc.cc
+++ b/osaf/services/saf/amf/amfd/ckpt_enc.cc
@@ -501,6 +501,8 @@ static void encode_si(const AVD_CL_CB *c
if (peer_version >= ver_compare) {
osaf_encode_uint32(ub, si->si_dep_state);
}
+
+ TRACE_LEAVE();
}
/****************************************************************************\
@@ -1889,6 +1891,7 @@ static uint32_t enc_comp_restart_count(A
uint32_t avd_enc_cold_sync_rsp(AVD_CL_CB *cb, NCS_MBCSV_CB_ENC *enc)
{
TRACE_ENTER();
+ TRACE_LEAVE();
return entire_data_update(cb, enc, true);
}
diff --git a/osaf/services/saf/amf/amfd/comp.cc
b/osaf/services/saf/amf/amfd/comp.cc
--- a/osaf/services/saf/amf/amfd/comp.cc
+++ b/osaf/services/saf/amf/amfd/comp.cc
@@ -130,7 +130,7 @@ void avd_comp_pres_state_set(AVD_COMP *c
node->name.value,comp->comp_info.name.value);
avd_d2n_reboot_snd(node);
}
-
+ TRACE_LEAVE();
}
void avd_comp_oper_state_set(AVD_COMP *comp, SaAmfOperationalStateT oper_state)
@@ -143,6 +143,7 @@ void avd_comp_oper_state_set(AVD_COMP *c
avd_saImmOiRtObjectUpdate(&comp->comp_info.name, "saAmfCompOperState",
SA_IMM_ATTR_SAUINT32T, &comp->saAmfCompOperState);
m_AVSV_SEND_CKPT_UPDT_ASYNC_UPDT(avd_cb, comp,
AVSV_CKPT_COMP_OPER_STATE);
+ TRACE_LEAVE();
}
void avd_comp_readiness_state_set(AVD_COMP *comp, SaAmfReadinessStateT
readiness_state)
@@ -158,6 +159,7 @@ void avd_comp_readiness_state_set(AVD_CO
avd_saImmOiRtObjectUpdate(&comp->comp_info.name,
"saAmfCompReadinessState",
SA_IMM_ATTR_SAUINT32T, &comp->saAmfCompReadinessState);
m_AVSV_SEND_CKPT_UPDT_ASYNC_UPDT(avd_cb, comp,
AVSV_CKPT_COMP_READINESS_STATE);
+ TRACE_LEAVE();
}
void avd_comp_proxy_status_change(AVD_COMP *comp, SaAmfProxyStatusT
proxy_status)
@@ -632,6 +634,7 @@ done:
comp = NULL;
}
+ TRACE_LEAVE();
return comp;
}
diff --git a/osaf/services/saf/amf/amfd/compcstype.cc
b/osaf/services/saf/amf/amfd/compcstype.cc
--- a/osaf/services/saf/amf/amfd/compcstype.cc
+++ b/osaf/services/saf/amf/amfd/compcstype.cc
@@ -107,6 +107,7 @@ AVD_COMPCS_TYPE * avd_compcstype_find_ma
avsv_create_association_class_dn(cstype_name, &comp->comp_info.name,
"safSupportedCsType", &dn);
TRACE("'%s'", dn.value);
cst = compcstype_db->find(Amf::to_string(&dn));
+ TRACE_LEAVE();
return cst;
}
@@ -263,6 +264,7 @@ done:
compcstype_db->erase(Amf::to_string(&compcstype->name));
delete [] cstype_name;
+ TRACE_LEAVE();
return compcstype;
}
diff --git a/osaf/services/saf/amf/amfd/comptype.cc
b/osaf/services/saf/amf/amfd/comptype.cc
--- a/osaf/services/saf/amf/amfd/comptype.cc
+++ b/osaf/services/saf/amf/amfd/comptype.cc
@@ -141,6 +141,7 @@ static AVD_COMP_TYPE *comptype_create(co
(void)immutil_getAttr(const_cast<SaImmAttrNameT>("saAmfCtDefDisableRestart"),
attributes, 0, &compt->saAmfCtDefDisableRestart);
+ TRACE_LEAVE();
return compt;
}
diff --git a/osaf/services/saf/amf/amfd/csi.cc
b/osaf/services/saf/amf/amfd/csi.cc
--- a/osaf/services/saf/amf/amfd/csi.cc
+++ b/osaf/services/saf/amf/amfd/csi.cc
@@ -290,6 +290,8 @@ AVD_CSI *csi_create(const SaNameT *csi_n
if (csi_db->insert(Amf::to_string(&csi->name), csi) != NCSCC_RC_SUCCESS)
osafassert(0);
+ TRACE_LEAVE();
+
return csi;
}
/**
diff --git a/osaf/services/saf/amf/amfd/cstype.cc
b/osaf/services/saf/amf/amfd/cstype.cc
--- a/osaf/services/saf/amf/amfd/cstype.cc
+++ b/osaf/services/saf/amf/amfd/cstype.cc
@@ -62,6 +62,7 @@ static avd_cstype_t *cstype_create(const
cst->saAmfCSAttrName[i] =
StrDup(immutil_getStringAttr(attributes, "saAmfCSAttrName", i));
}
+ TRACE_LEAVE();
return cst;
}
diff --git a/osaf/services/saf/amf/amfd/ctcstype.cc
b/osaf/services/saf/amf/amfd/ctcstype.cc
--- a/osaf/services/saf/amf/amfd/ctcstype.cc
+++ b/osaf/services/saf/amf/amfd/ctcstype.cc
@@ -116,6 +116,7 @@ static AVD_CTCS_TYPE *ctcstype_create(co
delete ctcstype;
ctcstype = NULL;
}
+ TRACE_LEAVE();
return ctcstype;
}
diff --git a/osaf/services/saf/amf/amfd/ndfsm.cc
b/osaf/services/saf/amf/amfd/ndfsm.cc
--- a/osaf/services/saf/amf/amfd/ndfsm.cc
+++ b/osaf/services/saf/amf/amfd/ndfsm.cc
@@ -195,6 +195,7 @@ void avd_nd_ncs_su_assigned(AVD_CL_CB *c
while (ncs_su != NULL) {
if ((ncs_su->list_of_susi == AVD_SU_SI_REL_NULL) ||
(ncs_su->list_of_susi->fsm != AVD_SU_SI_STATE_ASGND)) {
+ TRACE_LEAVE();
/* this is an unassigned SU so no need to scan further
return here. */
return;
}
@@ -242,6 +243,7 @@ void avd_nd_ncs_su_assigned(AVD_CL_CB *c
/* if (avnd->node_state != AVD_AVND_STATE_PRESENT) */
m_AVSV_SEND_CKPT_UPDT_ASYNC_UPDT(cb, avnd, AVSV_CKPT_AVND_NODE_STATE);
m_AVSV_SEND_CKPT_UPDT_ASYNC_UPDT(cb, cb, AVSV_CKPT_AVD_CB_CONFIG);
+ TRACE_LEAVE();
}
/*****************************************************************************
diff --git a/osaf/services/saf/amf/amfd/ndmsg.cc
b/osaf/services/saf/amf/amfd/ndmsg.cc
--- a/osaf/services/saf/amf/amfd/ndmsg.cc
+++ b/osaf/services/saf/amf/amfd/ndmsg.cc
@@ -346,6 +346,7 @@ uint32_t avd_n2d_msg_rcv(AVD_DND_MSG *rc
if (rcv_msg == NULL) {
LOG_ER("%s: no msg", __FUNCTION__);
+ TRACE_LEAVE();
return NCSCC_RC_FAILURE;
}
@@ -366,8 +367,10 @@ uint32_t avd_n2d_msg_rcv(AVD_DND_MSG *rc
avsv_dnd_msg_free(rcv_msg);
evt->info.avnd_msg = NULL;
delete evt;
+ TRACE_LEAVE();
return NCSCC_RC_FAILURE;
}
+ TRACE_LEAVE();
return NCSCC_RC_SUCCESS;
}
diff --git a/osaf/services/saf/amf/amfd/node.cc
b/osaf/services/saf/amf/amfd/node.cc
--- a/osaf/services/saf/amf/amfd/node.cc
+++ b/osaf/services/saf/amf/amfd/node.cc
@@ -348,6 +348,7 @@ void avd_node_state_set(AVD_AVND *node,
node_state_name[node_state]);
node->node_state = node_state;
m_AVSV_SEND_CKPT_UPDT_ASYNC_UPDT(avd_cb, node,
AVSV_CKPT_AVND_NODE_STATE);
+ TRACE_LEAVE();
}
/**
diff --git a/osaf/services/saf/amf/amfd/nodegroup.cc
b/osaf/services/saf/amf/amfd/nodegroup.cc
--- a/osaf/services/saf/amf/amfd/nodegroup.cc
+++ b/osaf/services/saf/amf/amfd/nodegroup.cc
@@ -165,6 +165,8 @@ done:
delete ng;
ng = NULL;
}
+
+ TRACE_LEAVE();
return ng;
}
diff --git a/osaf/services/saf/amf/amfd/ntf.cc
b/osaf/services/saf/amf/amfd/ntf.cc
--- a/osaf/services/saf/amf/amfd/ntf.cc
+++ b/osaf/services/saf/amf/amfd/ntf.cc
@@ -222,6 +222,7 @@ void avd_send_admin_state_chg_ntf(const
NULL,
false);
+ TRACE_LEAVE();
}
/*****************************************************************************
@@ -257,6 +258,7 @@ void avd_send_oper_chg_ntf(const SaNameT
new_state,
NULL,
false);
+ TRACE_LEAVE();
}
/*****************************************************************************
@@ -293,6 +295,7 @@ void avd_send_su_pres_state_chg_ntf(cons
NULL,
false);
+ TRACE_LEAVE();
}
/*****************************************************************************
@@ -332,6 +335,8 @@ void avd_send_su_ha_state_chg_ntf(const
(NCSCONTEXT)si_name,
true /* Si_name */);
+ TRACE_LEAVE();
+
}
/*****************************************************************************
@@ -404,6 +409,7 @@ void avd_send_si_assigned_ntf(const SaNa
NULL,
false);
+ TRACE_LEAVE();
}
/*****************************************************************************
diff --git a/osaf/services/saf/amf/amfd/sg.cc b/osaf/services/saf/amf/amfd/sg.cc
--- a/osaf/services/saf/amf/amfd/sg.cc
+++ b/osaf/services/saf/amf/amfd/sg.cc
@@ -413,6 +413,8 @@ static AVD_SG *sg_create(const SaNameT *
sg = NULL;
}
+ TRACE_LEAVE();
+
return sg;
}
@@ -1663,6 +1665,7 @@ void AVD_SG::set_admin_state(SaAmfAdminS
avd_send_admin_state_chg_ntf(&name, SA_AMF_NTFID_SG_ADMIN_STATE,
old_state,
saAmfSGAdminState);
+ TRACE_LEAVE();
}
void AVD_SG::set_fsm_state(AVD_SG_FSM_STATE state) {
@@ -1826,6 +1829,7 @@ uint32_t sg_instantiated_su_count(const
uint32_t inst_su_count;
AVD_SU *su;
+ TRACE_ENTER();
for (su = sg->list_of_su, inst_su_count = 0; su != NULL; su =
su->sg_list_su_next) {
TRACE_1("su'%s', pres state'%u', in_serv'%u', PrefIn'%u'",
su->name.value,
su->saAmfSUPresenceState,
su->saAmfSuReadinessState, sg->saAmfSGNumPrefInserviceSUs);
diff --git a/osaf/services/saf/amf/amfd/sgtype.cc
b/osaf/services/saf/amf/amfd/sgtype.cc
--- a/osaf/services/saf/amf/amfd/sgtype.cc
+++ b/osaf/services/saf/amf/amfd/sgtype.cc
@@ -249,6 +249,7 @@ static AVD_AMF_SG_TYPE *sgtype_create(Sa
sgt = NULL;
}
+ TRACE_LEAVE();
return sgt;
}
diff --git a/osaf/services/saf/amf/amfd/si.cc b/osaf/services/saf/amf/amfd/si.cc
--- a/osaf/services/saf/amf/amfd/si.cc
+++ b/osaf/services/saf/amf/amfd/si.cc
@@ -644,6 +644,7 @@ done:
si = NULL;
}
+ TRACE_LEAVE();
return si;
}
@@ -1420,6 +1421,7 @@ void AVD_SI::set_admin_state(SaAmfAdminS
SA_IMM_ATTR_SAUINT32T, &saAmfSIAdminState);
m_AVSV_SEND_CKPT_UPDT_ASYNC_UPDT(avd_cb, this,
AVSV_CKPT_SI_ADMIN_STATE);
avd_send_admin_state_chg_ntf(&name, SA_AMF_NTFID_SI_ADMIN_STATE,
old_state, saAmfSIAdminState);
+ TRACE_LEAVE();
}
void AVD_SI::set_si_switch(AVD_CL_CB *cb, const SaToggleState state)
diff --git a/osaf/services/saf/amf/amfd/siass.cc
b/osaf/services/saf/amf/amfd/siass.cc
--- a/osaf/services/saf/amf/amfd/siass.cc
+++ b/osaf/services/saf/amf/amfd/siass.cc
@@ -455,7 +455,8 @@ uint32_t avd_gen_su_ha_state_changed_ntf
/* alarm & notifications */
avd_send_su_ha_state_chg_ntf(&susi->su->name, &susi->si->name,
static_cast<SaAmfHAStateT>(SA_FALSE), susi->state); /*old state not known*/
-
+
+ TRACE_LEAVE();
return status;
}
/**
diff --git a/osaf/services/saf/amf/amfd/su.cc b/osaf/services/saf/amf/amfd/su.cc
--- a/osaf/services/saf/amf/amfd/su.cc
+++ b/osaf/services/saf/amf/amfd/su.cc
@@ -767,6 +767,7 @@ void AVD_SU::set_pres_state(SaAmfPresenc
avd_saImmOiRtObjectUpdate(&name, "saAmfSUPresenceState",
SA_IMM_ATTR_SAUINT32T, &saAmfSUPresenceState);
m_AVSV_SEND_CKPT_UPDT_ASYNC_UPDT(avd_cb, this, AVSV_CKPT_SU_PRES_STATE);
+ TRACE_LEAVE();
}
void AVD_SU::set_oper_state(SaAmfOperationalStateT oper_state) {
@@ -854,6 +855,7 @@ void AVD_SU::set_admin_state(SaAmfAdminS
m_AVSV_SEND_CKPT_UPDT_ASYNC_UPDT(avd_cb, this,
AVSV_CKPT_SU_ADMIN_STATE);
avd_send_admin_state_chg_ntf(&name, SA_AMF_NTFID_SU_ADMIN_STATE,
old_state, saAmfSUAdminState);
+ TRACE_LEAVE();
}
void AVD_SU::unlock(SaImmOiHandleT immoi_handle, SaInvocationT invocation) {
diff --git a/osaf/services/saf/amf/amfd/sutcomptype.cc
b/osaf/services/saf/amf/amfd/sutcomptype.cc
--- a/osaf/services/saf/amf/amfd/sutcomptype.cc
+++ b/osaf/services/saf/amf/amfd/sutcomptype.cc
@@ -49,6 +49,7 @@ static AVD_SUTCOMP_TYPE *sutcomptype_cre
if
(immutil_getAttr(const_cast<SaImmAttrNameT>("saAmfSutMinNumComponents"),
attributes, 0, &sutcomptype->saAmfSutMinNumComponents) != SA_AIS_OK)
sutcomptype->saAmfSutMinNumComponents = 1;
+ TRACE_LEAVE();
return sutcomptype;
}
diff --git a/osaf/services/saf/amf/amfd/sutype.cc
b/osaf/services/saf/amf/amfd/sutype.cc
--- a/osaf/services/saf/amf/amfd/sutype.cc
+++ b/osaf/services/saf/amf/amfd/sutype.cc
@@ -98,6 +98,8 @@ static struct avd_sutype *sutype_create(
if (rc != 0)
sutype_delete(&sutype);
+ TRACE_LEAVE();
+
return sutype;
}
diff --git a/osaf/services/saf/amf/amfd/svctypecstypes.cc
b/osaf/services/saf/amf/amfd/svctypecstypes.cc
--- a/osaf/services/saf/amf/amfd/svctypecstypes.cc
+++ b/osaf/services/saf/amf/amfd/svctypecstypes.cc
@@ -45,6 +45,7 @@ static AVD_SVC_TYPE_CS_TYPE *svctypecsty
if (immutil_getAttr(const_cast<SaImmAttrNameT>("saAmfSvctMaxNumCSIs"),
attributes, 0, &svctypecstype->saAmfSvctMaxNumCSIs) != SA_AIS_OK)
svctypecstype->saAmfSvctMaxNumCSIs = -1; /* no limit */
+ TRACE_LEAVE();
return svctypecstype;
}
diff --git a/osaf/services/saf/amf/amfd/timer.cc
b/osaf/services/saf/amf/amfd/timer.cc
--- a/osaf/services/saf/amf/amfd/timer.cc
+++ b/osaf/services/saf/amf/amfd/timer.cc
@@ -69,6 +69,7 @@ uint32_t avd_start_tmr(AVD_CL_CB *cb, AV
if (AVD_TMR_MAX <= tmr->type) {
LOG_EM("%s:%u: %u", __FILE__, __LINE__, tmr->type);
+ TRACE_LEAVE();
return NCSCC_RC_FAILURE;
}
@@ -87,9 +88,12 @@ uint32_t avd_start_tmr(AVD_CL_CB *cb, AV
tmr->is_active = true;
- if (TMR_T_NULL == tmr->tmr_id)
+ if (TMR_T_NULL == tmr->tmr_id) {
+ TRACE_LEAVE();
return NCSCC_RC_FAILURE;
+ }
+ TRACE_LEAVE();
return NCSCC_RC_SUCCESS;
}
@@ -111,6 +115,7 @@ void avd_stop_tmr(AVD_CL_CB *cb, AVD_TMR
/* If timer type is invalid just return */
if (AVD_TMR_MAX <= tmr->type) {
LOG_EM("%s:%u: %u", __FILE__, __LINE__, tmr->type);
+ TRACE_LEAVE();
return;
}
@@ -125,6 +130,7 @@ void avd_stop_tmr(AVD_CL_CB *cb, AVD_TMR
m_NCS_TMR_DESTROY(tmr->tmr_id);
tmr->tmr_id = TMR_T_NULL;
}
+ TRACE_LEAVE();
}
/*****************************************************************************
diff --git a/osaf/services/saf/amf/amfd/util.cc
b/osaf/services/saf/amf/amfd/util.cc
--- a/osaf/services/saf/amf/amfd/util.cc
+++ b/osaf/services/saf/amf/amfd/util.cc
@@ -272,9 +272,11 @@ uint32_t avd_snd_node_up_msg(AVD_CL_CB *
if (avd_d2n_msg_snd(cb, avnd, d2n_msg) != NCSCC_RC_SUCCESS) {
LOG_ER("%s: snd to %x failed", __FUNCTION__,
avnd->node_info.nodeId);
d2n_msg_free(d2n_msg);
+ TRACE_LEAVE();
return NCSCC_RC_FAILURE;
}
+ TRACE_LEAVE();
return NCSCC_RC_SUCCESS;
}
@@ -663,6 +665,7 @@ static uint32_t avd_prep_csi_attr_info(A
attr_ptr = attr_ptr->attr_next;
}
+ TRACE_LEAVE();
return NCSCC_RC_SUCCESS;
}
@@ -719,8 +722,10 @@ uint32_t avd_snd_susi_msg(AVD_CL_CB *cb,
/* Need not proceed further if node is not in proper state */
if ((avnd->node_state == AVD_AVND_STATE_ABSENT) ||
- (avnd->node_state == AVD_AVND_STATE_GO_DOWN))
+ (avnd->node_state == AVD_AVND_STATE_GO_DOWN)) {
+ TRACE_LEAVE();
return NCSCC_RC_SUCCESS;
+ }
/* Initialize the local variables to avoid warnings */
l_susi = susi;
@@ -794,6 +799,7 @@ uint32_t avd_snd_susi_msg(AVD_CL_CB *cb,
LOG_EM("%s:%u: %u", __FILE__, __LINE__, 0);
/* free the SUSI message */
d2n_msg_free(susi_msg);
+ TRACE_LEAVE();
return NCSCC_RC_FAILURE;
}
@@ -824,6 +830,7 @@ uint32_t avd_snd_susi_msg(AVD_CL_CB *cb,
LOG_EM("%s:%u: %u", __FILE__, __LINE__, 0);
/* free the SUSI message */
d2n_msg_free(susi_msg);
+ TRACE_LEAVE();
return NCSCC_RC_FAILURE;
}
@@ -850,6 +857,7 @@ uint32_t avd_snd_susi_msg(AVD_CL_CB *cb,
/* Log a fatal error that it is an invalid action */
LOG_EM("%s:%u: %u", __FILE__, __LINE__, actn);
d2n_msg_free(susi_msg);
+ TRACE_LEAVE();
return NCSCC_RC_FAILURE;
break;
} /* switch(actn) */
@@ -906,6 +914,7 @@ uint32_t avd_snd_susi_msg(AVD_CL_CB *cb,
== NCSCC_RC_FAILURE) {
LOG_EM("%s:%u: %u", __FILE__, __LINE__,
avnd->node_info.nodeId);
d2n_msg_free(susi_msg);
+ TRACE_LEAVE();
return NCSCC_RC_FAILURE;
}
}
@@ -957,10 +966,13 @@ uint32_t avd_snd_susi_msg(AVD_CL_CB *cb,
LOG_ER("%s: snd to %x failed", __FUNCTION__,
avnd->node_info.nodeId);
--(avnd->snd_msg_id);
d2n_msg_free(susi_msg);
+ TRACE_LEAVE();
return NCSCC_RC_FAILURE;
}
m_AVSV_SEND_CKPT_UPDT_ASYNC_UPDT(cb, avnd, AVSV_CKPT_AVND_SND_MSG_ID);
+
+ TRACE_LEAVE();
return NCSCC_RC_SUCCESS;
}
@@ -1164,6 +1176,7 @@ uint32_t avd_snd_set_leds_msg(AVD_CL_CB
/* Log a fatal error that AvND record can't be null */
LOG_EM("%s:%u: %u", __FILE__, __LINE__, 0);
+ TRACE_LEAVE();
return NCSCC_RC_FAILURE;
}
@@ -1188,11 +1201,14 @@ uint32_t avd_snd_set_leds_msg(AVD_CL_CB
LOG_ER("%s: snd to %x failed", __FUNCTION__,
avnd->node_info.nodeId);
--(avnd->snd_msg_id);
d2n_msg_free(d2n_msg);
+ TRACE_LEAVE();
return NCSCC_RC_FAILURE;
}
m_AVSV_SEND_CKPT_UPDT_ASYNC_UPDT(cb, avnd, AVSV_CKPT_AVND_SND_MSG_ID);
+ TRACE_LEAVE();
+
return NCSCC_RC_SUCCESS;
}
@@ -1812,8 +1828,10 @@ bool admin_op_is_valid(SaImmAdminOperati
bool valid = false;
TRACE_ENTER2("%llu, %u", opId, class_id);
- if (avd_cb->init_state == AVD_APP_STATE)
+ if (avd_cb->init_state == AVD_APP_STATE) {
+ TRACE_LEAVE();
return true;
+ }
switch (class_id) {
case AVSV_SA_AMF_SU:
@@ -1844,6 +1862,7 @@ bool admin_op_is_valid(SaImmAdminOperati
break;
}
+ TRACE_LEAVE();
return valid;
}
------------------------------------------------------------------------------
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
