Limit producer to single thread (#37)

* Producer のスレッドを単一に変更
idofront · Dec 7, 2024 · 602e07e · 602e07e
1 parent d8449d9
commit 602e07e
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 55 deletions.
diff --git a/include/TrafficPlayer.hpp b/include/TrafficPlayer.hpp
diff --git a/main/TrafficPlayer.cpp b/main/TrafficPlayer.cpp
@@ -9,16 +9,7 @@
 #include <TrafficMaker/PacketsPerSecondTrafficMaker.hpp>
 #include <TrafficMaker/SpeedScaledReplayTrafficMaker.hpp>
 #include <TrafficMaker/UniformThroughputTrafficMaker.hpp>
-#include <TrafficPlayer.hpp>
-#include <TrafficRecord.hpp>
-#include <boost/format.hpp>
-#include <filesystem>
-#include <iostream>
-#include <pcap.h>
 #include <spdlog/spdlog.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
 
 int main(int argc, char *argv[])
 {
@@ -66,7 +57,7 @@ int main(int argc, char *argv[])
 
         const auto NUM_OF_DEALERS = 1;
         const auto NUM_OF_REPORTERS = 1;
-        const auto NUM_OF_PRODUCERS = std::thread::hardware_concurrency();
+        const auto NUM_OF_PRODUCERS = 1;
         const auto NUM_OF_THREADS = NUM_OF_DEALERS + NUM_OF_REPORTERS + NUM_OF_PRODUCERS;
         auto employer = Thread::Employer(NUM_OF_THREADS);
 

diff --git a/src/Dealer/DealReporter.cpp b/src/Dealer/DealReporter.cpp
@@ -1,5 +1,8 @@
 #include <Dealer/DealReporter.hpp>
+#include <UnitConverter/SiPrefixConversion.hpp>
+#include <boost/format.hpp>
 #include <numeric>
+#include <spdlog/spdlog.h>
 
 DealReporter::DealReporter(Dealer &dealer, std::chrono::milliseconds interval)
     : _Dealer(dealer), _Interval(interval), _UnitConverter(std::make_unique<SiPrefixConversion>()),

diff --git a/src/Dealer/DealReporter.hpp b/src/Dealer/DealReporter.hpp
@@ -2,14 +2,8 @@
 #define DEALER__DEAL_REPORTER_HPP
 
 #include <Dealer/Dealer.hpp>
-#include <Queue/ThreadSafeQueue.hpp>
 #include <Thread/Runnable.hpp>
-#include <UnitConverter/BinaryPrefixConversion.hpp>
-#include <UnitConverter/NoConversion.hpp>
-#include <UnitConverter/SiPrefixConversion.hpp>
 #include <UnitConverter/UnitConverter.hpp>
-#include <chrono>
-#include <memory>
 
 class DealReporter : public Thread::Runnable
 {

diff --git a/src/Dealer/Dealer.cpp b/src/Dealer/Dealer.cpp
@@ -1,5 +1,11 @@
 #include <Dealer/Dealer.hpp>
+#include <arpa/inet.h>
+#include <boost/format.hpp>
+#include <netinet/ether.h>
 #include <numeric>
+#include <spdlog/spdlog.h>
+#include <string.h>
+#include <sys/ioctl.h>
 
 Dealer::Dealer(std::shared_ptr<ThreadSafeQueue<TrafficRecord>> queue, const std::string &device_name)
     : queue(queue), device_name(device_name), ReportsPtr(std::make_shared<ThreadSafeQueue<DealReport>>())
@@ -22,8 +28,6 @@ void Dealer::Task()
 
         if (result.has_value())
         {
-            auto str = TrafficPlayer::HexString(result.value().Data());
-            spdlog::trace("Deal: {}", str);
             try
             {
                 Send(result.value().Data());

diff --git a/src/Dealer/Dealer.hpp b/src/Dealer/Dealer.hpp
@@ -4,18 +4,9 @@
 #include <Dealer/DealReport.hpp>
 #include <Queue/ThreadSafeQueue.hpp>
 #include <Thread/Runnable.hpp>
-#include <TrafficPlayer.hpp>
 #include <TrafficRecord.hpp>
-#include <arpa/inet.h>
-#include <boost/format.hpp>
 #include <linux/if_packet.h>
-#include <memory>
 #include <net/if.h>
-#include <netinet/ether.h>
-#include <spdlog/spdlog.h>
-#include <string.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
 
 class Dealer : public Thread::Runnable
 {

diff --git a/src/Producer/Producer.hpp b/src/Producer/Producer.hpp
@@ -1,7 +1,6 @@
 #ifndef PRODUCER__PRODUCER_HPP
 #define PRODUCER__PRODUCER_HPP
 
-#include <Queue/IThreadSafeQueue.hpp>
 #include <Thread/Runnable.hpp>
 #include <TimingAdjuster/ReserveTimeRecord.hpp>
 #include <TrafficRecord.hpp>

diff --git a/src/TimingAdjuster/ReserveTimingAdjuster.hpp b/src/TimingAdjuster/ReserveTimingAdjuster.hpp
@@ -4,7 +4,6 @@
 #include <Queue/BoundedThreadSafeQueue.hpp>
 #include <Queue/ThreadSafeQueue.hpp>
 #include <TimingAdjuster/ReserveTimeRecord.hpp>
-#include <TrafficPlayer.hpp>
 #include <TrafficRecord.hpp>
 #include <memory>
 #include <spdlog/spdlog.h>