@@ -607,39 +607,37 @@ pub fn duration_to_secs_str(dur: std::time::Duration) -> String {
607
607
}
608
608
609
609
// Memory reporting
610
- cfg_if ! {
611
- if #[ cfg( windows) ] {
612
- fn get_resident( ) -> Option <usize > {
613
- use std:: mem:: { self , MaybeUninit } ;
614
- use winapi:: shared:: minwindef:: DWORD ;
615
- use winapi:: um:: processthreadsapi:: GetCurrentProcess ;
616
- use winapi:: um:: psapi:: { GetProcessMemoryInfo , PROCESS_MEMORY_COUNTERS } ;
617
-
618
- let mut pmc = MaybeUninit :: <PROCESS_MEMORY_COUNTERS >:: uninit( ) ;
619
- match unsafe {
620
- GetProcessMemoryInfo ( GetCurrentProcess ( ) , pmc. as_mut_ptr( ) , mem:: size_of_val( & pmc) as DWORD )
621
- } {
622
- 0 => None ,
623
- _ => {
624
- let pmc = unsafe { pmc. assume_init( ) } ;
625
- Some ( pmc. WorkingSetSize as usize )
626
- }
610
+ cfg_if ! {
611
+ if #[ cfg( windows) ] {
612
+ fn get_resident( ) -> Option <usize > {
613
+ use std:: mem:: { self , MaybeUninit } ;
614
+ use winapi:: shared:: minwindef:: DWORD ;
615
+ use winapi:: um:: processthreadsapi:: GetCurrentProcess ;
616
+ use winapi:: um:: psapi:: { GetProcessMemoryInfo , PROCESS_MEMORY_COUNTERS } ;
617
+
618
+ let mut pmc = MaybeUninit :: <PROCESS_MEMORY_COUNTERS >:: uninit( ) ;
619
+ match unsafe {
620
+ GetProcessMemoryInfo ( GetCurrentProcess ( ) , pmc. as_mut_ptr( ) , mem:: size_of_val( & pmc) as DWORD )
621
+ } {
622
+ 0 => None ,
623
+ _ => {
624
+ let pmc = unsafe { pmc. assume_init( ) } ;
625
+ Some ( pmc. WorkingSetSize as usize )
627
626
}
628
627
}
629
- } else if #[ cfg( unix) ] {
630
- fn get_resident( ) -> Option <usize > {
631
- let field = 1 ;
632
- let contents = fs:: read( "/proc/self/statm" ) . ok( ) ?;
633
- let contents = String :: from_utf8( contents) . ok( ) ?;
634
- let s = contents. split_whitespace( ) . nth( field) ?;
635
- let npages = s. parse:: <usize >( ) . ok( ) ?;
636
- Some ( npages * 4096 )
637
- }
638
- } else {
639
- fn get_resident( ) -> Option <usize > {
640
- None
641
- }
642
628
}
629
+ } else if #[ cfg( unix) ] {
630
+ fn get_resident( ) -> Option <usize > {
631
+ let field = 1 ;
632
+ let contents = fs:: read( "/proc/self/statm" ) . ok( ) ?;
633
+ let contents = String :: from_utf8( contents) . ok( ) ?;
634
+ let s = contents. split_whitespace( ) . nth( field) ?;
635
+ let npages = s. parse:: <usize >( ) . ok( ) ?;
636
+ Some ( npages * 4096 )
637
+ }
638
+ } else {
639
+ fn get_resident( ) -> Option <usize > {
640
+ None
643
641
}
644
642
}
645
643
}
0 commit comments