b871cd9da2
Move equipment capabilities and the E30 control state machine out of C++
code and into YAML data files; introduce a Router for SECS dispatch;
consolidate small files.
Behavioural changes: none. Demo identical (15 SxFy transactions +
3 equipment-initiated primaries), 67 test cases / 384 assertions still
all green. Structural changes only.
Why
---
The previous server.cpp held the equipment data dictionary (3 SVIDs,
2 ECIDs, 3 CEIDs, 2 alarms, 2 recipes, 4 host commands) as imperative
C++ in a 50-line `populate()` function, and routed inbound messages
through a 150-line if-ladder. Adding a new SVID required a recompile.
Adding a new state transition required editing two switch statements
(`operator_*` and `on_host_request_*`). The control state machine's
behavioural rules were spread across imperative code in two methods.
This is exactly what implementation_plan.md calls out as the wrong
shape: behavioural rules should live in versioned data, and every
runtime/test/analyzer should read from that data rather than re-encode
it. This commit starts that move.
What's new
----------
data/equipment.yaml
Equipment data dictionary. Declarative SVIDs / ECIDs / CEIDs /
alarms / recipes / host commands. Host commands carry their HCACK
ack code plus optional `emit_ceid` and `set_alarm` side-effects.
Adding a new SVID or command is a YAML edit, no recompile.
data/control_state.yaml
The E30 §6.2 control state transition table as data. Each row is
(from, on) -> (to [, then] [, ack]). `then` chains an auto-advance
through the transient AttemptOnline state. The previous
imperative switch is gone.
include/secsgem/config/loader.hpp + src/config/loader.cpp
yaml-cpp-backed loader. `load_control_state(path)` returns a
ControlTransitionTable + initial state; `load_equipment(path, model)`
populates the EquipmentDataModel and returns the device descriptor
(id, MDLN, SOFTREV, optional auto-emit CEID). Surfaces config
errors with file path + field name via ConfigError.
include/secsgem/gem/router.hpp (header-only)
Small (stream, function) -> handler map. Server registers all
handlers once at startup, then the Connection's message handler is
just `router.dispatch(msg)`. Unhandled primaries with W set get
SxF0 by default. Replaces the if-ladder in secs_server.cpp.
include/secsgem/gem/control_state.hpp + .cpp
ControlTransitionTable is the new pure data type. ControlStateMachine
is now a thin engine over the table: `fire(event)` looks up the row,
optionally transitions, optionally chains a `then` transition, returns
the ack code. Behaviour rules no longer live in C++ switches.
The default in-code table matches data/control_state.yaml row for row;
tests rely on it so they don't need the YAML file.
include/secsgem/gem/data_model.hpp + .cpp
`register_command(rcmd, CommandSpec)` replaces the function-handler
signature. CommandSpec = (HostCmdAck, optional emit_ceid, optional
set_alarm). `dispatch_command` returns a CommandResult so the server
can fire the side-effects after S2F42 is sent.
apps/secs_server.cpp
No populate(), no if-ladder. Loads equipment.yaml + control_state.yaml
at startup (clean error on bad config), wires the Router once,
delegates dispatch. Sm change handler reads emit_on_control_change
from the YAML. Welcome S10F3 removed for parity with config (a future
YAML rule could re-introduce it declaratively).
tests/test_loader.cpp (new)
Verifies the YAML loader produces the same shape as the in-code
default table, and that equipment.yaml populates every section
(SVIDs/ECIDs/CEIDs/alarms/recipes/commands). SECSGEM_DATA_DIR
CMake define points at ${CMAKE_SOURCE_DIR}/data so tests don't
depend on cwd.
CMakeLists.txt, Dockerfile
find_package(yaml-cpp) and link. libyaml-cpp-dev added to the
Ubuntu base image (yaml-cpp 0.8 ships the modern target name).
File consolidation
------------------
Five small files removed; their content lives in fewer headers:
- secs2/item.cpp -> inline in secs2/item.hpp
- secs2/message.cpp -> inline in secs2/message.hpp
- hsms/types.hpp -> merged into hsms/header.hpp
- hsms/frame.hpp -> merged into hsms/header.hpp
- hsms/frame.cpp -> merged into hsms/header.cpp
hsms/header.hpp is now "the HSMS wire format" in one place: SType + status
enums + Timers + Header + Frame + constants. All includers updated.
Net effect
----------
Before: equipment data dictionary lived in 50 lines of imperative
populate() inside secs_server.cpp; dispatch in a 20-branch if-ladder.
After: equipment data dictionary lives in 47 lines of YAML; dispatch
is a Router built once. Adding a new capability is now a YAML edit
in the common case.
Test count up to 67 cases / 384 assertions (+4 cases / +106 assertions)
covering the loader and the new table-driven SM paths.
What's NOT changed
------------------
The per-SxFy reply construction still lives in C++ (each message has a
unique body shape). Moving those into YAML/JSON message-shape
definitions is the next refactor step but requires a generic typed
encoder/decoder driven by shape descriptors; out of scope here.
Spooling, the S9 error stream, S1F19/F20, and the other gaps in
COMPLIANCE.md remain unchanged.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
279 lines
8.2 KiB
C++
279 lines
8.2 KiB
C++
#pragma once
|
|
|
|
#include <algorithm>
|
|
#include <cstdint>
|
|
#include <functional>
|
|
#include <map>
|
|
#include <optional>
|
|
#include <set>
|
|
#include <string>
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
#include "secsgem/secs2/item.hpp"
|
|
|
|
namespace secsgem::gem {
|
|
|
|
namespace s2 = secsgem::secs2;
|
|
|
|
// ---- Status / data / equipment-constant variables ------------------------
|
|
|
|
struct StatusVariable {
|
|
uint32_t id;
|
|
std::string name;
|
|
std::string units;
|
|
s2::Item value;
|
|
};
|
|
|
|
struct DataVariable {
|
|
uint32_t id;
|
|
std::string name;
|
|
std::string units;
|
|
s2::Item value;
|
|
};
|
|
|
|
struct EquipmentConstant {
|
|
uint32_t id;
|
|
std::string name;
|
|
std::string units;
|
|
s2::Item value;
|
|
s2::Item def_value;
|
|
std::string min_str; // optional, ASCII for S2F30 ECMIN/ECMAX
|
|
std::string max_str;
|
|
};
|
|
|
|
// ---- Event reports -------------------------------------------------------
|
|
|
|
struct CollectionEvent {
|
|
uint32_t id;
|
|
std::string name;
|
|
};
|
|
|
|
struct Report {
|
|
uint32_t id;
|
|
std::vector<uint32_t> vids;
|
|
};
|
|
|
|
// One report's worth of data at emission time: the RPTID and the values for
|
|
// each VID, in declaration order.
|
|
struct ReportData {
|
|
uint32_t rptid;
|
|
std::vector<s2::Item> values;
|
|
};
|
|
|
|
// ---- Alarms --------------------------------------------------------------
|
|
|
|
struct Alarm {
|
|
uint32_t id;
|
|
std::string text;
|
|
// Lower 7 bits of ALCD: alarm severity category (1=personal safety,
|
|
// 2=equipment safety, 4=parameter control error, ...). Bit 7 is the
|
|
// set/cleared flag, applied at emit time.
|
|
uint8_t severity_category;
|
|
};
|
|
|
|
// ---- Ack codes for the new SxFy ------------------------------------------
|
|
|
|
// S2F30 carries no ack; S2F34 / S2F36 / S2F38 do.
|
|
enum class DefineReportAck : uint8_t {
|
|
Accept = 0,
|
|
InsufficientSpace = 1,
|
|
InvalidFormat = 2,
|
|
RptidAlreadyDefined = 3,
|
|
InvalidVid = 5,
|
|
};
|
|
|
|
enum class LinkEventAck : uint8_t {
|
|
Accept = 0,
|
|
InsufficientSpace = 1,
|
|
InvalidFormat = 2,
|
|
UnknownCeid = 3,
|
|
UnknownRptid = 4,
|
|
CeidAlreadyLinked = 5,
|
|
};
|
|
|
|
enum class EnableEventAck : uint8_t {
|
|
Accept = 0,
|
|
UnknownCeid = 1,
|
|
};
|
|
|
|
// S5F2 / S5F4 alarm ack.
|
|
enum class AlarmAck : uint8_t {
|
|
Accept = 0,
|
|
Error = 1,
|
|
};
|
|
|
|
// S6F12 event-report ack.
|
|
enum class EventReportAck : uint8_t {
|
|
Accept = 0,
|
|
Denied = 1,
|
|
};
|
|
|
|
// S7F4 process-program ack.
|
|
enum class ProcessProgramAck : uint8_t {
|
|
Accept = 0,
|
|
PermissionNotGranted = 1,
|
|
LengthError = 2,
|
|
MatrixOverflow = 3,
|
|
PpidNotFound = 4,
|
|
ModeUnsupported = 5,
|
|
PerformanceError = 6,
|
|
};
|
|
|
|
// ---- Existing ack enums from earlier batches -----------------------------
|
|
|
|
enum class EquipmentAck : uint8_t {
|
|
Accept = 0,
|
|
Denied_UnknownEcid = 1,
|
|
Denied_Busy = 3,
|
|
Denied_OutOfRange = 4,
|
|
};
|
|
|
|
enum class TimeAck : uint8_t {
|
|
Accept = 0,
|
|
Error = 1,
|
|
NotDoneNotEmpty = 2,
|
|
};
|
|
|
|
enum class HostCmdAck : uint8_t {
|
|
Accept = 0,
|
|
InvalidCommand = 1,
|
|
CannotDoNow = 2,
|
|
ParameterInvalid = 3,
|
|
AcceptedWillFinishLater = 4,
|
|
Rejected = 5,
|
|
InvalidObject = 6,
|
|
};
|
|
|
|
enum class TerminalAck : uint8_t {
|
|
Accepted = 0,
|
|
WillNotDisplay = 1,
|
|
TerminalNotAvailable = 2,
|
|
};
|
|
|
|
// The in-memory equipment data dictionary. Owns SVIDs, DVIDs, ECIDs, the
|
|
// dynamic event-report subscription state (reports + links + enabled set),
|
|
// the alarm table, and a small process-program registry. Single-threaded;
|
|
// all access happens on the Asio executor.
|
|
class EquipmentDataModel {
|
|
public:
|
|
struct CommandParam {
|
|
std::string name;
|
|
s2::Item value;
|
|
};
|
|
|
|
// Declarative host-command effect, loaded from YAML. The server
|
|
// dispatches a command by looking up the spec and (optionally) firing
|
|
// a CEID emit / setting an alarm after the S2F42 reply is sent.
|
|
struct CommandSpec {
|
|
HostCmdAck ack = HostCmdAck::Accept;
|
|
std::optional<uint32_t> emit_ceid;
|
|
std::optional<uint32_t> set_alarm;
|
|
};
|
|
|
|
struct CommandResult {
|
|
HostCmdAck ack = HostCmdAck::InvalidCommand;
|
|
std::optional<uint32_t> emit_ceid;
|
|
std::optional<uint32_t> set_alarm;
|
|
};
|
|
|
|
// --- SVID ---------------------------------------------------------------
|
|
void add_status_variable(StatusVariable sv);
|
|
std::optional<StatusVariable> status_variable(uint32_t id) const;
|
|
std::vector<StatusVariable> all_status_variables() const;
|
|
void set_status_value(uint32_t id, s2::Item value);
|
|
|
|
// --- DVID ---------------------------------------------------------------
|
|
void add_data_variable(DataVariable dv);
|
|
std::optional<DataVariable> data_variable(uint32_t id) const;
|
|
std::vector<DataVariable> all_data_variables() const;
|
|
void set_data_value(uint32_t id, s2::Item value);
|
|
|
|
// VID lookup that searches SVIDs then DVIDs (E30 §6.5 — VIDs share a
|
|
// namespace from the host's point of view).
|
|
std::optional<s2::Item> vid_value(uint32_t vid) const;
|
|
bool vid_exists(uint32_t vid) const;
|
|
|
|
// --- ECID ---------------------------------------------------------------
|
|
void add_equipment_constant(EquipmentConstant ec);
|
|
std::optional<EquipmentConstant> equipment_constant(uint32_t id) const;
|
|
std::vector<EquipmentConstant> all_equipment_constants() const;
|
|
EquipmentAck set_equipment_constant_value(uint32_t id, s2::Item value);
|
|
|
|
// --- Clock --------------------------------------------------------------
|
|
std::string current_time_string() const;
|
|
TimeAck set_time_string(const std::string& time_str);
|
|
|
|
// --- Host commands ------------------------------------------------------
|
|
void register_command(const std::string& rcmd, CommandSpec spec);
|
|
CommandResult dispatch_command(const std::string& rcmd,
|
|
const std::vector<CommandParam>& params) const;
|
|
bool has_command(const std::string& rcmd) const;
|
|
|
|
// --- Collection events --------------------------------------------------
|
|
void register_event(CollectionEvent ce);
|
|
bool has_event(uint32_t ceid) const;
|
|
std::vector<CollectionEvent> all_events() const;
|
|
|
|
// S2F33: define reports. `reports` maps RPTID -> VID list. An empty
|
|
// vector deletes all reports (and clears all links). An empty VID list
|
|
// for a given RPTID deletes that report.
|
|
DefineReportAck define_reports(
|
|
const std::vector<std::pair<uint32_t, std::vector<uint32_t>>>& reports);
|
|
|
|
// S2F35: link CEIDs to RPTID lists. `links` maps CEID -> RPTID list.
|
|
// An empty RPTID list for a CEID clears its links. An empty outer list
|
|
// clears all links.
|
|
LinkEventAck link_event_reports(
|
|
const std::vector<std::pair<uint32_t, std::vector<uint32_t>>>& links);
|
|
|
|
// S2F37: enable/disable events. Empty CEID list applies to *all*
|
|
// registered events.
|
|
EnableEventAck enable_events(bool enable, const std::vector<uint32_t>& ceids);
|
|
|
|
bool is_event_enabled(uint32_t ceid) const;
|
|
|
|
// Compose the report data for a CEID emission (S6F11 body's report list).
|
|
std::vector<ReportData> compose_reports_for(uint32_t ceid) const;
|
|
|
|
std::vector<Report> all_reports() const;
|
|
|
|
// --- Alarms -------------------------------------------------------------
|
|
void add_alarm(Alarm a);
|
|
std::optional<Alarm> alarm(uint32_t alid) const;
|
|
std::vector<Alarm> all_alarms() const;
|
|
AlarmAck set_alarm_enabled(uint32_t alid, bool enable);
|
|
bool alarm_enabled(uint32_t alid) const;
|
|
// Returns the ALCD byte to put on the wire (bit 7 indicates set/cleared).
|
|
// Returns nullopt for unknown alarms.
|
|
std::optional<uint8_t> alarm_set(uint32_t alid);
|
|
std::optional<uint8_t> alarm_clear(uint32_t alid);
|
|
bool alarm_active(uint32_t alid) const;
|
|
|
|
// --- Process programs ---------------------------------------------------
|
|
void add_process_program(std::string ppid, std::string ppbody);
|
|
std::optional<std::string> process_program(const std::string& ppid) const;
|
|
std::vector<std::string> process_program_list() const;
|
|
ProcessProgramAck delete_process_program(const std::string& ppid);
|
|
|
|
private:
|
|
std::map<uint32_t, StatusVariable> svids_;
|
|
std::map<uint32_t, DataVariable> dvids_;
|
|
std::map<uint32_t, EquipmentConstant> ecids_;
|
|
std::int64_t time_offset_seconds_ = 0;
|
|
std::map<std::string, CommandSpec> commands_;
|
|
|
|
std::map<uint32_t, CollectionEvent> ceids_;
|
|
std::map<uint32_t, Report> reports_;
|
|
std::map<uint32_t, std::vector<uint32_t>> ce_links_; // CEID -> RPTID list
|
|
std::set<uint32_t> events_enabled_;
|
|
|
|
std::map<uint32_t, Alarm> alarms_;
|
|
std::set<uint32_t> alarms_enabled_;
|
|
std::set<uint32_t> alarms_active_;
|
|
|
|
std::map<std::string, std::string> process_programs_;
|
|
};
|
|
|
|
} // namespace secsgem::gem
|