From 23cba49ee7398a9976ccd2b35072fcfab78f65ae Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Tue, 21 Dec 2010 16:13:14 -0800 Subject: [PATCH] fix valgrind issue with lte-bearer test --- src/devices/lte/model/lte-mac-queue.cc | 1 + src/devices/lte/test/lte-bearer-test.cc | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/devices/lte/model/lte-mac-queue.cc b/src/devices/lte/model/lte-mac-queue.cc index efecad4ad..6d2f0a3ed 100644 --- a/src/devices/lte/model/lte-mac-queue.cc +++ b/src/devices/lte/model/lte-mac-queue.cc @@ -99,6 +99,7 @@ LteMacQueue::LteMacQueue (uint32_t maxSize) LteMacQueue::~LteMacQueue (void) { + m_queue.clear (); } diff --git a/src/devices/lte/test/lte-bearer-test.cc b/src/devices/lte/test/lte-bearer-test.cc index 865c37548..8084fe77f 100644 --- a/src/devices/lte/test/lte-bearer-test.cc +++ b/src/devices/lte/test/lte-bearer-test.cc @@ -102,7 +102,10 @@ Ns3LteBearerTestCase::DoRun (void) return true; // the queue should be empty } - + // Free memory; handle reference cycle that bearer has with RlcEntity + bearer->Dispose (); + bearer = 0; + Simulator::Destroy (); return (testResult); }