osaf/services/saf/amf/amfd/include/sg.h | 7 -------
osaf/services/saf/amf/amfd/sg_2n_fsm.cc | 6 +++---
osaf/services/saf/amf/amfd/sg_nored_fsm.cc | 6 +++---
osaf/services/saf/amf/amfd/sg_npm_fsm.cc | 7 +++----
osaf/services/saf/amf/amfd/sg_nway_fsm.cc | 2 +-
osaf/services/saf/amf/amfd/sg_nwayact_fsm.cc | 7 +++----
6 files changed, 13 insertions(+), 22 deletions(-)
diff --git a/osaf/services/saf/amf/amfd/include/sg.h
b/osaf/services/saf/amf/amfd/include/sg.h
--- a/osaf/services/saf/amf/amfd/include/sg.h
+++ b/osaf/services/saf/amf/amfd/include/sg.h
@@ -500,13 +500,6 @@ public:
struct avd_su_si_rel_tag *susi, AVSV_SUSI_ACT act,
SaAmfHAStateT state);
};
-
-#define m_AVD_SET_SG_ADJUST(cb,sg,state) {\
- TRACE("adjust_state %u => %u", sg->adjust_state, state); \
- sg->adjust_state = state;\
- m_AVSV_SEND_CKPT_UPDT_ASYNC_UPDT(cb, sg, AVSV_CKPT_SG_ADJUST_STATE);\
-}
-
#define m_AVD_SET_SG_FSM(cb,sg,state) {\
if (sg->sg_fsm_state != state) { \
TRACE("sg_fsm_state %u => %u", sg->sg_fsm_state, state); \
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
@@ -2701,14 +2701,14 @@ uint32_t SG_2N::realign(AVD_CL_CB *cb, A
}
if (sg->sg_fsm_state != AVD_SG_FSM_STABLE) {
- m_AVD_SET_SG_ADJUST(cb, sg, AVSV_SG_STABLE);
+ set_adjust_state(AVSV_SG_STABLE);
avd_sg_app_su_inst_func(cb, sg);
goto done;
}
if ((l_su = avd_sg_2n_su_chose_asgn(cb, sg)) == NULL) {
/* all the assignments have already been done in the SG. */
- m_AVD_SET_SG_ADJUST(cb, sg, AVSV_SG_STABLE);
+ set_adjust_state(AVSV_SG_STABLE);
avd_sg_app_su_inst_func(cb, sg);
goto done;
}
@@ -2716,7 +2716,7 @@ uint32_t SG_2N::realign(AVD_CL_CB *cb, A
/* Add the SU to the list and change the FSM state */
avd_sg_su_oper_list_add(cb, l_su, false);
- m_AVD_SET_SG_ADJUST(cb, sg, AVSV_SG_STABLE);
+ set_adjust_state(AVSV_SG_STABLE);
m_AVD_SET_SG_FSM(cb, sg, AVD_SG_FSM_SG_REALIGN);
done:
diff --git a/osaf/services/saf/amf/amfd/sg_nored_fsm.cc
b/osaf/services/saf/amf/amfd/sg_nored_fsm.cc
--- a/osaf/services/saf/amf/amfd/sg_nored_fsm.cc
+++ b/osaf/services/saf/amf/amfd/sg_nored_fsm.cc
@@ -762,19 +762,19 @@ uint32_t SG_NORED::realign(AVD_CL_CB *cb
}
if (sg->sg_fsm_state != AVD_SG_FSM_STABLE) {
- m_AVD_SET_SG_ADJUST(cb, sg, AVSV_SG_STABLE);
+ set_adjust_state(AVSV_SG_STABLE);
avd_sg_app_su_inst_func(cb, sg);
goto done;
}
if (assign_sis_to_sus() == NULL) {
/* all the assignments have already been done in the SG. */
- m_AVD_SET_SG_ADJUST(cb, sg, AVSV_SG_STABLE);
+ set_adjust_state(AVSV_SG_STABLE);
avd_sg_app_su_inst_func(cb, sg);
goto done;
}
- m_AVD_SET_SG_ADJUST(cb, sg, AVSV_SG_STABLE);
+ set_adjust_state(AVSV_SG_STABLE);
set_fsm_state(AVD_SG_FSM_SG_REALIGN);
done:
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
@@ -3121,7 +3121,7 @@ uint32_t SG_NPM::realign(AVD_CL_CB *cb,
}
if (sg->sg_fsm_state != AVD_SG_FSM_STABLE) {
- m_AVD_SET_SG_ADJUST(cb, sg, AVSV_SG_STABLE);
+ set_adjust_state(AVSV_SG_STABLE);
avd_sg_app_su_inst_func(cb, sg);
if ((AVD_SG_FSM_STABLE == sg->sg_fsm_state) &&
(true == sg->equal_ranked_su) &&
@@ -3135,13 +3135,12 @@ uint32_t SG_NPM::realign(AVD_CL_CB *cb,
if (avd_sg_npm_su_chose_asgn(cb, sg) == NULL) {
/* all the assignments have already been done in the SG. */
- m_AVD_SET_SG_ADJUST(cb, sg, AVSV_SG_STABLE);
+ set_adjust_state(AVSV_SG_STABLE);
avd_sg_app_su_inst_func(cb, sg);
goto done;
}
- /* change the FSM state */
- m_AVD_SET_SG_ADJUST(cb, sg, AVSV_SG_STABLE);
+ set_adjust_state(AVSV_SG_STABLE);
m_AVD_SET_SG_FSM(cb, (sg), AVD_SG_FSM_SG_REALIGN);
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
@@ -453,7 +453,7 @@ uint32_t SG_NWAY::realign(AVD_CL_CB *cb,
}
if (sg->sg_fsm_state != AVD_SG_FSM_STABLE) {
- m_AVD_SET_SG_ADJUST(cb, sg, AVSV_SG_STABLE);
+ set_adjust_state(AVSV_SG_STABLE);
avd_sg_app_su_inst_func(cb, sg);
goto done;
}
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
@@ -1218,20 +1218,19 @@ uint32_t SG_NACV::realign(AVD_CL_CB *cb,
}
if (sg->sg_fsm_state != AVD_SG_FSM_STABLE) {
- m_AVD_SET_SG_ADJUST(cb, sg, AVSV_SG_STABLE);
+ set_adjust_state(AVSV_SG_STABLE);
avd_sg_app_su_inst_func(cb, sg);
goto done;
}
if (avd_sg_nacvred_su_chose_asgn(cb, sg) == NULL) {
/* all the assignments have already been done in the SG. */
- m_AVD_SET_SG_ADJUST(cb, sg, AVSV_SG_STABLE);
+ set_adjust_state(AVSV_SG_STABLE);
avd_sg_app_su_inst_func(cb, sg);
goto done;
}
- /* change the FSM state */
- m_AVD_SET_SG_ADJUST(cb, sg, AVSV_SG_STABLE);
+ set_adjust_state(AVSV_SG_STABLE);
m_AVD_SET_SG_FSM(cb, sg, AVD_SG_FSM_SG_REALIGN);
done:
------------------------------------------------------------------------------
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
