aboutsummaryrefslogtreecommitdiff
path: root/src/Ryujinx.Common/SystemInterop/StdErrAdapter.cs
diff options
context:
space:
mode:
authorTSRBerry <20988865+TSRBerry@users.noreply.github.com>2023-06-28 18:41:38 +0200
committerGitHub <noreply@github.com>2023-06-28 18:41:38 +0200
commitfc20d9b925b83532a19467293a7cdcbaa4ef3d6b (patch)
treeebe0e690b6644d0f825ee80f20e4067855f35cf4 /src/Ryujinx.Common/SystemInterop/StdErrAdapter.cs
parent0a75b73fa43ddadf561ddeb0f923c6f3811c025b (diff)
[Ryujinx.Common] Address dotnet-format issues (#5358)
* dotnet format style --severity info Some changes were manually reverted. * dotnet format analyzers --serverity info Some changes have been minimally adapted. * Restore a few unused methods and variables * Silence dotnet format IDE0060 warnings * Silence dotnet format IDE0059 warnings * Address or silence dotnet format IDE1006 warnings * Address dotnet format CA1816 warnings * Address or silence dotnet format CA2211 warnings * Silence CA1806 and CA1834 issues * Fix formatting for switch expressions * Address most dotnet format whitespace warnings * Apply dotnet format whitespace formatting A few of them have been manually reverted and the corresponding warning was silenced * Revert formatting changes for while and for-loops * Format if-blocks correctly * Run dotnet format whitespace after rebase * Run dotnet format style after rebase * Run dotnet format analyzers after rebase * Run dotnet format after rebase and remove unused usings - analyzers - style - whitespace * Add comments to disabled warnings * Remove a few unused parameters * Replace MmeShadowScratch with Array256<uint> * Simplify properties and array initialization, Use const when possible, Remove trailing commas * Run dotnet format after rebase * Address IDE0251 warnings * Revert "Simplify properties and array initialization, Use const when possible, Remove trailing commas" This reverts commit 9462e4136c0a2100dc28b20cf9542e06790aa67e. * dotnet format whitespace after rebase * First dotnet format pass * Second dotnet format pass * Fix build issues * Fix StructArrayHelpers.cs * Apply suggestions from code review Co-authored-by: Ac_K <Acoustik666@gmail.com> * Fix return statements * Fix naming rule violations * Update src/Ryujinx.Common/Utilities/StreamUtils.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Add trailing commas * Address review feedback * Address review feedback * Rename remaining type parameters to TKey and TValue * Fix manual formatting for logging levels * Fix spacing before comments --------- Co-authored-by: Ac_K <Acoustik666@gmail.com>
Diffstat (limited to 'src/Ryujinx.Common/SystemInterop/StdErrAdapter.cs')
-rw-r--r--src/Ryujinx.Common/SystemInterop/StdErrAdapter.cs31
1 files changed, 13 insertions, 18 deletions
diff --git a/src/Ryujinx.Common/SystemInterop/StdErrAdapter.cs b/src/Ryujinx.Common/SystemInterop/StdErrAdapter.cs
index 4802178e..a04c404d 100644
--- a/src/Ryujinx.Common/SystemInterop/StdErrAdapter.cs
+++ b/src/Ryujinx.Common/SystemInterop/StdErrAdapter.cs
@@ -11,7 +11,7 @@ namespace Ryujinx.Common.SystemInterop
{
public partial class StdErrAdapter : IDisposable
{
- private bool _disposable = false;
+ private bool _disposable;
private Stream _pipeReader;
private Stream _pipeWriter;
private CancellationTokenSource _cancellationTokenSource;
@@ -41,7 +41,7 @@ namespace Ryujinx.Common.SystemInterop
_worker = Task.Run(async () => await EventWorkerAsync(_cancellationTokenSource.Token), _cancellationTokenSource.Token);
_disposable = true;
}
-
+
[SupportedOSPlatform("linux")]
[SupportedOSPlatform("macos")]
private async Task EventWorkerAsync(CancellationToken cancellationToken)
@@ -53,13 +53,15 @@ namespace Ryujinx.Common.SystemInterop
Logger.Error?.PrintRawMsg(line);
}
}
-
- private void Dispose(bool disposing)
+
+ public void Dispose()
{
+ GC.SuppressFinalize(this);
+
if (_disposable)
{
_disposable = false;
-
+
if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS())
{
_cancellationTokenSource.Cancel();
@@ -70,11 +72,6 @@ namespace Ryujinx.Common.SystemInterop
}
}
- public void Dispose()
- {
- Dispose(true);
- }
-
[LibraryImport("libc", SetLastError = true)]
private static partial int dup2(int fd, int fd2);
@@ -83,27 +80,25 @@ namespace Ryujinx.Common.SystemInterop
private static (int, int) MakePipe()
{
- Span<int> pipefd = stackalloc int[2];
+ Span<int> pipefd = stackalloc int[2];
if (pipe(pipefd) == 0)
{
return (pipefd[0], pipefd[1]);
}
- else
- {
- throw new();
- }
+
+ throw new();
}
-
+
[SupportedOSPlatform("linux")]
[SupportedOSPlatform("macos")]
private static Stream CreateFileDescriptorStream(int fd)
{
return new FileStream(
- new SafeFileHandle((IntPtr)fd, ownsHandle: true),
+ new SafeFileHandle(fd, ownsHandle: true),
FileAccess.ReadWrite
);
}
-
+
}
}