reduce hitches and do some other changes to FSW

This commit is contained in:
Stanley Dimant
2024-02-15 11:22:18 +01:00
committed by Loporrit
parent e98d5ce1ea
commit f9ca55db43
17 changed files with 140 additions and 94 deletions

View File

@@ -6,12 +6,14 @@ namespace MareSynchronos.Services.Mediator;
public abstract class WindowMediatorSubscriberBase : Window, IMediatorSubscriber, IDisposable
{
protected readonly ILogger _logger;
private readonly PerformanceCollectorService _performanceCollectorService;
protected WindowMediatorSubscriberBase(ILogger logger, MareMediator mediator, string name) : base(name)
protected WindowMediatorSubscriberBase(ILogger logger, MareMediator mediator, string name,
PerformanceCollectorService performanceCollectorService) : base(name)
{
_logger = logger;
Mediator = mediator;
_performanceCollectorService = performanceCollectorService;
_logger.LogTrace("Creating {type}", GetType());
Mediator.Subscribe<UiToggleMessage>(this, (msg) =>
@@ -31,6 +33,13 @@ public abstract class WindowMediatorSubscriberBase : Window, IMediatorSubscriber
GC.SuppressFinalize(this);
}
public override void Draw()
{
_performanceCollectorService.LogPerformance(this, "Draw", DrawInternal);
}
protected abstract void DrawInternal();
public virtual Task StopAsync(CancellationToken cancellationToken)
{
return Task.CompletedTask;

View File

@@ -18,10 +18,11 @@ public class UiFactory
private readonly PairManager _pairManager;
private readonly ServerConfigurationManager _serverConfigManager;
private readonly MareProfileManager _mareProfileManager;
private readonly PerformanceCollectorService _performanceCollectorService;
public UiFactory(ILoggerFactory loggerFactory, MareMediator mareMediator, ApiController apiController,
UiSharedService uiSharedService, PairManager pairManager, ServerConfigurationManager serverConfigManager,
MareProfileManager mareProfileManager)
MareProfileManager mareProfileManager, PerformanceCollectorService performanceCollectorService)
{
_loggerFactory = loggerFactory;
_mareMediator = mareMediator;
@@ -30,23 +31,24 @@ public class UiFactory
_pairManager = pairManager;
_serverConfigManager = serverConfigManager;
_mareProfileManager = mareProfileManager;
_performanceCollectorService = performanceCollectorService;
}
public SyncshellAdminUI CreateSyncshellAdminUi(GroupFullInfoDto dto)
{
return new SyncshellAdminUI(_loggerFactory.CreateLogger<SyncshellAdminUI>(), _mareMediator,
_apiController, _uiSharedService, _pairManager, dto);
_apiController, _uiSharedService, _pairManager, dto, _performanceCollectorService);
}
public StandaloneProfileUi CreateStandaloneProfileUi(Pair pair)
{
return new StandaloneProfileUi(_loggerFactory.CreateLogger<StandaloneProfileUi>(), _mareMediator,
_uiSharedService, _serverConfigManager, _mareProfileManager, _pairManager, pair);
_uiSharedService, _serverConfigManager, _mareProfileManager, _pairManager, pair, _performanceCollectorService);
}
public PermissionWindowUI CreatePermissionPopupUi(Pair pair)
{
return new PermissionWindowUI(_loggerFactory.CreateLogger<PermissionWindowUI>(), pair,
_mareMediator, _uiSharedService, _apiController);
_mareMediator, _uiSharedService, _apiController, _performanceCollectorService);
}
}