Re: [devel] [PATCH 1 of 1] amfd: Add constructor for AVD_SI [#713]
ack, code review only/Regards HansN
-Original Message-
From: Gary Lee [mailto:gary@dektech.com.au]
Sent: den 11 juni 2014 02:44
To: Hans Nordebäck
Cc: opensaf-devel@lists.sourceforge.net
Subject: [PATCH 1 of 1] amfd: Add constructor for AVD_SI [#713]
osaf/services/saf/amf/amfd/include/si.h | 7 -
osaf/services/saf/amf/amfd/si.cc| 43 ++--
2 files changed, 40 insertions(+), 10 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
@@ -69,6 +69,7 @@ typedef struct avd_sirankedsu {
*/
class AVD_SI {
public:
+ AVD_SI();
SaNameT name;
/ B.04 model
*/
@@ -106,7 +107,11 @@ public:
avd_sirankedsu_t *rankedsu_list_head;
SaInvocationT invocation;
- uint32_t alarm_sent; /* SI unassigned alarm has been sent */
+ bool alarm_sent; /* SI unassigned alarm has been sent */
+
+private:
+ AVD_SI(const AVD_SI);
+ AVD_SI operator=(const AVD_SI);
};
typedef struct avd_amf_svc_type_tag {
diff --git a/osaf/services/saf/amf/amfd/si.cc b/osaf/services/saf/amf/amfd/si.cc
--- a/osaf/services/saf/amf/amfd/si.cc
+++ b/osaf/services/saf/amf/amfd/si.cc
@@ -323,6 +323,40 @@ void avd_si_remove_csi(AVD_CSI* csi)
} /* if (csi-si != AVD_SI_NULL) */
}
+
+AVD_SI::AVD_SI() :
+ saAmfSIRank(0),
+ saAmfSIActiveWeight(NULL),
+ saAmfSIStandbyWeight(NULL),
+ saAmfSIPrefActiveAssignments(0),
+ saAmfSIPrefStandbyAssignments(0),
+ saAmfSIAdminState(SA_AMF_ADMIN_UNLOCKED),
+ saAmfSIAssignmentState(SA_AMF_ASSIGNMENT_UNASSIGNED),
+ saAmfSINumCurrActiveAssignments(0),
+ saAmfSINumCurrStandbyAssignments(0),
+ si_switch(AVSV_SI_TOGGLE_STABLE),
+ sg_of_si(NULL),
+ list_of_csi(NULL),
+ sg_list_of_si_next(NULL),
+ list_of_sisu(NULL),
+ si_dep_state(AVD_SI_NO_DEPENDENCY),
+ spons_si_list(NULL),
+ num_dependents(0),
+ tol_timer_count(0),
+ svc_type(NULL),
+ si_list_svc_type_next(NULL),
+ app(NULL),
+ si_list_app_next(NULL),
+ list_of_sus_per_si_rank(NULL),
+ rankedsu_list_head(NULL),
+ invocation(0),
+ alarm_sent(false)
+{
+ memset(name, 0, sizeof(SaNameT));
+ memset(saAmfSvcType, 0, sizeof(SaNameT));
+ memset(saAmfSIProtectedbySG, 0, sizeof(SaNameT)); }
+
AVD_SI *avd_si_new(const SaNameT *dn)
{
AVD_SI *si;
@@ -331,15 +365,6 @@ AVD_SI *avd_si_new(const SaNameT *dn)
memcpy(si-name.value, dn-value, dn-length);
si-name.length = dn-length;
- si-si_switch = AVSV_SI_TOGGLE_STABLE;
- si-saAmfSIAdminState = SA_AMF_ADMIN_UNLOCKED;
- si-si_dep_state = AVD_SI_NO_DEPENDENCY;
- si-saAmfSIAssignmentState = SA_AMF_ASSIGNMENT_UNASSIGNED;
- si-alarm_sent = false;
- si-num_dependents = 0;
- si-tol_timer_count = 0;
- si-saAmfSIActiveWeight = NULL;
- si-saAmfSIStandbyWeight = NULL;
return si;
}
--
HPCC Systems Open Source Big Data Platform from LexisNexis Risk Solutions
Find What Matters Most in Your Big Data with HPCC Systems
Open Source. Fast. Scalable. Simple. Ideal for Dirty Data.
Leverages Graph Analysis for Fast Processing Easy Data Exploration
http://p.sf.net/sfu/hpccsystems
___
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
[devel] [PATCH 1 of 1] amfd: Add constructor for AVD_SI [#713]
osaf/services/saf/amf/amfd/include/si.h | 7 -
osaf/services/saf/amf/amfd/si.cc| 43 ++--
2 files changed, 40 insertions(+), 10 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
@@ -69,6 +69,7 @@ typedef struct avd_sirankedsu {
*/
class AVD_SI {
public:
+ AVD_SI();
SaNameT name;
/ B.04 model
*/
@@ -106,7 +107,11 @@ public:
avd_sirankedsu_t *rankedsu_list_head;
SaInvocationT invocation;
- uint32_t alarm_sent; /* SI unassigned alarm has been sent */
+ bool alarm_sent; /* SI unassigned alarm has been sent */
+
+private:
+ AVD_SI(const AVD_SI);
+ AVD_SI operator=(const AVD_SI);
};
typedef struct avd_amf_svc_type_tag {
diff --git a/osaf/services/saf/amf/amfd/si.cc b/osaf/services/saf/amf/amfd/si.cc
--- a/osaf/services/saf/amf/amfd/si.cc
+++ b/osaf/services/saf/amf/amfd/si.cc
@@ -323,6 +323,40 @@ void avd_si_remove_csi(AVD_CSI* csi)
} /* if (csi-si != AVD_SI_NULL) */
}
+
+AVD_SI::AVD_SI() :
+ saAmfSIRank(0),
+ saAmfSIActiveWeight(NULL),
+ saAmfSIStandbyWeight(NULL),
+ saAmfSIPrefActiveAssignments(0),
+ saAmfSIPrefStandbyAssignments(0),
+ saAmfSIAdminState(SA_AMF_ADMIN_UNLOCKED),
+ saAmfSIAssignmentState(SA_AMF_ASSIGNMENT_UNASSIGNED),
+ saAmfSINumCurrActiveAssignments(0),
+ saAmfSINumCurrStandbyAssignments(0),
+ si_switch(AVSV_SI_TOGGLE_STABLE),
+ sg_of_si(NULL),
+ list_of_csi(NULL),
+ sg_list_of_si_next(NULL),
+ list_of_sisu(NULL),
+ si_dep_state(AVD_SI_NO_DEPENDENCY),
+ spons_si_list(NULL),
+ num_dependents(0),
+ tol_timer_count(0),
+ svc_type(NULL),
+ si_list_svc_type_next(NULL),
+ app(NULL),
+ si_list_app_next(NULL),
+ list_of_sus_per_si_rank(NULL),
+ rankedsu_list_head(NULL),
+ invocation(0),
+ alarm_sent(false)
+{
+ memset(name, 0, sizeof(SaNameT));
+ memset(saAmfSvcType, 0, sizeof(SaNameT));
+ memset(saAmfSIProtectedbySG, 0, sizeof(SaNameT));
+}
+
AVD_SI *avd_si_new(const SaNameT *dn)
{
AVD_SI *si;
@@ -331,15 +365,6 @@ AVD_SI *avd_si_new(const SaNameT *dn)
memcpy(si-name.value, dn-value, dn-length);
si-name.length = dn-length;
- si-si_switch = AVSV_SI_TOGGLE_STABLE;
- si-saAmfSIAdminState = SA_AMF_ADMIN_UNLOCKED;
- si-si_dep_state = AVD_SI_NO_DEPENDENCY;
- si-saAmfSIAssignmentState = SA_AMF_ASSIGNMENT_UNASSIGNED;
- si-alarm_sent = false;
- si-num_dependents = 0;
- si-tol_timer_count = 0;
- si-saAmfSIActiveWeight = NULL;
- si-saAmfSIStandbyWeight = NULL;
return si;
}
--
HPCC Systems Open Source Big Data Platform from LexisNexis Risk Solutions
Find What Matters Most in Your Big Data with HPCC Systems
Open Source. Fast. Scalable. Simple. Ideal for Dirty Data.
Leverages Graph Analysis for Fast Processing Easy Data Exploration
http://p.sf.net/sfu/hpccsystems
___
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
