Re: [devel] [PATCH 1 of 1] base: Improve TRACE_ENTER, TRACE_LEAVE macros [#2262]
Ack. Thanks, Ramesh. On 1/19/2017 7:45 PM, Anders Widell wrote: > Ack with minor comment marked AndersW> > > regards, > > Anders Widell > > > On 01/13/2017 10:40 AM, Hans Nordeback wrote: >> src/amf/amfd/ckpt_dec.cc | 2 + >> src/amf/amfd/clm.cc | 2 + >> src/amf/amfd/csi.cc | 7 - >> src/amf/amfd/node.cc | 4 ++- >> src/amf/amfd/nodegroup.cc| 4 ++- >> src/amf/amfd/si_dep.cc | 1 + >> src/amf/amfnd/pgdb.cc| 4 +- >> src/amf/amfnd/su.cc | 2 + >> src/base/logtrace.c | 18 +--- >> src/base/logtrace.h | 48 >> >> src/imm/agent/imma_init.cc | 7 +++- >> src/imm/agent/imma_om_api.cc | 2 - >> src/imm/immnd/ImmModel.cc| 16 ++-- >> src/imm/immpbed/immpbe_daemon.cc | 4 ++- >> src/log/logd/lgs_imm_gcfg.cc | 2 + >> src/log/logd/lgs_main.cc | 2 + >> src/log/logd/lgs_mbcsv.cc| 2 + >> src/ntf/ntfd/NtfClient.cc| 2 +- >> src/smf/smfd/SmfCampaignXmlParser.cc | 3 ++ >> src/smf/smfd/SmfUpgradeStep.cc | 3 ++ >> 20 files changed, 111 insertions(+), 24 deletions(-) >> >> >> diff --git a/src/amf/amfd/ckpt_dec.cc b/src/amf/amfd/ckpt_dec.cc >> --- a/src/amf/amfd/ckpt_dec.cc >> +++ b/src/amf/amfd/ckpt_dec.cc >> @@ -370,6 +370,8 @@ static uint32_t dec_app_config(AVD_CL_CB >> uint32_t status = NCSCC_RC_SUCCESS; >> AVD_APP app; >> >> +TRACE_ENTER(); >> + >> osafassert(dec->i_action == NCS_MBCSV_ACT_UPDATE); >> decode_app(&dec->i_uba, &app); >> >> diff --git a/src/amf/amfd/clm.cc b/src/amf/amfd/clm.cc >> --- a/src/amf/amfd/clm.cc >> +++ b/src/amf/amfd/clm.cc >> @@ -83,6 +83,8 @@ static void clm_node_exit_validate(AVD_A >> bool reject = false; >> SaAisErrorT rc = SA_AIS_OK; >> +TRACE_ENTER(); >> + >> /* >>* Reject validate step on self node as this is active controller >>*/ >> diff --git a/src/amf/amfd/csi.cc b/src/amf/amfd/csi.cc >> --- a/src/amf/amfd/csi.cc >> +++ b/src/amf/amfd/csi.cc >> @@ -831,6 +831,7 @@ static void ccb_apply_delete_hdlr(CcbUti >> bool first_sisu = true; >> +TRACE_ENTER(); >> if (avd_cb->avail_state_avd != SA_AMF_HA_ACTIVE) { >> /* A double check whether csi has been deleted from DB or >> not and whether pointer stored userData >> is still valid. */ >> @@ -851,7 +852,7 @@ static void ccb_apply_delete_hdlr(CcbUti >> goto done; >> } >> -TRACE_ENTER2("'%s'", csi ? csi->name.c_str() : nullptr); >> +TRACE("'%s'", csi ? csi->name.c_str() : nullptr); >> /* Check whether si has been assigned to any SU. */ >> if ((nullptr != csi->si->list_of_sisu) && >> @@ -992,6 +993,8 @@ static void csi_ccb_apply_modify_hdlr(st >> **/ >> static void csi_ccb_apply_create_hdlr(struct CcbUtilOperationData >> *opdata) >> { >> +TRACE_ENTER(); >> + >> AVD_CSI *csi = nullptr; >> if ((csi = csi_db->find(Amf::to_string(&opdata->objectName))) >> == nullptr) { >> /* this check is added because, some times there is >> @@ -1027,6 +1030,8 @@ SaAisErrorT csi_assign_hdlr(AVD_CSI *csi >> AVD_COMP_CSI_REL *compcsi; >> SaAisErrorT rc = SA_AIS_ERR_NO_OP; >> +TRACE_ENTER(); >> + >> /* Check whether csi assignment is already in progress and if >> yes, then return. >> This csi will be assigned after the undergoing csi >> assignment gets over.*/ >> if (csi->si->list_of_sisu != nullptr) { >> diff --git a/src/amf/amfd/node.cc b/src/amf/amfd/node.cc >> --- a/src/amf/amfd/node.cc >> +++ b/src/amf/amfd/node.cc >> @@ -891,7 +891,9 @@ static void node_ccb_apply_cb(CcbUtilOpe >> void node_admin_state_set(AVD_AVND *node, SaAmfAdminStateT >> admin_state) >> { >> SaAmfAdminStateT old_state = node->saAmfNodeAdminState; >> - >> + >> +TRACE_ENTER(); >> + >> if (old_state == admin_state) >> return; >> osafassert(admin_state <= SA_AMF_ADMIN_SHUTTING_DOWN); >> diff --git a/src/amf/amfd/nodegroup.cc b/src/amf/amfd/nodegroup.cc >> --- a/src/amf/amfd/nodegroup.cc >> +++ b/src/amf/amfd/nodegroup.cc >> @@ -467,13 +467,15 @@ static SaAisErrorT ng_ccb_completed_dele >> AVD_AVND *node; >> AVD_AMF_NG *ng = avd_ng_get(Amf::to_string(&opdata->objectName)); >> +TRACE_ENTER(); >> + >> if (ng == nullptr) { >> LOG_WA("Could not find %s in nodegroup_db", >> osaf_extended_name_borrow(&opdata->objectName)); >> TRACE_LEAVE(); >> return SA_AIS_OK; >> } >> -TRACE_ENTER2("%u", ng->number_nodes()); >> +TRACE("%u", ng->number_nodes()); >> std::set::const_iterator iter; >> if ((ng->saAmfNGAdminState != SA_AMF_ADMIN_LO
Re: [devel] [PATCH 1 of 1] base: Improve TRACE_ENTER, TRACE_LEAVE macros [#2262]
Hi Ramesh and Nagendra, Have you had any time to look at this patch? /Thanks HansN -Original Message- From: Hans Nordebäck [mailto:hans.nordeb...@ericsson.com] Sent: den 19 januari 2017 15:27 To: Anders Widell ; ramesh.bet...@oracle.com; nagendr...@oracle.com Cc: opensaf-devel@lists.sourceforge.net Subject: Re: [devel] [PATCH 1 of 1] base: Improve TRACE_ENTER, TRACE_LEAVE macros [#2262] Thanks Anders, I'll update the patch before pushing. /BR HansN -Original Message- From: Anders Widell Sent: den 19 januari 2017 15:15 To: Hans Nordebäck ; ramesh.bet...@oracle.com; nagendr...@oracle.com Cc: opensaf-devel@lists.sourceforge.net Subject: Re: [PATCH 1 of 1] base: Improve TRACE_ENTER, TRACE_LEAVE macros [#2262] Ack with minor comment marked AndersW> regards, Anders Widell On 01/13/2017 10:40 AM, Hans Nordeback wrote: > src/amf/amfd/ckpt_dec.cc | 2 + > src/amf/amfd/clm.cc | 2 + > src/amf/amfd/csi.cc | 7 - > src/amf/amfd/node.cc | 4 ++- > src/amf/amfd/nodegroup.cc| 4 ++- > src/amf/amfd/si_dep.cc | 1 + > src/amf/amfnd/pgdb.cc| 4 +- > src/amf/amfnd/su.cc | 2 + > src/base/logtrace.c | 18 +--- > src/base/logtrace.h | 48 > > src/imm/agent/imma_init.cc | 7 +++- > src/imm/agent/imma_om_api.cc | 2 - > src/imm/immnd/ImmModel.cc| 16 ++-- > src/imm/immpbed/immpbe_daemon.cc | 4 ++- > src/log/logd/lgs_imm_gcfg.cc | 2 + > src/log/logd/lgs_main.cc | 2 + > src/log/logd/lgs_mbcsv.cc| 2 + > src/ntf/ntfd/NtfClient.cc| 2 +- > src/smf/smfd/SmfCampaignXmlParser.cc | 3 ++ > src/smf/smfd/SmfUpgradeStep.cc | 3 ++ > 20 files changed, 111 insertions(+), 24 deletions(-) > > > diff --git a/src/amf/amfd/ckpt_dec.cc b/src/amf/amfd/ckpt_dec.cc > --- a/src/amf/amfd/ckpt_dec.cc > +++ b/src/amf/amfd/ckpt_dec.cc > @@ -370,6 +370,8 @@ static uint32_t dec_app_config(AVD_CL_CB > uint32_t status = NCSCC_RC_SUCCESS; > AVD_APP app; > > + TRACE_ENTER(); > + > osafassert(dec->i_action == NCS_MBCSV_ACT_UPDATE); > decode_app(&dec->i_uba, &app); > > diff --git a/src/amf/amfd/clm.cc b/src/amf/amfd/clm.cc > --- a/src/amf/amfd/clm.cc > +++ b/src/amf/amfd/clm.cc > @@ -83,6 +83,8 @@ static void clm_node_exit_validate(AVD_A > bool reject = false; > SaAisErrorT rc = SA_AIS_OK; > > + TRACE_ENTER(); > + > /* >* Reject validate step on self node as this is active controller >*/ > diff --git a/src/amf/amfd/csi.cc b/src/amf/amfd/csi.cc > --- a/src/amf/amfd/csi.cc > +++ b/src/amf/amfd/csi.cc > @@ -831,6 +831,7 @@ static void ccb_apply_delete_hdlr(CcbUti > > bool first_sisu = true; > > + TRACE_ENTER(); > if (avd_cb->avail_state_avd != SA_AMF_HA_ACTIVE) { > /* A double check whether csi has been deleted from DB or not > and whether pointer stored userData > is still valid. */ > @@ -851,7 +852,7 @@ static void ccb_apply_delete_hdlr(CcbUti > goto done; > } > > -TRACE_ENTER2("'%s'", csi ? csi->name.c_str() : nullptr); > +TRACE("'%s'", csi ? csi->name.c_str() : nullptr); > > /* Check whether si has been assigned to any SU. */ > if ((nullptr != csi->si->list_of_sisu) && @@ -992,6 +993,8 @@ > static void csi_ccb_apply_modify_hdlr(st >**/ > static void csi_ccb_apply_create_hdlr(struct CcbUtilOperationData *opdata) > { > + TRACE_ENTER(); > + > AVD_CSI *csi = nullptr; > if ((csi = csi_db->find(Amf::to_string(&opdata->objectName))) == > nullptr) { > /* this check is added because, some times there is @@ -1027,6 > +1030,8 @@ SaAisErrorT csi_assign_hdlr(AVD_CSI *csi > AVD_COMP_CSI_REL *compcsi; > SaAisErrorT rc = SA_AIS_ERR_NO_OP; > > + TRACE_ENTER(); > + > /* Check whether csi assignment is already in progress and if yes, then > return. > This csi will be assigned after the undergoing csi assignment gets > over.*/ > if (csi->si->list_of_sisu != nullptr) { diff --git > a/src/amf/amfd/node.cc b/src/amf/amfd/node.cc > --- a/src/amf/amfd/node.cc > +++ b/src/amf/amfd/node.cc > @@ -891,7 +891,9 @@ static void node_ccb_apply_cb(CcbUtilOpe > void node_admin_state_set(AVD_AVN
Re: [devel] [PATCH 1 of 1] base: Improve TRACE_ENTER, TRACE_LEAVE macros [#2262]
Thanks Anders, I'll update the patch before pushing. /BR HansN -Original Message- From: Anders Widell Sent: den 19 januari 2017 15:15 To: Hans Nordebäck ; ramesh.bet...@oracle.com; nagendr...@oracle.com Cc: opensaf-devel@lists.sourceforge.net Subject: Re: [PATCH 1 of 1] base: Improve TRACE_ENTER, TRACE_LEAVE macros [#2262] Ack with minor comment marked AndersW> regards, Anders Widell On 01/13/2017 10:40 AM, Hans Nordeback wrote: > src/amf/amfd/ckpt_dec.cc | 2 + > src/amf/amfd/clm.cc | 2 + > src/amf/amfd/csi.cc | 7 - > src/amf/amfd/node.cc | 4 ++- > src/amf/amfd/nodegroup.cc| 4 ++- > src/amf/amfd/si_dep.cc | 1 + > src/amf/amfnd/pgdb.cc| 4 +- > src/amf/amfnd/su.cc | 2 + > src/base/logtrace.c | 18 +--- > src/base/logtrace.h | 48 > > src/imm/agent/imma_init.cc | 7 +++- > src/imm/agent/imma_om_api.cc | 2 - > src/imm/immnd/ImmModel.cc| 16 ++-- > src/imm/immpbed/immpbe_daemon.cc | 4 ++- > src/log/logd/lgs_imm_gcfg.cc | 2 + > src/log/logd/lgs_main.cc | 2 + > src/log/logd/lgs_mbcsv.cc| 2 + > src/ntf/ntfd/NtfClient.cc| 2 +- > src/smf/smfd/SmfCampaignXmlParser.cc | 3 ++ > src/smf/smfd/SmfUpgradeStep.cc | 3 ++ > 20 files changed, 111 insertions(+), 24 deletions(-) > > > diff --git a/src/amf/amfd/ckpt_dec.cc b/src/amf/amfd/ckpt_dec.cc > --- a/src/amf/amfd/ckpt_dec.cc > +++ b/src/amf/amfd/ckpt_dec.cc > @@ -370,6 +370,8 @@ static uint32_t dec_app_config(AVD_CL_CB > uint32_t status = NCSCC_RC_SUCCESS; > AVD_APP app; > > + TRACE_ENTER(); > + > osafassert(dec->i_action == NCS_MBCSV_ACT_UPDATE); > decode_app(&dec->i_uba, &app); > > diff --git a/src/amf/amfd/clm.cc b/src/amf/amfd/clm.cc > --- a/src/amf/amfd/clm.cc > +++ b/src/amf/amfd/clm.cc > @@ -83,6 +83,8 @@ static void clm_node_exit_validate(AVD_A > bool reject = false; > SaAisErrorT rc = SA_AIS_OK; > > + TRACE_ENTER(); > + > /* >* Reject validate step on self node as this is active controller >*/ > diff --git a/src/amf/amfd/csi.cc b/src/amf/amfd/csi.cc > --- a/src/amf/amfd/csi.cc > +++ b/src/amf/amfd/csi.cc > @@ -831,6 +831,7 @@ static void ccb_apply_delete_hdlr(CcbUti > > bool first_sisu = true; > > + TRACE_ENTER(); > if (avd_cb->avail_state_avd != SA_AMF_HA_ACTIVE) { > /* A double check whether csi has been deleted from DB or not > and whether pointer stored userData > is still valid. */ > @@ -851,7 +852,7 @@ static void ccb_apply_delete_hdlr(CcbUti > goto done; > } > > -TRACE_ENTER2("'%s'", csi ? csi->name.c_str() : nullptr); > +TRACE("'%s'", csi ? csi->name.c_str() : nullptr); > > /* Check whether si has been assigned to any SU. */ > if ((nullptr != csi->si->list_of_sisu) && @@ -992,6 +993,8 @@ > static void csi_ccb_apply_modify_hdlr(st >**/ > static void csi_ccb_apply_create_hdlr(struct CcbUtilOperationData *opdata) > { > + TRACE_ENTER(); > + > AVD_CSI *csi = nullptr; > if ((csi = csi_db->find(Amf::to_string(&opdata->objectName))) == > nullptr) { > /* this check is added because, some times there is @@ -1027,6 > +1030,8 @@ SaAisErrorT csi_assign_hdlr(AVD_CSI *csi > AVD_COMP_CSI_REL *compcsi; > SaAisErrorT rc = SA_AIS_ERR_NO_OP; > > + TRACE_ENTER(); > + > /* Check whether csi assignment is already in progress and if yes, then > return. > This csi will be assigned after the undergoing csi assignment gets > over.*/ > if (csi->si->list_of_sisu != nullptr) { diff --git > a/src/amf/amfd/node.cc b/src/amf/amfd/node.cc > --- a/src/amf/amfd/node.cc > +++ b/src/amf/amfd/node.cc > @@ -891,7 +891,9 @@ static void node_ccb_apply_cb(CcbUtilOpe > void node_admin_state_set(AVD_AVND *node, SaAmfAdminStateT admin_state) > { > SaAmfAdminStateT old_state = node->saAmfNodeAdminState; > - > + > + TRACE_ENTER(); > + > if (old_state == admin_state) > return; > osafassert(admin_state <= SA_AMF_ADMIN_SHUTTING_DOWN); diff --git > a/src/amf/amfd/nodegroup.cc b/src/amf/amfd/nodegroup.cc > --- a/src/amf/amfd/nodegroup.cc > +++ b/src/amf/amfd/nodegroup.cc > @@ -467,13 +467,15 @@ static SaAisErrorT ng_ccb_completed_dele > AVD_AVND *node; > AVD_AMF_NG *ng = avd_ng_get(Amf::to_string(&opdata->objectName)); > > + TRACE_ENTER(); > + > if (ng == nullptr) { > LOG_WA("Could not find %s in nodegroup_db", > osaf_extended_name_borrow(&opdata->objectName)); > TRACE_LEAVE(); >
Re: [devel] [PATCH 1 of 1] base: Improve TRACE_ENTER, TRACE_LEAVE macros [#2262]
Ack with minor comment marked AndersW> regards, Anders Widell On 01/13/2017 10:40 AM, Hans Nordeback wrote: > src/amf/amfd/ckpt_dec.cc | 2 + > src/amf/amfd/clm.cc | 2 + > src/amf/amfd/csi.cc | 7 - > src/amf/amfd/node.cc | 4 ++- > src/amf/amfd/nodegroup.cc| 4 ++- > src/amf/amfd/si_dep.cc | 1 + > src/amf/amfnd/pgdb.cc| 4 +- > src/amf/amfnd/su.cc | 2 + > src/base/logtrace.c | 18 +--- > src/base/logtrace.h | 48 > > src/imm/agent/imma_init.cc | 7 +++- > src/imm/agent/imma_om_api.cc | 2 - > src/imm/immnd/ImmModel.cc| 16 ++-- > src/imm/immpbed/immpbe_daemon.cc | 4 ++- > src/log/logd/lgs_imm_gcfg.cc | 2 + > src/log/logd/lgs_main.cc | 2 + > src/log/logd/lgs_mbcsv.cc| 2 + > src/ntf/ntfd/NtfClient.cc| 2 +- > src/smf/smfd/SmfCampaignXmlParser.cc | 3 ++ > src/smf/smfd/SmfUpgradeStep.cc | 3 ++ > 20 files changed, 111 insertions(+), 24 deletions(-) > > > diff --git a/src/amf/amfd/ckpt_dec.cc b/src/amf/amfd/ckpt_dec.cc > --- a/src/amf/amfd/ckpt_dec.cc > +++ b/src/amf/amfd/ckpt_dec.cc > @@ -370,6 +370,8 @@ static uint32_t dec_app_config(AVD_CL_CB > uint32_t status = NCSCC_RC_SUCCESS; > AVD_APP app; > > + TRACE_ENTER(); > + > osafassert(dec->i_action == NCS_MBCSV_ACT_UPDATE); > decode_app(&dec->i_uba, &app); > > diff --git a/src/amf/amfd/clm.cc b/src/amf/amfd/clm.cc > --- a/src/amf/amfd/clm.cc > +++ b/src/amf/amfd/clm.cc > @@ -83,6 +83,8 @@ static void clm_node_exit_validate(AVD_A > bool reject = false; > SaAisErrorT rc = SA_AIS_OK; > > + TRACE_ENTER(); > + > /* >* Reject validate step on self node as this is active controller >*/ > diff --git a/src/amf/amfd/csi.cc b/src/amf/amfd/csi.cc > --- a/src/amf/amfd/csi.cc > +++ b/src/amf/amfd/csi.cc > @@ -831,6 +831,7 @@ static void ccb_apply_delete_hdlr(CcbUti > > bool first_sisu = true; > > + TRACE_ENTER(); > if (avd_cb->avail_state_avd != SA_AMF_HA_ACTIVE) { > /* A double check whether csi has been deleted from DB or not > and whether pointer stored userData > is still valid. */ > @@ -851,7 +852,7 @@ static void ccb_apply_delete_hdlr(CcbUti > goto done; > } > > -TRACE_ENTER2("'%s'", csi ? csi->name.c_str() : nullptr); > +TRACE("'%s'", csi ? csi->name.c_str() : nullptr); > > /* Check whether si has been assigned to any SU. */ > if ((nullptr != csi->si->list_of_sisu) && > @@ -992,6 +993,8 @@ static void csi_ccb_apply_modify_hdlr(st >**/ > static void csi_ccb_apply_create_hdlr(struct CcbUtilOperationData *opdata) > { > + TRACE_ENTER(); > + > AVD_CSI *csi = nullptr; > if ((csi = csi_db->find(Amf::to_string(&opdata->objectName))) == > nullptr) { > /* this check is added because, some times there is > @@ -1027,6 +1030,8 @@ SaAisErrorT csi_assign_hdlr(AVD_CSI *csi > AVD_COMP_CSI_REL *compcsi; > SaAisErrorT rc = SA_AIS_ERR_NO_OP; > > + TRACE_ENTER(); > + > /* Check whether csi assignment is already in progress and if yes, then > return. > This csi will be assigned after the undergoing csi assignment gets > over.*/ > if (csi->si->list_of_sisu != nullptr) { > diff --git a/src/amf/amfd/node.cc b/src/amf/amfd/node.cc > --- a/src/amf/amfd/node.cc > +++ b/src/amf/amfd/node.cc > @@ -891,7 +891,9 @@ static void node_ccb_apply_cb(CcbUtilOpe > void node_admin_state_set(AVD_AVND *node, SaAmfAdminStateT admin_state) > { > SaAmfAdminStateT old_state = node->saAmfNodeAdminState; > - > + > + TRACE_ENTER(); > + > if (old_state == admin_state) > return; > osafassert(admin_state <= SA_AMF_ADMIN_SHUTTING_DOWN); > diff --git a/src/amf/amfd/nodegroup.cc b/src/amf/amfd/nodegroup.cc > --- a/src/amf/amfd/nodegroup.cc > +++ b/src/amf/amfd/nodegroup.cc > @@ -467,13 +467,15 @@ static SaAisErrorT ng_ccb_completed_dele > AVD_AVND *node; > AVD_AMF_NG *ng = avd_ng_get(Amf::to_string(&opdata->objectName)); > > + TRACE_ENTER(); > + > if (ng == nullptr) { > LOG_WA("Could not find %s in nodegroup_db", > osaf_extended_name_borrow(&opdata->objectName)); > TRACE_LEAVE(); > return SA_AIS_OK; > } > > - TRACE_ENTER2("%u", ng->number_nodes()); > + TRACE("%u", ng->number_nodes()); > std::set::const_iterator iter; > if ((ng->saAmfNGAdminState != SA_AMF_ADMIN_LOCKED) && > (ng->saAmfNGAdminState != SA_AMF_ADMIN_UNLOCKED) && > diff --git a/src/amf/amfd/
[devel] [PATCH 1 of 1] base: Improve TRACE_ENTER, TRACE_LEAVE macros [#2262]
src/amf/amfd/ckpt_dec.cc | 2 + src/amf/amfd/clm.cc | 2 + src/amf/amfd/csi.cc | 7 - src/amf/amfd/node.cc | 4 ++- src/amf/amfd/nodegroup.cc| 4 ++- src/amf/amfd/si_dep.cc | 1 + src/amf/amfnd/pgdb.cc| 4 +- src/amf/amfnd/su.cc | 2 + src/base/logtrace.c | 18 +--- src/base/logtrace.h | 48 src/imm/agent/imma_init.cc | 7 +++- src/imm/agent/imma_om_api.cc | 2 - src/imm/immnd/ImmModel.cc| 16 ++-- src/imm/immpbed/immpbe_daemon.cc | 4 ++- src/log/logd/lgs_imm_gcfg.cc | 2 + src/log/logd/lgs_main.cc | 2 + src/log/logd/lgs_mbcsv.cc| 2 + src/ntf/ntfd/NtfClient.cc| 2 +- src/smf/smfd/SmfCampaignXmlParser.cc | 3 ++ src/smf/smfd/SmfUpgradeStep.cc | 3 ++ 20 files changed, 111 insertions(+), 24 deletions(-) diff --git a/src/amf/amfd/ckpt_dec.cc b/src/amf/amfd/ckpt_dec.cc --- a/src/amf/amfd/ckpt_dec.cc +++ b/src/amf/amfd/ckpt_dec.cc @@ -370,6 +370,8 @@ static uint32_t dec_app_config(AVD_CL_CB uint32_t status = NCSCC_RC_SUCCESS; AVD_APP app; + TRACE_ENTER(); + osafassert(dec->i_action == NCS_MBCSV_ACT_UPDATE); decode_app(&dec->i_uba, &app); diff --git a/src/amf/amfd/clm.cc b/src/amf/amfd/clm.cc --- a/src/amf/amfd/clm.cc +++ b/src/amf/amfd/clm.cc @@ -83,6 +83,8 @@ static void clm_node_exit_validate(AVD_A bool reject = false; SaAisErrorT rc = SA_AIS_OK; + TRACE_ENTER(); + /* * Reject validate step on self node as this is active controller */ diff --git a/src/amf/amfd/csi.cc b/src/amf/amfd/csi.cc --- a/src/amf/amfd/csi.cc +++ b/src/amf/amfd/csi.cc @@ -831,6 +831,7 @@ static void ccb_apply_delete_hdlr(CcbUti bool first_sisu = true; + TRACE_ENTER(); if (avd_cb->avail_state_avd != SA_AMF_HA_ACTIVE) { /* A double check whether csi has been deleted from DB or not and whether pointer stored userData is still valid. */ @@ -851,7 +852,7 @@ static void ccb_apply_delete_hdlr(CcbUti goto done; } -TRACE_ENTER2("'%s'", csi ? csi->name.c_str() : nullptr); +TRACE("'%s'", csi ? csi->name.c_str() : nullptr); /* Check whether si has been assigned to any SU. */ if ((nullptr != csi->si->list_of_sisu) && @@ -992,6 +993,8 @@ static void csi_ccb_apply_modify_hdlr(st **/ static void csi_ccb_apply_create_hdlr(struct CcbUtilOperationData *opdata) { + TRACE_ENTER(); + AVD_CSI *csi = nullptr; if ((csi = csi_db->find(Amf::to_string(&opdata->objectName))) == nullptr) { /* this check is added because, some times there is @@ -1027,6 +1030,8 @@ SaAisErrorT csi_assign_hdlr(AVD_CSI *csi AVD_COMP_CSI_REL *compcsi; SaAisErrorT rc = SA_AIS_ERR_NO_OP; + TRACE_ENTER(); + /* Check whether csi assignment is already in progress and if yes, then return. This csi will be assigned after the undergoing csi assignment gets over.*/ if (csi->si->list_of_sisu != nullptr) { diff --git a/src/amf/amfd/node.cc b/src/amf/amfd/node.cc --- a/src/amf/amfd/node.cc +++ b/src/amf/amfd/node.cc @@ -891,7 +891,9 @@ static void node_ccb_apply_cb(CcbUtilOpe void node_admin_state_set(AVD_AVND *node, SaAmfAdminStateT admin_state) { SaAmfAdminStateT old_state = node->saAmfNodeAdminState; - + + TRACE_ENTER(); + if (old_state == admin_state) return; osafassert(admin_state <= SA_AMF_ADMIN_SHUTTING_DOWN); diff --git a/src/amf/amfd/nodegroup.cc b/src/amf/amfd/nodegroup.cc --- a/src/amf/amfd/nodegroup.cc +++ b/src/amf/amfd/nodegroup.cc @@ -467,13 +467,15 @@ static SaAisErrorT ng_ccb_completed_dele AVD_AVND *node; AVD_AMF_NG *ng = avd_ng_get(Amf::to_string(&opdata->objectName)); + TRACE_ENTER(); + if (ng == nullptr) { LOG_WA("Could not find %s in nodegroup_db", osaf_extended_name_borrow(&opdata->objectName)); TRACE_LEAVE(); return SA_AIS_OK; } - TRACE_ENTER2("%u", ng->number_nodes()); + TRACE("%u", ng->number_nodes()); std::set::const_iterator iter; if ((ng->saAmfNGAdminState != SA_AMF_ADMIN_LOCKED) && (ng->saAmfNGAdminState != SA_AMF_ADMIN_UNLOCKED) && diff --git a/src/amf/amfd/si_dep.cc b/src/amf/amfd/si_dep.cc --- a/src/amf/amfd/si_dep.cc +++ b/src/amf/amfd/si_dep.cc @@ -1426,6 +1426,7 @@ void avd_sidep_start_tolerance_timer_for { AVD_SI_DEP *si_dep_rec; + TRACE_ENTER(); TRACE("dep_si:%s spons_si:%s",dep_si->name.c_str(),spons_si->name.c_str