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

lte: Simplify fix for #2731 (changeset 39839e91252e)

Browse Source
This commit is contained in:
Alexander Krotov
2017-06-05 13:43:06 +03:00
parent 4474e76064
commit 16b177df77
1 changed files with 13 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/lte/model/lte-rlc-am.cc
View File

@@ -1689,63 +1689,22 @@ LteRlcAm::ExpirePollRetransmitTimer (void)
|| (m_vtS == m_vtMs))
{
NS_LOG_INFO ("txonBuffer and retxBuffer empty. Move PDUs up to = " << m_vtS.GetValue () - 1 << " to retxBuffer");
uint16_t sn = 0;
uint16_t acked = m_vtA.GetValue();
uint16_t sent = m_vtS.GetValue ();
if(acked <= sent) //If no overflow, no change.
for (SequenceNumber10 sn = m_vtA; sn < m_vtS; sn++)
{
for ( sn = m_vtA.GetValue(); sn < m_vtS.GetValue (); sn++ )
{
bool pduAvailable = m_txedBuffer.at (sn).m_pdu != 0;
bool pduAvailable = m_txedBuffer.at (sn.GetValue ()).m_pdu != 0;
if ( pduAvailable )
{
NS_LOG_INFO ("Move PDU " << sn << " from txedBuffer to retxBuffer");
m_retxBuffer.at (sn).m_pdu = m_txedBuffer.at (sn).m_pdu->Copy ();
m_retxBuffer.at (sn).m_retxCount = m_txedBuffer.at (sn).m_retxCount;
m_retxBufferSize += m_retxBuffer.at (sn).m_pdu->GetSize ();
if ( pduAvailable )
{
uint16_t snValue = sn.GetValue ();
NS_LOG_INFO ("Move PDU " << sn << " from txedBuffer to retxBuffer");
m_retxBuffer.at (snValue).m_pdu = m_txedBuffer.at (snValue).m_pdu->Copy ();
m_retxBuffer.at (snValue).m_retxCount = m_txedBuffer.at (snValue).m_retxCount;
m_retxBufferSize += m_retxBuffer.at (snValue).m_pdu->GetSize ();
m_txedBufferSize -= m_txedBuffer.at (sn).m_pdu->GetSize ();
m_txedBuffer.at (sn).m_pdu = 0;
m_txedBuffer.at (sn).m_retxCount = 0;
}
}
}
else//If overflow happened, we retransmit from acked sequence to 1023, then from 0 to sent sequence.
{
for ( sn = m_vtA.GetValue(); sn < 1024; sn++ )
{
bool pduAvailable = m_txedBuffer.at (sn).m_pdu != 0;
if ( pduAvailable )
{
NS_LOG_INFO ("Move PDU " << sn << " from txedBuffer to retxBuffer");
m_retxBuffer.at (sn).m_pdu = m_txedBuffer.at (sn).m_pdu->Copy ();
m_retxBuffer.at (sn).m_retxCount = m_txedBuffer.at (sn).m_retxCount;
m_retxBufferSize += m_retxBuffer.at (sn).m_pdu->GetSize ();
m_txedBufferSize -= m_txedBuffer.at (sn).m_pdu->GetSize ();
m_txedBuffer.at (sn).m_pdu = 0;
m_txedBuffer.at (sn).m_retxCount = 0;
}
}
for ( sn = 0; sn < m_vtS.GetValue (); sn++ )
{
bool pduAvailable = m_txedBuffer.at (sn).m_pdu != 0;
if ( pduAvailable )
{
NS_LOG_INFO ("Move PDU " << sn << " from txedBuffer to retxBuffer");
m_retxBuffer.at (sn).m_pdu = m_txedBuffer.at (sn).m_pdu->Copy ();
m_retxBuffer.at (sn).m_retxCount = m_txedBuffer.at (sn).m_retxCount;
m_retxBufferSize += m_retxBuffer.at (sn).m_pdu->GetSize ();
m_txedBufferSize -= m_txedBuffer.at (sn).m_pdu->GetSize ();
m_txedBuffer.at (sn).m_pdu = 0;
m_txedBuffer.at (sn).m_retxCount = 0;
}
}
m_txedBufferSize -= m_txedBuffer.at (snValue).m_pdu->GetSize ();
m_txedBuffer.at (snValue).m_pdu = 0;
m_txedBuffer.at (snValue).m_retxCount = 0;
}
}
}