generated from eclipse-score/module_template
-
Notifications
You must be signed in to change notification settings - Fork 10
log: add Rust log init for C++ #38
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.
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
arkjedrz
wants to merge
1
commit into
eclipse-score:main
Choose a base branch
from
qorix-group:arkjedrz_score-log-init
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+354
−0
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| # ******************************************************************************* | ||
| # Copyright (c) 2025 Contributors to the Eclipse Foundation | ||
| # | ||
| # See the NOTICE file(s) distributed with this work for additional | ||
| # information regarding copyright ownership. | ||
| # | ||
| # This program and the accompanying materials are made available under the | ||
| # terms of the Apache License Version 2.0 which is available at | ||
| # https://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
| # ******************************************************************************* | ||
|
|
||
| load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library") | ||
| load("@rules_rust//rust:defs.bzl", "rust_static_library") | ||
|
|
||
| rust_static_library( | ||
| name = "ffi", | ||
| srcs = ["ffi.rs"], | ||
| edition = "2021", | ||
| visibility = ["//visibility:private"], | ||
| deps = [ | ||
| "//score/mw/log/rust/score_log_bridge", | ||
| ], | ||
| ) | ||
|
|
||
| cc_library( | ||
| name = "score_log_bridge_cpp_init", | ||
| srcs = ["score_log_bridge_init.cpp"], | ||
| hdrs = ["score_log_bridge_init.h"], | ||
| include_prefix = "score/mw/log/rust", | ||
| visibility = ["//visibility:public"], | ||
| deps = [ | ||
| ":ffi", | ||
| # Link dependency required by `:ffi`. | ||
| "//score/mw/log/detail/common:recorder_factory", | ||
| ], | ||
| ) | ||
|
|
||
| # Example consists of Rust library, C++ library, C++ application. | ||
|
|
||
| rust_static_library( | ||
| name = "example_lib", | ||
| srcs = ["examples/example_lib.rs"], | ||
| edition = "2021", | ||
| visibility = ["//visibility:private"], | ||
| deps = [ | ||
| "//score/mw/log/rust/score_log_bridge", | ||
| "@score_baselibs_rust//src/log/score_log", | ||
| ], | ||
| ) | ||
|
|
||
| cc_binary( | ||
| name = "example", | ||
| srcs = ["examples/main.cpp"], | ||
| linkopts = select({ | ||
| "@platforms//os:qnx": [ | ||
| "-lsocket", | ||
| ], | ||
| "//conditions:default": [], | ||
| }), | ||
| visibility = ["//visibility:public"], | ||
| deps = [ | ||
| ":example_lib", | ||
| ":score_log_bridge_cpp_init", | ||
| ], | ||
| ) |
75 changes: 75 additions & 0 deletions
75
score/mw/log/rust/score_log_bridge_cpp_init/examples/example_lib.rs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| // | ||
| // Copyright (c) 2025 Contributors to the Eclipse Foundation | ||
| // | ||
| // See the NOTICE file(s) distributed with this work for additional | ||
| // information regarding copyright ownership. | ||
| // | ||
| // This program and the accompanying materials are made available under the | ||
| // terms of the Apache License Version 2.0 which is available at | ||
| // <https://www.apache.org/licenses/LICENSE-2.0> | ||
| // | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // | ||
|
|
||
| //! Module contains functions printing example logs. | ||
| //! Based on `//score/mw/log/rust/score_log_bridge:example`. | ||
|
|
||
| use score_log::{debug, error, fatal, info, trace, warn, Log}; | ||
| use score_log_bridge::ScoreLoggerBuilder; | ||
|
|
||
| /// Show example logs. | ||
| #[no_mangle] | ||
| extern "C" fn show_logs() { | ||
| // Regular log usage. | ||
| trace!("This is a trace log - hidden"); | ||
| debug!("This is a debug log - hidden"); | ||
| info!("This is an info log"); | ||
| warn!("This is a warn log"); | ||
| error!("This is an error log"); | ||
| fatal!("This is a fatal log"); | ||
|
|
||
| // Log with modified context. | ||
| trace!(context: "EX1", "This is a trace log - hidden"); | ||
| debug!(context: "EX1", "This is a debug log - hidden"); | ||
| info!(context: "EX1", "This is an info log"); | ||
| warn!(context: "EX1", "This is a warn log"); | ||
| error!(context: "EX1", "This is an error log"); | ||
| fatal!(context: "EX1", "This is a fatal log"); | ||
|
|
||
| // Log with numeric values. | ||
| let x1 = 123.4; | ||
| let x2 = 111; | ||
| let x3 = true; | ||
| let x4 = -0x3Fi8; | ||
| error!( | ||
| "This is an error log with numeric values: {} {} {} {:x}", | ||
| x1, x2, x3, x4, | ||
| ); | ||
|
|
||
| // Use logger instance with modified context. | ||
| let logger = ScoreLoggerBuilder::new() | ||
| .context("ALFA") | ||
| .show_module(false) | ||
| .show_file(true) | ||
| .show_line(false) | ||
| .build(); | ||
|
|
||
| // Log with provided logger. | ||
| trace!( | ||
| logger: logger, | ||
| "This is a trace log - hidden" | ||
| ); | ||
| debug!(logger: logger, "This is a debug log - hidden"); | ||
| info!(logger: logger, "This is an info log"); | ||
| warn!(logger: logger, "This is a warn log"); | ||
| error!(logger: logger, "This is an error log"); | ||
| fatal!(logger: logger, "This is an fatal log"); | ||
|
|
||
| // Log with provided logger and modified context. | ||
| trace!(logger: logger, context: "EX2", "This is a trace log - hidden"); | ||
| debug!(logger: logger, context: "EX2", "This is a debug log - hidden"); | ||
| info!(logger: logger, context: "EX2", "This is an info log"); | ||
| warn!(logger: logger, context: "EX2", "This is a warn log"); | ||
| error!(logger: logger, context: "EX2", "This is an error log"); | ||
| fatal!(logger: logger, context: "EX2", "This is an fatal log"); | ||
| } |
30 changes: 30 additions & 0 deletions
30
score/mw/log/rust/score_log_bridge_cpp_init/examples/main.cpp
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| /******************************************************************************** | ||
| * Copyright (c) 2025 Contributors to the Eclipse Foundation | ||
| * | ||
| * See the NOTICE file(s) distributed with this work for additional | ||
| * information regarding copyright ownership. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Apache License Version 2.0 which is available at | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| ********************************************************************************/ | ||
|
|
||
| #include "score/mw/log/rust/score_log_bridge_init.h" | ||
|
|
||
| extern "C" { | ||
| void show_logs(); | ||
| } | ||
|
|
||
| int main() | ||
| { | ||
| using namespace score::mw::log::rust; | ||
|
|
||
| ScoreLoggerBuilder builder; | ||
| builder.Context("ABCD").ShowModule(true).ShowFile(true).ShowLine(true).SetAsDefaultLogger(); | ||
|
|
||
| show_logs(); | ||
|
|
||
| return 0; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| // | ||
| // Copyright (c) 2025 Contributors to the Eclipse Foundation | ||
| // | ||
| // See the NOTICE file(s) distributed with this work for additional | ||
| // information regarding copyright ownership. | ||
| // | ||
| // This program and the accompanying materials are made available under the | ||
| // terms of the Apache License Version 2.0 which is available at | ||
| // <https://www.apache.org/licenses/LICENSE-2.0> | ||
| // | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // | ||
|
|
||
| use core::ffi::c_char; | ||
| use core::slice::from_raw_parts; | ||
| use score_log_bridge::ScoreLoggerBuilder; | ||
|
|
||
| #[no_mangle] | ||
| extern "C" fn set_default_logger( | ||
| context_ptr: *const c_char, | ||
| context_size: usize, | ||
| show_module: *const bool, | ||
| show_file: *const bool, | ||
| show_line: *const bool, | ||
| ) { | ||
| let mut builder = ScoreLoggerBuilder::new(); | ||
|
|
||
| // Set parameters if non-null (option-like). | ||
| if !context_ptr.is_null() { | ||
| let context = unsafe { | ||
| let slice = from_raw_parts(context_ptr.cast(), context_size); | ||
| str::from_utf8(slice).expect("provided context is not a valid UTF-8 string") | ||
| }; | ||
| builder = builder.context(context); | ||
| } | ||
|
|
||
| if !show_module.is_null() { | ||
| builder = builder.show_module(unsafe { *show_module }); | ||
| } | ||
|
|
||
| if !show_file.is_null() { | ||
| builder = builder.show_file(unsafe { *show_file }); | ||
| } | ||
|
|
||
| if !show_line.is_null() { | ||
| builder = builder.show_line(unsafe { *show_line }); | ||
| } | ||
|
|
||
| builder.set_as_default_logger(); | ||
| } |
67 changes: 67 additions & 0 deletions
67
score/mw/log/rust/score_log_bridge_cpp_init/score_log_bridge_init.cpp
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| /******************************************************************************** | ||
| * Copyright (c) 2025 Contributors to the Eclipse Foundation | ||
| * | ||
| * See the NOTICE file(s) distributed with this work for additional | ||
| * information regarding copyright ownership. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Apache License Version 2.0 which is available at | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| ********************************************************************************/ | ||
|
|
||
| #include "score_log_bridge_init.h" | ||
|
|
||
| extern "C" void set_default_logger(const char* context_ptr, | ||
| size_t context_size, | ||
| const bool* show_module, | ||
| const bool* show_file, | ||
| const bool* show_line); | ||
|
|
||
| namespace score::mw::log::rust | ||
| { | ||
|
|
||
| ScoreLoggerBuilder& ScoreLoggerBuilder::Context(const std::string& context) noexcept | ||
| { | ||
| context_ = context; | ||
| return *this; | ||
| } | ||
|
|
||
| ScoreLoggerBuilder& ScoreLoggerBuilder::ShowModule(bool show_module) noexcept | ||
| { | ||
| show_module_ = show_module; | ||
| return *this; | ||
| } | ||
|
|
||
| ScoreLoggerBuilder& ScoreLoggerBuilder::ShowFile(bool show_file) noexcept | ||
| { | ||
| show_file_ = show_file; | ||
| return *this; | ||
| } | ||
|
|
||
| ScoreLoggerBuilder& ScoreLoggerBuilder::ShowLine(bool show_line) noexcept | ||
| { | ||
| show_line_ = show_line; | ||
| return *this; | ||
| } | ||
|
|
||
| void ScoreLoggerBuilder::SetAsDefaultLogger() noexcept | ||
| { | ||
| const char* context_ptr{nullptr}; | ||
| size_t context_size{0}; | ||
| if (context_) | ||
| { | ||
| auto value{context_.value()}; | ||
| context_ptr = value.c_str(); | ||
| context_size = value.size(); | ||
| } | ||
|
|
||
| const bool* show_module{show_module_ ? &show_module_.value() : nullptr}; | ||
| const bool* show_file{show_file_ ? &show_file_.value() : nullptr}; | ||
| const bool* show_line{show_line_ ? &show_line_.value() : nullptr}; | ||
|
|
||
| set_default_logger(context_ptr, context_size, show_module, show_file, show_line); | ||
| } | ||
|
|
||
| } // namespace score::mw::log::rust |
65 changes: 65 additions & 0 deletions
65
score/mw/log/rust/score_log_bridge_cpp_init/score_log_bridge_init.h
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| /******************************************************************************** | ||
| * Copyright (c) 2025 Contributors to the Eclipse Foundation | ||
| * | ||
| * See the NOTICE file(s) distributed with this work for additional | ||
| * information regarding copyright ownership. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Apache License Version 2.0 which is available at | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| ********************************************************************************/ | ||
|
|
||
| #pragma once | ||
|
|
||
| #include <optional> | ||
| #include <string> | ||
|
|
||
| namespace score::mw::log::rust | ||
| { | ||
|
|
||
| /// @brief | ||
| /// Builder for logger used by Rust libraries. | ||
| /// | ||
| /// @note | ||
| /// If parameter is not set explicitly then Rust-side default is used. | ||
| /// Only global logger setup is allowed. | ||
| /// `config` method is not exposed. | ||
| class ScoreLoggerBuilder final | ||
| { | ||
| public: | ||
| /// @brief Set context for the logger. | ||
| /// @param context | ||
| /// Context name. | ||
| /// Only ASCII characters are allowed. | ||
| /// Max 4 characters are used. Rest of the provided string will be trimmed. | ||
| /// @return This builder. | ||
| ScoreLoggerBuilder& Context(const std::string& context) noexcept; | ||
|
|
||
| /// @brief Show module name in logs. | ||
| /// @param show_module Value to set. | ||
| /// @return This builder. | ||
| ScoreLoggerBuilder& ShowModule(bool show_module) noexcept; | ||
|
|
||
| /// @brief Show file name in logs. | ||
| /// @param show_module Value to set. | ||
| /// @return This builder. | ||
| ScoreLoggerBuilder& ShowFile(bool show_file) noexcept; | ||
|
|
||
| /// @brief Show line number in logs. | ||
| /// @param show_module Value to set. | ||
| /// @return This builder. | ||
| ScoreLoggerBuilder& ShowLine(bool show_line) noexcept; | ||
|
|
||
| /// @brief Initialize default logger with provided parameters. | ||
| void SetAsDefaultLogger() noexcept; | ||
|
|
||
| private: | ||
| std::optional<std::string> context_; | ||
| std::optional<bool> show_module_; | ||
| std::optional<bool> show_file_; | ||
| std::optional<bool> show_line_; | ||
| }; | ||
|
|
||
| } // namespace score::mw::log::rust | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.