aboutsummaryrefslogtreecommitdiff
path: root/src/Ryujinx.Common/Memory/PartialUnmaps/NativeReaderWriterLock.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/Memory/PartialUnmaps/NativeReaderWriterLock.cs
parent0a75b73fa43ddadf561ddeb0f923c6f3811c025b (diff)
[Ryujinx.Common] Address dotnet-format issues (#5358)1.1.936
* 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/Memory/PartialUnmaps/NativeReaderWriterLock.cs')
-rw-r--r--src/Ryujinx.Common/Memory/PartialUnmaps/NativeReaderWriterLock.cs19
1 files changed, 12 insertions, 7 deletions
diff --git a/src/Ryujinx.Common/Memory/PartialUnmaps/NativeReaderWriterLock.cs b/src/Ryujinx.Common/Memory/PartialUnmaps/NativeReaderWriterLock.cs
index 78eeb16f..03d48fd8 100644
--- a/src/Ryujinx.Common/Memory/PartialUnmaps/NativeReaderWriterLock.cs
+++ b/src/Ryujinx.Common/Memory/PartialUnmaps/NativeReaderWriterLock.cs
@@ -1,6 +1,5 @@
using System.Runtime.InteropServices;
using System.Threading;
-
using static Ryujinx.Common.Memory.PartialUnmaps.PartialUnmapHelpers;
namespace Ryujinx.Common.Memory.PartialUnmaps
@@ -14,15 +13,15 @@ namespace Ryujinx.Common.Memory.PartialUnmaps
public int WriteLock;
public int ReaderCount;
- public static int WriteLockOffset;
- public static int ReaderCountOffset;
+ public static readonly int WriteLockOffset;
+ public static readonly int ReaderCountOffset;
/// <summary>
/// Populates the field offsets for use when emitting native code.
/// </summary>
static NativeReaderWriterLock()
{
- NativeReaderWriterLock instance = new NativeReaderWriterLock();
+ NativeReaderWriterLock instance = new();
WriteLockOffset = OffsetOf(ref instance, ref instance.WriteLock);
ReaderCountOffset = OffsetOf(ref instance, ref instance.ReaderCount);
@@ -35,7 +34,9 @@ namespace Ryujinx.Common.Memory.PartialUnmaps
{
// Must take write lock for a very short time to become a reader.
- while (Interlocked.CompareExchange(ref WriteLock, 1, 0) != 0) { }
+ while (Interlocked.CompareExchange(ref WriteLock, 1, 0) != 0)
+ {
+ }
Interlocked.Increment(ref ReaderCount);
@@ -60,11 +61,15 @@ namespace Ryujinx.Common.Memory.PartialUnmaps
Interlocked.Decrement(ref ReaderCount);
- while (Interlocked.CompareExchange(ref WriteLock, 1, 0) != 0) { }
+ while (Interlocked.CompareExchange(ref WriteLock, 1, 0) != 0)
+ {
+ }
// Wait for reader count to drop to 0, then take the lock again as the only reader.
- while (Interlocked.CompareExchange(ref ReaderCount, 1, 0) != 0) { }
+ while (Interlocked.CompareExchange(ref ReaderCount, 1, 0) != 0)
+ {
+ }
}
/// <summary>