Skip to content

hmon: fix cycles interval FFI issue #134

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
pawelrutkaq merged 1 commit into from
Mar 27, 2026
Merged

hmon: fix cycles interval FFI issue #134

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
31 changes: 23 additions & 8 deletions src/health_monitoring_lib/cpp/health_monitor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ using namespace score::hm::logic;
FFICode health_monitor_builder_create(FFIHandle* health_monitor_builder_handle_out);
FFICode health_monitor_builder_destroy(FFIHandle health_monitor_builder_handle);
FFICode health_monitor_builder_build(FFIHandle health_monitor_builder_handle,
uint32_t supervisor_cycle_ms,
uint32_t internal_cycle_ms,
const uint64_t* supervisor_cycle_ms,
const uint64_t* internal_cycle_ms,
FFIHandle* health_monitor_handle_out);
FFICode health_monitor_builder_add_deadline_monitor(FFIHandle health_monitor_builder_handle,
const MonitorTag* monitor_tag,
Expand Down Expand Up @@ -115,13 +115,17 @@ HealthMonitorBuilder HealthMonitorBuilder::add_logic_monitor(const MonitorTag& m

HealthMonitorBuilder HealthMonitorBuilder::with_internal_processing_cycle(std::chrono::milliseconds cycle_duration) &&
{
internal_processing_cycle_duration_ = cycle_duration;
auto count{cycle_duration.count()};
SCORE_LANGUAGE_FUTURECPP_ASSERT_MESSAGE(count >= 0, "cycle duration must be positive");
internal_processing_cycle_ms_ = count;
return std::move(*this);
}

HealthMonitorBuilder HealthMonitorBuilder::with_supervisor_api_cycle(std::chrono::milliseconds cycle_duration) &&
{
supervisor_api_cycle_duration_ = cycle_duration;
auto count{cycle_duration.count()};
SCORE_LANGUAGE_FUTURECPP_ASSERT_MESSAGE(count >= 0, "cycle duration must be positive");
supervisor_api_cycle_ms_ = count;
return std::move(*this);
}

Expand All @@ -130,12 +134,23 @@ score::cpp::expected<HealthMonitor, Error> HealthMonitorBuilder::build() &&
auto health_monitor_builder_handle = health_monitor_builder_handle_.drop_by_rust();
SCORE_LANGUAGE_FUTURECPP_PRECONDITION(health_monitor_builder_handle.has_value());

uint32_t supervisor_duration_ms = static_cast<uint32_t>(supervisor_api_cycle_duration_.count());
uint32_t internal_duration_ms = static_cast<uint32_t>(internal_processing_cycle_duration_.count());
// Handle optional parameters.
const uint64_t* supervisor_api_cycle_ms{nullptr};
const uint64_t* internal_processing_cycle_ms{nullptr};
if (supervisor_api_cycle_ms_.has_value())
{
supervisor_api_cycle_ms = &supervisor_api_cycle_ms_.value();
}
if (internal_processing_cycle_ms_.has_value())
{
internal_processing_cycle_ms = &internal_processing_cycle_ms_.value();
}

FFIHandle health_monitor_handle{nullptr};
auto result{health_monitor_builder_build(
health_monitor_builder_handle.value(), supervisor_duration_ms, internal_duration_ms, &health_monitor_handle)};
auto result{health_monitor_builder_build(health_monitor_builder_handle.value(),
supervisor_api_cycle_ms,
internal_processing_cycle_ms,
&health_monitor_handle)};
if (result != kSuccess)
{
return score::cpp::unexpected(static_cast<Error>(result));
Expand Down
4 changes: 2 additions & 2 deletions src/health_monitoring_lib/cpp/include/score/hm/health_monitor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ class HealthMonitorBuilder final
private:
internal::DroppableFFIHandle health_monitor_builder_handle_;

std::chrono::milliseconds supervisor_api_cycle_duration_;
std::chrono::milliseconds internal_processing_cycle_duration_;
std::optional<uint64_t> supervisor_api_cycle_ms_;
std::optional<uint64_t> internal_processing_cycle_ms_;
};

class HealthMonitor final
Expand Down
28 changes: 14 additions & 14 deletions src/health_monitoring_lib/rust/deadline/ffi.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,8 +334,8 @@ mod tests {
);
let _ = health_monitor_builder_build(
health_monitor_builder_handle,
200,
100,
null_mut(),
null_mut(),
&mut health_monitor_handle as *mut FFIHandle,
);
let _ = health_monitor_get_deadline_monitor(
Expand Down Expand Up @@ -383,8 +383,8 @@ mod tests {
);
let _ = health_monitor_builder_build(
health_monitor_builder_handle,
200,
100,
null_mut(),
null_mut(),
&mut health_monitor_handle as *mut FFIHandle,
);
let _ = health_monitor_get_deadline_monitor(
Expand Down Expand Up @@ -439,8 +439,8 @@ mod tests {
);
let _ = health_monitor_builder_build(
health_monitor_builder_handle,
200,
100,
null_mut(),
null_mut(),
&mut health_monitor_handle as *mut FFIHandle,
);
let _ = health_monitor_get_deadline_monitor(
Expand Down Expand Up @@ -485,8 +485,8 @@ mod tests {
);
let _ = health_monitor_builder_build(
health_monitor_builder_handle,
200,
100,
null_mut(),
null_mut(),
&mut health_monitor_handle as *mut FFIHandle,
);
let _ = health_monitor_get_deadline_monitor(
Expand Down Expand Up @@ -535,8 +535,8 @@ mod tests {
);
let _ = health_monitor_builder_build(
health_monitor_builder_handle,
200,
100,
null_mut(),
null_mut(),
&mut health_monitor_handle as *mut FFIHandle,
);
let _ = health_monitor_get_deadline_monitor(
Expand Down Expand Up @@ -584,8 +584,8 @@ mod tests {
);
let _ = health_monitor_builder_build(
health_monitor_builder_handle,
200,
100,
null_mut(),
null_mut(),
&mut health_monitor_handle as *mut FFIHandle,
);
let _ = health_monitor_get_deadline_monitor(
Expand Down Expand Up @@ -640,8 +640,8 @@ mod tests {
);
let _ = health_monitor_builder_build(
health_monitor_builder_handle,
200,
100,
null_mut(),
null_mut(),
&mut health_monitor_handle as *mut FFIHandle,
);
let _ = health_monitor_get_deadline_monitor(
Expand Down
Loading
Loading