Skip to content

Tuning sequncer perfomance #310

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
PTKu merged 11 commits into from
Dec 21, 2023
Merged

Tuning sequncer perfomance #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c119155
Tuning sequncer perfomance
Dec 14, 2023
b4b1341
Sequncer Optimalization
Dec 19, 2023
51f62ed
Merge branch 'dev-2311' into 305-from-dev2311-Investigate_performance…
Dec 19, 2023
808fc2d
Unit Sequnce optimalization
Dec 19, 2023
315e306
AxoTask ShouldRender override - render only for some properties
Dec 20, 2023
ba5bfc6
AxoComponnent ShouldRender override - only when _isManuallyControllab…
Dec 20, 2023
14053b6
Merge branch 'dev-2311' into 305-from-dev2311-Investigate_performance…
Dec 20, 2023
b28156c
Merge branch 'UnitComponent-to-Context' into 305-from-dev2311-Investi…
Dec 21, 2023
08e82ae
Conditional rendering for data, components and setting in Unit.razor
Dec 21, 2023
da03cb2
axo task view pooling reduction
Dec 21, 2023
426a50e
Merge branch 'dev-2311' into 305-from-dev2311-Investigate_performance…
PTKu Dec 21, 2023
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
71 changes: 48 additions & 23 deletions src/core/src/AXOpen.Core.Blazor/AxoComponent/AxoComponentView.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

namespace AXOpen.Core
{

public partial class AxoComponentView : RenderableComplexComponentBase<AxoComponent>, IDisposable
{
private bool areDetailsCollapsed = true;
Expand All @@ -32,6 +31,8 @@ public partial class AxoComponentView : RenderableComplexComponentBase<AxoCompon
[Parameter]
public bool IsControllable { get; set; }

private Pocos.AXOpen.Core.AxoComponent _lastPocoValue = new();

public override void AddToPolling(ITwinElement element, int pollingInterval = 250)
{
if (element is AxoComponent axoComponent)
Expand Down Expand Up @@ -61,6 +62,7 @@ private IEnumerable<ITwinElement> GetAllKidsWithComponentDetailsAttribute(ITwinO
}

private ITwinObject header;

private ITwinObject Header
{
get
Expand All @@ -70,7 +72,11 @@ private ITwinObject Header
.ToList());
}
}
private IEnumerable<ITwinObject> DetailsTabs => CreateDetailsTabs();

private IEnumerable<ITwinObject> DetailsTabs
{
get { return detailsTabs = detailsTabs ?? CreateDetailsTabs(); }
}

private IEnumerable<ITwinObject> CreateDetailsTabs()
{
Expand Down Expand Up @@ -105,15 +111,34 @@ private IEnumerable<ITwinObject> CreateDetailsTabs()
return _detailsTabs;
}

protected override void OnInitialized()
protected override async void OnInitialized()
{
base.OnInitialized();
containsHeaderAttribute = this.Header.GetKids().Count() != 0;
tabNames = GetAllTabNames(this.Component);
containsDetailsAttribute = this.DetailsTabs.Count() != 0;

// read variables that are needed for fist render
var requstedVariablesForFistRender = new List<ITwinPrimitive>() { Component._isManuallyControllable };
await Component.GetConnector().ReadBatchAsync(requstedVariablesForFistRender);

UpdateValuesOnChange(Component);
}

protected override bool ShouldRender()
{
if (_lastPocoValue._isManuallyControllable != this.Component._isManuallyControllable.LastValue)
{
saveLastPocoValue();
return true;
}

return true;
}


private void saveLastPocoValue()
{
_lastPocoValue._isManuallyControllable = this.Component._isManuallyControllable.LastValue;
}

protected override async Task OnInitializedAsync()
Expand All @@ -128,7 +153,6 @@ protected override async Task OnInitializedAsync()
await base.OnInitializedAsync();
}


private bool DisplayByTheRole(string role)
{
if (identities != null && role != null)
Expand All @@ -149,58 +173,60 @@ private bool DisplayByTheRole(string role)
return false;
}


[Inject]
private AuthenticationStateProvider? AuthenticationStateProvider { get; set; }

private async Task<IEnumerable<ClaimsIdentity>?> GetClaimsIdentitiesAsync()
{
var authenticationState = await AuthenticationStateProvider.GetAuthenticationStateAsync();
return authenticationState?.User?.Identities;
}
private IEnumerable<AxoMessenger>? Messengers => this.Component?.GetChildren().Flatten(p => p.GetChildren()).OfType<AxoMessenger>();

private IEnumerable<AxoMessenger>? Messengers => this.Component?.GetChildren().Flatten(p => p.GetChildren()).OfType<AxoMessenger>();

private eAlarmLevel AlarmLevel
{
get
{

var _messengers = Messengers?.ToList();
if (_messengers == null) { return eAlarmLevel.NoAlarms; }

if (_messengers.Any(p => p.State > eAxoMessengerState.Idle))
{

var seriousness = (eAxoMessageCategory)_messengers.Max(p => p.Category.LastValue);

switch (seriousness)
{
case eAxoMessageCategory.All:
case eAxoMessageCategory.Trace:
case eAxoMessageCategory.Debug:
case eAxoMessageCategory.All:
case eAxoMessageCategory.Trace:
case eAxoMessageCategory.Debug:
case eAxoMessageCategory.Info:
return eAlarmLevel.ActiveInfo;
case eAxoMessageCategory.TimedOut:
case eAxoMessageCategory.Notification:

case eAxoMessageCategory.TimedOut:
case eAxoMessageCategory.Notification:
case eAxoMessageCategory.Warning:
return eAlarmLevel.ActiveWarnings;
case eAxoMessageCategory.Error:
case eAxoMessageCategory.ProgrammingError:
case eAxoMessageCategory.Critical:
case eAxoMessageCategory.Fatal:

case eAxoMessageCategory.Error:
case eAxoMessageCategory.ProgrammingError:
case eAxoMessageCategory.Critical:
case eAxoMessageCategory.Fatal:
case eAxoMessageCategory.Catastrophic:
return eAlarmLevel.ActiveErrors;

case eAxoMessageCategory.None:
break;

default:
break;
}
}
}
else if (_messengers.Any(p => p.State > eAxoMessengerState.NotActiveWatingAckn))
{
return eAlarmLevel.Unacknowledged;
}

return eAlarmLevel.NoAlarms;
}
}
Expand Down Expand Up @@ -240,5 +266,4 @@ public AxoComponentStatusView()
IsControllable = false;
}
}
}

}
27 changes: 27 additions & 0 deletions src/core/src/AXOpen.Core.Blazor/AxoCoordination/AxoSequencer/AxoSequencerHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
using AXSharp.Connector;
using AXSharp.Presentation.Blazor.Controls;

namespace AXOpen.Core
{
public static class AxoSequncerHelper
{

public static IList<ITwinPrimitive> GetStepsOrderElements(this IEnumerable<AxoStep> steps)
{
List<ITwinPrimitive> activeProperties = new();

foreach (AxoStep step in steps)
{
activeProperties.Add(step.Order);
}

return activeProperties;
}


//public static void UpdateValuesOnChangePrimitives(this AxoSequencer sequencer, IList<ITwinPrimitive> ListOfPrimitives)
//{
// throw new NotImplementedException();
//}
}
}
97 changes: 70 additions & 27 deletions src/core/src/AXOpen.Core.Blazor/AxoCoordination/AxoSequencer/AxoSequencerView.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,23 +40,45 @@
<div>
<AuthorizeView Roles="can_skip_steps_in_sequence">
<Authorized>
<RenderableContentControl Context="@Component.StepBackwardCommand" Presentation="@(IsControllable ? "Command" : "Status")" />
@if (IsControllable)
{
<AXOpen.Core.AxoTaskCommandView Component="@Component.StepBackwardCommand" />
}
else
{
<AXOpen.Core.AxoTaskStatusView Component="@Component.StepBackwardCommand" />
}
</Authorized>
<NotAuthorized>
<RenderableContentControl Context="@Component.StepBackwardCommand" Presentation="Status" />
<AXOpen.Core.AxoTaskStatusView Component="@Component.StepBackwardCommand" />
</NotAuthorized>
</AuthorizeView>
</div>

<div>
<RenderableContentControl Context="@Component.StepIn" Presentation="@(IsControllable ? "Command" : "Status")" />
@if (IsControllable)
{
<AXOpen.Core.AxoTaskCommandView Component="@Component.StepIn" />
}
else
{
<AXOpen.Core.AxoTaskStatusView Component="@Component.StepIn" />
}
</div>
<div>
<AuthorizeView Roles="can_skip_steps_in_sequence">
<Authorized>
<RenderableContentControl Context="@Component.StepForwardCommand" Presentation="@(IsControllable ? "Command" : "Status")" />
@if (IsControllable)
{
<AXOpen.Core.AxoTaskCommandView Component="@Component.StepForwardCommand" />
}
else
{
<AXOpen.Core.AxoTaskStatusView Component="@Component.StepForwardCommand" />
}
</Authorized>
<NotAuthorized>
<RenderableContentControl Context="@Component.StepForwardCommand" Presentation="Status" />
<AXOpen.Core.AxoTaskStatusView Component="@Component.StepForwardCommand" />
</NotAuthorized>
</AuthorizeView>
</div>
Expand All @@ -66,7 +88,7 @@
@if (HasStepDetails)
{
<div class="row justify-content-end">
<button type="button" class="btn btn-primary ms-auto my-2 mx-3 col-auto" data-bs-toggle="modal" data-bs-target="#showStepsModal" @onclick="RefreshComponent">Show all steps</button>
<button type="button" class="btn btn-primary ms-auto my-2 mx-3 col-auto" data-bs-toggle="modal" data-bs-target="#showStepsModal" @onclick="OnOpenModalWindow">Show all steps</button>
</div>

<div class="rounded-3 overflow-hidden">
Expand All @@ -77,38 +99,59 @@
}
</div>

@{
void OnOpenModalWindow()
{
RefreshStepsInSequnce();
this.EnableModalContent = true;
}

void OnCloseModalWindow()
{
this.EnableModalContent = false;
}
}


<div class="modal fade" id="showStepsModal" tabindex="-1" aria-hidden="true">
<div class="modal-dialog modal-xl">
<div class="modal-content">
<div class="modal-header">
<h1 class="modal-title fs-5" id="exampleModalLabel">Steps</h1>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" @onclick="OnCloseModalWindow"></button>
</div>
<div class="modal-body" style="max-height: calc(95vh - 200px); overflow-x: auto;">
<table class="table rounded-3 overflow-hidden">
<thead class="bg-light">
<tr>
<th scope="col">Description</th>
<th scope="col">Duration</th>
<th scope="col">Start time</th>
</tr>
</thead>
<tbody>
@foreach (var step in this.Steps.Where(p => p != null && p.Order.Cyclic != 0).Skip(3).OrderBy(p => p.Order.Cyclic))
{
<tr class="@AxoStepHelper.StepRowColor(step)">
<th scope="row">@AxoStepHelper.Description(step)</th>
<td>@step.Duration.Cyclic.TotalSeconds</td>
<td>@Humanizer.DateHumanizeExtensions.Humanize(step.StartTimeStamp.Cyclic, culture: CultureExtensions.Culture)</td>

@if (this.EnableModalContent)
{
<table class="table rounded-3 overflow-hidden">
<thead class="bg-light">
<tr>
<th scope="col" width="30">Order</th>
<th scope="col">Description</th>
<th scope="col">Duration</th>
<th scope="col">Start time</th>
</tr>
}
</tbody>
</table>
</thead>
<tbody>
@foreach (var step in this.AllSteps.Where(p => p != null && p.Order.Cyclic != 0).OrderBy(p => p.Order.Cyclic))
{
<tr class="@AxoStepHelper.StepRowColor(step)">
<td>@step.Order.Cyclic</td>
<th scope="row">@AxoStepHelper.Description(step)</th>
<td>@step.Duration.Cyclic.TotalSeconds</td>
<td>@Humanizer.DateHumanizeExtensions.Humanize(step.StartTimeStamp.Cyclic, culture: CultureExtensions.Culture)</td>
</tr>
}
</tbody>
</table>
}
</div>

<div class="modal-footer">
<button type="button" class="btn btn-primary" @onclick="RefreshComponent">Refresh</button>
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
<button type="button" class="btn btn-primary" @onclick="RefreshDurationAndStatus">Refresh steps duration</button>
<button type="button" class="btn btn-primary" @onclick="RefreshStepsInSequnce">Refresh steps</button>
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @onclick="OnCloseModalWindow">Close</button>
</div>
</div>
</div>
Expand Down
Loading