diff options
| author | Brian Chen <brianchen118@gmail.com> | 2022-03-24 07:08:29 -0700 |
|---|---|---|
| committer | Facebook GitHub Bot <facebook-github-bot@users.noreply.github.com> | 2022-03-24 07:08:29 -0700 |
| commit | a3410de059d2e21fcf7071bd4b24a02bbdb757d8 (patch) | |
| tree | cac7e0e1d574e3e8e5379176f4c04f600dab2ce3 | |
| parent | dcbbdebf5c4653aa4fd9ebbe45379eb2ac8c0dd8 (diff) | |
Update Cargo.lock and fix build (#8134)
Summary: Pull Request resolved: https://github.com/facebookincubator/below/pull/8134
Test Plan: CI
Reviewed By: lnyng
Differential Revision: D35093036
Pulled By: brianc118
fbshipit-source-id: 5e3cb977266ab265c44fb1b9908b640068827fd8
| -rw-r--r-- | Cargo.lock | 37 | ||||
| -rw-r--r-- | below/model/src/collector.rs | 3 |
2 files changed, 26 insertions, 14 deletions
@@ -193,7 +193,7 @@ dependencies = [ "lazy_static", "maplit", "memmap", - "nix", + "nix 0.23.1", "paste", "serde", "serde_cbor", @@ -293,7 +293,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" name = "cgroupfs" version = "0.5.0" dependencies = [ - "nix", + "nix 0.23.1", "openat", "serde", "tempfile", @@ -653,7 +653,7 @@ version = "0.5.0" dependencies = [ "lazy_static", "libc", - "nix", + "nix 0.23.1", "openat", "serde", "tempfile", @@ -944,7 +944,7 @@ dependencies = [ "bitflags", "lazy_static", "libbpf-sys", - "nix", + "nix 0.22.0", "num_enum", "strum_macros", "thiserror", @@ -963,9 +963,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.107" +version = "0.2.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbe5e23404da5b4f555ef85ebed98fb4083e55a00c317800bc2a50ede9f3d219" +checksum = "efaa7b300f3b5fe8eb6bf21ce3895e1751d9665086af2d64b42f19701015ff4f" [[package]] name = "lock_api" @@ -1067,6 +1067,19 @@ dependencies = [ ] [[package]] +name = "nix" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" +dependencies = [ + "bitflags", + "cc", + "cfg-if", + "libc", + "memoffset", +] + +[[package]] name = "ntapi" version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2098,18 +2111,18 @@ checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" [[package]] name = "zstd" -version = "0.8.0+zstd.1.4.9" +version = "0.9.2+zstd.1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afab5e288c9e10bcd910b16ad82cb8028b74b09eccaa5ecd90621f99d3380735" +checksum = "2390ea1bf6c038c39674f22d95f0564725fc06034a47129179810b2fc58caa54" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "4.0.0+zstd.1.4.9" +version = "4.1.3+zstd.1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81f02c0811d5455aa82c6bc400cffd8c882f3a2813f5e2245e2b264443305ab2" +checksum = "e99d81b99fb3c2c2c794e3fe56c305c63d5173a16a46b5850b07c935ffc7db79" dependencies = [ "libc", "zstd-sys", @@ -2117,9 +2130,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "1.5.0+zstd.1.4.9" +version = "1.6.2+zstd.1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e6c094340240369025fc6b731b054ee2a834328fa584310ac96aa4baebdc465" +checksum = "2daf2f248d9ea44454bfcb2516534e8b8ad2fc91bf818a1885495fc42bc8ac9f" dependencies = [ "cc", "libc", diff --git a/below/model/src/collector.rs b/below/model/src/collector.rs index 40f76750..18b9d6f7 100644 --- a/below/model/src/collector.rs +++ b/below/model/src/collector.rs @@ -16,7 +16,6 @@ use std::sync::{Arc, Mutex}; use super::*; use crate::collector_plugin; -use gpu_stats::GpuSample; use regex::Regex; use slog::{self, error}; use std::path::{Path, PathBuf}; @@ -28,7 +27,7 @@ pub struct CollectorOptions { pub disable_disk_stat: bool, pub cgroup_re: Option<Regex>, #[cfg(fbcode_build)] - pub gpu_stats_receiver: Option<collector_plugin::Consumer<GpuSample>>, + pub gpu_stats_receiver: Option<collector_plugin::Consumer<gpu_stats::GpuSample>>, } impl Default for CollectorOptions { |