From 43f3ce4d5bea3316a9569328dcc9231ec18dd73a Mon Sep 17 00:00:00 2001 From: Nicola Baldo Date: Thu, 31 Mar 2011 14:41:39 +0200 Subject: [PATCH] fixed memory leak in PHY SAP usage --- src/lte/model/lte-enb-mac.cc | 3 +-- src/lte/model/lte-enb-phy.cc | 1 + src/lte/model/lte-ue-mac.cc | 1 + src/lte/model/lte-ue-phy.cc | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lte/model/lte-enb-mac.cc b/src/lte/model/lte-enb-mac.cc index 438adec4f..909d07aab 100644 --- a/src/lte/model/lte-enb-mac.cc +++ b/src/lte/model/lte-enb-mac.cc @@ -313,10 +313,8 @@ LteEnbMac::LteEnbMac () NS_LOG_FUNCTION (this); m_macSapProvider = new EnbMacMemberLteMacSapProvider (this); m_cmacSapProvider = new EnbMacMemberLteEnbCmacSapProvider (this); - m_schedSapUser = new EnbMacMemberFfMacSchedSapUser (this); m_cschedSapUser = new EnbMacMemberFfMacCschedSapUser (this); - m_enbPhySapUser = new EnbMacMemberLteEnbPhySapUser (this); } @@ -334,6 +332,7 @@ LteEnbMac::DoDispose () delete m_cmacSapProvider; delete m_schedSapUser; delete m_cschedSapUser; + delete m_enbPhySapUser; } diff --git a/src/lte/model/lte-enb-phy.cc b/src/lte/model/lte-enb-phy.cc index c1bf2024f..4e5a7195b 100644 --- a/src/lte/model/lte-enb-phy.cc +++ b/src/lte/model/lte-enb-phy.cc @@ -125,6 +125,7 @@ LteEnbPhy::DoDispose () { NS_LOG_FUNCTION (this); m_ueAttached.clear (); + delete m_enbPhySapProvider; LtePhy::DoDispose (); } diff --git a/src/lte/model/lte-ue-mac.cc b/src/lte/model/lte-ue-mac.cc index 45dedf24e..59e7d90fe 100644 --- a/src/lte/model/lte-ue-mac.cc +++ b/src/lte/model/lte-ue-mac.cc @@ -208,6 +208,7 @@ LteUeMac::DoDispose () NS_LOG_FUNCTION (this); delete m_macSapProvider; delete m_cmacSapProvider; + delete m_uePhySapUser; Object::DoDispose (); } diff --git a/src/lte/model/lte-ue-phy.cc b/src/lte/model/lte-ue-phy.cc index b93bb9dad..e1a9b9200 100644 --- a/src/lte/model/lte-ue-phy.cc +++ b/src/lte/model/lte-ue-phy.cc @@ -112,6 +112,7 @@ void LteUePhy::DoDispose () { NS_LOG_FUNCTION (this); + delete m_uePhySapProvider; LtePhy::DoDispose (); }