Skip to content

Commit 556d76a

Browse files
committed
perf(resource-monitor): look up external process identities by PID
1 parent a21d788 commit 556d76a

1 file changed

Lines changed: 45 additions & 10 deletions

File tree

‎native/resource-monitor/src/main.rs‎

Lines changed: 45 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -434,13 +434,12 @@ impl Collector {
434434
.external_processes
435435
.iter()
436436
.filter_map(|(pid, expected_start_time_ms)| {
437-
let (_, _, actual_start_time_ms) = rows
438-
.iter()
439-
.find(|(candidate_pid, _, _)| candidate_pid == pid)?;
440-
matches_external_identity(*actual_start_time_ms, *expected_start_time_ms).then_some(
437+
let process = self.system.process(Pid::from_u32(*pid))?;
438+
let actual_start_time_ms = process.start_time().saturating_mul(1_000);
439+
matches_external_identity(actual_start_time_ms, *expected_start_time_ms).then_some(
441440
ExternalProcess {
442441
pid: *pid,
443-
start_time_ms: Some(*actual_start_time_ms),
442+
start_time_ms: Some(actual_start_time_ms),
444443
},
445444
)
446445
})
@@ -1001,10 +1000,19 @@ mod tests {
10011000

10021001
#[test]
10031002
fn validates_external_process_start_identity() {
1004-
assert!(matches_external_identity(10_000, None));
1005-
assert!(matches_external_identity(10_000, Some(10_999)));
1006-
assert!(!matches_external_identity(10_000, Some(11_000)));
1007-
assert!(!matches_external_identity(10_000, Some(9_999)));
1003+
for (actual, expected, matches) in [
1004+
(10_000, None, true),
1005+
(10_000, Some(10_000), true),
1006+
(10_000, Some(10_999), true),
1007+
(10_000, Some(11_000), false),
1008+
(10_000, Some(9_999), false),
1009+
(0, Some(999), true),
1010+
(0, Some(1_000), false),
1011+
(u64::MAX, None, true),
1012+
(u64::MAX, Some(u64::MAX), false),
1013+
] {
1014+
assert_eq!(matches_external_identity(actual, expected), matches);
1015+
}
10081016
}
10091017

10101018
#[test]
@@ -1047,7 +1055,13 @@ mod tests {
10471055
assert_eq!(unselected.memory(), 0);
10481056
assert_eq!(unselected.virtual_memory(), 0);
10491057

1050-
config.external_processes.insert(pid.as_u32(), None);
1058+
config.external_processes = [
1059+
(pid.as_u32(), Some(0)),
1060+
(u32::MAX, None),
1061+
(pid.as_u32(), None),
1062+
]
1063+
.into_iter()
1064+
.collect();
10511065
let snapshot = collector.sample(&config, None);
10521066
let selected = snapshot
10531067
.processes
@@ -1057,6 +1071,27 @@ mod tests {
10571071
assert!(!selected.command.is_empty());
10581072
assert!(selected.resident_bytes > 0);
10591073
assert!(selected.start_time_ms > 0);
1074+
assert_eq!(
1075+
snapshot
1076+
.external_processes
1077+
.iter()
1078+
.map(|process| (process.pid, process.start_time_ms))
1079+
.collect::<Vec<_>>(),
1080+
vec![(pid.as_u32(), Some(selected.start_time_ms))],
1081+
);
1082+
1083+
config.root_pid = pid.as_u32();
1084+
config.external_processes.insert(pid.as_u32(), Some(0));
1085+
let snapshot = collector.sample(&config, None);
1086+
assert!(snapshot.external_processes.is_empty());
1087+
assert_eq!(
1088+
snapshot
1089+
.processes
1090+
.iter()
1091+
.filter(|process| process.pid == pid.as_u32())
1092+
.count(),
1093+
1,
1094+
);
10601095

10611096
let retained = collector
10621097
.system

0 commit comments

Comments
 (0)