Sync project level info in parallel.

src/VisualStudio/Core/Test.Next/Services/AssetProviderTests.cs

@@ -12,6 +12,7 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces;
+using Microsoft.CodeAnalysis.PooledObjects;
 using Microsoft.CodeAnalysis.Remote;
 using Microsoft.CodeAnalysis.Remote.Testing;
 using Microsoft.CodeAnalysis.Serialization;
@@ -137,7 +138,11 @@ public async Task TestProjectSynchronization()
  var assetSource = new SimpleAssetSource(workspace.Services.GetService<ISerializerService>(), map);
 
  var service = new AssetProvider(sessionId, storage, assetSource, remoteWorkspace.Services.GetService<ISerializerService>());
- await service.SynchronizeProjectAssetsAsync(await project.State.GetStateChecksumsAsync(CancellationToken.None), CancellationToken.None);
+
+ using var _ = ArrayBuilder<ProjectStateChecksums>.GetInstance(out var allProjectChecksums);
+ allProjectChecksums.Add(await project.State.GetStateChecksumsAsync(CancellationToken.None));
+
+ await service.SynchronizeProjectAssetsAsync(allProjectChecksums, CancellationToken.None);
 
  TestUtils.VerifyAssetStorage(map, storage);
  }

src/Workspaces/Core/Portable/Workspace/Solution/AssetPath.cs

@@ -0,0 +1,126 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Runtime.Serialization;
+using Roslyn.Utilities;
+
+namespace Microsoft.CodeAnalysis.Serialization;
+
+/// <summary>
+/// Required information passed with an asset synchronization request to tell the host where to scope the request to. In
+/// particular, this is often used to scope to a particular <see cref="Project"/> or <see cref="Document"/> to avoid
+/// having to search the entire solution.
+/// </summary>
+[DataContract]
+internal readonly struct AssetPath
+{
+ /// <summary>
+ /// Instance that will only look up solution-level data when searching for checksums.
+ /// </summary>
+ public static readonly AssetPath SolutionOnly = AssetPathKind.Solution;
+
+ /// <summary>
+ /// Special instance, allowed only in tests/debug-asserts, that can do a full lookup across the entire checksum
+ /// tree. Should not be used in normal release-mode product code.
+ /// </summary>
+ public static readonly AssetPath FullLookupForTesting = AssetPathKind.Solution | AssetPathKind.Projects | AssetPathKind.Documents;
+
+ [DataMember(Order = 0)]
+ private readonly AssetPathKind _kind;
+
+ /// <summary>
+ /// If not null, the search should only descend into the single project with this id.
+ /// </summary>
+ [DataMember(Order = 1)]
+ public readonly ProjectId? ProjectId;
+
+ /// <summary>
+ /// If not null, the search should only descend into the single document with this id.
+ /// </summary>
+ [DataMember(Order = 2)]
+ public readonly DocumentId? DocumentId;
+
+ public AssetPath(AssetPathKind kind, ProjectId? projectId = null, DocumentId? documentId = null)
+ {
+ _kind = kind;
+ ProjectId = projectId;
+ DocumentId = documentId;
+ }
+
+ public bool IncludeSolution => (_kind & AssetPathKind.Solution) != 0;
+ public bool IncludeProjects => (_kind & AssetPathKind.Projects) != 0;
+ public bool IncludeDocuments => (_kind & AssetPathKind.Documents) != 0;
+
+ public bool IncludeProjectStateChecksums => (_kind & AssetPathKind.ProjectStateChecksums) != 0;
+ public bool IncludeProjectAttributes => (_kind & AssetPathKind.ProjectAttributes) != 0;
+ public bool IncludeProjectCompilationOptions => (_kind & AssetPathKind.ProjectCompilationOptions) != 0;
+ public bool IncludeProjectParseOptions => (_kind & AssetPathKind.ProjectParseOptions) != 0;
+ public bool IncludeProjectProjectReferences => (_kind & AssetPathKind.ProjectProjectReferences) != 0;
+ public bool IncludeProjectMetadataReferences => (_kind & AssetPathKind.ProjectMetadataReferences) != 0;
+ public bool IncludeProjectAnalyzerReferences => (_kind & AssetPathKind.ProjectAnalyzerReferences) != 0;
+
+ public bool IncludeDocumentStateChecksums => (_kind & AssetPathKind.DocumentStateChecksums) != 0;
+ public bool IncludeDocumentAttributes => (_kind & AssetPathKind.DocumentAttributes) != 0;
+ public bool IncludeDocumentText => (_kind & AssetPathKind.DocumentText) != 0;
+
+ public static implicit operator AssetPath(AssetPathKind kind) => new(kind);
+
+ /// <summary>
+ /// Searches only for information about this project.
+ /// </summary>
+ public static implicit operator AssetPath(ProjectId projectId) => new(AssetPathKind.Projects, projectId, documentId: null);
+
+ /// <summary>
+ /// Searches only for information about this document.
+ /// </summary>
+ public static implicit operator AssetPath(DocumentId documentId) => new(AssetPathKind.Documents, documentId.ProjectId, documentId);
+
+ /// <summary>
+ /// Searches the requested project, and all documents underneath it. Used only in tests.
+ /// </summary>
+ /// <param name="projectId"></param>
+ /// <returns></returns>
+ public static AssetPath SolutionAndProjectForTesting(ProjectId projectId)
+ => new(AssetPathKind.Solution | AssetPathKind.Projects, projectId);
+
+ /// <summary>
+ /// Searches all documents within the specified project.
+ /// </summary>
+ /// <param name="projectId"></param>
+ /// <returns></returns>
+ public static AssetPath DocumentsInProject(ProjectId projectId)
+ => new(AssetPathKind.Documents, projectId);
+}
+
+[Flags]
+internal enum AssetPathKind
+{
+ /// <summary>
+ /// Search solution-level information.
+ /// </summary>
+ Solution = 1 << 0,
+
+ ProjectStateChecksums = 1 << 1,
+ ProjectAttributes = 1 << 2,
+ ProjectCompilationOptions = 1 << 3,
+ ProjectParseOptions = 1 << 4,
+ ProjectProjectReferences = 1 << 5,
+ ProjectMetadataReferences = 1 << 6,
+ ProjectAnalyzerReferences = 1 << 7,
+
+ /// <summary>
+ /// Search projects for results. All project-level information will be searched.
+ /// </summary>
+ Projects = ProjectStateChecksums | ProjectAttributes | ProjectCompilationOptions | ProjectParseOptions | ProjectProjectReferences | ProjectMetadataReferences | ProjectAnalyzerReferences,
+
+ DocumentStateChecksums = 1 << 8,
+ DocumentAttributes = 1 << 9,
+ DocumentText = 1 << 10,
+
+ /// <summary>
+ /// Search documents for results.
+ /// </summary>
+ Documents = DocumentStateChecksums | DocumentAttributes | DocumentText,
+}

src/Workspaces/Core/Portable/Workspace/Solution/Checksum.cs

@@ -98,9 +98,6 @@ public static Checksum ReadFrom(ObjectReader reader)
  public static Func<IEnumerable<Checksum>, string> GetChecksumsLogInfo { get; }
  = checksums => string.Join("|", checksums.Select(c => c.ToString()));
 
- public static Func<ProjectStateChecksums, string> GetProjectChecksumsLogInfo { get; }
- = checksums => checksums.Checksum.ToString();
-
  // Explicitly implement this method as default jit for records on netfx doesn't properly devirtualize the
  // standard calls to EqualityComparer<long>.Default.Equals
  public bool Equals(Checksum other)

src/Workspaces/Core/Portable/Workspace/Solution/ChecksumCollection.cs

@@ -55,19 +55,20 @@ public void AddAllTo(HashSet<Checksum> checksums)
 
  [PerformanceSensitive("https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1333566", AllowGenericEnumeration = false)]
  internal static async Task FindAsync<TState>(
+ AssetPath assetPath,
  TextDocumentStates<TState> documentStates,
- DocumentId? hintDocument,
  HashSet<Checksum> searchingChecksumsLeft,
  Dictionary<Checksum, object> result,
  CancellationToken cancellationToken) where TState : TextDocumentState
  {
+ var hintDocument = assetPath.DocumentId;
  if (hintDocument != null)
  {
  var state = documentStates.GetState(hintDocument);
  if (state != null)
  {
  Contract.ThrowIfFalse(state.TryGetStateChecksums(out var stateChecksums));
- await stateChecksums.FindAsync(state, searchingChecksumsLeft, result, cancellationToken).ConfigureAwait(false);
+ await stateChecksums.FindAsync(assetPath, state, searchingChecksumsLeft, result, cancellationToken).ConfigureAwait(false);
  }
  }
  else
@@ -80,7 +81,7 @@ internal static async Task FindAsync<TState>(
 
  Contract.ThrowIfFalse(state.TryGetStateChecksums(out var stateChecksums));
 
- await stateChecksums.FindAsync(state, searchingChecksumsLeft, result, cancellationToken).ConfigureAwait(false);
+ await stateChecksums.FindAsync(assetPath, state, searchingChecksumsLeft, result, cancellationToken).ConfigureAwait(false);
  }
  }
  }