Driver.AbCip-001 — ReinitializeAsync silently discarded its config JSON. Extracted AbCipDriverFactoryExtensions.ParseOptions; InitializeAsync now re-parses a content-bearing driverConfigJson and replaces _options (and recreates the alarm projection), so a reinitialize with a changed config (new device/tag, changed timeout) actually takes effect. A blank or empty-object JSON keeps construction-time options for the unit-test seam. Driver.AbCip-002 — libplctag status mapping used wrong integer constants. MapLibplctagStatus now switches on the libplctag.NET Status enum members (Ok/Pending/ErrorTimeout/ErrorNotFound/ErrorNotAllowed/ErrorOutOfBounds/…) instead of hand-typed natives, so timeout/not-found/not-allowed/out-of-bounds get their specific OPC UA codes instead of all collapsing to BadCommunicationError. The int overload casts to Status to stay correct against the wrapper's contiguous renumbering. Driver.AbCip-003 — whole-UDT reads decoded members at declaration-order offsets, which Studio 5000 does not guarantee. Added the opt-in AbCipDriverOptions.EnableDeclarationOnlyUdtGrouping flag (default false); AbCipUdtReadPlanner.Build forms no groups when it is off, so by default every UDT member reads per-tag rather than at possibly-wrong offsets. Driver.AbCip-008 — probe loops were fire-and-forget and ShutdownAsync raced them. Each probe Task is stored on DeviceState.ProbeTask; ShutdownAsync now cancels every CTS, awaits each probe Task (10s timeout), then disposes the CTS and handles. DeviceState.Runtimes/ParentRuntimes are ConcurrentDictionary and the Ensure*RuntimeAsync paths use TryAdd, disposing the losing concurrent creator instead of leaking a native tag handle. Adds AbCipDriverCodeReviewRegressionTests and updates existing AbCip tests to the corrected status constants + opt-in grouping flag. AbCip driver + test project build clean; all 244 AbCip tests pass. (The full-solution build has pre-existing, unrelated Driver.Galaxy protobuf-generation errors in this worktree.) Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
127 lines
5.7 KiB
C#
127 lines
5.7 KiB
C#
namespace ZB.MOM.WW.OtOpcUa.Driver.AbCip;
|
|
|
|
/// <summary>
|
|
/// Task #194 — groups a ReadAsync batch of full-references into whole-UDT reads where
|
|
/// possible. A group is emitted for every parent UDT tag whose declared
|
|
/// <see cref="AbCipStructureMember"/>s produced a valid offset map AND at least two of
|
|
/// its members appear in the batch; every other reference stays in the per-tag fallback
|
|
/// list that <see cref="AbCipDriver.ReadAsync"/> runs through its existing read path.
|
|
/// Pure function — the planner never touches the runtime + never reads the PLC.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// The grouped offsets come from <see cref="AbCipUdtMemberLayout"/>, which assumes the
|
|
/// controller lays members out in declaration order. Studio 5000 does not guarantee that,
|
|
/// so grouping is gated behind <see cref="AbCipDriverOptions.EnableDeclarationOnlyUdtGrouping"/>:
|
|
/// when grouping is disabled every member falls back to its own per-tag read.
|
|
/// </remarks>
|
|
public static class AbCipUdtReadPlanner
|
|
{
|
|
/// <summary>
|
|
/// Split <paramref name="requests"/> into whole-UDT groups + per-tag leftovers.
|
|
/// <paramref name="tagsByName"/> is the driver's <c>_tagsByName</c> map — both parent
|
|
/// UDT rows and their fanned-out member rows live there. Lookup is OrdinalIgnoreCase
|
|
/// to match the driver's dictionary semantics. When
|
|
/// <paramref name="enableDeclarationOnlyGrouping"/> is <c>false</c> no groups are
|
|
/// formed — every reference goes to the per-tag fallback path so member decoding never
|
|
/// relies on declaration-order offsets that may not match the controller layout.
|
|
/// </summary>
|
|
public static AbCipUdtReadPlan Build(
|
|
IReadOnlyList<string> requests,
|
|
IReadOnlyDictionary<string, AbCipTagDefinition> tagsByName,
|
|
bool enableDeclarationOnlyGrouping = false)
|
|
{
|
|
ArgumentNullException.ThrowIfNull(requests);
|
|
ArgumentNullException.ThrowIfNull(tagsByName);
|
|
|
|
var fallback = new List<AbCipUdtReadFallback>(requests.Count);
|
|
var byParent = new Dictionary<string, List<AbCipUdtReadMember>>(StringComparer.OrdinalIgnoreCase);
|
|
|
|
if (!enableDeclarationOnlyGrouping)
|
|
{
|
|
for (var i = 0; i < requests.Count; i++)
|
|
fallback.Add(new AbCipUdtReadFallback(i, requests[i]));
|
|
return new AbCipUdtReadPlan([], fallback);
|
|
}
|
|
|
|
for (var i = 0; i < requests.Count; i++)
|
|
{
|
|
var name = requests[i];
|
|
if (!tagsByName.TryGetValue(name, out var def))
|
|
{
|
|
fallback.Add(new AbCipUdtReadFallback(i, name));
|
|
continue;
|
|
}
|
|
|
|
var (parentName, memberName) = SplitParentMember(name);
|
|
if (parentName is null || memberName is null
|
|
|| !tagsByName.TryGetValue(parentName, out var parent)
|
|
|| parent.DataType != AbCipDataType.Structure
|
|
|| parent.Members is not { Count: > 0 })
|
|
{
|
|
fallback.Add(new AbCipUdtReadFallback(i, name));
|
|
continue;
|
|
}
|
|
|
|
var offsets = AbCipUdtMemberLayout.TryBuild(parent.Members);
|
|
if (offsets is null || !offsets.TryGetValue(memberName, out var offset))
|
|
{
|
|
fallback.Add(new AbCipUdtReadFallback(i, name));
|
|
continue;
|
|
}
|
|
|
|
if (!byParent.TryGetValue(parentName, out var members))
|
|
{
|
|
members = new List<AbCipUdtReadMember>();
|
|
byParent[parentName] = members;
|
|
}
|
|
members.Add(new AbCipUdtReadMember(i, def, offset));
|
|
}
|
|
|
|
// A single-member group saves nothing (one whole-UDT read replaces one per-member read)
|
|
// — demote to fallback to avoid paying the cost of reading the full UDT buffer only to
|
|
// pull one field out.
|
|
var groups = new List<AbCipUdtReadGroup>(byParent.Count);
|
|
foreach (var (parentName, members) in byParent)
|
|
{
|
|
if (members.Count < 2)
|
|
{
|
|
foreach (var m in members)
|
|
fallback.Add(new AbCipUdtReadFallback(m.OriginalIndex, m.Definition.Name));
|
|
continue;
|
|
}
|
|
groups.Add(new AbCipUdtReadGroup(parentName, tagsByName[parentName], members));
|
|
}
|
|
|
|
return new AbCipUdtReadPlan(groups, fallback);
|
|
}
|
|
|
|
private static (string? Parent, string? Member) SplitParentMember(string reference)
|
|
{
|
|
var dot = reference.IndexOf('.');
|
|
if (dot <= 0 || dot == reference.Length - 1) return (null, null);
|
|
return (reference[..dot], reference[(dot + 1)..]);
|
|
}
|
|
}
|
|
|
|
/// <summary>A planner output: grouped UDT reads + per-tag fallbacks.</summary>
|
|
public sealed record AbCipUdtReadPlan(
|
|
IReadOnlyList<AbCipUdtReadGroup> Groups,
|
|
IReadOnlyList<AbCipUdtReadFallback> Fallbacks);
|
|
|
|
/// <summary>One UDT parent whose members were batched into a single read.</summary>
|
|
public sealed record AbCipUdtReadGroup(
|
|
string ParentName,
|
|
AbCipTagDefinition ParentDefinition,
|
|
IReadOnlyList<AbCipUdtReadMember> Members);
|
|
|
|
/// <summary>
|
|
/// One member inside an <see cref="AbCipUdtReadGroup"/>. <c>OriginalIndex</c> is the
|
|
/// slot in the caller's request list so the decoded value lands at the correct output
|
|
/// offset. <c>Definition</c> is the fanned-out member-level tag definition. <c>Offset</c>
|
|
/// is the byte offset within the parent UDT buffer where this member lives.
|
|
/// </summary>
|
|
public sealed record AbCipUdtReadMember(int OriginalIndex, AbCipTagDefinition Definition, int Offset);
|
|
|
|
/// <summary>A reference that falls back to the per-tag read path.</summary>
|
|
public sealed record AbCipUdtReadFallback(int OriginalIndex, string Reference);
|