Add dataRate for link

Author: Mingyumaz

examples/p4-basic-tunnel.cc

@@ -40,7 +40,7 @@ unsigned long start = getTickCount();
 double global_start_time = 1.0;
 double sink_start_time = global_start_time + 1.0;
 double client_start_time = sink_start_time + 1.0;
-double client_stop_time = client_start_time + 3; // sending time 30s
+double client_stop_time = client_start_time + 5; // sending time
 double sink_stop_time = client_stop_time + 5;
 double global_stop_time = sink_stop_time + 5;
 
@@ -52,8 +52,10 @@ double first_packet_send_time_tx = 0.0;
 double last_packet_send_time_tx = 0.0;
 double first_packet_received_time_rx = 0.0;
 double last_packet_received_time_rx = 0.0;
-uint64_t totalTxBytes = 0;
-uint64_t totalRxBytes = 0;
+uint64_t totalTxBytes_1 = 0;
+uint64_t totalRxBytes_1 = 0;
+uint64_t totalTxBytes_2 = 0;
+uint64_t totalRxBytes_2 = 0;
 
 // Convert IP address to hexadecimal format
 std::string
@@ -86,6 +88,128 @@ ConvertMacToHex(Address macAddr)
     return hexStream.str();
 }
 
+void
+TxCallback(Ptr<const Packet> packet)
+{
+    if (first_tx)
+    {
+        // here we just simple jump the first 10 pkts (include some of ARP packets)
+        first_packet_send_time_tx = Simulator::Now().GetSeconds();
+        counter_sender_10--;
+        if (counter_sender_10 == 0)
+        {
+            first_tx = false;
+        }
+    }
+    else
+    {
+        totalTxBytes_1 += packet->GetSize();
+        last_packet_send_time_tx = Simulator::Now().GetSeconds();
+    }
+}
+
+void
+RxCallback(Ptr<const Packet> packet, const Address& addr)
+{
+    if (first_rx)
+    {
+        // here we just simple jump the first 10 pkts (include some of ARP packets)
+        first_packet_received_time_rx = Simulator::Now().GetSeconds();
+        counter_receiver_10--;
+        if (counter_receiver_10 == 0)
+        {
+            first_rx = false;
+        }
+    }
+    else
+    {
+        totalRxBytes_1 += packet->GetSize();
+        last_packet_received_time_rx = Simulator::Now().GetSeconds();
+    }
+}
+
+void
+TxCallback_2(Ptr<const Packet> packet)
+{
+    if (first_tx)
+    {
+        // here we just simple jump the first 10 pkts (include some of ARP packets)
+        first_packet_send_time_tx = Simulator::Now().GetSeconds();
+        counter_sender_10--;
+        if (counter_sender_10 == 0)
+        {
+            first_tx = false;
+        }
+    }
+    else
+    {
+        totalTxBytes_2 += packet->GetSize();
+        last_packet_send_time_tx = Simulator::Now().GetSeconds();
+    }
+}
+
+void
+RxCallback_2(Ptr<const Packet> packet, const Address& addr)
+{
+    if (first_rx)
+    {
+        // here we just simple jump the first 10 pkts (include some of ARP packets)
+        first_packet_received_time_rx = Simulator::Now().GetSeconds();
+        counter_receiver_10--;
+        if (counter_receiver_10 == 0)
+        {
+            first_rx = false;
+        }
+    }
+    else
+    {
+        totalRxBytes_2 += packet->GetSize();
+        last_packet_received_time_rx = Simulator::Now().GetSeconds();
+    }
+}
+
+void
+PrintFinalThroughput()
+{
+    // 计算传输和接收的时间间隔
+    double send_time = last_packet_send_time_tx - first_packet_send_time_tx;
+    double elapsed_time = last_packet_received_time_rx - first_packet_received_time_rx;
+
+    // 计算每个传输流的总字节数
+    uint64_t totalTxBytes = totalTxBytes_1 + totalTxBytes_2;
+    uint64_t totalRxBytes = totalRxBytes_1 + totalRxBytes_2;
+
+    // 避免除零错误
+    double finalTxThroughput = (send_time > 0) ? (totalTxBytes * 8.0) / (send_time * 1e6) : 0.0;
+    double finalRxThroughput =
+        (elapsed_time > 0) ? (totalRxBytes * 8.0) / (elapsed_time * 1e6) : 0.0;
+
+    std::cout << "======================================" << std::endl;
+    std::cout << "Final Simulation Results:" << std::endl;
+    std::cout << "Client Start Time: " << first_packet_send_time_tx << " s" << std::endl;
+    std::cout << "Client Stop Time: " << last_packet_send_time_tx << " s" << std::endl;
+    std::cout << "Sink Start Time: " << first_packet_received_time_rx << " s" << std::endl;
+    std::cout << "Sink Stop Time: " << last_packet_received_time_rx << " s" << std::endl;
+
+    std::cout << "--------------------------------------" << std::endl;
+    std::cout << "Detailed Bytes Transmitted & Received" << std::endl;
+    std::cout << "Tx Stream 1: " << totalTxBytes_1 << " bytes" << std::endl;
+    std::cout << "Tx Stream 2: " << totalTxBytes_2 << " bytes" << std::endl;
+    std::cout << "Total Transmitted Bytes: " << totalTxBytes << " bytes over " << send_time << " s"
+              << std::endl;
+
+    std::cout << "Rx Stream 1: " << totalRxBytes_1 << " bytes" << std::endl;
+    std::cout << "Rx Stream 2: " << totalRxBytes_2 << " bytes" << std::endl;
+    std::cout << "Total Received Bytes: " << totalRxBytes << " bytes over " << elapsed_time << " s"
+              << std::endl;
+
+    std::cout << "--------------------------------------" << std::endl;
+    std::cout << "Final Throughput Metrics" << std::endl;
+    std::cout << "Final Transmitted Throughput: " << finalTxThroughput << " Mbps" << std::endl;
+    std::cout << "Final Received Throughput: " << finalRxThroughput << " Mbps" << std::endl;
+    std::cout << "======================================" << std::endl;
+}
+
 // ============================ data struct ============================
 struct SwitchNodeC_t
 {
@@ -111,7 +235,7 @@ main(int argc, char* argv[])
 
     int running_number = 0;
     uint16_t pktSize = 1000; // in Bytes. 1458 to prevent fragments, default 512
-    std::string appDataRate[] = {"2Mbps", "5Mbps"}; // Default application data rate
+    std::string appDataRate[] = {"1Mbps", "3Mbps"}; // Default application data rate
     std::string ns3_link_rate = "1000Mbps";
     bool enableTracePcap = true;
 
@@ -121,7 +245,7 @@ main(int argc, char* argv[])
         "/home/p4/workdir/ns-3-dev-git/contrib/p4sim/examples/p4src/basic_tunnel/";
     std::string topoInput =
         "/home/p4/workdir/ns-3-dev-git/contrib/p4sim/examples/p4src/basic_tunnel/topo.txt";
-    std::string topoFormat("CsmaTopo");
+    std::string topoFormat("P2PTopo");
 
     // ============================  command line ============================
     CommandLine cmd;
@@ -156,6 +280,7 @@ main(int argc, char* argv[])
 
     // set default network link parameter
     P4PointToPointHelper p4p2phelper;
+    p4p2phelper.SetDeviceAttribute("DataRate", DataRateValue(DataRate("10Mbps")));
     p4p2phelper.SetChannelAttribute("Delay", TimeValue(MilliSeconds(0.01)));
 
     P4TopologyReader::ConstLinksIterator_t iter;
@@ -341,14 +466,19 @@ main(int argc, char* argv[])
     app1.Start(Seconds(client_start_time));
     app1.Stop(Seconds(client_stop_time));
 
+    // === Setup Tracing ===
+    Ptr<OnOffApplication> ptr_app1 =
+        DynamicCast<OnOffApplication>(terminals.Get(clientI)->GetApplication(0));
+    ptr_app1->TraceConnectWithoutContext("Tx", MakeCallback(&TxCallback));
+    sinkApp1.Get(0)->TraceConnectWithoutContext("Rx", MakeCallback(&RxCallback));
+
     // Normal Stream == Second == send link h0 -----> h1
-    servPort = 1200; // change the application port
+    servPort = 1301; // change the application port
 
-    // node = terminals.Get (serverI);
-    // ipv4_adder = node->GetObject<Ipv4> ();
-    // serverAddr1 =
-    //     ipv4_adder->GetAddress (1, 0)
-    //         .GetLocal (); // Interface index 1 corresponds to the first assigned IP
+    node = terminals.Get(serverI);
+    ipv4_adder = node->GetObject<Ipv4>();
+    serverAddr1 = ipv4_adder->GetAddress(1, 0)
+                      .GetLocal(); // Interface index 1 corresponds to the first assigned IP
     InetSocketAddress dst2 = InetSocketAddress(serverAddr1, servPort);
     PacketSinkHelper sink2 = PacketSinkHelper("ns3::UdpSocketFactory", dst2);
     ApplicationContainer sinkApp2 = sink2.Install(terminals.Get(serverI));
@@ -361,12 +491,18 @@ main(int argc, char* argv[])
     onOff2.SetAttribute("DataRate", StringValue(appDataRate[1]));
     onOff2.SetAttribute("OnTime", StringValue("ns3::ConstantRandomVariable[Constant=1]"));
     onOff2.SetAttribute("OffTime", StringValue("ns3::ConstantRandomVariable[Constant=0]"));
-    // onOff2.SetAttribute ("MaxBytes", UintegerValue (5000));
+    // onOff2.SetAttribute("MaxBytes", UintegerValue(500));
 
     ApplicationContainer app2 = onOff2.Install(terminals.Get(clientI));
     app2.Start(Seconds(client_start_time));
     app2.Stop(Seconds(client_stop_time));
 
+    // === Setup Tracing ===
+    Ptr<OnOffApplication> ptr_app2 =
+        DynamicCast<OnOffApplication>(terminals.Get(clientI)->GetApplication(0));
+    ptr_app2->TraceConnectWithoutContext("Tx", MakeCallback(&TxCallback_2));
+    sinkApp2.Get(0)->TraceConnectWithoutContext("Rx", MakeCallback(&RxCallback_2));
+
     // Enable pcap tracing
     p4p2phelper.EnablePcapAll("p4-basic-tunnel");
 
@@ -383,5 +519,6 @@ main(int argc, char* argv[])
                                           << std::endl
                                           << "Run successfully!");
 
+    PrintFinalThroughput();
     return 0;
 }

examples/p4src/basic_tunnel/basic_tunnel.json

@@ -167,7 +167,7 @@
             },
             {
               "type" : "hexstr",
-              "value" : "0x0012",
+              "value" : "0x00dc",
               "mask" : null,
               "next_state" : "parse_myTunnel"
             },

examples/p4src/basic_tunnel/basic_tunnel.p4

@@ -8,7 +8,7 @@
 
 const bit<16> TYPE_ARP = 0x806;
 const bit<16> TYPE_IPV4 = 0x800;
-const bit<16> TYPE_MYTUNNEL = 0x12;  // Same with: static constexpr uint64_t g_p4Protocol = 0x12;
+const bit<16> TYPE_MYTUNNEL = 0xDC;  // Same with: static constexpr uint64_t g_p4Protocol = 0xDC;
 
 /*************************************************************************
 *********************** H E A D E R S  ***********************************

examples/p4src/basic_tunnel/basic_tunnel.p4i

@@ -891,7 +891,7 @@ package V1Switch<H, M>(Parser<H, M> p,
 
 const bit<16> TYPE_ARP = 0x806;
 const bit<16> TYPE_IPV4 = 0x800;
-const bit<16> TYPE_MYTUNNEL = 0x12; // Same with: static constexpr uint64_t g_p4Protocol = 0x12;
+const bit<16> TYPE_MYTUNNEL = 0xDC; // Same with: static constexpr uint64_t g_p4Protocol = 0xDC;
 
 /*************************************************************************
 *********************** H E A D E R S  ***********************************

helper/p4-p2p-helper.cc

@@ -24,18 +24,10 @@
 #include "ns3/names.h"
 #include "ns3/net-device-queue-interface.h"
 #include "ns3/p4-p2p-channel.h"
+#include "ns3/p4-p2p-helper.h"
 #include "ns3/packet.h"
 #include "ns3/queue.h"
 #include "ns3/simulator.h"
-
-#ifdef NS3_MPI
-#include "ns3/mpi-interface.h"
-#include "ns3/mpi-receiver.h"
-#include "ns3/point-to-point-remote-channel.h"
-#endif
-
-#include "p4-p2p-helper.h"
-
 #include "ns3/trace-helper.h"
 
 namespace ns3
@@ -275,41 +267,7 @@ P4PointToPointHelper::Install(Ptr<Node> a, Ptr<Node> b)
     devB->AggregateObject(ndqiB);
 
     Ptr<P4P2PChannel> channel = nullptr;
-
-    // If MPI is enabled, we need to see if both nodes have the same system id
-    // (rank), and the rank is the same as this instance.  If both are true,
-    // use a normal p2p channel, otherwise use a remote channel
-#ifdef NS3_MPI
-    bool useNormalChannel = true;
-    if (MpiInterface::IsEnabled())
-    {
-        uint32_t n1SystemId = a->GetSystemId();
-        uint32_t n2SystemId = b->GetSystemId();
-        uint32_t currSystemId = MpiInterface::GetSystemId();
-        if (n1SystemId != currSystemId || n2SystemId != currSystemId)
-        {
-            useNormalChannel = false;
-        }
-    }
-    if (useNormalChannel)
-    {
-        m_channelFactory.SetTypeId("ns3::P4P2PChannel");
-        channel = m_channelFactory.Create<P4P2PChannel>();
-    }
-    else
-    {
-        m_channelFactory.SetTypeId("ns3::PointToPointRemoteChannel");
-        channel = m_channelFactory.Create<PointToPointRemoteChannel>();
-        Ptr<MpiReceiver> mpiRecA = CreateObject<MpiReceiver>();
-        Ptr<MpiReceiver> mpiRecB = CreateObject<MpiReceiver>();
-        mpiRecA->SetReceiveCallback(MakeCallback(&CustomP2PNetDevice::Receive, devA));
-        mpiRecB->SetReceiveCallback(MakeCallback(&CustomP2PNetDevice::Receive, devB));
-        devA->AggregateObject(mpiRecA);
-        devB->AggregateObject(mpiRecB);
-    }
-#else
     channel = m_channelFactory.Create<P4P2PChannel>();
-#endif
 
     devA->Attach(channel);
     devB->Attach(channel);

model/custom-p2p-net-device.cc

@@ -199,14 +199,14 @@ CustomP2PNetDevice::GetDstPort(Ptr<Packet> p)
         uint16_t protocol_temp = ip_hd.GetProtocol();
         cus_hd.SetProtocolFieldNumber(0);
 
-        if (protocol_temp == 0x11)
+        if (protocol_temp == 0x11) // UDP
         {
             NS_LOG_DEBUG("UDP protocol, return the dst port number");
             UdpHeader udp_hd;
             p->PeekHeader(udp_hd);
             dst_port = udp_hd.GetDestinationPort();
         }
-        else if (protocol_temp == 0x06)
+        else if (protocol_temp == 0x06) // TCP
         {
             NS_LOG_DEBUG("TCP protocol, return the dst port number");
             TcpHeader tcp_hd;

model/custom-p2p-net-device.h

@@ -478,7 +478,7 @@ class CustomP2PNetDevice : public NetDevice
 
     // Protocol number used to identify the custom P4 header in nested packet parsing.
     // The previous header's protocol field indicates that the next is a custom header
-    static constexpr uint16_t m_p4ProtocolNumber = 0x12;
+    static constexpr uint16_t m_p4ProtocolNumber = 0xDC;
 
     /**
      * \brief The Maximum Transmission Unit

model/p4-p2p-channel.cc

@@ -137,27 +137,4 @@ P4P2PChannel::IsInitialized(void) const
     return true;
 }
 
-// void P4P2PChannel::InstallP4Rule(uint32_t ruleId, const std::string& ruleData)
-// {
-//     m_p4Rules[ruleId] = ruleData;
-//     NS_LOG_INFO("Installed P4 rule with ID " << ruleId << ": " << ruleData);
-// }
-
-// void P4P2PChannel::RemoveP4Rule(uint32_t ruleId)
-// {
-//     if (m_p4Rules.erase(ruleId) > 0)
-//     {
-//         NS_LOG_INFO("Removed P4 rule with ID " << ruleId);
-//     }
-//     else
-//     {
-//         NS_LOG_WARN("P4 rule with ID " << ruleId << " not found.");
-//     }
-// }
-
-// std::map<std::string, uint64_t> P4P2PChannel::GetP4Statistics() const
-// {
-//     return m_p4Stats; // Return collected statistics
-// }
-
 } // namespace ns3