Ack for the series with a Note:Tickets #1544 and #1520 are not updated
with all the generated changesets.
Thanks
Praveen
On 14-Jan-16 12:28 PM, Gary Lee wrote:
> osaf/services/saf/amf/amfd/ckpt_edu.cc | 215
> --------------------------
> osaf/services/saf/amf/amfd/include/ckpt_edu.h | 12 -
> 2 files changed, 0 insertions(+), 227 deletions(-)
>
>
> diff --git a/osaf/services/saf/amf/amfd/ckpt_edu.cc
> b/osaf/services/saf/amf/amfd/ckpt_edu.cc
> --- a/osaf/services/saf/amf/amfd/ckpt_edu.cc
> +++ b/osaf/services/saf/amf/amfd/ckpt_edu.cc
> @@ -53,22 +53,10 @@
>
> m_NCS_EDU_HDL_INIT(&cb->edu_hdl);
>
> - rc = m_NCS_EDU_COMPILE_EDP(&cb->edu_hdl, avsv_edp_ckpt_msg_node, &err);
> - if (rc != NCSCC_RC_SUCCESS)
> - goto error;
> -
> rc = m_NCS_EDU_COMPILE_EDP(&cb->edu_hdl,
> avsv_edp_ckpt_msg_async_updt_cnt, &err);
> if (rc != NCSCC_RC_SUCCESS)
> goto error;
>
> - rc = m_NCS_EDU_COMPILE_EDP(&cb->edu_hdl,
> avsv_edp_ckpt_msg_sus_per_si_rank, &err);
> - if (rc != NCSCC_RC_SUCCESS)
> - goto error;
> -
> - rc = m_NCS_EDU_COMPILE_EDP(&cb->edu_hdl,
> avsv_edp_ckpt_msg_comp_cs_type, &err);
> - if (rc != NCSCC_RC_SUCCESS)
> - goto error;
> -
> return rc;
>
> error:
> @@ -78,106 +66,6 @@
> return rc;
> }
>
> -/*****************************************************************************
> -
> - PROCEDURE NAME: avsv_edp_ckpt_msg_cluster
> -
> - DESCRIPTION: EDU program handler for "AVD_CLUSTER" data. This
> - function is invoked by EDU for performing encode/decode
> - operation on "AVD_CLUSTER" data.
> -
> - RETURNS: NCSCC_RC_SUCCESS/NCSCC_RC_FAILURE
> -
> -*****************************************************************************/
> -uint32_t avsv_edp_ckpt_msg_cluster(EDU_HDL *hdl, EDU_TKN *edu_tkn,
> - NCSCONTEXT ptr, uint32_t *ptr_data_len,
> - EDU_BUF_ENV *buf_env, EDP_OP_TYPE op, EDU_ERR *o_err)
> -{
> - uint32_t rc = NCSCC_RC_SUCCESS;
> - AVD_CLUSTER *struct_ptr = nullptr, **d_ptr = nullptr;
> -
> - EDU_INST_SET avsv_ckpt_msg_cluster_rules[] = {
> - {EDU_START, avsv_edp_ckpt_msg_cluster, 0, 0, 0,
> sizeof(AVD_CLUSTER), 0, nullptr},
> - {EDU_EXEC, ncs_edp_uns32, 0, 0, 0, (long)&((AVD_CLUSTER
> *)0)->saAmfClusterAdminState, 0, nullptr},
> - {EDU_END, 0, 0, 0, 0, 0, 0, nullptr},
> - };
> -
> - if (op == EDP_OP_TYPE_ENC) {
> - struct_ptr = (AVD_CLUSTER *)ptr;
> - } else if (op == EDP_OP_TYPE_DEC) {
> - d_ptr = (AVD_CLUSTER **)ptr;
> - if (*d_ptr == nullptr) {
> - *o_err = EDU_ERR_MEM_FAIL;
> - return NCSCC_RC_FAILURE;
> - }
> - memset(*d_ptr, '\0', sizeof(AVD_CLUSTER));
> - struct_ptr = *d_ptr;
> - } else {
> - struct_ptr = static_cast<AVD_CLUSTER*>(ptr);
> - }
> -
> - rc = m_NCS_EDU_RUN_RULES(hdl, edu_tkn, avsv_ckpt_msg_cluster_rules,
> - struct_ptr, ptr_data_len, buf_env, op, o_err);
> -
> - return rc;
> -}
> -
> -/*****************************************************************************
> -
> - PROCEDURE NAME: avsv_edp_ckpt_msg_node
> -
> - DESCRIPTION: EDU program handler for "AVD_AVND" data. This
> - function is invoked by EDU for performing encode/decode
> - operation on "AVD_AVND" data.
> -
> - RETURNS: NCSCC_RC_SUCCESS/NCSCC_RC_FAILURE
> -
> -*****************************************************************************/
> -uint32_t avsv_edp_ckpt_msg_node(EDU_HDL *hdl, EDU_TKN *edu_tkn,
> - NCSCONTEXT ptr, uint32_t *ptr_data_len,
> - EDU_BUF_ENV *buf_env, EDP_OP_TYPE op, EDU_ERR *o_err)
> -{
> - uint32_t rc = NCSCC_RC_SUCCESS;
> - AVD_AVND *struct_ptr = nullptr, **d_ptr = nullptr;
> -
> - EDU_INST_SET avsv_ckpt_msg_node_rules[] = {
> - {EDU_START, avsv_edp_ckpt_msg_node, 0, 0, 0, sizeof(AVD_AVND),
> 0, nullptr},
> -
> - /* Fill here AVD AVND config data structure encoding rules */
> - {EDU_EXEC, m_NCS_EDP_SACLMNODEIDT, 0, 0, 0, (long)&((AVD_AVND
> *)0)->node_info.nodeId, 0, nullptr},
> - {EDU_EXEC, ncs_edp_saclmnodeaddresst, 0, 0, 0,
> (long)&((AVD_AVND *)0)->node_info.nodeAddress, 0, nullptr},
> - {EDU_EXEC, ncs_edp_sanamet, 0, 0, 0, (long)&((AVD_AVND
> *)0)->name, 0, nullptr},
> - {EDU_EXEC, ncs_edp_int, 0, 0, 0, (long)&((AVD_AVND
> *)0)->node_info.member, 0, nullptr},
> - {EDU_EXEC, m_NCS_EDP_SATIMET, 0, 0, 0, (long)&((AVD_AVND
> *)0)->node_info.bootTimestamp, 0, nullptr},
> - {EDU_EXEC, m_NCS_EDP_SAUINT64T, 0, 0, 0, (long)&((AVD_AVND
> *)0)->node_info.initialViewNumber, 0, nullptr},
> - {EDU_EXEC, ncs_edp_mds_dest, 0, 0, 0, (long)&((AVD_AVND
> *)0)->adest, 0, nullptr},
> - {EDU_EXEC, ncs_edp_uns32, 0, 0, 0, (long)&((AVD_AVND
> *)0)->saAmfNodeAdminState, 0, nullptr},
> - {EDU_EXEC, ncs_edp_uns32, 0, 0, 0, (long)&((AVD_AVND
> *)0)->saAmfNodeOperState, 0, nullptr},
> - {EDU_EXEC, ncs_edp_uns32, 0, 0, 0, (long)&((AVD_AVND
> *)0)->node_state, 0, nullptr},
> - {EDU_EXEC, ncs_edp_uns32, 0, 0, 0, (long)&((AVD_AVND
> *)0)->type, 0, nullptr},
> - {EDU_EXEC, ncs_edp_uns32, 0, 0, 0, (long)&((AVD_AVND
> *)0)->rcv_msg_id, 0, nullptr},
> - {EDU_EXEC, ncs_edp_uns32, 0, 0, 0, (long)&((AVD_AVND
> *)0)->snd_msg_id, 0, nullptr},
> - {EDU_END, 0, 0, 0, 0, 0, 0, nullptr},
> - };
> -
> - if (op == EDP_OP_TYPE_ENC) {
> - struct_ptr = (AVD_AVND *)ptr;
> - } else if (op == EDP_OP_TYPE_DEC) {
> - d_ptr = (AVD_AVND **)ptr;
> - if (*d_ptr == nullptr) {
> - *o_err = EDU_ERR_MEM_FAIL;
> - return NCSCC_RC_FAILURE;
> - }
> - memset(*d_ptr, '\0', sizeof(AVD_AVND));
> - struct_ptr = *d_ptr;
> - } else {
> - struct_ptr = static_cast<AVD_AVND*>(ptr);
> - }
> -
> - rc = m_NCS_EDU_RUN_RULES(hdl, edu_tkn, avsv_ckpt_msg_node_rules,
> struct_ptr, ptr_data_len, buf_env, op, o_err);
> -
> - return rc;
> -}
>
>
> /*****************************************************************************
>
> @@ -256,106 +144,3 @@
>
> return rc;
> }
> -
> -/*****************************************************************************
> -
> - PROCEDURE NAME: avsv_edp_ckpt_msg_sus_per_si_rank
> -
> - DESCRIPTION: EDU program handler for "AVD_SUS_PER_SI_RANK" data. This
> - function is invoked by EDU for performing encode/decode
> - operation on "AVD_SUS_PER_SI_RANK" data.
> -
> - RETURNS: NCSCC_RC_SUCCESS/NCSCC_RC_FAILURE
> -
> -*****************************************************************************/
> -
> -uint32_t avsv_edp_ckpt_msg_sus_per_si_rank(EDU_HDL *hdl, EDU_TKN *edu_tkn,
> - NCSCONTEXT ptr, uint32_t *ptr_data_len,
> - EDU_BUF_ENV *buf_env, EDP_OP_TYPE op,
> EDU_ERR *o_err)
> -{
> - uint32_t rc = NCSCC_RC_SUCCESS;
> - AVD_SUS_PER_SI_RANK *struct_ptr = nullptr, **d_ptr = nullptr;
> -
> - EDU_INST_SET avsv_ckpt_msg_sus_per_si_rank_rules[] = {
> - {EDU_START, avsv_edp_ckpt_msg_sus_per_si_rank, 0, 0, 0,
> - sizeof(AVD_SUS_PER_SI_RANK), 0, nullptr},
> -
> - /* Fill here AVD SUS PER SI RANK data structure encoding rules
> */
> - {EDU_EXEC, ncs_edp_sanamet, 0, 0, 0,
> - (long)&((AVD_SUS_PER_SI_RANK *)0)->indx.si_name, 0, nullptr},
> - {EDU_EXEC, ncs_edp_uns32, 0, 0, 0,
> - (long)&((AVD_SUS_PER_SI_RANK *)0)->indx.su_rank, 0, nullptr},
> - {EDU_EXEC, ncs_edp_sanamet, 0, 0, 0,
> - (long)&((AVD_SUS_PER_SI_RANK *)0)->su_name, 0, nullptr},
> - {EDU_END, 0, 0, 0, 0, 0, 0, nullptr},
> - };
> -
> - if (op == EDP_OP_TYPE_ENC) {
> - struct_ptr = (AVD_SUS_PER_SI_RANK *)ptr;
> - } else if (op == EDP_OP_TYPE_DEC) {
> - d_ptr = (AVD_SUS_PER_SI_RANK **)ptr;
> - if (*d_ptr == nullptr) {
> - *o_err = EDU_ERR_MEM_FAIL;
> - return NCSCC_RC_FAILURE;
> - }
> - memset(*d_ptr, '\0', sizeof(AVD_SUS_PER_SI_RANK));
> - struct_ptr = *d_ptr;
> - } else {
> - struct_ptr = static_cast<AVD_SUS_PER_SI_RANK*>(ptr);
> - }
> -
> - rc = m_NCS_EDU_RUN_RULES(hdl, edu_tkn,
> avsv_ckpt_msg_sus_per_si_rank_rules, struct_ptr,
> - ptr_data_len, buf_env, op, o_err);
> -
> - return rc;
> -
> -}
> -
> -/*****************************************************************************
> -
> - PROCEDURE NAME: avsv_edp_ckpt_msg_comp_cs_type
> -
> - DESCRIPTION: EDU program handler for "AVD_COMP_CS_TYPE" data. This
> - function is invoked by EDU for performing encode/decode
> - operation on "AVD_COMP_CS_TYPE" data.
> -
> - RETURNS: NCSCC_RC_SUCCESS/NCSCC_RC_FAILURE
> -
> -*****************************************************************************/
> -
> -uint32_t avsv_edp_ckpt_msg_comp_cs_type(EDU_HDL *hdl, EDU_TKN *edu_tkn,
> - NCSCONTEXT ptr, uint32_t *ptr_data_len,
> - EDU_BUF_ENV *buf_env, EDP_OP_TYPE op,
> EDU_ERR *o_err)
> -{
> - uint32_t rc = NCSCC_RC_SUCCESS;
> -
> - AVD_COMPCS_TYPE *struct_ptr = nullptr, **d_ptr = nullptr;
> -
> - EDU_INST_SET avsv_ckpt_msg_comp_cs_type_rules[] = {
> - {EDU_START, avsv_edp_ckpt_msg_comp_cs_type, 0, 0, 0,
> sizeof(AVD_COMPCS_TYPE), 0, nullptr} ,
> -
> - {EDU_EXEC, ncs_edp_sanamet, 0, 0, 0, (long)&((AVD_COMPCS_TYPE
> *)0)->name, 0, nullptr},
> - {EDU_EXEC, ncs_edp_uns32, 0, 0, 0, (long)&((AVD_COMPCS_TYPE
> *)0)->saAmfCompNumCurrActiveCSIs, 0, nullptr},
> - {EDU_EXEC, ncs_edp_uns32, 0, 0, 0, (long)&((AVD_COMPCS_TYPE
> *)0)->saAmfCompNumCurrStandbyCSIs, 0, nullptr},
> -
> - {EDU_END, 0, 0, 0, 0, 0, 0, nullptr},
> - };
> -
> - if (op == EDP_OP_TYPE_ENC) {
> - struct_ptr = (AVD_COMPCS_TYPE *)ptr;
> - } else if (op == EDP_OP_TYPE_DEC) {
> - d_ptr = (AVD_COMPCS_TYPE **)ptr;
> - if (*d_ptr == nullptr) {
> - *o_err = EDU_ERR_MEM_FAIL;
> - return NCSCC_RC_FAILURE;
> - }
> - memset(*d_ptr, '\0', sizeof(AVD_COMPCS_TYPE));
> - struct_ptr = *d_ptr;
> - } else {
> - struct_ptr = static_cast<AVD_COMPCS_TYPE*>(ptr);
> - }
> -
> - rc = m_NCS_EDU_RUN_RULES(hdl, edu_tkn,
> avsv_ckpt_msg_comp_cs_type_rules, struct_ptr,
> - ptr_data_len, buf_env, op, o_err);
> - return rc;
> -}
> diff --git a/osaf/services/saf/amf/amfd/include/ckpt_edu.h
> b/osaf/services/saf/amf/amfd/include/ckpt_edu.h
> --- a/osaf/services/saf/amf/amfd/include/ckpt_edu.h
> +++ b/osaf/services/saf/amf/amfd/include/ckpt_edu.h
> @@ -35,24 +35,12 @@
>
> /* Function Definations of avd_ckpt_edu.c */
> uint32_t avd_compile_ckpt_edp(AVD_CL_CB *cb);
> -uint32_t avsv_edp_ckpt_msg_cluster(EDU_HDL *hdl, EDU_TKN *edu_tkn,
> - NCSCONTEXT ptr, uint32_t *ptr_data_len,
> - EDU_BUF_ENV *buf_env, EDP_OP_TYPE op, EDU_ERR *o_err);
>
> uint32_t avsv_edp_ckpt_msg_node(EDU_HDL *hdl, EDU_TKN *edu_tkn,
> NCSCONTEXT ptr, uint32_t
> *ptr_data_len,
> EDU_BUF_ENV *buf_env, EDP_OP_TYPE
> op, EDU_ERR *o_err);
> -uint32_t avsv_edp_ckpt_msg_si(EDU_HDL *hdl, EDU_TKN *edu_tkn,
> - NCSCONTEXT ptr, uint32_t *ptr_data_len,
> - EDU_BUF_ENV *buf_env, EDP_OP_TYPE op,
> EDU_ERR *o_err);
> uint32_t avsv_edp_ckpt_msg_async_updt_cnt(EDU_HDL *hdl, EDU_TKN *edu_tkn,
> NCSCONTEXT ptr, uint32_t
> *ptr_data_len,
> EDU_BUF_ENV *buf_env,
> EDP_OP_TYPE op, EDU_ERR *o_err);
> -uint32_t avsv_edp_ckpt_msg_sus_per_si_rank(EDU_HDL *hdl, EDU_TKN *edu_tkn,
> - NCSCONTEXT ptr, uint32_t
> *ptr_data_len,
> - EDU_BUF_ENV *buf_env,
> EDP_OP_TYPE op, EDU_ERR *o_err);
> -uint32_t avsv_edp_ckpt_msg_comp_cs_type(EDU_HDL *hdl, EDU_TKN *edu_tkn,
> - NCSCONTEXT ptr, uint32_t
> *ptr_data_len,
> - EDU_BUF_ENV *buf_env, EDP_OP_TYPE
> op, EDU_ERR *o_err);
>
> #endif
>
------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=267308311&iu=/4140
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
