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/sg_nway_fsm.cc | 4 ++--
osaf/services/saf/amf/amfd/si_dep.cc | 14 +++++++-------
5 files changed, 13 insertions(+), 13 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
@@ -147,6 +147,7 @@ public:
void unassign();
void update_dependents_states();
void screen_si_dependencies();
+ void send_active_to_dependents();
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
@@ -82,7 +82,6 @@ extern bool avd_sidep_is_si_failover_pos
extern void avd_sidep_update_depstate_su_rolefailover(AVD_SU *su);
extern void avd_sidep_update_depstate_si_failover(AVD_SI *si, AVD_SU *su);
extern bool avd_sidep_si_dependency_exists_within_su(const AVD_SU *su);
-extern void avd_sidep_send_active_to_dependents(const AVD_SI *si);
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);
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
@@ -1727,7 +1727,7 @@ uint32_t SG_2N::susi_success_sg_realign(
} else {
if ((susi->state == SA_AMF_HA_ACTIVE) &&
(susi->si->num_dependents > 0))
-
avd_sidep_send_active_to_dependents(susi->si);
+ susi->si->send_active_to_dependents();
}
/* if (as_flag == false) */
}
@@ -1932,7 +1932,7 @@ uint32_t SG_2N::susi_success_su_oper(AVD
*/
if (susi) {
if (susi->si->num_dependents > 0)
-
avd_sidep_send_active_to_dependents(susi->si);
+ susi->si->send_active_to_dependents();
if(!all_assignments_done(su))
goto done;
@@ -1951,7 +1951,7 @@ uint32_t SG_2N::susi_success_su_oper(AVD
} else {
if (susi) {
if (susi->si->num_dependents > 0)
-
avd_sidep_send_active_to_dependents(susi->si);
+ susi->si->send_active_to_dependents();
if(!all_assignments_done(su))
goto done;
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
@@ -2231,7 +2231,7 @@ uint32_t avd_sg_nway_susi_succ_sg_realig
avd_sg_su_oper_list_del(cb, su, false);
} else {
if ((susi->state == SA_AMF_HA_ACTIVE) &&
(susi->si->num_dependents > 0)) {
-
avd_sidep_send_active_to_dependents(susi->si);
+ susi->si->send_active_to_dependents();
}
/* identify the quiesced susi assignment */
@@ -2623,7 +2623,7 @@ uint32_t avd_sg_nway_susi_succ_su_oper(A
avd_susi_update(susi, state);
if (susi->si->num_dependents > 0) {
- avd_sidep_send_active_to_dependents(susi->si);
+ susi->si->send_active_to_dependents();
}
/* determine if all the standby sus are engaged */
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
@@ -2059,26 +2059,26 @@ bool avd_sidep_si_dependency_exists_with
*
* @returns nothing
**/
-void avd_sidep_send_active_to_dependents(const AVD_SI *si)
+void AVD_SI::send_active_to_dependents()
{
AVD_SU_SI_REL *sisu;
AVD_SU *active_su = NULL;
- TRACE_ENTER2(": '%s'",si->name.value);
+ TRACE_ENTER2(": '%s'", name.value);
/* determine the active su */
- for (sisu = si->list_of_sisu;sisu != NULL;sisu = sisu->si_next) {
+ for (sisu = list_of_sisu;sisu != NULL;sisu = sisu->si_next) {
if ((sisu->state == SA_AMF_HA_ACTIVE) &&
(sisu->fsm != AVD_SU_SI_STATE_UNASGN)) {
active_su = sisu->su;
break;
- }
- }
+ }
+ }
for (std::map<std::pair<std::string,std::string>,
AVD_SI_DEP*>::const_iterator it = sidep_db->begin();
it != sidep_db->end(); it++) {
const AVD_SI_DEP *sidep = it->second;
- if (m_CMP_HORDER_SANAMET(sidep->spons_si->name, si->name) != 0)
+ if (m_CMP_HORDER_SANAMET(sidep->spons_si->name, name) != 0)
continue;
AVD_SI *dep_si = avd_si_get(&sidep->dep_name);
@@ -2090,7 +2090,7 @@ void avd_sidep_send_active_to_dependents
/* Some of the sponsors are not yet in Active
state */
continue;
AVD_SU_SI_REL *sisu;
- switch (si->sg_of_si->sg_redundancy_model) {
+ switch (sg_of_si->sg_redundancy_model) {
case SA_AMF_NPM_REDUNDANCY_MODEL:
case SA_AMF_N_WAY_ACTIVE_REDUNDANCY_MODEL:
case SA_AMF_NO_REDUNDANCY_MODEL:
------------------------------------------------------------------------------
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
