Skip to content
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

Avoid extra JTF collection/factory #9623

Merged
merged 3 commits into from
Dec 18, 2024
Merged

Avoid extra JTF collection/factory #9623

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0e1f7a
Avoid extra JTF collection/factory
drewnoakes Dec 16, 2024
67f60bf
Make "isEnabled" static
drewnoakes Dec 17, 2024
ca6820a
Set AsyncLazy.SuppressRecursiveFactoryDetection true
drewnoakes Dec 17, 2024
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
33 changes: 19 additions & 14 deletions ...lStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/LanguageServices/LanguageServiceHost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ namespace Microsoft.VisualStudio.ProjectSystem.LanguageServices;
[AppliesTo(ProjectCapability.DotNetLanguageService)]
internal sealed class LanguageServiceHost : OnceInitializedOnceDisposedAsync, IProjectDynamicLoadComponent, IWorkspaceWriter
{
/// <summary>
/// Singleton instance across all projects, initialized once.
/// </summary>
private static AsyncLazy<bool>? s_isEnabled;

private readonly TaskCompletionSource _firstPrimaryWorkspaceSet = new();

private readonly UnconfiguredProject _unconfiguredProject;
Expand All @@ -45,9 +50,6 @@ internal sealed class LanguageServiceHost : OnceInitializedOnceDisposedAsync, IP
private readonly IUnconfiguredProjectTasksService _tasksService;
private readonly ISafeProjectGuidService _projectGuidService;
private readonly IProjectFaultHandlerService _projectFaultHandler;
private readonly JoinableTaskCollection _joinableTaskCollection;
private readonly JoinableTaskFactory _joinableTaskFactory;
private readonly AsyncLazy<bool> _isEnabled;

private DisposableBag? _disposables;

Expand Down Expand Up @@ -78,7 +80,9 @@ public LanguageServiceHost(
_projectGuidService = projectGuidService;
_projectFaultHandler = projectFaultHandler;

_isEnabled = new(
// We initialize this once across all instances. Note that we don't need any synchronization here.
// If more than one thread initializes this, it's not a big deal.
s_isEnabled ??= new(
async () =>
{
// If VS is running in command line mode (e.g. "devenv.exe /build my.sln"),
Expand All @@ -87,11 +91,10 @@ public LanguageServiceHost(
return !await vsShell.IsCommandLineModeAsync()
|| await vsShell.IsPopulateSolutionCacheModeAsync();
},
threadingService.JoinableTaskFactory);

_joinableTaskCollection = threadingService.JoinableTaskContext.CreateCollection();
_joinableTaskCollection.DisplayName = "LanguageServiceHostTasks";
_joinableTaskFactory = new JoinableTaskFactory(_joinableTaskCollection);
threadingService.JoinableTaskFactory)
{
SuppressRecursiveFactoryDetection = true
};
}

public Task LoadAsync()
Expand Down Expand Up @@ -175,7 +178,7 @@ protected override async Task InitializeCoreAsync(CancellationToken cancellation
linkOptions: DataflowOption.PropagateCompletion,
cancellationToken: cancellationToken),

ProjectDataSources.JoinUpstreamDataSources(_joinableTaskFactory, _projectFaultHandler, _activeConfiguredProjectProvider, _activeConfigurationGroupSubscriptionService),
ProjectDataSources.JoinUpstreamDataSources(JoinableFactory, _projectFaultHandler, _activeConfiguredProjectProvider, _activeConfigurationGroupSubscriptionService),

new DisposableDelegate(() =>
{
Expand Down Expand Up @@ -211,7 +214,7 @@ async Task OnSlicesChangedAsync(IProjectVersionedValue<(ConfiguredProject Active
Guid projectGuid = await _projectGuidService.GetProjectGuidAsync(cancellationToken);

// New slice. Create a workspace for it.
workspace = _workspaceFactory.Create(source, slice, _joinableTaskCollection, _joinableTaskFactory, projectGuid, cancellationToken);
workspace = _workspaceFactory.Create(source, slice, JoinableCollection, JoinableFactory, projectGuid, cancellationToken);

if (workspace is null)
{
Expand Down Expand Up @@ -274,15 +277,17 @@ async Task OnSlicesChangedAsync(IProjectVersionedValue<(ConfiguredProject Active

public Task<bool> IsEnabledAsync(CancellationToken cancellationToken)
{
Assumes.NotNull(s_isEnabled);

// Defer to the host environment to determine if we're enabled.
return _isEnabled.GetValueAsync(cancellationToken);
return s_isEnabled.GetValueAsync(cancellationToken);
}

public async Task WhenInitialized(CancellationToken token)
{
await ValidateEnabledAsync(token);

using (_joinableTaskCollection.Join())
using (JoinableCollection.Join())
{
await _firstPrimaryWorkspaceSet.Task.WithCancellation(token);
}
Expand Down Expand Up @@ -350,7 +355,7 @@ public async Task AfterLoadInitialConfigurationAsync()
// Ensure the project is not considered loaded until our first publication.
Task result = _tasksService.PrioritizedProjectLoadedInHostAsync(async () =>
{
using (_joinableTaskCollection.Join())
using (JoinableCollection.Join())
{
await WhenInitialized(_tasksService.UnloadCancellationToken);
}
Expand Down
Loading