Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit fa2711b

Browse files
GuillaumeGomezGuillaumeGomez
committedJul 31, 2024·
Update sysinfo version to 0.31.0
1 parent e552c16 commit fa2711b

File tree

6 files changed

+171
-66
lines changed

6 files changed

+171
-66
lines changed
 

‎Cargo.lock

Lines changed: 76 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -312,12 +312,12 @@ dependencies = [
312312

313313
[[package]]
314314
name = "bstr"
315-
version = "1.6.0"
315+
version = "1.10.0"
316316
source = "registry+https://github.com/rust-lang/crates.io-index"
317-
checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05"
317+
checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c"
318318
dependencies = [
319319
"memchr",
320-
"regex-automata 0.3.7",
320+
"regex-automata 0.4.7",
321321
"serde",
322322
]
323323

@@ -771,7 +771,7 @@ dependencies = [
771771
"tracing-subscriber",
772772
"unified-diff",
773773
"walkdir",
774-
"windows",
774+
"windows 0.52.0",
775775
]
776776

777777
[[package]]
@@ -1713,7 +1713,7 @@ dependencies = [
17131713
"iana-time-zone-haiku",
17141714
"js-sys",
17151715
"wasm-bindgen",
1716-
"windows-core",
1716+
"windows-core 0.52.0",
17171717
]
17181718

17191719
[[package]]
@@ -2296,9 +2296,9 @@ dependencies = [
22962296

22972297
[[package]]
22982298
name = "memchr"
2299-
version = "2.5.0"
2299+
version = "2.7.4"
23002300
source = "registry+https://github.com/rust-lang/crates.io-index"
2301-
checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
2301+
checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
23022302
dependencies = [
23032303
"compiler_builtins",
23042304
"rustc-std-workspace-core",
@@ -2436,15 +2436,6 @@ dependencies = [
24362436
"windows-sys 0.52.0",
24372437
]
24382438

2439-
[[package]]
2440-
name = "ntapi"
2441-
version = "0.4.1"
2442-
source = "registry+https://github.com/rust-lang/crates.io-index"
2443-
checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4"
2444-
dependencies = [
2445-
"winapi",
2446-
]
2447-
24482439
[[package]]
24492440
name = "nu-ansi-term"
24502441
version = "0.46.0"
@@ -3249,6 +3240,12 @@ dependencies = [
32493240
"regex-syntax 0.7.5",
32503241
]
32513242

3243+
[[package]]
3244+
name = "regex-automata"
3245+
version = "0.4.7"
3246+
source = "registry+https://github.com/rust-lang/crates.io-index"
3247+
checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
3248+
32523249
[[package]]
32533250
name = "regex-lite"
32543251
version = "0.1.6"
@@ -3717,7 +3714,7 @@ dependencies = [
37173714
"thorin-dwp",
37183715
"tracing",
37193716
"wasm-encoder 0.210.0",
3720-
"windows",
3717+
"windows 0.52.0",
37213718
]
37223719

37233720
[[package]]
@@ -3774,7 +3771,7 @@ dependencies = [
37743771
"tempfile",
37753772
"thin-vec",
37763773
"tracing",
3777-
"windows",
3774+
"windows 0.52.0",
37783775
]
37793776

37803777
[[package]]
@@ -3835,7 +3832,7 @@ dependencies = [
38353832
"shlex",
38363833
"time",
38373834
"tracing",
3838-
"windows",
3835+
"windows 0.52.0",
38393836
]
38403837

38413838
[[package]]
@@ -3886,7 +3883,7 @@ dependencies = [
38863883
"termcolor",
38873884
"termize",
38883885
"tracing",
3889-
"windows",
3886+
"windows 0.52.0",
38903887
]
38913888

38923889
[[package]]
@@ -4607,7 +4604,7 @@ dependencies = [
46074604
"smallvec",
46084605
"termize",
46094606
"tracing",
4610-
"windows",
4607+
"windows 0.52.0",
46114608
]
46124609

46134610
[[package]]
@@ -5365,16 +5362,14 @@ dependencies = [
53655362

53665363
[[package]]
53675364
name = "sysinfo"
5368-
version = "0.30.12"
5365+
version = "0.31.0"
53695366
source = "registry+https://github.com/rust-lang/crates.io-index"
5370-
checksum = "732ffa00f53e6b2af46208fba5718d9662a421049204e156328b66791ffa15ae"
5367+
checksum = "29a6b037e3af4ae9a9d6214198e4df53091363b2c96c88fc416a6c1bd92a2799"
53715368
dependencies = [
5372-
"cfg-if",
5369+
"bstr",
53735370
"core-foundation-sys",
53745371
"libc",
5375-
"ntapi",
5376-
"once_cell",
5377-
"windows",
5372+
"windows 0.57.0",
53785373
]
53795374

53805375
[[package]]
@@ -6299,7 +6294,17 @@ version = "0.52.0"
62996294
source = "registry+https://github.com/rust-lang/crates.io-index"
63006295
checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
63016296
dependencies = [
6302-
"windows-core",
6297+
"windows-core 0.52.0",
6298+
"windows-targets 0.52.5",
6299+
]
6300+
6301+
[[package]]
6302+
name = "windows"
6303+
version = "0.57.0"
6304+
source = "registry+https://github.com/rust-lang/crates.io-index"
6305+
checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143"
6306+
dependencies = [
6307+
"windows-core 0.57.0",
63036308
"windows-targets 0.52.5",
63046309
]
63056310

@@ -6326,12 +6331,55 @@ dependencies = [
63266331
"windows-targets 0.52.5",
63276332
]
63286333

6334+
[[package]]
6335+
name = "windows-core"
6336+
version = "0.57.0"
6337+
source = "registry+https://github.com/rust-lang/crates.io-index"
6338+
checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d"
6339+
dependencies = [
6340+
"windows-implement",
6341+
"windows-interface",
6342+
"windows-result",
6343+
"windows-targets 0.52.5",
6344+
]
6345+
6346+
[[package]]
6347+
name = "windows-implement"
6348+
version = "0.57.0"
6349+
source = "registry+https://github.com/rust-lang/crates.io-index"
6350+
checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
6351+
dependencies = [
6352+
"proc-macro2",
6353+
"quote",
6354+
"syn 2.0.67",
6355+
]
6356+
6357+
[[package]]
6358+
name = "windows-interface"
6359+
version = "0.57.0"
6360+
source = "registry+https://github.com/rust-lang/crates.io-index"
6361+
checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
6362+
dependencies = [
6363+
"proc-macro2",
6364+
"quote",
6365+
"syn 2.0.67",
6366+
]
6367+
63296368
[[package]]
63306369
name = "windows-metadata"
63316370
version = "0.58.0"
63326371
source = "registry+https://github.com/rust-lang/crates.io-index"
63336372
checksum = "2e837f3c3012cfe9e7086302a93f441a7999439be1ad4c530d55d2f6d2921809"
63346373

6374+
[[package]]
6375+
name = "windows-result"
6376+
version = "0.1.2"
6377+
source = "registry+https://github.com/rust-lang/crates.io-index"
6378+
checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
6379+
dependencies = [
6380+
"windows-targets 0.52.5",
6381+
]
6382+
63356383
[[package]]
63366384
name = "windows-sys"
63376385
version = "0.48.0"

‎compiler/rustc_ast/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ edition = "2021"
77
# FIXME: bumping memchr to 2.7.1 causes linker errors in MSVC thin-lto
88
# tidy-alphabetical-start
99
bitflags = "2.4.1"
10-
memchr = "=2.5.0"
10+
memchr = "=2.7.4"
1111
rustc_ast_ir = { path = "../rustc_ast_ir" }
1212
rustc_data_structures = { path = "../rustc_data_structures" }
1313
rustc_index = { path = "../rustc_index" }

‎src/bootstrap/Cargo.lock

Lines changed: 83 additions & 29 deletions
Original file line numberDiff line numberDiff line change

‎src/bootstrap/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ walkdir = "2.4"
6363
xz2 = "0.1"
6464

6565
# Dependencies needed by the build-metrics feature
66-
sysinfo = { version = "0.30", default-features = false, optional = true }
66+
sysinfo = { version = "0.31", default-features = false, optional = true, features = ["system"] }
6767

6868
[target.'cfg(windows)'.dependencies.junction]
6969
version = "1.0.0"

‎src/bootstrap/src/utils/metrics.rs

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,9 @@ impl BuildMetrics {
5555
finished_steps: Vec::new(),
5656
running_steps: Vec::new(),
5757

58-
system_info: System::new(),
58+
system_info: System::new_with_specifics(
59+
RefreshKind::new().with_cpu(CpuRefreshKind::everything()),
60+
),
5961
timer_start: None,
6062
invocation_timer_start: Instant::now(),
6163
invocation_start: SystemTime::now(),
@@ -77,7 +79,7 @@ impl BuildMetrics {
7779
self.collect_stats(&mut *state);
7880
}
7981

80-
state.system_info.refresh_cpu();
82+
state.system_info.refresh_cpu_usage();
8183
state.timer_start = Some(Instant::now());
8284

8385
state.running_steps.push(StepMetrics {
@@ -110,7 +112,7 @@ impl BuildMetrics {
110112
state.running_steps.last_mut().unwrap().children.push(step);
111113

112114
// Start collecting again for the parent step.
113-
state.system_info.refresh_cpu();
115+
state.system_info.refresh_cpu_usage();
114116
state.timer_start = Some(Instant::now());
115117
}
116118
}
@@ -148,7 +150,7 @@ impl BuildMetrics {
148150
let elapsed = state.timer_start.unwrap().elapsed();
149151
step.duration_excluding_children_sec += elapsed;
150152

151-
state.system_info.refresh_cpu();
153+
state.system_info.refresh_cpu_usage();
152154
let cpu = state.system_info.cpus().iter().map(|p| p.cpu_usage()).sum::<f32>();
153155
step.cpu_usage_time_sec += cpu as f64 / 100.0 * elapsed.as_secs_f64();
154156
}
@@ -159,8 +161,9 @@ impl BuildMetrics {
159161

160162
let dest = build.out.join("metrics.json");
161163

162-
let mut system = System::new();
163-
system.refresh_cpu();
164+
let mut system =
165+
System::new_with_specifics(RefreshKind::new().with_cpu(CpuRefreshKind::everything()));
166+
system.refresh_cpu_usage();
164167
system.refresh_memory();
165168

166169
let system_stats = JsonInvocationSystemStats {

‎src/tools/opt-dist/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ log = "0.4"
1010
anyhow = { version = "1", features = ["backtrace"] }
1111
humantime = "2"
1212
humansize = "2"
13-
sysinfo = { version = "0.30", default-features = false }
13+
sysinfo = { version = "0.31", default-features = false, features = ["disk"] }
1414
fs_extra = "1"
1515
camino = "1"
1616
tar = "0.4"

0 commit comments

Comments
 (0)
Please sign in to comment.