Skip to content

Refactor route tunnel compile #312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TheRandomCharacter wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Refactor route tunnel compile #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
22df1b4
Separate route_tunnel request creation for each socket
Mar 19, 2025
56bf131
Add log error when truncating route_tunnel request size
Mar 19, 2025
d3542bc
Replace manual looping with accumulate
Mar 19, 2025
ba22f64
Separate route tunnel default request creation
Mar 19, 2025
b5d8589
Replace if chain with variant visitor
Mar 19, 2025
9aa2914
Append requests without lambdas
Mar 19, 2025
dd56283
Split filling request_interface from per socket requests
Mar 20, 2025
76b4cf1
Split tunnel_value compilation logic to a lambda
Mar 20, 2025
e23bd7d
Replace some tuples with structs
Sep 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions common/type.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1998,6 +1998,23 @@ enum class eNexthopType : unsigned int
repeat,
};

inline std::string InterfaceName(eNexthopType nh)
{
switch (nh)
{
case eNexthopType::controlPlane:
return "linux";
case eNexthopType::repeat:
return "repeat";
default:
#if __cpp_exceptions
throw std::invalid_argument{"No valid conversion from eNexthopType to interface name string"};
#else
std::exit(EXIT_FAILURE);
#endif
}
}

enum class eFlowType : uint8_t
{
drop,
Expand Down
10 changes: 10 additions & 0 deletions common/utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,5 +169,15 @@ class Job
}
};

// helper type for the variant visitor
template<class... Ts>
struct Visitor : Ts...
{
using Ts::operator()...;
};
// explicit deduction guide (not needed as of C++20)
template<class... Ts>
Visitor(Ts...) -> Visitor<Ts...>;

}
// namespace utils
30 changes: 19 additions & 11 deletions common/weight.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,19 @@ class weight_t
}

public:
std::tuple<uint32_t, uint32_t, bool> insert(const std::vector<uint32_t>& weights)
struct Range
{
uint32_t start;
uint32_t size;
};

struct InsertResult
{
Range range;
bool is_fallback;
};

InsertResult insert(const std::vector<uint32_t>& weights)
{
/// @todo: check weights.size()

Expand All @@ -38,11 +50,7 @@ class weight_t
}
else
{
uint32_t weight_total = 0;
for (const auto& weight : weights)
{
weight_total += weight;
}
uint32_t weight_total = std::accumulate(weights.begin(), weights.end(), uint32_t{});
if (size + weight_total > size_T)
{
YANET_LOG_WARNING("not enough weights\n");
Expand All @@ -55,9 +63,9 @@ class weight_t
return {0, std::min((uint32_t)weights.size(), (uint32_t)256), true}; ///< fallback
}

auto& [range_start, range_size] = ranges[*id];
Range& range = ranges[*id];

range_start = size;
range.start = size;

index_type_T item_i = 0;
for (const auto& weight : weights)
Expand All @@ -68,10 +76,10 @@ class weight_t
size += weight;
}

range_size = size - range_start;
range.size = size - range.start;
}

return std::tuple_cat(ranges[values.get_id(weights)], std::make_tuple(false));
return {ranges[values.get_id(weights)], false};
}

void clear()
Expand Down Expand Up @@ -108,7 +116,7 @@ class weight_t
values;

std::map<uint64_t, ///< refarray_t::id_t
std::tuple<uint32_t, uint32_t>>
Range>
ranges;

mutable std::vector<index_type_T> base;
Expand Down
Loading