Merge branch 'waf'

Author: Mingyumaz

CMakeLists.txt

@@ -18,13 +18,9 @@ build_lib(
         model/p4-switch-core.cc
         model/p4-switch-interface.cc
         model/bridge-p4-net-device.cc
-        model/standard-metadata-tag.cc
-        model/p4-queue-item.cc
-        model/p4-rr-pri-queue-disc.cc
         model/format-utils.cc
         model/switch-api.cc
         helper/p4sim-helper.cc
-        helper/priority-port-tag.cc
         helper/global.cc
         helper/p4-exception-handle.cc
         helper/p4-topology-reader-helper.cc
@@ -36,14 +32,10 @@ build_lib(
         model/p4-switch-core.h
         model/p4-switch-interface.h
         model/bridge-p4-net-device.h
-        model/standard-metadata-tag.h
-        model/p4-queue-item.h
-        model/p4-rr-pri-queue-disc.h
         model/format-utils.h
         model/switch-api.h
         model/register_access.h
         helper/p4sim-helper.h
-        helper/priority-port-tag.h
         helper/global.h
         helper/p4-exception-handle.h
         helper/p4-topology-reader-helper.h

README.md

@@ -2,7 +2,10 @@
 
 [Quick Note with Google Docs](https://docs.google.com/document/d/18QQqo4PK8ycuZovrbAacRtFtqWSIqS0v9hRiiUYgvU8/edit?usp=sharing)
 
+## Virtual Machine as virtual env
 
-## Virtual Machine
+`p4sim` integrates an NS-3-based P4 simulation environment with virtual machine configuration files sourced via sparse checkout from the [P4Lang tutorials repository](https://github.com/p4lang/tutorials/tree/master). The `vm` directory contains setup files, including Vagrant configurations and bootstrap scripts, for Ubuntu-based virtual machines (`24.04` Recommended) that simplify the process of installing NS-3 and its dependencies. Using these pre-configured virtual machines is highly recommended for a streamlined setup, ensuring compatibility and minimizing installation issues.
 
-`p4sim` integrates an NS-3-based P4 simulation environment with virtual machine configuration files sourced via sparse checkout from the [P4Lang tutorials repository](https://github.com/p4lang/tutorials/tree/master). The `vm` directory contains setup files, including Vagrant configurations and bootstrap scripts, for Ubuntu-based virtual machines (`20.04` and `24.04`) that simplify the process of installing NS-3 and its dependencies. Using these pre-configured virtual machines is highly recommended for a streamlined setup, ensuring compatibility and minimizing installation issues.
+This code is tested with the following commit from the P4Lang tutorials repository:
+- Commit: `3acf7d1e9bb7635c76cc8fc60cd34f9919bb59d4`
+- Date: `2024-Dec-01`

deprecated/custom-onoff-helper.cc

@@ -0,0 +1,108 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2008 INRIA
+ *
+ * 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: Mathieu Lacage <[email protected]>
+ */
+#include "custom-onoff-helper.h"
+#include "ns3/inet-socket-address.h"
+#include "ns3/packet-socket-address.h"
+#include "ns3/string.h"
+#include "ns3/data-rate.h"
+#include "ns3/uinteger.h"
+#include "ns3/names.h"
+#include "ns3/random-variable-stream.h"
+#include "ns3/onoff-application.h"
+
+namespace ns3 {
+
+CustomOnOffHelper::CustomOnOffHelper (std::string protocol, Address address)
+{
+  m_factory.SetTypeId ("ns3::OnOffApplication");
+  m_factory.Set ("Protocol", StringValue (protocol));
+  m_factory.Set ("Remote", AddressValue (address));
+}
+
+void
+CustomOnOffHelper::SetAttribute (std::string name, const AttributeValue &value)
+{
+  m_factory.Set (name, value);
+}
+
+ApplicationContainer
+CustomOnOffHelper::Install (Ptr<Node> node) const
+{
+  return ApplicationContainer (InstallPriv (node));
+}
+
+ApplicationContainer
+CustomOnOffHelper::Install (std::string nodeName) const
+{
+  Ptr<Node> node = Names::Find<Node> (nodeName);
+  return ApplicationContainer (InstallPriv (node));
+}
+
+ApplicationContainer
+CustomOnOffHelper::Install (NodeContainer c) const
+{
+  ApplicationContainer apps;
+  for (NodeContainer::Iterator i = c.Begin (); i != c.End (); ++i)
+    {
+      apps.Add (InstallPriv (*i));
+    }
+
+  return apps;
+}
+
+Ptr<Application>
+CustomOnOffHelper::InstallPriv (Ptr<Node> node) const
+{
+  Ptr<Application> app = m_factory.Create<Application> ();
+  node->AddApplication (app);
+
+  return app;
+}
+
+int64_t
+CustomOnOffHelper::AssignStreams (NodeContainer c, int64_t stream)
+{
+  int64_t currentStream = stream;
+  Ptr<Node> node;
+  for (NodeContainer::Iterator i = c.Begin (); i != c.End (); ++i)
+    {
+      node = (*i);
+      for (uint32_t j = 0; j < node->GetNApplications (); j++)
+        {
+          Ptr<OnOffApplication> onoff = DynamicCast<OnOffApplication> (node->GetApplication (j));
+          if (onoff)
+            {
+              currentStream += onoff->AssignStreams (currentStream);
+            }
+        }
+    }
+  return (currentStream - stream);
+}
+
+void
+CustomOnOffHelper::SetConstantRate (DataRate dataRate, uint32_t packetSize)
+{
+  m_factory.Set ("OnTime", StringValue ("ns3::ConstantRandomVariable[Constant=1000]"));
+  m_factory.Set ("OffTime", StringValue ("ns3::ConstantRandomVariable[Constant=0]"));
+  m_factory.Set ("DataRate", DataRateValue (dataRate));
+  m_factory.Set ("PacketSize", UintegerValue (packetSize));
+}
+
+} // namespace ns3

deprecated/custom-onoff-helper.h

@@ -0,0 +1,112 @@
+#ifndef CUSTOM_ONOFF_HELPER_H
+#define CUSTOM_ONOFF_HELPER_H
+
+#include <stdint.h>
+#include <string>
+#include "ns3/object-factory.h"
+#include "ns3/address.h"
+#include "ns3/attribute.h"
+#include "ns3/net-device.h"
+#include "ns3/node-container.h"
+#include "ns3/application-container.h"
+#include "ns3/onoff-application.h"
+
+namespace ns3 {
+
+class DataRate;
+
+/**
+ * \ingroup onoff
+ * \brief A helper to make it easier to instantiate an ns3::CustomOnOffApplication 
+ * on a set of nodes.
+ */
+class CustomOnOffHelper
+{
+public:
+  /**
+   * Create an CustomOnOffHelper to make it easier to work with CustomOnOffApplications
+   *
+   * \param protocol the name of the protocol to use to send traffic
+   *        by the applications. This string identifies the socket
+   *        factory type used to create sockets for the applications.
+   *        A typical value would be ns3::UdpSocketFactory.
+   * \param address the address of the remote node to send traffic
+   *        to.
+   */
+  CustomOnOffHelper (std::string protocol, Address address);
+
+  /**
+   * Helper function used to set the underlying application attributes.
+   *
+   * \param name the name of the application attribute to set
+   * \param value the value of the application attribute to set
+   */
+  void SetAttribute (std::string name, const AttributeValue &value);
+
+  /**
+   * Helper function to set a constant rate source.  Equivalent to
+   * setting the attributes OnTime to constant 1000 seconds, OffTime to 
+   * constant 0 seconds, and the DataRate and PacketSize set accordingly
+   *
+   * \param dataRate DataRate object for the sending rate
+   * \param packetSize size in bytes of the packet payloads generated
+   */
+  void SetConstantRate (DataRate dataRate, uint32_t packetSize = 512);
+
+  /**
+   * Install an ns3::CustomOnOffApplication on each node of the input container
+   * configured with all the attributes set with SetAttribute.
+   *
+   * \param c NodeContainer of the set of nodes on which an CustomOnOffApplication 
+   * will be installed.
+   * \returns Container of Ptr to the applications installed.
+   */
+  ApplicationContainer Install (NodeContainer c) const;
+
+  /**
+   * Install an ns3::CustomOnOffApplication on the node configured with all the 
+   * attributes set with SetAttribute.
+   *
+   * \param node The node on which an CustomOnOffApplication will be installed.
+   * \returns Container of Ptr to the applications installed.
+   */
+  ApplicationContainer Install (Ptr<Node> node) const;
+
+  /**
+   * Install an ns3::CustomOnOffApplication on the node configured with all the 
+   * attributes set with SetAttribute.
+   *
+   * \param nodeName The node on which an CustomOnOffApplication will be installed.
+   * \returns Container of Ptr to the applications installed.
+   */
+  ApplicationContainer Install (std::string nodeName) const;
+
+  /**
+  * Assign a fixed random variable stream number to the random variables
+  * used by this model.  Return the number of streams (possibly zero) that
+  * have been assigned.  The Install() method should have previously been
+  * called by the user.
+  *
+  * \param stream first stream index to use
+  * \param c NodeContainer of the set of nodes for which the CustomOnOffApplication
+  *          should be modified to use a fixed stream
+  * \return the number of stream indices assigned by this helper
+  */
+  int64_t AssignStreams (NodeContainer c, int64_t stream);
+
+private:
+  /**
+   * Install an ns3::CustomOnOffApplication on the node configured with all the 
+   * attributes set with SetAttribute.
+   *
+   * \param node The node on which an CustomOnOffApplication will be installed.
+   * \returns Ptr to the application installed.
+   */
+  Ptr<Application> InstallPriv (Ptr<Node> node) const;
+
+  ObjectFactory m_factory; //!< Object factory.
+};
+
+} // namespace ns3
+
+#endif // CUSTOM_ONOFF_HELPER_H

doc/changes.patch

@@ -0,0 +1,48 @@
+diff --git a/src/network/utils/bit-deserializer.h b/src/network/utils/bit-deserializer.h
+index 01d5c2a15..4844788b4 100644
+--- a/src/network/utils/bit-deserializer.h
++++ b/src/network/utils/bit-deserializer.h
+@@ -23,6 +23,7 @@
+ 
+ #include <vector>
+ #include <deque>
++#include <cstdint> // 添加这行以引入 uint8_t 和 uint64_t 类型
+ 
+ namespace ns3 {
+ 
+diff --git a/src/network/utils/bit-serializer.h b/src/network/utils/bit-serializer.h
+index acaf1feaf..e5bbe4ec0 100644
+--- a/src/network/utils/bit-serializer.h
++++ b/src/network/utils/bit-serializer.h
+@@ -22,6 +22,7 @@
+ #define BITSERIALIZER_H_
+ 
+ #include <vector>
++#include <cstdint> // 添加这行以引入 uint8_t 和 uint64_t 类型
+ 
+ namespace ns3 {
+ 
+diff --git a/src/wifi/model/block-ack-type.cc b/src/wifi/model/block-ack-type.cc
+index e47387e5a..a62f3351f 100644
+--- a/src/wifi/model/block-ack-type.cc
++++ b/src/wifi/model/block-ack-type.cc
+@@ -20,6 +20,7 @@
+ 
+ #include "block-ack-type.h"
+ #include "ns3/fatal-error.h"
++#include <cstdint> // 添加这行以引入 uint8_t 和 uint64_t 类型
+ 
+ namespace ns3 {
+ 
+diff --git a/src/wifi/model/block-ack-type.h b/src/wifi/model/block-ack-type.h
+index 07b21fb43..2e32689f8 100644
+--- a/src/wifi/model/block-ack-type.h
++++ b/src/wifi/model/block-ack-type.h
+@@ -23,6 +23,7 @@
+ 
+ #include <ostream>
+ #include <vector>
++#include <cstdint> // 添加这行以引入 uint8_t 和 uint64_t 类型
+ 
+ namespace ns3 {
+ 

doc/examples.md

@@ -0,0 +1,2 @@
+# P4sim examples
+

doc/waf.md

@@ -0,0 +1,7 @@
+
+```bash
+pkg-config --list-all | grep xxx
+    simple_switch                  simple switch - Behavioral Model Target Simple Switch
+    bm                             BMv2 - Behavioral Model
+    boost_system                   Boost System - Boost System
+```