mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-22 01:26:20 +08:00
9b034f8291
# Description Nullable reference types are now enabled once, in `common.props`, and every project in the repository builds warning-clean with them. **Configuration** - `<Nullable>enable</Nullable>` lives in `common.props`. All per-project `<Nullable>` settings are removed: 178 project files (enable, annotations, and the `disable` in the three Aot test projects). - 419 per-file `#nullable enable`/`restore` directives and the 4 `#nullable disable` directives are removed. - Kept on purpose: - The 5 `<auto-generated>` schema files (`UANodeSet.cs`, `UA Type Dictionary.cs`, `OPCBinarySchema.cs`, `SecuredApplication.cs`, `PInvokeHelper.cs`) keep `#nullable enable`. The compiler ignores the project setting in generated code, so the directive is required there. - `tests/Opc.Ua.Interop.LegacyPeer` keeps `disable`. It builds against the 1.5.378 packages and does not import the repository props. - `docs/DeveloperGuide.md` and `.github/copilot-instructions.md` now describe the central setting. **Migration** (the 43 unset and 13 annotations-only projects, roughly 10k diagnostics) - **Production code: annotated at the declarations.** Covers `tools/Opc.Ua.SourceGeneration.Core`, `src/Opc.Ua.Lds.Server` and the LDS sample. - Members, parameters and returns are nullable where null actually flows. - Null-check helpers carry `[NotNullWhen]` (`IsNull`, `IsValidXmlName`, `IsMethodTypeDesign`). - `CoreUtils.Format`, `Utils.Format`, `ITemplateWriter.WriteLine` take `params object?[]`. `Template.AddReplacement` takes `string?` (rendering already skips null replacements). - `IRegisteredServerStore.RegisterAsync` returns `Task<RegistrationEntry?>`: it returns null when a registration is removed. - Dereferences backed by an invariant (for example, the validated model) use `!`, so runtime behaviour is unchanged. - **Behavioural changes in production code** (small, deliberate): - `NodeSetToModelDesign` throws `InvalidOperationException` when the file is not a NodeSet. Before, it threw a NullReferenceException on the next line. - `ModelDesignValidator` starts its lookup tables empty instead of null. A redundant `if (m_nodes == null) return;` guard is gone. - **Test code: minimal annotations.** - `?` on values that can be null, `!` where the test asserts non-null. - `= null!` for fixture members assigned in SetUp. - `TryGetStructure<T>(out T? x)` where the inferred `T?` broke the `IEncodeable` constraint. - A few redundant `== null` checks on structs (`NodeId`, `ArrayOf<T>`) folded into the adjacent `IsNull`/`Count` checks. **Notes for reviewers** - The diff is large (~1,500 files) but almost entirely mechanical: `?`, `!` and directive removal. The non-annotation changes are listed above. - Known follow-up, not done here: `IModelDesign.Namespaces/TargetNamespace/NamespaceUris` stay non-nullable even though the validator returns null before it loads a dictionary. Making them nullable would ripple through every generator call site. ## Related Issues - Fixes #4439 ## 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. - [ ] I have added tests that prove my fix is effective or that my feature works and increased code coverage. - [x] I have added all necessary documentation. - [x] I have verified that my changes do not introduce (new) build or analyzer warnings. - [ ] I ran **all** tests locally using the **UA.slnx** solution against at least .net **framework** and .net **10**, and all passed. - [ ] I fixed **all** failing and flaky tests in the CI pipelines and **all** CodeQL warnings. - [ ] I have addressed **all** PR feedback received. The "no new warnings" box covers net10.0 and net48: full non-incremental builds of `UA.slnx`, `tools/SourceGeneration.slnx`, `tools/MigrationAnalyzer.slnx` and the Aot test projects finished with 0 warnings and 0 errors under the repository's warnings-as-errors settings. net9.0 and net8.0 also had no nullable diagnostics, but they were not rebuilt after the final fixes. Tests have not been run locally yet. 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
212 lines
8.5 KiB
C#
212 lines
8.5 KiB
C#
using BenchmarkDotNet.Attributes;
|
|
using BenchmarkDotNet.Configs;
|
|
using Moq;
|
|
using Opc.Ua.Tests;
|
|
|
|
namespace Opc.Ua.Server.Tests
|
|
{
|
|
[GroupBenchmarksBy(BenchmarkLogicalGroupRule.ByCategory)]
|
|
[MemoryDiagnoser]
|
|
// CA1001: benchmark class; ownership/disposal is handled by BenchmarkDotNet's
|
|
// [GlobalSetup]/[GlobalCleanup] lifecycle.
|
|
#pragma warning disable CA1001
|
|
public class MonitoredItemBenchmarks
|
|
#pragma warning restore CA1001
|
|
{
|
|
private DataValue m_valueDouble;
|
|
private DataValue m_lastValueDouble;
|
|
private DataValue m_valueFloat;
|
|
private DataValue m_lastValueFloat;
|
|
private DataValue m_valueArrayDouble;
|
|
private DataValue m_lastValueArrayDouble;
|
|
private DataChangeFilter m_filter = null!;
|
|
private MonitoredItem m_monitoredItem = null!;
|
|
private MonitoredItemQueueFactory m_queueFactory = null!;
|
|
private BaseEventState m_event1 = null!;
|
|
private BaseEventState m_event2 = null!;
|
|
private readonly double m_range = 100.0;
|
|
private const int kIterations = 10000;
|
|
private static readonly double[] s_value = [1.0, 2.0, 3.0, 4.0, 5.0];
|
|
private static readonly double[] s_valueArray = [1.0, 2.0, 3.0, 4.0, 5.0];
|
|
|
|
[GlobalSetup]
|
|
public void Setup()
|
|
{
|
|
m_valueDouble = new DataValue(new Variant(10.0));
|
|
m_lastValueDouble = new DataValue(new Variant(10.0));
|
|
m_valueFloat = new DataValue(new Variant(10.0f));
|
|
m_lastValueFloat = new DataValue(new Variant(10.0f));
|
|
m_valueArrayDouble = new DataValue(new Variant(s_value));
|
|
m_lastValueArrayDouble = new DataValue(new Variant(s_valueArray));
|
|
m_filter = new DataChangeFilter
|
|
{
|
|
Trigger = DataChangeTrigger.StatusValue
|
|
};
|
|
|
|
ITelemetryContext telemetry = NUnitTelemetryContext.Create();
|
|
|
|
var eventFilter = new EventFilter
|
|
{
|
|
SelectClauses = [
|
|
new SimpleAttributeOperand
|
|
{
|
|
TypeDefinitionId = ObjectTypeIds.BaseEventType,
|
|
BrowsePath = [new QualifiedName(BrowseNames.EventId)],
|
|
AttributeId = Attributes.Value
|
|
},
|
|
new SimpleAttributeOperand
|
|
{
|
|
TypeDefinitionId = ObjectTypeIds.BaseEventType,
|
|
BrowsePath = [new QualifiedName(BrowseNames.EventType)],
|
|
AttributeId = Attributes.Value
|
|
},
|
|
new SimpleAttributeOperand
|
|
{
|
|
TypeDefinitionId = ObjectTypeIds.BaseEventType,
|
|
BrowsePath = [new QualifiedName(BrowseNames.SourceNode)],
|
|
AttributeId = Attributes.Value
|
|
},
|
|
new SimpleAttributeOperand
|
|
{
|
|
TypeDefinitionId = ObjectTypeIds.BaseEventType,
|
|
BrowsePath = [new QualifiedName(BrowseNames.SourceName)],
|
|
AttributeId = Attributes.Value
|
|
},
|
|
new SimpleAttributeOperand
|
|
{
|
|
TypeDefinitionId = ObjectTypeIds.BaseEventType,
|
|
BrowsePath = [new QualifiedName(BrowseNames.Time)],
|
|
AttributeId = Attributes.Value
|
|
},
|
|
new SimpleAttributeOperand
|
|
{
|
|
TypeDefinitionId = ObjectTypeIds.BaseEventType,
|
|
BrowsePath = [new QualifiedName(BrowseNames.ReceiveTime)],
|
|
AttributeId = Attributes.Value
|
|
},
|
|
new SimpleAttributeOperand
|
|
{
|
|
TypeDefinitionId = ObjectTypeIds.BaseEventType,
|
|
BrowsePath = [new QualifiedName(BrowseNames.Message)],
|
|
AttributeId = Attributes.Value
|
|
},
|
|
new SimpleAttributeOperand
|
|
{
|
|
TypeDefinitionId = ObjectTypeIds.BaseEventType,
|
|
BrowsePath = [new QualifiedName(BrowseNames.Severity)],
|
|
AttributeId = Attributes.Value
|
|
}
|
|
],
|
|
|
|
WhereClause = new ContentFilter
|
|
{
|
|
Elements = [
|
|
new ContentFilterElement
|
|
{
|
|
FilterOperator = FilterOperator.GreaterThanOrEqual,
|
|
FilterOperands = [
|
|
new ExtensionObject(new SimpleAttributeOperand
|
|
{
|
|
TypeDefinitionId = ObjectTypeIds.BaseEventType,
|
|
BrowsePath = [new QualifiedName(BrowseNames.Severity)],
|
|
AttributeId = Attributes.Value
|
|
}),
|
|
new ExtensionObject(new LiteralOperand { Value = Variant.From((ushort)100) })
|
|
]
|
|
}
|
|
]
|
|
}
|
|
};
|
|
|
|
var serverMock = new Mock<IServerInternal>();
|
|
serverMock.Setup(s => s.Telemetry).Returns(telemetry);
|
|
serverMock.Setup(s => s.NamespaceUris).Returns(new NamespaceTable());
|
|
serverMock.Setup(s => s.TypeTree).Returns(new TypeTable(new NamespaceTable()));
|
|
m_queueFactory = new MonitoredItemQueueFactory(telemetry);
|
|
serverMock.Setup(s => s.MonitoredItemQueueFactory).Returns(m_queueFactory);
|
|
|
|
var nodeManagerMock = new Mock<IAsyncNodeManager>();
|
|
|
|
m_monitoredItem = new MonitoredItem(
|
|
serverMock.Object,
|
|
nodeManagerMock.Object,
|
|
null!,
|
|
1,
|
|
2,
|
|
new ReadValueId { NodeId = ObjectIds.Server },
|
|
DiagnosticsMasks.All,
|
|
TimestampsToReturn.Both,
|
|
MonitoringMode.Reporting,
|
|
3,
|
|
eventFilter,
|
|
eventFilter,
|
|
null,
|
|
1000.0,
|
|
1,
|
|
true,
|
|
1000);
|
|
|
|
var systemContext = new SystemContext(telemetry)
|
|
{
|
|
NamespaceUris = serverMock.Object.NamespaceUris
|
|
};
|
|
m_event1 = new BaseEventState(null);
|
|
m_event1.Initialize(systemContext, null, EventSeverity.Medium, new LocalizedText("Event 1"));
|
|
m_event1.SetChildValue(systemContext, BrowseNames.SourceNode, ObjectIds.Server, false);
|
|
m_event1.SetChildValue(systemContext, BrowseNames.SourceName, "Internal 1", false);
|
|
|
|
m_event2 = new BaseEventState(null);
|
|
m_event2.Initialize(systemContext, null, EventSeverity.High, new LocalizedText("Event 2"));
|
|
m_event2.SetChildValue(systemContext, BrowseNames.SourceNode, ObjectIds.Server, false);
|
|
m_event2.SetChildValue(systemContext, BrowseNames.SourceName, "Internal 2", false);
|
|
}
|
|
|
|
[GlobalCleanup]
|
|
public void Cleanup()
|
|
{
|
|
m_monitoredItem?.Dispose();
|
|
m_queueFactory?.Dispose();
|
|
}
|
|
|
|
[Benchmark]
|
|
[BenchmarkCategory("Double")]
|
|
public void ValueChangedDoubleSame()
|
|
{
|
|
for (int i = 0; i < kIterations; i++)
|
|
{
|
|
MonitoredItem.ValueChanged(m_valueDouble, null!, m_lastValueDouble, null!, m_filter, m_range);
|
|
}
|
|
}
|
|
|
|
[Benchmark]
|
|
[BenchmarkCategory("Float")]
|
|
public void ValueChangedFloatSame()
|
|
{
|
|
for (int i = 0; i < kIterations; i++)
|
|
{
|
|
MonitoredItem.ValueChanged(m_valueFloat, null!, m_lastValueFloat, null!, m_filter, m_range);
|
|
}
|
|
}
|
|
|
|
[Benchmark]
|
|
[BenchmarkCategory("DoubleArray")]
|
|
public void ValueChangedDoubleArraySame()
|
|
{
|
|
for (int i = 0; i < kIterations; i++)
|
|
{
|
|
MonitoredItem.ValueChanged(m_valueArrayDouble, null!, m_lastValueArrayDouble, null!, m_filter, m_range);
|
|
}
|
|
}
|
|
|
|
[Benchmark]
|
|
[BenchmarkCategory("Event")]
|
|
public void QueueEvent()
|
|
{
|
|
for (int i = 0; i < kIterations; i++)
|
|
{
|
|
m_monitoredItem.QueueEvent(i % 2 == 0 ? m_event1 : m_event2);
|
|
}
|
|
}
|
|
}
|
|
}
|