Optimize modules loading.

src/OrchardCore/OrchardCore.Abstractions/Modules/Application.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
@@ -8,7 +7,7 @@ namespace OrchardCore.Modules
 {
     public class Application
     {
-        private readonly Dictionary<string, List<Module>> _modulesByName;
+        private readonly Dictionary<string, Module> _modulesByName;
         private readonly List<Module> _modules;
 
         public static readonly string ModulesPath = "Areas";
@@ -26,7 +25,7 @@ public Application(IHostingEnvironment environment, IEnumerable<Module> modules)
             Assembly = Assembly.Load(new AssemblyName(Name));
 
             _modules = new List<Module>(modules);
-            _modulesByName = _modules.GroupBy(x => x.Name).ToDictionary(x => x.Key, x => x.ToList());
+            _modulesByName = _modules.ToDictionary(m => m.Name, m => m);
         }
 
         public string Name { get; }
@@ -39,12 +38,12 @@ public Application(IHostingEnvironment environment, IEnumerable<Module> modules)
 
         public Module GetModule(string name)
         {
-            if (!_modulesByName.TryGetValue(name, out var modules) || modules.Count == 0)
+            if (!_modulesByName.TryGetValue(name, out var module))
             {
                 return new Module(string.Empty);
             }
 
-            return modules[modules.Count - 1];
+            return module;
         }
     }
 }

src/OrchardCore/OrchardCore.Abstractions/Modules/ModularApplicationContext.cs

@@ -1,6 +1,7 @@
-using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Hosting;
 
 namespace OrchardCore.Modules
@@ -48,13 +49,18 @@ private void EnsureInitialized()
 
         private IEnumerable<Module> GetModules()
         {
-            var modules = new List<Module>();
+            var modules = new ConcurrentBag<Module>();
             modules.Add(new Module(_environment.ApplicationName, true));
 
-            foreach (var provider in _moduleNamesProviders)
+            var names = _moduleNamesProviders
+                .SelectMany(p => p.GetModuleNames())
+                .Where(n => n != _environment.ApplicationName)
+                .Distinct();
+
+            Parallel.ForEach(names, new ParallelOptions { MaxDegreeOfParallelism = 8 }, (name) =>
             {
-                modules.AddRange(provider.GetModuleNames().Select(name => new Module(name, name == _environment.ApplicationName)));
-            }
+                modules.Add(new Module(name, false));
+            });
 
             return modules;
         }

src/OrchardCore/OrchardCore/Environment/Shell/Builders/ShellContainerFactory.cs

@@ -13,7 +13,10 @@ namespace OrchardCore.Environment.Shell.Builders
 {
     public class ShellContainerFactory : IShellContainerFactory
     {
-        private readonly IFeatureInfo _applicationFeature;
+        private IFeatureInfo _applicationFeature;
+
+        private readonly IHostingEnvironment _hostingEnvironment;
+        private readonly IExtensionManager _extensionManager;
         private readonly IServiceProvider _serviceProvider;
         private readonly ILogger _logger;
         private readonly ILoggerFactory _loggerFactory;
@@ -27,9 +30,8 @@ public ShellContainerFactory(
             ILogger<ShellContainerFactory> logger,
             IServiceCollection applicationServices)
         {
-            _applicationFeature = extensionManager.GetFeatures().FirstOrDefault(
-                f => f.Id == hostingEnvironment.ApplicationName);
-
+            _hostingEnvironment = hostingEnvironment;
+            _extensionManager = extensionManager;
             _applicationServices = applicationServices;
             _serviceProvider = serviceProvider;
             _loggerFactory = loggerFactory;
@@ -84,6 +86,10 @@ public IServiceProvider CreateContainer(ShellSettings settings, ShellBlueprint b
             // OrderBy performs a stable sort so order is preserved among equal Order values.
             startups = startups.OrderBy(s => s.Order);
 
+            // To not trigger features loading before it is normally done by 'ShellHost',
+            // init here the application feature in place of doing it in the constructor.
+            EnsureApplicationFeature();
+
             // Let any module add custom service descriptors to the tenant
             foreach (var startup in startups)
             {
@@ -97,7 +103,7 @@ public IServiceProvider CreateContainer(ShellSettings settings, ShellBlueprint b
             }
 
             (moduleServiceProvider as IDisposable).Dispose();
-            
+
             var shellServiceProvider = tenantServiceCollection.BuildServiceProvider(true);
 
             // Register all DIed types in ITypeFeatureProvider
@@ -124,5 +130,20 @@ public IServiceProvider CreateContainer(ShellSettings settings, ShellBlueprint b
 
             return shellServiceProvider;
         }
+
+        private void EnsureApplicationFeature()
+        {
+            if (_applicationFeature == null)
+            {
+                lock (this)
+                {
+                    if (_applicationFeature == null)
+                    {
+                        _applicationFeature = _extensionManager.GetFeatures()
+                            .FirstOrDefault(f => f.Id == _hostingEnvironment.ApplicationName);
+                    }
+                }
+            }
+        }
     }
 }