feat(gem): multi-observer state-change handlers via HandlerSlot

The single-slot set_*_handler pattern was a structural blocker, hit twice:
the daemon could not observe control-state changes because
register_default_handlers owns the slot, forcing GetControlState to read the
FSM cross-thread (a data race), and blocking WatchHealth and the Subscribe
stream's ControlStateChange variant.

HandlerSlot<Args...> keeps a primary slot with exact legacy semantics
(set_ replaces — one existing test depends on replacement) plus an
append-only observer list (add_) that survives set_ calls. Fire sites are
textually unchanged (operator bool / operator() / assign-from-function).

Applied to ControlStateMachine + ProcessJobStore + ControlJobStore (the
roadmap-critical three; the remaining single-slot classes follow the same
3-line pattern as needed). EquipmentRuntime gains an atomic control-state
mirror registered as an observer — control_state() is now safe from any
thread, retiring the GetControlState race — plus add_control_state_observer
and add_link_observer (selected/closed fan-out), the hooks WatchHealth and
Subscribe need.

Tests: observer ordering, set-replaces-primary-but-observers-survive,
observers-without-primary, PJ-store coexistence, and the runtime scenario
that was previously impossible (mirror + observer + default-handlers set_).
Core 464/464 (2816 assertions), daemon 16/16, live GEM300 demo passes with
single-fire control-state transitions.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
2026-06-10 18:57:53 +02:00
parent b067a76b80
commit 8a48ffeed4
10 changed files with 192 additions and 7 deletions
+6 -1
View File
@@ -6,6 +6,8 @@
#include <string>
#include <vector>
#include "secsgem/gem/handler_slot.hpp"
namespace secsgem::gem {
// E30 §6.2 Control State Model.
@@ -94,7 +96,10 @@ class ControlStateMachine {
ControlState state() const { return state_; }
bool online() const { return is_online(state_); }
// Replaces the primary handler (legacy single-slot semantics).
void set_state_change_handler(StateChangeHandler h) { on_change_ = std::move(h); }
// Appends an observer that survives set_state_change_handler calls.
void add_state_change_handler(StateChangeHandler h) { on_change_.add(std::move(h)); }
// Operator actions. Return true if a transition (or self-ack) was found.
bool operator_online();
@@ -113,7 +118,7 @@ class ControlStateMachine {
ControlTransitionTable table_;
ControlState state_;
StateChangeHandler on_change_;
HandlerSlot<ControlState, ControlState, ControlEvent> on_change_;
};
} // namespace secsgem::gem
+51
View File
@@ -0,0 +1,51 @@
#pragma once
#include <functional>
#include <utility>
#include <vector>
namespace secsgem::gem {
// Replaces the single-slot `std::function on_change_` pattern with a primary
// slot plus an append-only observer list, so multiple parties can watch one
// state machine without fighting over a single handler.
//
// - `slot = fn;` / set_*_handler(fn) -> sets/replaces the PRIMARY handler.
// Exactly the legacy single-slot semantics: callers that always owned the
// slot (register_default_handlers, apps, tests) keep working unchanged,
// including replacement.
// - `slot.add(fn)` / add_*_handler(fn) -> appends an OBSERVER. Observers are
// immune to later set_ calls — this is what lets the runtime keep an
// atomic control-state mirror (and later: WatchHealth, the Subscribe
// stream) while default_handlers still owns the primary slot.
//
// Invocation order: primary first, then observers in registration order.
// Copyable (fire sites that snapshot the handler before invoking keep
// working). Not thread-safe: register on the owning thread before the
// io_context runs, fire on the io thread — same contract as before.
template <typename... Args>
class HandlerSlot {
public:
using Fn = std::function<void(Args...)>;
HandlerSlot& operator=(Fn f) {
primary_ = std::move(f);
return *this;
}
void add(Fn f) { observers_.push_back(std::move(f)); }
void operator()(Args... args) const {
if (primary_) primary_(args...);
for (const auto& o : observers_)
if (o) o(args...);
}
explicit operator bool() const { return static_cast<bool>(primary_) || !observers_.empty(); }
private:
Fn primary_;
std::vector<Fn> observers_;
};
} // namespace secsgem::gem
+20 -1
View File
@@ -1,6 +1,7 @@
#pragma once
#include <asio.hpp>
#include <atomic>
#include <cstdint>
#include <functional>
#include <memory>
@@ -8,6 +9,7 @@
#include <string>
#include <thread>
#include <utility>
#include <vector>
#include "secsgem/config/loader.hpp"
#include "secsgem/endpoint.hpp"
@@ -76,7 +78,22 @@ class EquipmentRuntime {
}
// ---- control state -------------------------------------------------------
ControlState control_state() const { return sm_->state(); }
// Safe from any thread: reads an atomic mirror updated by a state-machine
// observer, so gRPC threads never touch the FSM the io thread owns.
ControlState control_state() const { return control_state_cache_.load(std::memory_order_relaxed); }
// Observe control-state transitions (fires on the io thread). Survives the
// primary set_state_change_handler that register_default_handlers installs.
// Register before run()/run_async().
void add_control_state_observer(ControlStateMachine::StateChangeHandler h) {
sm_->add_state_change_handler(std::move(h));
}
// Observe HSMS link state: fires on the io thread with true when a session
// reaches SELECTED, false when the connection closes. Register before
// run()/run_async(). Foundation for the daemon's WatchHealth stream.
using LinkObserver = std::function<void(bool selected)>;
void add_link_observer(LinkObserver h) { link_observers_.push_back(std::move(h)); }
// Deliver a primary to the host, or spool it if there's no SELECTED session.
// Call on the io thread (e.g. from a router handler or a posted emitter).
@@ -100,6 +117,8 @@ class EquipmentRuntime {
config::EquipmentDescriptor descriptor_;
std::unique_ptr<Server> server_;
Router router_;
std::atomic<ControlState> control_state_cache_{ControlState::HostOffline};
std::vector<LinkObserver> link_observers_;
std::optional<asio::executor_work_guard<asio::io_context::executor_type>> work_;
std::thread io_thread_;
};
+3 -1
View File
@@ -12,6 +12,7 @@
#include <utility>
#include <vector>
#include "secsgem/gem/handler_slot.hpp"
#include "secsgem/gem/control_job_state.hpp"
namespace secsgem::gem {
@@ -258,7 +259,8 @@ class ControlJobStore {
std::map<std::string, ControlJob> jobs_;
TransitionTableFactory factory_;
StateChangeHandler on_change_;
HandlerSlot<const std::string&, ControlJobState, ControlJobState,
ControlJobEvent> on_change_;
bool persistent_ = false;
std::filesystem::path journal_dir_;
uint64_t next_seq_ = 0;
+6 -1
View File
@@ -13,6 +13,7 @@
#include <utility>
#include <vector>
#include "secsgem/gem/handler_slot.hpp"
#include "secsgem/gem/e40_constants.hpp"
#include "secsgem/gem/process_job_state.hpp"
#include "secsgem/secs2/codec.hpp"
@@ -72,7 +73,10 @@ class ProcessJobStore {
ProcessJobStore& operator=(ProcessJobStore&&) = delete;
void set_table_factory(TransitionTableFactory f) { factory_ = std::move(f); }
// set_ replaces the primary handler (legacy semantics); add_ appends an
// observer that survives set_ calls (see handler_slot.hpp).
void set_state_change_handler(StateChangeHandler h) { on_change_ = std::move(h); }
void add_state_change_handler(StateChangeHandler h) { on_change_.add(std::move(h)); }
enum class CreateResult {
Created,
@@ -512,7 +516,8 @@ class ProcessJobStore {
std::map<std::string, ProcessJob> jobs_;
std::vector<std::string> order_; // queue position (E40 HOQ-aware)
TransitionTableFactory factory_;
StateChangeHandler on_change_;
HandlerSlot<const std::string&, ProcessJobState, ProcessJobState,
ProcessJobEvent> on_change_;
bool persistent_ = false;
std::filesystem::path journal_dir_;
uint64_t next_seq_ = 0;