mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2024-11-25 05:03:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
crosvm/metrics/Cargo.toml

26 lines
611 B
TOML
Raw Normal View History

Revert "Revert "metrics: Add metrics crate."" This reverts commit 55a5c8d8f9969be5510115b3876b2f0fefdbcb06. In order to accommodate the removal of the UnixSeqPacket+CloseNotifier change, I updated the controller.rs to reference platform-specific internal implementations. On Windows, CloseNotifier is used to detect closed Tubes. On Linux, we rely on PollContext returning because the socket fd is hung up. Some minor adjustmets to the code were made just to allow as litte duplication as possible. In the end, very little logic has changed from the original CL, it's just moved around. TL;DR: This fixes the downstream regression by removing its dependency on the breaking changes to base. BUG=b:232316549 FIXED=b:232316549 TEST=Crosvm tests Change-Id: I946d5096f7a312538c3c694950697fab1be7f0ca Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3661257 Commit-Queue: Michael Hoyle <mikehoyle@google.com> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com>
2022-05-23 20:18:04 +00:00
[package]
name = "metrics"
version = "0.1.0"
Fix remaining Chrome/Chromium OS instances These should be written as ChromeOS and ChromiumOS (without the space) to match the updated branding. The copyright headers were already migrated to the new style (https://crrev.com/c/3894243), but there were some more instances left over. BUG=None TEST=tools/cargo-doc Change-Id: I8c76aea2eb33b2e370ab71ee9b5cc0a4cfd00585 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4129934 Reviewed-by: Dennis Kempin <denniskempin@google.com> Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
2022-12-29 21:24:33 +00:00
authors = ["The ChromiumOS Authors"]
Revert "Revert "metrics: Add metrics crate."" This reverts commit 55a5c8d8f9969be5510115b3876b2f0fefdbcb06. In order to accommodate the removal of the UnixSeqPacket+CloseNotifier change, I updated the controller.rs to reference platform-specific internal implementations. On Windows, CloseNotifier is used to detect closed Tubes. On Linux, we rely on PollContext returning because the socket fd is hung up. Some minor adjustmets to the code were made just to allow as litte duplication as possible. In the end, very little logic has changed from the original CL, it's just moved around. TL;DR: This fixes the downstream regression by removing its dependency on the breaking changes to base. BUG=b:232316549 FIXED=b:232316549 TEST=Crosvm tests Change-Id: I946d5096f7a312538c3c694950697fab1be7f0ca Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3661257 Commit-Queue: Michael Hoyle <mikehoyle@google.com> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com>
2022-05-23 20:18:04 +00:00
edition = "2021"
[dependencies]
anyhow = "*"
base = { path = "../base" }
cfg-if = "*"
libc = { version = "*", optional = true }
Cargo.toml: upgrade protobuf 2.x -> 3.x system_api bindings have been regenerated with protobuf 3.2; this should be okay to land before the full ChromeOS system_api migration, since crosvm always uses its own copy of the bindings rather than the ones provided by the dev-rust/system_api package. The protoc-rust crate is replaced with protobuf_codegen in 3.x. BUG=b:277243607 BUG=b:279834784 TEST=tools/dev_container tools/presubmit Change-Id: I6aad45ded2639d7506a7238800584bebab196455 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4405309 Reviewed-by: Dennis Kempin <denniskempin@google.com> Commit-Queue: Daniel Verkamp <dverkamp@chromium.org> Reviewed-by: Noah Gold <nkgold@google.com>
2023-04-06 19:45:32 +00:00
protobuf = "3.2"
Revert "Revert "metrics: Add metrics crate."" This reverts commit 55a5c8d8f9969be5510115b3876b2f0fefdbcb06. In order to accommodate the removal of the UnixSeqPacket+CloseNotifier change, I updated the controller.rs to reference platform-specific internal implementations. On Windows, CloseNotifier is used to detect closed Tubes. On Linux, we rely on PollContext returning because the socket fd is hung up. Some minor adjustmets to the code were made just to allow as litte duplication as possible. In the end, very little logic has changed from the original CL, it's just moved around. TL;DR: This fixes the downstream regression by removing its dependency on the breaking changes to base. BUG=b:232316549 FIXED=b:232316549 TEST=Crosvm tests Change-Id: I946d5096f7a312538c3c694950697fab1be7f0ca Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3661257 Commit-Queue: Michael Hoyle <mikehoyle@google.com> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com>
2022-05-23 20:18:04 +00:00
serde = { version = "1", features = [ "derive" ] }
serde_json = { version = "*", optional = true }
sync = { path = "../common/sync", optional = true }
[target.'cfg(windows)'.dependencies]
chrono = { version = "*" }
winapi = { version = "*" }
crosvm: move enum ProcessType to win_util. This is to keep consistency with Windows downstream code. The conversion from ProcessType to EmulatorProcessType is moved to the metrics crate as it is only used for generating metrics. BUG=b:213146388 TEST=presubmit Change-Id: Ia62f76835a1f162dd8bbc9e53fd671968c368473 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3908370 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Commit-Queue: Pujun Lun <lunpujun@google.com>
2022-09-20 21:48:39 +00:00
win_util = { path = "../win_util" }
Revert "Revert "metrics: Add metrics crate."" This reverts commit 55a5c8d8f9969be5510115b3876b2f0fefdbcb06. In order to accommodate the removal of the UnixSeqPacket+CloseNotifier change, I updated the controller.rs to reference platform-specific internal implementations. On Windows, CloseNotifier is used to detect closed Tubes. On Linux, we rely on PollContext returning because the socket fd is hung up. Some minor adjustmets to the code were made just to allow as litte duplication as possible. In the end, very little logic has changed from the original CL, it's just moved around. TL;DR: This fixes the downstream regression by removing its dependency on the breaking changes to base. BUG=b:232316549 FIXED=b:232316549 TEST=Crosvm tests Change-Id: I946d5096f7a312538c3c694950697fab1be7f0ca Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3661257 Commit-Queue: Michael Hoyle <mikehoyle@google.com> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com>
2022-05-23 20:18:04 +00:00
wmi = { version = "^0.9" }
[build-dependencies]
metrics: migrate to proto_build_tools. BUG=b:256951877 TEST=builds Change-Id: Iea6ab37489e87b1c8ca3c33fbf4a0d974a9b59ca Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4021591 Reviewed-by: Vikram Auradkar <auradkar@google.com> Commit-Queue: Noah Gold <nkgold@google.com>
2022-11-10 21:23:26 +00:00
proto_build_tools = { path = "../proto_build_tools" }
Reference in a new issue Copy permalink