fixed connection of RLC traces

src/lte/examples/lena-rlc-calculator.cc

@@ -74,7 +74,7 @@ int main (int argc, char *argv[])
   EpsBearer bearer (q);
   lena->ActivateEpsBearer (ueDevs, bearer, LteTft::Default ());
 
-  Simulator::Stop (Seconds (5));
+  Simulator::Stop (Seconds (0.2));
 
   lena->EnableMacTraces ();
   lena->EnableRlcTraces ();
@@ -87,7 +87,7 @@ int main (int argc, char *argv[])
     {
       Ptr<ConstantPositionMobilityModel> mm = ueNodes.Get (i)->GetObject<ConstantPositionMobilityModel> ();
       mm->SetPosition (Vector (userDistance[i], 0.0, 0.0));
-    } // rkwan
+    } 
 
   Simulator::Run ();
 

src/lte/helper/lena-helper.cc

@@ -716,7 +716,7 @@ LenaHelper::EnableDlRlcTraces (void)
   NS_LOG_FUNCTION_NOARGS ();
   Config::Connect ("/NodeList/*/DeviceList/*/LteEnbRrc/UeMap/*/RadioBearerMap/*/LteRlc/TxPDU",
                    MakeBoundCallback (&DlTxPduCallback, m_rlcStats));
-  Config::Connect ("/NodeList/*/DeviceList/*/LteUeRrc/RlcMap/*/RxPDU",
+  Config::Connect ("/NodeList/*/DeviceList/*/LteUeRrc/RadioBearerMap/*/LteRlc/RxPDU",
                    MakeBoundCallback (&DlRxPduCallback, m_rlcStats));
 }
 

src/lte/model/lte-rlc.cc

@@ -188,12 +188,13 @@ LteRlcSm::GetTypeId (void)
 void
 LteRlcSm::DoTransmitPdcpPdu (Ptr<Packet> p)
 {
-  NS_LOG_FUNCTION (this);
+  NS_LOG_FUNCTION (this << p);
 }
 
 void
 LteRlcSm::DoReceivePdu (Ptr<Packet> p)
 {
+  NS_LOG_FUNCTION (this << p);
   // RLC Performance evaluation
   RlcTag rlcTag;
   Time delay;
@@ -208,6 +209,7 @@ LteRlcSm::DoReceivePdu (Ptr<Packet> p)
 void
 LteRlcSm::DoNotifyTxOpportunity (uint32_t bytes)
 {
+  NS_LOG_FUNCTION (this << bytes);
   LteMacSapProvider::TransmitPduParameters params;
   params.pdu = Create<Packet> (bytes);
   params.rnti = m_rnti;

src/lte/test/lte-test-rlc-um-transmitter.cc

@@ -38,8 +38,8 @@ using namespace ns3;
 LteRlcUmTransmitterTestSuite::LteRlcUmTransmitterTestSuite ()
   : TestSuite ("lte-rlc-um-transmitter", SYSTEM)
 {
-  LogLevel logLevel = (LogLevel)(LOG_PREFIX_FUNC | LOG_PREFIX_TIME | LOG_LEVEL_ALL);
-  LogComponentEnable ("LteRlcUmTransmitterTest", logLevel);
+  // LogLevel logLevel = (LogLevel)(LOG_PREFIX_FUNC | LOG_PREFIX_TIME | LOG_LEVEL_ALL);
+  // LogComponentEnable ("LteRlcUmTransmitterTest", logLevel);
 
   NS_LOG_INFO ("Creating LteRlcUmTransmitterTestSuite");
 
@@ -56,7 +56,7 @@ static LteRlcUmTransmitterTestSuite lteRlcUmTransmitterTestSuite;
 LteRlcUmTransmitterTestCase::LteRlcUmTransmitterTestCase (std::string name)
   : TestCase (name)
 {
-  NS_LOG_UNCOND ("Creating LteRlcUmTransmitterTestCase: " + name);
+  // NS_LOG_UNCOND ("Creating LteRlcUmTransmitterTestCase: " + name);
 }
 
 LteRlcUmTransmitterTestCase::~LteRlcUmTransmitterTestCase ()

src/lte/test/lte-test-rr-ff-mac-scheduler.cc

@@ -299,7 +299,7 @@ LenaRrFfMacSchedulerTestCase::DoRun (void)
       // get the lcId
       uint8_t lcId = ueDevs.Get (i)->GetObject<LteUeNetDevice> ()->GetRrc ()->GetLcIdVector ().at (0);
       dlDataRxed.push_back (rlcStats->GetDlRxData (imsi, lcId));
-      NS_LOG_INFO ("\tUser " << i << " imsi " << imsi << " bytes rxed " << (double)dlDataRxed.at (i) << "  thr " << (double)dlDataRxed.at (i) / simulationTime << " ref " << m_thrRefDl);
+      NS_LOG_INFO ("\tUser " << i << " imsi " << imsi << " lcid " << (uint16_t) lcId << " bytes rxed " << (double)dlDataRxed.at (i) << "  thr " << (double)dlDataRxed.at (i) / simulationTime << " ref " << m_thrRefDl);
       NS_TEST_ASSERT_MSG_EQ_TOL ((double)dlDataRxed.at (i) / simulationTime, m_thrRefDl, m_thrRefDl * tolerance, " Unfair Throughput!");
     }
 
@@ -312,7 +312,7 @@ LenaRrFfMacSchedulerTestCase::DoRun (void)
       // get the lcId
       uint8_t lcId = ueDevs.Get (i)->GetObject<LteUeNetDevice> ()->GetRrc ()->GetLcIdVector ().at (0);
       ulDataRxed.push_back (rlcStats->GetUlRxData (imsi, lcId));
-      NS_LOG_INFO ("\tUser " << i << " imsi " << imsi << " bytes txed " << (double)ulDataRxed.at (i) << "  thr " << (double)ulDataRxed.at (i) / simulationTime << " ref " << m_thrRefUl);
+      NS_LOG_INFO ("\tUser " << i << " imsi " << imsi << " lcid " << (uint16_t) lcId << " bytes txed " << (double)ulDataRxed.at (i) << "  thr " << (double)ulDataRxed.at (i) / simulationTime << " ref " << m_thrRefUl);
       NS_TEST_ASSERT_MSG_EQ_TOL ((double)ulDataRxed.at (i) / simulationTime, m_thrRefUl, m_thrRefUl * tolerance, " Unfair Throughput!");
     }
 

src/lte/test/test-lte-epc-e2e-data.cc

@@ -248,7 +248,7 @@ LteEpcE2eDataTestSuite::LteEpcE2eDataTestSuite ()
   EnbTestData e3;
   UeTestData f3_1 (3, 50);
   e3.ues.push_back (f3_1);
-  UeTestData f3_2 (5, 1472);
+  UeTestData f3_2 (5, 1400);
   e3.ues.push_back (f3_2);
   UeTestData f3_3 (1, 1);
   e3.ues.push_back (f3_2);