YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-03-31 17:55:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to glommio version 0.7 (using crates.io instead of git version)

Browse source
This commit is contained in:
Joakim Frostegård 2022-02-19 15:32:25 +01:00
parent 0d501dc833
commit f6a7514fb8
5 changed files with 75 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

109
Cargo.lock generated
View file

@ -97,7 +97,7 @@ dependencies = [
"either",
"futures-lite",
"futures-rustls",
"glommio 0.6.0 (git+https://github.com/DataDog/glommio.git?rev=4e6b14772da2f4325271fbcf12d24cf91ed466e5)",
"glommio",
"itoa 1.0.1",
"log",
"memchr",
@ -124,7 +124,7 @@ dependencies = [
"aquatic_http_protocol",
"aquatic_toml_config",
"futures-lite",
"glommio 0.6.0 (git+https://github.com/DataDog/glommio.git?rev=4e6b14772da2f4325271fbcf12d24cf91ed466e5)",
"glommio",
"hashbrown 0.12.0",
"log",
"mimalloc",
@ -269,7 +269,7 @@ dependencies = [
"futures",
"futures-lite",
"futures-rustls",
"glommio 0.6.0 (git+https://github.com/DataDog/glommio.git?rev=2efe2f2a08f54394a435b674e8e0125057cbff03)",
"glommio",
"hashbrown 0.12.0",
"histogram",
"log",
@ -301,7 +301,7 @@ dependencies = [
"async-tungstenite",
"futures",
"futures-rustls",
"glommio 0.6.0 (git+https://github.com/DataDog/glommio.git?rev=2efe2f2a08f54394a435b674e8e0125057cbff03)",
"glommio",
"log",
"mimalloc",
"quickcheck",
@ -792,6 +792,19 @@ dependencies = [
"num-traits",
]
[[package]]
name = "flume"
version = "0.10.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b279436a715a9de95dcd26b151db590a71961cc06e54918b24fe0dd5b7d3fc4"
dependencies = [
"futures-core",
"futures-sink",
"nanorand",
"pin-project",
"spin 0.9.2",
]
[[package]]
name = "fnv"
version = "1.0.7"
@ -940,8 +953,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c"
dependencies = [
"cfg-if",
"js-sys",
"libc",
"wasi",
"wasm-bindgen",
]
[[package]]
@ -952,41 +967,12 @@ checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4"
[[package]]
name = "glommio"
version = "0.6.0"
source = "git+https://github.com/DataDog/glommio.git?rev=2efe2f2a08f54394a435b674e8e0125057cbff03#2efe2f2a08f54394a435b674e8e0125057cbff03"
dependencies = [
"ahash",
"bitflags 1.3.2",
"bitmaps",
"buddy-alloc",
"cc",
"concurrent-queue",
"crossbeam",
"enclose",
"futures-lite",
"intrusive-collections",
"lazy_static",
"libc",
"lockfree",
"log",
"membarrier",
"nix",
"pin-project-lite",
"rlimit",
"scoped-tls",
"scopeguard",
"smallvec",
"socket2 0.3.19",
"tracing",
"typenum",
]
[[package]]
name = "glommio"
version = "0.6.0"
source = "git+https://github.com/DataDog/glommio.git?rev=4e6b14772da2f4325271fbcf12d24cf91ed466e5#4e6b14772da2f4325271fbcf12d24cf91ed466e5"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd6912e67cabcb397683537cadc80a38136fdea7702430ede1a43207940697a6"
dependencies = [
"ahash",
"backtrace",
"bitflags 1.3.2",
"bitmaps",
"buddy-alloc",
@ -994,6 +980,7 @@ dependencies = [
"concurrent-queue",
"crossbeam",
"enclose",
"flume",
"futures-lite",
"intrusive-collections",
"lazy_static",
@ -1006,6 +993,8 @@ dependencies = [
"rlimit",
"scoped-tls",
"scopeguard",
"signal-hook",
"sketches-ddsketch",
"smallvec",
"socket2 0.3.19",
"tracing",
@ -1344,6 +1333,15 @@ dependencies = [
"winapi 0.3.9",
]
[[package]]
name = "nanorand"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "729eb334247daa1803e0a094d0a5c55711b85571179f5ec6e53eccfdf7008958"
dependencies = [
"getrandom",
]
[[package]]
name = "nix"
version = "0.23.1"
@ -1502,6 +1500,26 @@ version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
[[package]]
name = "pin-project"
version = "1.0.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e"
dependencies = [
"pin-project-internal",
]
[[package]]
name = "pin-project-internal"
version = "1.0.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "pin-project-lite"
version = "0.2.8"
@ -1710,7 +1728,7 @@ dependencies = [
"cc",
"libc",
"once_cell",
"spin",
"spin 0.5.2",
"untrusted",
"web-sys",
"winapi 0.3.9",
@ -1924,6 +1942,12 @@ dependencies = [
"termcolor",
]
[[package]]
name = "sketches-ddsketch"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "76a77a8fd93886010f05e7ea0720e569d6d16c65329dbe3ec033bbbccccb017b"
[[package]]
name = "slab"
version = "0.4.5"
@ -1972,6 +1996,15 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
[[package]]
name = "spin"
version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "511254be0c5bcf062b019a6c89c01a664aa359ded62f78aa72c6fc137c0590e5"
dependencies = [
"lock_api",
]
[[package]]
name = "static_assertions"
version = "1.1.0"

2
aquatic_http/Cargo.toml
View file

@ -25,7 +25,7 @@ cfg-if = "1"
either = "1"
futures-lite = "1"
futures-rustls = "0.22"
glommio = { git = "https://github.com/DataDog/glommio.git", rev = "4e6b14772da2f4325271fbcf12d24cf91ed466e5" }
glommio = "0.7"
itoa = "1"
log = "0.4"
mimalloc = { version = "0.1", default-features = false }

2
aquatic_http_load_test/Cargo.toml
View file

@ -19,7 +19,7 @@ aquatic_common = "0.1.0"
aquatic_http_protocol = "0.1.0"
futures-lite = "1"
hashbrown = "0.12"
glommio = { git = "https://github.com/DataDog/glommio.git", rev = "4e6b14772da2f4325271fbcf12d24cf91ed466e5" }
glommio = "0.7"
log = "0.4"
mimalloc = { version = "0.1", default-features = false }
rand = { version = "0.8", features = ["small_rng"] }

2
aquatic_ws/Cargo.toml
View file

@ -51,7 +51,7 @@ async-tungstenite = { version = "0.17", optional = true }
futures-lite = { version = "1", optional = true }
futures = { version = "0.3", optional = true }
futures-rustls = { version = "0.22", optional = true }
glommio = { git = "https://github.com/DataDog/glommio.git", rev = "2efe2f2a08f54394a435b674e8e0125057cbff03", optional = true }
glommio = { version = "0.7", optional = true }
[dev-dependencies]
quickcheck = "1"

2
aquatic_ws_load_test/Cargo.toml
View file

@ -20,7 +20,7 @@ aquatic_common = "0.1.0"
aquatic_ws_protocol = "0.1.0"
futures = "0.3"
futures-rustls = "0.22"
glommio = { git = "https://github.com/DataDog/glommio.git", rev = "2efe2f2a08f54394a435b674e8e0125057cbff03" }
glommio = "0.7"
log = "0.4"
mimalloc = { version = "0.1", default-features = false }
rand = { version = "0.8", features = ["small_rng"] }