Apply CA1837 and CA1840 (#305)

* Apply CA1837: Use Environment.ProcessId instead of Process.GetCurrentProcess().Id * CA1840: Use Environment.CurrentManagedThreadId instead of Thread.CurrentThread.ManagedThreadId
microsoft · Apr 24, 2024 · dc7b517 · dc7b517
1 parent cce3053
commit dc7b517
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -221,6 +221,12 @@ dotnet_diagnostic.CA1829.severity = suggestion
 # CA1836: Prefer IsEmpty over Count when available
 dotnet_diagnostic.CA1836.severity = suggestion
 
+# CA1837: Use Environment.ProcessId instead of Process.GetCurrentProcess().Id
+dotnet_diagnostic.CA1837.severity = suggestion
+
+# CA1840: Use Environment.CurrentManagedThreadId instead of Thread.CurrentThread.ManagedThreadId
+dotnet_diagnostic.CA1840.severity = suggestion
+
 # CA1852: Seal internal types
 dotnet_diagnostic.CA1852.severity = suggestion
 

diff --git a/libs/storage/Tsavorite/cs/src/core/Index/Common/ConcurrentCounter.cs b/libs/storage/Tsavorite/cs/src/core/Index/Common/ConcurrentCounter.cs
@@ -45,7 +45,7 @@ internal void Increment(long incrValue)
         {
             if (incrValue == 0) return;
 
-            var partition = Thread.CurrentThread.ManagedThreadId % partitionCount;
+            var partition = Environment.CurrentManagedThreadId % partitionCount;
             Interlocked.Add(ref partitionsPtr[partition].value, incrValue);
         }
 

diff --git a/test/Garnet.test/TestUtils.cs b/test/Garnet.test/TestUtils.cs
@@ -36,8 +36,6 @@ internal static class TestUtils
         /// </summary>
         public static int Port = 33278;
 
-        private static int procId = Process.GetCurrentProcess().Id;
-
         internal static string AzureTestContainer
         {
             get
@@ -571,7 +569,7 @@ public static EndPointCollection GetEndPoints(int shards, int port = default)
         internal static string UnitTestWorkingDir(string category = null, bool includeGuid = false)
         {
             // Include process id to avoid conflicts between parallel test runs
-            var testPath = $"{procId}_{TestContext.CurrentContext.Test.ClassName}_{TestContext.CurrentContext.Test.MethodName}";
+            var testPath = $"{Environment.ProcessId}_{TestContext.CurrentContext.Test.ClassName}_{TestContext.CurrentContext.Test.MethodName}";
             var rootPath = Path.Combine(RootTestsProjectPath, ".tmp", testPath);
 
             if (category != null)