aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.HLE/FileSystem/Content/ContentManager.cs
diff options
context:
space:
mode:
authorThog <me@thog.eu>2020-01-13 01:17:44 +0100
committerAc_K <Acoustik666@gmail.com>2020-01-13 01:17:44 +0100
commitf0055482fd1aef9dcae7c6c4c6e01483f11f7839 (patch)
treee5aaa40d3df987b59a435a29bdbe786e4ee4ec53 /Ryujinx.HLE/FileSystem/Content/ContentManager.cs
parentb8e3909d800ff5947683bb169d8efda2ef63d697 (diff)
Fix race condition in ContentManager (#884)
* Fix race condition in ContentManager This fix a race condition happening since #791 when trying to load a game via command line. * Address gdk's comments * Ensure to dispose the FileStream and not the IStorage
Diffstat (limited to 'Ryujinx.HLE/FileSystem/Content/ContentManager.cs')
-rw-r--r--Ryujinx.HLE/FileSystem/Content/ContentManager.cs247
1 files changed, 138 insertions, 109 deletions
diff --git a/Ryujinx.HLE/FileSystem/Content/ContentManager.cs b/Ryujinx.HLE/FileSystem/Content/ContentManager.cs
index b83ae440..680ebd52 100644
--- a/Ryujinx.HLE/FileSystem/Content/ContentManager.cs
+++ b/Ryujinx.HLE/FileSystem/Content/ContentManager.cs
@@ -28,6 +28,8 @@ namespace Ryujinx.HLE.FileSystem.Content
private Switch _device;
+ private readonly object _lock = new object();
+
public ContentManager(Switch device)
{
_contentDictionary = new SortedDictionary<(ulong, NcaContentType), string>();
@@ -58,139 +60,151 @@ namespace Ryujinx.HLE.FileSystem.Content
public void LoadEntries(bool ignoreMissingFonts = false)
{
- _contentDictionary = new SortedDictionary<(ulong, NcaContentType), string>();
- _locationEntries = new Dictionary<StorageId, LinkedList<LocationEntry>>();
-
- foreach (StorageId storageId in Enum.GetValues(typeof(StorageId)))
+ lock (_lock)
{
- string contentDirectory = null;
- string contentPathString = null;
- string registeredDirectory = null;
+ _contentDictionary = new SortedDictionary<(ulong, NcaContentType), string>();
+ _locationEntries = new Dictionary<StorageId, LinkedList<LocationEntry>>();
- try
+ foreach (StorageId storageId in Enum.GetValues(typeof(StorageId)))
{
- contentPathString = LocationHelper.GetContentRoot(storageId);
- contentDirectory = LocationHelper.GetRealPath(_device.FileSystem, contentPathString);
- registeredDirectory = Path.Combine(contentDirectory, "registered");
- }
- catch (NotSupportedException)
- {
- continue;
- }
+ string contentDirectory = null;
+ string contentPathString = null;
+ string registeredDirectory = null;
- Directory.CreateDirectory(registeredDirectory);
+ try
+ {
+ contentPathString = LocationHelper.GetContentRoot(storageId);
+ contentDirectory = LocationHelper.GetRealPath(_device.FileSystem, contentPathString);
+ registeredDirectory = Path.Combine(contentDirectory, "registered");
+ }
+ catch (NotSupportedException)
+ {
+ continue;
+ }
- LinkedList<LocationEntry> locationList = new LinkedList<LocationEntry>();
+ Directory.CreateDirectory(registeredDirectory);
- void AddEntry(LocationEntry entry)
- {
- locationList.AddLast(entry);
- }
+ LinkedList<LocationEntry> locationList = new LinkedList<LocationEntry>();
- foreach (string directoryPath in Directory.EnumerateDirectories(registeredDirectory))
- {
- if (Directory.GetFiles(directoryPath).Length > 0)
+ void AddEntry(LocationEntry entry)
{
- string ncaName = new DirectoryInfo(directoryPath).Name.Replace(".nca", string.Empty);
+ locationList.AddLast(entry);
+ }
- using (FileStream ncaFile = new FileStream(Directory.GetFiles(directoryPath)[0], FileMode.Open, FileAccess.Read))
+ foreach (string directoryPath in Directory.EnumerateDirectories(registeredDirectory))
+ {
+ if (Directory.GetFiles(directoryPath).Length > 0)
{
- Nca nca = new Nca(_device.System.KeySet, ncaFile.AsStorage());
+ string ncaName = new DirectoryInfo(directoryPath).Name.Replace(".nca", string.Empty);
+
+ using (FileStream ncaFile = File.OpenRead(Directory.GetFiles(directoryPath)[0]))
+ {
+ Nca nca = new Nca(_device.System.KeySet, ncaFile.AsStorage());
- string switchPath = contentPathString + ":/" + ncaFile.Name.Replace(contentDirectory, string.Empty).TrimStart(Path.DirectorySeparatorChar);
+ string switchPath = contentPathString + ":/" + ncaFile.Name.Replace(contentDirectory, string.Empty).TrimStart(Path.DirectorySeparatorChar);
- // Change path format to switch's
- switchPath = switchPath.Replace('\\', '/');
+ // Change path format to switch's
+ switchPath = switchPath.Replace('\\', '/');
- LocationEntry entry = new LocationEntry(switchPath,
- 0,
- (long)nca.Header.TitleId,
- nca.Header.ContentType);
+ LocationEntry entry = new LocationEntry(switchPath,
+ 0,
+ (long)nca.Header.TitleId,
+ nca.Header.ContentType);
- AddEntry(entry);
+ AddEntry(entry);
- _contentDictionary.Add((nca.Header.TitleId, nca.Header.ContentType), ncaName);
+ _contentDictionary.Add((nca.Header.TitleId, nca.Header.ContentType), ncaName);
+ }
}
}
- }
- foreach (string filePath in Directory.EnumerateFiles(contentDirectory))
- {
- if (Path.GetExtension(filePath) == ".nca")
+ foreach (string filePath in Directory.EnumerateFiles(contentDirectory))
{
- string ncaName = Path.GetFileNameWithoutExtension(filePath);
-
- using (FileStream ncaFile = new FileStream(filePath, FileMode.Open, FileAccess.Read))
+ if (Path.GetExtension(filePath) == ".nca")
{
- Nca nca = new Nca(_device.System.KeySet, ncaFile.AsStorage());
+ string ncaName = Path.GetFileNameWithoutExtension(filePath);
- string switchPath = contentPathString + ":/" + filePath.Replace(contentDirectory, string.Empty).TrimStart(Path.DirectorySeparatorChar);
+ using (FileStream ncaFile = new FileStream(filePath, FileMode.Open, FileAccess.Read))
+ {
+ Nca nca = new Nca(_device.System.KeySet, ncaFile.AsStorage());
+
+ string switchPath = contentPathString + ":/" + filePath.Replace(contentDirectory, string.Empty).TrimStart(Path.DirectorySeparatorChar);
- // Change path format to switch's
- switchPath = switchPath.Replace('\\', '/');
+ // Change path format to switch's
+ switchPath = switchPath.Replace('\\', '/');
- LocationEntry entry = new LocationEntry(switchPath,
- 0,
- (long)nca.Header.TitleId,
- nca.Header.ContentType);
+ LocationEntry entry = new LocationEntry(switchPath,
+ 0,
+ (long)nca.Header.TitleId,
+ nca.Header.ContentType);
- AddEntry(entry);
+ AddEntry(entry);
- _contentDictionary.Add((nca.Header.TitleId, nca.Header.ContentType), ncaName);
+ _contentDictionary.Add((nca.Header.TitleId, nca.Header.ContentType), ncaName);
+ }
}
}
- }
- if (_locationEntries.ContainsKey(storageId) && _locationEntries[storageId]?.Count == 0)
- {
- _locationEntries.Remove(storageId);
- }
+ if (_locationEntries.ContainsKey(storageId) && _locationEntries[storageId]?.Count == 0)
+ {
+ _locationEntries.Remove(storageId);
+ }
- if (!_locationEntries.ContainsKey(storageId))
- {
- _locationEntries.Add(storageId, locationList);
+ if (!_locationEntries.ContainsKey(storageId))
+ {
+ _locationEntries.Add(storageId, locationList);
+ }
}
- }
- TimeManager.Instance.InitializeTimeZone(_device);
+ TimeManager.Instance.InitializeTimeZone(_device);
- _device.System.Font.Initialize(this, ignoreMissingFonts);
+ _device.System.Font.Initialize(this, ignoreMissingFonts);
+ }
}
public void ClearEntry(long titleId, NcaContentType contentType, StorageId storageId)
{
- RemoveLocationEntry(titleId, contentType, storageId);
+ lock (_lock)
+ {
+ RemoveLocationEntry(titleId, contentType, storageId);
+ }
}
public void RefreshEntries(StorageId storageId, int flag)
{
- LinkedList<LocationEntry> locationList = _locationEntries[storageId];
- LinkedListNode<LocationEntry> locationEntry = locationList.First;
-
- while (locationEntry != null)
+ lock (_lock)
{
- LinkedListNode<LocationEntry> nextLocationEntry = locationEntry.Next;
+ LinkedList<LocationEntry> locationList = _locationEntries[storageId];
+ LinkedListNode<LocationEntry> locationEntry = locationList.First;
- if (locationEntry.Value.Flag == flag)
+ while (locationEntry != null)
{
- locationList.Remove(locationEntry.Value);
- }
+ LinkedListNode<LocationEntry> nextLocationEntry = locationEntry.Next;
- locationEntry = nextLocationEntry;
+ if (locationEntry.Value.Flag == flag)
+ {
+ locationList.Remove(locationEntry.Value);
+ }
+
+ locationEntry = nextLocationEntry;
+ }
}
}
public bool HasNca(string ncaId, StorageId storageId)
{
- if (_contentDictionary.ContainsValue(ncaId))
+ lock (_lock)
{
- var content = _contentDictionary.FirstOrDefault(x => x.Value == ncaId);
- long titleId = (long)content.Key.Item1;
+ if (_contentDictionary.ContainsValue(ncaId))
+ {
+ var content = _contentDictionary.FirstOrDefault(x => x.Value == ncaId);
+ long titleId = (long)content.Key.Item1;
- NcaContentType contentType = content.Key.type;
- StorageId storage = GetInstalledStorage(titleId, contentType, storageId);
+ NcaContentType contentType = content.Key.type;
+ StorageId storage = GetInstalledStorage(titleId, contentType, storageId);
- return storage == storageId;
+ return storage == storageId;
+ }
}
return false;
@@ -198,9 +212,12 @@ namespace Ryujinx.HLE.FileSystem.Content
public UInt128 GetInstalledNcaId(long titleId, NcaContentType contentType)
{
- if (_contentDictionary.ContainsKey(((ulong)titleId, contentType)))
+ lock (_lock)
{
- return new UInt128(_contentDictionary[((ulong)titleId, contentType)]);
+ if (_contentDictionary.ContainsKey(((ulong)titleId, contentType)))
+ {
+ return new UInt128(_contentDictionary[((ulong)titleId, contentType)]);
+ }
}
return new UInt128();
@@ -208,19 +225,25 @@ namespace Ryujinx.HLE.FileSystem.Content
public StorageId GetInstalledStorage(long titleId, NcaContentType contentType, StorageId storageId)
{
- LocationEntry locationEntry = GetLocation(titleId, contentType, storageId);
+ lock (_lock)
+ {
+ LocationEntry locationEntry = GetLocation(titleId, contentType, storageId);
- return locationEntry.ContentPath != null ?
- LocationHelper.GetStorageId(locationEntry.ContentPath) : StorageId.None;
+ return locationEntry.ContentPath != null ?
+ LocationHelper.GetStorageId(locationEntry.ContentPath) : StorageId.None;
+ }
}
public string GetInstalledContentPath(long titleId, StorageId storageId, NcaContentType contentType)
{
- LocationEntry locationEntry = GetLocation(titleId, contentType, storageId);
-
- if (VerifyContentType(locationEntry, contentType))
+ lock (_lock)
{
- return locationEntry.ContentPath;
+ LocationEntry locationEntry = GetLocation(titleId, contentType, storageId);
+
+ if (VerifyContentType(locationEntry, contentType))
+ {
+ return locationEntry.ContentPath;
+ }
}
return string.Empty;
@@ -228,14 +251,17 @@ namespace Ryujinx.HLE.FileSystem.Content
public void RedirectLocation(LocationEntry newEntry, StorageId storageId)
{
- LocationEntry locationEntry = GetLocation(newEntry.TitleId, newEntry.ContentType, storageId);
-
- if (locationEntry.ContentPath != null)
+ lock (_lock)
{
- RemoveLocationEntry(newEntry.TitleId, newEntry.ContentType, storageId);
- }
+ LocationEntry locationEntry = GetLocation(newEntry.TitleId, newEntry.ContentType, storageId);
- AddLocationEntry(newEntry, storageId);
+ if (locationEntry.ContentPath != null)
+ {
+ RemoveLocationEntry(newEntry.TitleId, newEntry.ContentType, storageId);
+ }
+
+ AddLocationEntry(newEntry, storageId);
+ }
}
private bool VerifyContentType(LocationEntry locationEntry, NcaContentType contentType)
@@ -827,28 +853,31 @@ namespace Ryujinx.HLE.FileSystem.Content
{
LoadEntries(true);
- var locationEnties = _locationEntries[StorageId.NandSystem];
-
- foreach (var entry in locationEnties)
+ lock (_lock)
{
- if (entry.ContentType == NcaContentType.Data)
- {
- var path = _device.FileSystem.SwitchPathToSystemPath(entry.ContentPath);
+ var locationEnties = _locationEntries[StorageId.NandSystem];
- using (IStorage ncaStorage = File.Open(path, FileMode.Open).AsStorage())
+ foreach (var entry in locationEnties)
+ {
+ if (entry.ContentType == NcaContentType.Data)
{
- Nca nca = new Nca(_device.System.KeySet, ncaStorage);
+ var path = _device.FileSystem.SwitchPathToSystemPath(entry.ContentPath);
- if (nca.Header.TitleId == SystemVersionTitleId && nca.Header.ContentType == NcaContentType.Data)
+ using (FileStream fileStream = File.OpenRead(path))
{
- var romfs = nca.OpenFileSystem(NcaSectionType.Data, _device.System.FsIntegrityCheckLevel);
+ Nca nca = new Nca(_device.System.KeySet, fileStream.AsStorage());
- if (romfs.OpenFile(out IFile systemVersionFile, "/file", OpenMode.Read).IsSuccess())
+ if (nca.Header.TitleId == SystemVersionTitleId && nca.Header.ContentType == NcaContentType.Data)
{
- return new SystemVersion(systemVersionFile.AsStream());
+ var romfs = nca.OpenFileSystem(NcaSectionType.Data, _device.System.FsIntegrityCheckLevel);
+
+ if (romfs.OpenFile(out IFile systemVersionFile, "/file", OpenMode.Read).IsSuccess())
+ {
+ return new SystemVersion(systemVersionFile.AsStream());
+ }
}
- }
+ }
}
}
}
generated by cgit v1.2.3-70-g09d2 (git 2.48.1) at 2025-03-21 21:23:45 +0000