From df815155f56709b03dea6ef3d3fc991dbc1ce123 Mon Sep 17 00:00:00 2001 From: Marco Miozzo Date: Thu, 17 Mar 2011 15:47:36 +0100 Subject: [PATCH] DL PF Scheduler --- src/lte/helper/lena-helper.cc | 1 + src/lte/model/lte-enb-mac.cc | 1 - src/lte/model/lte-enb-net-device.cc | 42 +++++++++++++++------------- src/lte/model/lte-enb-net-device.h | 4 +-- src/lte/model/rr-ff-mac-scheduler.cc | 2 +- src/lte/wscript | 2 ++ 6 files changed, 29 insertions(+), 23 deletions(-) diff --git a/src/lte/helper/lena-helper.cc b/src/lte/helper/lena-helper.cc index 2bf2435bd..a535a9d6b 100644 --- a/src/lte/helper/lena-helper.cc +++ b/src/lte/helper/lena-helper.cc @@ -238,6 +238,7 @@ LenaHelper::EnableLogComponents (void) LogComponentEnable ("LteUeMac", LOG_LEVEL_ALL); LogComponentEnable ("LteRlc", LOG_LEVEL_ALL); LogComponentEnable ("RrPacketScheduler", LOG_LEVEL_ALL); + LogComponentEnable ("PfPacketScheduler", LOG_LEVEL_ALL); LogComponentEnable ("LtePhy", LOG_LEVEL_ALL); LogComponentEnable ("LteEnbPhy", LOG_LEVEL_ALL); diff --git a/src/lte/model/lte-enb-mac.cc b/src/lte/model/lte-enb-mac.cc index 189c02675..a0871738b 100644 --- a/src/lte/model/lte-enb-mac.cc +++ b/src/lte/model/lte-enb-mac.cc @@ -415,7 +415,6 @@ LteEnbMac::DoSubframeIndication (uint32_t frameNo, uint32_t subframeNo) { cqiNum = MAX_CQI_LIST; } - cqiInfoReq.m_cqiList.insert (cqiInfoReq.m_cqiList.begin (), m_dlCqiReceived.begin (), m_dlCqiReceived.end ()); m_dlCqiReceived.erase (m_dlCqiReceived.begin (), m_dlCqiReceived.end ()); m_schedSapProvider->SchedDlCqiInfoReq (cqiInfoReq); diff --git a/src/lte/model/lte-enb-net-device.cc b/src/lte/model/lte-enb-net-device.cc index 21cbe0446..45408b6e3 100644 --- a/src/lte/model/lte-enb-net-device.cc +++ b/src/lte/model/lte-enb-net-device.cc @@ -20,24 +20,27 @@ * Author: Nicola Baldo : Integrated with new RRC and MAC architecture */ -#include "ns3/llc-snap-header.h" -#include "ns3/simulator.h" -#include "ns3/callback.h" -#include "ns3/node.h" -#include "ns3/packet.h" -#include "lte-net-device.h" -#include "ns3/packet-burst.h" -#include "ns3/uinteger.h" -#include "ns3/trace-source-accessor.h" -#include "ns3/pointer.h" -#include "ns3/enum.h" -#include "lte-amc.h" -#include "lte-enb-mac.h" -#include "lte-enb-net-device.h" -#include "lte-enb-rrc.h" -#include "lte-ue-net-device.h" -#include "lte-enb-phy.h" -#include "rr-ff-mac-scheduler.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +//#include +#include + NS_LOG_COMPONENT_DEFINE ("LteEnbNetDevice"); @@ -115,7 +118,8 @@ LteEnbNetDevice::InitLteEnbNetDevice (void) m_mac->SetLteEnbCmacSapUser (m_rrc->GetLteEnbCmacSapUser ()); m_rrc->SetLteMacSapProvider (m_mac->GetLteMacSapProvider ()); - m_scheduler = Create (); + //m_scheduler = Create (); + m_scheduler = Create (); m_mac->SetFfMacSchedSapProvider (m_scheduler->GetFfMacSchedSapProvider ()); m_mac->SetFfMacCschedSapProvider (m_scheduler->GetFfMacCschedSapProvider ()); diff --git a/src/lte/model/lte-enb-net-device.h b/src/lte/model/lte-enb-net-device.h index c19abfa3c..1a5b13f19 100644 --- a/src/lte/model/lte-enb-net-device.h +++ b/src/lte/model/lte-enb-net-device.h @@ -40,7 +40,7 @@ class LtePhy; class LteEnbPhy; class LteEnbMac; class LteEnbRrc; -class RrFfMacScheduler; +class FfMacScheduler; /** @@ -110,7 +110,7 @@ private: Ptr m_rrc; - Ptr m_scheduler; + Ptr m_scheduler; uint16_t m_cellId; /**< Cell Identifer. Part of the CGI, see TS 29.274, section 8.21.1 */ diff --git a/src/lte/model/rr-ff-mac-scheduler.cc b/src/lte/model/rr-ff-mac-scheduler.cc index ab0e15d34..60822a604 100644 --- a/src/lte/model/rr-ff-mac-scheduler.cc +++ b/src/lte/model/rr-ff-mac-scheduler.cc @@ -440,7 +440,7 @@ RrFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sched rlcPduSize += newDci.m_tbsSize.at (i); } newEl.m_dci = newDci; - // ...more parameters -> ingored in this version + // ...more parameters -> ignored in this version RlcPduListElement_s newRlcEl; newRlcEl.m_logicalChannelIdentity = (*it).m_logicalChannelIdentity; diff --git a/src/lte/wscript b/src/lte/wscript index 22883eb1f..3281e24ea 100644 --- a/src/lte/wscript +++ b/src/lte/wscript @@ -39,6 +39,7 @@ def build(bld): 'model/lte-ue-phy-sap.cc', 'model/lte-interference.cc', 'model/lte-sinr-chunk-processor.cc', + 'model/pf-ff-mac-scheduler.cc', ] headers = bld.new_task_gen('ns3header') @@ -82,6 +83,7 @@ def build(bld): 'model/lte-ue-phy-sap.h', 'model/lte-interference.h', 'model/lte-sinr-chunk-processor.h', + 'model/pf-ff-mac-scheduler.h', ] if (bld.env['ENABLE_EXAMPLES']):