Merge pull request #108 from qorix-group/arkjedrz_global-fixes

pawelrutkaq · web-flow · commit 419588e60bcd · 2026-03-06T07:09:31.000Z
hmon: global fixes to HMON
diff --git a/src/health_monitoring_lib/cpp/include/score/hm/common.h b/src/health_monitoring_lib/cpp/include/score/hm/common.h
@@ -44,7 +44,7 @@ class RustDroppable
     /// Marks object as no longer managed by C++ side, releasing handle to be passed to Rust side for dropping
     std::optional<FFIHandle> drop_by_rust()
     {
-        return static_cast<T*>(this)->__drop_by_rust_impl();
+        return static_cast<T*>(this)->_drop_by_rust_impl();
     }
 };
 
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
@@ -51,7 +51,7 @@ class DeadlineMonitorBuilder final : public internal::RustDroppable<DeadlineMoni
     DeadlineMonitorBuilder add_deadline(const DeadlineTag& deadline_tag, const TimeRange& range) &&;
 
   protected:
-    std::optional<internal::FFIHandle> __drop_by_rust_impl()
+    std::optional<internal::FFIHandle> _drop_by_rust_impl()
     {
         return monitor_builder_handler_.drop_by_rust();
     }
diff --git a/src/health_monitoring_lib/rust/deadline/ffi.rs b/src/health_monitoring_lib/rust/deadline/ffi.rs
@@ -40,7 +40,7 @@ impl DeadlineMonitorCpp {
     }
 }
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub extern "C" fn deadline_monitor_builder_create(deadline_monitor_builder_handle_out: *mut FFIHandle) -> FFICode {
     if deadline_monitor_builder_handle_out.is_null() {
         return FFICode::NullParameter;
@@ -54,7 +54,7 @@ pub extern "C" fn deadline_monitor_builder_create(deadline_monitor_builder_handl
     FFICode::Success
 }
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub extern "C" fn deadline_monitor_builder_destroy(deadline_monitor_builder_handle: FFIHandle) -> FFICode {
     if deadline_monitor_builder_handle.is_null() {
         return FFICode::NullParameter;
@@ -70,7 +70,7 @@ pub extern "C" fn deadline_monitor_builder_destroy(deadline_monitor_builder_hand
     FFICode::Success
 }
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub extern "C" fn deadline_monitor_builder_add_deadline(
     deadline_monitor_builder_handle: FFIHandle,
     deadline_tag: *const DeadlineTag,
@@ -108,7 +108,7 @@ pub extern "C" fn deadline_monitor_builder_add_deadline(
     FFICode::Success
 }
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub extern "C" fn deadline_monitor_get_deadline(
     deadline_monitor_handle: FFIHandle,
     deadline_tag: *const DeadlineTag,
@@ -141,7 +141,7 @@ pub extern "C" fn deadline_monitor_get_deadline(
     }
 }
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub extern "C" fn deadline_monitor_destroy(deadline_monitor_handle: FFIHandle) -> FFICode {
     if deadline_monitor_handle.is_null() {
         return FFICode::NullParameter;
@@ -157,7 +157,7 @@ pub extern "C" fn deadline_monitor_destroy(deadline_monitor_handle: FFIHandle) -
     FFICode::Success
 }
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub extern "C" fn deadline_start(deadline_handle: FFIHandle) -> FFICode {
     if deadline_handle.is_null() {
         return FFICode::NullParameter;
@@ -176,7 +176,7 @@ pub extern "C" fn deadline_start(deadline_handle: FFIHandle) -> FFICode {
     }
 }
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub extern "C" fn deadline_stop(deadline_handle: FFIHandle) -> FFICode {
     if deadline_handle.is_null() {
         return FFICode::NullParameter;
@@ -193,7 +193,7 @@ pub extern "C" fn deadline_stop(deadline_handle: FFIHandle) -> FFICode {
     FFICode::Success
 }
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub extern "C" fn deadline_destroy(deadline_handle: FFIHandle) -> FFICode {
     if deadline_handle.is_null() {
         return FFICode::NullParameter;
diff --git a/src/health_monitoring_lib/rust/ffi.rs b/src/health_monitoring_lib/rust/ffi.rs
@@ -73,7 +73,7 @@ impl<T: DerefMut> DerefMut for FFIBorrowed<T> {
     }
 }
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub extern "C" fn health_monitor_builder_create(health_monitor_builder_handle_out: *mut FFIHandle) -> FFICode {
     if health_monitor_builder_handle_out.is_null() {
         return FFICode::NullParameter;
@@ -87,7 +87,7 @@ pub extern "C" fn health_monitor_builder_create(health_monitor_builder_handle_ou
     FFICode::Success
 }
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub extern "C" fn health_monitor_builder_destroy(health_monitor_builder_handle: FFIHandle) -> FFICode {
     if health_monitor_builder_handle.is_null() {
         return FFICode::NullParameter;
@@ -104,7 +104,7 @@ pub extern "C" fn health_monitor_builder_destroy(health_monitor_builder_handle:
     FFICode::Success
 }
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub extern "C" fn health_monitor_builder_build(
     health_monitor_builder_handle: FFIHandle,
     supervisor_cycle_ms: u32,
@@ -137,7 +137,7 @@ pub extern "C" fn health_monitor_builder_build(
     }
 }
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub extern "C" fn health_monitor_builder_add_deadline_monitor(
     health_monitor_builder_handle: FFIHandle,
     monitor_tag: *const MonitorTag,
@@ -171,7 +171,7 @@ pub extern "C" fn health_monitor_builder_add_deadline_monitor(
     FFICode::Success
 }
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub extern "C" fn health_monitor_get_deadline_monitor(
     health_monitor_handle: FFIHandle,
     monitor_tag: *const MonitorTag,
@@ -202,7 +202,7 @@ pub extern "C" fn health_monitor_get_deadline_monitor(
     }
 }
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub extern "C" fn health_monitor_start(health_monitor_handle: FFIHandle) -> FFICode {
     if health_monitor_handle.is_null() {
         return FFICode::NullParameter;
@@ -221,7 +221,7 @@ pub extern "C" fn health_monitor_start(health_monitor_handle: FFIHandle) -> FFIC
     }
 }
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub extern "C" fn health_monitor_destroy(health_monitor_handle: FFIHandle) -> FFICode {
     if health_monitor_handle.is_null() {
         return FFICode::NullParameter;
diff --git a/src/health_monitoring_lib/rust/tag.rs b/src/health_monitoring_lib/rust/tag.rs
@@ -23,6 +23,15 @@ struct Tag {
     length: usize,
 }
 
+impl Tag {
+    const fn new(value: &str) -> Self {
+        Self {
+            data: value.as_ptr(),
+            length: value.len(),
+        }
+    }
+}
+
 unsafe impl Send for Tag {}
 unsafe impl Sync for Tag {}
 
@@ -86,6 +95,12 @@ impl From<&str> for Tag {
 #[repr(C)]
 pub struct MonitorTag(Tag);
 
+impl MonitorTag {
+    pub const fn new(value: &str) -> Self {
+        MonitorTag(Tag::new(value))
+    }
+}
+
 impl fmt::Debug for MonitorTag {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         // SAFETY: the underlying data was created from a valid `&str`.
@@ -121,6 +136,12 @@ impl From<&str> for MonitorTag {
 #[repr(C)]
 pub struct DeadlineTag(Tag);
 
+impl DeadlineTag {
+    pub const fn new(value: &str) -> Self {
+        DeadlineTag(Tag::new(value))
+    }
+}
+
 impl fmt::Debug for DeadlineTag {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         // SAFETY: the underlying data was created from a valid `&str`.
@@ -230,6 +251,13 @@ mod tests {
         assert_eq!(tag_as_str, expected);
     }
 
+    #[test]
+    fn tag_new() {
+        const EXAMPLE_STR: &str = "EXAMPLE";
+        const TAG: Tag = Tag::new(EXAMPLE_STR);
+        compare_tag(TAG, EXAMPLE_STR);
+    }
+
     #[test]
     fn tag_debug() {
         let example_str = "EXAMPLE";
@@ -312,6 +340,13 @@ mod tests {
         compare_tag(tag, example_str);
     }
 
+    #[test]
+    fn monitor_tag_new() {
+        const EXAMPLE_STR: &str = "EXAMPLE";
+        const TAG: MonitorTag = MonitorTag::new(EXAMPLE_STR);
+        compare_tag(TAG.0, EXAMPLE_STR);
+    }
+
     #[test]
     fn monitor_tag_debug() {
         let example_str = "EXAMPLE";
@@ -342,6 +377,13 @@ mod tests {
         compare_tag(tag.0, example_str);
     }
 
+    #[test]
+    fn deadline_tag_new() {
+        const EXAMPLE_STR: &str = "EXAMPLE";
+        const TAG: DeadlineTag = DeadlineTag::new(EXAMPLE_STR);
+        compare_tag(TAG.0, EXAMPLE_STR);
+    }
+
     #[test]
     fn deadline_tag_debug() {
         let example_str = "EXAMPLE";

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ class RustDroppable`
`44`	`44`	`/// Marks object as no longer managed by C++ side, releasing handle to be passed to Rust side for dropping`
`45`	`45`	`std::optional<FFIHandle> drop_by_rust()`
`46`	`46`	`{`
`47`		`- return static_cast<T*>(this)->__drop_by_rust_impl();`
	`47`	`+ return static_cast<T*>(this)->_drop_by_rust_impl();`
`48`	`48`	`}`
`49`	`49`	`};`
`50`	`50`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ class DeadlineMonitorBuilder final : public internal::RustDroppable<DeadlineMoni`
`51`	`51`	`DeadlineMonitorBuilder add_deadline(const DeadlineTag& deadline_tag, const TimeRange& range) &&;`
`52`	`52`
`53`	`53`	`protected:`
`54`		`- std::optional<internal::FFIHandle> __drop_by_rust_impl()`
	`54`	`+ std::optional<internal::FFIHandle> _drop_by_rust_impl()`
`55`	`55`	`{`
`56`	`56`	`return monitor_builder_handler_.drop_by_rust();`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ impl DeadlineMonitorCpp {`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`
`43`		`-#[no_mangle]`
	`43`	`+#[unsafe(no_mangle)]`
`44`	`44`	`pub extern "C" fn deadline_monitor_builder_create(deadline_monitor_builder_handle_out: *mut FFIHandle) -> FFICode {`
`45`	`45`	`if deadline_monitor_builder_handle_out.is_null() {`
`46`	`46`	`return FFICode::NullParameter;`
`@@ -54,7 +54,7 @@ pub extern "C" fn deadline_monitor_builder_create(deadline_monitor_builder_handl`
`54`	`54`	`FFICode::Success`
`55`	`55`	`}`
`56`	`56`
`57`		`-#[no_mangle]`
	`57`	`+#[unsafe(no_mangle)]`
`58`	`58`	`pub extern "C" fn deadline_monitor_builder_destroy(deadline_monitor_builder_handle: FFIHandle) -> FFICode {`
`59`	`59`	`if deadline_monitor_builder_handle.is_null() {`
`60`	`60`	`return FFICode::NullParameter;`
`@@ -70,7 +70,7 @@ pub extern "C" fn deadline_monitor_builder_destroy(deadline_monitor_builder_hand`
`70`	`70`	`FFICode::Success`
`71`	`71`	`}`
`72`	`72`
`73`		`-#[no_mangle]`
	`73`	`+#[unsafe(no_mangle)]`
`74`	`74`	`pub extern "C" fn deadline_monitor_builder_add_deadline(`
`75`	`75`	`deadline_monitor_builder_handle: FFIHandle,`
`76`	`76`	`deadline_tag: *const DeadlineTag,`
`@@ -108,7 +108,7 @@ pub extern "C" fn deadline_monitor_builder_add_deadline(`
`108`	`108`	`FFICode::Success`
`109`	`109`	`}`
`110`	`110`
`111`		`-#[no_mangle]`
	`111`	`+#[unsafe(no_mangle)]`
`112`	`112`	`pub extern "C" fn deadline_monitor_get_deadline(`
`113`	`113`	`deadline_monitor_handle: FFIHandle,`
`114`	`114`	`deadline_tag: *const DeadlineTag,`
`@@ -141,7 +141,7 @@ pub extern "C" fn deadline_monitor_get_deadline(`
`141`	`141`	`}`
`142`	`142`	`}`
`143`	`143`
`144`		`-#[no_mangle]`
	`144`	`+#[unsafe(no_mangle)]`
`145`	`145`	`pub extern "C" fn deadline_monitor_destroy(deadline_monitor_handle: FFIHandle) -> FFICode {`
`146`	`146`	`if deadline_monitor_handle.is_null() {`
`147`	`147`	`return FFICode::NullParameter;`
`@@ -157,7 +157,7 @@ pub extern "C" fn deadline_monitor_destroy(deadline_monitor_handle: FFIHandle) -`
`157`	`157`	`FFICode::Success`
`158`	`158`	`}`
`159`	`159`
`160`		`-#[no_mangle]`
	`160`	`+#[unsafe(no_mangle)]`
`161`	`161`	`pub extern "C" fn deadline_start(deadline_handle: FFIHandle) -> FFICode {`
`162`	`162`	`if deadline_handle.is_null() {`
`163`	`163`	`return FFICode::NullParameter;`
`@@ -176,7 +176,7 @@ pub extern "C" fn deadline_start(deadline_handle: FFIHandle) -> FFICode {`
`176`	`176`	`}`
`177`	`177`	`}`
`178`	`178`
`179`		`-#[no_mangle]`
	`179`	`+#[unsafe(no_mangle)]`
`180`	`180`	`pub extern "C" fn deadline_stop(deadline_handle: FFIHandle) -> FFICode {`
`181`	`181`	`if deadline_handle.is_null() {`
`182`	`182`	`return FFICode::NullParameter;`
`@@ -193,7 +193,7 @@ pub extern "C" fn deadline_stop(deadline_handle: FFIHandle) -> FFICode {`
`193`	`193`	`FFICode::Success`
`194`	`194`	`}`
`195`	`195`
`196`		`-#[no_mangle]`
	`196`	`+#[unsafe(no_mangle)]`
`197`	`197`	`pub extern "C" fn deadline_destroy(deadline_handle: FFIHandle) -> FFICode {`
`198`	`198`	`if deadline_handle.is_null() {`
`199`	`199`	`return FFICode::NullParameter;`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ impl<T: DerefMut> DerefMut for FFIBorrowed<T> {`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`
`76`		`-#[no_mangle]`
	`76`	`+#[unsafe(no_mangle)]`
`77`	`77`	`pub extern "C" fn health_monitor_builder_create(health_monitor_builder_handle_out: *mut FFIHandle) -> FFICode {`
`78`	`78`	`if health_monitor_builder_handle_out.is_null() {`
`79`	`79`	`return FFICode::NullParameter;`
`@@ -87,7 +87,7 @@ pub extern "C" fn health_monitor_builder_create(health_monitor_builder_handle_ou`
`87`	`87`	`FFICode::Success`
`88`	`88`	`}`
`89`	`89`
`90`		`-#[no_mangle]`
	`90`	`+#[unsafe(no_mangle)]`
`91`	`91`	`pub extern "C" fn health_monitor_builder_destroy(health_monitor_builder_handle: FFIHandle) -> FFICode {`
`92`	`92`	`if health_monitor_builder_handle.is_null() {`
`93`	`93`	`return FFICode::NullParameter;`
`@@ -104,7 +104,7 @@ pub extern "C" fn health_monitor_builder_destroy(health_monitor_builder_handle:`
`104`	`104`	`FFICode::Success`
`105`	`105`	`}`
`106`	`106`
`107`		`-#[no_mangle]`
	`107`	`+#[unsafe(no_mangle)]`
`108`	`108`	`pub extern "C" fn health_monitor_builder_build(`
`109`	`109`	`health_monitor_builder_handle: FFIHandle,`
`110`	`110`	`supervisor_cycle_ms: u32,`
`@@ -137,7 +137,7 @@ pub extern "C" fn health_monitor_builder_build(`
`137`	`137`	`}`
`138`	`138`	`}`
`139`	`139`
`140`		`-#[no_mangle]`
	`140`	`+#[unsafe(no_mangle)]`
`141`	`141`	`pub extern "C" fn health_monitor_builder_add_deadline_monitor(`
`142`	`142`	`health_monitor_builder_handle: FFIHandle,`
`143`	`143`	`monitor_tag: *const MonitorTag,`
`@@ -171,7 +171,7 @@ pub extern "C" fn health_monitor_builder_add_deadline_monitor(`
`171`	`171`	`FFICode::Success`
`172`	`172`	`}`
`173`	`173`
`174`		`-#[no_mangle]`
	`174`	`+#[unsafe(no_mangle)]`
`175`	`175`	`pub extern "C" fn health_monitor_get_deadline_monitor(`
`176`	`176`	`health_monitor_handle: FFIHandle,`
`177`	`177`	`monitor_tag: *const MonitorTag,`
`@@ -202,7 +202,7 @@ pub extern "C" fn health_monitor_get_deadline_monitor(`
`202`	`202`	`}`
`203`	`203`	`}`
`204`	`204`
`205`		`-#[no_mangle]`
	`205`	`+#[unsafe(no_mangle)]`
`206`	`206`	`pub extern "C" fn health_monitor_start(health_monitor_handle: FFIHandle) -> FFICode {`
`207`	`207`	`if health_monitor_handle.is_null() {`
`208`	`208`	`return FFICode::NullParameter;`
`@@ -221,7 +221,7 @@ pub extern "C" fn health_monitor_start(health_monitor_handle: FFIHandle) -> FFIC`
`221`	`221`	`}`
`222`	`222`	`}`
`223`	`223`
`224`		`-#[no_mangle]`
	`224`	`+#[unsafe(no_mangle)]`
`225`	`225`	`pub extern "C" fn health_monitor_destroy(health_monitor_handle: FFIHandle) -> FFICode {`
`226`	`226`	`if health_monitor_handle.is_null() {`
`227`	`227`	`return FFICode::NullParameter;`