Hotfix: Fixes some warnings and compilation errors

zzudongxiang · Nov 3, 2024 · 9ad27e5 · 9ad27e5
1 parent 3b098c6
commit 9ad27e5
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 12 deletions.
diff --git a/src/point-to-point/CMakeLists.txt b/src/point-to-point/CMakeLists.txt
@@ -22,7 +22,6 @@ build_lib(
   SOURCE_FILES
     ${mpi_sources}
     helper/point-to-point-helper.cc
-    model/point-to-point-remote-channel.cc
     model/cn-header.cc
     model/nvswitch-node.cc
     model/pause-header.cc
@@ -43,7 +42,6 @@ build_lib(
     ${mpi_headers}
     helper/point-to-point-helper.h
     helper/sim-setting.h
-    model/point-to-point-remote-channel.h
     model/cn-header.h
     model/nvswitch-node.h
     model/pause-header.h

diff --git a/src/point-to-point/helper/qbb-helper.cc b/src/point-to-point/helper/qbb-helper.cc
@@ -344,7 +344,7 @@ QbbHelper::GetTraceFromPacket(TraceFormat& tr,
                               Ptr<QbbNetDevice> dev,
                               Ptr<const Packet> p,
                               uint32_t qidx,
-                              Event event,
+                              EventEnum event,
                               bool hasL2)
 {
     CustomHeader hdr((hasL2 ? CustomHeader::L2_Header : 0) | CustomHeader::L3_Header |
@@ -409,7 +409,7 @@ QbbHelper::PacketEventCallback(FILE* file,
                                Ptr<QbbNetDevice> dev,
                                Ptr<const Packet> p,
                                uint32_t qidx,
-                               Event event,
+                               EventEnum event,
                                bool hasL2)
 {
     TraceFormat tr;

diff --git a/src/point-to-point/helper/qbb-helper.h b/src/point-to-point/helper/qbb-helper.h
@@ -160,13 +160,13 @@ class QbbHelper : public PcapHelperForDevice, public AsciiTraceHelperForDevice
                                    Ptr<QbbNetDevice>,
                                    Ptr<const Packet> p,
                                    uint32_t qidx,
-                                   Event event,
+                                   EventEnum event,
                                    bool hasL2);
     static void PacketEventCallback(FILE* file,
                                     Ptr<QbbNetDevice>,
                                     Ptr<const Packet>,
                                     uint32_t qidx,
-                                    Event event,
+                                    EventEnum event,
                                     bool hasL2);
     static void MacRxDetailCallback(FILE* file, Ptr<QbbNetDevice>, Ptr<const Packet> p);
     static void EnqueueDetailCallback(FILE* file,

diff --git a/src/point-to-point/helper/sim-setting.h b/src/point-to-point/helper/sim-setting.h
@@ -19,8 +19,7 @@ class SimSetting
         // write port_speed
         uint32_t len = 0;
         for (auto i : port_speed)
-            for (auto j : i.second)
-                len++;
+            len += i.second.size();
         fwrite(&len, sizeof(len), 1, file);
         for (auto i : port_speed)
             for (auto j : i.second)

diff --git a/src/point-to-point/model/rdma-hw.cc b/src/point-to-point/model/rdma-hw.cc
@@ -1378,7 +1378,7 @@ RdmaHw::UpdateRateHp(Ptr<RdmaQueuePair> qp, Ptr<Packet> p, CustomHeader& ch, boo
             }
 
             DataRate new_rate;
-            int32_t new_incStage;
+            int32_t new_incStage = 0;
             DataRate new_rate_per_hop[IntHeader::maxHop];
             int32_t new_incStage_per_hop[IntHeader::maxHop];
             if (!m_multipleRate)
@@ -1741,7 +1741,7 @@ RdmaHw::UpdateRateHpPint(Ptr<RdmaQueuePair> qp, Ptr<Packet> p, CustomHeader& ch,
         double U = Pint::decode_u(ih.GetPower());
 
         DataRate new_rate;
-        int32_t new_incStage;
+        int32_t new_incStage = 0;
         double max_c = U / m_targetUtil;
 
         if (max_c >= 1 || qp->hpccPint.m_incStage >= m_miThresh)

diff --git a/src/point-to-point/model/trace-format.h b/src/point-to-point/model/trace-format.h
@@ -10,7 +10,7 @@
 namespace ns3
 {
 
-enum Event
+enum EventEnum
 {
     Recv = 0,
     Enqu = 1,
@@ -94,7 +94,7 @@ struct TraceFormat
 };
 
 static inline const char*
-EventToStr(enum Event e)
+EventToStr(enum EventEnum e)
 {
     switch (e)
     {