From 900e65959d447ce00a906357735c9808b8bf3702 Mon Sep 17 00:00:00 2001 From: Dizhi Zhou Date: Sun, 7 Apr 2013 17:51:56 -0300 Subject: [PATCH] Solve FDTBFQ, TDTBFQ uninitialized variables --- src/lte/model/fdtbfq-ff-mac-scheduler.cc | 3 ++- src/lte/model/tdtbfq-ff-mac-scheduler.cc | 11 +++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/lte/model/fdtbfq-ff-mac-scheduler.cc b/src/lte/model/fdtbfq-ff-mac-scheduler.cc index 9dc1f48af..f410901a5 100644 --- a/src/lte/model/fdtbfq-ff-mac-scheduler.cc +++ b/src/lte/model/fdtbfq-ff-mac-scheduler.cc @@ -220,7 +220,8 @@ FdTbfqFfMacScheduler::FdTbfqFfMacScheduler () : m_cschedSapUser (0), m_schedSapUser (0), m_timeWindow (99.0), - m_nextRntiUl (0) + m_nextRntiUl (0), + bankSize (0) { m_amc = CreateObject (); m_cschedSapProvider = new FdTbfqSchedulerMemberCschedSapProvider (this); diff --git a/src/lte/model/tdtbfq-ff-mac-scheduler.cc b/src/lte/model/tdtbfq-ff-mac-scheduler.cc index f44077692..01b7ef14b 100644 --- a/src/lte/model/tdtbfq-ff-mac-scheduler.cc +++ b/src/lte/model/tdtbfq-ff-mac-scheduler.cc @@ -220,7 +220,8 @@ TdTbfqFfMacScheduler::TdTbfqFfMacScheduler () : m_cschedSapUser (0), m_schedSapUser (0), m_timeWindow (99.0), - m_nextRntiUl (0) + m_nextRntiUl (0), + bankSize (0) { m_amc = CreateObject (); m_cschedSapProvider = new TdTbfqSchedulerMemberCschedSapProvider (this); @@ -1117,7 +1118,6 @@ TdTbfqFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::S { if ((*itCqi).second.m_higherLayerSelected.size () > (*itMap).second.at (k)) { - NS_LOG_INFO (this << " RBG " << (*itMap).second.at (k) << " CQI " << (uint16_t)((*itCqi).second.m_higherLayerSelected.at ((*itMap).second.at (k)).m_sbCqi.at (0)) ); for (uint8_t j = 0; j < nLayer; j++) { if ((*itCqi).second.m_higherLayerSelected.at ((*itMap).second.at (k)).m_sbCqi.size () > j) @@ -1150,17 +1150,12 @@ TdTbfqFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::S worstCqi.at (j) = 1; // try with lowest MCS in RBG with no info on channel } } - for (uint8_t j = 0; j < nLayer; j++) - { - NS_LOG_INFO (this << " Layer " << (uint16_t)j << " CQI selected " << (uint16_t)worstCqi.at (j)); - } uint32_t bytesTxed = 0; for (uint8_t j = 0; j < nLayer; j++) { newDci.m_mcs.push_back (m_amc->GetMcsFromCqi (worstCqi.at (j))); - int tbSize = (m_amc->GetTbSizeFromMcs (newDci.m_mcs.at (j), RgbPerRnti * rbgSize) / 8); // (size of TB in bytes according to table 7.1.7.2.1-1 of 36.213) + int tbSize = (m_amc->GetTbSizeFromMcs (newDci.m_mcs.at (j), RgbPerRnti * rbgSize) / 8); // (size of TB in bytes according to table 7.1.7.2.1-1 of 36.213) newDci.m_tbsSize.push_back (tbSize); - NS_LOG_INFO (this << " Layer " << (uint16_t)j << " MCS selected" << m_amc->GetMcsFromCqi (worstCqi.at (j))); bytesTxed += tbSize; }