Attachment #2400 for bug #2389

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




Queue::Enqueue (Ptr<QueueItem> item)
{
  NS_LOG_FUNCTION (this << item);
  Ptr<Packet> p = item->GetPacket ();

  if (m_mode == QUEUE_MODE_PACKETS && (m_nPackets.Get () >= m_maxPackets))
    {
      NS_LOG_LOGIC ("Queue full (at max packets) -- dropping pkt");
      Drop (item);
      return false;
    }

  if (m_mode == QUEUE_MODE_BYTES && (m_nBytes.Get () + item->GetPacketSize () > m_maxBytes))
    {
      NS_LOG_LOGIC ("Queue full (packet would exceed max bytes) -- dropping pkt");
      Drop (item);
      return false;
    }


}

void
Queue::SetDropCallback (DropCallback cb)
{
  m_dropCallback = cb;
}

void
Queue::NotifyDrop (Ptr<QueueItem> item)
{
  NS_LOG_FUNCTION (this << item);

  if (!m_dropCallback.IsNull ())
    {
      m_dropCallback (item);
    }
}

void
Queue::Drop (Ptr<QueueItem> item)
{
  NS_LOG_FUNCTION (this << item);

  m_nTotalDroppedPackets++;
  m_nTotalDroppedBytes += item->GetPacketSize ();

  NS_LOG_LOGIC ("m_traceDrop (p)");
  m_traceDrop (item->GetPacket ());
  NotifyDrop (item);
}

} // namespace ns3




  double GetDroppedPacketsPerSecondVariance (void);
#endif

  /// Callback set by the object (e.g., a queue disc) that wants to be notified of a packet drop
  typedef Callback<void, Ptr<QueueItem> > DropCallback;

  /**
   * \brief Set the drop callback
   * \param cb the callback to set
   *
   * Called when a queue is added to a queue disc in order to set a
   * callback to the Drop method of the queue disc.
   */
  virtual void SetDropCallback (DropCallback cb);

protected:
  /**
   * \brief Drop a packet
   * \param item item that was dropped
   *
   * This method is called by the base class when a packet is dropped because
   * the queue is full and by the subclasses to notify parent (this class) that
   * a packet has been dropped for other reasons.
   */
  void Drop (Ptr<QueueItem> item);

private:
  /**

   */
  virtual Ptr<const QueueItem> DoPeek (void) const = 0;

  /**
   *  \brief Notification of a packet drop
   *  \param item item that was dropped
   */
  void NotifyDrop (Ptr<QueueItem> item);

  /// Traced callback: fired when a packet is enqueued
  TracedCallback<Ptr<const Packet> > m_traceEnqueue;
  /// Traced callback: fired when a packet is dequeued

  uint32_t m_maxPackets;              //!< max packets in the queue
  uint32_t m_maxBytes;                //!< max bytes in the queue
  QueueMode m_mode;                   //!< queue mode (packets or bytes limited)
  DropCallback m_dropCallback;        //!< drop callback
};

} // namespace ns3




  // Tag packet with current time for DoDequeue() to compute sojourn time
  CoDelTimestampTag tag;
  p->AddPacketTag (tag);

  bool retval = GetInternalQueue (0)->Enqueue (item);

  // If Queue::Enqueue fails, QueueDisc::Drop is called by the internal queue
  // because QueueDisc::AddInternalQueue sets the drop callback

  NS_LOG_LOGIC ("Number packets " << GetInternalQueue (0)->GetNPackets ());
  NS_LOG_LOGIC ("Number bytes " << GetInternalQueue (0)->GetNBytes ());

  return retval;
}

bool




      band = ret;
    }

  bool retval = GetInternalQueue(band)->Enqueue (item);

  // If Queue::Enqueue fails, QueueDisc::Drop is called by the internal queue
  // because QueueDisc::AddInternalQueue sets the drop callback

    }
  NS_LOG_LOGIC ("Number packets band " << band << ": " << GetInternalQueue(band)->GetNPackets ());

  return retval;
}

Ptr<QueueDiscItem>

(-)a/src/traffic-control/model/queue-disc.cc (+3 lines)

Lines 313-318 void	Link Here

313

QueueDisc::AddInternalQueue (Ptr<Queue> queue)

313

QueueDisc::AddInternalQueue (Ptr<Queue> queue)

314

315

  NS_LOG_FUNCTION (this);

315

  NS_LOG_FUNCTION (this);

316

  // set the drop callback on the internal queue, so that the queue disc is

317

  // notified of packets dropped by the internal queue

318

  queue->SetDropCallback (MakeCallback (&QueueDisc::Drop, this));

316

  m_queues.push_back (queue);

319

  m_queues.push_back (queue);

317

320

318

321

(-)a/src/traffic-control/model/red-queue-disc.cc (-2 / +5 lines)

Lines 410-421 RedQueueDisc::DoEnqueue (Ptr<QueueDiscItem> item)	Link Here

410

      return false;

410

      return false;

411

412

413

  GetInternalQueue (0)->Enqueue (item);

413

  bool retval = GetInternalQueue (0)->Enqueue (item);

414

415

  // If Queue::Enqueue fails, QueueDisc::Drop is called by the internal queue

416

  // because QueueDisc::AddInternalQueue sets the drop callback

414

417

415

  NS_LOG_LOGIC ("Number packets " << GetInternalQueue (0)->GetNPackets ());

418

  NS_LOG_LOGIC ("Number packets " << GetInternalQueue (0)->GetNPackets ());

416

  NS_LOG_LOGIC ("Number bytes " << GetInternalQueue (0)->GetNBytes ());

419

  NS_LOG_LOGIC ("Number bytes " << GetInternalQueue (0)->GetNBytes ());

417

420

418

  return true;

421

  return retval;

419

422

420

423

421

/*

424

/*

Return to bug 2389