ns-3.24: comparison src/lte/helper/lena-helper.cc

equal deleted inserted replaced

-:09e2d03022a2
+:810e24692db8
 tid =
 TypeId ("ns3::LenaHelper")
 .SetParent<Object> ()
 .AddConstructor<LenaHelper> ()
 .AddAttribute ("Scheduler",
 "The type of scheduler to be used for eNBs",
 StringValue ("ns3::PfFfMacScheduler"),
 MakeStringAccessor (&LenaHelper::SetSchedulerType),
 MakeStringChecker ())
 .AddAttribute ("PropagationModel",
 "The type of propagation model to be used",
 StringValue ("ns3::FriisSpectrumPropagationLossModel"),
 MakeStringAccessor (&LenaHelper::SetPropagationModelType),
 MakeStringChecker ())
 ;
 return tid;
 }
 void
 LenaHelper::SetSchedulerType (std::string type)
 Ptr<NetDevice>
 LenaHelper::InstallSingleEnbDevice (Ptr<Node> n)
 {
 Ptr<LteSpectrumPhy> dlPhy = CreateObject<LteSpectrumPhy> ();
 Ptr<LteSpectrumPhy> ulPhy = CreateObject<LteSpectrumPhy> ();
 Ptr<LteEnbPhy> phy = CreateObject<LteEnbPhy> (dlPhy, ulPhy);
 Ptr<LteCqiSinrChunkProcessor> p = Create<LteCqiSinrChunkProcessor> (phy->GetObject<LtePhy> ());
 ulPhy->AddSinrChunkProcessor (p);
 ulPhy->SetMobility (mm);
 m_uplinkChannel->AddRx (ulPhy);
 Ptr<LteEnbMac> mac = CreateObject<LteEnbMac> ();
 Ptr<FfMacScheduler> sched = m_schedulerFactory.Create<FfMacScheduler> ();
 Ptr<LteEnbRrc> rrc = CreateObject<LteEnbRrc> ();
 // connect SAPs
 rrc->SetLteEnbCmacSapProvider (mac->GetLteEnbCmacSapProvider ());
 NS_ASSERT_MSG (mm, "MobilityModel needs to be set on node before calling LenaHelper::InstallUeDevice ()");
 dlPhy->SetMobility (mm);
 ulPhy->SetMobility (mm);
 m_downlinkChannel->AddRx (dlPhy);
 Ptr<LteUeMac> mac = CreateObject<LteUeMac> ();
 Ptr<LteUeRrc> rrc = CreateObject<LteUeRrc> ();
 // connect SAPs
 rrc->SetLteUeCmacSapProvider (mac->GetLteUeCmacSapProvider ());
 void
 DlSchedulingCallback (Ptr<MacStatsCalculator> mac, std::string path,
 uint32_t frameNo, uint32_t subframeNo, uint16_t rnti,
 uint8_t mcsTb1, uint16_t sizeTb1, uint8_t mcsTb2, uint16_t sizeTb2)
 {
-mac->DlScheduling(frameNo, subframeNo, rnti, mcsTb1, sizeTb1, mcsTb2, sizeTb2);
+mac->DlScheduling (frameNo, subframeNo, rnti, mcsTb1, sizeTb1, mcsTb2, sizeTb2);
 }
 void
 LenaHelper::EnableDlMacTraces (void)
 {
-Config::Connect("/NodeList/0/DeviceList/0/LteEnbMac/DlScheduling",
+Config::Connect ("/NodeList/0/DeviceList/0/LteEnbMac/DlScheduling",
-MakeBoundCallback(&DlSchedulingCallback, macStats));
+MakeBoundCallback (&DlSchedulingCallback, macStats));
 }
 void
 UlSchedulingCallback (Ptr<MacStatsCalculator> mac, std::string path,
 uint32_t frameNo, uint32_t subframeNo, uint16_t rnti,
 uint8_t mcs, uint16_t size)
 {
-mac->UlScheduling(frameNo, subframeNo, rnti, mcs, size);
+mac->UlScheduling (frameNo, subframeNo, rnti, mcs, size);
 }
 void
 LenaHelper::EnableUlMacTraces (void)
 {
-Config::Connect("/NodeList/0/DeviceList/0/LteEnbMac/UlScheduling",
+Config::Connect ("/NodeList/0/DeviceList/0/LteEnbMac/UlScheduling",
-MakeBoundCallback(&UlSchedulingCallback, macStats));
+MakeBoundCallback (&UlSchedulingCallback, macStats));
 }
 void
 LenaHelper::EnableRlcTraces (void)
 {
 {
 // Sample path input:
 // /NodeList/#NodeId/DeviceList/#DeviceId/LteEnbRrc/UeMap/#C-RNTI/RadioBearerMap/#LCID/LteRlc/RxPDU
 // We retrieve the UeInfo accociated to the C-RNTI and perform the IMSI lookup
-std::string ueMapPath = path.substr (0, path.find("/RadioBearerMap"));
+std::string ueMapPath = path.substr (0, path.find ("/RadioBearerMap"));
 Config::MatchContainer match = Config::LookupMatches (ueMapPath);
 if (match.GetN () != 0)
 {
-Ptr<Object> ueInfo = match.Get(0);
+Ptr<Object> ueInfo = match.Get (0);
 return ueInfo->GetObject<UeInfo> ()->GetImsi ();
 }
 else
 {
 NS_FATAL_ERROR ("Lookup " << ueMapPath << " got no matches");
 }
 // Sample path input:
 // /NodeList/1/DeviceList/0/LteUeRrc/RlcMap/1/RxPDU
 // /NodeList/#NodeId/DeviceList/#DeviceId/LteUeRrc/RlcMap/#LCID/RxPDU
 // We retrieve the LteUeNetDevice path
-std::string lteUeNetDevicePath = path.substr (0, path.find("/LteUeRrc"));
+std::string lteUeNetDevicePath = path.substr (0, path.find ("/LteUeRrc"));
 Config::MatchContainer match = Config::LookupMatches (lteUeNetDevicePath);
 if (match.GetN () != 0)
 {
-Ptr<Object> ueNetDevice = match.Get(0);
+Ptr<Object> ueNetDevice = match.Get (0);
 return ueNetDevice->GetObject<LteUeNetDevice> ()->GetImsi ();
 }
 else
 {
 NS_FATAL_ERROR ("Lookup " << lteUeNetDevicePath << " got no matches");
 }
 }
 void
 DlTxPduCallback (Ptr<RlcStatsCalculator> rlcStats, std::string path,
 uint16_t rnti, uint8_t lcid, uint32_t packetSize)
 {
 uint64_t imsi = FindImsiFromEnbRlcPath (path);
 rlcStats->DlTxPdu (imsi, rnti, lcid, packetSize);
 }
 void
 DlRxPduCallback (Ptr<RlcStatsCalculator> rlcStats, std::string path,
 uint16_t rnti, uint8_t lcid, uint32_t packetSize, uint64_t delay)
 {
 uint64_t imsi = FindImsiFromUeRlc (path);
 rlcStats->DlRxPdu (imsi, rnti, lcid, packetSize, delay);
 }
 void
 LenaHelper::EnableDlRlcTraces (void)
 {
 Config::Connect ("/NodeList/*/DeviceList/*/LteEnbRrc/UeMap/*/RadioBearerMap/*/LteRlc/TxPDU",
-MakeBoundCallback(&DlTxPduCallback, rlcStats));
+MakeBoundCallback (&DlTxPduCallback, rlcStats));
 Config::Connect ("/NodeList/*/DeviceList/*/LteUeRrc/RlcMap/*/RxPDU",
-MakeBoundCallback(&DlRxPduCallback, rlcStats));
+MakeBoundCallback (&DlRxPduCallback, rlcStats));
 }
 void
-UlTxPduCallback(Ptr<RlcStatsCalculator> rlcStats, std::string path,
+UlTxPduCallback (Ptr<RlcStatsCalculator> rlcStats, std::string path,
 uint16_t rnti, uint8_t lcid, uint32_t packetSize)
 {
 uint64_t imsi = FindImsiFromUeRlc (path);
 rlcStats->UlTxPdu (imsi, rnti, lcid, packetSize);
 }
 void
-UlRxPduCallback(Ptr<RlcStatsCalculator> rlcStats, std::string path,
+UlRxPduCallback (Ptr<RlcStatsCalculator> rlcStats, std::string path,
 uint16_t rnti, uint8_t lcid, uint32_t packetSize, uint64_t delay)
 {
 uint64_t imsi = FindImsiFromEnbRlcPath (path);
 rlcStats->UlRxPdu (imsi, rnti, lcid, packetSize, delay);
 }
 void
 LenaHelper::EnableUlRlcTraces (void)
 {
-Config::Connect("/NodeList/*/DeviceList/*/LteUeRrc/RlcMap/*/TxPDU",
+Config::Connect ("/NodeList/*/DeviceList/*/LteUeRrc/RlcMap/*/TxPDU",
-MakeBoundCallback(&UlTxPduCallback, rlcStats));
+MakeBoundCallback (&UlTxPduCallback, rlcStats));
 Config::Connect ("/NodeList/0/DeviceList/*/LteEnbRrc/UeMap/*/RadioBearerMap/*/LteRlc/RxPDU",
-MakeBoundCallback(&UlRxPduCallback, rlcStats));
+MakeBoundCallback (&UlRxPduCallback, rlcStats));
 }
 Ptr<RlcStatsCalculator>
 LenaHelper::GetRlcStats (void)
 {

changeset 8149	810e24692db8
parent 8056	b38f1b984c98
child 8151	c4bf0eb55569