Ack for the patches 1-5.
Reviewing 6-16.
Thanks,
Praveen
On 19-Aug-14 12:16 PM, Gary Lee wrote:
> osaf/services/saf/amf/amfd/ckpt_dec.cc | 2 +-
> osaf/services/saf/amf/amfd/include/si.h | 3 +
> osaf/services/saf/amf/amfd/include/si_dep.h | 1 -
> osaf/services/saf/amf/amfd/sg_2n_fsm.cc | 8 +-
> osaf/services/saf/amf/amfd/sg_npm_fsm.cc | 4 +-
> osaf/services/saf/amf/amfd/sg_nway_fsm.cc | 2 +-
> osaf/services/saf/amf/amfd/si_dep.cc | 93
> ++++++++++++++--------------
> 7 files changed, 58 insertions(+), 55 deletions(-)
>
>
> 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
> @@ -1680,7 +1680,7 @@ static uint32_t dec_si_dep_state(AVD_CL_
> osaf_decode_uint32(&dec->i_uba, &si_dep_state);
>
> /* Update the fields received in this checkpoint message */
> - avd_sidep_si_dep_state_set(si, (AVD_SI_DEP_STATE)si_dep_state);
> + si->set_dep_state((AVD_SI_DEP_STATE)si_dep_state);
>
> cb->async_updt_cnt.si_updt++;
>
> diff --git a/osaf/services/saf/amf/amfd/include/si.h
> b/osaf/services/saf/amf/amfd/include/si.h
> --- a/osaf/services/saf/amf/amfd/include/si.h
> +++ b/osaf/services/saf/amf/amfd/include/si.h
> @@ -140,6 +140,9 @@ public:
> void arrange_dep_csi(struct avd_csi_tag* csi);
> void add_csi_db(struct avd_csi_tag* csi);
>
> + // SI SI dependency related functions
> + void set_dep_state(AVD_SI_DEP_STATE state);
> +
> private:
> AVD_SI(const AVD_SI&);
> AVD_SI& operator=(const AVD_SI&);
> diff --git a/osaf/services/saf/amf/amfd/include/si_dep.h
> b/osaf/services/saf/amf/amfd/include/si_dep.h
> --- a/osaf/services/saf/amf/amfd/include/si_dep.h
> +++ b/osaf/services/saf/amf/amfd/include/si_dep.h
> @@ -78,7 +78,6 @@ void sidep_stop_tol_timer(AVD_CL_CB *cb,
> extern SaAisErrorT avd_sidep_config_get(void);
> extern void avd_sidep_constructor(void);
> extern void avd_sidep_reset_dependents_depstate_in_sufault(AVD_SI *si);
> -extern void avd_sidep_si_dep_state_set(AVD_SI *si, AVD_SI_DEP_STATE state);
> extern bool avd_sidep_is_su_failover_possible(AVD_SU *su);
> extern bool avd_sidep_is_si_failover_possible(AVD_SI *si, AVD_SU *su);
> extern void avd_sidep_update_depstate_su_rolefailover(AVD_SU *su);
> diff --git a/osaf/services/saf/amf/amfd/sg_2n_fsm.cc
> b/osaf/services/saf/amf/amfd/sg_2n_fsm.cc
> --- a/osaf/services/saf/amf/amfd/sg_2n_fsm.cc
> +++ b/osaf/services/saf/amf/amfd/sg_2n_fsm.cc
> @@ -1214,7 +1214,7 @@ uint32_t SG_2N::su_fault(AVD_CL_CB *cb,
> */
> for (l_susi = su->list_of_susi;l_susi != NULL;l_susi =
> l_susi->su_next) {
> if(l_susi->si->si_dep_state ==
> AVD_SI_FAILOVER_UNDER_PROGRESS)
> - avd_sidep_si_dep_state_set(l_susi->si,
> AVD_SI_SPONSOR_UNASSIGNED);
> +
> l_susi->si->set_dep_state(AVD_SI_SPONSOR_UNASSIGNED);
> if (l_susi->si->num_dependents > 0)
>
> avd_sidep_reset_dependents_depstate_in_sufault(l_susi->si);
> }
> @@ -3000,7 +3000,7 @@ void SG_2N::node_fail_si_oper(AVD_SU *su
> * sponsor SIs are
> assigned back,if so move the SI state to ASSIGNED state
> */
> if
> (avd_sidep_sponsors_assignment_states(susi_temp->si))
> -
> avd_sidep_si_dep_state_set(susi_temp->si, AVD_SI_ASSIGNED);
> +
> susi_temp->si->set_dep_state(AVD_SI_ASSIGNED);
> else
>
> avd_susi_del_send(susi_temp);
> }
> @@ -3072,7 +3072,7 @@ void SG_2N::node_fail_si_oper(AVD_SU *su
> * sponsor SIs
> are assigned back,if so move the SI state to ASSIGNED state
> */
> if
> (avd_sidep_sponsors_assignment_states(susi_temp->si))
> -
> avd_sidep_si_dep_state_set(susi_temp->si, AVD_SI_ASSIGNED);
> +
> susi_temp->si->set_dep_state(AVD_SI_ASSIGNED);
> else
>
> avd_susi_del_send(susi_temp);
> }
> @@ -3166,7 +3166,7 @@ void SG_2N::node_fail(AVD_CL_CB *cb, AVD
> * sponsor SIs
> are assigned back,if so move the SI state to ASSIGNED state
> */
> if
> (avd_sidep_sponsors_assignment_states(s_susi->si))
> -
> avd_sidep_si_dep_state_set(s_susi->si, AVD_SI_ASSIGNED);
> +
> s_susi->si->set_dep_state(AVD_SI_ASSIGNED);
> else
>
> avd_susi_del_send(s_susi);
> }
> diff --git a/osaf/services/saf/amf/amfd/sg_npm_fsm.cc
> b/osaf/services/saf/amf/amfd/sg_npm_fsm.cc
> --- a/osaf/services/saf/amf/amfd/sg_npm_fsm.cc
> +++ b/osaf/services/saf/amf/amfd/sg_npm_fsm.cc
> @@ -1265,7 +1265,7 @@ static uint32_t avd_sg_npm_su_fault_sg_r
> AVD_SU_SI_REL *l_susi;
> for (l_susi = su->list_of_susi;l_susi != NULL;l_susi =
> l_susi->su_next) {
> if(l_susi->si->si_dep_state ==
> AVD_SI_FAILOVER_UNDER_PROGRESS)
> - avd_sidep_si_dep_state_set(l_susi->si,
> AVD_SI_SPONSOR_UNASSIGNED);
> +
> l_susi->si->set_dep_state(AVD_SI_SPONSOR_UNASSIGNED);
> if (l_susi->si->num_dependents > 0)
>
> avd_sidep_reset_dependents_depstate_in_sufault(l_susi->si);
> }
> @@ -2389,7 +2389,7 @@ static void avd_sg_npm_stdbysu_role_chan
>
> } else {
> TRACE("Role failover is
> deferred as sponsors role failover is under going");
> -
> avd_sidep_si_dep_state_set(act_susi->si, AVD_SI_FAILOVER_UNDER_PROGRESS);
> +
> act_susi->si->set_dep_state(AVD_SI_FAILOVER_UNDER_PROGRESS);
> }
> }
> }
> diff --git a/osaf/services/saf/amf/amfd/sg_nway_fsm.cc
> b/osaf/services/saf/amf/amfd/sg_nway_fsm.cc
> --- a/osaf/services/saf/amf/amfd/sg_nway_fsm.cc
> +++ b/osaf/services/saf/amf/amfd/sg_nway_fsm.cc
> @@ -1629,7 +1629,7 @@ uint32_t avd_sg_nway_su_fault_sg_realign
> */
> for (curr_susi = su->list_of_susi;curr_susi !=
> NULL;curr_susi = curr_susi->su_next) {
> if(curr_susi->si->si_dep_state ==
> AVD_SI_FAILOVER_UNDER_PROGRESS)
> -
> avd_sidep_si_dep_state_set(curr_susi->si, AVD_SI_SPONSOR_UNASSIGNED);
> +
> curr_susi->si->set_dep_state(AVD_SI_SPONSOR_UNASSIGNED);
> if (curr_susi->si->num_dependents > 0)
>
> avd_sidep_reset_dependents_depstate_in_sufault(curr_susi->si);
> }
> diff --git a/osaf/services/saf/amf/amfd/si_dep.cc
> b/osaf/services/saf/amf/amfd/si_dep.cc
> --- a/osaf/services/saf/amf/amfd/si_dep.cc
> +++ b/osaf/services/saf/amf/amfd/si_dep.cc
> @@ -193,31 +193,32 @@ static const char *depstatename[] = {
> * @return Nothing
> *
> **/
> -void avd_sidep_si_dep_state_set(AVD_SI *si, AVD_SI_DEP_STATE state)
> +
> +void AVD_SI::set_dep_state(AVD_SI_DEP_STATE state)
> {
> - AVD_SI_DEP_STATE old_state = si->si_dep_state;
> + AVD_SI_DEP_STATE old_state = si_dep_state;
> if (old_state == state)
> return;
> - si->si_dep_state = state;
> - TRACE("'%s' si_dep_state %s => %s", si->name.value,
> depstatename[old_state], depstatename[state]);
> - m_AVSV_SEND_CKPT_UPDT_ASYNC_UPDT(avd_cb, si, AVSV_CKPT_SI_DEP_STATE);
> + si_dep_state = state;
> + TRACE("'%s' si_dep_state %s => %s", name.value,
> depstatename[old_state], depstatename[state]);
> + m_AVSV_SEND_CKPT_UPDT_ASYNC_UPDT(avd_cb, this, AVSV_CKPT_SI_DEP_STATE);
>
> if (avd_cb->avail_state_avd != SA_AMF_HA_ACTIVE) {
> - TRACE("si->num_dependents:%u", si->num_dependents);
> + TRACE("si->num_dependents:%u", num_dependents);
> /* If the Sponsor SI is Unasigned then iterate through all its
> dependents
> and start Tolerance timer for each dependent */
> - if ((si->num_dependents) &&
> - ((si->si_dep_state ==
> AVD_SI_SPONSOR_UNASSIGNED) ||
> - (si->si_dep_state == AVD_SI_NO_DEPENDENCY) ||
> - (si->si_dep_state == AVD_SI_READY_TO_ASSIGN)))
> {
> + if ((num_dependents) &&
> + ((si_dep_state == AVD_SI_SPONSOR_UNASSIGNED) ||
> + (si_dep_state == AVD_SI_NO_DEPENDENCY) ||
> + (si_dep_state == AVD_SI_READY_TO_ASSIGN))) {
> /*Check if this SI is a sponsor SI for some other SI
> then
> take appropriate action on dependents.*/
> - sidep_take_action_on_dependents(si);
> + sidep_take_action_on_dependents(this);
> }
> /*If a dependent si moves to AVD_SI_READY_TO_UNASSIGN state
> then start the tolerance timer.*/
> - if (si->si_dep_state == AVD_SI_READY_TO_UNASSIGN)
> - sidep_process_ready_to_unassign_depstate(si);
> + if (si_dep_state == AVD_SI_READY_TO_UNASSIGN)
> + sidep_process_ready_to_unassign_depstate(this);
> }
> }
>
> @@ -430,9 +431,9 @@ uint32_t sidep_unassign_dependent(AVD_CL
> susi = susi->si_next;
> }
> if(si->spons_si_list == NULL)
> - avd_sidep_si_dep_state_set(si, AVD_SI_NO_DEPENDENCY);
> + si->set_dep_state(AVD_SI_NO_DEPENDENCY);
> else
> - avd_sidep_si_dep_state_set(si, AVD_SI_SPONSOR_UNASSIGNED);
> + si->set_dep_state(AVD_SI_SPONSOR_UNASSIGNED);
>
> /* transition to sg-realign state */
> m_AVD_SET_SG_FSM(cb, si->sg_of_si, AVD_SG_FSM_SG_REALIGN);
> @@ -475,7 +476,7 @@ uint32_t sidep_sg_red_si_process_assignm
> }
>
> if (sidep_is_si_active(si)) {
> - avd_sidep_si_dep_state_set(si, AVD_SI_ASSIGNED);
> + si->set_dep_state(AVD_SI_ASSIGNED);
> rc = NCSCC_RC_SUCCESS;
> }
> }
> @@ -519,7 +520,7 @@ uint32_t sidep_si_dep_state_evt_send(AVD
>
> /*For unassignment mark the si_dep_state t- AVD_SI_READY_TO_UNASSIGN*/
> if (evt_type == AVD_EVT_UNASSIGN_SI_DEP_STATE)
> - avd_sidep_si_dep_state_set(si, AVD_SI_READY_TO_UNASSIGN);
> + si->set_dep_state(AVD_SI_READY_TO_UNASSIGN);
>
> if (m_NCS_IPC_SEND(&cb->avd_mbx, evt, NCS_IPC_PRIORITY_HIGH) !=
> NCSCC_RC_SUCCESS) {
> LOG_ER("%s: ipc send %u failed", __FUNCTION__, evt->rcv_evt);
> @@ -577,7 +578,7 @@ void avd_sidep_tol_tmr_evh(AVD_CL_CB *cb
> if (cb->avail_state_avd != SA_AMF_HA_ACTIVE)
> goto done;
>
> - avd_sidep_si_dep_state_set(si, AVD_SI_UNASSIGNING_DUE_TO_DEP);
> + si->set_dep_state(AVD_SI_UNASSIGNING_DUE_TO_DEP);
> /* Do not take action on dependent si if its sg fsm is unstable.
> When sg becomes stable, based on updated
> si_dep_state action is taken.
> @@ -597,7 +598,7 @@ void avd_sidep_tol_tmr_evh(AVD_CL_CB *cb
> and stop other tolerance timers.
> */
> if (sidep_is_si_active(si))
> - avd_sidep_si_dep_state_set(si, AVD_SI_ASSIGNED);
> + si->set_dep_state(AVD_SI_ASSIGNED);
> else
> sidep_sg_red_si_process_assignment(cb, si);
>
> @@ -610,7 +611,7 @@ void avd_sidep_tol_tmr_evh(AVD_CL_CB *cb
> sidep_unassign_dependent(cb, si);
> }
> else
> - avd_sidep_si_dep_state_set(si,
> AVD_SI_SPONSOR_UNASSIGNED);
> + si->set_dep_state(AVD_SI_SPONSOR_UNASSIGNED);
>
> }
>
> @@ -812,7 +813,7 @@ void sidep_si_dep_start_unassign(AVD_CL_
> * initiate the unassignment process for the (dependent) SI.
> */
> if (avd_sidep_all_sponsors_active(si)) {
> - avd_sidep_si_dep_state_set(si, AVD_SI_ASSIGNED);
> + si->set_dep_state(AVD_SI_ASSIGNED);
> goto done;
> }
>
> @@ -820,7 +821,7 @@ void sidep_si_dep_start_unassign(AVD_CL_
> * unassignment
> */
> if (si->list_of_sisu == AVD_SU_SI_REL_NULL) {
> - avd_sidep_si_dep_state_set(si, AVD_SI_SPONSOR_UNASSIGNED);
> + si->set_dep_state(AVD_SI_SPONSOR_UNASSIGNED);
> goto done;
> }
>
> @@ -878,13 +879,13 @@ void sidep_update_si_dep_state_for_spons
> LOG_NO("Tolerance timer started, sponsor si:'%s',
> dependent si:%s",
> spons_si->name.value,
> dep_si->name.value);
> }
> - avd_sidep_si_dep_state_set(dep_si, AVD_SI_TOL_TIMER_RUNNING);
> + dep_si->set_dep_state(AVD_SI_TOL_TIMER_RUNNING);
> } else if (cb->avail_state_avd == SA_AMF_HA_ACTIVE) {
> /*Tolerance time is not configured for this si-si dependency.
> If active amfd then send an event to start SI unassignment
> process.
> */
> if (dep_si->si_dep_state != AVD_SI_UNASSIGNING_DUE_TO_DEP) {
> - avd_sidep_si_dep_state_set(dep_si,
> AVD_SI_READY_TO_UNASSIGN);
> + dep_si->set_dep_state(AVD_SI_READY_TO_UNASSIGN);
> sidep_si_dep_state_evt_send(cb, dep_si,
> AVD_EVT_UNASSIGN_SI_DEP_STATE);
> }
> }
> @@ -930,7 +931,7 @@ void sidep_take_action_on_dependents(AVD
> (dep_si->sg_of_si != si->sg_of_si)) {
> if ((dep_si->si_dep_state ==
> AVD_SI_FAILOVER_UNDER_PROGRESS) &&
>
> (avd_sidep_all_sponsors_active(dep_si))) {
> - avd_sidep_si_dep_state_set(dep_si,
> AVD_SI_READY_TO_ASSIGN);
> + dep_si->set_dep_state(AVD_SI_READY_TO_ASSIGN);
> sidep_dependentsi_role_failover(dep_si);
> }
> continue;
> @@ -941,7 +942,7 @@ void sidep_take_action_on_dependents(AVD
> * update its dep_state to AVD_SI_READY_TO_UNASSIGN
> */
> TRACE("Send an event to start SI unassignment process");
> - avd_sidep_si_dep_state_set(dep_si,
> AVD_SI_READY_TO_UNASSIGN);
> + dep_si->set_dep_state(AVD_SI_READY_TO_UNASSIGN);
> }
>
> if (dep_si->si_dep_state == AVD_SI_READY_TO_UNASSIGN) {
> @@ -1243,9 +1244,9 @@ static AVD_SI_DEP *sidep_new(SaNameT *si
> may be made and thus it will help in avoiding re-screening in
> *_chosen_asgn().
> */
> if (avd_sidep_all_sponsors_active(sidep->dep_si))
> - avd_sidep_si_dep_state_set(sidep->dep_si,
> AVD_SI_READY_TO_ASSIGN);
> + sidep->dep_si->set_dep_state(AVD_SI_READY_TO_ASSIGN);
> else
> - avd_sidep_si_dep_state_set(sidep->dep_si,
> AVD_SI_SPONSOR_UNASSIGNED);
> + sidep->dep_si->set_dep_state(AVD_SI_SPONSOR_UNASSIGNED);
> }
> TRACE_LEAVE();
> return sidep;
> @@ -1677,7 +1678,7 @@ bool avd_sidep_is_si_failover_possible(A
> }
> }
> if (sponsor_in_modify_state == true) {
> - avd_sidep_si_dep_state_set(si,
> AVD_SI_FAILOVER_UNDER_PROGRESS);
> + si->set_dep_state(AVD_SI_FAILOVER_UNDER_PROGRESS);
> failover_possible = false;
> goto done;
> }
> @@ -1717,7 +1718,7 @@ bool avd_sidep_is_su_failover_possible(A
> flag = avd_sidep_is_si_failover_possible(susi->si, su);
> if (flag == false){
> TRACE("Role failover is deferred as sponsors
> role failover is under going");
> - avd_sidep_si_dep_state_set(susi->si,
> AVD_SI_FAILOVER_UNDER_PROGRESS);
> +
> susi->si->set_dep_state(AVD_SI_FAILOVER_UNDER_PROGRESS);
> goto done;
> }
> }
> @@ -1791,7 +1792,7 @@ void avd_sidep_update_depstate_si_failov
> (dep_si->si_dep_state
> != AVD_SI_FAILOVER_UNDER_PROGRESS)) &&
>
> (avd_sidep_sponsors_assignment_states(dep_si))) {
>
> -
> avd_sidep_si_dep_state_set(dep_si, AVD_SI_FAILOVER_UNDER_PROGRESS);
> +
> dep_si->set_dep_state(AVD_SI_FAILOVER_UNDER_PROGRESS);
> if
> (dep_si->num_dependents > 0) {
> /* This SI also
> has dependents under it, update their state also */
>
> avd_sidep_update_depstate_si_failover(dep_si, su);
> @@ -1803,7 +1804,7 @@ void avd_sidep_update_depstate_si_failov
> (dep_si->si_dep_state !=
> AVD_SI_READY_TO_UNASSIGN) ||
> (dep_si->si_dep_state !=
> AVD_SI_FAILOVER_UNDER_PROGRESS)) {
>
> -
> avd_sidep_si_dep_state_set(dep_si, AVD_SI_FAILOVER_UNDER_PROGRESS);
> +
> dep_si->set_dep_state(AVD_SI_FAILOVER_UNDER_PROGRESS);
> if (dep_si->num_dependents > 0)
> {
> /* This SI also has
> dependents under it, update their state also */
>
> avd_sidep_update_depstate_si_failover(dep_si, su);
> @@ -1844,7 +1845,7 @@ void avd_sidep_update_depstate_si_failov
>
> (dep_si->si_dep_state != AVD_SI_READY_TO_UNASSIGN) ||
>
> (dep_si->si_dep_state != AVD_SI_FAILOVER_UNDER_PROGRESS)) {
>
> -
> avd_sidep_si_dep_state_set(dep_si, AVD_SI_FAILOVER_UNDER_PROGRESS);
> +
> dep_si->set_dep_state(AVD_SI_FAILOVER_UNDER_PROGRESS);
> if
> (dep_si->num_dependents > 0) {
>
> avd_sidep_update_depstate_si_failover(dep_si, su);
> }
> @@ -1934,7 +1935,7 @@ static void sidep_dependentsi_role_failo
> */
> avd_sg_su_si_mod_snd(avd_cb, stdby_su,
> SA_AMF_HA_ACTIVE);
>
> - avd_sidep_si_dep_state_set(si, AVD_SI_ASSIGNED);
> + si->set_dep_state(AVD_SI_ASSIGNED);
> }
> if (si->sg_of_si->su_oper_list.su == NULL) {
> /* add the SU to the operation list and change
> the SG FSM to SG realign. */
> @@ -1967,7 +1968,7 @@ static void sidep_dependentsi_role_failo
> */
> avd_sg_su_si_mod_snd(avd_cb, stdby_su,
> SA_AMF_HA_ACTIVE);
>
> - avd_sidep_si_dep_state_set(si, AVD_SI_ASSIGNED);
> + si->set_dep_state(AVD_SI_ASSIGNED);
> if (si->sg_of_si->su_oper_list.su == NULL) {
> /* add the SU to the operation list and change
> the SG FSM to SG realign. */
> avd_sg_su_oper_list_add(avd_cb, stdby_su,
> false);
> @@ -1982,7 +1983,7 @@ static void sidep_dependentsi_role_failo
> if (susi) {
> avd_susi_mod_send(susi, SA_AMF_HA_ACTIVE);
> m_AVD_SET_SG_FSM(avd_cb, si->sg_of_si,
> AVD_SG_FSM_SG_REALIGN);
> - avd_sidep_si_dep_state_set(si, AVD_SI_ASSIGNED);
> + si->set_dep_state(AVD_SI_ASSIGNED);
> }
> }
> break;
> @@ -2015,7 +2016,7 @@ void avd_sidep_reset_dependents_depstate
> osafassert(dep_si != NULL);
>
> if (dep_si->si_dep_state == AVD_SI_FAILOVER_UNDER_PROGRESS)
> - avd_sidep_si_dep_state_set(dep_si,
> AVD_SI_SPONSOR_UNASSIGNED);
> + dep_si->set_dep_state(AVD_SI_SPONSOR_UNASSIGNED);
> }
>
> TRACE_LEAVE();
> @@ -2112,7 +2113,7 @@ void avd_sidep_send_active_to_dependents
> sisu = avd_find_preferred_standby_susi(dep_si);
> if (sisu) {
> avd_susi_mod_send(sisu,
> SA_AMF_HA_ACTIVE);
> - avd_sidep_si_dep_state_set(dep_si,
> AVD_SI_ASSIGNED);
> + dep_si->set_dep_state(AVD_SI_ASSIGNED);
> }
> else
> /* As susi failover is not possible,
> delete all the
> @@ -2122,7 +2123,7 @@ void avd_sidep_send_active_to_dependents
> default:
> break;
> }
> - avd_sidep_si_dep_state_set(dep_si, AVD_SI_ASSIGNED);
> + dep_si->set_dep_state(AVD_SI_ASSIGNED);
> }
> }
> TRACE_LEAVE();
> @@ -2257,7 +2258,7 @@ void sidep_update_si_self_dep_state(AVD_
> /*If atleast one sponsor is unassigned, unassign the dependent*/
> for (spons = si->spons_si_list; spons; spons = spons->next) {
> if (spons->si->list_of_sisu == NULL) {
> - avd_sidep_si_dep_state_set(si,
> AVD_SI_READY_TO_UNASSIGN);
> + si->set_dep_state(AVD_SI_READY_TO_UNASSIGN);
> goto done;
> }
> }
> @@ -2272,7 +2273,7 @@ void sidep_update_si_self_dep_state(AVD_
>
> if (sidep_is_si_active(si)) {
> /* Since SI is assigned set its si_dep_state to
> AVD_SI_ASSIGNED.*/
> - avd_sidep_si_dep_state_set(si, AVD_SI_ASSIGNED);
> + si->set_dep_state(AVD_SI_ASSIGNED);
> if (si->tol_timer_count > 0)
> /*Stop any toleracne timer if running */
> sidep_stop_tol_timer(avd_cb, si);
> @@ -2282,9 +2283,9 @@ void sidep_update_si_self_dep_state(AVD_
> otherwise modify it to AVD_SI_READY_TO_ASSIGN.
> */
> if (si->spons_si_list == NULL)
> - avd_sidep_si_dep_state_set(si,
> AVD_SI_NO_DEPENDENCY);
> + si->set_dep_state(AVD_SI_NO_DEPENDENCY);
> else
> - avd_sidep_si_dep_state_set(si,
> AVD_SI_READY_TO_ASSIGN);
> + si->set_dep_state(AVD_SI_READY_TO_ASSIGN);
> }
> }
> else {
> @@ -2296,10 +2297,10 @@ void sidep_update_si_self_dep_state(AVD_
> depending upon the value of saAmfToleranceTime for
> unassigned sponsors
> */
> if (si->si_dep_state != AVD_SI_UNASSIGNING_DUE_TO_DEP)
> - avd_sidep_si_dep_state_set(si,
> AVD_SI_READY_TO_UNASSIGN);
> + si->set_dep_state(AVD_SI_READY_TO_UNASSIGN);
> }
> else
> - avd_sidep_si_dep_state_set(si,
> AVD_SI_SPONSOR_UNASSIGNED);
> + si->set_dep_state(AVD_SI_SPONSOR_UNASSIGNED);
> }
> done:
> TRACE_LEAVE();
> @@ -2484,7 +2485,7 @@ void avd_sidep_unassign_evh(AVD_CL_CB *c
> dep_si = avd_si_get(&evt->info.tmr.dep_si_name);
> osafassert(dep_si != NULL);
>
> - avd_sidep_si_dep_state_set(dep_si, AVD_SI_UNASSIGNING_DUE_TO_DEP);
> + dep_si->set_dep_state(AVD_SI_UNASSIGNING_DUE_TO_DEP);
>
> /* Take action only when dependent sg fsm is stable. When SG becomes
> stable, based on updated si_dep_state action is taken.
>
------------------------------------------------------------------------------
Slashdot TV.
Video for Nerds. Stuff that matters.
http://tv.slashdot.org/
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
