From 789ad766faa00f7c82ac57f82caf429f4a0127ee Mon Sep 17 00:00:00 2001
From: Daiki Ueno <dueno@redhat.com>
Date: Wed, 28 Jun 2023 07:58:35 +0200
Subject: [PATCH] Enable only necessary features for tokio

Signed-off-by: Daiki Ueno <dueno@redhat.com>
---
 Cargo.lock              | 40 ----------------------------------------
 agent/Cargo.toml        | 12 ++++++------
 client/Cargo.toml       |  6 +++---
 event-broker/Cargo.toml |  6 +++---
 4 files changed, 12 insertions(+), 52 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3a464a7..dd9c5b1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -931,16 +931,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "lock_api"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
-
 [[package]]
 name = "log"
 version = "0.4.17"
@@ -1224,29 +1214,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "parking_lot"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
-dependencies = [
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall",
- "smallvec",
- "windows-sys",
-]
-
 [[package]]
 name = "peeking_take_while"
 version = "0.1.2"
@@ -1461,12 +1428,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
 
-[[package]]
-name = "scopeguard"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-
 [[package]]
 name = "scratch"
 version = "1.0.2"
@@ -1825,7 +1786,6 @@ dependencies = [
  "memchr",
  "mio",
  "num_cpus",
- "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
  "socket2",
diff --git a/agent/Cargo.toml b/agent/Cargo.toml
index 2b99cff..faac8ba 100644
--- a/agent/Cargo.toml
+++ b/agent/Cargo.toml
@@ -12,22 +12,22 @@ default = ["tokio-uring"]
 [dependencies]
 anyhow = "1.0"
 bytes = "1.2"
-clap = { version = "4", features=["cargo", "derive"] }
+clap = { version = "4", features = ["cargo", "derive"] }
 crypto-auditing = { path = "../crypto-auditing" }
 futures = "0.3"
-libbpf-rs = { version = "0.20", features=["novendor"] }
+libbpf-rs = { version = "0.20", features = ["novendor"] }
 libc = "0.2"
 nix = "0.26"
 openssl = "0.10"
 page_size = "0.5"
 serde = "1.0"
 serde_cbor = "0.10"
-time = { version = "0.3", features=["formatting", "local-offset", "macros"] }
-tokio = { version = "1.23", features=["full"] }
+time = { version = "0.3", features = ["formatting", "local-offset", "macros"] }
+tokio = { version = "1.23", features = ["io-util", "signal"] }
 tokio-uring = { version = "0.4", optional = true }
 toml = "0.6"
 tracing = "0.1"
-tracing-subscriber = { version = "0.3", features=["env-filter"] }
+tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [build-dependencies]
-libbpf-cargo = { version = "0.20", features=["novendor"] }
+libbpf-cargo = { version = "0.20", features = ["novendor"] }
diff --git a/client/Cargo.toml b/client/Cargo.toml
index 0e4b8fb..ce21e5e 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -10,12 +10,12 @@ authors = ["The crypto-auditing developers"]
 
 [dependencies]
 anyhow = "1.0"
-clap = { version = "4", features=["derive"] }
+clap = { version = "4", features = ["derive"] }
 crypto-auditing = { path = "../crypto-auditing" }
 futures = "0.3"
 serde_cbor = "0.10"
 serde_json = "1.0"
-tokio = "1.23"
+tokio = { version = "1.23", features = ["macros", "rt", "rt-multi-thread"] }
 toml = "0.6"
 tracing = "0.1"
-tracing-subscriber = { version = "0.3", features=["env-filter"] }
+tracing-subscriber = { version = "0.3", features = ["env-filter"] }
diff --git a/event-broker/Cargo.toml b/event-broker/Cargo.toml
index 70e8de2..81ddae5 100644
--- a/event-broker/Cargo.toml
+++ b/event-broker/Cargo.toml
@@ -20,9 +20,9 @@ inotify = "0.10"
 libsystemd = { version = "0.6", optional = true }
 serde_cbor = "0.10"
 tarpc = { version = "0.33", features = ["serde-transport", "unix"] }
-tokio = "1.23"
-tokio-serde = { version = "0.8", features=["cbor"] }
+tokio = { version = "1.23", features = ["macros", "rt", "rt-multi-thread"] }
+tokio-serde = { version = "0.8", features = ["cbor"] }
 tokio-stream = "0.1"
 toml = "0.6"
 tracing = "0.1"
-tracing-subscriber = { version = "0.3", features=["env-filter"] }
+tracing-subscriber = { version = "0.3", features = ["env-filter"] }