fixbug: replace the init method from CreateObject to direct Create

Author: Mingyumaz

CMakeLists.txt

@@ -20,7 +20,6 @@ build_lib(
         model/bridge-p4-net-device.cc
         model/standard-metadata-tag.cc
         model/p4-queue-item.cc
-        model/p4-logic-pri-rl-queue-disc.cc
         model/p4-rr-pri-queue-disc.cc
         model/format-utils.cc
         model/switch-api.cc
@@ -39,7 +38,6 @@ build_lib(
         model/bridge-p4-net-device.h
         model/standard-metadata-tag.h
         model/p4-queue-item.h
-        model/p4-logic-pri-rl-queue-disc.h
         model/p4-rr-pri-queue-disc.h
         model/format-utils.h
         model/switch-api.h

model/p4-queue-item.cc

@@ -1,49 +1,60 @@
 #include "ns3/p4-queue-item.h"
+
 #include "ns3/log.h"
 
-namespace ns3 {
+namespace ns3
+{
+
+NS_LOG_COMPONENT_DEFINE("P4QueueItem");
 
-NS_LOG_COMPONENT_DEFINE ("P4QueueItem");
+// TypeId
+// P4QueueItem::GetTypeId()
+// {
+//     static TypeId tid =
+//         TypeId("ns3::P4QueueItem").SetParent<QueueDiscItem>().AddConstructor<P4QueueItem>();
+//     return tid;
+// }
 
-P4QueueItem::P4QueueItem (Ptr<Packet> p, const Address &addr, uint16_t protocol)
-  : QueueDiscItem (p, addr, protocol), m_sendTime (Seconds (0))
+P4QueueItem::P4QueueItem(Ptr<Packet> p, const Address& addr, uint16_t protocol)
+    : QueueDiscItem(p, addr, protocol),
+      m_sendTime(Seconds(0))
 {
-  NS_LOG_FUNCTION (this << p << addr << protocol);
+    NS_LOG_FUNCTION(this << p << addr << protocol);
 }
 
-P4QueueItem::~P4QueueItem ()
+
+P4QueueItem::~P4QueueItem()
 {
-  NS_LOG_FUNCTION (this);
+    NS_LOG_FUNCTION(this);
 }
 
 void
-P4QueueItem::SetSendTime (Time sendTime)
+P4QueueItem::SetSendTime(Time sendTime)
 {
-  NS_LOG_FUNCTION (this << sendTime);
-  m_sendTime = sendTime;
+    NS_LOG_FUNCTION(this << sendTime);
+    m_sendTime = sendTime;
 }
 
 Time
-P4QueueItem::GetSendTime () const
+P4QueueItem::GetSendTime() const
 {
-  NS_LOG_FUNCTION (this);
-  return m_sendTime;
+    NS_LOG_FUNCTION(this);
+    return m_sendTime;
 }
 
 bool
-P4QueueItem::IsReadyToDequeue (Time currentTime) const
+P4QueueItem::IsReadyToDequeue(Time currentTime) const
 {
-  NS_LOG_FUNCTION (this << currentTime);
-  return currentTime >= m_sendTime;
+    NS_LOG_FUNCTION(this << currentTime);
+    return currentTime >= m_sendTime;
 }
 
 void
-P4QueueItem::Print (std::ostream &os) const
+P4QueueItem::Print(std::ostream& os) const
 {
-  NS_LOG_FUNCTION (this);
-  os << "P4QueueItem: "
-     << "SendTime=" << m_sendTime.GetSeconds () << "s, "
-     << "PacketSize=" << GetPacket ()->GetSize () << " bytes";
+    NS_LOG_FUNCTION(this);
+    os << "P4QueueItem: " << "SendTime=" << m_sendTime.GetSeconds() << "s, "
+       << "PacketSize=" << GetPacket()->GetSize() << " bytes";
 }
 
 } // namespace ns3

model/p4-queue-item.h

@@ -11,6 +11,14 @@ namespace ns3 {
 class P4QueueItem : public QueueDiscItem
 {
 public:
+  
+  // /**
+  //    * \brief Get the type ID.
+  //    * \return the object TypeId
+  //    */
+  //   static TypeId GetTypeId();
+  
+
   /**
    * \brief Constructor
    * \param p The packet
@@ -19,10 +27,12 @@ class P4QueueItem : public QueueDiscItem
    */
   P4QueueItem (Ptr<Packet> p, const Address &addr, uint16_t protocol);
 
-  /**
-   * \brief Destructor
-   */
-  virtual ~P4QueueItem ();
+  virtual ~P4QueueItem () override;
+
+  // Delete default constructor, copy constructor and assignment operator to avoid misuse
+  P4QueueItem () = delete;
+  P4QueueItem (const P4QueueItem &) = delete;
+  P4QueueItem &operator = (const P4QueueItem &) = delete;
 
   /**
    * \brief Set the expected send time
@@ -48,6 +58,24 @@ class P4QueueItem : public QueueDiscItem
    */
   void Print (std::ostream &os) const override;
 
+  void AddHeader() override
+  {
+    // @TODO deal with header, keep header and payload separate to allow manipulating the header
+    return;
+  }
+
+  /**
+   * \brief Marks the packet as a substitute for dropping it, such as for Explicit Congestion
+   * Notification
+   *
+   * \return true if the packet is marked by this method or is already marked, false otherwise
+   */
+  bool Mark() override
+  {
+    // 
+    return false;
+  }
+
 private:
   Time m_sendTime; //!< Expected send time of the packet
 };