Skip to content

🎨 Remove inlining attributes from logging functions #691

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

Merged
merged 1 commit into from
Feb 19, 2025
Merged

🎨 Remove inlining attributes from logging functions #691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions include/log/catalog/mipi_builder.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ template <typename> struct builder;

template <> struct builder<defn::short32_msg_t> {
template <auto Level, std::same_as<std::uint32_t>... Ts>
ALWAYS_INLINE static auto build(string_id id, module_id, Ts...) {
static auto build(string_id id, module_id, Ts...) {
using namespace msg;
return owning<defn::short32_msg_t>{"payload"_field = id};
}
};

template <typename Storage> struct catalog_builder {
template <auto Level, std::same_as<std::uint32_t>... Ts>
ALWAYS_INLINE static auto build(string_id id, module_id m, Ts... msg_data) {
static auto build(string_id id, module_id m, Ts... msg_data) {
using namespace msg;
defn::catalog_msg_t::owner_t<Storage> message{"severity"_field = Level,
"module_id"_field = m};
Expand All @@ -48,7 +48,7 @@ template <typename Storage>
requires std::same_as<typename Storage::value_type, std::uint32_t>
struct catalog_builder<Storage> {
template <auto Level, std::same_as<std::uint32_t>... Ts>
ALWAYS_INLINE static auto build(string_id id, module_id m, Ts... msg_data) {
static auto build(string_id id, module_id m, Ts... msg_data) {
using namespace msg;
defn::catalog_msg_t::owner_t<Storage> message{"severity"_field = Level,
"module_id"_field = m};
Expand All @@ -65,7 +65,7 @@ struct catalog_builder<Storage> {

template <> struct builder<defn::catalog_msg_t> {
template <auto Level, std::same_as<std::uint32_t>... Ts>
ALWAYS_INLINE static auto build(string_id id, module_id m, Ts... msg_data) {
static auto build(string_id id, module_id m, Ts... msg_data) {
using namespace msg;
if constexpr (sizeof...(Ts) <= 2u) {
constexpr auto header_size =
Expand All @@ -89,7 +89,7 @@ template <> struct builder<defn::catalog_msg_t> {

struct default_builder {
template <auto Level, std::same_as<std::uint32_t>... Ts>
ALWAYS_INLINE static auto build(string_id id, module_id m, Ts... msg_data) {
static auto build(string_id id, module_id m, Ts... msg_data) {
if constexpr (sizeof...(Ts) == 0u) {
return builder<defn::short32_msg_t>{}.template build<Level>(
id, m, msg_data...);
Expand Down
10 changes: 4 additions & 6 deletions include/log/catalog/mipi_encoder.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,11 @@ template <typename TDestinations> struct log_handler {

template <typename Env, typename FilenameStringType,
typename LineNumberType, typename MsgType>
ALWAYS_INLINE auto log(FilenameStringType, LineNumberType,
MsgType const &msg) -> void {
auto log(FilenameStringType, LineNumberType, MsgType const &msg) -> void {
log_msg<Env>(msg);
}

template <typename Env, typename Msg>
ALWAYS_INLINE auto log_msg(Msg msg) -> void {
template <typename Env, typename Msg> auto log_msg(Msg msg) -> void {
msg.apply([&]<typename S, typename... Args>(S, Args... args) {
constexpr auto L = stdx::to_underlying(get_level(Env{}).value);
using Message = decltype(detail::to_message<S, Args...>());
Expand Down Expand Up @@ -93,7 +91,7 @@ template <typename TDestinations> struct log_handler {

private:
template <std::size_t N>
NEVER_INLINE auto write(stdx::span<std::uint8_t const, N> msg) -> void {
auto write(stdx::span<std::uint8_t const, N> msg) -> void {
stdx::for_each(
[&]<typename Dest>(Dest &dest) {
conc::call_in_critical_section<Dest>(
Expand All @@ -103,7 +101,7 @@ template <typename TDestinations> struct log_handler {
}

template <std::size_t N>
NEVER_INLINE auto write(stdx::span<std::uint32_t const, N> msg) -> void {
auto write(stdx::span<std::uint32_t const, N> msg) -> void {
[&]<std::size_t... Is>(std::index_sequence<Is...>) {
stdx::for_each(
[&]<typename Dest>(Dest &dest) {
Expand Down
7 changes: 3 additions & 4 deletions include/log/log.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ struct config {
template <typename...> inline auto config = null::config{};

template <typename Env, typename... Ts>
ALWAYS_INLINE constexpr static auto get_config() -> auto & {
constexpr static auto get_config() -> auto & {
using flavor_t = typename decltype(get_flavor(Env{}).value)::type;
if constexpr (std::same_as<flavor_t, default_flavor_t>) {
return config<Ts...>;
Expand All @@ -49,7 +49,7 @@ ALWAYS_INLINE constexpr static auto get_config() -> auto & {
}

template <typename Env, typename... Ts, typename... TArgs>
ALWAYS_INLINE static auto log(TArgs &&...args) -> void {
static auto log(TArgs &&...args) -> void {
auto &cfg = get_config<Env, Ts...>();
cfg.logger.template log<Env>(std::forward<TArgs>(args)...);
}
Expand Down Expand Up @@ -89,8 +89,7 @@ ALWAYS_INLINE static auto log(TArgs &&...args) -> void {
((expr) ? void(0) : CIB_FATAL("Assertion failure: " #expr))

namespace logging {
template <typename Env, typename... Ts>
ALWAYS_INLINE static auto log_version() -> void {
template <typename Env, typename... Ts> static auto log_version() -> void {
auto &l_cfg = get_config<Env, Ts...>();
auto &v_cfg = ::version::config<Ts...>;
if constexpr (requires {
Expand Down
Loading