mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2024-11-24 12:34:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
crosvm/cros_async/Cargo.toml

49 lines
1.2 KiB
TOML
Raw Normal View History

Refactoring: Move common/cros_async to cros_async This runs the script added in https://crrev.com/c/3533607 BUG=b:22320646 TEST=presubmit Change-Id: I2e7efdb35508d45281f046e64c24aa43e27f2000 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3533608 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com>
2022-03-17 18:26:01 +00:00
[package]
name = "cros_async"
crosvm: Bump version number. There are two copies of io_uring and cros_async that are slightly different. Bump the version number of new one. BUG=None TEST=cargo build Change-Id: I7f82d3c5f01633bef7d0ce14ab777bbb50d4fbd5 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3565625 Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Dennis Kempin <denniskempin@google.com> Commit-Queue: Junichi Uekawa <uekawa@chromium.org>
2022-04-01 09:20:43 +00:00
version = "0.1.1"
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"]
Refactoring: Move common/cros_async to cros_async This runs the script added in https://crrev.com/c/3533607 BUG=b:22320646 TEST=presubmit Change-Id: I2e7efdb35508d45281f046e64c24aa43e27f2000 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3533608 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com>
2022-03-17 18:26:01 +00:00
edition = "2021"
cros_async: Blocking tokio executor for linux This is selectable with a new ExecutorKind. Rather than using the common_executor backend, it uses tokio as the backend. Bug: b/320603688 Test: tools/presubmit Test: cargo build --features=cros_async/tokio --target=x86_64-unknown-linux-gnu Change-Id: Ibf65b17077048f4ed1cce07fa985787b1eb1b6a3 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5174966 Commit-Queue: Cody Schuffelen <schuffelen@google.com> Reviewed-by: Frederick Mayle <fmayle@google.com>
2024-01-07 03:25:46 +00:00
[features]
tokio = ["dep:tokio"]
Refactoring: Move common/cros_async to cros_async This runs the script added in https://crrev.com/c/3533607 BUG=b:22320646 TEST=presubmit Change-Id: I2e7efdb35508d45281f046e64c24aa43e27f2000 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3533608 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com>
2022-03-17 18:26:01 +00:00
[dependencies]
async-trait = "0.1.36"
async-task = "4"
cros_async: upstream Windows support. Major changes: * Adds Windows implementations * Refactors cros_async to use the styleguide for cross platform code. * Adds platform specific Descriptor impls to Timer & Event (short term; this will go away in the next CL in the series). Minor adjustments: * The doctests for the Executor were passing the wrong type of seek parameter to write_from_vec. It was disabling seeking (None) when it should have been seeking to zero (Some(0)). BUG=b:213147081 TEST=tested by Windows & Linux bots. Change-Id: Id7e025ceb9f1be4a165de1e9ba824cf60dd076ff Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3579735 Reviewed-by: Alexandre Courbot <acourbot@chromium.org> Reviewed-by: Keiichi Watanabe <keiichiw@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Commit-Queue: Noah Gold <nkgold@google.com>
2022-04-13 04:36:24 +00:00
cfg-if = "1.0.0"
Refactoring: Move common/cros_async to cros_async This runs the script added in https://crrev.com/c/3533607 BUG=b:22320646 TEST=presubmit Change-Id: I2e7efdb35508d45281f046e64c24aa43e27f2000 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3533608 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com>
2022-03-17 18:26:01 +00:00
intrusive-collections = "0.9"
libc = "*"
once_cell = "1.7.2"
paste = "1.0"
pin-utils = "0.1.0-alpha.4"
remain = "0.2"
slab = "0.4"
sync = { path = "../common/sync" } # provided by ebuild
cros_async: Depend on base, not sys_util base was previously providing some async types which now would cause a circular dependency. Those have been moved into cros_async. BUG=b:22320646 TEST=presubmit Change-Id: I1f526ccfc5882f3a64404f714b13ac92ebfddcd6 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3533614 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com>
2022-03-17 20:11:41 +00:00
base = { path = "../base" } # provided by ebuild
Refactoring: Move common/cros_async to cros_async This runs the script added in https://crrev.com/c/3533607 BUG=b:22320646 TEST=presubmit Change-Id: I2e7efdb35508d45281f046e64c24aa43e27f2000 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3533608 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com>
2022-03-17 18:26:01 +00:00
thiserror = "1.0.20"
audio_streams = { path = "../common/audio_streams" } # provided by ebuild
anyhow = "1.0"
cros_async: Depend on base, not sys_util base was previously providing some async types which now would cause a circular dependency. Those have been moved into cros_async. BUG=b:22320646 TEST=presubmit Change-Id: I1f526ccfc5882f3a64404f714b13ac92ebfddcd6 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3533614 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com>
2022-03-17 20:11:41 +00:00
serde = "*"
Adding missing `# provided by ebuild` to Cargo.tomls cros_async and by extension serde_keyvalue are needed on ChromeOS, so add the `# provided by ebuild` comments where appropriate to make it possible to uprev cros_async (which requires pulling in serde_keyvalue). BUG=b:250883877 TEST=kokoro passes Change-Id: I423cac0c4e5e30afac058b914358caca7d27edbf Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3953082 Auto-Submit: Allen Webb <allenwebb@google.com> Commit-Queue: Dennis Kempin <denniskempin@google.com> Reviewed-by: Dennis Kempin <denniskempin@google.com>
2022-10-13 19:16:21 +00:00
serde_keyvalue = { path = "../serde_keyvalue", features = ["argh_derive"] } # provided by ebuild
cros_async: assert IoSource is Send and Sync Nothing needs an IO future to be `Send` at the moment, but that is mostly a legacy of cros_async not supporting it until recently. This compile time test will keep it from regressing. BUG=b:271297810 Change-Id: Ib966740e1c563e675982326edd3bc055363b193f Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5124626 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Commit-Queue: Frederick Mayle <fmayle@google.com>
2023-12-14 23:54:16 +00:00
static_assertions = "1.1"
Cargo.lock: switch to tokio 1.29.1 ChromeOS only has tokio version 1.29.1 vendored currently, so switch the required version in Cargo.toml and update Cargo.lock to ensure we can build against that version. Since this is only a difference in minor version, newer versions of tokio should also work for other downstream crosvm users. The Cargo.lock update was done by: cargo update -p tokio --precise 1.29.1 BUG=b:334109381 TEST=emerge-$BOARD Change-Id: I5f67367258cd51145a1ff74246cb4e0f02f6a8be Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5450247 Commit-Queue: Daniel Verkamp <dverkamp@chromium.org> Reviewed-by: Dennis Kempin <denniskempin@google.com> Reviewed-by: Frederick Mayle <fmayle@google.com>
2024-04-12 17:25:42 +00:00
tokio = { version = "1.29.1", optional = true, features = ["net", "rt-multi-thread"] }
Refactoring: Move common/cros_async to cros_async This runs the script added in https://crrev.com/c/3533607 BUG=b:22320646 TEST=presubmit Change-Id: I2e7efdb35508d45281f046e64c24aa43e27f2000 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3533608 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com>
2022-03-17 18:26:01 +00:00
Replace #[cfg(unix)] with #[cfg(any(target_os = "android", target_os = "linux"))] Updates are made to source and documentation. This more accurately represents the currently supported platforms of Android/Linux and Windows, without unexpectedly including other unix-like operating systems. Command to reproduce: $ find . -type f -not -path '*/\.git/*' | xargs -I {} sed -i 's/cfg(unix)/cfg(any(target_os = "android", target_os = "linux"))/g' {} $ cargo fmt md files manually updated to fix line lengths. Renaming `unix` modules to `linux` will be done in a later CL. Test: ./tools/dev_container ./tools/presubmit Bug: b/298269162 Change-Id: I42c1bf0abf80b9a0df25551613910293217c7295 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4909059 Commit-Queue: Cody Schuffelen <schuffelen@google.com> Reviewed-by: Frederick Mayle <fmayle@google.com> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Reviewed-by: Noah Gold <nkgold@google.com>
2023-10-03 01:33:00 +00:00
[target.'cfg(any(target_os = "android", target_os = "linux"))'.dependencies]
cros_async: upstream Windows support. Major changes: * Adds Windows implementations * Refactors cros_async to use the styleguide for cross platform code. * Adds platform specific Descriptor impls to Timer & Event (short term; this will go away in the next CL in the series). Minor adjustments: * The doctests for the Executor were passing the wrong type of seek parameter to write_from_vec. It was disabling seeking (None) when it should have been seeking to zero (Some(0)). BUG=b:213147081 TEST=tested by Windows & Linux bots. Change-Id: Id7e025ceb9f1be4a165de1e9ba824cf60dd076ff Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3579735 Reviewed-by: Alexandre Courbot <acourbot@chromium.org> Reviewed-by: Keiichi Watanabe <keiichiw@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Commit-Queue: Noah Gold <nkgold@google.com>
2022-04-13 04:36:24 +00:00
io_uring = { path = "../io_uring" } # provided by ebuild
[target.'cfg(windows)'.dependencies]
winapi = "*"
win_util = { path = "../win_util" }
smallvec = "*"
Refactoring: Move common/cros_async to cros_async This runs the script added in https://crrev.com/c/3533607 BUG=b:22320646 TEST=presubmit Change-Id: I2e7efdb35508d45281f046e64c24aa43e27f2000 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3533608 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com>
2022-03-17 18:26:01 +00:00
[dependencies.futures]
version = "*"
default-features = false
features = ["alloc"]
[dev-dependencies]
futures = { version = "*", features = ["executor"] }
futures-executor = { version = "0.3", features = ["thread-pool"] }
futures-util = "0.3"
tempfile = "3"
Reference in a new issue Copy permalink