forked from MeloNX/MeloNX
* 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>
105 lines
3.0 KiB
C#
105 lines
3.0 KiB
C#
using Microsoft.Win32.SafeHandles;
|
|
using Ryujinx.Common.Logging;
|
|
using System;
|
|
using System.IO;
|
|
using System.Runtime.InteropServices;
|
|
using System.Runtime.Versioning;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
|
|
namespace Ryujinx.Common.SystemInterop
|
|
{
|
|
public partial class StdErrAdapter : IDisposable
|
|
{
|
|
private bool _disposable;
|
|
private Stream _pipeReader;
|
|
private Stream _pipeWriter;
|
|
private CancellationTokenSource _cancellationTokenSource;
|
|
private Task _worker;
|
|
|
|
public StdErrAdapter()
|
|
{
|
|
if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS())
|
|
{
|
|
RegisterPosix();
|
|
}
|
|
}
|
|
|
|
[SupportedOSPlatform("linux")]
|
|
[SupportedOSPlatform("macos")]
|
|
private void RegisterPosix()
|
|
{
|
|
const int StdErrFileno = 2;
|
|
|
|
(int readFd, int writeFd) = MakePipe();
|
|
dup2(writeFd, StdErrFileno);
|
|
|
|
_pipeReader = CreateFileDescriptorStream(readFd);
|
|
_pipeWriter = CreateFileDescriptorStream(writeFd);
|
|
|
|
_cancellationTokenSource = new CancellationTokenSource();
|
|
_worker = Task.Run(async () => await EventWorkerAsync(_cancellationTokenSource.Token), _cancellationTokenSource.Token);
|
|
_disposable = true;
|
|
}
|
|
|
|
[SupportedOSPlatform("linux")]
|
|
[SupportedOSPlatform("macos")]
|
|
private async Task EventWorkerAsync(CancellationToken cancellationToken)
|
|
{
|
|
using TextReader reader = new StreamReader(_pipeReader, leaveOpen: true);
|
|
string line;
|
|
while (cancellationToken.IsCancellationRequested == false && (line = await reader.ReadLineAsync(cancellationToken)) != null)
|
|
{
|
|
Logger.Error?.PrintRawMsg(line);
|
|
}
|
|
}
|
|
|
|
public void Dispose()
|
|
{
|
|
GC.SuppressFinalize(this);
|
|
|
|
if (_disposable)
|
|
{
|
|
_disposable = false;
|
|
|
|
if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS())
|
|
{
|
|
_cancellationTokenSource.Cancel();
|
|
_worker.Wait(0);
|
|
_pipeReader?.Close();
|
|
_pipeWriter?.Close();
|
|
}
|
|
}
|
|
}
|
|
|
|
[LibraryImport("libc", SetLastError = true)]
|
|
private static partial int dup2(int fd, int fd2);
|
|
|
|
[LibraryImport("libc", SetLastError = true)]
|
|
private static partial int pipe(Span<int> pipefd);
|
|
|
|
private static (int, int) MakePipe()
|
|
{
|
|
Span<int> pipefd = stackalloc int[2];
|
|
|
|
if (pipe(pipefd) == 0)
|
|
{
|
|
return (pipefd[0], pipefd[1]);
|
|
}
|
|
|
|
throw new();
|
|
}
|
|
|
|
[SupportedOSPlatform("linux")]
|
|
[SupportedOSPlatform("macos")]
|
|
private static Stream CreateFileDescriptorStream(int fd)
|
|
{
|
|
return new FileStream(
|
|
new SafeFileHandle(fd, ownsHandle: true),
|
|
FileAccess.ReadWrite
|
|
);
|
|
}
|
|
|
|
}
|
|
}
|