F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Nicola Baldo
2015-04-16 17:49:29 +02:00
parent e3e8613a07 9fcf2037b0
commit 95eb0e7adf
2 changed files with 42 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/lte/test/lte-test-entities.cc
View File

@@ -203,8 +203,26 @@ LteTestRrc::Start ()
p.rnti = 1111;
p.lcid = 222;
p.pdcpSdu = Create<Packet> (m_pduSize);
bool haveContext = false;
Ptr<Node> node;
if (m_device != 0)
{
node = m_device->GetNode ();
if (node != 0)
{
haveContext = true;
}
}
if (haveContext)
{
Simulator::ScheduleWithContext (node->GetId (), Seconds (0), &LtePdcpSapProvider::TransmitPdcpSdu, m_pdcpSapProvider, p);
}
else
{
Simulator::Schedule (Seconds (0), &LtePdcpSapProvider::TransmitPdcpSdu, m_pdcpSapProvider, p);
}
Simulator::ScheduleWithContext (m_device->GetNode ()->GetId (), Seconds (0), &LtePdcpSapProvider::TransmitPdcpSdu, m_pdcpSapProvider, p);
m_nextPdu = Simulator::Schedule (m_arrivalTime, &LteTestRrc::Start, this);
// Simulator::Run ();
}
@@ -456,7 +474,25 @@ void
LteTestMac::SendTxOpportunity (Time time, uint32_t bytes)
{
NS_LOG_FUNCTION (this << time << bytes);
Simulator::ScheduleWithContext (m_device->GetNode ()->GetId (), time, &LteMacSapUser::NotifyTxOpportunity, m_macSapUser, bytes, 0, 0);
bool haveContext = false;
Ptr<Node> node;
if (m_device != 0)
{
node = m_device->GetNode ();
if (node != 0)
{
haveContext = true;
}
}
if (haveContext)
{
Simulator::ScheduleWithContext (node->GetId (), time, &LteMacSapUser::NotifyTxOpportunity, m_macSapUser, bytes, 0, 0);
}
else
{
Simulator::Schedule (time, &LteMacSapUser::NotifyTxOpportunity, m_macSapUser, bytes, 0, 0);
}
if (m_txOpportunityMode == RANDOM_MODE)
{
if (m_txOppTime != Seconds (0))

4
src/lte/test/lte-test-rlc-am-transmitter.cc
View File

@@ -139,6 +139,7 @@ LteRlcAmTransmitterOneSduTestCase::DoRun (void)
txMac->SendTxOpportunity (Seconds (0.150), 30);
CheckDataReceived (Seconds (0.200), "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "SDU is not OK");
Simulator::Stop (Seconds (0.3));
Simulator::Run ();
Simulator::Destroy ();
}
@@ -181,6 +182,7 @@ LteRlcAmTransmitterSegmentationTestCase::DoRun (void)
txMac->SendTxOpportunity (Seconds (0.450), 7);
CheckDataReceived (Seconds (0.500), "YZZ", "Segment #4 is not OK");
Simulator::Stop (Seconds (0.6));
Simulator::Run ();
Simulator::Destroy ();
}
@@ -217,6 +219,7 @@ LteRlcAmTransmitterConcatenationTestCase::DoRun (void)
txMac->SendTxOpportunity (Seconds (0.250), 33);
CheckDataReceived (Seconds (0.300), "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "Concatenation is not OK");
Simulator::Stop (Seconds (0.4));
Simulator::Run ();
Simulator::Destroy ();
}
@@ -293,6 +296,7 @@ LteRlcAmTransmitterReportBufferStatusTestCase::DoRun (void)
txMac->SendTxOpportunity (Seconds (1.650), (4+2+1+2) + (3+10+10+7));
CheckDataReceived (Seconds (1.700), "XYZABCDEFGHIJKLMNOPQRSTUVWXYZ", "SDU #9 is not OK");
Simulator::Stop (Seconds (2));
Simulator::Run ();
Simulator::Destroy ();
}