remove unused includes in dataplane and autotest

yanet-platform · Jan 10, 2024 · 76a1c76 · 76a1c76
1 parent 99cad24
commit 76a1c76
Show file tree

Hide file tree

Showing 23 changed files with 17 additions and 29 deletions.
diff --git a/autotest/common.h b/autotest/common.h
@@ -2,9 +2,6 @@
 
 #include <stdio.h>
 
-#include "common/define.h"
-#include "common/type.h"
-
 #define ANSI_COLOR_RED "\x1b[31m"
 #define ANSI_COLOR_GREEN "\x1b[32m"
 #define ANSI_COLOR_YELLOW "\x1b[33m"

diff --git a/autotest/main.cpp b/autotest/main.cpp
@@ -5,7 +5,6 @@
 #include "common/result.h"
 
 #include "autotest.h"
-#include "common.h"
 
 common::log::LogPriority common::log::logPriority = common::log::TLOG_DEBUG;
 

diff --git a/common/acl.h b/common/acl.h
@@ -2,7 +2,6 @@
 
 #include "stream.h"
 #include "type.h"
-#include "uint128.h"
 
 namespace common::acl
 {

diff --git a/common/balancer.h b/common/balancer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "type.h"
+#include <inttypes.h>
 
 namespace balancer
 {

diff --git a/common/ctree.h b/common/ctree.h
@@ -4,7 +4,6 @@
 
 #include "define.h"
 #include "stream.h"
-#include "type.h"
 
 namespace common
 {

diff --git a/common/icp_proto.h b/common/icp_proto.h
@@ -2,9 +2,6 @@
 
 #include "libprotobuf/controlplane.pb.h"
 
-#include "icp.h"
-#include "sendrecv.h"
-
 namespace common::icp_proto
 {
 constexpr inline char socketPath[] = "/run/yanet/protocontrolplane.sock";

diff --git a/common/idataplane.h b/common/idataplane.h
@@ -4,7 +4,6 @@
 
 #include <sys/un.h>
 
-#include "define.h"
 #include "idp.h"
 #include "result.h"
 #include "sendrecv.h"

diff --git a/common/refarray.h b/common/refarray.h
@@ -1,8 +1,10 @@
 #pragma once
 
 #include <atomic>
+#include <cstdio>
+#include <optional>
 
-#include "type.h"
+#include "define.h"
 
 namespace common
 {

diff --git a/common/scheduler.h b/common/scheduler.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "type.h"
+#include <inttypes.h>
 
 namespace balancer
 {
@@ -19,8 +19,7 @@ class scheduler_params
 	uint32_t wlc_power;
 };
 
-YANET_UNUSED
-constexpr const char* to_string(const scheduler& scheduler)
+[[maybe_unused]] constexpr const char* to_string(const scheduler& scheduler)
 {
 	switch (scheduler)
 	{

diff --git a/common/weight.h b/common/weight.h
@@ -3,7 +3,6 @@
 #include <atomic>
 
 #include "refarray.h"
-#include "type.h"
 
 namespace common
 {

diff --git a/dataplane/base.h b/dataplane/base.h
@@ -8,8 +8,6 @@
 #include <rte_tcp.h>
 #include <rte_udp.h>
 
-#include "common/result.h"
-
 #include "type.h"
 
 namespace dataplane::base

diff --git a/dataplane/bus.h b/dataplane/bus.h
@@ -11,7 +11,6 @@
 
 #include "common/idp.h"
 #include "common/result.h"
-#include "common/type.h"
 
 #include "type.h"
 

diff --git a/dataplane/controlplane.cpp b/dataplane/controlplane.cpp
@@ -8,6 +8,7 @@
 #include <rte_lcore.h>
 #include <rte_malloc.h>
 
+#include "common/fallback.h"
 #include "common/version.h"
 
 #include "checksum.h"

diff --git a/dataplane/dataplane.cpp b/dataplane/dataplane.cpp
@@ -16,6 +16,7 @@
 #include <rte_lcore.h>
 #include <rte_malloc.h>
 #include <rte_ring.h>
+#include <rte_version.h>
 
 #include <numa.h>
 #include <numaif.h>

diff --git a/dataplane/dregress.cpp b/dataplane/dregress.cpp
@@ -1,6 +1,8 @@
 #include <rte_tcp.h>
 #include <rte_udp.h>
 
+#include "common/fallback.h"
+
 #include "checksum.h"
 #include "controlplane.h"
 #include "dregress.h"

diff --git a/dataplane/dregress.h b/dataplane/dregress.h
@@ -4,7 +4,6 @@
 
 #include "common/btree.h"
 #include "common/idp.h"
-#include "common/result.h"
 #include "common/type.h"
 
 #include "hashtable.h"

diff --git a/dataplane/flat.h b/dataplane/flat.h
@@ -4,7 +4,6 @@
 
 #include <vector>
 
-#include "common/config.h"
 #include "common/define.h"
 #include "common/result.h"
 #include "common/type.h"

diff --git a/dataplane/fragmentation.h b/dataplane/fragmentation.h
@@ -9,7 +9,6 @@
 
 #include <rte_mbuf.h>
 
-#include "common/result.h"
 #include "common/type.h"
 
 #include "type.h"

diff --git a/dataplane/report.h b/dataplane/report.h
@@ -7,7 +7,6 @@
 #include "common/result.h"
 #include "common/type.h"
 
-#include "hashtable.h"
 #include "type.h"
 
 class cReport

diff --git a/dataplane/sharedmemory.h b/dataplane/sharedmemory.h
@@ -1,7 +1,7 @@
+#include <rte_mbuf.h>
+
 #include "common/bufferring.h"
 #include "common/result.h"
-#include "rte_mbuf.h"
-#include "type.h"
 
 class cSharedMemory
 {

diff --git a/dataplane/type.h b/dataplane/type.h
@@ -5,12 +5,9 @@
 
 #include "common/balancer.h"
 #include "common/config.h"
-#include "common/fallback.h"
 #include "common/scheduler.h"
 #include "common/type.h"
 
-#include "common.h"
-
 class cDataPlane;
 class cControlPlane;
 class cWorker;

diff --git a/dataplane/worker.cpp b/dataplane/worker.cpp
@@ -1,3 +1,6 @@
+#include <netinet/icmp6.h>
+#include <netinet/ip_icmp.h>
+
 #include <string>
 #include <thread>
 
@@ -13,11 +16,11 @@
 #include <rte_udp.h>
 
 #include "common/counters.h"
+#include "common/fallback.h"
 
 #include "checksum.h"
 #include "common.h"
 #include "dataplane.h"
-#include "icmp.h"
 #include "metadata.h"
 #include "prepare.h"
 #include "worker.h"

diff --git a/dataplane/worker_gc.cpp b/dataplane/worker_gc.cpp
@@ -4,6 +4,7 @@
 #include <rte_ethdev.h>
 
 #include "common/counters.h"
+#include "common/fallback.h"
 
 #include "controlplane.h"
 #include "dataplane.h"