Ack(Reviewed). Thanks -Nagu
> -----Original Message----- > From: Hans Feldt [mailto:osafde...@gmail.com] > Sent: 10 April 2014 18:24 > To: hans.nordeb...@ericsson.com; Praveen Malviya; Nagendra Kumar > Cc: opensaf-devel@lists.sourceforge.net > Subject: [PATCH 4 of 6] amfd: use SU method delete_all_susis [#713] > > osaf/services/saf/amf/amfd/sg_2n_fsm.cc | 70 > ++++++++++++++------------- > - > osaf/services/saf/amf/amfd/sg_npm_fsm.cc | 56 +++++++++++----------- > osaf/services/saf/amf/amfd/sg_nway_fsm.cc | 12 ++-- > osaf/services/saf/amf/amfd/sg_nwayact_fsm.cc | 20 ++++---- > osaf/services/saf/amf/amfd/sgproc.cc | 6 +- > 5 files changed, 82 insertions(+), 82 deletions(-) > > > 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 > @@ -1604,7 +1604,7 @@ static uint32_t avd_sg_2n_susi_sucss_sg_ > * operation list. > */ > > - avd_sg_su_asgn_del_util(cb, su, true, > false); > + su->delete_all_susis(); > avd_sg_su_oper_list_del(cb, su, false); > } else if ((o_su->list_of_susi != > AVD_SU_SI_REL_NULL) && > (avd_su_state_determine(o_su) == > SA_AMF_HA_ACTIVE)) { > @@ -1612,7 +1612,7 @@ static uint32_t avd_sg_2n_susi_sucss_sg_ > * Free all the SI assignments for the > SU. Remove all the SUs > * from the operation list. > */ > - avd_sg_su_asgn_del_util(cb, su, true, > false); > + su->delete_all_susis(); > while (su->sg_of_su->su_oper_list.su > != NULL) { > avd_sg_su_oper_list_del(cb, > su->sg_of_su->su_oper_list.su, false); > } > @@ -1646,7 +1646,7 @@ static uint32_t avd_sg_2n_susi_sucss_sg_ > failover */ > avd_sg_su_si_mod_snd(cb, > o_su, SA_AMF_HA_ACTIVE); > } > - avd_sg_su_asgn_del_util(cb, su, true, > false); > + su->delete_all_susis(); > avd_sg_su_oper_list_del(cb, su, false); > } > /* if ((o_su->list_of_susi != > AVD_SU_SI_REL_NULL) && > @@ -1673,7 +1673,7 @@ static uint32_t avd_sg_2n_susi_sucss_sg_ > * Free all the SI assignments > for the SU. Remove all the SUs > * from the operation list. > */ > - avd_sg_su_asgn_del_util(cb, > su, true, false); > + su->delete_all_susis(); > while (su->sg_of_su- > >su_oper_list.su != NULL) { > > avd_sg_su_oper_list_del(cb, su->sg_of_su->su_oper_list.su, false); > } > @@ -1709,7 +1709,7 @@ static uint32_t avd_sg_2n_susi_sucss_sg_ > } > } > > - avd_sg_su_asgn_del_util(cb, > su, true, false); > + su->delete_all_susis(); > while (su->sg_of_su- > >su_oper_list.su != NULL) { > > avd_sg_su_oper_list_del(cb, su->sg_of_su->su_oper_list.su, false); > } > @@ -1720,7 +1720,7 @@ static uint32_t avd_sg_2n_susi_sucss_sg_ > } else { /* if (o_su != AVD_SU_NULL) */ > > /* no other SU has any assignments. */ > - avd_sg_su_asgn_del_util(cb, su, true, > false); > + su->delete_all_susis(); > while (su->sg_of_su->su_oper_list.su > != NULL) { > avd_sg_su_oper_list_del(cb, > su->sg_of_su->su_oper_list.su, false); > } > @@ -2158,7 +2158,7 @@ static uint32_t avd_sg_2n_susi_sucss_su_ > } > if (flag == false) { > /* All are unassigned.*/ > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > } > else if (susi != NULL) { > avd_compcsi_delete(cb, susi, false); > @@ -2252,7 +2252,7 @@ static uint32_t avd_sg_2n_susi_sucss_su_ > } > > /* Free all the SI assignments to this SU. */ > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > > if (su->sg_of_su->sg_fsm_state == AVD_SG_FSM_STABLE) { > if ((l_su = avd_sg_2n_su_chose_asgn(cb, su- > >sg_of_su)) == NULL) { > @@ -2464,7 +2464,7 @@ uint32_t avd_sg_2n_susi_sucss_func(AVD_C > /* Do the action specified in the message if delete else no > action. */ > if (act == AVSV_SUSI_ACT_DEL) { > if (susi == AVD_SU_SI_REL_NULL) { > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > } else { > /* free all the CSI assignments */ > avd_compcsi_delete(cb, susi, false); > @@ -2500,7 +2500,7 @@ uint32_t avd_sg_2n_susi_sucss_func(AVD_C > } > } else if ((susi == AVD_SU_SI_REL_NULL) && (act == > AVSV_SUSI_ACT_DEL)) { > /* Free all the SI assignments to this SU */ > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > i_su = su->sg_of_su->list_of_su; > while (i_su != NULL) { > if (i_su->list_of_susi != > AVD_SU_SI_REL_NULL) { > @@ -2574,7 +2574,7 @@ uint32_t avd_sg_2n_susi_sucss_func(AVD_C > (state == SA_AMF_HA_QUIESCED)) */ > else if ((susi == AVD_SU_SI_REL_NULL) && (act == > AVSV_SUSI_ACT_DEL)) { > /* remove all. Free all the SI assignments to > this > SU */ > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > } else if ((susi != AVD_SU_SI_REL_NULL) && (act == > AVSV_SUSI_ACT_MOD) && > (state == SA_AMF_HA_QUIESCED)) { > /* susi != null means that the assignment has > been per SU level.*/ > @@ -2675,7 +2675,7 @@ uint32_t avd_sg_2n_susi_fail_func(AVD_CL > /* Do the action specified in the message if delete else no > action. */ > if (act == AVSV_SUSI_ACT_DEL) { > if (susi == AVD_SU_SI_REL_NULL) { > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > } else { > /* free all the CSI assignments */ > avd_compcsi_delete(cb, susi, false); > @@ -3036,12 +3036,12 @@ static void avd_sg_2n_node_fail_su_oper( > } > > avd_sg_su_oper_list_del(cb, su, false); > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > m_AVD_SET_SG_FSM(cb, (su->sg_of_su), > AVD_SG_FSM_SG_REALIGN); > } else { /* if (s_susi != AVD_SU_SI_REL_NULL) */ > > avd_sg_su_oper_list_del(cb, su, false); > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > m_AVD_SET_SG_FSM(cb, (su->sg_of_su), > AVD_SG_FSM_STABLE); > if ((o_su = avd_sg_2n_su_chose_asgn(cb, su- > >sg_of_su)) != NULL) { > /* add the SU to the operation list and > change the SG FSM to SG realign. */ > @@ -3076,7 +3076,7 @@ static void avd_sg_2n_node_fail_su_oper( > */ > > avd_sg_su_oper_list_del(cb, su, false); > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > > m_AVD_GET_SU_NODE_PTR(cb, su, su_node_ptr); > > @@ -3120,12 +3120,12 @@ static void avd_sg_2n_node_fail_su_oper( > } > > avd_sg_su_oper_list_del(cb, su, false); > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > m_AVD_SET_SG_FSM(cb, (su->sg_of_su), > AVD_SG_FSM_SG_REALIGN); > } else { /* if (s_susi != AVD_SU_SI_REL_NULL) */ > > avd_sg_su_oper_list_del(cb, su, false); > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > m_AVD_SET_SG_FSM(cb, (su->sg_of_su), > AVD_SG_FSM_STABLE); > /*As sg is stable, screen for si dependencies > and take action on whole sg*/ > > avd_sidep_update_si_dep_state_for_all_sis(su->sg_of_su); > @@ -3164,7 +3164,7 @@ static void avd_sg_2n_node_fail_su_oper( > } > > m_AVD_SET_SU_SWITCH(cb, (su->sg_of_su- > >su_oper_list.su), AVSV_SI_TOGGLE_STABLE); > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > > } /* if(avd_su_state_determine(su) == SA_AMF_HA_STANDBY) > */ > else if (avd_su_state_determine(su) == SA_AMF_HA_ACTIVE) { > @@ -3200,7 +3200,7 @@ static void avd_sg_2n_node_fail_su_oper( > } > > m_AVD_SET_SU_SWITCH(cb, (su->sg_of_su- > >su_oper_list.su), AVSV_SI_TOGGLE_STABLE); > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > > } > /* if (avd_su_state_determine(su) == SA_AMF_HA_ACTIVE) */ > @@ -3279,11 +3279,11 @@ static void avd_sg_2n_node_fail_si_oper( > } > > m_AVD_CLEAR_SG_ADMIN_SI(cb, (su- > >sg_of_su)); > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > } /* if (s_susi != AVD_SU_SI_REL_NULL) */ > else { > m_AVD_CLEAR_SG_ADMIN_SI(cb, (su- > >sg_of_su)); > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > m_AVD_SET_SG_FSM(cb, (su->sg_of_su), > AVD_SG_FSM_STABLE); > > if ((o_su = avd_sg_2n_su_chose_asgn(cb, su- > >sg_of_su)) != NULL) { > @@ -3298,7 +3298,7 @@ static void avd_sg_2n_node_fail_si_oper( > } else { /* if ((avd_su_state_determine(su) == > SA_AMF_HA_ACTIVE) || > (avd_su_state_determine(su) == > SA_AMF_HA_QUIESCED)) */ > /* means standby free the assignments. */ > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > > } /* else ((avd_su_state_determine(su) == > SA_AMF_HA_ACTIVE) || > (avd_su_state_determine(su) == > SA_AMF_HA_QUIESCED)) */ > @@ -3351,12 +3351,12 @@ static void avd_sg_2n_node_fail_si_oper( > > avd_si_admin_state_set((su->sg_of_su- > >admin_si), SA_AMF_ADMIN_UNLOCKED); > m_AVD_CLEAR_SG_ADMIN_SI(cb, (su- > >sg_of_su)); > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > } /* if (s_susi != AVD_SU_SI_REL_NULL) */ > else { > avd_si_admin_state_set((su->sg_of_su- > >admin_si), SA_AMF_ADMIN_LOCKED); > m_AVD_CLEAR_SG_ADMIN_SI(cb, (su- > >sg_of_su)); > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > m_AVD_SET_SG_FSM(cb, (su->sg_of_su), > AVD_SG_FSM_STABLE); > > if ((o_su = avd_sg_2n_su_chose_asgn(cb, su- > >sg_of_su)) != NULL) { > @@ -3371,7 +3371,7 @@ static void avd_sg_2n_node_fail_si_oper( > } else { /* if ((avd_su_state_determine(su) == > SA_AMF_HA_ACTIVE) || > (avd_su_state_determine(su) == > SA_AMF_HA_QUIESCING)) */ > /* means standby free the assignments. */ > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > > } /* else ((avd_su_state_determine(su) == > SA_AMF_HA_ACTIVE) || > (avd_su_state_determine(su) == > SA_AMF_HA_QUIESCING)) */ > @@ -3461,10 +3461,10 @@ void avd_sg_2n_node_fail_func(AVD_CL_CB > avd_sg_su_oper_list_add(cb, s_susi- > >su, false); > } > m_AVD_SET_SG_FSM(cb, (su->sg_of_su), > AVD_SG_FSM_SG_REALIGN); > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > } /* if (s_susi != AVD_SU_SI_REL_NULL) */ > else { > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > > if ((o_su = avd_sg_2n_su_chose_asgn(cb, su- > >sg_of_su)) != NULL) { > /* add the SU to the operation list and > change the SG FSM to SG realign. */ > @@ -3485,7 +3485,7 @@ void avd_sg_2n_node_fail_func(AVD_CL_CB > * stay in the stable state. > */ > > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > if ((o_su = avd_sg_2n_su_chose_asgn(cb, su- > >sg_of_su)) != NULL) { > /* add the SU to the operation list and change > the SG FSM to SG realign. */ > avd_sg_su_oper_list_add(cb, o_su, false); > @@ -3545,7 +3545,7 @@ void avd_sg_2n_node_fail_func(AVD_CL_CB > } > avd_sg_su_oper_list_add(cb, o_su, > false); > > - avd_sg_su_asgn_del_util(cb, su, true, > false); > + su->delete_all_susis(); > avd_sg_su_oper_list_del(cb, su, false); > } else { > /* the other SU has quiesced or > standby assigned and is in the > @@ -3555,7 +3555,7 @@ void avd_sg_2n_node_fail_func(AVD_CL_CB > * SU SI relationships of this SU. > */ > avd_sg_su_si_del_snd(cb, o_su); > - avd_sg_su_asgn_del_util(cb, su, true, > false); > + su->delete_all_susis(); > avd_sg_su_oper_list_del(cb, su, false); > m_AVD_CHK_OPLIST(o_su, flag); > if (flag == false) { > @@ -3564,7 +3564,7 @@ void avd_sg_2n_node_fail_func(AVD_CL_CB > } > } else { /* if (o_su != AVD_SU_NULL) */ > > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > avd_sg_su_oper_list_del(cb, su, false); > if (su->sg_of_su->su_oper_list.su == NULL) { > m_AVD_SET_SG_FSM(cb, (su- > >sg_of_su), AVD_SG_FSM_STABLE); > @@ -3585,7 +3585,7 @@ void avd_sg_2n_node_fail_func(AVD_CL_CB > * SUSIs are assigned. Do the functionality specified in > table with > * stable state and new SI event. > */ > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > avd_sg_su_oper_list_del(cb, su, false); > if (su->sg_of_su->su_oper_list.su == NULL) { > m_AVD_SET_SG_FSM(cb, (su->sg_of_su), > AVD_SG_FSM_STABLE); > @@ -3616,7 +3616,7 @@ void avd_sg_2n_node_fail_func(AVD_CL_CB > /* SG is admin lock */ > > /* Free all the SI assignments to this SU */ > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > i_su = su->sg_of_su->list_of_su; > while (i_su != NULL) { > if (i_su->list_of_susi != AVD_SU_SI_REL_NULL) > { > @@ -3655,7 +3655,7 @@ void avd_sg_2n_node_fail_func(AVD_CL_CB > avd_sidep_sg_take_action(su- > >sg_of_su); > } > > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > avd_sg_admin_state_set(su->sg_of_su, > SA_AMF_ADMIN_LOCKED); > > i_su = su->sg_of_su->list_of_su; > @@ -3666,7 +3666,7 @@ void avd_sg_2n_node_fail_func(AVD_CL_CB > } /* if (avd_su_state_determine(su) == > SA_AMF_HA_QUIESCING) */ > else { > /* It is standby SU Free all the SI assignments > to > this SU */ > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > } /* else (avd_su_state_determine(su) == > SA_AMF_HA_QUIESCING) */ > > } > 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 > @@ -1749,7 +1749,7 @@ static uint32_t avd_sg_npm_susi_sucss_sg > /* free all the SUSI relationships to this SU. remove > this > SU from the > * SU oper list.SU in the operation list > */ > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > avd_sg_su_oper_list_del(cb, su, false); > > if ((su->sg_of_su->su_oper_list.su == NULL) && (su- > >sg_of_su->admin_si == AVD_SI_NULL)) { > @@ -2585,7 +2585,7 @@ static uint32_t avd_sg_npm_susi_sucss_su > * relationships for the SU. > */ > > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > > } /* if ((susi == AVD_SU_SI_REL_NULL) && (act > == AVSV_SUSI_ACT_DEL) && > (su->sg_of_su->su_oper_list.su != su)) */ > @@ -2622,7 +2622,7 @@ static uint32_t avd_sg_npm_susi_sucss_su > /* free all the SUSI relationships to this SU. remove this SU > from > the > * SU oper list.SU in the operation list > */ > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > avd_sg_su_oper_list_del(cb, su, false); > > if (su->sg_of_su->su_oper_list.su == NULL) { > @@ -2887,7 +2887,7 @@ uint32_t avd_sg_npm_susi_sucss_func(AVD_ > /* Do the action specified in the message if delete else no > action. */ > if (act == AVSV_SUSI_ACT_DEL) { > if (susi == AVD_SU_SI_REL_NULL) { > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > } else { > /* free all the CSI assignments */ > avd_compcsi_delete(cb, susi, false); > @@ -2944,7 +2944,7 @@ uint32_t avd_sg_npm_susi_sucss_func(AVD_ > * SU oper list is empty, change the SG admin state to > LOCK, > * Change state to stable. > */ > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > avd_sg_su_oper_list_del(cb, su, false); > if (su->sg_of_su->su_oper_list.su == NULL) { > avd_sg_admin_state_set(su->sg_of_su, > SA_AMF_ADMIN_LOCKED); > @@ -3021,7 +3021,7 @@ uint32_t avd_sg_npm_susi_fail_func(AVD_C > /* Do the action specified in the message if delete else no > action. */ > if (act == AVSV_SUSI_ACT_DEL) { > if (susi == AVD_SU_SI_REL_NULL) { > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > } else { > /* free all the CSI assignments */ > avd_compcsi_delete(cb, susi, false); > @@ -3379,7 +3379,7 @@ static void avd_sg_npm_node_fail_sg_relg > } /* else (l_flag == true) */ > > /* Free all the SI assignments to this SU. */ > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > > } else { /* if (l_susi == AVD_SU_SI_REL_NULL) */ > > @@ -3412,7 +3412,7 @@ static void avd_sg_npm_node_fail_sg_relg > avd_sg_su_oper_list_del(cb, su, false); > > /* Free all the SI assignments to this > SU. */ > - avd_sg_su_asgn_del_util(cb, su, true, > false); > + su->delete_all_susis(); > > /* Change the SI switch state to false. > Remove the SI from the > * SI admin pointer. > @@ -3456,7 +3456,7 @@ static void avd_sg_npm_node_fail_sg_relg > m_AVD_CLEAR_SG_ADMIN_SI(cb, > (su->sg_of_su)); > > /* Free all the SI assignments to this > SU. */ > - avd_sg_su_asgn_del_util(cb, su, true, > false); > + su->delete_all_susis(); > > if (su->sg_of_su->su_oper_list.su == > NULL) { > /* both the SI admin pointer > and SU oper list are empty. > @@ -3486,7 +3486,7 @@ static void avd_sg_npm_node_fail_sg_relg > avd_sg_su_oper_list_del(cb, > su, false); > > /* Free all the SI assignments to this > SU. */ > - avd_sg_su_asgn_del_util(cb, su, true, > false); > + su->delete_all_susis(); > } /* else if (l_susi->state == > SA_AMF_HA_STANDBY) */ > else if (l_susi->state == SA_AMF_HA_ACTIVE) { > /* this SI relation with the SU is > standby. */ > @@ -3516,7 +3516,7 @@ static void avd_sg_npm_node_fail_sg_relg > m_AVD_CLEAR_SG_ADMIN_SI(cb, > (su->sg_of_su)); > > /* Free all the SI assignments to this > SU. */ > - avd_sg_su_asgn_del_util(cb, su, true, > false); > + su->delete_all_susis(); > > if (su->sg_of_su->su_oper_list.su == > NULL) { > /* both the SI admin pointer > and SU oper list are empty. > @@ -3567,7 +3567,7 @@ static void avd_sg_npm_node_fail_sg_relg > } > > /* Free all the SI assignments to this > SU. */ > - avd_sg_su_asgn_del_util(cb, su, true, > false); > + su->delete_all_susis(); > > /* Remove the SI from the SI admin > pointer. */ > m_AVD_CLEAR_SG_ADMIN_SI(cb, > (su->sg_of_su)); > @@ -3601,7 +3601,7 @@ static void avd_sg_npm_node_fail_sg_relg > avd_sg_su_oper_list_del(cb, > su, false); > > /* Free all the SI assignments to this > SU. */ > - avd_sg_su_asgn_del_util(cb, su, true, > false); > + su->delete_all_susis(); > > } /* else if (l_susi->state == > SA_AMF_HA_STANDBY) */ > } /* else (su->sg_of_su->admin_si->si_switch == > AVSV_SI_TOGGLE_SWITCH) */ > @@ -3659,7 +3659,7 @@ static void avd_sg_npm_node_fail_sg_relg > } > > /* Free all the SI assignments to this SU. */ > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > > /* remove the SU from the operation list. */ > avd_sg_su_oper_list_del(cb, su, false); > @@ -3679,7 +3679,7 @@ static void avd_sg_npm_node_fail_sg_relg > (su->list_of_susi->state == > SA_AMF_HA_QUIESCING) || > (su->list_of_susi->state == > SA_AMF_HA_ACTIVE)) */ > /* Free all the SI assignments to this SU. */ > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > > /* remove the SU from the operation list. */ > avd_sg_su_oper_list_del(cb, su, false); > @@ -3733,7 +3733,7 @@ static void avd_sg_npm_node_fail_sg_relg > > /* if (su->list_of_susi->state == SA_AMF_HA_ACTIVE) > */ > /* Free all the SI assignments to this SU. */ > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > > } /* else (l_flag == true) */ > > @@ -3801,7 +3801,7 @@ static void avd_sg_npm_node_fail_su_oper > } > > /* Free all the SI assignments to this SU. */ > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > > /* remove the SU from the operation list. */ > avd_sg_su_oper_list_del(cb, su, false); > @@ -3866,7 +3866,7 @@ static void avd_sg_npm_node_fail_su_oper > > /* if (su->list_of_susi->state == SA_AMF_HA_ACTIVE) */ > /* Free all the SI assignments to this SU. */ > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > > } /* else (su->sg_of_su->su_oper_list.su == su) > */ > > @@ -3933,7 +3933,7 @@ static void avd_sg_npm_node_fail_si_oper > > /* if (su->list_of_susi->state == SA_AMF_HA_ACTIVE) */ > /* Free all the SI assignments to this SU. */ > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > > } else { /* if (l_susi == AVD_SU_SI_REL_NULL) */ > > @@ -3960,7 +3960,7 @@ static void avd_sg_npm_node_fail_si_oper > } > > /* Free all the SI assignments to this SU. */ > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > > /* Change the SI switch state to false. Remove > the SI from the > * SI admin pointer. > @@ -4009,7 +4009,7 @@ static void avd_sg_npm_node_fail_si_oper > m_AVD_CLEAR_SG_ADMIN_SI(cb, (su- > >sg_of_su)); > > /* Free all the SI assignments to this SU. */ > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > > if (su->sg_of_su->su_oper_list.su == NULL) { > /* both the SI admin pointer and SU > oper list are empty. > @@ -4040,7 +4040,7 @@ static void avd_sg_npm_node_fail_si_oper > (l_susi->fsm == AVD_SU_SI_STATE_ASGND)) > */ > else if (l_susi->state == SA_AMF_HA_STANDBY) { > /* Free all the SI assignments to this SU. */ > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > } /* else if (l_susi->state == SA_AMF_HA_STANDBY) */ > else if (l_susi->state == SA_AMF_HA_ACTIVE) { > /* this SI relation with the SU is standby. */ > @@ -4067,7 +4067,7 @@ static void avd_sg_npm_node_fail_si_oper > m_AVD_CLEAR_SG_ADMIN_SI(cb, (su- > >sg_of_su)); > > /* Free all the SI assignments to this SU. */ > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > > if (su->sg_of_su->su_oper_list.su == NULL) { > /* both the SI admin pointer and SU > oper list are empty. > @@ -4121,7 +4121,7 @@ static void avd_sg_npm_node_fail_si_oper > } > > /* Free all the SI assignments to this SU. */ > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > > /* Remove the SI from the SI admin pointer. > */ > m_AVD_CLEAR_SG_ADMIN_SI(cb, (su- > >sg_of_su)); > @@ -4156,7 +4156,7 @@ static void avd_sg_npm_node_fail_si_oper > (l_susi->state == SA_AMF_HA_QUIESCED)) > */ > else if (l_susi->state == SA_AMF_HA_STANDBY) { > /* Free all the SI assignments to this SU. */ > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > > } /* else if (l_susi->state == > SA_AMF_HA_STANDBY) */ > } /* else (su->sg_of_su->admin_si->si_switch == > AVSV_SI_TOGGLE_SWITCH) */ > @@ -4203,7 +4203,7 @@ void avd_sg_npm_node_fail_func(AVD_CL_CB > avd_sg_npm_stdbysu_role_change(su); > > /* Free all the SI assignments to this SU. */ > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > > } else { /* if (su->list_of_susi->state == > SA_AMF_HA_ACTIVE) > */ > > @@ -4216,7 +4216,7 @@ void avd_sg_npm_node_fail_func(AVD_CL_CB > * stay in the stable state. > */ > > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > if ((o_su = avd_sg_npm_su_chose_asgn(cb, su- > >sg_of_su)) != NULL) { > /* add the SU to the operation list and change > the SG FSM to SG realign. */ > avd_sg_su_oper_list_add(cb, o_su, false); > @@ -4262,7 +4262,7 @@ void avd_sg_npm_node_fail_func(AVD_CL_CB > > /* if (su->sg_of_su->admin_state == > NCS_ADMIN_STATE_SHUTDOWN) */ > /* Free all the SI assignments to this SU. */ > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > > /* remove the SU from the operation list. */ > avd_sg_su_oper_list_del(cb, su, false); > 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 > @@ -2638,7 +2638,7 @@ uint32_t avd_sg_nway_susi_succ_sg_realig > } > > /* delete the si assignments to this su */ > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > > /* remove the su from the su-oper list */ > avd_sg_su_oper_list_del(cb, su, false); > @@ -2857,7 +2857,7 @@ uint32_t avd_sg_nway_susi_succ_su_oper(A > } /* for */ > > /* free all the SI assignments to this SU */ > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > > /* transition to sg-realign state or initiate si assignments */ > if (sg->su_oper_list.su) { > @@ -3133,7 +3133,7 @@ uint32_t avd_sg_nway_susi_succ_sg_admin( > if ((SA_AMF_ADMIN_LOCKED == sg->saAmfSGAdminState) || > (SA_AMF_ADMIN_SHUTTING_DOWN == sg- > >saAmfSGAdminState)) { > /* free all the SI assignments to this SU */ > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > > /* delete the su from the oper list */ > avd_sg_su_oper_list_del(cb, su, false); > @@ -3221,7 +3221,7 @@ void avd_sg_nway_node_fail_stable(AVD_CL > } /* for */ > > /* delete the si assignments to this su */ > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > > /* if sg is still in stable state, initiate si assignments */ > if (AVD_SG_FSM_STABLE == sg->sg_fsm_state) { > @@ -3351,7 +3351,7 @@ void avd_sg_nway_node_fail_su_oper(AVD_C > } > > /* delete the si assignments to this su */ > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > > done: > TRACE_LEAVE(); > @@ -3603,7 +3603,7 @@ void avd_sg_nway_node_fail_sg_admin(AVD_ > TRACE_ENTER2("SU '%s'",su->name.value); > > /* delete the si assignments to this su */ > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > > /* delete the su from the su-oper list */ > avd_sg_su_oper_list_del(cb, su, false); > diff --git a/osaf/services/saf/amf/amfd/sg_nwayact_fsm.cc > b/osaf/services/saf/amf/amfd/sg_nwayact_fsm.cc > --- a/osaf/services/saf/amf/amfd/sg_nwayact_fsm.cc > +++ b/osaf/services/saf/amf/amfd/sg_nwayact_fsm.cc > @@ -634,7 +634,7 @@ uint32_t avd_sg_nacvred_susi_sucss_func( > /* Do the action specified in the message if delete else no > action. */ > if (act == AVSV_SUSI_ACT_DEL) { > if (susi == AVD_SU_SI_REL_NULL) { > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > } else { > /* free all the CSI assignments */ > avd_compcsi_delete(cb, susi, false); > @@ -658,7 +658,7 @@ uint32_t avd_sg_nacvred_susi_sucss_func( > m_AVD_SU_SI_TRG_DEL(cb, susi); > } else { > /* Remove all the SI relationships to this SU. > */ > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > } > > if (su->sg_of_su->admin_si != AVD_SI_NULL) { > @@ -834,7 +834,7 @@ uint32_t avd_sg_nacvred_susi_sucss_func( > if (act == AVSV_SUSI_ACT_DEL) { > if (susi == AVD_SU_SI_REL_NULL) { > LOG_ER("%s:%u: %s (%u)", __FILE__, > __LINE__, su->name.value, su->name.length); > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > > } else { > LOG_ER("%s:%u: %s (%u)", __FILE__, > __LINE__, su->name.value, su->name.length); > @@ -980,7 +980,7 @@ uint32_t avd_sg_nacvred_susi_sucss_func( > m_AVD_SU_SI_TRG_DEL(cb, susi); > } else { > /* Remove all the SI relationships to this SU. > */ > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > } > > if (su->sg_of_su->admin_si->list_of_sisu != > AVD_SU_SI_REL_NULL) { > @@ -1040,7 +1040,7 @@ uint32_t avd_sg_nacvred_susi_sucss_func( > * Change the SG FSM state to stable. > */ > > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > > avd_sg_su_oper_list_del(cb, su, false); > > @@ -1415,7 +1415,7 @@ void avd_sg_nacvred_node_fail_func(AVD_C > * stable state. > */ > > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > > if (avd_sg_nacvred_su_chose_asgn(cb, su->sg_of_su) != NULL) > { > /* new assignments are been done in the SG. change > the FSM state */ > @@ -1469,7 +1469,7 @@ void avd_sg_nacvred_node_fail_func(AVD_C > pointers.*/ > } > } > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > > if (su->sg_of_su->admin_si != AVD_SI_NULL) { > if (su->sg_of_su->admin_si->list_of_sisu != > AVD_SU_SI_REL_NULL) { > @@ -1523,7 +1523,7 @@ void avd_sg_nacvred_node_fail_func(AVD_C > case AVD_SG_FSM_SU_OPER: > > /* Remove the SI relationship to this SU. */ > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > > if (su->sg_of_su->su_oper_list.su == su) { > /* SU is same as the SU in the list. If this SU admin > is > shutdown > @@ -1582,7 +1582,7 @@ void avd_sg_nacvred_node_fail_func(AVD_C > * If this SI admin is shutdown change to LOCK. Remove the SI > from > * SI admin pointer. Add the SU to operation list. Change state > to SG_realign. > */ > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > > if (su->sg_of_su->admin_si->list_of_sisu != > AVD_SU_SI_REL_NULL) { > if ((su->sg_of_su->admin_si->list_of_sisu->fsm > @@ -1623,7 +1623,7 @@ void avd_sg_nacvred_node_fail_func(AVD_C > * to stable. > */ > > - avd_sg_su_asgn_del_util(cb, su, true, false); > + su->delete_all_susis(); > > avd_sg_su_oper_list_del(cb, su, false); > > diff --git a/osaf/services/saf/amf/amfd/sgproc.cc > b/osaf/services/saf/amf/amfd/sgproc.cc > --- a/osaf/services/saf/amf/amfd/sgproc.cc > +++ b/osaf/services/saf/amf/amfd/sgproc.cc > @@ -342,7 +342,7 @@ static uint32_t sg_su_failover_func(AVD_ > } > } > su->sg_of_su->node_fail(avd_cb, su); > - avd_sg_su_asgn_del_util(avd_cb, su, true, false); > + su->delete_all_susis(); > } > > rc = NCSCC_RC_SUCCESS; > @@ -1562,7 +1562,7 @@ void avd_node_down_mw_susi_failover(AVD_ > i_su->sg_of_su->node_fail(cb, i_su); > > /* Free all the SU SI assignments*/ > - avd_sg_su_asgn_del_util(cb, i_su, true, false); > + i_su->delete_all_susis(); > > i_su = i_su->avnd_list_su_next; > > @@ -1641,7 +1641,7 @@ void avd_node_down_appl_susi_failover(AV > i_su->sg_of_su->node_fail(cb, i_su); > > /* Free all the SU SI assignments*/ > - avd_sg_su_asgn_del_util(cb, i_su, true, false); > + i_su->delete_all_susis(); > > /* Since a SU has gone out of service relook at the SG > to > * re instatiate and terminate SUs if needed. ------------------------------------------------------------------------------ Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/NeoTech _______________________________________________ Opensaf-devel mailing list Opensaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/opensaf-devel
