diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-12-20 15:11:01 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-12-20 15:11:01 +0000 |
| commit | 3573e7399c9474a5f43261afc4cb8b9e4580b891 (patch) | |
| tree | 7488c6c7eff7cbced7ebad1baca28046bdb4aa00 /CIAO | |
| parent | 3e4403aebe0479fd36a875a6781064579e233ce1 (diff) | |
| download | ATCD-3573e7399c9474a5f43261afc4cb8b9e4580b891.tar.gz | |
Tue Dec 20 15:10:01 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp:
* connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp:
* connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/Throughput_Receiver.cpp:
* connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp:
Reset the timer queue and finalize DDS explicitly to fix a lot
of
reported memory leaks
Diffstat (limited to 'CIAO')
5 files changed, 16 insertions, 0 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 63a65834867..0f4cf6cf46b 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,12 @@ +Tue Dec 20 15:10:01 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp: + * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp: + * connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/Throughput_Receiver.cpp: + * connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp: + Reset the timer queue and finalize DDS explicitly to fix a lot of + reported memory leaks + Tue Dec 20 09:10:05 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl> * connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp: diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp index d8cbb1f5483..7cc51a87fe1 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp +++ b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp @@ -304,6 +304,8 @@ clean_exit: } } + DDSDomainParticipantFactory::finalize_instance (); + return main_result; } diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp index b8549552c05..ccc85620b19 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp +++ b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp @@ -711,6 +711,8 @@ int ACE_TMAIN(int argc, ACE_TCHAR* argv[]) delete [] datalen_range_; delete [] duration_times_; delete pub_listener; + DDSDomainParticipantFactory::finalize_instance (); + ACE_Reactor::instance ()->timer_queue(0); return main_result; } diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/Throughput_Receiver.cpp b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/Throughput_Receiver.cpp index 8e7df2a1232..43e702809a8 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/Throughput_Receiver.cpp +++ b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/Throughput_Receiver.cpp @@ -304,6 +304,8 @@ clean_exit: } } + DDSDomainParticipantFactory::finalize_instance (); + return main_result; } diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp index 34f4b66dd63..1c378f0d976 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp +++ b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp @@ -323,5 +323,6 @@ clean_exit: ex._tao_print_exception("ERROR : Unexpected CORBA exception caught :"); main_result = 1; } + DDSDomainParticipantFactory::finalize_instance (); return main_result; } |