emu-mirrors/ryujinx-final
Archived
0
0
Fork 0
Code Activity

shader cache: Fix possible race causing crashes on manifest at startup (#1718)

Browse source 
* shader cache: Fix possible race causing crashes on manifest at startup

This fix a misplace function call ending up causing possibly two write
on the cache.info at the same time.

* shader cache: Make RemoveManifestEntries async too to be sure all operations are perform before starting the game
This commit is contained in:
Mary 2020-11-17 22:31:05 +01:00 committed by GitHub
parent 383c039037
commit cc60ba9d22
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Ryujinx.Graphics.Gpu/Shader/Cache/CacheCollection.cs
View file

@ -33,6 +33,11 @@ namespace Ryujinx.Graphics.Gpu.Shader.Cache
/// </summary> /// </summary>
SaveManifest, SaveManifest,
/// <summary>
/// Remove entries from the hash manifest and save it.
/// </summary>
RemoveManifestEntries,
/// <summary> /// <summary>
/// Flush temporary cache to archive. /// Flush temporary cache to archive.
/// </summary> /// </summary>
@ -227,11 +232,24 @@ namespace Ryujinx.Graphics.Gpu.Shader.Cache
FlushToArchive(); FlushToArchive();
} }
/// <summary>
/// Queue a task to remove entries from the hash manifest.
/// </summary>
/// <param name="entries">Entries to remove from the manifest</param>
public void RemoveManifestEntriesAsync(HashSet<Hash128> entries)
{
_fileWriterWorkerQueue.Add(new CacheFileOperationTask
{
Type = CacheFileOperation.RemoveManifestEntries,
Data = entries
});
}
/// <summary> /// <summary>
/// Remove given entries from the manifest. /// Remove given entries from the manifest.
/// </summary> /// </summary>
/// <param name="entries">Entries to remove from the manifest</param> /// <param name="entries">Entries to remove from the manifest</param>
public void RemoveManifestEntries(HashSet<Hash128> entries) private void RemoveManifestEntries(HashSet<Hash128> entries)
{ {
lock (_hashTable) lock (_hashTable)
{ {
@ -488,6 +506,9 @@ namespace Ryujinx.Graphics.Gpu.Shader.Cache
case CacheFileOperation.SaveManifest: case CacheFileOperation.SaveManifest:
SaveManifest(); SaveManifest();
break; break;
case CacheFileOperation.RemoveManifestEntries:
RemoveManifestEntries((HashSet<Hash128>)task.Data);
break;
case CacheFileOperation.FlushToArchive: case CacheFileOperation.FlushToArchive:
FlushToArchive(); FlushToArchive();
break; break;

4
Ryujinx.Graphics.Gpu/Shader/Cache/CacheManager.cs
View file

@ -58,8 +58,8 @@ namespace Ryujinx.Graphics.Gpu.Shader.Cache
/// <param name="entries">Entries to remove from the manifest of all caches</param> /// <param name="entries">Entries to remove from the manifest of all caches</param>
public void RemoveManifestEntries(HashSet<Hash128> entries) public void RemoveManifestEntries(HashSet<Hash128> entries)
{ {
_guestProgramCache.RemoveManifestEntries(entries); _guestProgramCache.RemoveManifestEntriesAsync(entries);
_hostProgramCache.RemoveManifestEntries(entries); _hostProgramCache.RemoveManifestEntriesAsync(entries);
} }
/// <summary> /// <summary>