DL PF Scheduler

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);

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);

src/lte/model/lte-enb-net-device.cc

@@ -20,24 +20,27 @@
  * Author: Nicola Baldo <nbaldo@cttc.es>  : 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 <ns3/llc-snap-header.h>
+#include <ns3/simulator.h>
+#include <ns3/callback.h>
+#include <ns3/node.h>
+#include <ns3/packet.h>
+#include <ns3/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 <ns3/lte-amc.h>
+#include <ns3/lte-enb-mac.h>
+#include <ns3/lte-enb-net-device.h>
+#include <ns3/lte-enb-rrc.h>
+#include <ns3/lte-ue-net-device.h>
+#include <ns3/lte-enb-phy.h>
+#include <ns3/ff-mac-scheduler.h>
+//#include <ns3/rr-ff-mac-scheduler.h>
+#include <ns3/pf-ff-mac-scheduler.h>
+
 
 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<RrFfMacScheduler> ();
+  //m_scheduler = Create<RrFfMacScheduler> ();
+  m_scheduler = Create<PfFfMacScheduler> ();
   m_mac->SetFfMacSchedSapProvider (m_scheduler->GetFfMacSchedSapProvider ());
   m_mac->SetFfMacCschedSapProvider (m_scheduler->GetFfMacCschedSapProvider ());
 

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<LteEnbRrc> m_rrc;
 
-  Ptr<RrFfMacScheduler> m_scheduler;
+  Ptr<FfMacScheduler> m_scheduler;
 
   uint16_t m_cellId; /**< Cell Identifer. Part of the CGI, see TS 29.274, section 8.21.1  */ 
 

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;

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']):