osaf/services/saf/amf/amfd/ndfsm.cc | 3 +++
osaf/services/saf/amf/amfd/util.cc | 10 +++++++++-
2 files changed, 12 insertions(+), 1 deletions(-)
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
@@ -196,6 +196,7 @@
if ((ncs_su->list_of_susi == AVD_SU_SI_REL_NULL) ||
(ncs_su->list_of_susi->fsm != AVD_SU_SI_STATE_ASGND)) {
/* this is an unassigned SU so no need to scan further
return here. */
+ TRACE_LEAVE();
return;
}
@@ -242,6 +243,8 @@
/* 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/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
@@ -719,8 +719,10 @@
/* 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 +796,7 @@
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 +827,7 @@
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 +854,7 @@
/* 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 +911,7 @@
== 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 +963,12 @@
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;
}
------------------------------------------------------------------------------
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
