rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use a SeedableRng to generate random numbers

Browse Source
This commit is contained in:
Adrián Arroyo Calle
2023-09-20 21:54:14 +02:00
parent 9dc1c339ef
commit 7cf6e77f4d
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/machine/mock_wam.rs
View File

@@ -246,6 +246,7 @@ impl Machine {
runtime, runtime,
#[cfg(feature = "ffi")] #[cfg(feature = "ffi")]
foreign_function_table: Default::default(), foreign_function_table: Default::default(),
rng: StdRng::from_entropy(),
}; };
let mut lib_path = current_dir(); let mut lib_path = current_dir();

4
src/machine/mod.rs
View File

@@ -54,6 +54,8 @@ use std::env;
use std::path::PathBuf; use std::path::PathBuf;
use std::sync::atomic::AtomicBool; use std::sync::atomic::AtomicBool;
use tokio::runtime::Runtime; use tokio::runtime::Runtime;
use rand::rngs::StdRng;
use rand::SeedableRng;
lazy_static! { lazy_static! {
pub static ref INTERRUPT: AtomicBool = AtomicBool::new(false); pub static ref INTERRUPT: AtomicBool = AtomicBool::new(false);
@@ -71,6 +73,7 @@ pub struct Machine {
pub(super) runtime: Runtime, pub(super) runtime: Runtime,
#[cfg(feature = "ffi")] #[cfg(feature = "ffi")]
pub(super) foreign_function_table: ForeignFunctionTable, pub(super) foreign_function_table: ForeignFunctionTable,
pub(super) rng: StdRng,
} }
#[derive(Debug)] #[derive(Debug)]
@@ -472,6 +475,7 @@ impl Machine {
runtime, runtime,
#[cfg(feature = "ffi")] #[cfg(feature = "ffi")]
foreign_function_table: Default::default(), foreign_function_table: Default::default(),
rng: StdRng::from_entropy(),
}; };
let mut lib_path = current_dir(); let mut lib_path = current_dir();

18
src/machine/system_calls.rs
View File

@@ -42,7 +42,6 @@ use indexmap::IndexSet;
pub(crate) use ref_thread_local::RefThreadLocal; pub(crate) use ref_thread_local::RefThreadLocal;
use std::borrow::BorrowMut;
use std::cell::Cell; use std::cell::Cell;
use std::cmp::Ordering; use std::cmp::Ordering;
use std::collections::BTreeSet; use std::collections::BTreeSet;
@@ -4216,15 +4215,13 @@ impl Machine {
#[inline(always)] #[inline(always)]
pub(crate) fn maybe(&mut self) { pub(crate) fn maybe(&mut self) {
fn generate_random_bits(num_bits: usize) -> u64 { fn generate_random_bits(rng: &mut rand::rngs::StdRng, num_bits: usize) -> u64 {
let mut rng = rand::thread_rng();
let rand = rng.borrow_mut();
let mut random_bits: u64 = 0; let mut random_bits: u64 = 0;
for _ in 0..num_bits { for _ in 0..num_bits {
random_bits <<= 1; random_bits <<= 1;
if rand.gen_bool(0.5) { if rng.gen_bool(0.5) {
random_bits |= 1; random_bits |= 1;
} }
} }
@@ -4232,7 +4229,7 @@ impl Machine {
random_bits random_bits
} }
let result = { generate_random_bits(1) == 0 }; let result = { generate_random_bits(&mut self.rng, 1) == 0 };
self.machine_st.fail = result; self.machine_st.fail = result;
} }
@@ -6184,16 +6181,19 @@ impl Machine {
match Number::try_from(seed) { match Number::try_from(seed) {
Ok(Number::Fixnum(n)) => { Ok(Number::Fixnum(n)) => {
let n: u64 = Integer::from(n).try_into().unwrap(); let n: u64 = Integer::from(n).try_into().unwrap();
let _: StdRng = SeedableRng::seed_from_u64(n); let rng: StdRng = SeedableRng::seed_from_u64(n);
self.rng = rng;
}, },
Ok(Number::Integer(n)) => { Ok(Number::Integer(n)) => {
let n: u64 = (&*n).try_into().unwrap(); let n: u64 = (&*n).try_into().unwrap();
let _: StdRng = SeedableRng::seed_from_u64(n); let rng: StdRng = SeedableRng::seed_from_u64(n);
self.rng = rng;
}, },
Ok(Number::Rational(n)) => { Ok(Number::Rational(n)) => {
if n.denominator() == &UBig::from(1 as u32) { if n.denominator() == &UBig::from(1 as u32) {
let n: u64 = n.numerator().try_into().unwrap(); let n: u64 = n.numerator().try_into().unwrap();
let _: StdRng = SeedableRng::seed_from_u64(n); let rng: StdRng = SeedableRng::seed_from_u64(n);
self.rng = rng;
} }
} }
_ => { _ => {