[C#] RecordInfo v2 (#577)

* RecordInfo v2 * fix version jump in CPR. * Updated misc stuff * nit * misc updates to SpanByte * Remove IntExclLocker * Add Try APIs to record locking * cleanup
microsoft · Oct 19, 2021 · 0c7ff6b · 0c7ff6b
1 parent 2287004
commit 0c7ff6b
Show file tree

Hide file tree

Showing 14 changed files with 286 additions and 331 deletions.
diff --git a/cs/benchmark/FasterSpanByteYcsbBenchmark.cs b/cs/benchmark/FasterSpanByteYcsbBenchmark.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-#pragma warning disable CS0162 // Unreachable code detected -- when switching on YcsbConstants 
-
 // Define below to enable continuous performance report for dashboard
 // #define DASHBOARD
 
@@ -297,7 +295,7 @@ internal unsafe (double, double) Run(TestLoader testLoader)
                         long start = swatch.ElapsedTicks;
                         if (store.TakeHybridLogCheckpoint(out _, testLoader.Options.PeriodicCheckpointType, testLoader.Options.PeriodicCheckpointTryIncremental))
                         {
-                            store.CompleteCheckpointAsync().GetAwaiter().GetResult();
+                            store.CompleteCheckpointAsync().AsTask().GetAwaiter().GetResult();
                             var timeTaken = (swatch.ElapsedTicks - start) / TimeSpan.TicksPerMillisecond;
                             Console.WriteLine("Checkpoint time: {0}ms", timeTaken);
                             checkpointTaken++;

diff --git a/cs/benchmark/FasterYcsbBenchmark.cs b/cs/benchmark/FasterYcsbBenchmark.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-#pragma warning disable CS0162 // Unreachable code detected -- when switching on YcsbConstants 
-
 // Define below to enable continuous performance report for dashboard
 // #define DASHBOARD
 
@@ -292,7 +290,7 @@ internal unsafe (double, double) Run(TestLoader testLoader)
                         long start = swatch.ElapsedTicks;
                         if (store.TakeHybridLogCheckpoint(out _, testLoader.Options.PeriodicCheckpointType, testLoader.Options.PeriodicCheckpointTryIncremental))
                         {
-                            store.CompleteCheckpointAsync().GetAwaiter().GetResult();
+                            store.CompleteCheckpointAsync().AsTask().GetAwaiter().GetResult();
                             var timeTaken = (swatch.ElapsedTicks - start) / TimeSpan.TicksPerMillisecond;
                             Console.WriteLine("Checkpoint time: {0}ms", timeTaken);
                             checkpointTaken++;

diff --git a/cs/benchmark/Functions.cs b/cs/benchmark/Functions.cs
@@ -98,12 +98,18 @@ public void CopyUpdater(ref Key key, ref Input input, ref Value oldValue, ref Va
 
         public void Lock(ref RecordInfo recordInfo, ref Key key, ref Value value, LockType lockType, ref long lockContext)
         {
-            recordInfo.SpinLock();
+            if (lockType == LockType.Exclusive)
+                recordInfo.LockExclusive();
+            else
+                recordInfo.LockShared();
         }
 
         public bool Unlock(ref RecordInfo recordInfo, ref Key key, ref Value value, LockType lockType, long lockContext)
         {
-            recordInfo.Unlock();
+            if (lockType == LockType.Exclusive)
+                recordInfo.UnlockExclusive();
+            else
+                recordInfo.UnlockShared();
             return true;
         }
     }