Removed lock on the stopping of the precompute. (#267)

* Removed lock on the stopping of the precompute.
Added benchmark to time the stopPrecompute functionality.

* Update version numbers for nuget release

Author: SteveMaier-IRT

CMakeLists.txt

@@ -7,7 +7,7 @@ set(META_PROJECT_EXPORT      "ElectionGuard")
 set(META_PROJECT_TARGET      "electionguard")
 set(META_VERSION_MAJOR       "0")
 set(META_VERSION_MINOR       "1")
-set(META_VERSION_PATCH       "6")
+set(META_VERSION_PATCH       "10")
 set(META_VERSION             "${META_VERSION_MAJOR}.${META_VERSION_MINOR}.${META_VERSION_PATCH}")
 
 set(LIBRARY_PUBLIC_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include)

bindings/netstandard/ElectionGuard/ElectionGuard.Encryption.Bench/BenchEncrypt.cs

@@ -3,6 +3,7 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using ElectionGuard.Encryption.Utils;
 
@@ -11,6 +12,7 @@ namespace ElectionGuard.Encryption.Bench
 
     public class BenchEncrypt : Fixture
     {
+        readonly int MAX_COMPLETE_DELAY = 7000;
         ElementModQ nonce;
         ElGamalKeyPair keypair;
         Manifest manifest;
@@ -41,6 +43,9 @@ public override void Run()
             Bench_Encrypt_BallotFull_NoProofCheck();
             Bench_Encrypt_BallotFull_WithProofCheck();
             Bench_Encrypt_Ballot_Compact_NoProofCheck();
+
+            Setup_Precompute_Buffers();
+            Bench_Encrypt_BallotFull_NoProofCheck();
             // TODO: Bench_Encrypt_Ballot_Compact_WithProofCheck();
         }
 
@@ -79,5 +84,24 @@ public void Bench_Encrypt_Ballot_Compact_WithProofCheck()
                 var ciphertext = Encrypt.CompactBallot(ballot, internalManifest, context, device.GetHash(), nonce, true);
             });
         }
+
+        public void Setup_Precompute_Buffers()
+        {
+            Console.WriteLine("Setup_Precompute_Buffers");
+            var waitHandle = new AutoResetEvent(false);
+
+            Precompute precompute = new Precompute();
+            precompute.CompletedEvent += (PrecomputeStatus completedStatus) =>
+            {
+                waitHandle.Set();
+            };
+            precompute.StartPrecomputeAsync(keypair.PublicKey, 1000);
+            var waitReturn = waitHandle.WaitOne(MAX_COMPLETE_DELAY);
+            Run(() =>
+            {
+                precompute.StopPrecompute();
+            });
+        }
+
     }
 }

bindings/netstandard/ElectionGuard/ElectionGuard.Encryption/ElectionGuard.Encryption.csproj

@@ -7,9 +7,9 @@
     <!-- Project -->
     <RootNamespace>ElectionGuard</RootNamespace>
     <AssemblyName>ElectionGuard.Encryption</AssemblyName>
-    <Version>0.1.9</Version>
-    <AssemblyVersion>0.1.9.0</AssemblyVersion>
-    <AssemblyFileVersion>0.1.9.0</AssemblyFileVersion>
+    <Version>0.1.10</Version>
+    <AssemblyVersion>0.1.10.0</AssemblyVersion>
+    <AssemblyFileVersion>0.1.10.0</AssemblyFileVersion>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -19,7 +19,7 @@
     <Title>ElectionGuard Encryption</Title>
     <Description>Open source implementation of ElectionGuard's ballot encryption.</Description>
     <Authors>Microsoft</Authors>
-    <PackageVersion>0.1.9</PackageVersion>
+    <PackageVersion>0.1.10</PackageVersion>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/microsoft/electionguard-cpp</PackageProjectUrl>
     <RepositoryUrl>https://github.com/microsoft/electionguard-cpp</RepositoryUrl>

src/electionguard/precompute_buffers.cpp

@@ -232,11 +232,7 @@ namespace electionguard
         } while (getInstance().quadruple_queue.size() < getInstance().max);
     }
 
-    void PrecomputeBufferContext::stop_populate()
-    {
-        std::lock_guard<std::mutex> lock(queue_lock);
-        getInstance().populate_OK = false;
-    }
+    void PrecomputeBufferContext::stop_populate() { getInstance().populate_OK = false; }
 
     uint32_t PrecomputeBufferContext::get_max_queue_size() { return getInstance().max; }