Mod: Do LayeredFs loading Parallel to improve speed (#6180)

* Mod: Do LayeredFs loading Parallel to improve speed

This fixes and superseed #5672 due to inactivity, nothing more.
(See original PR for description)

Testing are welcome.

Close #5661

* Addresses gdkchan's feedback

* commit to test mako change

* Revert "commit to test mako change"

This reverts commit 8b0caa8a21db298db3dfcbe5b7e9029c4f066c46.

1 files changed, 7 insertions, 6 deletions

diff --git a/src/Ryujinx.HLE/HOS/ModLoader.cs b/src/Ryujinx.HLE/HOS/ModLoader.cs
index 322c8afd..8ae52965 100644
--- a/src/Ryujinx.HLE/HOS/ModLoader.cs
+++ b/src/Ryujinx.HLE/HOS/ModLoader.cs
@@ -18,6 +18,7 @@ using System.Collections.Specialized;
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using LazyFile = Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy.LazyFile;
 using Path = System.IO.Path;
 
 namespace Ryujinx.HLE.HOS
@@ -512,7 +513,7 @@ namespace Ryujinx.HLE.HOS
 
                 using (IFileSystem fs = new LocalFileSystem(mod.Path.FullName))
                 {
-                    AddFiles(fs, mod.Name, fileSet, builder);
+                    AddFiles(fs, mod.Name, mod.Path.FullName, fileSet, builder);
                 }
                 count++;
             }
@@ -528,7 +529,7 @@ namespace Ryujinx.HLE.HOS
                 Logger.Info?.Print(LogClass.ModLoader, $"Found 'romfs.bin' for Application {applicationId:X16}");
                 using (IFileSystem fs = new RomFsFileSystem(mod.Path.OpenRead().AsStorage()))
                 {
-                    AddFiles(fs, mod.Name, fileSet, builder);
+                    AddFiles(fs, mod.Name, mod.Path.FullName, fileSet, builder);
                 }
                 count++;
             }
@@ -561,18 +562,18 @@ namespace Ryujinx.HLE.HOS
             return newStorage;
         }
 
-        private static void AddFiles(IFileSystem fs, string modName, ISet<string> fileSet, RomFsBuilder builder)
+        private static void AddFiles(IFileSystem fs, string modName, string rootPath, ISet<string> fileSet, RomFsBuilder builder)
         {
             foreach (var entry in fs.EnumerateEntries()
+                                    .AsParallel()
                                     .Where(f => f.Type == DirectoryEntryType.File)
                                     .OrderBy(f => f.FullPath, StringComparer.Ordinal))
             {
-                using var file = new UniqueRef<IFile>();
+                var file = new LazyFile(entry.FullPath, rootPath, fs);
 
-                fs.OpenFile(ref file.Ref, entry.FullPath.ToU8Span(), OpenMode.Read).ThrowIfFailure();
                 if (fileSet.Add(entry.FullPath))
                 {
-                    builder.AddFile(entry.FullPath, file.Release());
+                    builder.AddFile(entry.FullPath, file);
                 }
                 else
                 {