From b73142ee7737de74c8a3d01dce033edef83c1d1f Mon Sep 17 00:00:00 2001 From: Dizhi Zhou Date: Fri, 7 Dec 2012 15:52:36 -0500 Subject: [PATCH] Initialize 'bankSize' and 'rbgIndex' in fdtbfq-ff-mac-scheduler.cc, and 'bankSize' in tdtbfq-ff-mac-scheduler.cc --- src/lte/model/fdtbfq-ff-mac-scheduler.cc | 7 ++++--- src/lte/model/tdtbfq-ff-mac-scheduler.cc | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/lte/model/fdtbfq-ff-mac-scheduler.cc b/src/lte/model/fdtbfq-ff-mac-scheduler.cc index 91eaa2c94..a046febed 100644 --- a/src/lte/model/fdtbfq-ff-mac-scheduler.cc +++ b/src/lte/model/fdtbfq-ff-mac-scheduler.cc @@ -215,7 +215,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); @@ -583,7 +584,7 @@ FdTbfqFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::S // assign RBGs to this UE uint32_t bytesTxed = 0; uint32_t bytesTxedTmp = 0; - int rbgIndex; + int rbgIndex = 0; while ( bytesTxed <= budget ) { totalRbg++; @@ -598,7 +599,7 @@ FdTbfqFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::S } int nLayer = TransmissionModesLayers::TxMode2LayerNum ((*itTxMode).second); - // find RBG with largest achievableRate + // find RBG with largest achievableRate double achievableRateMax = 0.0; rbgIndex = rbgNum; for (int k = 0; k < rbgNum; k++) diff --git a/src/lte/model/tdtbfq-ff-mac-scheduler.cc b/src/lte/model/tdtbfq-ff-mac-scheduler.cc index 99c6c1b25..f05db2c51 100644 --- a/src/lte/model/tdtbfq-ff-mac-scheduler.cc +++ b/src/lte/model/tdtbfq-ff-mac-scheduler.cc @@ -215,7 +215,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);