[devel] [PATCH 0/2] Review Request for osaf: support compile gcc/g++ 10 [#3307]
Summary: osaf: support compile gcc/g++ 10 [#3307] Review request for Ticket(s): 3307 Peer Reviewer(s): *** LIST THE TECH REVIEWER(S) / MAINTAINER(S) HERE *** Pull request to: *** LIST THE PERSON WITH PUSH ACCESS HERE *** Affected branch(es): develop Development branch: ticket-3307 Base revision: b99fd24c88e4f08799bfcfa9eaa2d585ba426593 Personal repository: git://git.code.sf.net/u/thangng/review Impacted area Impact y/n Docsn Build systemn RPM/packaging n Configuration files n Startup scripts n SAF servicesy OpenSAF servicesn Core libraries n Samples n Tests n Other n NOTE: Patch(es) contain lines longer than 80 characers Comments (indicate scope for each "y" above): - revision b3c201ea329d1c6370af694728249943cb7f0d95 Author: thang.d.nguyen Date: Wed, 16 Mar 2022 09:26:59 +0700 osaf: fix memleak in API test [#3307] Fix some memleak in API test. revision 430bedc07eb65ab90a1f8894950aae61a9cb6171 Author: thang.d.nguyen Date: Wed, 16 Mar 2022 09:24:31 +0700 osaf: support compile gcc/g++ 10 [#3307] Fix error to support compile code with gcc/g++ 10. Complete diffstat: -- src/ckpt/agent/cpa_cb.h| 2 +- src/ckpt/apitest/test_cpa.c| 2 + src/ckpt/apitest/test_cpa_util.c | 13 +++- src/ckpt/apitest/test_cpsv_conf.h | 2 +- src/ckpt/ckptd/cpd_amf.c | 1 - src/ckpt/ckptd/cpd_init.h | 2 +- src/evt/agent/eda.h| 2 +- src/evt/apitest/tet_eda.c | 32 + src/evt/apitest/tet_eda.h | 80 ++ src/evt/apitest/tet_edsv_func.c| 1 + src/evt/evtd/eds.h | 2 +- src/evt/evtd/eds_amf.h | 6 +- src/evt/evtd/eds_cb.h | 2 +- .../management/test_saImmOmThreadInterference.c| 4 +- src/imm/immd/immd.h| 2 +- src/lck/apitest/tet_gld.c | 1 - src/lck/apitest/tet_glnd.c | 2 - src/lck/lckd/gld_dl_api.h | 2 +- src/lck/lcknd/glnd_cb.h| 4 +- src/log/apitest/logtest.c | 6 ++ src/log/apitest/logtest.h | 6 +- src/log/logd/lgs_dest.cc | 4 +- src/mds/apitest/mdstipc.h | 30 src/mds/apitest/mdstipc_api.c | 17 + src/mds/mds_core.h | 30 src/mds/mds_dt_common.c| 3 + src/mds/mds_dt_tcp.c | 3 +- src/mds/mds_dt_tcp.h | 2 +- src/mds/mds_dt_tipc.c | 2 - src/mds/mds_main.c | 47 + src/msg/msgnd/mqnd_db.h| 2 +- tools/devel/fenced/node_state_hdlr_pl.cc | 1 + 32 files changed, 224 insertions(+), 91 deletions(-) Testing Commands: - N/A Testing, Expected Results: -- N/A Conditions of Submission: - Ack from reviewer Arch Built StartedLinux distro --- mipsn n mips64 n n x86 n n x86_64 y y powerpc n n powerpc64 n n Reviewer Checklist: --- [Submitters: make sure that your review doesn't trigger any checkmarks!] Your checkin has not passed review because (see checked entries): ___ Your RR template is generally incomplete; it has too many blank entries that need proper data filled in. ___ You have failed to nominate the proper persons for review and push. ___ Your patches do not have proper short+long header ___ You have grammar/spelling in your header that is unacceptable. ___ You have exceeded a sensible line length in your headers/comments/text. ___ You have failed to put in a proper Trac Ticket # into your commits. ___ You have incorrectly put/left internal data in your comments/files (i.e. internal bug tracking tool IDs, product names etc) ___ You have not given any evidence of testing beyond basic build tests. Demonstrate some level of runtime or other sanity testing. ___ You have ^M present in some of your files. These have to be removed. ___ You have needlessly changed whitespace or added whitespace crimes like trailing spaces, or spaces before tabs. ___ You have mixed real technical changes with whitespace and other
[devel] [PATCH 2/2] osaf: fix memleak in API test [#3307]
Fix some memleak in API test.
---
src/ckpt/apitest/test_cpa.c | 2 ++
src/ckpt/apitest/test_cpa_util.c | 13 ++---
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/ckpt/apitest/test_cpa.c b/src/ckpt/apitest/test_cpa.c
index 6c37e91d5..0093b91ea 100644
--- a/src/ckpt/apitest/test_cpa.c
+++ b/src/ckpt/apitest/test_cpa.c
@@ -364,6 +364,7 @@ void fill_testcase_data()
*(ckpt_name + length) = '.';
saAisNameLend(ckpt_name,
_replicas_ckpt_with_valid_extended_name_length);
+ free(ckpt_name);
ckpt_name = malloc(INVALID_EXTENDED_NAME_LENGTH);
memset(ckpt_name, 0, INVALID_EXTENDED_NAME_LENGTH);
@@ -374,6 +375,7 @@ void fill_testcase_data()
*(ckpt_name + length) = '.';
saAisNameLend(ckpt_name,
_replicas_ckpt_with_invalid_extended_name_length);
+ free(ckpt_name);
/* Variables for sec create */
tcd.sec_id1 = (SaUint8T *)"11";
diff --git a/src/ckpt/apitest/test_cpa_util.c b/src/ckpt/apitest/test_cpa_util.c
index 474e76f0d..7da36e0c1 100644
--- a/src/ckpt/apitest/test_cpa_util.c
+++ b/src/ckpt/apitest/test_cpa_util.c
@@ -24,6 +24,7 @@ extern const char *saf_error_string[];
int gl_try_again_cnt;
int gl_tmout_cnt;
int gl_sync_pointnum;
+NCSCONTEXT gl_task_hdl = NULL;
int tmoutFlag;
int cpsv_test_result(SaAisErrorT rc, SaAisErrorT exp_out, char *test_case,
@@ -651,23 +652,24 @@ void selection_thread_blocking(NCSCONTEXT arg)
m_TEST_CPSV_PRINTF("\n Dispatching FAILED %d \n", rc);
else
m_TEST_CPSV_PRINTF("\n Thread selected \n");
+ m_NCS_TASK_RELEASE(gl_task_hdl);
}
void cpsv_createthread(SaCkptHandleT *cl_hdl)
{
SaAisErrorT rc;
- NCSCONTEXT thread_handle;
rc = m_NCS_TASK_CREATE((NCS_OS_CB)selection_thread_blocking,
(NCSCONTEXT)cl_hdl, "cpsv_block_test", 0,
- SCHED_OTHER, 8000, _handle);
+ SCHED_OTHER, 8000, _task_hdl);
if (rc != NCSCC_RC_SUCCESS) {
m_TEST_CPSV_PRINTF(" Failed to create thread\n");
return;
}
- rc = m_NCS_TASK_START(thread_handle);
+ rc = m_NCS_TASK_START(gl_task_hdl);
if (rc != NCSCC_RC_SUCCESS) {
+ m_NCS_TASK_RELEASE(gl_task_hdl);
m_TEST_CPSV_PRINTF(" Failed to start thread\n");
return;
}
@@ -3007,6 +3009,11 @@ static void ntfCallback(SaNtfSubscriptionIdT
subscriptionId,
break;
}
} while (false);
+
+ if (notification->notificationType == SA_NTF_TYPE_STATE_CHANGE)
+ saNtfNotificationFree(
+ notification->notification.stateChangeNotification
+ .notificationHandle);
}
int test_ckptNtfStateChange(int i, CONFIG_FLAG cfg_flg)
--
2.25.1
___
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
[devel] [PATCH 1/2] osaf: support compile gcc/g++ 10 [#3307]
Fix error to support compile code with gcc/g++ 10.
---
src/ckpt/agent/cpa_cb.h | 2 +-
src/ckpt/apitest/test_cpsv_conf.h | 2 +-
src/ckpt/ckptd/cpd_amf.c | 1 -
src/ckpt/ckptd/cpd_init.h | 2 +-
src/evt/agent/eda.h | 2 +-
src/evt/apitest/tet_eda.c | 32
src/evt/apitest/tet_eda.h | 80 ---
src/evt/apitest/tet_edsv_func.c | 1 +
src/evt/evtd/eds.h| 2 +-
src/evt/evtd/eds_amf.h| 6 +-
src/evt/evtd/eds_cb.h | 2 +-
.../test_saImmOmThreadInterference.c | 4 +-
src/imm/immd/immd.h | 2 +-
src/lck/apitest/tet_gld.c | 1 -
src/lck/apitest/tet_glnd.c| 2 -
src/lck/lckd/gld_dl_api.h | 2 +-
src/lck/lcknd/glnd_cb.h | 4 +-
src/log/apitest/logtest.c | 6 ++
src/log/apitest/logtest.h | 6 +-
src/log/logd/lgs_dest.cc | 4 +-
src/mds/apitest/mdstipc.h | 30 +++
src/mds/apitest/mdstipc_api.c | 17
src/mds/mds_core.h| 30 +++
src/mds/mds_dt_common.c | 3 +
src/mds/mds_dt_tcp.c | 3 +-
src/mds/mds_dt_tcp.h | 2 +-
src/mds/mds_dt_tipc.c | 2 -
src/mds/mds_main.c| 47 +++
src/msg/msgnd/mqnd_db.h | 2 +-
tools/devel/fenced/node_state_hdlr_pl.cc | 1 +
30 files changed, 212 insertions(+), 88 deletions(-)
diff --git a/src/ckpt/agent/cpa_cb.h b/src/ckpt/agent/cpa_cb.h
index ac48c6c4f..d6335830f 100644
--- a/src/ckpt/agent/cpa_cb.h
+++ b/src/ckpt/agent/cpa_cb.h
@@ -119,7 +119,7 @@ typedef struct cpa_cb {
} CPA_CB;
-uint32_t gl_cpa_hdl;
+extern uint32_t gl_cpa_hdl;
typedef struct cpa_prcess_evt_sync {
NCS_QELEM qelem;
diff --git a/src/ckpt/apitest/test_cpsv_conf.h
b/src/ckpt/apitest/test_cpsv_conf.h
index d33be6779..2d35f5dc1 100644
--- a/src/ckpt/apitest/test_cpsv_conf.h
+++ b/src/ckpt/apitest/test_cpsv_conf.h
@@ -154,7 +154,7 @@ struct cpsv_testcase_data {
int ntfTest;
};
-struct cpsv_testcase_data tcd;
+extern struct cpsv_testcase_data tcd;
extern int test_ckptInitialize(int i, CONFIG_FLAG cfg_flg);
extern int test_ckptSelectionObject(int i, CONFIG_FLAG cfg_flg);
diff --git a/src/ckpt/ckptd/cpd_amf.c b/src/ckpt/ckptd/cpd_amf.c
index 48d06c167..0d0cd3cf4 100644
--- a/src/ckpt/ckptd/cpd_amf.c
+++ b/src/ckpt/ckptd/cpd_amf.c
@@ -37,7 +37,6 @@
#include "ckpt/ckptd/cpd_imm.h"
#define NCS_2_0 1
#if NCS_2_0 /* Required for NCS 2.0 */
-extern uint32_t gl_cpd_cb_hdl;
extern const SaImmOiImplementerNameT implementer_name;
/
diff --git a/src/ckpt/ckptd/cpd_init.h b/src/ckpt/ckptd/cpd_init.h
index 0c02642e4..cf3466bb1 100644
--- a/src/ckpt/ckptd/cpd_init.h
+++ b/src/ckpt/ckptd/cpd_init.h
@@ -33,7 +33,7 @@
#include
#include "cpd_cb.h"
-uint32_t gl_cpd_cb_hdl;
+extern uint32_t gl_cpd_cb_hdl;
/* Macro to get the component name for the component type */
#define m_CPD_TASKNAME "CPD"
diff --git a/src/evt/agent/eda.h b/src/evt/agent/eda.h
index 4d1991cd9..138c91010 100644
--- a/src/evt/agent/eda.h
+++ b/src/evt/agent/eda.h
@@ -39,7 +39,7 @@
#include "base/logtrace.h"
/* EDA CB global handle declaration */
-uint32_t gl_eda_hdl;
+extern uint32_t gl_eda_hdl;
/* EDA Default MDS timeout value */
#define EDA_MDS_DEF_TIMEOUT 100
diff --git a/src/evt/apitest/tet_eda.c b/src/evt/apitest/tet_eda.c
index 4c551df9c..bc56233e6 100644
--- a/src/evt/apitest/tet_eda.c
+++ b/src/evt/apitest/tet_eda.c
@@ -16,6 +16,38 @@ int gl_minor_version = 0x01;
SaEvtLimitIdT gl_limitId;
SaLimitValueT gl_limitValue;
+int gl_tNode1, gl_tNode2, gl_tNode3, gl_node_id, gl_jCount, gl_allocatedNumber,
+gl_patternLength, gl_tCount, gl_tCase, gl_iteration, gl_listNumber,
+gl_error, subCount, gl_err, gl_cbk, iCmpCount, tempDataSize, gl_hide;
+char gl_eventData[20];
+NCSCONTEXT gl_t_handle;
+SaEvtHandleT gl_evtHandle;
+SaEvtHandleT gl_threadEvtHandle;
+SaVersionT gl_version;
+SaAisErrorT gl_rc;
+SaSelectionObjectT gl_selObject;
+SaDispatchFlagsT gl_dispatchFlags;
+SaNameT gl_channelName;
+SaNameT gl_publisherName;
+SaEvtChannelOpenFlagsT gl_channelOpenFlags;
+SaTimeT gl_timeout;
+SaTimeT gl_retentionTime;
+SaTimeT gl_publishTime;
+SaEvtChannelHandleT gl_channelHandle;
+SaInvocationT gl_invocation;
+SaEvtEventHandleT gl_eventHandle;
+SaEvtEventHandleT gl_eventDeliverHandle;
+SaEvtEventIdT gl_evtId;
+SaEvtEventPatternArrayT gl_patternArray;
+SaEvtEventPriorityT gl_priority;
+SaSizeT gl_eventDataSize;
+SaEvtEventFilterArrayT gl_filterArray;
+SaEvtSubscriptionIdT
Re: [devel] [PATCH 1/1] osaf: support compile with gcc/g++ 10 [#3307]
Hi Thang,
I think it would be nice you can separate two commits, one for test, one for
gcc/g++ 10 code changes.
Thanks,
Minh
From: Thang Duc Nguyen
Sent: Wednesday, March 16, 2022 11:44 AM
To: Hieu Hong Hoang ; Thien Minh Huynh
; Minh Hon Chau
Cc: opensaf-devel@lists.sourceforge.net ;
Thang Duc Nguyen
Subject: [PATCH 1/1] osaf: support compile with gcc/g++ 10 [#3307]
- Fix error to support gcc/g++ 10.
- Fix memleak in api test.
---
src/ckpt/agent/cpa_cb.h | 2 +-
src/ckpt/apitest/test_cpa.c | 2 +
src/ckpt/apitest/test_cpa_util.c | 13 ++-
src/ckpt/apitest/test_cpsv_conf.h | 2 +-
src/ckpt/ckptd/cpd_amf.c | 1 -
src/ckpt/ckptd/cpd_init.h | 2 +-
src/evt/agent/eda.h | 2 +-
src/evt/apitest/tet_eda.c | 32
src/evt/apitest/tet_eda.h | 80 ---
src/evt/apitest/tet_edsv_func.c | 1 +
src/evt/evtd/eds.h| 2 +-
src/evt/evtd/eds_amf.h| 6 +-
src/evt/evtd/eds_cb.h | 2 +-
.../test_saImmOmThreadInterference.c | 4 +-
src/imm/immd/immd.h | 2 +-
src/lck/apitest/tet_gld.c | 1 -
src/lck/apitest/tet_glnd.c| 2 -
src/lck/lckd/gld_dl_api.h | 2 +-
src/lck/lcknd/glnd_cb.h | 4 +-
src/log/apitest/logtest.c | 6 ++
src/log/apitest/logtest.h | 6 +-
src/log/logd/lgs_dest.cc | 4 +-
src/mds/apitest/mdstipc.h | 30 +++
src/mds/apitest/mdstipc_api.c | 17
src/mds/mds_core.h| 30 +++
src/mds/mds_dt_common.c | 3 +
src/mds/mds_dt_tcp.c | 3 +-
src/mds/mds_dt_tcp.h | 2 +-
src/mds/mds_dt_tipc.c | 2 -
src/mds/mds_main.c| 47 +++
src/msg/msgnd/mqnd_db.h | 2 +-
tools/devel/fenced/node_state_hdlr_pl.cc | 1 +
32 files changed, 224 insertions(+), 91 deletions(-)
diff --git a/src/ckpt/agent/cpa_cb.h b/src/ckpt/agent/cpa_cb.h
index ac48c6c4f..d6335830f 100644
--- a/src/ckpt/agent/cpa_cb.h
+++ b/src/ckpt/agent/cpa_cb.h
@@ -119,7 +119,7 @@ typedef struct cpa_cb {
} CPA_CB;
-uint32_t gl_cpa_hdl;
+extern uint32_t gl_cpa_hdl;
typedef struct cpa_prcess_evt_sync {
NCS_QELEM qelem;
diff --git a/src/ckpt/apitest/test_cpa.c b/src/ckpt/apitest/test_cpa.c
index 6c37e91d5..0093b91ea 100644
--- a/src/ckpt/apitest/test_cpa.c
+++ b/src/ckpt/apitest/test_cpa.c
@@ -364,6 +364,7 @@ void fill_testcase_data()
*(ckpt_name + length) = '.';
saAisNameLend(ckpt_name,
_replicas_ckpt_with_valid_extended_name_length);
+ free(ckpt_name);
ckpt_name = malloc(INVALID_EXTENDED_NAME_LENGTH);
memset(ckpt_name, 0, INVALID_EXTENDED_NAME_LENGTH);
@@ -374,6 +375,7 @@ void fill_testcase_data()
*(ckpt_name + length) = '.';
saAisNameLend(ckpt_name,
_replicas_ckpt_with_invalid_extended_name_length);
+ free(ckpt_name);
/* Variables for sec create */
tcd.sec_id1 = (SaUint8T *)"11";
diff --git a/src/ckpt/apitest/test_cpa_util.c b/src/ckpt/apitest/test_cpa_util.c
index 474e76f0d..7da36e0c1 100644
--- a/src/ckpt/apitest/test_cpa_util.c
+++ b/src/ckpt/apitest/test_cpa_util.c
@@ -24,6 +24,7 @@ extern const char *saf_error_string[];
int gl_try_again_cnt;
int gl_tmout_cnt;
int gl_sync_pointnum;
+NCSCONTEXT gl_task_hdl = NULL;
int tmoutFlag;
int cpsv_test_result(SaAisErrorT rc, SaAisErrorT exp_out, char *test_case,
@@ -651,23 +652,24 @@ void selection_thread_blocking(NCSCONTEXT arg)
m_TEST_CPSV_PRINTF("\n Dispatching FAILED %d \n", rc);
else
m_TEST_CPSV_PRINTF("\n Thread selected \n");
+ m_NCS_TASK_RELEASE(gl_task_hdl);
}
void cpsv_createthread(SaCkptHandleT *cl_hdl)
{
SaAisErrorT rc;
- NCSCONTEXT thread_handle;
rc = m_NCS_TASK_CREATE((NCS_OS_CB)selection_thread_blocking,
(NCSCONTEXT)cl_hdl, "cpsv_block_test", 0,
- SCHED_OTHER, 8000, _handle);
+ SCHED_OTHER, 8000, _task_hdl);
if (rc != NCSCC_RC_SUCCESS) {
m_TEST_CPSV_PRINTF(" Failed to create thread\n");
return;
}
- rc = m_NCS_TASK_START(thread_handle);
+ rc = m_NCS_TASK_START(gl_task_hdl);
if (rc != NCSCC_RC_SUCCESS) {
+ m_NCS_TASK_RELEASE(gl_task_hdl);
m_TEST_CPSV_PRINTF(" Failed to start thread\n");
return;
}
@@ -3007,6 +3009,11 @@ static void
[devel] [PATCH 0/1] Review Request for osaf: support compile with gcc/g++ 10 [#3307]
Summary: osaf: support compile with gcc/g++ 10 [#3307] Review request for Ticket(s): 3307 Peer Reviewer(s): *** LIST THE TECH REVIEWER(S) / MAINTAINER(S) HERE *** Pull request to: *** LIST THE PERSON WITH PUSH ACCESS HERE *** Affected branch(es): develop Development branch: ticket-3307 Base revision: b99fd24c88e4f08799bfcfa9eaa2d585ba426593 Personal repository: git://git.code.sf.net/u/thangng/review Impacted area Impact y/n Docsn Build systemn RPM/packaging n Configuration files n Startup scripts n SAF servicesy OpenSAF servicesn Core libraries n Samples n Tests n Other n NOTE: Patch(es) contain lines longer than 80 characers Comments (indicate scope for each "y" above): - revision 38726264a752b8646030c83ed046388f64bac8b7 Author: thang.d.nguyen Date: Tue, 15 Mar 2022 18:39:26 +0700 osaf: support compile with gcc/g++ 10 [#3307] - Fix error to support gcc/g++ 10. - Fix memleak in api test. Complete diffstat: -- src/ckpt/agent/cpa_cb.h| 2 +- src/ckpt/apitest/test_cpa.c| 2 + src/ckpt/apitest/test_cpa_util.c | 13 +++- src/ckpt/apitest/test_cpsv_conf.h | 2 +- src/ckpt/ckptd/cpd_amf.c | 1 - src/ckpt/ckptd/cpd_init.h | 2 +- src/evt/agent/eda.h| 2 +- src/evt/apitest/tet_eda.c | 32 + src/evt/apitest/tet_eda.h | 80 ++ src/evt/apitest/tet_edsv_func.c| 1 + src/evt/evtd/eds.h | 2 +- src/evt/evtd/eds_amf.h | 6 +- src/evt/evtd/eds_cb.h | 2 +- .../management/test_saImmOmThreadInterference.c| 4 +- src/imm/immd/immd.h| 2 +- src/lck/apitest/tet_gld.c | 1 - src/lck/apitest/tet_glnd.c | 2 - src/lck/lckd/gld_dl_api.h | 2 +- src/lck/lcknd/glnd_cb.h| 4 +- src/log/apitest/logtest.c | 6 ++ src/log/apitest/logtest.h | 6 +- src/log/logd/lgs_dest.cc | 4 +- src/mds/apitest/mdstipc.h | 30 src/mds/apitest/mdstipc_api.c | 17 + src/mds/mds_core.h | 30 src/mds/mds_dt_common.c| 3 + src/mds/mds_dt_tcp.c | 3 +- src/mds/mds_dt_tcp.h | 2 +- src/mds/mds_dt_tipc.c | 2 - src/mds/mds_main.c | 47 + src/msg/msgnd/mqnd_db.h| 2 +- tools/devel/fenced/node_state_hdlr_pl.cc | 1 + 32 files changed, 224 insertions(+), 91 deletions(-) Testing Commands: - N/A Testing, Expected Results: -- N/A Conditions of Submission: - Ack from reviewer Arch Built StartedLinux distro --- mipsn n mips64 n n x86 n n x86_64 y y powerpc n n powerpc64 n n Reviewer Checklist: --- [Submitters: make sure that your review doesn't trigger any checkmarks!] Your checkin has not passed review because (see checked entries): ___ Your RR template is generally incomplete; it has too many blank entries that need proper data filled in. ___ You have failed to nominate the proper persons for review and push. ___ Your patches do not have proper short+long header ___ You have grammar/spelling in your header that is unacceptable. ___ You have exceeded a sensible line length in your headers/comments/text. ___ You have failed to put in a proper Trac Ticket # into your commits. ___ You have incorrectly put/left internal data in your comments/files (i.e. internal bug tracking tool IDs, product names etc) ___ You have not given any evidence of testing beyond basic build tests. Demonstrate some level of runtime or other sanity testing. ___ You have ^M present in some of your files. These have to be removed. ___ You have needlessly changed whitespace or added whitespace crimes like trailing spaces, or spaces before tabs. ___ You have mixed real technical changes with whitespace and other cosmetic code cleanup changes. These have to be separate commits. ___ You need to refactor your submission into logical chunks; there is too much content into a single
[devel] [PATCH 1/1] osaf: support compile with gcc/g++ 10 [#3307]
- Fix error to support gcc/g++ 10.
- Fix memleak in api test.
---
src/ckpt/agent/cpa_cb.h | 2 +-
src/ckpt/apitest/test_cpa.c | 2 +
src/ckpt/apitest/test_cpa_util.c | 13 ++-
src/ckpt/apitest/test_cpsv_conf.h | 2 +-
src/ckpt/ckptd/cpd_amf.c | 1 -
src/ckpt/ckptd/cpd_init.h | 2 +-
src/evt/agent/eda.h | 2 +-
src/evt/apitest/tet_eda.c | 32
src/evt/apitest/tet_eda.h | 80 ---
src/evt/apitest/tet_edsv_func.c | 1 +
src/evt/evtd/eds.h| 2 +-
src/evt/evtd/eds_amf.h| 6 +-
src/evt/evtd/eds_cb.h | 2 +-
.../test_saImmOmThreadInterference.c | 4 +-
src/imm/immd/immd.h | 2 +-
src/lck/apitest/tet_gld.c | 1 -
src/lck/apitest/tet_glnd.c| 2 -
src/lck/lckd/gld_dl_api.h | 2 +-
src/lck/lcknd/glnd_cb.h | 4 +-
src/log/apitest/logtest.c | 6 ++
src/log/apitest/logtest.h | 6 +-
src/log/logd/lgs_dest.cc | 4 +-
src/mds/apitest/mdstipc.h | 30 +++
src/mds/apitest/mdstipc_api.c | 17
src/mds/mds_core.h| 30 +++
src/mds/mds_dt_common.c | 3 +
src/mds/mds_dt_tcp.c | 3 +-
src/mds/mds_dt_tcp.h | 2 +-
src/mds/mds_dt_tipc.c | 2 -
src/mds/mds_main.c| 47 +++
src/msg/msgnd/mqnd_db.h | 2 +-
tools/devel/fenced/node_state_hdlr_pl.cc | 1 +
32 files changed, 224 insertions(+), 91 deletions(-)
diff --git a/src/ckpt/agent/cpa_cb.h b/src/ckpt/agent/cpa_cb.h
index ac48c6c4f..d6335830f 100644
--- a/src/ckpt/agent/cpa_cb.h
+++ b/src/ckpt/agent/cpa_cb.h
@@ -119,7 +119,7 @@ typedef struct cpa_cb {
} CPA_CB;
-uint32_t gl_cpa_hdl;
+extern uint32_t gl_cpa_hdl;
typedef struct cpa_prcess_evt_sync {
NCS_QELEM qelem;
diff --git a/src/ckpt/apitest/test_cpa.c b/src/ckpt/apitest/test_cpa.c
index 6c37e91d5..0093b91ea 100644
--- a/src/ckpt/apitest/test_cpa.c
+++ b/src/ckpt/apitest/test_cpa.c
@@ -364,6 +364,7 @@ void fill_testcase_data()
*(ckpt_name + length) = '.';
saAisNameLend(ckpt_name,
_replicas_ckpt_with_valid_extended_name_length);
+ free(ckpt_name);
ckpt_name = malloc(INVALID_EXTENDED_NAME_LENGTH);
memset(ckpt_name, 0, INVALID_EXTENDED_NAME_LENGTH);
@@ -374,6 +375,7 @@ void fill_testcase_data()
*(ckpt_name + length) = '.';
saAisNameLend(ckpt_name,
_replicas_ckpt_with_invalid_extended_name_length);
+ free(ckpt_name);
/* Variables for sec create */
tcd.sec_id1 = (SaUint8T *)"11";
diff --git a/src/ckpt/apitest/test_cpa_util.c b/src/ckpt/apitest/test_cpa_util.c
index 474e76f0d..7da36e0c1 100644
--- a/src/ckpt/apitest/test_cpa_util.c
+++ b/src/ckpt/apitest/test_cpa_util.c
@@ -24,6 +24,7 @@ extern const char *saf_error_string[];
int gl_try_again_cnt;
int gl_tmout_cnt;
int gl_sync_pointnum;
+NCSCONTEXT gl_task_hdl = NULL;
int tmoutFlag;
int cpsv_test_result(SaAisErrorT rc, SaAisErrorT exp_out, char *test_case,
@@ -651,23 +652,24 @@ void selection_thread_blocking(NCSCONTEXT arg)
m_TEST_CPSV_PRINTF("\n Dispatching FAILED %d \n", rc);
else
m_TEST_CPSV_PRINTF("\n Thread selected \n");
+ m_NCS_TASK_RELEASE(gl_task_hdl);
}
void cpsv_createthread(SaCkptHandleT *cl_hdl)
{
SaAisErrorT rc;
- NCSCONTEXT thread_handle;
rc = m_NCS_TASK_CREATE((NCS_OS_CB)selection_thread_blocking,
(NCSCONTEXT)cl_hdl, "cpsv_block_test", 0,
- SCHED_OTHER, 8000, _handle);
+ SCHED_OTHER, 8000, _task_hdl);
if (rc != NCSCC_RC_SUCCESS) {
m_TEST_CPSV_PRINTF(" Failed to create thread\n");
return;
}
- rc = m_NCS_TASK_START(thread_handle);
+ rc = m_NCS_TASK_START(gl_task_hdl);
if (rc != NCSCC_RC_SUCCESS) {
+ m_NCS_TASK_RELEASE(gl_task_hdl);
m_TEST_CPSV_PRINTF(" Failed to start thread\n");
return;
}
@@ -3007,6 +3009,11 @@ static void ntfCallback(SaNtfSubscriptionIdT
subscriptionId,
break;
}
} while (false);
+
+ if (notification->notificationType == SA_NTF_TYPE_STATE_CHANGE)
+ saNtfNotificationFree(
+ notification->notification.stateChangeNotification
+ .notificationHandle);
}
int test_ckptNtfStateChange(int i, CONFIG_FLAG cfg_flg)
diff --git
