@@ -9,8 +9,8 @@ use clap::Parser;
9
9
use graph:: data:: value:: { Object , Word } ;
10
10
use graph:: object;
11
11
use graph:: prelude:: { lazy_static, q, r, BigDecimal , BigInt , QueryResult } ;
12
- use rand:: SeedableRng ;
13
12
use rand:: { rngs:: SmallRng , Rng } ;
13
+ use rand:: { RngCore , SeedableRng } ;
14
14
15
15
use graph:: util:: cache_weight:: CacheWeight ;
16
16
use graph:: util:: lfu_cache:: LfuCache ;
@@ -240,8 +240,8 @@ impl Template for BigInt {
240
240
fn create ( size : usize , rng : Option < & mut SmallRng > ) -> Self {
241
241
let f = match rng {
242
242
Some ( rng) => {
243
- let mag = rng. gen_range ( 1 ..100 ) ;
244
- if rng. gen_bool ( 0.5 ) {
243
+ let mag = rng. random_range ( 1 ..100 ) ;
244
+ if rng. random_bool ( 0.5 ) {
245
245
mag
246
246
} else {
247
247
-mag
@@ -261,8 +261,8 @@ impl Template for BigDecimal {
261
261
fn create ( size : usize , mut rng : Option < & mut SmallRng > ) -> Self {
262
262
let f = match rng. as_deref_mut ( ) {
263
263
Some ( rng) => {
264
- let mag = rng. gen_range ( 1i32 ..100 ) ;
265
- if rng. gen_bool ( 0.5 ) {
264
+ let mag = rng. random_range ( 1i32 ..100 ) ;
265
+ if rng. random_bool ( 0.5 ) {
266
266
mag
267
267
} else {
268
268
-mag
@@ -271,7 +271,7 @@ impl Template for BigDecimal {
271
271
None => 1 ,
272
272
} ;
273
273
let exp = match rng {
274
- Some ( rng) => rng. gen_range ( -100 ..=100 ) ,
274
+ Some ( rng) => rng. random_range ( -100 ..=100 ) ,
275
275
None => 1 ,
276
276
} ;
277
277
let bi = BigInt :: from ( 3u64 ) . pow ( size as u8 ) . unwrap ( ) * BigInt :: from ( f) ;
@@ -307,7 +307,7 @@ fn make_object(size: usize, mut rng: Option<&mut SmallRng>) -> Object {
307
307
for i in 0 ..size {
308
308
let kind = rng
309
309
. as_deref_mut ( )
310
- . map ( |rng| rng. gen_range ( 0 ..modulus) )
310
+ . map ( |rng| rng. random_range ( 0 ..modulus) )
311
311
. unwrap_or ( i % modulus) ;
312
312
313
313
let value = match kind {
@@ -334,7 +334,11 @@ fn make_object(size: usize, mut rng: Option<&mut SmallRng>) -> Object {
334
334
_ => unreachable ! ( ) ,
335
335
} ;
336
336
337
- let key = rng. as_deref_mut ( ) . map ( |rng| rng. gen ( ) ) . unwrap_or ( i) % modulus;
337
+ let key = rng
338
+ . as_deref_mut ( )
339
+ . map ( |rng| rng. next_u32 ( ) as usize )
340
+ . unwrap_or ( i)
341
+ % modulus;
338
342
obj. push ( ( Word :: from ( format ! ( "val{}" , key) ) , value) ) ;
339
343
}
340
344
Object :: from_iter ( obj)
@@ -406,7 +410,7 @@ impl ValueMap {
406
410
for i in 0 ..size {
407
411
let kind = rng
408
412
. as_deref_mut ( )
409
- . map ( |rng| rng. gen_range ( 0 ..modulus) )
413
+ . map ( |rng| rng. random_range ( 0 ..modulus) )
410
414
. unwrap_or ( i % modulus) ;
411
415
412
416
let value = match kind {
@@ -431,7 +435,11 @@ impl ValueMap {
431
435
_ => unreachable ! ( ) ,
432
436
} ;
433
437
434
- let key = rng. as_deref_mut ( ) . map ( |rng| rng. gen ( ) ) . unwrap_or ( i) % modulus;
438
+ let key = rng
439
+ . as_deref_mut ( )
440
+ . map ( |rng| rng. next_u32 ( ) as usize )
441
+ . unwrap_or ( i)
442
+ % modulus;
435
443
map. insert ( format ! ( "val{}" , key) , value) ;
436
444
}
437
445
MapMeasure ( map)
@@ -466,7 +474,10 @@ impl UsizeMap {
466
474
fn make_map ( size : usize , mut rng : Option < & mut SmallRng > ) -> Self {
467
475
let mut map = BTreeMap :: new ( ) ;
468
476
for i in 0 ..size {
469
- let key = rng. as_deref_mut ( ) . map ( |rng| rng. gen ( ) ) . unwrap_or ( 2 * i) ;
477
+ let key = rng
478
+ . as_deref_mut ( )
479
+ . map ( |rng| rng. next_u32 ( ) as usize )
480
+ . unwrap_or ( 2 * i) ;
470
481
map. insert ( key, i * 3 ) ;
471
482
}
472
483
MapMeasure ( map)
@@ -563,7 +574,10 @@ fn maybe_rng<'a>(opt: &'a Opt, rng: &'a mut SmallRng) -> Option<&'a mut SmallRng
563
574
564
575
fn stress < T : Template > ( opt : & Opt ) {
565
576
let mut rng = match opt. seed {
566
- None => SmallRng :: from_entropy ( ) ,
577
+ None => {
578
+ let mut rng = rand:: rng ( ) ;
579
+ SmallRng :: from_rng ( & mut rng)
580
+ }
567
581
Some ( seed) => SmallRng :: seed_from_u64 ( seed) ,
568
582
} ;
569
583
@@ -624,7 +638,7 @@ fn stress<T: Template>(opt: &Opt) {
624
638
let size = if opt. fixed || opt. obj_size == 0 {
625
639
opt. obj_size
626
640
} else {
627
- rng. gen_range ( 0 ..opt. obj_size )
641
+ rng. random_range ( 0 ..opt. obj_size )
628
642
} ;
629
643
let before = ALLOCATED . load ( SeqCst ) ;
630
644
let sample = template. sample ( size, maybe_rng ( opt, & mut rng) ) ;
@@ -638,7 +652,7 @@ fn stress<T: Template>(opt: &Opt) {
638
652
cache. insert ( key, Entry :: from ( * sample) ) ;
639
653
// Do a few random reads from the cache
640
654
for _attempt in 0 ..5 {
641
- let read = rng. gen_range ( 0 ..=key) ;
655
+ let read = rng. random_range ( 0 ..=key) ;
642
656
let _v = cache. get ( & read) ;
643
657
}
644
658
}
0 commit comments