osaf/services/saf/amf/amfd/clm.cc | 2 +-
osaf/services/saf/amf/amfd/include/su.h | 6 +-----
osaf/services/saf/amf/amfd/node.cc | 2 +-
osaf/services/saf/amf/amfd/sg.cc | 5 ++---
osaf/services/saf/amf/amfd/su.cc | 16 +++++++++++-----
5 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/osaf/services/saf/amf/amfd/clm.cc
b/osaf/services/saf/amf/amfd/clm.cc
--- a/osaf/services/saf/amf/amfd/clm.cc
+++ b/osaf/services/saf/amf/amfd/clm.cc
@@ -59,7 +59,7 @@ static void clm_node_join_complete(AVD_A
(sg_instantiated_su_count(su->sg_of_su) +
su->sg_of_su->try_inst_counter)) {
if
(avd_snd_presence_msg(avd_cb, su, false) == NCSCC_RC_SUCCESS) {
-
m_AVD_SET_SU_TERM(avd_cb, su, false);
+
su->set_term_state(false);
su->sg_of_su->try_inst_counter++;
} else {
LOG_ER("Internal error,
could not send message to avnd");
diff --git a/osaf/services/saf/amf/amfd/include/su.h
b/osaf/services/saf/amf/amfd/include/su.h
--- a/osaf/services/saf/amf/amfd/include/su.h
+++ b/osaf/services/saf/amf/amfd/include/su.h
@@ -110,6 +110,7 @@ class AVD_SU {
void delete_all_susis(void);
void set_all_susis_assigned_quiesced(void);
void set_all_susis_assigned(void);
+ void set_term_state(bool state);
private:
void send_attribute_update(AVSV_AMF_SU_ATTR_ID attrib_id);
@@ -127,11 +128,6 @@ typedef struct {
} AVD_SUTCOMP_TYPE;
-#define m_AVD_SET_SU_TERM(cb,su,state) {\
-su->term_state = state;\
-m_AVSV_SEND_CKPT_UPDT_ASYNC_UPDT(cb, su, AVSV_CKPT_SU_TERM_STATE);\
-}
-
#define m_AVD_SET_SU_SWITCH(cb,su,state) {\
su->su_switch = state;\
m_AVSV_SEND_CKPT_UPDT_ASYNC_UPDT(cb, su, AVSV_CKPT_SU_SWITCH);\
diff --git a/osaf/services/saf/amf/amfd/node.cc
b/osaf/services/saf/amf/amfd/node.cc
--- a/osaf/services/saf/amf/amfd/node.cc
+++ b/osaf/services/saf/amf/amfd/node.cc
@@ -1055,7 +1055,7 @@ static void node_sus_termstate_set(AVD_A
for (su = node->list_of_su; su; su = su->avnd_list_su_next) {
if (su->saAmfSUPreInstantiable == true)
- m_AVD_SET_SU_TERM(avd_cb, su, term_state);
+ su->set_term_state(term_state);
}
}
diff --git a/osaf/services/saf/amf/amfd/sg.cc b/osaf/services/saf/amf/amfd/sg.cc
--- a/osaf/services/saf/amf/amfd/sg.cc
+++ b/osaf/services/saf/amf/amfd/sg.cc
@@ -1037,7 +1037,7 @@ static uint32_t avd_sg_su_term_in_revers
(su->saAmfSUPresenceState !=
SA_AMF_PRESENCE_TERMINATION_FAILED)) {
if (avd_snd_presence_msg(avd_cb, su, true) == NCSCC_RC_SUCCESS) {
- m_AVD_SET_SU_TERM(avd_cb, su, true);
+ su->set_term_state(true);
} else {
rc = NCSCC_RC_FAILURE;
LOG_WA("Failed Termination '%s'", su->name.value);
@@ -1098,8 +1098,7 @@ static void sg_app_sg_admin_unlock_inst(
}
/* set uncondionally of msg snd outcome */
- m_AVD_SET_SU_TERM(cb, su, false);
-
+ su->set_term_state(false);
}
}
}
diff --git a/osaf/services/saf/amf/amfd/su.cc b/osaf/services/saf/amf/amfd/su.cc
--- a/osaf/services/saf/amf/amfd/su.cc
+++ b/osaf/services/saf/amf/amfd/su.cc
@@ -1054,7 +1054,7 @@ static void su_admin_op_cb(SaImmOiHandle
/* No need to terminate the SUs in Unins/Inst
Failed/Term Failed state */
su->set_admin_state(SA_AMF_ADMIN_LOCKED_INSTANTIATION);
avd_saImmOiAdminOperationResult(immoi_handle,
invocation, SA_AIS_OK);
- m_AVD_SET_SU_TERM(cb, su, true);
+ su->set_term_state(true);
LOG_NO("'%s' presence state is '%u'", su_name->value,
su->saAmfSUPresenceState);
goto done;
}
@@ -1065,7 +1065,7 @@ static void su_admin_op_cb(SaImmOiHandle
/* When the SU will terminate then prescence state
change message will come
and so store the callback parameters to send
response later on. */
if (avd_snd_presence_msg(cb, su, true) ==
NCSCC_RC_SUCCESS) {
- m_AVD_SET_SU_TERM(cb, su, true);
+ su->set_term_state(true);
su->set_admin_state(SA_AMF_ADMIN_LOCKED_INSTANTIATION);
su->pend_cbk.admin_oper =
static_cast<SaAmfAdminOperationIdT>(op_id);
su->pend_cbk.invocation = invocation;
@@ -1078,7 +1078,7 @@ static void su_admin_op_cb(SaImmOiHandle
} else {
su->set_admin_state(SA_AMF_ADMIN_LOCKED_INSTANTIATION);
avd_saImmOiAdminOperationResult(immoi_handle,
invocation, SA_AIS_OK);
- m_AVD_SET_SU_TERM(cb, su, true);
+ su->set_term_state(true);
}
break;
@@ -1116,7 +1116,7 @@ static void su_admin_op_cb(SaImmOiHandle
/* When the SU will instantiate then prescence state
change message will come
and so store the callback parameters to send
response later on. */
if (avd_snd_presence_msg(cb, su, false) ==
NCSCC_RC_SUCCESS) {
- m_AVD_SET_SU_TERM(cb, su, false);
+ su->set_term_state(false);
su->set_admin_state(SA_AMF_ADMIN_LOCKED);
su->pend_cbk.admin_oper =
static_cast<SaAmfAdminOperationIdT>(op_id);
@@ -1129,7 +1129,7 @@ static void su_admin_op_cb(SaImmOiHandle
} else {
su->set_admin_state(SA_AMF_ADMIN_LOCKED);
avd_saImmOiAdminOperationResult(immoi_handle,
invocation, SA_AIS_OK);
- m_AVD_SET_SU_TERM(cb, su, false);
+ su->set_term_state(false);
}
break;
@@ -1702,3 +1702,9 @@ void AVD_SU::set_all_susis_assigned(void
TRACE_LEAVE();
}
+
+void AVD_SU::set_term_state(bool state) {
+ term_state = state;
+ TRACE("%s term_state %u", name.value, term_state);
+ m_AVSV_SEND_CKPT_UPDT_ASYNC_UPDT(avd_cb, this, AVSV_CKPT_SU_TERM_STATE);
+}
------------------------------------------------------------------------------
"Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
Instantly run your Selenium tests across 300+ browser/OS combos. Get
unparalleled scalability from the best Selenium testing platform available.
Simple to use. Nothing to install. Get started now for free."
http://p.sf.net/sfu/SauceLabs
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
