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
326 lines
13 KiB
C#
326 lines
13 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/
|
|
* ======================================================================*/
|
|
|
|
// CA2000: test code; many disposables are ownership-transferred to test fixtures or short-lived,
|
|
// making CA2000 noisy without a real leak risk. Disabled file-level for the suite.
|
|
#pragma warning disable CA2000
|
|
using System;
|
|
using System.Collections.Concurrent;
|
|
using System.Collections.Generic;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Tests;
|
|
|
|
namespace Opc.Ua.Core.Tests.Stack.State
|
|
{
|
|
/// <summary>
|
|
/// Tests for concurrency issues in BaseVariableState class
|
|
/// </summary>
|
|
[TestFixture]
|
|
[SetCulture("en-us")]
|
|
[SetUICulture("en-us")]
|
|
[Category("NodeStateConcurrency")]
|
|
[Parallelizable(ParallelScope.All)]
|
|
public class NodeStateCollectionConcurrencyTests
|
|
{
|
|
[Test]
|
|
public async Task AtomicReferenceMutationPublishesExactlyOneWinnerPerKeyAsync()
|
|
{
|
|
var node = new BaseObjectState(null);
|
|
const int k_count = 128;
|
|
const int k_workers = 8;
|
|
int addedCallbacks = 0;
|
|
int removedCallbacks = 0;
|
|
node.OnReferenceAdded = (_, _, _, _) => Interlocked.Increment(ref addedCallbacks);
|
|
node.OnReferenceRemoved = (_, _, _, _) => Interlocked.Increment(ref removedCallbacks);
|
|
var start = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
|
|
var workers = new Task[k_workers];
|
|
for (int worker = 0; worker < workers.Length; worker++)
|
|
{
|
|
workers[worker] = Task.Run(async () =>
|
|
{
|
|
await start.Task.ConfigureAwait(false);
|
|
for (uint index = 1; index <= k_count; index++)
|
|
{
|
|
node.AddReferenceIfMissing(ReferenceTypeIds.HasComponent, false, new NodeId(index, 1));
|
|
Assert.That(node.ReferenceExists(
|
|
ReferenceTypeIds.HasComponent, false, new NodeId(index, 1)), Is.True);
|
|
}
|
|
});
|
|
}
|
|
start.SetResult(true);
|
|
await Task.WhenAll(workers).WaitAsync(TimeSpan.FromSeconds(30)).ConfigureAwait(false);
|
|
var snapshot = new List<IReference>();
|
|
node.GetReferences(null, snapshot);
|
|
Assert.That(snapshot, Has.Count.EqualTo(k_count));
|
|
Assert.That(addedCallbacks, Is.EqualTo(k_count));
|
|
for (int worker = 0; worker < workers.Length; worker++)
|
|
{
|
|
workers[worker] = Task.Run(() =>
|
|
{
|
|
for (uint index = 1; index <= k_count; index++)
|
|
{
|
|
node.RemoveReference(ReferenceTypeIds.HasComponent, false, new NodeId(index, 1));
|
|
}
|
|
});
|
|
}
|
|
await Task.WhenAll(workers).WaitAsync(TimeSpan.FromSeconds(30)).ConfigureAwait(false);
|
|
var current = new List<IReference>();
|
|
node.GetReferences(null, current);
|
|
Assert.That(current, Is.Empty);
|
|
Assert.That(removedCallbacks, Is.EqualTo(k_count));
|
|
Assert.That(snapshot, Has.Count.EqualTo(k_count));
|
|
var targets = new HashSet<ExpandedNodeId>();
|
|
foreach (IReference reference in snapshot)
|
|
{
|
|
Assert.That(reference.ReferenceTypeId, Is.EqualTo(ReferenceTypeIds.HasComponent));
|
|
Assert.That(reference.IsInverse, Is.False);
|
|
Assert.That(targets.Add(reference.TargetId), Is.True);
|
|
}
|
|
for (uint index = 1; index <= k_count; index++)
|
|
{
|
|
Assert.That(targets, Does.Contain(new ExpandedNodeId(new NodeId(index, 1))));
|
|
}
|
|
}
|
|
|
|
[Test]
|
|
[CancelAfter(10000)]
|
|
public void NodeStateReferencesCollectionConcurrencyTest(
|
|
CancellationToken cancellationToken)
|
|
{
|
|
ITelemetryContext telemetry = NUnitTelemetryContext.Create();
|
|
|
|
var testNodeState = new AnalogUnitRangeState(null);
|
|
var serviceMessageContext = ServiceMessageContext.Create(telemetry);
|
|
|
|
var systemContext = new SystemContext(telemetry)
|
|
{
|
|
NamespaceUris = serviceMessageContext.NamespaceUris
|
|
};
|
|
|
|
testNodeState.Create(
|
|
new SystemContext(telemetry) { NamespaceUris = serviceMessageContext.NamespaceUris },
|
|
new NodeId("TestNode", 7),
|
|
new QualifiedName("TestNode", 7),
|
|
new LocalizedText("TestNode"),
|
|
true);
|
|
|
|
var references = new List<IReference>();
|
|
|
|
testNodeState.GetReferences(systemContext, references);
|
|
|
|
int originalReferenceCount = references.Count;
|
|
|
|
uint index = 0;
|
|
var referenceTargets = new BlockingCollection<ExpandedNodeId>();
|
|
|
|
var task = Task.Run(
|
|
() =>
|
|
{
|
|
DateTime utcNow = DateTime.UtcNow;
|
|
|
|
while (DateTime.UtcNow - utcNow < TimeSpan.FromSeconds(3))
|
|
{
|
|
var target = new ExpandedNodeId(index++, "test.namespace");
|
|
testNodeState.AddReference(ReferenceTypeIds.HasComponent, false, target);
|
|
referenceTargets.Add(target);
|
|
}
|
|
|
|
referenceTargets.CompleteAdding();
|
|
},
|
|
cancellationToken);
|
|
|
|
foreach (ExpandedNodeId target in referenceTargets.GetConsumingEnumerable(
|
|
cancellationToken))
|
|
{
|
|
bool removeReferenceSuccess = testNodeState.RemoveReference(
|
|
ReferenceTypeIds.HasComponent,
|
|
false,
|
|
target);
|
|
Assert.That(removeReferenceSuccess, Is.True);
|
|
}
|
|
|
|
task.Wait(cancellationToken);
|
|
|
|
references.Clear();
|
|
testNodeState.GetReferences(systemContext, references);
|
|
|
|
Assert.That(references, Has.Count.EqualTo(originalReferenceCount));
|
|
}
|
|
|
|
[Test]
|
|
[CancelAfter(10000)]
|
|
public void NodeStateNotifiersCollectionConcurrencyTest(CancellationToken cancellationToken)
|
|
{
|
|
ITelemetryContext telemetry = NUnitTelemetryContext.Create();
|
|
|
|
var serviceMessageContext = ServiceMessageContext.Create(telemetry);
|
|
var systemContext = new SystemContext(telemetry)
|
|
{
|
|
NamespaceUris = serviceMessageContext.NamespaceUris
|
|
};
|
|
|
|
var testNodeState = new BaseObjectState(null);
|
|
|
|
testNodeState.Create(
|
|
new SystemContext(telemetry) { NamespaceUris = serviceMessageContext.NamespaceUris },
|
|
new NodeId("TestNode", 7),
|
|
new QualifiedName("TestNode", 7),
|
|
new LocalizedText("TestNode"),
|
|
true);
|
|
|
|
var notifiers = new List<NodeState.Notifier>();
|
|
|
|
testNodeState.GetNotifiers(systemContext, notifiers);
|
|
|
|
int originalNotifierCount = notifiers.Count;
|
|
|
|
uint index = 0;
|
|
var notifierTargets = new BlockingCollection<NodeState>();
|
|
|
|
var task = Task.Run(
|
|
() =>
|
|
{
|
|
DateTime utcNow = DateTime.UtcNow;
|
|
|
|
while (DateTime.UtcNow - utcNow < TimeSpan.FromSeconds(3))
|
|
{
|
|
var targetState = new AnalogUnitRangeState(null);
|
|
|
|
testNodeState.Create(
|
|
new SystemContext(telemetry)
|
|
{
|
|
NamespaceUris = serviceMessageContext.NamespaceUris
|
|
},
|
|
new NodeId("TestNode", 7),
|
|
new QualifiedName("TestNode", 7),
|
|
new LocalizedText("TestNode"),
|
|
true);
|
|
|
|
var target = new ExpandedNodeId(index++, "test.namespace");
|
|
testNodeState.AddNotifier(
|
|
systemContext,
|
|
ReferenceTypeIds.HasEventSource,
|
|
false,
|
|
targetState);
|
|
notifierTargets.Add(targetState);
|
|
}
|
|
|
|
notifierTargets.CompleteAdding();
|
|
},
|
|
cancellationToken);
|
|
|
|
foreach (NodeState target in notifierTargets.GetConsumingEnumerable(cancellationToken))
|
|
{
|
|
testNodeState.RemoveNotifier(systemContext, target, false);
|
|
}
|
|
|
|
task.Wait(cancellationToken);
|
|
|
|
notifiers.Clear();
|
|
testNodeState.GetNotifiers(systemContext, notifiers);
|
|
|
|
Assert.That(notifiers, Has.Count.EqualTo(originalNotifierCount));
|
|
}
|
|
|
|
[Test]
|
|
[CancelAfter(10000)]
|
|
public void NodeStateChildrenCollectionConcurrencyTest(CancellationToken cancellationToken)
|
|
{
|
|
ITelemetryContext telemetry = NUnitTelemetryContext.Create();
|
|
|
|
var serviceMessageContext = ServiceMessageContext.Create(telemetry);
|
|
var systemContext = new SystemContext(telemetry)
|
|
{
|
|
NamespaceUris = serviceMessageContext.NamespaceUris
|
|
};
|
|
|
|
var testNodeState = new BaseObjectState(null);
|
|
|
|
testNodeState.Create(
|
|
new SystemContext(telemetry) { NamespaceUris = serviceMessageContext.NamespaceUris },
|
|
new NodeId("TestNode", 7),
|
|
new QualifiedName("TestNode", 7),
|
|
new LocalizedText("TestNode"),
|
|
true);
|
|
|
|
var children = new List<BaseInstanceState>();
|
|
|
|
testNodeState.GetChildren(systemContext, children);
|
|
|
|
int originalNotifierCount = children.Count;
|
|
|
|
uint index = 0;
|
|
var childrenCollection = new BlockingCollection<BaseInstanceState>();
|
|
|
|
var task = Task.Run(
|
|
() =>
|
|
{
|
|
DateTime utcNow = DateTime.UtcNow;
|
|
|
|
while (DateTime.UtcNow - utcNow < TimeSpan.FromSeconds(3))
|
|
{
|
|
var targetState = new AnalogUnitRangeState(null);
|
|
|
|
testNodeState.Create(
|
|
new SystemContext(telemetry)
|
|
{
|
|
NamespaceUris = serviceMessageContext.NamespaceUris
|
|
},
|
|
new NodeId("TestNode", 7),
|
|
new QualifiedName("TestNode", 7),
|
|
new LocalizedText("TestNode"),
|
|
true);
|
|
|
|
var target = new ExpandedNodeId(index++, "test.namespace");
|
|
testNodeState.AddChild(targetState);
|
|
childrenCollection.Add(targetState);
|
|
}
|
|
|
|
childrenCollection.CompleteAdding();
|
|
},
|
|
cancellationToken);
|
|
|
|
foreach (BaseInstanceState child in childrenCollection.GetConsumingEnumerable(
|
|
cancellationToken))
|
|
{
|
|
testNodeState.RemoveChild(child);
|
|
}
|
|
|
|
task.Wait(cancellationToken);
|
|
|
|
children.Clear();
|
|
testNodeState.GetChildren(systemContext, children);
|
|
|
|
Assert.That(children, Has.Count.EqualTo(originalNotifierCount));
|
|
}
|
|
}
|
|
}
|