one comment inline with [Praveen].
On 20-Nov-15 1:12 PM, Hans Nordeback wrote:
> osaf/services/saf/amf/amfd/chkop.cc | 4 -
> osaf/services/saf/amf/amfd/ckpt_dec.cc | 104 -------
> osaf/services/saf/amf/amfd/ckpt_enc.cc | 351
> +++++++++----------------
> osaf/services/saf/amf/amfd/include/ckpt_msg.h | 2 -
> 4 files changed, 128 insertions(+), 333 deletions(-)
>
>
> Simplify encode of AVD_COMP
>
> 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
> @@ -1017,8 +1017,6 @@ uint32_t avsv_send_ckpt_data(AVD_CL_CB *
> return NCSCC_RC_SUCCESS;
> /* else fall through */
> case AVSV_CKPT_COMP_CURR_PROXY_NAME:
> - case AVSV_CKPT_COMP_CURR_NUM_CSI_ACTV:
> - case AVSV_CKPT_COMP_CURR_NUM_CSI_STBY:
> case AVSV_CKPT_COMP_OPER_STATE:
> case AVSV_CKPT_COMP_READINESS_STATE:
> case AVSV_CKPT_COMP_PRES_STATE:
> @@ -1404,8 +1402,6 @@ static uint32_t avsv_validate_reo_type_i
> /* COMP Async Update messages */
> case AVSV_CKPT_AVD_COMP_CONFIG:
> case AVSV_CKPT_COMP_CURR_PROXY_NAME:
> - case AVSV_CKPT_COMP_CURR_NUM_CSI_ACTV:
> - case AVSV_CKPT_COMP_CURR_NUM_CSI_STBY:
> case AVSV_CKPT_COMP_OPER_STATE:
> case AVSV_CKPT_COMP_READINESS_STATE:
> case AVSV_CKPT_COMP_PRES_STATE:
> diff --git a/osaf/services/saf/amf/amfd/ckpt_dec.cc
> b/osaf/services/saf/amf/amfd/ckpt_dec.cc
> --- a/osaf/services/saf/amf/amfd/ckpt_dec.cc
> +++ b/osaf/services/saf/amf/amfd/ckpt_dec.cc
> @@ -74,8 +74,6 @@ static uint32_t dec_si_assignment_state(
> static uint32_t dec_si_dep_state(AVD_CL_CB *cb, NCS_MBCSV_CB_DEC *dec);
> static uint32_t dec_si_alarm_sent(AVD_CL_CB *cb, NCS_MBCSV_CB_DEC *dec);
> static uint32_t dec_comp_proxy_comp_name(AVD_CL_CB *cb, NCS_MBCSV_CB_DEC
> *dec);
> -static uint32_t dec_comp_curr_num_csi_actv(AVD_CL_CB *cb, NCS_MBCSV_CB_DEC
> *dec);
> -static uint32_t dec_comp_curr_num_csi_stby(AVD_CL_CB *cb, NCS_MBCSV_CB_DEC
> *dec);
> static uint32_t dec_comp_oper_state(AVD_CL_CB *cb, NCS_MBCSV_CB_DEC *dec);
> static uint32_t dec_comp_readiness_state(AVD_CL_CB *cb, NCS_MBCSV_CB_DEC
> *dec);
> static uint32_t dec_comp_pres_state(AVD_CL_CB *cb, NCS_MBCSV_CB_DEC *dec);
> @@ -165,8 +163,6 @@ const AVSV_DECODE_CKPT_DATA_FUNC_PTR avd
>
> /* COMP Async Update messages */
> dec_comp_proxy_comp_name,
> - dec_comp_curr_num_csi_actv,
> - dec_comp_curr_num_csi_stby,
> dec_comp_oper_state,
> dec_comp_readiness_state,
> dec_comp_pres_state,
> @@ -1896,106 +1892,6 @@ static uint32_t dec_comp_proxy_comp_name
> }
>
>
> /****************************************************************************\
> - * Function: dec_comp_curr_num_csi_actv
> - *
> - * Purpose: Decode COMP Current number of CSI active.
> - *
> - * Input: cb - CB pointer.
> - * dec - Decode arguments passed by MBCSV.
> - *
> - * Returns: NCSCC_RC_SUCCESS/NCSCC_RC_FAILURE.
> - *
> - * NOTES:
> - *
> - *
> -\**************************************************************************/
> -static uint32_t dec_comp_curr_num_csi_actv(AVD_CL_CB *cb, NCS_MBCSV_CB_DEC
> *dec)
> -{
> - uint32_t status = NCSCC_RC_SUCCESS;
> - AVD_COMP *comp_ptr;
> - AVD_COMP dec_comp;
> - EDU_ERR ederror = static_cast<EDU_ERR>(0);
> - AVD_COMP *comp_struct;
> -
> - TRACE_ENTER();
> -
> - comp_ptr = &dec_comp;
> -
> - /*
> - * Action in this case is just to update.
> - */
> - status = ncs_edu_exec(&cb->edu_hdl, avsv_edp_ckpt_msg_comp,
> - &dec->i_uba, EDP_OP_TYPE_DEC, (AVD_COMP **)&comp_ptr, &ederror,
> 2, 1, 32);
> -
> - if (status != NCSCC_RC_SUCCESS)
> - osafassert(0);
> -
> - if (nullptr == (comp_struct =
> comp_db->find(Amf::to_string(&comp_ptr->comp_info.name)))) {
> - LOG_ER("%s: comp not found, %s", __FUNCTION__,
> comp_ptr->comp_info.name.value);
> - return NCSCC_RC_FAILURE;
> - }
> -
> - /* Update the fields received in this checkpoint message */
> - comp_struct->curr_num_csi_actv = comp_ptr->curr_num_csi_actv;
> -
> - cb->async_updt_cnt.comp_updt++;
> -
> - TRACE_LEAVE2("status '%u'", status);
> - return status;
> -}
> -
> -/****************************************************************************\
> - * Function: dec_comp_curr_num_csi_stby
> - *
> - * Purpose: Decode COMP Current number of CSI standby.
> - *
> - * Input: cb - CB pointer.
> - * dec - Decode arguments passed by MBCSV.
> - *
> - * Returns: NCSCC_RC_SUCCESS/NCSCC_RC_FAILURE.
> - *
> - * NOTES:
> - *
> - *
> -\**************************************************************************/
> -static uint32_t dec_comp_curr_num_csi_stby(AVD_CL_CB *cb, NCS_MBCSV_CB_DEC
> *dec)
> -{
> - uint32_t status = NCSCC_RC_SUCCESS;
> - AVD_COMP *comp_ptr;
> - AVD_COMP dec_comp;
> - EDU_ERR ederror = static_cast<EDU_ERR>(0);
> - AVD_COMP *comp_struct;
> -
> - TRACE_ENTER();
> -
> - comp_ptr = &dec_comp;
> -
> - /*
> - * Action in this case is just to update.
> - */
> - status = ncs_edu_exec(&cb->edu_hdl, avsv_edp_ckpt_msg_comp,
> - &dec->i_uba, EDP_OP_TYPE_DEC, (AVD_COMP
> **)&comp_ptr, &ederror, 2, 1, 33);
> -
> - if (status != NCSCC_RC_SUCCESS) {
> - LOG_ER("%s: decode failed, ederror=%u", __FUNCTION__, ederror);
> - return status;
> - }
> -
> - if (nullptr == (comp_struct =
> comp_db->find(Amf::to_string(&comp_ptr->comp_info.name)))) {
> - LOG_ER("%s: comp not found, %s", __FUNCTION__,
> comp_ptr->comp_info.name.value);
> - return NCSCC_RC_FAILURE;
> - }
> -
> - /* Update the fields received in this checkpoint message */
> - comp_struct->curr_num_csi_stdby = comp_ptr->curr_num_csi_stdby;
> -
> - cb->async_updt_cnt.comp_updt++;
> -
> - TRACE_LEAVE2("status '%u'", status);
> - return status;
> -}
> -
> -/****************************************************************************\
> * Function: dec_comp_oper_state
> *
> * Purpose: Decode COMP Operation State.
> 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
> @@ -74,8 +74,6 @@ static uint32_t enc_si_assignment_state(
> static uint32_t enc_si_dep_state(AVD_CL_CB *cb, NCS_MBCSV_CB_ENC *enc);
> static uint32_t enc_si_alarm_sent(AVD_CL_CB *cb, NCS_MBCSV_CB_ENC *enc);
> static uint32_t enc_comp_proxy_comp_name(AVD_CL_CB *cb, NCS_MBCSV_CB_ENC
> *enc);
> -static uint32_t enc_comp_curr_num_csi_actv(AVD_CL_CB *cb, NCS_MBCSV_CB_ENC
> *enc);
> -static uint32_t enc_comp_curr_num_csi_stby(AVD_CL_CB *cb, NCS_MBCSV_CB_ENC
> *enc);
> static uint32_t enc_comp_oper_state(AVD_CL_CB *cb, NCS_MBCSV_CB_ENC *enc);
> static uint32_t enc_comp_readiness_state(AVD_CL_CB *cb, NCS_MBCSV_CB_ENC
> *enc);
> static uint32_t enc_comp_pres_state(AVD_CL_CB *cb, NCS_MBCSV_CB_ENC *enc);
> @@ -166,8 +164,6 @@ const AVSV_ENCODE_CKPT_DATA_FUNC_PTR avd
>
> /* COMP Async Update messages */
> enc_comp_proxy_comp_name,
> - enc_comp_curr_num_csi_actv,
> - enc_comp_curr_num_csi_stby,
> enc_comp_oper_state,
> enc_comp_readiness_state,
> enc_comp_pres_state,
> @@ -702,6 +698,30 @@ static uint32_t enc_siass(AVD_CL_CB *cb,
> return status;
> }
>
> +
> +/****************************************************************************\
> + * Function: encode_comp
> + *
> + * Purpose: Encode entire AVD_COMP data.
> + *
> + * Input: ub - USRBUF work space for encode/decode.
> + * comp - AVD_COMP class to be encoded.
> + *
> + * Returns: void.
> + *
> + * NOTES:
> + *
> + *
> +\**************************************************************************/
> +void encode_comp(NCS_UBAID *ub, const AVD_COMP *comp) {
> + osaf_encode_sanamet(ub, &comp->comp_info.name);
> + osaf_encode_uint32(ub, comp->saAmfCompOperState);
> + osaf_encode_uint32(ub, comp->saAmfCompReadinessState);
> + osaf_encode_uint32(ub, comp->saAmfCompPresenceState);
> + osaf_encode_uint32(ub, comp->saAmfCompRestartCount);
> + osaf_encode_sanamet(ub, &comp->saAmfCompCurrProxyName);
> +}
> +
>
> /****************************************************************************\
> * Function: enc_comp_config
> *
> @@ -716,43 +736,31 @@ static uint32_t enc_siass(AVD_CL_CB *cb,
> *
> *
> \**************************************************************************/
> -static uint32_t enc_comp_config(AVD_CL_CB *cb, NCS_MBCSV_CB_ENC *enc)
> -{
> - uint32_t status = NCSCC_RC_SUCCESS;
> - EDU_ERR ederror = static_cast<EDU_ERR>(0);
> - TRACE_ENTER2("io_action '%u'", enc->io_action);
> +static uint32_t enc_comp_config(AVD_CL_CB *cb, NCS_MBCSV_CB_ENC *enc) {
> + TRACE_ENTER2("io_action '%u'", enc->io_action);
>
> - /*
> - * Check for the action type (whether it is add, rmv or update) and act
> - * accordingly. If it is update or add, encode entire data. If it is rmv
> - * send key information only.
> - */
> - switch (enc->io_action) {
> - case NCS_MBCSV_ACT_ADD:
> - case NCS_MBCSV_ACT_UPDATE:
> - /* Send entire data */
> - status = m_NCS_EDU_VER_EXEC(&cb->edu_hdl,
> avsv_edp_ckpt_msg_comp, &enc->io_uba,
> - EDP_OP_TYPE_ENC, (AVD_COMP
> *)(NCS_INT64_TO_PTR_CAST(enc->io_reo_hdl)),
> - &ederror, enc->i_peer_version);
> - break;
> + AVD_COMP *comp = (AVD_COMP *) (NCS_INT64_TO_PTR_CAST(enc->io_reo_hdl));
> + /*
> + * Check for the action type (whether it is add, rmv or update) and act
> + * accordingly. If it is update or add, encode entire data. If it is rmv
> + * send key information only.
> + */
> + switch (enc->io_action) {
> + case NCS_MBCSV_ACT_ADD:
> + case NCS_MBCSV_ACT_UPDATE:
> + encode_comp(&enc->io_uba, comp);
> + break;
>
> - case NCS_MBCSV_ACT_RMV:
> - /* Send only key information */
> - status = m_NCS_EDU_SEL_VER_EXEC(&cb->edu_hdl,
> avsv_edp_ckpt_msg_comp, &enc->io_uba,
> - EDP_OP_TYPE_ENC, (AVD_COMP
> *)(NCS_INT64_TO_PTR_CAST(enc->io_reo_hdl)),
> - &ederror, enc->i_peer_version, 1, 1);
> - break;
> + case NCS_MBCSV_ACT_RMV:
> + osaf_encode_sanamet(&enc->io_uba, &comp->comp_info.name);
> + break;
>
> - default:
> - osafassert(0);
> - }
> + default:
> + osafassert(0);
> + }
>
> - if (status != NCSCC_RC_SUCCESS) {
> - LOG_ER("%s: encode failed, ederror=%u", __FUNCTION__, ederror);
> - }
> -
> - TRACE_LEAVE2("status '%u'", status);
> - return status;
> + TRACE_LEAVE();
> + return NCSCC_RC_SUCCESS;
> }
>
>
> /****************************************************************************\
> @@ -1618,108 +1626,24 @@ static uint32_t enc_si_alarm_sent(AVD_CL
> *
> *
> \**************************************************************************/
> -static uint32_t enc_comp_proxy_comp_name(AVD_CL_CB *cb, NCS_MBCSV_CB_ENC
> *enc)
> -{
> - uint32_t status = NCSCC_RC_SUCCESS;
> - EDU_ERR ederror = static_cast<EDU_ERR>(0);
> - TRACE_ENTER();
> +static uint32_t enc_comp_proxy_comp_name(AVD_CL_CB *cb, NCS_MBCSV_CB_ENC
> *enc) {
> + AVD_COMP *comp =(AVD_COMP *)(NCS_INT64_TO_PTR_CAST(enc->io_reo_hdl));
>
> - /*
> - * Action in this case is just to update. If action passed is add/rmv
> then log
> - * error. Call EDU encode to encode this field.
> - */
> - if (NCS_MBCSV_ACT_UPDATE == enc->io_action) {
> - status = m_NCS_EDU_SEL_VER_EXEC(&cb->edu_hdl,
> avsv_edp_ckpt_msg_comp, &enc->io_uba,
> - EDP_OP_TYPE_ENC, (AVD_COMP
> *)(NCS_INT64_TO_PTR_CAST(enc->io_reo_hdl)),
> - &ederror, enc->i_peer_version,
> 2, 1, 6);
> + TRACE_ENTER();
>
> - if (status != NCSCC_RC_SUCCESS)
> - LOG_ER("%s: encode failed, ederror=%u", __FUNCTION__,
> ederror);
> - } else
> - osafassert(0);
> + /*
> + * Action in this case is just to update. If action passed is add/rmv then
> log
> + * error. Call EDU encode to encode this field.
> + */
> + if (NCS_MBCSV_ACT_UPDATE == enc->io_action) {
> + osaf_encode_sanamet(&enc->io_uba, &comp->comp_info.name);
> + osaf_encode_sanamet(&enc->io_uba, &comp->saAmfCompCurrProxyName);
> + } else {
> + osafassert(0);
> + }
>
> - TRACE_LEAVE2("status '%u'", status);
> - return status;
> -}
> -
> -/****************************************************************************\
> - * Function: enc_comp_curr_num_csi_actv
> - *
> - * Purpose: Encode COMP Current number of CSI active.
> - *
> - * Input: cb - CB pointer.
> - * enc - Encode arguments passed by MBCSV.
> - *
> - * Returns: NCSCC_RC_SUCCESS/NCSCC_RC_FAILURE.
> - *
> - * NOTES:
> - *
> - *
> -\**************************************************************************/
> -static uint32_t enc_comp_curr_num_csi_actv(AVD_CL_CB *cb, NCS_MBCSV_CB_ENC
> *enc)
> -{
> - uint32_t status = NCSCC_RC_SUCCESS;
> - EDU_ERR ederror = static_cast<EDU_ERR>(0);
> - TRACE_ENTER();
> -
> - osafassert(0);
> -
> - /*
> - * Action in this case is just to update. If action passed is add/rmv
> then log
> - * error. Call EDU encode to encode this field.
> - */
> - if (NCS_MBCSV_ACT_UPDATE == enc->io_action) {
> - status = m_NCS_EDU_SEL_VER_EXEC(&cb->edu_hdl,
> avsv_edp_ckpt_msg_comp, &enc->io_uba,
> - EDP_OP_TYPE_ENC, (AVD_COMP
> *)(NCS_INT64_TO_PTR_CAST(enc->io_reo_hdl)),
> - &ederror, enc->i_peer_version, 2, 1, 32);
> -
> - if (status != NCSCC_RC_SUCCESS)
> - LOG_ER("%s: encode failed, ederror=%u", __FUNCTION__,
> ederror);
> - } else
> - osafassert(0);
> -
> - TRACE_LEAVE2("status '%u'", status);
> - return status;
> -}
> -
> -/****************************************************************************\
> - * Function: enc_comp_curr_num_csi_stby
> - *
> - * Purpose: Encode COMP Current number of CSI standby.
> - *
> - * Input: cb - CB pointer.
> - * enc - Encode arguments passed by MBCSV.
> - *
> - * Returns: NCSCC_RC_SUCCESS/NCSCC_RC_FAILURE.
> - *
> - * NOTES:
> - *
> - *
> -\**************************************************************************/
> -static uint32_t enc_comp_curr_num_csi_stby(AVD_CL_CB *cb, NCS_MBCSV_CB_ENC
> *enc)
> -{
> - uint32_t status = NCSCC_RC_SUCCESS;
> - EDU_ERR ederror = static_cast<EDU_ERR>(0);
> - TRACE_ENTER();
> -
> - osafassert(0);
> -
> - /*
> - * Action in this case is just to update. If action passed is add/rmv
> then log
> - * error. Call EDU encode to encode this field.
> - */
> - if (NCS_MBCSV_ACT_UPDATE == enc->io_action) {
> - status = m_NCS_EDU_SEL_VER_EXEC(&cb->edu_hdl,
> avsv_edp_ckpt_msg_comp, &enc->io_uba,
> - EDP_OP_TYPE_ENC, (AVD_COMP
> *)(NCS_INT64_TO_PTR_CAST(enc->io_reo_hdl)),
> - &ederror, enc->i_peer_version, 2, 1, 33);
> -
> - if (status != NCSCC_RC_SUCCESS)
> - LOG_ER("%s: encode failed, ederror=%u", __FUNCTION__,
> ederror);
> - } else
> - osafassert(0);
> -
> - TRACE_LEAVE2("status '%u'", status);
> - return status;
> + TRACE_LEAVE();
> + return NCSCC_RC_SUCCESS;
> }
>
>
> /****************************************************************************\
> @@ -1736,28 +1660,24 @@ static uint32_t enc_comp_curr_num_csi_st
> *
> *
> \**************************************************************************/
> -static uint32_t enc_comp_oper_state(AVD_CL_CB *cb, NCS_MBCSV_CB_ENC *enc)
> -{
> - uint32_t status = NCSCC_RC_SUCCESS;
> - EDU_ERR ederror = static_cast<EDU_ERR>(0);
> - TRACE_ENTER();
> +static uint32_t enc_comp_oper_state(AVD_CL_CB *cb, NCS_MBCSV_CB_ENC *enc) {
> + AVD_COMP *comp = (AVD_COMP *) (NCS_INT64_TO_PTR_CAST(enc->io_reo_hdl));
>
> - /*
> - * Action in this case is just to update. If action passed is add/rmv
> then log
> - * error. Call EDU encode to encode this field.
> - */
> - if (NCS_MBCSV_ACT_UPDATE == enc->io_action) {
> - status = m_NCS_EDU_SEL_VER_EXEC(&cb->edu_hdl,
> avsv_edp_ckpt_msg_comp, &enc->io_uba,
> - EDP_OP_TYPE_ENC, (AVD_COMP
> *)(NCS_INT64_TO_PTR_CAST(enc->io_reo_hdl)),
> - &ederror, enc->i_peer_version, 2, 1, 2);
> + TRACE_ENTER();
>
> - if (status != NCSCC_RC_SUCCESS)
> - LOG_ER("%s: encode failed, ederror=%u", __FUNCTION__,
> ederror);
> - } else
> - osafassert(0);
> + /*
> + * Action in this case is just to update. If action passed is add/rmv then
> log
> + * error. Call EDU encode to encode this field.
> + */
> + if (NCS_MBCSV_ACT_UPDATE == enc->io_action) {
> + osaf_encode_sanamet(&enc->io_uba, &comp->comp_info.name);
> + osaf_encode_uint32(&enc->io_uba, comp->saAmfCompOperState);
> + } else {
> + osafassert(0);
> + }
>
> - TRACE_LEAVE2("status '%u'", status);
> - return status;
> + TRACE_LEAVE();
> + return NCSCC_RC_SUCCESS;
> }
>
>
> /****************************************************************************\
> @@ -1774,28 +1694,24 @@ static uint32_t enc_comp_oper_state(AVD_
> *
> *
> \**************************************************************************/
> -static uint32_t enc_comp_readiness_state(AVD_CL_CB *cb, NCS_MBCSV_CB_ENC
> *enc)
> -{
> - uint32_t status = NCSCC_RC_SUCCESS;
> - EDU_ERR ederror = static_cast<EDU_ERR>(0);
> - TRACE_ENTER();
> +static uint32_t enc_comp_readiness_state(AVD_CL_CB *cb, NCS_MBCSV_CB_ENC
> *enc) {
> + AVD_COMP *comp = (AVD_COMP *) (NCS_INT64_TO_PTR_CAST(enc->io_reo_hdl));
>
> - /*
> - * Action in this case is just to update. If action passed is add/rmv
> then log
> - * error. Call EDU encode to encode this field.
> - */
> - if (NCS_MBCSV_ACT_UPDATE == enc->io_action) {
> - status = m_NCS_EDU_SEL_VER_EXEC(&cb->edu_hdl,
> avsv_edp_ckpt_msg_comp, &enc->io_uba,
> - EDP_OP_TYPE_ENC, (AVD_COMP
> *)(NCS_INT64_TO_PTR_CAST(enc->io_reo_hdl)),
> - &ederror, enc->i_peer_version, 2, 1, 3);
> + TRACE_ENTER();
>
> - if (status != NCSCC_RC_SUCCESS)
> - LOG_ER("%s: encode failed, ederror=%u", __FUNCTION__,
> ederror);
> - } else
> - osafassert(0);
> + /*
> + * Action in this case is just to update. If action passed is add/rmv then
> log
> + * error. Call EDU encode to encode this field.
> + */
> + if (NCS_MBCSV_ACT_UPDATE == enc->io_action) {
> + osaf_encode_sanamet(&enc->io_uba, &comp->comp_info.name);
> + osaf_encode_uint32(&enc->io_uba, comp->saAmfCompReadinessState);
> + } else {
> + osafassert(0);
> + }
>
> - TRACE_LEAVE2("status '%u'", status);
> - return status;
> + TRACE_LEAVE();
> + return NCSCC_RC_SUCCESS;
> }
>
>
> /****************************************************************************\
> @@ -1812,28 +1728,26 @@ static uint32_t enc_comp_readiness_state
> *
> *
> \**************************************************************************/
> -static uint32_t enc_comp_pres_state(AVD_CL_CB *cb, NCS_MBCSV_CB_ENC *enc)
> -{
> - uint32_t status = NCSCC_RC_SUCCESS;
> - EDU_ERR ederror = static_cast<EDU_ERR>(0);
> - TRACE_ENTER();
> +static uint32_t enc_comp_pres_state(AVD_CL_CB *cb, NCS_MBCSV_CB_ENC *enc) {
> + AVD_COMP *comp = (AVD_COMP *) (NCS_INT64_TO_PTR_CAST(enc->io_reo_hdl));
>
> - /*
> - * Action in this case is just to update. If action passed is add/rmv
> then log
> - * error. Call EDU encode to encode this field.
> - */
> - if (NCS_MBCSV_ACT_UPDATE == enc->io_action) {
> - status = m_NCS_EDU_SEL_VER_EXEC(&cb->edu_hdl,
> avsv_edp_ckpt_msg_comp, &enc->io_uba,
> - EDP_OP_TYPE_ENC, (AVD_COMP
> *)(NCS_INT64_TO_PTR_CAST(enc->io_reo_hdl)),
> - &ederror, enc->i_peer_version, 2, 1, 4);
> + TRACE_ENTER();
>
> - if (status != NCSCC_RC_SUCCESS)
> - LOG_ER("%s: encode failed, ederror=%u", __FUNCTION__,
> ederror);
> - } else
> - osafassert(0);
>
> - TRACE_LEAVE2("status '%u'", status);
> - return status;
> + /*
> + * Action in this case is just to update. If action passed is add/rmv then
> log
> + * error. Call EDU encode to encode this field.
> + */
> + if (NCS_MBCSV_ACT_UPDATE == enc->io_action) {
> + osaf_encode_sanamet(&enc->io_uba, &comp->comp_info.name);
> + osaf_encode_uint32(&enc->io_uba, comp->saAmfCompPresenceState);
> +
> + } else {
> + osafassert(0);
> + }
> +
> + TRACE_LEAVE();
> + return NCSCC_RC_SUCCESS;
> }
>
>
> /****************************************************************************\
> @@ -1850,28 +1764,26 @@ static uint32_t enc_comp_pres_state(AVD_
> *
> *
> \**************************************************************************/
> -static uint32_t enc_comp_restart_count(AVD_CL_CB *cb, NCS_MBCSV_CB_ENC *enc)
> -{
> - uint32_t status = NCSCC_RC_SUCCESS;
> - EDU_ERR ederror = static_cast<EDU_ERR>(0);
> - TRACE_ENTER();
> +static uint32_t enc_comp_restart_count(AVD_CL_CB *cb, NCS_MBCSV_CB_ENC *enc)
> {
> + AVD_COMP *comp = (AVD_COMP *) (NCS_INT64_TO_PTR_CAST(enc->io_reo_hdl));
>
> - /*
> - * Action in this case is just to update. If action passed is add/rmv
> then log
> - * error. Call EDU encode to encode this field.
> - */
> - if (NCS_MBCSV_ACT_UPDATE == enc->io_action) {
> - status = m_NCS_EDU_SEL_VER_EXEC(&cb->edu_hdl,
> avsv_edp_ckpt_msg_comp, &enc->io_uba,
> - EDP_OP_TYPE_ENC, (AVD_COMP
> *)(NCS_INT64_TO_PTR_CAST(enc->io_reo_hdl)),
> - &ederror, enc->i_peer_version, 2, 1, 5);
> + TRACE_ENTER();
>
> - if (status != NCSCC_RC_SUCCESS)
> - LOG_ER("%s: encode failed, ederror=%u", __FUNCTION__,
> ederror);
> - } else
> - osafassert(0);
> + /*
> + * Action in this case is just to update. If action passed is add/rmv then
> log
> + * error. Call EDU encode to encode this field.
> + */
> + if (NCS_MBCSV_ACT_UPDATE == enc->io_action) {
>
> - TRACE_LEAVE2("status '%u'", status);
> - return status;
> + osaf_encode_sanamet(&enc->io_uba, &comp->comp_info.name);
> +
> + osaf_encode_uint32(&enc->io_uba, comp->saAmfCompRestartCount);
> + } else {
> + osafassert(0);
> + }
> +
> + TRACE_LEAVE();
> + return NCSCC_RC_SUCCESS;
> }
>
>
> /****************************************************************************\
> @@ -2378,7 +2290,7 @@ static uint32_t enc_cs_siass(AVD_CL_CB *
>
> /****************************************************************************\
> * Function: enc_cs_comp_config
> *
> - * Purpose: Encode entire AVD_COMP data..
> + * Purpose: Encode entire AVD_COMP data.
> *
> * Input: cb - CB pointer.
> * enc - Encode arguments passed by MBCSV.
> @@ -2391,8 +2303,6 @@ static uint32_t enc_cs_siass(AVD_CL_CB *
> \**************************************************************************/
> static uint32_t enc_cs_comp_config(AVD_CL_CB *cb, NCS_MBCSV_CB_ENC *enc,
> uint32_t *num_of_obj)
> {
> - uint32_t status = NCSCC_RC_SUCCESS;
> - EDU_ERR ederror = static_cast<EDU_ERR>(0);
> TRACE_ENTER();
>
> /*
> @@ -2401,19 +2311,14 @@ static uint32_t enc_cs_comp_config(AVD_C
> for (std::map<std::string, AVD_COMP*>::const_iterator it =
> comp_db->begin();
> it != comp_db->end(); it++) {
> AVD_COMP *comp = it->second;
> - status = m_NCS_EDU_VER_EXEC(&cb->edu_hdl,
> avsv_edp_ckpt_msg_comp, &enc->io_uba,
> - EDP_OP_TYPE_ENC, comp, &ederror,
> enc->i_peer_version);
>
> - if (status != NCSCC_RC_SUCCESS) {
> - LOG_ER("%s: encode failed, ederror=%u", __FUNCTION__,
> ederror);
> - return NCSCC_RC_FAILURE;
> - }
> + encode_comp(&enc->io_uba, comp);
>
> (*num_of_obj)++;
> }
>
> - TRACE_LEAVE2("status '%u'", status);
> - return status;
> + TRACE_LEAVE();
> + return NCSCC_RC_SUCCESS;
> }
>
>
> /****************************************************************************\
> diff --git a/osaf/services/saf/amf/amfd/include/ckpt_msg.h
> b/osaf/services/saf/amf/amfd/include/ckpt_msg.h
> --- a/osaf/services/saf/amf/amfd/include/ckpt_msg.h
> +++ b/osaf/services/saf/amf/amfd/include/ckpt_msg.h
> @@ -100,8 +100,6 @@ typedef enum avsv_ckpt_msg_reo_type {
>
> /* COMP Async Update messages */
> AVSV_CKPT_COMP_CURR_PROXY_NAME,
> - AVSV_CKPT_COMP_CURR_NUM_CSI_ACTV,
> - AVSV_CKPT_COMP_CURR_NUM_CSI_STBY,
[Praveen] Patch removes these two enum values and their corresponding
function handlers.
Since patch does not update amfd mbcsv version, old AMFD (release 4.x)
will go out of sync and crash. If 5.0 is not required to be upgradable
from 4.7, then above mentioned consideration for old AMFD is not required.
I think till now we do not have any such information like upgrade
requirement for 5.0 from 4.x series.
Ideally this is major version change, so there should not be any such
requirement on 5.0.
Thanks,
Praveen
> AVSV_CKPT_COMP_OPER_STATE,
> AVSV_CKPT_COMP_READINESS_STATE,
> AVSV_CKPT_COMP_PRES_STATE,
>
------------------------------------------------------------------------------
Go from Idea to Many App Stores Faster with Intel(R) XDK
Give your users amazing mobile app experiences with Intel(R) XDK.
Use one codebase in this all-in-one HTML5 development environment.
Design, debug & build mobile apps & 2D/3D high-impact games for multiple OSs.
http://pubads.g.doubleclick.net/gampad/clk?id=254741551&iu=/4140
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
