commit 24699ce86a6ad95d291e514e64bbb65ed67ea090
author whitequark <whitequark@whitequark.org> Fri Jun 26 10:35:46 2020 +0000
committer whitequark <whitequark@whitequark.org> Fri Jun 26 10:35:52 2020 +0000
tree 8102857e37ab338278b0b759429a021982bcb282
parent c9dcfbd54ff09bc3ebfd757b806bcd2017e3343b

ecpbram: refactor seeding logic.

libtrellis/tools/ecpbram.cpp

diff --git a/libtrellis/tools/ecpbram.cpp b/libtrellis/tools/ecpbram.cpp
index a1bc205..bffb889 100644
--- a/libtrellis/tools/ecpbram.cpp
+++ b/libtrellis/tools/ecpbram.cpp
@@ -124,11 +124,6 @@
 int main(int argc, char **argv)
 {
     bool verbose = false;
-#ifdef _WIN32
-    uint32_t seed_nr = GetCurrentProcessId();
-#else
-    uint32_t seed_nr = getpid();
-#endif
     namespace po = boost::program_options;
 
     std::string database_folder = get_database_path();;
@@ -197,14 +192,24 @@
             return 1;
         }
 
+        // If -s is provided: seed with the given value.
+        // If -s is not provided: seed with the PID and current time, which are unlikely 
+        // to repeat simultaneously.
+        uint32_t seed_nr;
         if (vm.count("seed")) {
             seed_nr = vm.at("seed").as<int>();
 
             if (verbose)
                 fprintf(stderr, "Seed: %d\n", seed_nr);
+        } else {
+#ifdef _WIN32
+            seed_nr = GetCurrentProcessId();
+#else
+            seed_nr = getpid();
+#endif
         }
 
-        x  =  uint64_t(seed_nr) << 32;
+        x  = uint64_t(seed_nr) << 32;
         x ^= uint64_t(seed_nr) << 20;
         x ^= uint64_t(seed_nr);