Skip to content

GSF-12 IndependentActionAdapterManagerBase fixes #356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ritchiecarroll merged 3 commits into from
Jan 21, 2025
Merged

GSF-12 IndependentActionAdapterManagerBase fixes #356

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce9db9b
GSF.TimeSeries: Eliminate queue of input measurement keys
StephenCWills Jan 21, 2025
681d767
GSF.TimeSeries: Filter inactive measurements out of input measurement…
StephenCWills Jan 21, 2025
5a481ed
GSF.TimeSeries: Track adapter index during initialization
StephenCWills Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 15 additions & 24 deletions Source/Libraries/GSF.TimeSeries/Adapters/IndependentActionAdapterManagerBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ namespace GSF.TimeSeries.Adapters
// Fields
private readonly LongSynchronizedOperation m_parseConnectionString;
private readonly LongSynchronizedOperation m_initializeChildAdapters;
private readonly List<MeasurementKey[]> m_inputMeasurementKeysQueue;
private MeasurementKey[] m_inputMeasurementKeysForInitialization;
private bool m_disposed;

#endregion
Expand All @@ -104,8 +104,6 @@ protected IndependentActionAdapterManagerBase()
{
IsBackground = true
};

m_inputMeasurementKeysQueue = new List<MeasurementKey[]>(2);
}

#endregion
Expand Down Expand Up @@ -458,32 +456,21 @@ protected override void Dispose(bool disposing)
/// </remarks>
protected virtual void InitializeChildAdapterManagement(MeasurementKey[] inputMeasurementKeys)
{
lock (m_inputMeasurementKeysQueue)
{
if (m_inputMeasurementKeysQueue.Count < 2)
m_inputMeasurementKeysQueue.Add(inputMeasurementKeys);
else
m_inputMeasurementKeysQueue[1] = inputMeasurementKeys;

m_initializeChildAdapters.RunOnceAsync();
}
Interlocked.Exchange(ref m_inputMeasurementKeysForInitialization, inputMeasurementKeys);
m_initializeChildAdapters.RunOnceAsync();
}

private void InitializeChildAdapters()
{
MeasurementKey[] inputMeasurementKeys;

lock (m_inputMeasurementKeysQueue)
try
{
if (m_inputMeasurementKeysQueue.Count == 0)
return;
MeasurementKey[] inputMeasurementKeys = Interlocked.Exchange(ref m_inputMeasurementKeysForInitialization, null);

inputMeasurementKeys = m_inputMeasurementKeysQueue[0];
m_inputMeasurementKeysQueue.RemoveAt(0);
}
// Indicates an extremely unlikely race condition occurred,
// but this is expected so don't issue a warning
if (inputMeasurementKeys is null)
return;

try
{
// If no inputs are defined, skip setup
if (inputMeasurementKeys.Length == 0)
{
Expand Down Expand Up @@ -544,9 +531,9 @@ private void InitializeChildAdapters()
}

// Create child adapter for provided inputs to the parent bulk collection-based adapter
for (int i = 0; i < inputMeasurementKeys.Length; i += inputsPerAdapter)
for (int i = 0, adapterIndex = 0; i < inputMeasurementKeys.Length; i += inputsPerAdapter, adapterIndex++)
{
CurrentAdapterIndex = adapters.Count;
CurrentAdapterIndex = adapterIndex;
inputsPerAdapter = PerAdapterInputCount;

Guid[] inputs = new Guid[inputsPerAdapter];
Expand Down Expand Up @@ -653,6 +640,10 @@ public virtual void ParseConnectionString()
{
this.HandleParseConnectionString();

InputMeasurementKeys = InputMeasurementKeys
.Where(key => this.SignalIDExists(key.SignalID))
.ToArray();

if (FramesPerSecond < 1)
FramesPerSecond = DefaultFramesPerSecond;

Expand Down