manuth/Ryujinx
1
0
Fork 0
mirror of https://git.naxdy.org/Mirror/Ryujinx.git synced 2025-01-12 13:49:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Async + Avoid Copies

Browse source
This commit is contained in:
Isaac Marovitz 2023-10-04 15:53:37 -04:00
parent c8b39e0c98
commit 9201d1d596
No known key found for this signature in database
GPG key ID: 97250B2B09A132E1
3 changed files with 140 additions and 293 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

358
src/Ryujinx.Ava/Common/SaveManager/SaveManager.cs
View file

@ -4,9 +4,7 @@ using LibHac.Common;
using LibHac.Fs; using LibHac.Fs;
using LibHac.Fs.Shim; using LibHac.Fs.Shim;
using LibHac.Ns; using LibHac.Ns;
using Microsoft.IdentityModel.Tokens;
using Ryujinx.Ava.UI.Windows; using Ryujinx.Ava.UI.Windows;
using Ryujinx.Common.Configuration;
using Ryujinx.Common.Logging; using Ryujinx.Common.Logging;
using Ryujinx.Ui.Common.Helper; using Ryujinx.Ui.Common.Helper;
using Ryujinx.Ui.Common.SaveManager; using Ryujinx.Ui.Common.SaveManager;
@ -49,30 +47,7 @@ namespace Ryujinx.Ava.Common.SaveManager
_loadingEventArgs.Max = userSaves.Length + 1; // Add one for metadata file _loadingEventArgs.Max = userSaves.Length + 1; // Add one for metadata file
BackupProgressUpdated?.Invoke(this, _loadingEventArgs); BackupProgressUpdated?.Invoke(this, _loadingEventArgs);
// Create the top level temp dir for the intermediate copies - ensure it's empty return await CreateOrReplaceZipFile(userSaves, savePath.LocalPath);
// TODO: should this go in the location since data has to go there anyway? might make the ultimate zip faster since IO is local?
var backupTempDir = Path.Combine(AppDataManager.BackupDirPath, $"{userId}_library_saveTemp");
try
{
// Delete temp for good measure?
_ = Directory.CreateDirectory(backupTempDir);
return await BatchCopySavesToTempDir(userSaves, backupTempDir)
&& CreateOrReplaceZipFile(backupTempDir, savePath.LocalPath);
}
catch (Exception ex)
{
Logger.Error?.Print(LogClass.Application, $"Failed to backup user data - {ex.Message}");
return false;
}
finally
{
if (Directory.Exists(backupTempDir))
{
Directory.Delete(backupTempDir, true);
}
}
} }
private IEnumerable<BackupSaveMeta> GetUserSaveData(LibHacUserId userId) private IEnumerable<BackupSaveMeta> GetUserSaveData(LibHacUserId userId)
@ -145,150 +120,126 @@ namespace Ryujinx.Ava.Common.SaveManager
return saves; return saves;
} }
private async Task<bool> BatchCopySavesToTempDir(IEnumerable<BackupSaveMeta> userSaves, string backupTempDir) private async static Task<bool> CreateOrReplaceZipFile(IEnumerable<BackupSaveMeta> userSaves, string zipPath)
{ {
await using FileStream zipFileSteam = new(zipPath, FileMode.Create, FileAccess.ReadWrite);
using ZipArchive zipArchive = new(zipFileSteam, ZipArchiveMode.Create);
foreach (var save in userSaves)
{
// Find the most recent version of the data, there is a committed (0) and working (1) paths directory
var saveRootPath = ApplicationHelper.FindValidSaveDir(save.SaveDataId);
// The actual title in the name would be nice but titleId is more reliable
// /[titleId]/[saveType]
var copyDestPath = Path.Combine(save.TitleId.Value.ToString(), save.Type.ToString());
foreach (string filename in Directory.EnumerateFileSystemEntries(saveRootPath, "*", SearchOption.AllDirectories))
{
var attributes = File.GetAttributes(filename);
if (attributes.HasFlag(FileAttributes.Hidden | FileAttributes.System | FileAttributes.Directory))
{
continue;
}
try try
{ {
// Batch intermediate copies so we don't overwhelm systems await using FileStream sourceFile = new(filename, FileMode.Open, FileAccess.Read);
const int BATCH_SIZE = 5;
List<Task<bool>> tempCopyTasks = new(BATCH_SIZE);
// Copy each applications save data to it's own folder in the temp dir var filePath = Path.Join(copyDestPath, Path.GetRelativePath(saveRootPath, filename));
foreach (var meta in userSaves)
{
// if the buffer is full, wait for it to drain
if (tempCopyTasks.Count >= BATCH_SIZE)
{
// TODO: error handling with options
_ = await Task.WhenAll(tempCopyTasks);
tempCopyTasks.Clear();
}
// Add backup task ZipArchiveEntry entry = zipArchive.CreateEntry(filePath, CompressionLevel.SmallestSize);
tempCopyTasks.Add(CopySaveDataToIntermediateDirectory(meta, backupTempDir));
}
// wait for any outstanding temp copies to complete await using StreamWriter writer = new(entry.Open());
_ = await Task.WhenAll(tempCopyTasks);
_loadingEventArgs.Curr++; await sourceFile.CopyToAsync(writer.BaseStream);
BackupProgressUpdated?.Invoke(this, _loadingEventArgs);
return true;
} }
catch (Exception ex) catch (Exception ex)
{ {
Logger.Error?.Print(LogClass.Application, $"Failed to copy save data to intermediate directory - {ex.Message}"); Logger.Error?.Print(LogClass.Application, $"Failed to zip file: {ex.Message}");
}
}
} }
return false;
}
private async Task<bool> CopySaveDataToIntermediateDirectory(BackupSaveMeta saveMeta, string destinationDir)
{
// Find the most recent version of the data, there is a commited (0) and working (1) paths directory
var saveRootPath = ApplicationHelper.FindValidSaveDir(saveMeta.SaveDataId);
// the actual title in the name would be nice but titleId is more reliable
// [backupLocation]/[titleId]/[saveType]
var copyDestPath = Path.Combine(destinationDir, saveMeta.TitleId.Value.ToString(), saveMeta.Type.ToString());
var result = await CopyDirectoryAsync(saveRootPath, copyDestPath);
// Update progress for each dir we copy save data for
_loadingEventArgs.Curr++;
BackupProgressUpdated?.Invoke(this, _loadingEventArgs);
return result;
}
public static bool CreateOrReplaceZipFile(string sourceDataDirectory, string backupDestinationFullPath)
{
try
{
if (File.Exists(backupDestinationFullPath))
{
File.Delete(backupDestinationFullPath);
}
ZipFile.CreateFromDirectory(sourceDataDirectory, backupDestinationFullPath, CompressionLevel.SmallestSize, false);
return true; return true;
} }
catch (Exception ex)
{
Logger.Error?.Print(LogClass.Application, $"Failed to zip data.\n{ex.Message}");
return false;
}
}
#endregion #endregion
#region Restore #region Restore
public async Task<bool> RestoreUserSaveDataFromZip(LibHacUserId userId, public async Task<bool> RestoreUserSaveDataFromZip(LibHacUserId userId, string zipPath)
string sourceDataPath)
{ {
var sourceInfo = new FileInfo(sourceDataPath); var titleDirectories = new List<RestoreSaveMeta>();
var determinedSourcePath = sourceInfo.FullName;
bool requireSourceCleanup = false;
if (sourceInfo.Extension.Equals(".zip", StringComparison.OrdinalIgnoreCase))
{
determinedSourcePath = Path.Combine(AppDataManager.BackupDirPath, userId.ToString(), "import", "temp");
Directory.CreateDirectory(determinedSourcePath);
requireSourceCleanup = true;
try try
{ {
ZipFile.ExtractToDirectory(sourceInfo.FullName, determinedSourcePath, true); await using FileStream zipFileSteam = new(zipPath, FileMode.Open, FileAccess.Read);
sourceInfo = new FileInfo(determinedSourcePath); using ZipArchive zipArchive = new(zipFileSteam, ZipArchiveMode.Read);
}
catch (Exception ex)
{
var error = $"Failed to extract save backup zip {ex.Message}";
Logger.Error?.Print(LogClass.Application, error);
return false; // Directories do not always have entries
foreach (var entry in zipArchive.Entries)
{
var pathByDepth = entry.FullName.Split(Path.DirectorySeparatorChar, StringSplitOptions.RemoveEmptyEntries);
// Depth 1 is title IDs, Depth 2 the save type
if (pathByDepth.Length < 2)
{
continue;
}
var parentDirectoryName = pathByDepth[0];
var directoryName = pathByDepth[1];
if (!ulong.TryParse(parentDirectoryName, out var titleId))
{
continue;
}
if (Enum.TryParse<SaveDataType>(directoryName, out var saveType))
{
var meta = new RestoreSaveMeta { TitleId = titleId, SaveType = saveType };
if (!titleDirectories.Contains(meta))
{
titleDirectories.Add(meta);
}
} }
} }
try try
{ {
// Reset progress bar var mappings = new List<MetaToLocalMap?>();
_loadingEventArgs.Curr = 0;
_loadingEventArgs.Max = 0;
BackupProgressUpdated?.Invoke(this, _loadingEventArgs);
var identifiedTitleDirectories = GetTitleDirectories(sourceInfo); // Find the saveId for each titleId and migrate it. Use cache to avoid duplicate lookups of known titleId
if (identifiedTitleDirectories.IsNullOrEmpty()) foreach (var importMeta in titleDirectories)
{ {
return false; if (PrepareLocalSaveData(importMeta, userId, out string localDir))
{
mappings.Add(new MetaToLocalMap
{
RelativeDir = Path.Join(importMeta.TitleId.ToString(), importMeta.SaveType.ToString()),
LocalDir = localDir
});
}
} }
// Start import foreach (var entry in zipArchive.Entries)
_loadingEventArgs.Max = identifiedTitleDirectories.Count();
BackupProgressUpdated?.Invoke(this, _loadingEventArgs);
// buffer of concurrent saves to import -- limited so we don't overwhelm systems
const int BUFFER_SIZE = 4; // multiple of cores is ideal
List<Task<bool>> importBuffer = new(BUFFER_SIZE);
// find the saveId for each titleId and migrate it. Use cache to avoid duplicate lookups of known titleId
foreach (var importMeta in identifiedTitleDirectories)
{ {
if (importBuffer.Count >= BUFFER_SIZE) if (entry.FullName[^1] == Path.DirectorySeparatorChar)
{ {
_ = await Task.WhenAll(importBuffer); continue;
importBuffer.Clear();
} }
importBuffer.Add(ImportSaveData(importMeta, userId)); var optional = mappings.FirstOrDefault(x => entry.FullName.Contains(x.Value.RelativeDir), null);
// Mark complete if (!optional.HasValue)
_loadingEventArgs.Curr++; {
BackupProgressUpdated?.Invoke(this, _loadingEventArgs); continue;
} }
// let the import complete var map = optional.Value;
_ = await Task.WhenAll(importBuffer); var localPath = Path.Join(map.LocalDir, Path.GetRelativePath(map.RelativeDir, entry.FullName));
entry.ExtractToFile(localPath, true);
}
return true; return true;
} }
@ -297,17 +248,19 @@ namespace Ryujinx.Ava.Common.SaveManager
Logger.Error?.Print(LogClass.Application, $"Failed to import save data - {ex.Message}"); Logger.Error?.Print(LogClass.Application, $"Failed to import save data - {ex.Message}");
return false; return false;
} }
finally
{
if (requireSourceCleanup)
{
Directory.Delete(determinedSourcePath, true);
} }
catch (Exception ex)
{
var error = $"Failed to load save backup zip: {ex.Message}";
Logger.Error?.Print(LogClass.Application, error);
return false;
} }
} }
private async Task<bool> ImportSaveData(RestoreSaveMeta meta, LibHacUserId userId) private bool PrepareLocalSaveData(RestoreSaveMeta meta, UserId userId, out String? path)
{ {
path = null;
// Lookup the saveId based on title for the user we're importing too // Lookup the saveId based on title for the user we're importing too
var saveDataFilter = SaveDataFilter.Make(meta.TitleId, var saveDataFilter = SaveDataFilter.Make(meta.TitleId,
meta.SaveType, meta.SaveType,
@ -340,7 +293,7 @@ namespace Ryujinx.Ava.Common.SaveManager
} }
} }
// Find the most recent version of the data, there is a commited (0) and working (1) directory // Find the most recent version of the data, there is a committed (0) and working (1) directory
var userHostSavePath = ApplicationHelper.FindValidSaveDir(saveDataInfo.SaveDataId); var userHostSavePath = ApplicationHelper.FindValidSaveDir(saveDataInfo.SaveDataId);
if (string.IsNullOrWhiteSpace(userHostSavePath)) if (string.IsNullOrWhiteSpace(userHostSavePath))
{ {
@ -348,30 +301,20 @@ namespace Ryujinx.Ava.Common.SaveManager
return false; return false;
} }
// copy from backup path to host save path path = userHostSavePath;
var copyResult = await CopyDirectoryAsync(meta.ImportPath, userHostSavePath); return true;
}
_loadingEventArgs.Curr++; private void TryGenerateSaveEntry(ulong titleId, UserId userId)
BackupProgressUpdated?.Invoke(this, _loadingEventArgs);
BackupImportSave?.Invoke(this, new ImportSaveEventArgs
{ {
SaveInfo = saveDataInfo // Resolve from app data
});
return copyResult;
#region LocalFunction
bool TryGenerateSaveEntry(ulong titleId, LibHacUserId userId)
{
// resolve from app data
var titleIdHex = titleId.ToString("x16"); var titleIdHex = titleId.ToString("x16");
var appData = MainWindow.MainWindowViewModel.Applications var appData = MainWindow.MainWindowViewModel.Applications
.FirstOrDefault(x => x.TitleId.Equals(titleIdHex, StringComparison.OrdinalIgnoreCase)); .FirstOrDefault(x => x.TitleId.Equals(titleIdHex, StringComparison.OrdinalIgnoreCase));
if (appData is null) if (appData is null)
{ {
Logger.Error?.Print(LogClass.Application, $"No application loaded with titleId {titleIdHex}"); Logger.Error?.Print(LogClass.Application, $"No application loaded with titleId {titleIdHex}");
return false; return;
} }
ref ApplicationControlProperty control = ref appData.ControlHolder.Value; ref ApplicationControlProperty control = ref appData.ControlHolder.Value;
@ -392,110 +335,7 @@ namespace Ryujinx.Ava.Common.SaveManager
} }
Uid user = new(userId.Id.High, userId.Id.Low); Uid user = new(userId.Id.High, userId.Id.Low);
return _horizonClient.Fs.EnsureApplicationSaveData(out _, new LibHac.Ncm.ApplicationId(titleId), in control, in user) _horizonClient.Fs.EnsureApplicationSaveData(out _, new LibHac.Ncm.ApplicationId(titleId), in control, in user);
.IsSuccess();
}
#endregion
}
private static IEnumerable<RestoreSaveMeta> GetTitleDirectories(FileInfo sourceInfo)
{
if ((sourceInfo.Attributes & FileAttributes.Directory) != FileAttributes.Directory)
{
Logger.Error?.Print(LogClass.Application, $"Unsupported entry specified to extract save data from {sourceInfo.FullName}");
return Enumerable.Empty<RestoreSaveMeta>();
}
// Find the "root" save directories
var outcome = new List<RestoreSaveMeta>();
foreach (var entry in Directory.EnumerateDirectories(sourceInfo.FullName))
{
// check if the leaf directory is a titleId
if (!ulong.TryParse(entry[(entry.LastIndexOf(Path.DirectorySeparatorChar) + 1)..], out var titleId))
{
Logger.Warning?.Print(LogClass.Application, $"Skipping import of unknown directory {entry}");
continue;
}
// it looks like a titleId, see if we can find the save type directories we expect
foreach (var saveTypeDir in Directory.EnumerateDirectories(entry))
{
var saveTypeEntryInfo = new FileInfo(saveTypeDir);
// Check empty dirs?
if (Enum.TryParse<SaveDataType>(saveTypeEntryInfo.Name, out var saveType))
{
outcome.Add(new RestoreSaveMeta
{
TitleId = titleId,
SaveType = saveType,
ImportPath = saveTypeEntryInfo.FullName
});
}
}
}
return outcome;
}
#endregion
#region Utilities
private static async Task<bool> CopyDirectoryAsync(string sourceDirectory, string destDirectory)
{
bool result = true;
Directory.CreateDirectory(destDirectory);
foreach (string filename in Directory.EnumerateFileSystemEntries(sourceDirectory))
{
var itemDest = Path.Combine(destDirectory, Path.GetFileName(filename));
var attrs = File.GetAttributes(filename);
result &= attrs switch
{
_ when (attrs & FileAttributes.Directory) == FileAttributes.Directory => await CopyDirectoryAsync(filename, itemDest),
_ => await CopyFileAsync(filename, itemDest)
};
if (!result)
{
// TODO: use options to decide hard fail
continue;
}
}
return result;
#region LocalMethod
static async Task<bool> CopyFileAsync(string source, string destination, int retryCount = 0)
{
try
{
if (retryCount > 0)
{
Logger.Debug?.Print(LogClass.Application, $"Backing off retrying copy of {source}");
await Task.Delay((int)(Math.Pow(2, retryCount) * 200));
}
using FileStream sourceStream = File.Open(source, FileMode.Open, FileAccess.Read);
using FileStream destinationStream = File.Create(destination);
await sourceStream.CopyToAsync(destinationStream);
return true;
}
catch (Exception ex)
{
if (ex.Message.Contains("is being used by another process", StringComparison.OrdinalIgnoreCase))
{
const int RetryThreshold = 3;
return ++retryCount < RetryThreshold
&& await CopyFileAsync(source, destination, retryCount);
}
Logger.Error?.Print(LogClass.Application, $"Failed to copy file {source} - {ex.Message}");
return false;
}
}
#endregion
} }
#endregion #endregion
} }

8
src/Ryujinx.Ava/Common/SaveManager/SaveManagerMetadata.cs
View file

@ -1,5 +1,6 @@
using LibHac.Fs; using LibHac.Fs;
using LibHac.Ncm; using LibHac.Ncm;
using System.IO.Compression;
namespace Ryujinx.Ava.Common.SaveManager namespace Ryujinx.Ava.Common.SaveManager
{ {
@ -14,6 +15,11 @@ namespace Ryujinx.Ava.Common.SaveManager
{ {
public ulong TitleId { get; init; } public ulong TitleId { get; init; }
public SaveDataType SaveType { get; init; } public SaveDataType SaveType { get; init; }
public string ImportPath { get; init; } }
internal readonly record struct MetaToLocalMap
{
public string RelativeDir { get; init; }
public string LocalDir { get; init; }
} }
} }

1
src/Ryujinx.Ava/Ryujinx.Ava.csproj
View file

@ -12,6 +12,7 @@
<TieredPGO>true</TieredPGO> <TieredPGO>true</TieredPGO>
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault> <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
<ApplicationManifest>app.manifest</ApplicationManifest> <ApplicationManifest>app.manifest</ApplicationManifest>
<Nullable>enable</Nullable>
</PropertyGroup> </PropertyGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="$([MSBuild]::IsOSPlatform('OSX'))"> <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="$([MSBuild]::IsOSPlatform('OSX'))">