blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix merge error

This commit is contained in:
Haoran Yi 2022-12-05 08:19:27 -06:00 committed by HaoranYi
parent 824473a3a5
commit bbd49acb2f
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bucket_map/src/bucket_storage.rs
View File

@ -435,7 +435,7 @@ mod test {
assert!(storage.is_free(ix));
assert_eq!(storage.uid(ix), None);
// test get_mmap_fd_stats
// test get_open_fd stats
let mmap_count = get_mmap_count().unwrap();
let open_fd = get_num_open_fd().unwrap();
let (soft_limit, hard_limit) = get_open_fd_limits().unwrap();
@ -446,6 +446,8 @@ mod test {
assert!(hard_limit > 0);
}
/// bench get_mmap_count
/// 2M mmaps takes 1.5s
#[cfg(target_os = "linux")]
#[ignore]
#[test]
@ -465,7 +467,6 @@ mod test {
v.push(s);
}
// test get_mmap_fd_stats
let start = Instant::now();
let mmap_count = get_mmap_count().unwrap();
let duration = start.elapsed();

2
core/src/system_monitor_service.rs
View File

@ -30,8 +30,6 @@ const SAMPLE_INTERVAL_OS_NETWORK_LIMITS_MS: u64 = MS_PER_H;
const SAMPLE_INTERVAL_MEM_MS: u64 = 5 * MS_PER_S;
const SAMPLE_INTERVAL_CPU_MS: u64 = 10 * MS_PER_S;
const SAMPLE_INTERVAL_DISK_MS: u64 = 5 * MS_PER_S;
const SAMPLE_INTERVAL_OPEN_FD_MS: u64 = 30 * MS_PER_S;
const SAMPLE_INTERVAL_DISK_MS: u64 = 5 * MS_PER_S;
const SAMPLE_INTERVAL_OPEN_FD_MS: u64 = 60 * MS_PER_S;
const SLEEP_INTERVAL: Duration = Duration::from_millis(500);