Fix formatting, copyrights

pawelrutkaq · pawelrutkaq · commit b9c92b8445bc · 2026-01-22T15:25:04.000+01:00
diff --git a/.clang-format b/.clang-format
@@ -1,4 +1,3 @@
----
 BasedOnStyle: Google
 AccessModifierOffset: -2
 AllowAllParametersOfDeclarationOnNextLine: false
@@ -47,4 +46,3 @@ CommentPragmas: '^.*A2Lfactory:'
 # Make sure language specific settings are below the generic settings to be compatible to all languages.
 Language: Cpp
 Standard: c++17
-...
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -105,22 +105,19 @@ use_repo(toolchains_qnx, "toolchains_qnx_ifs")
 
 bazel_dep(name = "score_baselibs_rust", version = "0.0.3")
 bazel_dep(name = "score_baselibs", version = "0.2.2")
-
-git_override(
-    module_name = "score_baselibs",
-    commit = "9925dba1fd2ca7f2d33300cd2c01e6af022024cd",
-    remote = "https://github.com/eclipse-score/baselibs.git",
-)
+# git_override(
+#     module_name = "score_baselibs",
+#     commit = "9925dba1fd2ca7f2d33300cd2c01e6af022024cd",
+#     remote = "https://github.com/eclipse-score/baselibs.git",
+# )
 
 # Hedron's Compile Commands Extractor for Bazel
 # https://github.com/hedronvision/bazel-compile-commands-extractor
 bazel_dep(name = "hedron_compile_commands", dev_dependency = True)
 git_override(
     module_name = "hedron_compile_commands",
-    remote = "https://github.com/hedronvision/bazel-compile-commands-extractor.git",
     commit = "0e990032f3c5a866e72615cf67e5ce22186dcb97",
+    remote = "https://github.com/hedronvision/bazel-compile-commands-extractor.git",
     # Replace the commit hash (above) with the latest (https://github.com/hedronvision/bazel-compile-commands-extractor/commits/main).
     # Even better, set up Renovate and let it do the work for you (see "Suggestion: Updates" in the README).
 )
-
-
diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
diff --git a/src/health_monitoring_lib/BUILD b/src/health_monitoring_lib/BUILD
@@ -11,7 +11,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # *******************************************************************************
 
-load("@rules_rust//rust:defs.bzl", "rust_library", "rust_test", "rust_static_library")
+load("@rules_rust//rust:defs.bzl", "rust_library", "rust_static_library", "rust_test")
 load("@score_baselibs//:bazel/unit_tests.bzl", "cc_gtest_unit_test", "cc_unit_test_suites_for_host_and_qnx")
 
 rust_library(
@@ -27,7 +27,6 @@ rust_library(
     ],
 )
 
-
 rust_static_library(
     name = "health_monitoring_lib_ffi",
     srcs = glob(["src/**/*.rs"]),
@@ -52,26 +51,25 @@ rust_test(
 cc_library(
     name = "health_monitoring_lib_cc",
     srcs = [
-        "cpp/deadline/deadline_monitor.cpp",
-        "cpp/health_monitor.cpp",
         "cpp/common.cpp",
+        "cpp/deadline/deadline_monitor.cpp",
         "cpp/ffi_helpers.h",
-        ],
+        "cpp/health_monitor.cpp",
+    ],
     hdrs = [
-        "cpp/include/score/hm/deadline/deadline_monitor.h",
         "cpp/include/score/hm/common.h",
-        "cpp/include/score/hm/health_monitor.h"
-    
+        "cpp/include/score/hm/deadline/deadline_monitor.h",
+        "cpp/include/score/hm/health_monitor.h",
+    ],
+    copts = [
+        "-Isrc/health_monitoring_lib/cpp",  # private include path
     ],
-    visibility = ["//visibility:public"],
     strip_include_prefix = "cpp/include",
+    visibility = ["//visibility:public"],
     deps = [
         ":health_monitoring_lib_ffi",
         "@score_baselibs//score/result",
     ],
-    copts = [
-        "-Isrc/health_monitoring_lib/cpp",      # private include path
-    ],
 )
 
 cc_gtest_unit_test(
@@ -82,4 +80,4 @@ cc_gtest_unit_test(
     deps = [
         ":health_monitoring_lib_cc",
     ],
-)
+)
diff --git a/src/health_monitoring_lib/cpp/common.cpp b/src/health_monitoring_lib/cpp/common.cpp
@@ -1,3 +1,15 @@
+/********************************************************************************
+ * Copyright (c) 2026 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/hm/common.h>
 
 namespace score::hm::internal
diff --git a/src/health_monitoring_lib/cpp/deadline/deadline_monitor.cpp b/src/health_monitoring_lib/cpp/deadline/deadline_monitor.cpp
@@ -1,3 +1,15 @@
+/********************************************************************************
+ * Copyright (c) 2026 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/hm/deadline/deadline_monitor.h"
 #include "ffi_helpers.h"
 
diff --git a/src/health_monitoring_lib/cpp/ffi_helpers.h b/src/health_monitoring_lib/cpp/ffi_helpers.h
@@ -1,3 +1,15 @@
+/********************************************************************************
+ * Copyright (c) 2026 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
+ ********************************************************************************/
 #ifndef SCORE_HM_FFI_HELPERS_HPP
 #define SCORE_HM_FFI_HELPERS_HPP
 
diff --git a/src/health_monitoring_lib/cpp/health_monitor.cpp b/src/health_monitoring_lib/cpp/health_monitor.cpp
@@ -1,3 +1,15 @@
+/********************************************************************************
+ * Copyright (c) 2026 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/hm/health_monitor.h"
 
 extern "C" {
diff --git a/src/health_monitoring_lib/cpp/include/score/hm/common.h b/src/health_monitoring_lib/cpp/include/score/hm/common.h
@@ -1,3 +1,15 @@
+/********************************************************************************
+ * Copyright (c) 2026 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
+ ********************************************************************************/
 #ifndef SCORE_HM_COMMON_H
 #define SCORE_HM_COMMON_H
 
diff --git a/src/health_monitoring_lib/cpp/include/score/hm/deadline/deadline_monitor.h b/src/health_monitoring_lib/cpp/include/score/hm/deadline/deadline_monitor.h
@@ -1,3 +1,15 @@
+/********************************************************************************
+ * Copyright (c) 2026 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
+ ********************************************************************************/
 #ifndef SCORE_HM_DEADLINE_DEADLINE_MONITOR_H
 #define SCORE_HM_DEADLINE_DEADLINE_MONITOR_H
 
diff --git a/src/health_monitoring_lib/cpp/include/score/hm/health_monitor.h b/src/health_monitoring_lib/cpp/include/score/hm/health_monitor.h
@@ -1,3 +1,15 @@
+/********************************************************************************
+ * Copyright (c) 2026 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
+ ********************************************************************************/
 #ifndef SCORE_HM_HEALTH_MONITOR_H
 #define SCORE_HM_HEALTH_MONITOR_H
 
diff --git a/src/health_monitoring_lib/cpp/tests/health_monitor_test.cpp b/src/health_monitoring_lib/cpp/tests/health_monitor_test.cpp
@@ -1,3 +1,15 @@
+/********************************************************************************
+ * Copyright (c) 2026 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/hm/health_monitor.h"
 #include "score/hm/common.h"
 
diff --git a/src/health_monitoring_lib/src/common.rs b/src/health_monitoring_lib/src/common.rs
@@ -11,21 +11,37 @@
 // SPDX-License-Identifier: Apache-2.0
 // *******************************************************************************
 
+use core::hash::Hash;
 use core::time::Duration;
 
 /// Unique identifier for deadlines.
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
+#[derive(Clone, Copy, Debug, Eq)]
 #[repr(C)]
 pub struct IdentTag {
     data: *const u8,
     len: usize,
 } // Internal representation as a leaked string slice for now. It can be also an str to u64 conversion. Since this is internal only, we can change it later if needed.
 
+// Safety below for `from_raw_parts` -> Data was constructed from valid str
+impl Hash for IdentTag {
+    fn hash<H: core::hash::Hasher>(&self, state: &mut H) {
+        let bytes = unsafe { core::slice::from_raw_parts(self.data, self.len) };
+        bytes.hash(state);
+    }
+}
+impl PartialEq for IdentTag {
+    fn eq(&self, other: &Self) -> bool {
+        let self_bytes = unsafe { core::slice::from_raw_parts(self.data, self.len) };
+        let other_bytes = unsafe { core::slice::from_raw_parts(other.data, other.len) };
+        self_bytes == other_bytes
+    }
+}
+
 impl crate::log::ScoreDebug for IdentTag {
     fn fmt(&self, f: crate::log::Writer, spec: &crate::log::FormatSpec) -> Result<(), crate::log::Error> {
         let bytes = unsafe { core::slice::from_raw_parts(self.data, self.len) };
         crate::log::DebugStruct::new(f, spec, "IdentTag")
-            .field("data", &bytes)
+            .field("data", unsafe { &core::str::from_utf8_unchecked(bytes) }) // Safety: The underlying data was created out of valid str
             .finish()
     }
 }
diff --git a/src/health_monitoring_lib/src/deadline/ffi.rs b/src/health_monitoring_lib/src/deadline/ffi.rs
@@ -1,3 +1,15 @@
+// *******************************************************************************
+// Copyright (c) 2026 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 crate::common::ffi::*;
 use crate::deadline::deadline_monitor::Deadline;
 use crate::deadline::*;
diff --git a/src/health_monitoring_lib/src/ffi.rs b/src/health_monitoring_lib/src/ffi.rs
@@ -1,3 +1,15 @@
+// *******************************************************************************
+// Copyright (c) 2026 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 crate::common::ffi::*;
 use crate::deadline::ffi::DeadlineMonitorCpp;
 use crate::*;
