X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=test%2Flib%2Frandom.hpp;h=322de6af91392b59fede7d91945039fcc299e6fb;hb=1e080e086eed966bfbb1278f7afd24aa9ee27811;hp=1984e89c89d2686417f72af40c6a6b2364d992a9;hpb=2224115a3a7017166591a9c628827771dd82e36d;p=awesomized%2Flibmemcached

diff --git a/test/lib/random.hpp b/test/lib/random.hpp
index 1984e89c..322de6af 100644
--- a/test/lib/random.hpp
+++ b/test/lib/random.hpp
@@ -1,3 +1,18 @@
+/*
+    +--------------------------------------------------------------------+
+    | libmemcached - C/C++ Client Library for memcached                  |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted under the terms of the BSD license.    |
+    | You should have received a copy of the license in a bundled file   |
+    | named LICENSE; in case you did not receive a copy you can review   |
+    | the terms online at: https://opensource.org/licenses/BSD-3-Clause  |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2006-2014 Brian Aker   https://datadifferential.com/ |
+    | Copyright (c) 2020 Michael Wallner   <mike@php.net>                |
+    +--------------------------------------------------------------------+
+*/
+
 #pragma once
 
 #include <cstddef>
@@ -7,22 +22,21 @@
 #include <string>
 #include <type_traits>
 #include <utility>
+#include <mutex>
 
 using namespace std;
 
 using kv_pair = pair<string, string>;
 
-template<typename T>
-enable_if_t<is_integral_v<T>, T> random_num(T min, T max) {
-  using namespace chrono;
-  using rnd = mt19937;
-  using dst = uniform_int_distribution<T>;
+extern mt19937_64 rnd_eng;
+extern mutex rnd_mtx;
 
-  static auto time = duration_cast<nanoseconds>(system_clock::now().time_since_epoch());
-  static auto seed = static_cast<rnd::result_type>(time.count() % numeric_limits<T>::max());
-  static auto rgen = rnd{seed};
+void random_setup();
 
-  return dst(min, max)(rgen);
+template<typename T>
+enable_if_t<is_integral_v<T>, T> random_num(T min, T max) {
+  lock_guard m{rnd_mtx};
+  return uniform_int_distribution<T>(min, max)(rnd_eng);
 }
 
 unsigned random_port();
@@ -32,10 +46,10 @@ char random_binary();
 string random_binary_string(size_t len);
 char random_ascii(char min = '!', char max = '~');
 string random_ascii_string(size_t len, char min = '!', char max = '~');
-kv_pair random_ascii_pair(size_t minlen = 1<<2, size_t maxlen = 1<<10);
+kv_pair random_ascii_pair(size_t minlen = 1 << 2, size_t maxlen = 1 << 10);
 
-template<template <typename> class Container>
-auto random_ascii_pairs(size_t count, size_t minlen = 1<<2, size_t maxlen = 1<<10) {
+template<template<typename> class Container>
+auto random_ascii_pairs(size_t count, size_t minlen = 1 << 2, size_t maxlen = 1 << 10) {
   Container<kv_pair> v;
 
   v.reserve(count);