@@ -537,8 +537,10 @@ mod tests {
537
537
use crate :: runtime:: GlobalStatBuffer ;
538
538
use crate :: runtime:: MemStat ;
539
539
use crate :: runtime:: MemStatBuffer ;
540
+ use crate :: runtime:: ParentMemStat ;
540
541
use crate :: runtime:: Thread ;
541
542
use crate :: runtime:: ThreadTracker ;
543
+ use crate :: runtime:: GLOBAL_QUERIES_MANAGER ;
542
544
543
545
fn with_mock_env <
544
546
T : Allocator + Send + Sync + ' static ,
@@ -550,7 +552,11 @@ mod tests {
550
552
global : Arc < MemStat > ,
551
553
) -> R {
552
554
{
553
- let mem_stat = MemStat :: create ( GlobalUniqName :: unique ( ) ) ;
555
+ let mem_stat = MemStat :: create_child (
556
+ GlobalUniqName :: unique ( ) ,
557
+ 0 ,
558
+ ParentMemStat :: Normal ( global. clone ( ) ) ,
559
+ ) ;
554
560
let mut tracking_payload = ThreadTracker :: new_tracking_payload ( ) ;
555
561
tracking_payload. mem_stat = Some ( mem_stat. clone ( ) ) ;
556
562
@@ -582,7 +588,7 @@ mod tests {
582
588
with_mock_env (
583
589
test_function,
584
590
DefaultAllocator :: default ( ) ,
585
- Arc :: new ( MemStat :: global ( ) ) ,
591
+ Arc :: new ( MemStat :: global ( & GLOBAL_QUERIES_MANAGER ) ) ,
586
592
) ;
587
593
}
588
594
@@ -610,7 +616,7 @@ mod tests {
610
616
with_mock_env (
611
617
test_function,
612
618
DefaultAllocator :: default ( ) ,
613
- Arc :: new ( MemStat :: global ( ) ) ,
619
+ Arc :: new ( MemStat :: global ( & GLOBAL_QUERIES_MANAGER ) ) ,
614
620
) ;
615
621
}
616
622
@@ -641,7 +647,7 @@ mod tests {
641
647
with_mock_env (
642
648
test_function,
643
649
DefaultAllocator :: default ( ) ,
644
- Arc :: new ( MemStat :: global ( ) ) ,
650
+ Arc :: new ( MemStat :: global ( & GLOBAL_QUERIES_MANAGER ) ) ,
645
651
) ;
646
652
}
647
653
@@ -666,7 +672,11 @@ mod tests {
666
672
assert_eq ! ( GlobalStatBuffer :: current( ) . memory_usage, 0 ) ;
667
673
} ;
668
674
669
- with_mock_env ( test_function, FailingAllocator , Arc :: new ( MemStat :: global ( ) ) ) ;
675
+ with_mock_env (
676
+ test_function,
677
+ FailingAllocator ,
678
+ Arc :: new ( MemStat :: global ( & GLOBAL_QUERIES_MANAGER ) ) ,
679
+ ) ;
670
680
}
671
681
672
682
#[ test]
@@ -695,7 +705,7 @@ mod tests {
695
705
with_mock_env (
696
706
test_function,
697
707
DefaultAllocator :: default ( ) ,
698
- Arc :: new ( MemStat :: global ( ) ) ,
708
+ Arc :: new ( MemStat :: global ( & GLOBAL_QUERIES_MANAGER ) ) ,
699
709
) ;
700
710
}
701
711
@@ -721,7 +731,7 @@ mod tests {
721
731
with_mock_env (
722
732
test_function,
723
733
DefaultAllocator :: default ( ) ,
724
- Arc :: new ( MemStat :: global ( ) ) ,
734
+ Arc :: new ( MemStat :: global ( & GLOBAL_QUERIES_MANAGER ) ) ,
725
735
) ;
726
736
}
727
737
@@ -760,7 +770,11 @@ mod tests {
760
770
assert_eq ! ( GlobalStatBuffer :: current( ) . memory_usage, 0 ) ;
761
771
} ;
762
772
763
- with_mock_env ( test_function, FailingAllocator , Arc :: new ( MemStat :: global ( ) ) ) ;
773
+ with_mock_env (
774
+ test_function,
775
+ FailingAllocator ,
776
+ Arc :: new ( MemStat :: global ( & GLOBAL_QUERIES_MANAGER ) ) ,
777
+ ) ;
764
778
}
765
779
766
780
#[ test]
@@ -836,7 +850,7 @@ mod tests {
836
850
with_mock_env (
837
851
test_function,
838
852
PartialFailingAllocator ( DefaultAllocator :: default ( ) ) ,
839
- Arc :: new ( MemStat :: global ( ) ) ,
853
+ Arc :: new ( MemStat :: global ( & GLOBAL_QUERIES_MANAGER ) ) ,
840
854
) ;
841
855
}
842
856
@@ -914,7 +928,7 @@ mod tests {
914
928
with_mock_env (
915
929
test_function,
916
930
GrowZeroedFailingAllocator ( DefaultAllocator :: default ( ) ) ,
917
- Arc :: new ( MemStat :: global ( ) ) ,
931
+ Arc :: new ( MemStat :: global ( & GLOBAL_QUERIES_MANAGER ) ) ,
918
932
) ;
919
933
}
920
934
@@ -991,7 +1005,7 @@ mod tests {
991
1005
with_mock_env (
992
1006
test_function,
993
1007
ShrinkFailingAllocator ( DefaultAllocator :: default ( ) ) ,
994
- Arc :: new ( MemStat :: global ( ) ) ,
1008
+ Arc :: new ( MemStat :: global ( & GLOBAL_QUERIES_MANAGER ) ) ,
995
1009
) ;
996
1010
}
997
1011
@@ -1204,7 +1218,7 @@ mod tests {
1204
1218
inner : DefaultAllocator :: default ( ) ,
1205
1219
failure_rate : 0.3 ,
1206
1220
} ,
1207
- Arc :: new ( MemStat :: global ( ) ) ,
1221
+ Arc :: new ( MemStat :: global ( & GLOBAL_QUERIES_MANAGER ) ) ,
1208
1222
) ;
1209
1223
}
1210
1224
@@ -1241,13 +1255,13 @@ mod tests {
1241
1255
with_mock_env (
1242
1256
test_function,
1243
1257
DefaultAllocator :: default ( ) ,
1244
- Arc :: new ( MemStat :: global ( ) ) ,
1258
+ Arc :: new ( MemStat :: global ( & GLOBAL_QUERIES_MANAGER ) ) ,
1245
1259
) ;
1246
1260
}
1247
1261
1248
1262
#[ test]
1249
1263
fn test_dynamic_memstat_switch ( ) {
1250
- let global = Arc :: new ( MemStat :: global ( ) ) ;
1264
+ let global = Arc :: new ( MemStat :: global ( & GLOBAL_QUERIES_MANAGER ) ) ;
1251
1265
let test_function = {
1252
1266
let global = global. clone ( ) ;
1253
1267
move |mem_stat : Arc < MemStat > , _allocator : Arc < dyn Allocator + Send + Sync + ' static > | {
@@ -1311,7 +1325,7 @@ mod tests {
1311
1325
1312
1326
#[ test]
1313
1327
fn test_thread_local_stat_isolation ( ) {
1314
- let global_mem_stat = Arc :: new ( MemStat :: global ( ) ) ;
1328
+ let global_mem_stat = Arc :: new ( MemStat :: global ( & GLOBAL_QUERIES_MANAGER ) ) ;
1315
1329
1316
1330
let test_function = {
1317
1331
let global_mem_stat = global_mem_stat. clone ( ) ;
0 commit comments