mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-29 07:07:24 +08:00
# Description Consolidate the complete B01/B02 NodeState memory work into one PR. - Replace eager cold-path NodeState locks with lazy canonical publication and update the event-monitor counter atomically. - Store six design-metadata properties and three security properties in separate lazy private bags while preserving public APIs, null/empty distinctions, masks, copying and existing serialization behavior. - Avoid allocating the ReportEvent scheduling closure when the async-dispatch path is unused. - Retain the logger factory's category logger directly, avoiding a redundant typed wrapper on telemetry initialization. - Keep Variant at 24 bytes while removing eligible outer boxes for QualifiedName, NodeId, NET8+ ByteString and text-only LocalizedText values. - Add reproducible allocation/layout/occupancy fixtures, real registered and monitored populations, reference contracts, generated-consumer coverage and NativeAOT cases. ## Measured allocation changes Matched .NET 10.0.11 x64 observations against the integrated master baseline: | Construction/assignment | Master | This PR | |---|---:|---:| | Bare/minimal object | 824 B | 640 B | | Bare/minimal variable | 1160 B | 976 B | | Variable with both optional groups populated or reset | 1160 B | 1088 B | | Variable with a shared ByteString value | 1192 B | 976 B | Separate paired measurements show: - telemetry initialization: 24 B typed-logger wrapper removed; - eligible QualifiedName, NodeId and ByteString Variant construction: 32 B to 0 B; - eligible text-only LocalizedText Variant construction: 40 B to 0 B; - variable attributes read into caller-provided Variant destinations: 136 B to 0 B. These are runtime-specific per-operation observations, not additive whole-server savings. Optional bags retain their documented populated/high-water premiums and are not reclaimed on reset. ## Reference-storage decision A complete private indexed reference backend and a sorted-traversal alternative were measured, but both changed the existing filtered hash-index enumeration order. They were rejected despite lower memory use. The production reference backend remains unchanged; strengthened ordering, identity, serialization and concurrency contracts are retained. Adaptive small-set storage remains deferred. ## Consolidation This PR now contains all changes from #4451 and the former narrower #4452 branch. Every #4452 changed path was present in #4451; after merging, the #4451 head `836e45226` is a direct ancestor of this branch. #4451 is closed as superseded. Draft #4425 remains unchanged and is also superseded by this consolidated work. ## Review feedback - Removed the standalone Variant storage document and its README entry. - Made the raw NodeId constructor private; the documented internal `GetRawState`/`SetRawState` bridge is explicitly Variant-only and must never become public. - Marked the two 32-thread counter tests non-parallel. - Added 10-second timeouts to the concurrent browse benchmark's main and worker barriers and completion waits. - Migrated the registered-population fixture to the current async `SealAsync` API. All review threads on #4451 and #4452 were replied to with the action and fix commit, then resolved. ## Related issues - Related to #4275. - Supersedes #4425 and #4451. ## Validation - Consolidated Types/Core/Server selection: **1241 passed** on net10.0. - Consolidated Types/Core/Server selection: **1238 passed** on net48. - Focused #4451 feedback selection: **189 passed** on net10.0 and **187 passed** on net48. - Earlier integrated NativeAOT validation passed **163/163** cases across the main, MCP and Historian applications; current PR CI provides the authoritative final merged-source native validation. The first #4452 CI run was blocked by merge conflicts. Seven later jobs completed their tests but encountered a shared artifact-service HTTP 403 while uploading results; no workflow or test was weakened to mask that infrastructure failure. Generated `report.*.json` crash artifacts remain untracked and are not part of this PR. ## Checklist - [ ] I have signed the [CLA](https://opcfoundation.org/license/cla/ContributorLicenseAgreementv1.0.pdf) and read the [CONTRIBUTING](https://github.com/OPCFoundation/UA-.NETStandard/blob/master/CONTRIBUTING.md) doc. - [x] I have added tests that prove the changes and improve coverage. - [x] I have added the necessary current-behavior documentation. - [ ] I have verified that the fresh consolidated CI run introduces no build or analyzer warnings. - [ ] I ran the complete UA.slnx suite locally on net48 and net10.0 with no failures. - [ ] I fixed all failing and flaky CI tests and all CodeQL warnings. - [x] I have addressed all PR feedback received. --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: d2569e2e-7115-4969-bb44-8159e302b450
285 lines
12 KiB
C#
285 lines
12 KiB
C#
/* ========================================================================
|
|
* Copyright (c) 2005-2025 The OPC Foundation, Inc. All rights reserved.
|
|
*
|
|
* OPC Foundation MIT License 1.00
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person
|
|
* obtaining a copy of this software and associated documentation
|
|
* files (the "Software"), to deal in the Software without
|
|
* restriction, including without limitation the rights to use,
|
|
* copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following
|
|
* conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be
|
|
* included in all copies or substantial portions of the Software.
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
|
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
|
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
|
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
* OTHER DEALINGS IN THE SOFTWARE.
|
|
*
|
|
* The complete license agreement can be found here:
|
|
* http://opcfoundation.org/License/MIT/1.00/
|
|
* ======================================================================*/
|
|
|
|
#nullable enable
|
|
|
|
using System;
|
|
using System.Collections.Generic;
|
|
using Moq;
|
|
using NUnit.Framework;
|
|
using NUnit.Framework.Interfaces;
|
|
|
|
namespace Opc.Ua.Server.Tests
|
|
{
|
|
/// <summary>
|
|
/// Checks callback occupancy while the real <see cref="MonitoredNode2"/> adds and removes items.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// Server and node-manager dependencies are mocked; no server is started.
|
|
/// Failure-only CSV rows report the two monitoring callbacks and the total occupied behavior callbacks.
|
|
/// </remarks>
|
|
[TestFixture]
|
|
[Category("NodeStateOccupancy")]
|
|
[Category("MonitoredNode")]
|
|
[SetCulture("en-us")]
|
|
[SetUICulture("en-us")]
|
|
[Parallelizable]
|
|
public sealed class NodeStateMonitoringOccupancyTests
|
|
{
|
|
/// <summary>
|
|
/// Clears the diagnostic rows before each test.
|
|
/// </summary>
|
|
[SetUp]
|
|
public void ClearRows()
|
|
{
|
|
m_rows.Clear();
|
|
}
|
|
|
|
/// <summary>
|
|
/// Outputs buffered CSV rows only when the test does not pass.
|
|
/// </summary>
|
|
[TearDown]
|
|
public void PrintRowsOnFailure()
|
|
{
|
|
if (TestContext.CurrentContext.Result.Outcome.Status != TestStatus.Passed)
|
|
{
|
|
TestContext.Out.WriteLine(
|
|
k_csvHeader +
|
|
Environment.NewLine +
|
|
string.Join(Environment.NewLine, m_rows));
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Tracks the callback assignment lifecycle for a data-change monitored variable.
|
|
/// </summary>
|
|
[Test]
|
|
public void DataChangeMonitoredItemCallbackLifecycle()
|
|
{
|
|
var nodeId = new NodeId("occupancyVar", 1);
|
|
var node = new BaseDataVariableState(null)
|
|
{
|
|
NodeId = nodeId,
|
|
BrowseName = new QualifiedName("occupancyVar", 1),
|
|
DataType = DataTypeIds.Int32
|
|
};
|
|
|
|
(Mock<IAsyncNodeManager> nodeManagerMock, Mock<IServerInternal> serverMock) = CreateMinimalMocks();
|
|
Mock<IDataChangeMonitoredItem2> itemMock = CreateDataChangeItemMock(10u);
|
|
|
|
m_rows.Add(BuildRow("Before", node));
|
|
Assert.That(node.OnStateChangedAsync, Is.Null, "OnStateChangedAsync must be null before monitoring.");
|
|
Assert.That(TotalBehaviorNonNull(node), Is.Zero);
|
|
|
|
using var monitoredNode = new MonitoredNode2(nodeManagerMock.Object, serverMock.Object, node);
|
|
|
|
monitoredNode.Add(itemMock.Object);
|
|
m_rows.Add(BuildRow("DataChangeAdded", node));
|
|
Assert.That(TotalBehaviorNonNull(node), Is.EqualTo(1));
|
|
Assert.That(node.OnStateChangedAsync, Is.Not.Null,
|
|
"MonitoredNode2.Add(IDataChangeMonitoredItem2) must install OnStateChangedAsync.");
|
|
Assert.That(node.OnReportEventAsync, Is.Null,
|
|
"OnReportEventAsync must remain null for data-change-only monitoring.");
|
|
|
|
monitoredNode.Remove(itemMock.Object);
|
|
m_rows.Add(BuildRow("DataChangeRemoved", node));
|
|
Assert.That(TotalBehaviorNonNull(node), Is.Zero);
|
|
Assert.That(node.OnStateChangedAsync, Is.Null,
|
|
"OnStateChangedAsync must be cleared after last data-change item removed.");
|
|
}
|
|
|
|
/// <summary>
|
|
/// Tracks the callback assignment lifecycle for an event monitored item.
|
|
/// </summary>
|
|
[Test]
|
|
public void EventMonitoredItemCallbackLifecycle()
|
|
{
|
|
var node = new BaseObjectState(null)
|
|
{
|
|
NodeId = new NodeId("occupancyObj", 1),
|
|
BrowseName = new QualifiedName("occupancyObj", 1)
|
|
};
|
|
|
|
(Mock<IAsyncNodeManager> nodeManagerMock, Mock<IServerInternal> serverMock) = CreateMinimalMocks();
|
|
Mock<IEventMonitoredItem> eventItemMock = CreateEventItemMock(20u);
|
|
|
|
m_rows.Add(BuildRow("EventBefore", node));
|
|
Assert.That(node.OnReportEventAsync, Is.Null, "OnReportEventAsync must be null before event monitoring.");
|
|
Assert.That(TotalBehaviorNonNull(node), Is.Zero);
|
|
|
|
using var monitoredNode = new MonitoredNode2(nodeManagerMock.Object, serverMock.Object, node);
|
|
|
|
monitoredNode.Add(eventItemMock.Object);
|
|
m_rows.Add(BuildRow("EventAdded", node));
|
|
Assert.That(TotalBehaviorNonNull(node), Is.EqualTo(1));
|
|
Assert.That(node.OnReportEventAsync, Is.Not.Null,
|
|
"MonitoredNode2.Add(IEventMonitoredItem) must install OnReportEventAsync.");
|
|
Assert.That(node.OnStateChangedAsync, Is.Null,
|
|
"OnStateChangedAsync must remain null for event-only monitoring.");
|
|
|
|
monitoredNode.Remove(eventItemMock.Object);
|
|
m_rows.Add(BuildRow("EventRemoved", node));
|
|
Assert.That(TotalBehaviorNonNull(node), Is.Zero);
|
|
Assert.That(node.OnReportEventAsync, Is.Null,
|
|
"OnReportEventAsync must be cleared after last event item removed.");
|
|
}
|
|
|
|
/// <summary>
|
|
/// Tracks co-occurrence when both a data-change item and an event item are
|
|
/// present simultaneously: both callbacks are installed.
|
|
/// </summary>
|
|
[Test]
|
|
public void DataChangeAndEventCoOccurrenceBothCallbacksPresent()
|
|
{
|
|
var node = new BaseObjectState(null)
|
|
{
|
|
NodeId = new NodeId("occupancyBoth", 1),
|
|
BrowseName = new QualifiedName("occupancyBoth", 1)
|
|
};
|
|
|
|
(Mock<IAsyncNodeManager> nodeManagerMock, Mock<IServerInternal> serverMock) = CreateMinimalMocks();
|
|
Mock<IDataChangeMonitoredItem2> dataItemMock = CreateDataChangeItemMock(30u);
|
|
Mock<IEventMonitoredItem> eventItemMock = CreateEventItemMock(31u);
|
|
|
|
using var monitoredNode = new MonitoredNode2(nodeManagerMock.Object, serverMock.Object, node);
|
|
monitoredNode.Add(dataItemMock.Object);
|
|
monitoredNode.Add(eventItemMock.Object);
|
|
|
|
m_rows.Add(BuildRow("BothCallbacks", node));
|
|
|
|
Assert.That(node.OnStateChangedAsync, Is.Not.Null,
|
|
"OnStateChangedAsync must be set when data-change item is added.");
|
|
Assert.That(node.OnReportEventAsync, Is.Not.Null,
|
|
"OnReportEventAsync must be set when event item is added.");
|
|
Assert.That(TotalBehaviorNonNull(node), Is.EqualTo(2),
|
|
"Exactly 2 behavior callbacks must be occupied for combined monitoring.");
|
|
|
|
monitoredNode.Remove(dataItemMock.Object);
|
|
Assert.That(node.OnStateChangedAsync, Is.Null);
|
|
Assert.That(node.OnReportEventAsync, Is.Not.Null);
|
|
Assert.That(TotalBehaviorNonNull(node), Is.EqualTo(1));
|
|
monitoredNode.Remove(eventItemMock.Object);
|
|
Assert.That(node.OnReportEventAsync, Is.Null);
|
|
Assert.That(TotalBehaviorNonNull(node), Is.Zero);
|
|
m_rows.Add(BuildRow("BothRemoved", node));
|
|
}
|
|
|
|
/// <summary>
|
|
/// Verifies that Description and RolePermissions are not modified by
|
|
/// <see cref="MonitoredNode2"/> machinery.
|
|
/// </summary>
|
|
[Test]
|
|
public void DescriptionAndRolePermissionsNotModifiedByMonitoring()
|
|
{
|
|
var node = new BaseDataVariableState(null)
|
|
{
|
|
NodeId = new NodeId("occupancyMeta", 1),
|
|
BrowseName = new QualifiedName("occupancyMeta", 1),
|
|
DataType = DataTypeIds.Int32,
|
|
Description = new LocalizedText("Described variable"),
|
|
RolePermissions = ArrayOf.Wrapped(
|
|
new RolePermissionType { RoleId = new NodeId(1u, 0), Permissions = 0xFF })
|
|
};
|
|
|
|
LocalizedText descriptionBefore = node.Description;
|
|
|
|
(Mock<IAsyncNodeManager> nodeManagerMock, Mock<IServerInternal> serverMock) = CreateMinimalMocks();
|
|
Mock<IDataChangeMonitoredItem2> itemMock = CreateDataChangeItemMock(40u);
|
|
|
|
using var monitoredNode = new MonitoredNode2(nodeManagerMock.Object, serverMock.Object, node);
|
|
monitoredNode.Add(itemMock.Object);
|
|
|
|
m_rows.Add(BuildRow("DescriptionAndPermissionsUnchanged", node));
|
|
|
|
Assert.That(node.Description, Is.EqualTo(descriptionBefore),
|
|
"MonitoredNode2 must not modify Description.");
|
|
Assert.That(node.RolePermissions.IsNull, Is.False);
|
|
Assert.That(node.RolePermissions.Count, Is.EqualTo(1));
|
|
Assert.That(node.RolePermissions[0].RoleId, Is.EqualTo(new NodeId(1u, 0)));
|
|
Assert.That(node.RolePermissions[0].Permissions, Is.EqualTo(0xFFu),
|
|
"MonitoredNode2 must not mutate the permission payload.");
|
|
}
|
|
|
|
private static string BuildRow(string phase, NodeState node)
|
|
{
|
|
return $"{phase}," +
|
|
$"{node.OnStateChangedAsync is not null}," +
|
|
$"{node.OnReportEventAsync is not null}," +
|
|
$"{TotalBehaviorNonNull(node)}";
|
|
}
|
|
|
|
private static int TotalBehaviorNonNull(NodeState n)
|
|
{
|
|
return B(n.OnValidate) +
|
|
B(n.OnStateChanged) +
|
|
B(n.OnStateChangedAsync) +
|
|
B(n.OnReferenceAdded) +
|
|
B(n.OnReferenceRemoved) +
|
|
B(n.OnReportEvent) +
|
|
B(n.OnReportEventAsync) +
|
|
B(n.OnConditionRefresh) +
|
|
B(n.OnCreateBrowser) +
|
|
B(n.OnPopulateBrowser);
|
|
}
|
|
|
|
private static int B(Delegate? d)
|
|
{
|
|
return d is null ? 0 : 1;
|
|
}
|
|
|
|
private static (Mock<IAsyncNodeManager> nodeManagerMock, Mock<IServerInternal> serverMock)
|
|
CreateMinimalMocks()
|
|
{
|
|
return (new Mock<IAsyncNodeManager>(), new Mock<IServerInternal>());
|
|
}
|
|
|
|
private static Mock<IDataChangeMonitoredItem2> CreateDataChangeItemMock(uint id)
|
|
{
|
|
var mock = new Mock<IDataChangeMonitoredItem2>();
|
|
mock.Setup(m => m.Id).Returns(id);
|
|
return mock;
|
|
}
|
|
|
|
private static Mock<IEventMonitoredItem> CreateEventItemMock(uint id)
|
|
{
|
|
var mock = new Mock<IEventMonitoredItem>();
|
|
mock.Setup(m => m.Id).Returns(id);
|
|
return mock;
|
|
}
|
|
|
|
private const string k_csvHeader =
|
|
"Phase," +
|
|
"OnStateChangedAsync," +
|
|
"OnReportEventAsync," +
|
|
"TotalBehaviorNonNull";
|
|
|
|
private readonly List<string> m_rows = [];
|
|
}
|
|
}
|