# HG changeset patch # User Manuel Requena # Date 1328717698 -3600 # Node ID 859fa94888fc33d22f822c89967c713ea896a893 # Parent b86b82c7669392685fa6b2e236b2a4388ee4b0d6# Parent db24d2db55d43aad2cd646a8e9cb3dae12ec92cb Merge new tests of RLC entities diff -r db24d2db55d4 -r 859fa94888fc src/lte/model/lte-rlc-am-header.cc --- a/src/lte/model/lte-rlc-am-header.cc Wed Feb 08 13:42:00 2012 +0100 +++ b/src/lte/model/lte-rlc-am-header.cc Wed Feb 08 17:14:58 2012 +0100 @@ -89,9 +89,9 @@ } void -LteRlcAmHeader::SetSequenceNumber (uint16_t sequenceNumber) +LteRlcAmHeader::SetSequenceNumber (SequenceNumber10 sequenceNumber) { - m_sequenceNumber = sequenceNumber & 0x03FF; + m_sequenceNumber = sequenceNumber; } uint8_t @@ -100,7 +100,7 @@ return m_framingInfo; } -uint16_t +SequenceNumber10 LteRlcAmHeader::GetSequenceNumber () const { return m_sequenceNumber; @@ -209,12 +209,12 @@ void -LteRlcAmHeader::SetAckSn (uint16_t ackSn) +LteRlcAmHeader::SetAckSn (SequenceNumber10 ackSn) { - m_ackSn = ackSn & 0x03FF; + m_ackSn = ackSn; } -uint16_t +SequenceNumber10 LteRlcAmHeader::GetAckSn (void) const { return m_ackSn; @@ -303,8 +303,8 @@ ((m_pollingBit << 5) & 0x20) | ((m_framingInfo << 3) & 0x18) | (((*it1) << 2) & 0x04) | - ((m_sequenceNumber >> 8) & 0x0003) ); - i.WriteU8 ( m_sequenceNumber & 0x00FF ); + ((m_sequenceNumber.GetValue () >> 8) & 0x0003) ); + i.WriteU8 ( m_sequenceNumber.GetValue () & 0x00FF ); i.WriteU8 ( ((m_lastSegmentFlag << 7) & 0x80) | ((m_segmentOffset >> 8) & 0x007F) ); i.WriteU8 ( m_segmentOffset & 0x00FF ); @@ -346,8 +346,8 @@ { i.WriteU8 ( ((CONTROL_PDU << 7) & 0x80) | ((m_controlPduType << 4) & 0x70) | - ((m_ackSn >> 6) & 0x0F) ); - i.WriteU8 ( ((m_ackSn << 2) & 0xC0) ); + ((m_ackSn.GetValue () >> 6) & 0x0F) ); + i.WriteU8 ( ((m_ackSn.GetValue () << 2) & 0xFC) ); } } @@ -378,7 +378,7 @@ m_lastSegmentFlag = (byte_3 & 0x80) >> 7; m_segmentOffset = (byte_3 & 0x7F) | byte_4; - + extensionBit = (byte_1 & 0x04) >> 2; m_extensionBits.push_back (extensionBit); diff -r db24d2db55d4 -r 859fa94888fc src/lte/model/lte-rlc-am-header.h --- a/src/lte/model/lte-rlc-am-header.h Wed Feb 08 13:42:00 2012 +0100 +++ b/src/lte/model/lte-rlc-am-header.h Wed Feb 08 17:14:58 2012 +0100 @@ -22,6 +22,7 @@ #define LTE_RLC_AM_HEADER_H #include "ns3/header.h" +#include "ns3/lte-rlc-sequence-number.h" #include @@ -65,8 +66,8 @@ // DATA PDU // - void SetSequenceNumber (uint16_t sequenceNumber); - uint16_t GetSequenceNumber () const; + void SetSequenceNumber (SequenceNumber10 sequenceNumber); + SequenceNumber10 GetSequenceNumber () const; void SetFramingInfo (uint8_t framingInfo); uint8_t GetFramingInfo () const; @@ -124,8 +125,8 @@ // CONTROL PDU // - void SetAckSn (uint16_t ackSn); - uint16_t GetAckSn () const; + void SetAckSn (SequenceNumber10 ackSn); + SequenceNumber10 GetAckSn () const; static TypeId GetTypeId (void); @@ -143,7 +144,7 @@ uint8_t m_resegmentationFlag; uint8_t m_pollingBit; uint8_t m_framingInfo; // 2 bits - uint16_t m_sequenceNumber; // 10 bits + SequenceNumber10 m_sequenceNumber; uint8_t m_lastSegmentFlag; uint16_t m_segmentOffset; uint16_t m_lastOffset; @@ -155,8 +156,8 @@ uint8_t m_controlPduType; // Status PDU fields - uint16_t m_ackSn; - uint16_t m_nackSn; + SequenceNumber10 m_ackSn; + SequenceNumber10 m_nackSn; std::list m_extensionBits1; // Includes E1 after ACK_SN std::list m_extensionBits2; diff -r db24d2db55d4 -r 859fa94888fc src/lte/model/lte-rlc-am.cc --- a/src/lte/model/lte-rlc-am.cc Wed Feb 08 13:42:00 2012 +0100 +++ b/src/lte/model/lte-rlc-am.cc Wed Feb 08 17:14:58 2012 +0100 @@ -38,9 +38,9 @@ // Buffers m_txonBufferSize = 0; - m_retxBuffer.resize (512); + m_retxBuffer.resize (1024); m_retxBufferSize = 0; - m_txedBuffer.resize (512); + m_txedBuffer.resize (1024); m_txedBufferSize = 0; m_statusPduRequested = false; @@ -129,7 +129,7 @@ Time retxQueueHolDelay (0); if ( m_retxBufferSize ) { - m_retxBuffer.front ().m_pdu->PeekPacketTag (retxQueueHolTimeTag); +//MRE m_retxBuffer.front ().m_pdu->PeekPacketTag (retxQueueHolTimeTag); retxQueueHolDelay = now - retxQueueHolTimeTag.GetSenderTimestamp (); } @@ -186,10 +186,25 @@ params.lcid = m_lcid; m_macSapProvider->TransmitPdu (params); + return; } else if ( m_retxBufferSize > 0 ) { NS_LOG_LOGIC ("Sending data from Retransmission Buffer"); + + Ptr packet = m_retxBuffer.at (m_vtA.GetValue ()).m_pdu; + + if ( packet->GetSize () <= bytes ) + { + // Send RLC PDU to MAC layer + LteMacSapProvider::TransmitPduParameters params; + params.pdu = packet; + params.rnti = m_rnti; + params.lcid = m_lcid; + + m_macSapProvider->TransmitPdu (params); + return; + } } else if ( m_txonBufferSize > 0 ) { @@ -212,7 +227,7 @@ rlcAmHeader.SetDataPdu (); // Build Data field - uint32_t nextSegmentSize = bytes - 2; + uint32_t nextSegmentSize = bytes - 4; uint32_t nextSegmentId = 1; uint32_t dataFieldTotalSize = 0; uint32_t dataFieldAddedSize = 0; @@ -304,7 +319,7 @@ dataFieldAddedSize = firstSegment->GetSize (); dataFieldTotalSize += dataFieldAddedSize; dataField.push_back (firstSegment); - firstSegment = 0; // TODO how to put a null ptr to Packet? + firstSegment = 0; // ExtensionBit (Next_Segment - 1) = 0 rlcAmHeader.PushExtensionBit (LteRlcAmHeader::DATA_FIELD_FOLLOWS); @@ -320,9 +335,9 @@ NS_LOG_LOGIC (" First SDU buffer = " << *(m_txonBuffer.begin())); NS_LOG_LOGIC (" First SDU size = " << (*(m_txonBuffer.begin()))->GetSize ()); } - NS_LOG_LOGIC (" Next segment size = " << nextSegmentSize << " (should be 0)"); + NS_LOG_LOGIC (" Next segment size = " << nextSegmentSize); - // nextSegmentSize MUST be zero + // nextSegmentSize MUST be zero (only if txonBuffer is not empty) // (NO more segments) → exit // break; @@ -341,7 +356,7 @@ // LengthIndicator (Next_Segment) = txBuffer.FirstBuffer.length() rlcAmHeader.PushLengthIndicator (firstSegment->GetSize ()); - nextSegmentSize -= ((nextSegmentId % 2) ? (2) : (1)) + dataFieldAddedSize; // TODO??? + nextSegmentSize -= ((nextSegmentId % 2) ? (2) : (1)) + dataFieldAddedSize; nextSegmentId++; NS_LOG_LOGIC (" SDUs in TxBuffer = " << m_txonBuffer.size ()); @@ -366,9 +381,7 @@ // Build RLC header // - rlcAmHeader.SetSequenceNumber ( m_vtS ); - m_vtS = (m_vtS + 1) % 1024; - + rlcAmHeader.SetSequenceNumber ( m_vtS++ ); rlcAmHeader.SetResegmentationFlag (LteRlcAmHeader::PDU); rlcAmHeader.SetLastSegmentFlag (LteRlcAmHeader::LAST_PDU_SEGMENT); rlcAmHeader.SetSegmentOffset (0); @@ -444,7 +457,7 @@ { NS_LOG_LOGIC ("Start PollRetransmit timer"); - m_pollRetransmitTimer = Simulator::Schedule (Time ("1.0s"), + m_pollRetransmitTimer = Simulator::Schedule (Time ("0.1s"), &LteRlcAm::ExpirePollRetransmitTimer, this); } else @@ -452,7 +465,7 @@ NS_LOG_LOGIC ("Restart PollRetransmit timer"); m_pollRetransmitTimer.Cancel (); - m_pollRetransmitTimer = Simulator::Schedule (Time ("1.0s"), + m_pollRetransmitTimer = Simulator::Schedule (Time ("0.1s"), &LteRlcAm::ExpirePollRetransmitTimer, this); } } @@ -465,7 +478,7 @@ // Store new PDU into the Transmitted PDU Buffer NS_LOG_LOGIC ("Put transmitted PDU in the txedBuffer"); m_txedBufferSize += packet->GetSize (); - m_txedBuffer.at ( rlcAmHeader.GetSequenceNumber () ) = packet; + m_txedBuffer.at ( rlcAmHeader.GetSequenceNumber ().GetValue () ) = packet; // Send RLC PDU to MAC layer LteMacSapProvider::TransmitPduParameters params; @@ -544,7 +557,7 @@ // - update state variables and start t-Reordering as needed (see sub clause 5.1.3.2.4). - uint16_t seqNumber = rlcAmHeader.GetSequenceNumber (); + SequenceNumber10 seqNumber = rlcAmHeader.GetSequenceNumber (); if ( rlcAmHeader.GetResegmentationFlag () == LteRlcAmHeader::SEGMENT ) { @@ -640,8 +653,8 @@ else { NS_LOG_LOGIC ("Place AMD PDU in the reception buffer ( SN = " << seqNumber << " )"); - m_rxonBuffer[ seqNumber ].m_byteSegments.push_back (p); - m_rxonBuffer[ seqNumber ].m_pduComplete = true; + m_rxonBuffer[ seqNumber.GetValue () ].m_byteSegments.push_back (p); + m_rxonBuffer[ seqNumber.GetValue () ].m_pduComplete = true; // - if some byte segments of the AMD PDU contained in the RLC data PDU have been received before: // - discard the duplicate byte segments. @@ -656,7 +669,7 @@ if ( seqNumber >= m_vrH ) { - m_vrH = (seqNumber + 1) % 1024; + m_vrH = seqNumber + 1; NS_LOG_LOGIC ("New VR(H) = " << m_vrH); } @@ -664,11 +677,12 @@ // - update VR(MS) to the SN of the first AMD PDU with SN > current VR(MS) for // which not all byte segments have been received; - if ( m_rxonBuffer[ m_vrMs ].m_pduComplete ) + if ( m_rxonBuffer[ m_vrMs.GetValue () ].m_pduComplete ) { - while ( m_rxonBuffer[ m_vrMs ].m_pduComplete ) + while ( m_rxonBuffer[ m_vrMs.GetValue () ].m_pduComplete ) { - m_vrMs = (m_vrMs + 1) % 1024; + m_vrMs++; + NS_LOG_LOGIC ("Incr VR(MS) = " << m_vrMs); } NS_LOG_LOGIC ("New VR(MS) = " << m_vrMs); } @@ -681,21 +695,28 @@ if ( seqNumber == m_vrR ) { - if ( m_rxonBuffer[ seqNumber ].m_pduComplete ) + if ( m_rxonBuffer[ seqNumber.GetValue () ].m_pduComplete ) { - while ( m_rxonBuffer[ m_vrR ].m_pduComplete ) + while ( m_rxonBuffer[ m_vrR.GetValue () ].m_pduComplete ) { - m_vrR = (m_vrR + 1) % 1024; + NS_LOG_LOGIC ("Reassemble and Deliver ( SN = " << m_vrR << " )"); + NS_ASSERT_MSG (m_rxonBuffer[ m_vrR.GetValue () ].m_byteSegments.size () == 1, + "Too many segments. PDU Reassembly process didn't work"); + ReassembleAndDeliver (m_rxonBuffer[ m_vrR.GetValue () ].m_byteSegments.front ()); + m_rxonBuffer.erase (m_vrR.GetValue ()); + + m_vrR++; } NS_LOG_LOGIC ("New VR(R) = " << m_vrR); m_vrMr = m_vrR + m_windowSize; NS_LOG_LOGIC ("New VR(MR) = " << m_vrMr); } - NS_LOG_LOGIC ("Reassemble and Deliver ( SN = " << seqNumber << " )"); - NS_ASSERT_MSG (m_rxonBuffer[ seqNumber ].m_byteSegments.size () == 1, - "Too many segments. PDU Reassembly process didn't work"); - ReassembleAndDeliver (m_rxonBuffer[ seqNumber ].m_byteSegments.front ()); +// NS_LOG_LOGIC ("Reassemble and Deliver ( SN = " << seqNumber << " )"); +// NS_ASSERT_MSG (m_rxonBuffer[ seqNumber.GetValue () ].m_byteSegments.size () == 1, +// "Too many segments. PDU Reassembly process didn't work"); +// ReassembleAndDeliver (m_rxonBuffer[ seqNumber.GetValue () ].m_byteSegments.front ()); +// m_rxonBuffer.erase (seqNumber.GetValue ()); } // - if t-Reordering is running: @@ -727,7 +748,7 @@ if ( m_vrH > m_vrR ) { NS_LOG_LOGIC ("Start reordering timer"); - m_reorderingTimer = Simulator::Schedule (Time ("1.0s"), + m_reorderingTimer = Simulator::Schedule (Time ("0.1s"), &LteRlcAm::ExpireReorderingTimer ,this); m_vrX = m_vrH; NS_LOG_LOGIC ("New VR(X) = " << m_vrX); @@ -831,46 +852,67 @@ { NS_LOG_INFO ("Control AM RLC PDU"); - uint16_t ackSn = rlcAmHeader.GetAckSn (); - uint16_t seqNumber = m_vtA; + SequenceNumber10 ackSn = rlcAmHeader.GetAckSn (); +// SequenceNumber10 seqNumber = m_vtA; - while (seqNumber < ackSn) + NS_LOG_INFO ("ackSn = " << ackSn); + NS_LOG_INFO ("VT(A) = " << m_vtA); + NS_LOG_INFO ("VT(S) = " << m_vtS); + while (m_vtA < ackSn && m_vtA < m_vtS) { - NS_LOG_INFO ("seqNumber = " << seqNumber); - NS_LOG_INFO ("ackSn = " << ackSn); - NS_LOG_INFO ("m_txedBuffer(seqNumber).size = " << m_txedBuffer.size ()); - if (m_txedBuffer.at (seqNumber)) +// NS_LOG_INFO ("seqNumber = " << seqNumber); +// NS_LOG_INFO ("m_txedBuffer( VT(A) ).size = " << m_txedBuffer.size ()); + + uint16_t seqNumberValue = m_vtA.GetValue (); + if (m_txedBuffer.at (seqNumberValue)) { - NS_LOG_INFO ("m_txedBuffer(seqNumber)->GetSize = " << m_txedBuffer.at (seqNumber)->GetSize ()); - m_txedBufferSize -= m_txedBuffer.at (seqNumber)->GetSize (); - m_txedBuffer.at (seqNumber) = 0; + NS_LOG_INFO ("ACKed SN = " << seqNumberValue << " from txedBuffer"); +// NS_LOG_INFO ("m_txedBuffer( " << m_vtA << " )->GetSize = " << m_txedBuffer.at (m_vtA.GetValue ())->GetSize ()); + m_txedBufferSize -= m_txedBuffer.at (seqNumberValue)->GetSize (); + m_txedBuffer.at (seqNumberValue) = 0; } - seqNumber++; + + if (m_retxBuffer.at (seqNumberValue).m_pdu) + { + NS_LOG_INFO ("ACKed SN = " << seqNumberValue << " from retxBuffer"); + m_retxBufferSize -= m_retxBuffer.at (seqNumberValue).m_pdu->GetSize (); + m_retxBuffer.at (seqNumberValue).m_pdu = 0; + m_retxBuffer.at (seqNumberValue).m_retxCount = 0; + } + + m_vtA++; } + NS_LOG_INFO ("New VT(A) = " << m_vtA); + + SequenceNumber10 seqNumber = m_vtA; + uint16_t seqNumberValue; while (seqNumber < m_vtS) { - if (m_txedBuffer.at (seqNumber)) + seqNumberValue = seqNumber.GetValue (); + if (m_txedBuffer.at (seqNumberValue)) { - m_retxBuffer.at (seqNumber).m_pdu = m_txedBuffer.at (seqNumber); - m_retxBuffer.at (seqNumber).m_retxCount = 0; - m_retxBufferSize += m_retxBuffer.at (seqNumber).m_pdu->GetSize (); + NS_LOG_INFO ("Move SN = " << seqNumberValue << " to retxBuffer"); + m_retxBuffer.at (seqNumberValue).m_pdu = m_txedBuffer.at (seqNumberValue); + m_retxBuffer.at (seqNumberValue).m_retxCount = 0; + m_retxBufferSize += m_retxBuffer.at (seqNumberValue).m_pdu->GetSize (); - m_txedBufferSize -= m_txedBuffer.at (seqNumber)->GetSize (); - m_txedBuffer.at (seqNumber) = 0; + m_txedBufferSize -= m_txedBuffer.at (seqNumberValue)->GetSize (); + m_txedBuffer.at (seqNumberValue) = 0; } - else if (m_retxBuffer.at (seqNumber).m_pdu) + else if (m_retxBuffer.at (seqNumberValue).m_pdu) { - m_retxBuffer.at (seqNumber).m_retxCount++; - if (m_retxBuffer.at (seqNumber).m_retxCount >= m_maxRetxThreshold) + m_retxBuffer.at (seqNumberValue).m_retxCount++; + NS_LOG_INFO ("Incr RETX_COUNT for SN = " << seqNumberValue); + if (m_retxBuffer.at (seqNumberValue).m_retxCount >= m_maxRetxThreshold) { - NS_LOG_INFO ("Max RETX_COUNT for SN = " << seqNumber); + NS_LOG_INFO ("Max RETX_COUNT for SN = " << seqNumberValue); } } seqNumber++; } - + return; } else @@ -901,16 +943,24 @@ bool -LteRlcAm::IsInsideReceivingWindow (uint16_t seqNumber) +LteRlcAm::IsInsideReceivingWindow (SequenceNumber10 seqNumber) { - if ( ( ((m_vrR - m_vrR) % 1024) <= ((seqNumber - m_vrR) % 1024) ) && - ( ((seqNumber - m_vrR) % 1024) < ((m_vrMr - m_vrR) % 1024) ) - ) + NS_LOG_FUNCTION (this << seqNumber); + NS_LOG_LOGIC ("Receiving Window: " << + m_vrR << " <= " << seqNumber << " <= " << m_vrMr); + + m_vrR.SetModulusBase (m_vrR); + m_vrMr.SetModulusBase (m_vrR); + seqNumber.SetModulusBase (m_vrR); + + if ( (m_vrR <= seqNumber) && (seqNumber < m_vrMr ) ) { + NS_LOG_LOGIC (seqNumber << " is INSIDE the receiving window"); return true; } else { + NS_LOG_LOGIC (seqNumber << " is OUTSIDE the receiving window"); return false; } } @@ -922,20 +972,20 @@ LteRlcAmHeader rlcAmHeader; packet->RemoveHeader (rlcAmHeader); uint8_t framingInfo = rlcAmHeader.GetFramingInfo (); - uint16_t currSeqNumber = rlcAmHeader.GetSequenceNumber (); + SequenceNumber10 currSeqNumber = rlcAmHeader.GetSequenceNumber (); bool expectedSnLost; if ( currSeqNumber != m_expectedSeqNumber ) { expectedSnLost = true; NS_LOG_LOGIC ("There are losses. Expected SN = " << m_expectedSeqNumber << ". Current SN = " << currSeqNumber); - m_expectedSeqNumber = (currSeqNumber + 1) % 1024; + m_expectedSeqNumber = currSeqNumber + 1; } else { expectedSnLost = false; NS_LOG_LOGIC ("No losses. Expected SN = " << m_expectedSeqNumber << ". Current SN = " << currSeqNumber); - m_expectedSeqNumber = (m_expectedSeqNumber + 1) % 1024; + m_expectedSeqNumber = m_expectedSeqNumber + 1; } // Build list of SDUs @@ -1387,7 +1437,6 @@ // } -// TODO To check void LteRlcAm::ExpireReorderingTimer (void) { @@ -1402,23 +1451,22 @@ // - set VR(X) to VR(H). m_vrMs = m_vrX; - while ( m_rxonBuffer[ m_vrMs ].m_pduComplete ) + while ( m_rxonBuffer[ m_vrMs.GetValue () ].m_pduComplete ) { - m_vrMs = (m_vrMs + 1) % 1024; + m_vrMs++; } NS_LOG_LOGIC ("New VR(MS) = " << m_vrMs); if ( m_vrH > m_vrMs ) { NS_LOG_LOGIC ("Start reordering timer"); - m_reorderingTimer = Simulator::Schedule (Time ("1.0s"), + m_reorderingTimer = Simulator::Schedule (Time ("0.1s"), &LteRlcAm::ExpireReorderingTimer ,this); m_vrX = m_vrH; NS_LOG_LOGIC ("New VR(MS) = " << m_vrMs); } } -// TODO To check void LteRlcAm::ExpirePollRetransmitTimer (void) { diff -r db24d2db55d4 -r 859fa94888fc src/lte/model/lte-rlc-am.h --- a/src/lte/model/lte-rlc-am.h Wed Feb 08 13:42:00 2012 +0100 +++ b/src/lte/model/lte-rlc-am.h Wed Feb 08 17:14:58 2012 +0100 @@ -21,6 +21,8 @@ #ifndef LTE_RLC_AM_H #define LTE_RLC_AM_H +#include "ns3/lte-rlc-sequence-number.h" + #include "ns3/lte-rlc.h" #include @@ -61,7 +63,7 @@ void ExpireReorderingTimer (void); void ExpirePollRetransmitTimer (void); - bool IsInsideReceivingWindow (uint16_t seqNumber); + bool IsInsideReceivingWindow (SequenceNumber10 seqNumber); // // void ReassembleOutsideWindow (void); // void ReassembleSnLessThan (uint16_t seqNumber); @@ -89,7 +91,7 @@ struct PduBuffer { - uint16_t m_seqNumber; + SequenceNumber10 m_seqNumber; std::list < Ptr > m_byteSegments; bool m_pduComplete; @@ -110,17 +112,17 @@ * State variables. See section 7.1 in TS 36.322 */ // Transmitting side - uint16_t m_vtA; // VT(A) - uint16_t m_vtMs; // VT(MS) - uint16_t m_vtS; // VT(S) - uint16_t m_pollSn; // POLL_SN + SequenceNumber10 m_vtA; // VT(A) + SequenceNumber10 m_vtMs; // VT(MS) + SequenceNumber10 m_vtS; // VT(S) + SequenceNumber10 m_pollSn; // POLL_SN // Receiving side - uint16_t m_vrR; // VR(R) - uint16_t m_vrMr; // VR(MR) - uint16_t m_vrX; // VR(X) - uint16_t m_vrMs; // VR(MS) - uint16_t m_vrH; // VR(H) + SequenceNumber10 m_vrR; // VR(R) + SequenceNumber10 m_vrMr; // VR(MR) + SequenceNumber10 m_vrX; // VR(X) + SequenceNumber10 m_vrMs; // VR(MS) + SequenceNumber10 m_vrH; // VR(H) /** * Counters. See section 7.1 in TS 36.322 @@ -159,7 +161,7 @@ /** * Expected Sequence Number */ - uint16_t m_expectedSeqNumber; + SequenceNumber10 m_expectedSeqNumber; }; diff -r db24d2db55d4 -r 859fa94888fc src/lte/model/lte-rlc-sequence-number.h --- a/src/lte/model/lte-rlc-sequence-number.h Wed Feb 08 13:42:00 2012 +0100 +++ b/src/lte/model/lte-rlc-sequence-number.h Wed Feb 08 17:14:58 2012 +0100 @@ -125,6 +125,11 @@ return (!this->operator> (other)); } + bool operator >= (const SequenceNumber10 &other) const + { + return (this->operator> (other) || this->operator== (other)); + } + bool operator < (const SequenceNumber10 &other) const { return !this->operator> (other) && m_value != other.m_value; diff -r db24d2db55d4 -r 859fa94888fc src/lte/model/lte-rlc-um.cc --- a/src/lte/model/lte-rlc-um.cc Wed Feb 08 13:42:00 2012 +0100 +++ b/src/lte/model/lte-rlc-um.cc Wed Feb 08 17:14:58 2012 +0100 @@ -69,7 +69,7 @@ void LteRlcUm::DoTransmitPdcpPdu (Ptr p) { - NS_LOG_FUNCTION (this); + NS_LOG_FUNCTION (this << p->GetSize ()); /** Store arrival time */ RlcTag timeTag (Simulator::Now ()); @@ -488,6 +488,12 @@ ReassembleSnLessThan (m_vrUr); } + // m_vrUh can change previously, set new modulus base + // for the t-Reordering timer-related comparisons + m_vrUr.SetModulusBase (m_vrUh - m_windowSize); + m_vrUx.SetModulusBase (m_vrUh - m_windowSize); + m_vrUh.SetModulusBase (m_vrUh - m_windowSize); + // - if t-Reordering is running: // - if VR(UX) <= VR(UR); or // - if VR(UX) falls outside of the reordering window and VR(UX) is not equal to VR(UH):: @@ -512,11 +518,11 @@ { NS_LOG_LOGIC ("Reordering timer is not running"); - if ( m_vrUx > m_vrUr ) + if ( m_vrUh > m_vrUr ) { - NS_LOG_LOGIC ("VR(UX) > VR(UR). " << m_vrUx << " > " << m_vrUr); + NS_LOG_LOGIC ("VR(UH) > VR(UR)"); NS_LOG_LOGIC ("Start reordering timer"); - m_reorderingTimer = Simulator::Schedule (Time ("1.0s"), + m_reorderingTimer = Simulator::Schedule (Time ("0.1s"), &LteRlcUm::ExpireReorderingTimer ,this); m_vrUx = m_vrUh; NS_LOG_LOGIC ("New VR(UX) = " << m_vrUx); @@ -547,12 +553,12 @@ if ( ((m_vrUh - m_windowSize) <= seqNumber) && (seqNumber < m_vrUh)) { - NS_LOG_LOGIC (seqNumber << "is INSIDE the reordering window"); + NS_LOG_LOGIC (seqNumber << " is INSIDE the reordering window"); return true; } else { - NS_LOG_LOGIC (seqNumber << "is OUTSIDE the reordering window"); + NS_LOG_LOGIC (seqNumber << " is OUTSIDE the reordering window"); return false; } } @@ -1062,7 +1068,7 @@ void LteRlcUm::ExpireReorderingTimer (void) { - NS_LOG_LOGIC ("TODO: Reordering Timer has expired..."); + NS_LOG_LOGIC ("Reordering timer has expired"); // 5.1.2.2.4 Actions when t-Reordering expires // When t-Reordering expires, the receiving UM RLC entity shall: @@ -1081,15 +1087,17 @@ newVrUr++; } m_vrUr = newVrUr; + NS_LOG_LOGIC ("New VR(UR) = " << m_vrUr); ReassembleSnLessThan (m_vrUr); if ( m_vrUh > m_vrUr) { NS_LOG_LOGIC ("Start reordering timer"); - m_reorderingTimer = Simulator::Schedule (Time ("1.0s"), + m_reorderingTimer = Simulator::Schedule (Time ("0.1s"), &LteRlcUm::ExpireReorderingTimer, this); m_vrUx = m_vrUh; + NS_LOG_LOGIC ("New VR(UX) = " << m_vrUx); } } diff -r db24d2db55d4 -r 859fa94888fc src/lte/test/lte-simple-helper.cc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/lte/test/lte-simple-helper.cc Wed Feb 08 17:14:58 2012 +0100 @@ -0,0 +1,336 @@ +/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* + * Copyright (c) 2012 Centre Tecnologic de Telecomunicacions de Catalunya (CTTC) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation; + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Manuel Requena (Based on lte-helper.cc) + */ + +#include "ns3/lte-simple-helper.h" +#include "ns3/log.h" +#include "ns3/callback.h" +#include "ns3/config.h" +#include "ns3/simple-channel.h" +#include "ns3/error-model.h" + + +NS_LOG_COMPONENT_DEFINE ("LteSimpleHelper"); + +namespace ns3 { + + +NS_OBJECT_ENSURE_REGISTERED (LteSimpleHelper); + +LteSimpleHelper::LteSimpleHelper (void) +{ + NS_LOG_FUNCTION (this); + m_enbDeviceFactory.SetTypeId (LteSimpleNetDevice::GetTypeId ()); + m_ueDeviceFactory.SetTypeId (LteSimpleNetDevice::GetTypeId ()); +} + +void +LteSimpleHelper::DoStart (void) +{ + NS_LOG_FUNCTION (this); + + m_phyChannel = CreateObject (); + + Object::DoStart (); +} + +LteSimpleHelper::~LteSimpleHelper (void) +{ + NS_LOG_FUNCTION (this); +} + +TypeId LteSimpleHelper::GetTypeId (void) +{ + static TypeId + tid = + TypeId ("ns3::LteSimpleHelper") + .SetParent