View | Details | Raw Unified | Return to bug 2308
Collapse All | Expand All

(-)a/src/lte/model/lte-pdcp.cc (-2 / +3 lines)
 Lines 188-194   LtePdcp::DoTransmitPdcpSdu (Ptr<Packet> p) Link Here 
188 

          188
          

        

        

          189
          
  // Sender timestamp

          189
          
  // Sender timestamp

        

        

          190
          
  PdcpTag pdcpTag (Simulator::Now ());

          190
          
  PdcpTag pdcpTag (Simulator::Now ());

        

          
            

              191
              
  p->AddByteTag (pdcpTag);


              191
              
  p->AddPacketTag (pdcpTag);

            

        

          192
          
  m_txPdu (m_rnti, m_lcid, p->GetSize ());

          192
          
  m_txPdu (m_rnti, m_lcid, p->GetSize ());

        

        

          193
          

          193
          

        

        

          194
          
  LteRlcSapProvider::TransmitPdcpPduParameters params;

          194
          
  LteRlcSapProvider::TransmitPdcpPduParameters params;

        

  

    

    

       Lines 207-215
      LtePdcp::DoReceivePdu (Ptr<Packet> p) 
    
  Link Here 
    

  

        

          207
          
  // Receiver timestamp

          207
          
  // Receiver timestamp

        

        

          208
          
  PdcpTag pdcpTag;

          208
          
  PdcpTag pdcpTag;

        

        

          209
          
  Time delay;

          209
          
  Time delay;

        

          
            

              210
              
  if (p->FindFirstMatchingByteTag (pdcpTag))


              210
              
  if (p->PeekPacketTag (pdcpTag))

            

        

          211
          
    {

          211
          
    {

        

        

          212
          
      delay = Simulator::Now() - pdcpTag.GetSenderTimestamp ();

          212
          
      delay = Simulator::Now() - pdcpTag.GetSenderTimestamp ();

        

            

              
              
              213
              
      p->RemovePacketTag (pdcpTag);

            

        

          213
          
    }

          214
          
    }

        

        

          214
          
  m_rxPdu(m_rnti, m_lcid, p->GetSize (), delay.GetNanoSeconds ());

          215
          
  m_rxPdu(m_rnti, m_lcid, p->GetSize (), delay.GetNanoSeconds ());

        

        

          215
          

          216
          

        



(-)a/src/lte/model/lte-rlc-am.cc
      (-2 / +3 lines)




  

    

    

       Lines 707-713
      LteRlcAm::DoNotifyTxOpportunity (uint32_t bytes, uint8_t layer, uint8_t harqId) 
    
  Link Here 
    

  

        

          707
          

          707
          

        

        

          708
          
  // Sender timestamp

          708
          
  // Sender timestamp

        

        

          709
          
  RlcTag rlcTag (Simulator::Now ());

          709
          
  RlcTag rlcTag (Simulator::Now ());

        

          
            

              710
              
  packet->AddByteTag (rlcTag);


              710
              
  packet->AddPacketTag (rlcTag);

            

        

          711
          
  m_txPdu (m_rnti, m_lcid, packet->GetSize ());

          711
          
  m_txPdu (m_rnti, m_lcid, packet->GetSize ());

        

        

          712
          

          712
          

        

        

          713
          
  // Send RLC PDU to MAC layer

          713
          
  // Send RLC PDU to MAC layer

        

  

    

    

       Lines 736-744
      LteRlcAm::DoReceivePdu (Ptr<Packet> p) 
    
  Link Here 
    

  

        

          736
          
  // Receiver timestamp

          736
          
  // Receiver timestamp

        

        

          737
          
  RlcTag rlcTag;

          737
          
  RlcTag rlcTag;

        

        

          738
          
  Time delay;

          738
          
  Time delay;

        

          
            

              739
              
  if (p->FindFirstMatchingByteTag (rlcTag))


              739
              
  if (p->PeekPacketTag (rlcTag))

            

        

          740
          
    {

          740
          
    {

        

        

          741
          
      delay = Simulator::Now() - rlcTag.GetSenderTimestamp ();

          741
          
      delay = Simulator::Now() - rlcTag.GetSenderTimestamp ();

        

            

              
              
              742
              
      p->RemovePacketTag (rlcTag);

            

        

          742
          
    }

          743
          
    }

        

        

          743
          
  m_rxPdu (m_rnti, m_lcid, p->GetSize (), delay.GetNanoSeconds ());

          744
          
  m_rxPdu (m_rnti, m_lcid, p->GetSize (), delay.GetNanoSeconds ());

        

        

          744
          

          745
          

        



(-)a/src/lte/model/lte-rlc-tm.cc
      (-2 / +3 lines)




  

    

    

       Lines 140-146
      LteRlcTm::DoNotifyTxOpportunity (uint32_t bytes, uint8_t layer, uint8_t harqId) 
    
  Link Here 
    

  

        

          140
          
 

          140
          
 

        

        

          141
          
  // Sender timestamp

          141
          
  // Sender timestamp

        

        

          142
          
  RlcTag rlcTag (Simulator::Now ());

          142
          
  RlcTag rlcTag (Simulator::Now ());

        

          
            

              143
              
  packet->AddByteTag (rlcTag);


              143
              
  packet->AddPacketTag (rlcTag);

            

        

          144
          
  m_txPdu (m_rnti, m_lcid, packet->GetSize ());

          144
          
  m_txPdu (m_rnti, m_lcid, packet->GetSize ());

        

        

          145
          

          145
          

        

        

          146
          
  // Send RLC PDU to MAC layer

          146
          
  // Send RLC PDU to MAC layer

        

  

    

    

       Lines 174-182
      LteRlcTm::DoReceivePdu (Ptr<Packet> p) 
    
  Link Here 
    

  

        

          174
          
  // Receiver timestamp

          174
          
  // Receiver timestamp

        

        

          175
          
  RlcTag rlcTag;

          175
          
  RlcTag rlcTag;

        

        

          176
          
  Time delay;

          176
          
  Time delay;

        

          
            

              177
              
  if (p->FindFirstMatchingByteTag (rlcTag))


              177
              
  if (p->PeekPacketTag (rlcTag))

            

        

          178
          
    {

          178
          
    {

        

        

          179
          
      delay = Simulator::Now() - rlcTag.GetSenderTimestamp ();

          179
          
      delay = Simulator::Now() - rlcTag.GetSenderTimestamp ();

        

            

              
              
              180
              
      p->RemovePacketTag (rlcTag);

            

        

          180
          
    }

          181
          
    }

        

        

          181
          
  m_rxPdu (m_rnti, m_lcid, p->GetSize (), delay.GetNanoSeconds ());

          182
          
  m_rxPdu (m_rnti, m_lcid, p->GetSize (), delay.GetNanoSeconds ());

        

        

          182
          

          183
          

        



(-)a/src/lte/model/lte-rlc-um.cc
      (-2 / +3 lines)




  

    

    

       Lines 372-378
      LteRlcUm::DoNotifyTxOpportunity (uint32_t bytes, uint8_t layer, uint8_t harqId) 
    
  Link Here 
    

  

        

          372
          

          372
          

        

        

          373
          
  // Sender timestamp

          373
          
  // Sender timestamp

        

        

          374
          
  RlcTag rlcTag (Simulator::Now ());

          374
          
  RlcTag rlcTag (Simulator::Now ());

        

          
            

              375
              
  packet->AddByteTag (rlcTag);


              375
              
  packet->AddPacketTag (rlcTag);

            

        

          376
          
  m_txPdu (m_rnti, m_lcid, packet->GetSize ());

          376
          
  m_txPdu (m_rnti, m_lcid, packet->GetSize ());

        

        

          377
          

          377
          

        

        

          378
          
  // Send RLC PDU to MAC layer

          378
          
  // Send RLC PDU to MAC layer

        

  

    

    

       Lines 406-414
      LteRlcUm::DoReceivePdu (Ptr<Packet> p) 
    
  Link Here 
    

  

        

          406
          
  // Receiver timestamp

          406
          
  // Receiver timestamp

        

        

          407
          
  RlcTag rlcTag;

          407
          
  RlcTag rlcTag;

        

        

          408
          
  Time delay;

          408
          
  Time delay;

        

          
            

              409
              
  if (p->FindFirstMatchingByteTag (rlcTag))


              409
              
  if (p->PeekPacketTag (rlcTag))

            

        

          410
          
    {

          410
          
    {

        

        

          411
          
      delay = Simulator::Now() - rlcTag.GetSenderTimestamp ();

          411
          
      delay = Simulator::Now() - rlcTag.GetSenderTimestamp ();

        

            

              
              
              412
              
      p->RemovePacketTag (rlcTag);

            

        

          412
          
    }

          413
          
    }

        

        

          413
          
  m_rxPdu (m_rnti, m_lcid, p->GetSize (), delay.GetNanoSeconds ());

          414
          
  m_rxPdu (m_rnti, m_lcid, p->GetSize (), delay.GetNanoSeconds ());

        

        

          414
          

          415
          

        



(-)a/src/lte/model/lte-rlc.cc
      (-3 / +3 lines)




  

    

    

       Lines 219-227
      LteRlcSm::DoReceivePdu (Ptr<Packet> p) 
    
  Link Here 
    

  

        

          219
          
  // RLC Performance evaluation

          219
          
  // RLC Performance evaluation

        

        

          220
          
  RlcTag rlcTag;

          220
          
  RlcTag rlcTag;

        

        

          221
          
  Time delay;

          221
          
  Time delay;

        

          
            

              222
              
  if (p->FindFirstMatchingByteTag(rlcTag))


              222
              
  if (p->PeekPacketTag (rlcTag))

            

        

          223
          
    {

          223
          
    {

        

        

          224
          
      delay = Simulator::Now() - rlcTag.GetSenderTimestamp ();

          224
          
      delay = Simulator::Now() - rlcTag.GetSenderTimestamp ();

        

            

              
              
              225
              
      p->RemovePacketTag (rlcTag);

            

        

          225
          
    }

          226
          
    }

        

        

          226
          
  NS_LOG_LOGIC (" RNTI=" << m_rnti 

          227
          
  NS_LOG_LOGIC (" RNTI=" << m_rnti 

        

        

          227
          
                << " LCID=" << (uint32_t) m_lcid 

          228
          
                << " LCID=" << (uint32_t) m_lcid 

        

  

    

    

       Lines 243-249
      LteRlcSm::DoNotifyTxOpportunity (uint32_t bytes, uint8_t layer, uint8_t harqId) 
    
  Link Here 
    

  

        

          243
          

          244
          

        

        

          244
          
  // RLC Performance evaluation

          245
          
  // RLC Performance evaluation

        

        

          245
          
  RlcTag tag (Simulator::Now());

          246
          
  RlcTag tag (Simulator::Now());

        

          
            

              246
              
  params.pdu->AddByteTag (tag);


              247
              
  params.pdu->AddPacketTag (tag);

            

        

          247
          
  NS_LOG_LOGIC (" RNTI=" << m_rnti 

          248
          
  NS_LOG_LOGIC (" RNTI=" << m_rnti 

        

        

          248
          
                << " LCID=" << (uint32_t) m_lcid 

          249
          
                << " LCID=" << (uint32_t) m_lcid 

        

        

          249
          
                << " size=" << bytes);

          250
          
                << " size=" << bytes);

        

            

              250
              
- 

              
              
            






  

  Return to bug 2308