Skip to content

Commit f7e6196

Browse files
author
Alexey Zharkov
committed
fix clang-format
1 parent 777607b commit f7e6196

4 files changed

Lines changed: 30 additions & 25 deletions

File tree

source/connection/flow/tcp/tcp_flow.cpp

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,14 @@ TcpFlow::TcpFlow(Id a_id, std::shared_ptr<IConnection> a_conn,
4646
}
4747

4848
void TcpFlow::update(Packet packet) {
49-
utils::StrExpected<PacketFlagsBase> exp_packet_type_label_flag = packet.flags.get_flag(m_packet_type_label);
49+
utils::StrExpected<PacketFlagsBase> exp_packet_type_label_flag =
50+
packet.flags.get_flag(m_packet_type_label);
5051
if (!exp_packet_type_label_flag.has_value()) {
5152
LOG_ERROR(std::move(exp_packet_type_label_flag.error()));
5253
}
5354

54-
PacketType type = static_cast<PacketType>(exp_packet_type_label_flag.value());
55+
PacketType type =
56+
static_cast<PacketType>(exp_packet_type_label_flag.value());
5557
if (m_src.expired()) {
5658
LOG_ERROR(fmt::format("Sender exprired for flow {}; ignore packet {}",
5759
to_string(), packet.to_string()));
@@ -321,13 +323,11 @@ void TcpFlow::process_ack(Packet ack, std::size_t confirm_count) {
321323
Packet TcpFlow::generate_data_packet(PacketNum packet_num) {
322324
Packet packet;
323325
packet.flags = get_flag_manager();
324-
auto result = packet.flags.set_flag(m_packet_type_label,
325-
PacketType::DATA);
326+
auto result = packet.flags.set_flag(m_packet_type_label, PacketType::DATA);
326327
if (!result.has_value()) {
327328
LOG_ERROR(std::move(result.error()));
328329
}
329330

330-
331331
set_avg_rtt_if_present(packet);
332332
packet.size = m_packet_size;
333333
packet.flow = this;
@@ -422,28 +422,29 @@ Packet TcpFlow::create_ack(Packet data) {
422422
ack.congestion_experienced = data.congestion_experienced;
423423

424424
ack.flags = get_flag_manager();
425-
auto result = ack.flags.set_flag(m_packet_type_label,
425+
auto result = ack.flags.set_flag(
426+
m_packet_type_label,
426427
(M_COLLECTIVE_ACK_SUPPORT ? PacketType::COLLECTIVE_ACK
427428
: PacketType::ACK));
428429
if (!result.has_value()) {
429430
LOG_ERROR(std::move(result.error()));
430431
}
431-
432+
432433
result = ack.flags.set_flag(m_ack_ttl_label, data.ttl);
433434
if (!result.has_value()) {
434435
LOG_ERROR(std::move(result.error()));
435436
}
436-
437+
437438
utils::StrExpected<TimeNs> exp_avg_rtt = get_avg_rtt_label(data.flags);
438439
if (!exp_avg_rtt.has_value()) {
439440
LOG_INFO(
440441
fmt::format("avg rtt flag does not set in data packet {} so it "
441442
"will not be set in "
442443
"ack {}",
443-
data.to_string(), ack.to_string()));
444+
data.to_string(), ack.to_string()));
444445
return ack;
445-
}
446-
446+
}
447+
447448
result = set_avg_rtt_flag(ack.flags, exp_avg_rtt.value());
448449
if (!result.has_value()) {
449450
// TODO: handle

source/device/hashers/adaptive_flowlet_hasher.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ std::uint32_t AdaptiveFlowletHasher::get_hash(const Packet& packet) {
3535

3636
utils::StrExpected<TimeNs> exp_avg_rtt = get_avg_rtt_label(packet.flags);
3737
if (!exp_avg_rtt.has_value()) {
38-
LOG_ERROR(fmt::format("Adaptive flowlet hasher could not find avg rtt ({});"
39-
"returned previous hash",
40-
exp_avg_rtt.error()));
38+
LOG_ERROR(
39+
fmt::format("Adaptive flowlet hasher could not find avg rtt ({});"
40+
"returned previous hash",
41+
exp_avg_rtt.error()));
4142
return ecmp_hash + shift;
4243
}
43-
TimeNs flowlet_threshold =
44-
exp_avg_rtt.value() * m_factor;
44+
TimeNs flowlet_threshold = exp_avg_rtt.value() * m_factor;
4545

4646
if (elapsed_from_last_seen > flowlet_threshold) {
4747
shift++;

source/utils/avg_rtt_packet_flag.hpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@ inline bool register_packet_avg_rtt_flag(BaseFlagManager& flag_manager) {
1919
sizeof_bits(AvgRttCastType));
2020
}
2121

22-
[[nodiscard]] inline std::expected<void, std::string> set_avg_rtt_flag(BaseFlagManager& flag_manager, TimeNs rtt) {
22+
[[nodiscard]] inline std::expected<void, std::string> set_avg_rtt_flag(
23+
BaseFlagManager& flag_manager, TimeNs rtt) {
2324
AvgRttCastType value = rtt.value_nanoseconds();
2425
AvgRttFlagType casted_value = std::bit_cast<AvgRttFlagType>(value);
2526
return flag_manager.set_flag(packet_avg_rtt_label, casted_value);
2627
}
2728

28-
[[nodiscard]] inline utils::StrExpected<TimeNs> get_avg_rtt_label(const BaseFlagManager& flag_manager) {
29+
[[nodiscard]] inline utils::StrExpected<TimeNs> get_avg_rtt_label(
30+
const BaseFlagManager& flag_manager) {
2931
auto exp_flag = flag_manager.get_flag(packet_avg_rtt_label);
3032
if (!exp_flag.has_value()) {
3133
return std::unexpected(exp_flag.error());

source/utils/flag_manager.hpp

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,12 @@ class FlagManager {
6363
return true;
6464
}
6565

66-
[[nodiscard]] std::expected<void, std::string> set_flag(FlagId id, BitStorage value) {
66+
[[nodiscard]] std::expected<void, std::string> set_flag(FlagId id,
67+
BitStorage value) {
6768
auto it = m_flag_manager.find(id);
6869
if (it == m_flag_manager.end()) {
69-
return std::unexpected(fmt::format("Flag with id '{}' was not registred.", id));
70+
return std::unexpected(
71+
fmt::format("Flag with id '{}' was not registred.", id));
7072
}
7173

7274
FlagInfo& info = it->second;
@@ -78,18 +80,18 @@ class FlagManager {
7880
[[nodiscard]] utils::StrExpected<BitStorage> get_flag(FlagId id) const {
7981
auto it = m_flag_manager.find(id);
8082
if (it == m_flag_manager.end()) {
81-
return std::unexpected(fmt::format("Flag with id '{}' was not registred.", id));
83+
return std::unexpected(
84+
fmt::format("Flag with id '{}' was not registred.", id));
8285
}
8386
const FlagInfo& info = it->second;
8487
if (!info.is_set) {
85-
return std::unexpected(fmt::format("Flag with id '{}' was not set.", id));
88+
return std::unexpected(
89+
fmt::format("Flag with id '{}' was not set.", id));
8690
}
8791
return m_bits.get_range(info.start, info.start + info.length - 1);
8892
}
8993

90-
BitSet<BitStorage> get_bit_storage() const {
91-
return m_bits;
92-
}
94+
BitSet<BitStorage> get_bit_storage() const { return m_bits; }
9395

9496
void reset() {
9597
m_next_pos = 0;

0 commit comments

Comments
 (0)