Attachment #2431 for bug #2308

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





  // Sender timestamp
  PdcpTag pdcpTag (Simulator::Now ());
  p->AddPacketTag (pdcpTag);
  m_txPdu (m_rnti, m_lcid, p->GetSize ());

  LteRlcSapProvider::TransmitPdcpPduParameters params;

  // Receiver timestamp
  PdcpTag pdcpTag;
  Time delay;
  if (p->PeekPacketTag (pdcpTag))
    {
      delay = Simulator::Now() - pdcpTag.GetSenderTimestamp ();
      p->RemovePacketTag (pdcpTag);
    }
  m_rxPdu(m_rnti, m_lcid, p->GetSize (), delay.GetNanoSeconds ());






  // Sender timestamp
  RlcTag rlcTag (Simulator::Now ());
  packet->AddPacketTag (rlcTag);
  m_txPdu (m_rnti, m_lcid, packet->GetSize ());

  // Send RLC PDU to MAC layer

  // Receiver timestamp
  RlcTag rlcTag;
  Time delay;
  if (p->PeekPacketTag (rlcTag))
    {
      delay = Simulator::Now() - rlcTag.GetSenderTimestamp ();
      p->RemovePacketTag (rlcTag);
    }
  m_rxPdu (m_rnti, m_lcid, p->GetSize (), delay.GetNanoSeconds ());


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

Lines 139-146	Link Here

139

  m_txBuffer.erase (m_txBuffer.begin ());

139

  m_txBuffer.erase (m_txBuffer.begin ());

140

141

  // Sender timestamp

141

  // Sender timestamp

142

  RlcTag rlcTag (Simulator::Now ());

142

  RlcTag rlcTag;

143

  packet->AddByteTag (rlcTag);

143

  packet->RemovePacketTag (rlcTag);

144

  rlcTag.SetSenderTimestamp (Simulator::Now ());

145

  packet->AddPacketTag (rlcTag);

144

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

146

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

145

147

146

  // Send RLC PDU to MAC layer

148

  // Send RLC PDU to MAC layer

Lines 174-182	Link Here

174

  // Receiver timestamp

176

  // Receiver timestamp

175

  RlcTag rlcTag;

177

  RlcTag rlcTag;

176

  Time delay;

178

  Time delay;

177

  if (p->FindFirstMatchingByteTag (rlcTag))

179

  if (p->PeekPacketTag (rlcTag))

178

180

179

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

181

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

182

      p->RemovePacketTag (rlcTag);

180

183

181

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

184

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

182

185





  // Sender timestamp
  RlcTag rlcTag (Simulator::Now ());
  packet->AddPacketTag (rlcTag);
  m_txPdu (m_rnti, m_lcid, packet->GetSize ());

  // Send RLC PDU to MAC layer

  // Receiver timestamp
  RlcTag rlcTag;
  Time delay;
  if (p->PeekPacketTag (rlcTag))
    {
      delay = Simulator::Now() - rlcTag.GetSenderTimestamp ();
      p->RemovePacketTag (rlcTag);
    }
  m_rxPdu (m_rnti, m_lcid, p->GetSize (), delay.GetNanoSeconds ());





  // RLC Performance evaluation
  RlcTag rlcTag;
  Time delay;
  if (p->PeekPacketTag (rlcTag))
    {
      delay = Simulator::Now() - rlcTag.GetSenderTimestamp ();
      p->RemovePacketTag (rlcTag);
    }
  NS_LOG_LOGIC (" RNTI=" << m_rnti 
                << " LCID=" << (uint32_t) m_lcid 


  // RLC Performance evaluation
  RlcTag tag (Simulator::Now());
  params.pdu->AddPacketTag (tag);
  NS_LOG_LOGIC (" RNTI=" << m_rnti 
                << " LCID=" << (uint32_t) m_lcid 
                << " size=" << bytes);

Return to bug 2308