Revert "Use arc4random when available to select delta for image relocation."
This reverts commit 7ecbd49c6c78e6c633883aa6766675df8abaa7dd.
Change-Id: Ifb37e23584722b31cb2369bcc9b91da6146d2cf6
diff --git a/runtime/gc/space/image_space.cc b/runtime/gc/space/image_space.cc
index e2b2431..1fe9a03 100644
--- a/runtime/gc/space/image_space.cc
+++ b/runtime/gc/space/image_space.cc
@@ -58,7 +58,10 @@
CHECK_ALIGNED(max_delta, kPageSize);
CHECK_LT(min_delta, max_delta);
- int32_t r = GetRandomNumber<int32_t>(min_delta, max_delta);
+ std::default_random_engine generator;
+ generator.seed(NanoTime() * getpid());
+ std::uniform_int_distribution<int32_t> distribution(min_delta, max_delta);
+ int32_t r = distribution(generator);
if (r % 2 == 0) {
r = RoundUp(r, kPageSize);
} else {
diff --git a/runtime/utils.cc b/runtime/utils.cc
index 7da5640..68db7e3 100644
--- a/runtime/utils.cc
+++ b/runtime/utils.cc
@@ -18,14 +18,12 @@
#include <inttypes.h>
#include <pthread.h>
-#include <stdlib.h>
#include <sys/stat.h>
#include <sys/syscall.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <unistd.h>
#include <memory>
-#include <random>
#include "art_field-inl.h"
#include "art_method-inl.h"
@@ -62,26 +60,6 @@
static constexpr bool kUseAddr2line = !kIsTargetBuild;
#endif
-#if defined(__BIONIC__)
-struct Arc4RandomGenerator {
- typedef uint32_t result_type;
- uint32_t min() { return std::numeric_limits<uint32_t>::min(); }
- uint32_t max() { return std::numeric_limits<uint32_t>::max(); }
- uint32_t operator() { return arc4random(); }
-};
-using RNG = Arc4RandomGenerator;
-#else
-using RNG = std::random_device;
-#endif
-
-template <typename T>
-T GetRandomNumber(T min, T max) {
- CHECK_LT(min, max);
- std::uniform_int_distribution<T> dist(min, max);
- RNG rng;
- return dist(rng);
-}
-
pid_t GetTid() {
#if defined(__APPLE__)
uint64_t owner;
diff --git a/runtime/utils.h b/runtime/utils.h
index c3684e0..3690f86 100644
--- a/runtime/utils.h
+++ b/runtime/utils.h
@@ -350,9 +350,6 @@
double* parsed_value,
UsageFn Usage);
-template <typename T>
-T GetRandomNumber(T min, T max);
-
} // namespace art
#endif // ART_RUNTIME_UTILS_H_