osaf/services/saf/amf/amfd/include/si.h | 1 +
osaf/services/saf/amf/amfd/include/si_dep.h | 1 -
osaf/services/saf/amf/amfd/sg_2n_fsm.cc | 6 +++---
osaf/services/saf/amf/amfd/si_dep.cc | 10 +++++-----
4 files changed, 9 insertions(+), 9 deletions(-)
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
@@ -148,6 +148,7 @@ public:
void update_dependents_states();
void screen_si_dependencies();
void send_active_to_dependents();
+ bool sponsors_assigned_active();
private:
AVD_SI(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
@@ -84,7 +84,6 @@ extern void avd_sidep_update_depstate_si
extern bool avd_sidep_si_dependency_exists_within_su(const AVD_SU *su);
extern bool avd_sidep_quiesced_done_for_all_dependents(const AVD_SI *si, const
AVD_SU *su);
extern void sidep_take_action_on_dependents(AVD_SI *si);
-extern bool avd_sidep_sponsors_assignment_states(AVD_SI *si);
extern void sidep_si_take_action(AVD_SI *si);
extern void sidep_update_si_self_dep_state(AVD_SI *si);
extern void sidep_process_ready_to_unassign_depstate(AVD_SI *dep_si);
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
@@ -2999,7 +2999,7 @@ void SG_2N::node_fail_si_oper(AVD_SU *su
/* Before starting
unassignment process of SI, check once again whether
* sponsor SIs are
assigned back,if so move the SI state to ASSIGNED state
*/
- if
(avd_sidep_sponsors_assignment_states(susi_temp->si))
+ if
(susi_temp->si->sponsors_assigned_active() == true)
susi_temp->si->set_dep_state(AVD_SI_ASSIGNED);
else
avd_susi_del_send(susi_temp);
@@ -3071,7 +3071,7 @@ void SG_2N::node_fail_si_oper(AVD_SU *su
/* Before
starting unassignment process of SI, check once again whether
* sponsor SIs
are assigned back,if so move the SI state to ASSIGNED state
*/
- if
(avd_sidep_sponsors_assignment_states(susi_temp->si))
+ if
(susi_temp->si->sponsors_assigned_active() == true)
susi_temp->si->set_dep_state(AVD_SI_ASSIGNED);
else
avd_susi_del_send(susi_temp);
@@ -3165,7 +3165,7 @@ void SG_2N::node_fail(AVD_CL_CB *cb, AVD
/* Before
starting unassignment process of SI, check once again whether
* sponsor SIs
are assigned back,if so move the SI state to ASSIGNED state
*/
- if
(avd_sidep_sponsors_assignment_states(s_susi->si))
+ if
(s_susi->si->sponsors_assigned_active() == true)
s_susi->si->set_dep_state(AVD_SI_ASSIGNED);
else
avd_susi_del_send(s_susi);
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
@@ -1788,7 +1788,7 @@ void avd_sidep_update_depstate_si_failov
if(((dep_si->si_dep_state !=
AVD_SI_TOL_TIMER_RUNNING) ||
(dep_si->si_dep_state
!= AVD_SI_READY_TO_UNASSIGN) ||
(dep_si->si_dep_state
!= AVD_SI_FAILOVER_UNDER_PROGRESS)) &&
-
(avd_sidep_sponsors_assignment_states(dep_si))) {
+
(dep_si->sponsors_assigned_active() == true)) {
dep_si->set_dep_state(AVD_SI_FAILOVER_UNDER_PROGRESS);
if
(dep_si->num_dependents > 0) {
@@ -2172,18 +2172,18 @@ done:
* @return NCSCC_RC_SUCCESS/NCSCC_RC_FAILURE
*
**/
-bool avd_sidep_sponsors_assignment_states(AVD_SI *si)
+bool AVD_SI::sponsors_assigned_active()
{
bool all_assigned_active = true;
AVD_SPONS_SI_NODE *spons_si;
- TRACE_ENTER2("SI:%s",si->name.value);
+ TRACE_ENTER2("SI:%s", name.value);
- if (si->spons_si_list == NULL) {
+ if (spons_si_list == NULL) {
goto done;
}
- for (spons_si = si->spons_si_list; spons_si ;spons_si = spons_si->next)
{
+ for (spons_si = spons_si_list; spons_si ;spons_si = spons_si->next) {
if (si_assignment_state_check(spons_si->si) == false) {
all_assigned_active = false;
goto done;
------------------------------------------------------------------------------
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
