Apply clang-format to all files changed so far

autotest/autotest.cpp

@@ -1,6 +1,6 @@
 #include <arpa/inet.h>
-#include <pcap.h>
 #include <cstring>
+#include <pcap.h>
 #include <sys/shm.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
@@ -409,7 +409,7 @@ class TextDumper
 class PcapDumper
 {
 public:
-	PcapDumper(std::string  path, int capsize = MAX_PACK_LEN) :
+	PcapDumper(std::string path, int capsize = MAX_PACK_LEN) :
 	        tmpFilePath(std::move(path)), pcap(pcap_open_dead(DLT_EN10MB, capsize))
 	{
 

autotest/main.cpp

@@ -1,6 +1,5 @@
 #include <csignal>
 
-
 #include "common/result.h"
 
 #include "autotest.h"

cli/balancer.h

@@ -84,7 +84,7 @@ void service(std::string module_string,
 		for (const auto& [service_key, service_value] : services)
 		{
 			const auto& [virtual_ip, proto, virtual_port] = service_key;
-			YANET_UNUSED const auto& [scheduler, version,  nap_connections, packets, bytes] = service_value;
+			YANET_UNUSED const auto& [scheduler, version, nap_connections, packets, bytes] = service_value;
 
 			auto proto_string = controlplane::balancer::from_proto(proto);
 

cli/develop.h

@@ -13,8 +13,6 @@
 
 #include "helper.h"
 
-
-
 namespace develop::dataplane
 {
 
@@ -365,5 +363,3 @@ void tsc_monitoring()
 }
 
 }
-
-

cli/route.h

@@ -101,7 +101,7 @@ void get(const std::string& route_name,
 
 	for (const auto& item : response)
 	{
-		YANET_UNUSED const auto& [ingress_physical_ports,  prefix, nexthop, egress_interface, labels] = item;
+		YANET_UNUSED const auto& [ingress_physical_ports, prefix, nexthop, egress_interface, labels] = item;
 
 		table.insert(ingress_physical_ports,
 		             nexthop.is_default() ? std::string("") : nexthop.toString(),
@@ -188,7 +188,7 @@ void get(const std::string& route_name,
 
 	for (const auto& item : response)
 	{
-		YANET_UNUSED const auto& [ingress_physical_ports,  prefix, nexthop, label, egress_interface, peer, weight_percent] = item;
+		YANET_UNUSED const auto& [ingress_physical_ports, prefix, nexthop, label, egress_interface, peer, weight_percent] = item;
 
 		double percent = (double)100.0 * weight_percent;
 

cli/telegraf.h

@@ -698,7 +698,7 @@ void main_counters()
 	{
 		std::vector<influxdb_format::value_t> values;
 		auto* buffer = common::sdp::ShiftBuffer<uint64_t*>(worker_info.buffer,
-		                                                       sdp_data.metadata_worker.start_counters);
+		                                                   sdp_data.metadata_worker.start_counters);
 		for (const auto& [name, index] : sdp_data.metadata_worker.counter_positions)
 		{
 			values.emplace_back(name.data(), buffer[index]);
@@ -710,7 +710,7 @@ void main_counters()
 	{
 		std::vector<influxdb_format::value_t> values;
 		auto* buffer = common::sdp::ShiftBuffer<uint64_t*>(worker_info.buffer,
-		                                                       sdp_data.metadata_worker.start_counters);
+		                                                   sdp_data.metadata_worker.start_counters);
 		for (const auto& [name, index] : sdp_data.metadata_worker_gc.counter_positions)
 		{
 			values.emplace_back(name.data(), buffer[index]);

common/balancer.h

@@ -1,6 +1,5 @@
 #pragma once
 
-
 #include <cstdint>
 namespace balancer
 {

common/define.h

@@ -9,7 +9,6 @@
 #include <set>
 #include <vector>
 
-
 #define YANET_UNUSED [[maybe_unused]]
 
 #define YANET_LOG_PRINT(msg, args...) fprintf(stdout, msg, ##args)

common/icp.h

@@ -15,7 +15,6 @@
 #include "result.h"
 #include "type.h"
 
-
 namespace common::icp
 {
 
@@ -1020,4 +1019,3 @@ using response = std::variant<std::tuple<>,
                               convert::response,
                               counters_stat::response>;
 }
-

common/icp_proto.h

@@ -1,6 +1,5 @@
 #pragma once
 
-
 namespace common::icp_proto
 {
 constexpr inline char socketPath[] = "/run/yanet/protocontrolplane.sock";

common/idp.h

@@ -1,6 +1,5 @@
 #pragma once
 
-
 #include <array>
 #include <map>
 #include <set>

common/neighbor.h

@@ -1,6 +1,5 @@
 #pragma once
 
-
 #include <cstdint>
 namespace common::neighbor
 {

common/refarray.h

@@ -40,7 +40,7 @@ class refarray_t
 			return false;
 		}
 
-		YANET_UNUSED auto& [refcount,  id] = it->second;
+		YANET_UNUSED auto& [refcount, id] = it->second;
 
 		refcount++;
 
@@ -104,7 +104,7 @@ class refarray_t
 		}
 
 		const auto& value = it->second;
-		YANET_UNUSED auto& [refcount,  values_id] = values[value];
+		YANET_UNUSED auto& [refcount, values_id] = values[value];
 
 		refcount--;
 		if (refcount)

common/result.h

@@ -1,6 +1,5 @@
 #pragma once
 
-
 #include <cstdint>
 
 namespace common

common/rpc_controller.h

@@ -11,7 +11,7 @@ class RpcController : public google::protobuf::RpcController
 {
 public:
 	RpcController() { _reset(); }
-	 ~RpcController() override = default;
+	~RpcController() override = default;
 
 	virtual void Reset()
 	{

common/scheduler.h

@@ -1,6 +1,5 @@
 #pragma once
 
-
 #include <cstdint>
 namespace balancer
 {

common/sdpclient.h

@@ -178,7 +178,7 @@ class SdpClient
 				if (!core_id.has_value() || worker_core_id == core_id)
 				{
 					auto* counters = common::sdp::ShiftBuffer<uint64_t*>(worker_info.buffer,
-					                                                         sdp_data.metadata_worker.start_counters);
+					                                                     sdp_data.metadata_worker.start_counters);
 					result[worker_core_id] = counters[index];
 				}
 			}
@@ -194,7 +194,7 @@ class SdpClient
 				if (!core_id.has_value() || worker_core_id == core_id)
 				{
 					auto* counters = common::sdp::ShiftBuffer<uint64_t*>(worker_info.buffer,
-					                                                         sdp_data.metadata_worker.start_counters);
+					                                                     sdp_data.metadata_worker.start_counters);
 					result[worker_core_id] = counters[index];
 				}
 			}

common/sendrecv.h

@@ -2,8 +2,8 @@
 
 #include <string>
 
-#include <google/protobuf/message.h>
 #include <cstring>
+#include <google/protobuf/message.h>
 #include <sys/socket.h>
 #include <unistd.h>
 #include <vector>

common/shared_memory.h

@@ -1,10 +1,10 @@
 #pragma once
 
+#include <cstring>
 #include <fcntl.h>
 #include <numa.h>
 #include <numaif.h>
 #include <optional>
-#include <cstring>
 #include <sys/mman.h>
 #include <sys/shm.h>
 #include <sys/stat.h>

common/stream.h

@@ -1,6 +1,5 @@
 #pragma once
 
-
 #include <map>
 #include <memory>
 #include <optional>

common/tsc_deltas.h

@@ -13,8 +13,6 @@
 #define YANET_TSC_BINS_SHIFT 2
 #define YANET_TSC_BINS_N 4
 
-
-
 namespace dataplane::perf
 {
 
@@ -110,5 +108,3 @@ static_assert(std::is_pod_v<tsc_deltas> == true,
               "tsc structure is not pod");
 
 }
-
-

common/type.h

@@ -11,11 +11,11 @@
 #include <memory.h>
 #include <nlohmann/json.hpp>
 
+#include "config.release.h"
 #include "ctree.h"
 #include "define.h"
 #include "stream.h"
 #include "uint128.h"
-#include "config.release.h"
 
 using tCoreId = uint32_t;
 using tSocketId = uint32_t;
@@ -1983,7 +1983,6 @@ constexpr ipv6_prefix_t ipv6_prefix_default = {ipv6_address_default, 0};
 
 //
 
-
 namespace worker::stats
 {
 struct common
@@ -2032,7 +2031,6 @@ struct port
 };
 }
 
-
 namespace worker_gc
 {
 struct stats_t

controlplane/acl/bitset.h

@@ -135,7 +135,7 @@ struct bitset_t
 	}
 
 	[[nodiscard]] std::tuple<size_t, bool> minAnd(const bitset_t& p1,
-	                                const bitset_t& p2) const
+	                                              const bitset_t& p2) const
 	{
 		for (size_t i = std::max(std::max(first_one, p1.first_one), p2.first_one); i < size; ++i)
 		{

controlplane/acl/dict.h

@@ -1,6 +1,5 @@
 #pragma once
 
-
 #include "bitset.h"
 #include "network.h"
 #include "rule.h"

controlplane/acl_tree.h

@@ -506,7 +506,7 @@ class tree_t
 			for (const auto& [key, value] : warp_chunk_ids)
 			{
 				const auto& [prev_address, prev_mask] = key;
-				YANET_UNUSED const auto& [prev_shift,  prev_warp_chunk_id] = value;
+				YANET_UNUSED const auto& [prev_shift, prev_warp_chunk_id] = value;
 
 				type_t shared_shadow_mask = warp_shadow_mask & (prev_mask & (prev_mask + 1));
 
@@ -561,8 +561,7 @@ class tree_t
 		for (const auto& [map_key, map_value] : warp_chunk_ids)
 		{
 			const auto& [warp_address, warp_mask] = map_key;
-			YANET_UNUSED const auto& [shift,  warp_chunk_id] = map_value;
-
+			YANET_UNUSED const auto& [shift, warp_chunk_id] = map_value;
 
 			type_t warp_shadow_mask = warp_mask & (warp_mask + 1);
 

controlplane/balancer.cpp

@@ -160,13 +160,13 @@ void balancer_t::Real(
 	for (const auto& real : req->reals())
 	{
 		request.emplace_back(real.module(),
-		                   convert_to_ip_address(real.virtual_ip()),
-		                   real.proto() == common::icp_proto::NetProto::tcp ? IPPROTO_TCP : IPPROTO_UDP,
-		                   real.virtual_port_opt_case() == common::icp_proto::BalancerRealRequest_Real::VirtualPortOptCase::kVirtualPort ? std::make_optional(real.virtual_port()) : std::nullopt,
-		                   convert_to_ip_address(real.real_ip()),
-		                   real.real_port_opt_case() == common::icp_proto::BalancerRealRequest_Real::RealPortOptCase::kRealPort ? std::make_optional(real.real_port()) : std::nullopt,
-		                   real.enable(),
-		                   real.weight_opt_case() == common::icp_proto::BalancerRealRequest_Real::WeightOptCase::kWeight ? std::make_optional(real.weight()) : std::nullopt);
+		                     convert_to_ip_address(real.virtual_ip()),
+		                     real.proto() == common::icp_proto::NetProto::tcp ? IPPROTO_TCP : IPPROTO_UDP,
+		                     real.virtual_port_opt_case() == common::icp_proto::BalancerRealRequest_Real::VirtualPortOptCase::kVirtualPort ? std::make_optional(real.virtual_port()) : std::nullopt,
+		                     convert_to_ip_address(real.real_ip()),
+		                     real.real_port_opt_case() == common::icp_proto::BalancerRealRequest_Real::RealPortOptCase::kRealPort ? std::make_optional(real.real_port()) : std::nullopt,
+		                     real.enable(),
+		                     real.weight_opt_case() == common::icp_proto::BalancerRealRequest_Real::WeightOptCase::kWeight ? std::make_optional(real.weight()) : std::nullopt);
 	}
 
 	balancer_real(request);

controlplane/bus.h

@@ -1,6 +1,5 @@
 #pragma once
 
-
 #include "module.h"
 
 namespace controlplane::module

controlplane/configconverter.cpp

@@ -6,8 +6,8 @@
 #include <netinet/ip_icmp.h>
 
 #include "acl.h"
-#include "errors.h"
 #include "configconverter.h"
+#include "errors.h"
 
 eResult config_converter_t::process(uint32_t serial)
 {
@@ -1057,8 +1057,7 @@ void config_converter_t::acl_rules_nat64stateless_ingress(controlplane::base::ac
 	for (const auto& [key, value] : nat64stateless.translations)
 	{
 		const auto& [ipv6Address, ipv6DestinationAddress, ingressPortRange] = key;
-		YANET_UNUSED const auto& [ipv4Address,  egressPortRange, translationId] = value;
-
+		YANET_UNUSED const auto& [ipv4Address, egressPortRange, translationId] = value;
 
 		flow.data.nat64stateless.translationId = translationId;
 		flow_icmp.data.nat64stateless.translationId = translationId;

controlplane/configconverter.h

@@ -10,8 +10,8 @@ class config_converter_t
 {
 public:
 	config_converter_t(cControlPlane* controlplane,
-	                   controlplane::base_t  baseNext,
-	                   common::idp::limits::response  limits) :
+	                   controlplane::base_t baseNext,
+	                   common::idp::limits::response limits) :
 	        controlplane(controlplane),
 	        baseNext(std::move(baseNext)),
 	        limits(std::move(limits))

controlplane/configparser.cpp

@@ -155,7 +155,7 @@ controlplane::base_t config_parser_t::loadConfig(const std::string& rootFilePath
 
 	try
 	{
-		YANET_UNUSED const auto& [dataplane_physicalports,  dataplane_workers,  dataplane_values] = dataPlaneConfig;
+		YANET_UNUSED const auto& [dataplane_physicalports, dataplane_workers, dataplane_values] = dataPlaneConfig;
 
 		for (YANET_UNUSED const auto& [core_id, worker] : dataplane_workers)
 		{
@@ -171,7 +171,7 @@ controlplane::base_t config_parser_t::loadConfig(const std::string& rootFilePath
 				{
 					const auto& logicalport = baseNext.logicalPorts[interface.nextModule];
 
-					YANET_UNUSED const auto& [physicalport_name, socket_id,  mac_address,  pci] = dataplane_physicalports.find(logicalport.physicalPortId)->second;
+					YANET_UNUSED const auto& [physicalport_name, socket_id, mac_address, pci] = dataplane_physicalports.find(logicalport.physicalPortId)->second;
 
 					baseNext.socket_interfaces[socket_id].emplace(interface.interfaceId);
 				}

controlplane/controlplane.h

@@ -8,12 +8,12 @@
 
 #include <nlohmann/json.hpp>
 
+#include "balancer.h"
 #include "common/generation.h"
 #include "common/icp.h"
 #include "common/idataplane.h"
 #include "common/idp.h"
 #include "common/result.h"
-#include "balancer.h"
 #include "dregress.h"
 #include "durations.h"
 #include "fqdn.h"