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

Merge pull request #93 from greatest-ape/work-2022-09-25

Browse source 
Use Rust 1.64 workspace inheritance; udp&http: don't return response peers if announce event is stopped; fix anti-avx512 script issues
This commit is contained in:
Joakim Frostegård 2022-09-25 12:22:19 +02:00 • committed by GitHub
commit 4b3f186c31
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 200 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

14
CHANGELOG.md
View file

@ -14,22 +14,28 @@
### Changed ### Changed
* Rename request workers to swarm workers * Rename request workers to swarm workers
* Switch to thin LTO * Switch to thin LTO for faster compile times
* Use proper workspace path declarations and remove workspace patch section * Use proper workspace path declarations and remove workspace patch section
* Reduce space taken by ValidUntil struct from 128 to 32 bits * Use [Rust 1.64 workspace inheritance](https://blog.rust-lang.org/2022/09/22/Rust-1.64.0.html)
* Reduce space taken by ValidUntil struct from 128 to 32 bits, reducing memory
consumtion for each stored peer by same amount
* Use regular (non-amortized) IndexMap for peer and pending scrape response maps (but not for torrent maps) * Use regular (non-amortized) IndexMap for peer and pending scrape response maps (but not for torrent maps)
* Improve privilege dropping * Improve privilege dropping
* Quit whole program if any thread panics * Quit whole program if any thread panics
* Update dependencies * Update dependencies
* _aquatic_udp_: replace ConnectionMap with BLAKE3-based connection validator * _aquatic_udp_: replace ConnectionMap with BLAKE3-based connection validator,
greatly decreasing memory consumtion
* _aquatic_udp_: don't return any response peers if announce event is stopped
* _aquatic_udp_: ignore requests with source port value of zero * _aquatic_udp_: ignore requests with source port value of zero
* _aquatic_http_: don't return any response peers if announce event is stopped
* _aquatic_ws_: reduce size of various structs * _aquatic_ws_: reduce size of various structs
* _aquatic_ws_: make TLS optional * _aquatic_ws_: make TLS optional
* _aquatic_ws_: support reverse proxies * _aquatic_ws_: support reverse proxies
### Fixed ### Fixed
* Fail on unrecognized config keys * Forbid unrecognized keys when parsing config files
* Fix warnings from invalid avx512 key included in `./scripts/env-native-cpu-without-avx-512`
* _aquatic_http_protocol_: explicity check for /scrape path * _aquatic_http_protocol_: explicity check for /scrape path
* _aquatic_http_protocol_: return NeedMoreData until headers are fully parsed * _aquatic_http_protocol_: return NeedMoreData until headers are fully parsed
* _aquatic_http_protocol_: fix issues with ScrapeRequest::write and AnnounceRequest::write * _aquatic_http_protocol_: fix issues with ScrapeRequest::write and AnnounceRequest::write

24
Cargo.lock generated
View file

@ -1893,9 +1893,9 @@ dependencies = [
[[package]] [[package]]
name = "once_cell" name = "once_cell"
version = "1.14.0" version = "1.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0" checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1"
[[package]] [[package]]
name = "oorandom" name = "oorandom"
@ -2114,9 +2114,9 @@ dependencies = [
[[package]] [[package]]
name = "proc-macro2" name = "proc-macro2"
version = "1.0.43" version = "1.0.44"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" checksum = "7bd7356a8122b6c4a24a82b278680c73357984ca2fc79a0f9fa6dea7dced7c58"
dependencies = [ dependencies = [
"unicode-ident", "unicode-ident",
] ]
@ -2369,9 +2369,9 @@ dependencies = [
[[package]] [[package]]
name = "serde" name = "serde"
version = "1.0.144" version = "1.0.145"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860" checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b"
dependencies = [ dependencies = [
"serde_derive", "serde_derive",
] ]
@ -2407,9 +2407,9 @@ dependencies = [
[[package]] [[package]]
name = "serde_derive" name = "serde_derive"
version = "1.0.144" version = "1.0.145"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00" checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -2761,18 +2761,18 @@ dependencies = [
[[package]] [[package]]
name = "thiserror" name = "thiserror"
version = "1.0.35" version = "1.0.36"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c53f98874615aea268107765aa1ed8f6116782501d18e53d08b471733bea6c85" checksum = "0a99cb8c4b9a8ef0e7907cd3b617cc8dc04d571c4e73c8ae403d80ac160bb122"
dependencies = [ dependencies = [
"thiserror-impl", "thiserror-impl",
] ]
[[package]] [[package]]
name = "thiserror-impl" name = "thiserror-impl"
version = "1.0.35" version = "1.0.36"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8b463991b4eab2d801e724172285ec4195c650e8ec79b149e6c2a8e6dd3f783" checksum = "3a891860d3c8d66fec8e73ddb3765f90082374dbaaa833407b904a94f1a7eb43"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",

21
Cargo.toml
View file

@ -1,5 +1,4 @@
[workspace] [workspace]
members = [ members = [
"aquatic", "aquatic",
"aquatic_common", "aquatic_common",
@ -18,6 +17,26 @@ members = [
"aquatic_ws_protocol", "aquatic_ws_protocol",
] ]
[workspace.package]
version = "0.2.0"
authors = ["Joakim Frostegård <joakim.frostegard@gmail.com>"]
edition = "2021"
license = "Apache-2.0"
repository = "https://github.com/greatest-ape/aquatic"
readme = "./README.md"
rust-version = "1.64"
[workspace.dependencies]
aquatic_common = { version = "0.2.0", path = "./aquatic_common" }
aquatic_http_protocol = { version = "0.2.0", path = "./aquatic_http_protocol" }
aquatic_http = { version = "0.2.0", path = "./aquatic_http" }
aquatic_toml_config = { version = "0.2.0", path = "./aquatic_toml_config" }
aquatic_toml_config_derive = { version = "0.2.0", path = "./aquatic_toml_config_derive" }
aquatic_udp_protocol = { version = "0.2.0", path = "./aquatic_udp_protocol" }
aquatic_udp = { version = "0.2.0", path = "./aquatic_udp" }
aquatic_ws_protocol = { version = "0.2.0", path = "./aquatic_ws_protocol" }
aquatic_ws = { version = "0.2.0", path = "./aquatic_ws" }
[patch.crates-io] [patch.crates-io]
membarrier = { git = "https://github.com/glommer/membarrier-rs.git", branch = "issue-22" } membarrier = { git = "https://github.com/glommer/membarrier-rs.git", branch = "issue-22" }

21
aquatic/Cargo.toml
View file

@ -1,20 +1,21 @@
[package] [package]
name = "aquatic" name = "aquatic"
version = "0.2.0"
authors = ["Joakim Frostegård <joakim.frostegard@gmail.com>"]
edition = "2021"
license = "Apache-2.0"
description = "High-performance open BitTorrent tracker (UDP, HTTP, WebTorrent)" description = "High-performance open BitTorrent tracker (UDP, HTTP, WebTorrent)"
repository = "https://github.com/greatest-ape/aquatic"
keywords = ["bittorrent", "torrent", "webtorrent"] keywords = ["bittorrent", "torrent", "webtorrent"]
readme = "../README.md" version.workspace = true
authors.workspace = true
edition.workspace = true
license.workspace = true
repository.workspace = true
readme.workspace = true
rust-version.workspace = true
[[bin]] [[bin]]
name = "aquatic" name = "aquatic"
[dependencies] [dependencies]
aquatic_common = { version = "0.2.0", path = "../aquatic_common" } aquatic_common.workspace = true
aquatic_http = { version = "0.2.0", path = "../aquatic_http" } aquatic_http.workspace = true
aquatic_udp = { version = "0.2.0", path = "../aquatic_udp" } aquatic_udp.workspace = true
aquatic_ws = { version = "0.2.0", path = "../aquatic_ws" } aquatic_ws.workspace = true
mimalloc = { version = "0.1", default-features = false } mimalloc = { version = "0.1", default-features = false }

15
aquatic_common/Cargo.toml
View file

@ -1,12 +1,13 @@
[package] [package]
name = "aquatic_common" name = "aquatic_common"
version = "0.2.0"
authors = ["Joakim Frostegård <joakim.frostegard@gmail.com>"]
edition = "2021"
license = "Apache-2.0"
description = "aquatic BitTorrent tracker common code" description = "aquatic BitTorrent tracker common code"
repository = "https://github.com/greatest-ape/aquatic" version.workspace = true
readme = "../README.md" authors.workspace = true
edition.workspace = true
license.workspace = true
repository.workspace = true
readme.workspace = true
rust-version.workspace = true
[lib] [lib]
name = "aquatic_common" name = "aquatic_common"
@ -15,7 +16,7 @@ name = "aquatic_common"
rustls = ["dep:rustls", "rustls-pemfile"] rustls = ["dep:rustls", "rustls-pemfile"]
[dependencies] [dependencies]
aquatic_toml_config = { version = "0.2.0", path = "../aquatic_toml_config" } aquatic_toml_config.workspace = true
ahash = "0.8" ahash = "0.8"
anyhow = "1" anyhow = "1"

19
aquatic_http/Cargo.toml
View file

@ -1,13 +1,14 @@
[package] [package]
name = "aquatic_http" name = "aquatic_http"
version = "0.2.0"
authors = ["Joakim Frostegård <joakim.frostegard@gmail.com>"]
edition = "2021"
license = "Apache-2.0"
description = "High-performance open BitTorrent tracker (HTTP over TLS)" description = "High-performance open BitTorrent tracker (HTTP over TLS)"
repository = "https://github.com/greatest-ape/aquatic"
keywords = ["http", "server", "peer-to-peer", "torrent", "bittorrent"] keywords = ["http", "server", "peer-to-peer", "torrent", "bittorrent"]
readme = "../README.md" version.workspace = true
authors.workspace = true
edition.workspace = true
license.workspace = true
repository.workspace = true
readme.workspace = true
rust-version.workspace = true
[lib] [lib]
name = "aquatic_http" name = "aquatic_http"
@ -16,9 +17,9 @@ name = "aquatic_http"
name = "aquatic_http" name = "aquatic_http"
[dependencies] [dependencies]
aquatic_common = { version = "0.2.0", path = "../aquatic_common", features = ["rustls", "glommio"] } aquatic_common = { workspace = true, features = ["rustls", "glommio"] }
aquatic_http_protocol = { version = "0.2.0", path = "../aquatic_http_protocol" } aquatic_http_protocol.workspace = true
aquatic_toml_config = { version = "0.2.0", path = "../aquatic_toml_config" } aquatic_toml_config.workspace = true
anyhow = "1" anyhow = "1"
cfg-if = "1" cfg-if = "1"

6
aquatic_http/src/workers/socket.rs
View file

@ -248,17 +248,15 @@ impl Connection {
match Request::from_bytes(&self.request_buffer[..self.request_buffer_position]) { match Request::from_bytes(&self.request_buffer[..self.request_buffer_position]) {
Ok(request) => { Ok(request) => {
::log::debug!("received request: {:?}", request);
return Ok(Either::Right(request)); return Ok(Either::Right(request));
} }
Err(RequestParseError::Invalid(err)) => { Err(RequestParseError::Invalid(err)) => {
::log::debug!("invalid request: {:?}", err);
let response = FailureResponse { let response = FailureResponse {
failure_reason: "Invalid request".into(), failure_reason: "Invalid request".into(),
}; };
::log::debug!("Invalid request: {:#}", err);
return Ok(Either::Left(response)); return Ok(Either::Left(response));
} }
Err(RequestParseError::NeedMoreData) => { Err(RequestParseError::NeedMoreData) => {

32
aquatic_http/src/workers/swarm.rs
View file

@ -344,8 +344,6 @@ pub fn upsert_peer_and_get_response_peers<I: Ip>(
valid_until, valid_until,
}; };
::log::debug!("peer: {:?}", peer);
let ip_or_key = request let ip_or_key = request
.key .key
.map(Either::Right) .map(Either::Right)
@ -356,8 +354,6 @@ pub fn upsert_peer_and_get_response_peers<I: Ip>(
ip_or_key, ip_or_key,
}; };
::log::debug!("peer map key: {:?}", peer_map_key);
let opt_removed_peer = match peer_status { let opt_removed_peer = match peer_status {
PeerStatus::Leeching => { PeerStatus::Leeching => {
torrent_data.num_leechers += 1; torrent_data.num_leechers += 1;
@ -372,8 +368,6 @@ pub fn upsert_peer_and_get_response_peers<I: Ip>(
PeerStatus::Stopped => torrent_data.peers.remove(&peer_map_key), PeerStatus::Stopped => torrent_data.peers.remove(&peer_map_key),
}; };
::log::debug!("opt_removed_peer: {:?}", opt_removed_peer);
match opt_removed_peer.map(|peer| peer.status) { match opt_removed_peer.map(|peer| peer.status) {
Some(PeerStatus::Leeching) => { Some(PeerStatus::Leeching) => {
torrent_data.num_leechers -= 1; torrent_data.num_leechers -= 1;
@ -384,21 +378,23 @@ pub fn upsert_peer_and_get_response_peers<I: Ip>(
_ => {} _ => {}
} }
::log::debug!("peer request numwant: {:?}", request.numwant); let response_peers = if let PeerStatus::Stopped = peer_status {
Vec::new()
} else {
let max_num_peers_to_take = match request.numwant {
Some(0) | None => config.protocol.max_peers,
Some(numwant) => numwant.min(config.protocol.max_peers),
};
let max_num_peers_to_take = match request.numwant { extract_response_peers(
Some(0) | None => config.protocol.max_peers, rng,
Some(numwant) => numwant.min(config.protocol.max_peers), &torrent_data.peers,
max_num_peers_to_take,
peer_map_key,
Peer::to_response_peer,
)
}; };
let response_peers: Vec<ResponsePeer<I>> = extract_response_peers(
rng,
&torrent_data.peers,
max_num_peers_to_take,
peer_map_key,
Peer::to_response_peer,
);
( (
torrent_data.num_seeders, torrent_data.num_seeders,
torrent_data.num_leechers, torrent_data.num_leechers,

19
aquatic_http_load_test/Cargo.toml
View file

@ -1,21 +1,22 @@
[package] [package]
name = "aquatic_http_load_test" name = "aquatic_http_load_test"
version = "0.2.0"
authors = ["Joakim Frostegård <joakim.frostegard@gmail.com>"]
edition = "2021"
license = "Apache-2.0"
description = "BitTorrent (HTTP over TLS) load tester" description = "BitTorrent (HTTP over TLS) load tester"
repository = "https://github.com/greatest-ape/aquatic"
keywords = ["http", "benchmark", "peer-to-peer", "torrent", "bittorrent"] keywords = ["http", "benchmark", "peer-to-peer", "torrent", "bittorrent"]
readme = "../README.md" version.workspace = true
authors.workspace = true
edition.workspace = true
license.workspace = true
repository.workspace = true
readme.workspace = true
rust-version.workspace = true
[[bin]] [[bin]]
name = "aquatic_http_load_test" name = "aquatic_http_load_test"
[dependencies] [dependencies]
aquatic_common = { version = "0.2.0", path = "../aquatic_common", features = ["glommio"] } aquatic_common = { workspace = true, features = ["glommio"] }
aquatic_http_protocol = { version = "0.2.0", path = "../aquatic_http_protocol" } aquatic_http_protocol.workspace = true
aquatic_toml_config = { version = "0.2.0", path = "../aquatic_toml_config" } aquatic_toml_config.workspace = true
anyhow = "1" anyhow = "1"
futures-lite = "1" futures-lite = "1"

18
aquatic_http_private/Cargo.toml
View file

@ -1,11 +1,13 @@
[package] [package]
name = "aquatic_http_private" name = "aquatic_http_private"
version = "0.2.0"
edition = "2021"
authors = ["Joakim Frostegård <joakim.frostegard@gmail.com>"]
license = "Apache-2.0"
repository = "https://github.com/greatest-ape/aquatic"
keywords = ["http", "benchmark", "peer-to-peer", "torrent", "bittorrent"] keywords = ["http", "benchmark", "peer-to-peer", "torrent", "bittorrent"]
version.workspace = true
authors.workspace = true
edition.workspace = true
license.workspace = true
repository.workspace = true
readme.workspace = true
rust-version.workspace = true
[lib] [lib]
name = "aquatic_http_private" name = "aquatic_http_private"
@ -14,9 +16,9 @@ name = "aquatic_http_private"
name = "aquatic_http_private" name = "aquatic_http_private"
[dependencies] [dependencies]
aquatic_common = { version = "0.2.0", path = "../aquatic_common", features = ["rustls"] } aquatic_common = { workspace = true, features = ["rustls"] }
aquatic_http_protocol = { version = "0.2.0", path = "../aquatic_http_protocol", features = ["axum"] } aquatic_http_protocol = { workspace = true, features = ["axum"] }
aquatic_toml_config = { version = "0.2.0", path = "../aquatic_toml_config" } aquatic_toml_config.workspace = true
anyhow = "1" anyhow = "1"
axum = { version = "0.5", default-features = false, features = ["headers", "http1", "matched-path", "original-uri"] } axum = { version = "0.5", default-features = false, features = ["headers", "http1", "matched-path", "original-uri"] }

13
aquatic_http_protocol/Cargo.toml
View file

@ -1,13 +1,14 @@
[package] [package]
name = "aquatic_http_protocol" name = "aquatic_http_protocol"
version = "0.2.0"
authors = ["Joakim Frostegård <joakim.frostegard@gmail.com>"]
edition = "2021"
license = "Apache-2.0"
repository = "https://github.com/greatest-ape/aquatic"
description = "HTTP BitTorrent tracker protocol" description = "HTTP BitTorrent tracker protocol"
keywords = ["http", "protocol", "peer-to-peer", "torrent", "bittorrent"] keywords = ["http", "protocol", "peer-to-peer", "torrent", "bittorrent"]
readme = "../README.md" version.workspace = true
authors.workspace = true
edition.workspace = true
license.workspace = true
repository.workspace = true
readme.workspace = true
rust-version.workspace = true
[lib] [lib]
name = "aquatic_http_protocol" name = "aquatic_http_protocol"

15
aquatic_toml_config/Cargo.toml
View file

@ -1,20 +1,21 @@
[package] [package]
name = "aquatic_toml_config" name = "aquatic_toml_config"
version = "0.2.0"
authors = ["Joakim Frostegård <joakim.frostegard@gmail.com>"]
edition = "2021"
license = "Apache-2.0"
description = "Serialize toml with comments" description = "Serialize toml with comments"
repository = "https://github.com/greatest-ape/aquatic"
keywords = ["toml"] keywords = ["toml"]
readme = "../README.md" version.workspace = true
authors.workspace = true
edition.workspace = true
license.workspace = true
repository.workspace = true
readme.workspace = true
rust-version.workspace = true
[lib] [lib]
name = "aquatic_toml_config" name = "aquatic_toml_config"
[dependencies] [dependencies]
toml = "0.5" toml = "0.5"
aquatic_toml_config_derive = { version = "0.2.0", path = "../aquatic_toml_config_derive" } aquatic_toml_config_derive.workspace = true
[dev-dependencies] [dev-dependencies]
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }

13
aquatic_toml_config_derive/Cargo.toml
View file

@ -1,14 +1,15 @@
[package] [package]
name = "aquatic_toml_config_derive" name = "aquatic_toml_config_derive"
version = "0.2.0"
authors = ["Joakim Frostegård <joakim.frostegard@gmail.com>"]
edition = "2021"
license = "Apache-2.0"
description = "Serialize toml with comments" description = "Serialize toml with comments"
repository = "https://github.com/greatest-ape/aquatic"
exclude = ["target"] exclude = ["target"]
keywords = ["toml"] keywords = ["toml"]
readme = "../README.md" version.workspace = true
authors.workspace = true
edition.workspace = true
license.workspace = true
repository.workspace = true
readme.workspace = true
rust-version.workspace = true
[lib] [lib]
proc-macro = true proc-macro = true

20
aquatic_udp/Cargo.toml
View file

@ -1,14 +1,14 @@
[package] [package]
name = "aquatic_udp" name = "aquatic_udp"
version = "0.2.0"
authors = ["Joakim Frostegård <joakim.frostegard@gmail.com>"]
edition = "2021"
license = "Apache-2.0"
description = "High-performance open UDP BitTorrent tracker" description = "High-performance open UDP BitTorrent tracker"
repository = "https://github.com/greatest-ape/aquatic"
keywords = ["udp", "server", "peer-to-peer", "torrent", "bittorrent"] keywords = ["udp", "server", "peer-to-peer", "torrent", "bittorrent"]
readme = "../README.md" version.workspace = true
rust-version = "1.62" authors.workspace = true
edition.workspace = true
license.workspace = true
repository.workspace = true
readme.workspace = true
rust-version.workspace = true
[lib] [lib]
name = "aquatic_udp" name = "aquatic_udp"
@ -20,9 +20,9 @@ name = "aquatic_udp"
cpu-pinning = ["aquatic_common/hwloc"] cpu-pinning = ["aquatic_common/hwloc"]
[dependencies] [dependencies]
aquatic_common = { version = "0.2.0", path = "../aquatic_common" } aquatic_common.workspace = true
aquatic_toml_config = { version = "0.2.0", path = "../aquatic_toml_config" } aquatic_toml_config.workspace = true
aquatic_udp_protocol = { version = "0.2.0", path = "../aquatic_udp_protocol" } aquatic_udp_protocol.workspace = true
anyhow = "1" anyhow = "1"
blake3 = "1" blake3 = "1"

7
aquatic_udp/src/workers/swarm/mod.rs
View file

@ -157,8 +157,11 @@ fn handle_announce_request<I: Ip>(
peer_valid_until, peer_valid_until,
); );
let response_peers = let response_peers = if let PeerStatus::Stopped = peer_status {
torrent_data.extract_response_peers(rng, request.peer_id, max_num_peers_to_take); Vec::new()
} else {
torrent_data.extract_response_peers(rng, request.peer_id, max_num_peers_to_take)
};
AnnounceResponse { AnnounceResponse {
transaction_id: request.transaction_id, transaction_id: request.transaction_id,

21
aquatic_udp_bench/Cargo.toml
View file

@ -1,20 +1,21 @@
[package] [package]
name = "aquatic_udp_bench" name = "aquatic_udp_bench"
version = "0.2.0" version.workspace = true
authors = ["Joakim Frostegård <joakim.frostegard@gmail.com>"] authors.workspace = true
edition = "2021" edition.workspace = true
license = "Apache-2.0" license.workspace = true
repository = "https://github.com/greatest-ape/aquatic" repository.workspace = true
readme = "../README.md" readme.workspace = true
rust-version.workspace = true
[[bin]] [[bin]]
name = "aquatic_udp_bench" name = "aquatic_udp_bench"
[dependencies] [dependencies]
aquatic_common = { version = "0.2.0", path = "../aquatic_common" } aquatic_common.workspace = true
aquatic_toml_config = { version = "0.2.0", path = "../aquatic_toml_config" } aquatic_toml_config.workspace = true
aquatic_udp = { version = "0.2.0", path = "../aquatic_udp" } aquatic_udp.workspace = true
aquatic_udp_protocol = { version = "0.2.0", path = "../aquatic_udp_protocol" } aquatic_udp_protocol.workspace = true
anyhow = "1" anyhow = "1"
crossbeam-channel = "0.5" crossbeam-channel = "0.5"

19
aquatic_udp_load_test/Cargo.toml
View file

@ -1,13 +1,14 @@
[package] [package]
name = "aquatic_udp_load_test" name = "aquatic_udp_load_test"
version = "0.2.0"
authors = ["Joakim Frostegård <joakim.frostegard@gmail.com>"]
edition = "2021"
license = "Apache-2.0"
description = "BitTorrent (UDP) load tester" description = "BitTorrent (UDP) load tester"
repository = "https://github.com/greatest-ape/aquatic"
keywords = ["udp", "benchmark", "peer-to-peer", "torrent", "bittorrent"] keywords = ["udp", "benchmark", "peer-to-peer", "torrent", "bittorrent"]
readme = "../README.md" version.workspace = true
authors.workspace = true
edition.workspace = true
license.workspace = true
repository.workspace = true
readme.workspace = true
rust-version.workspace = true
[features] [features]
cpu-pinning = ["aquatic_common/hwloc"] cpu-pinning = ["aquatic_common/hwloc"]
@ -16,9 +17,9 @@ cpu-pinning = ["aquatic_common/hwloc"]
name = "aquatic_udp_load_test" name = "aquatic_udp_load_test"
[dependencies] [dependencies]
aquatic_common = { version = "0.2.0", path = "../aquatic_common" } aquatic_common.workspace = true
aquatic_toml_config = { version = "0.2.0", path = "../aquatic_toml_config" } aquatic_toml_config.workspace = true
aquatic_udp_protocol = { version = "0.2.0", path = "../aquatic_udp_protocol" } aquatic_udp_protocol.workspace = true
anyhow = "1" anyhow = "1"
hashbrown = "0.12" hashbrown = "0.12"

13
aquatic_udp_protocol/Cargo.toml
View file

@ -1,13 +1,14 @@
[package] [package]
name = "aquatic_udp_protocol" name = "aquatic_udp_protocol"
version = "0.2.0"
authors = ["Joakim Frostegård <joakim.frostegard@gmail.com>"]
edition = "2021"
license = "Apache-2.0"
description = "UDP BitTorrent tracker protocol" description = "UDP BitTorrent tracker protocol"
repository = "https://github.com/greatest-ape/aquatic"
keywords = ["udp", "protocol", "peer-to-peer", "torrent", "bittorrent"] keywords = ["udp", "protocol", "peer-to-peer", "torrent", "bittorrent"]
readme = "../README.md" version.workspace = true
authors.workspace = true
edition.workspace = true
license.workspace = true
repository.workspace = true
readme.workspace = true
rust-version.workspace = true
[dependencies] [dependencies]
byteorder = "1" byteorder = "1"

19
aquatic_ws/Cargo.toml
View file

@ -1,13 +1,14 @@
[package] [package]
name = "aquatic_ws" name = "aquatic_ws"
version = "0.2.0"
authors = ["Joakim Frostegård <joakim.frostegard@gmail.com>"]
edition = "2021"
license = "Apache-2.0"
description = "High-performance open WebTorrent tracker" description = "High-performance open WebTorrent tracker"
repository = "https://github.com/greatest-ape/aquatic"
keywords = ["webtorrent", "websocket", "peer-to-peer", "torrent", "bittorrent"] keywords = ["webtorrent", "websocket", "peer-to-peer", "torrent", "bittorrent"]
readme = "../README.md" version.workspace = true
authors.workspace = true
edition.workspace = true
license.workspace = true
repository.workspace = true
readme.workspace = true
rust-version.workspace = true
[lib] [lib]
name = "aquatic_ws" name = "aquatic_ws"
@ -16,9 +17,9 @@ name = "aquatic_ws"
name = "aquatic_ws" name = "aquatic_ws"
[dependencies] [dependencies]
aquatic_common = { version = "0.2.0", path = "../aquatic_common", features = ["rustls", "glommio"] } aquatic_common = { workspace = true, features = ["rustls", "glommio"] }
aquatic_toml_config = { version = "0.2.0", path = "../aquatic_toml_config" } aquatic_toml_config.workspace = true
aquatic_ws_protocol = { version = "0.2.0", path = "../aquatic_ws_protocol" } aquatic_ws_protocol.workspace = true
anyhow = "1" anyhow = "1"
async-tungstenite = "0.17" async-tungstenite = "0.17"

19
aquatic_ws_load_test/Cargo.toml
View file

@ -1,21 +1,22 @@
[package] [package]
name = "aquatic_ws_load_test" name = "aquatic_ws_load_test"
version = "0.2.0"
authors = ["Joakim Frostegård <joakim.frostegard@gmail.com>"]
edition = "2021"
license = "Apache-2.0"
description = "WebTorrent over TLS load tester" description = "WebTorrent over TLS load tester"
repository = "https://github.com/greatest-ape/aquatic"
keywords = ["webtorrent", "websocket", "benchmark", "torrent", "bittorrent"] keywords = ["webtorrent", "websocket", "benchmark", "torrent", "bittorrent"]
readme = "../README.md" version.workspace = true
authors.workspace = true
edition.workspace = true
license.workspace = true
repository.workspace = true
readme.workspace = true
rust-version.workspace = true
[[bin]] [[bin]]
name = "aquatic_ws_load_test" name = "aquatic_ws_load_test"
[dependencies] [dependencies]
aquatic_common = { version = "0.2.0", path = "../aquatic_common", features = ["glommio"] } aquatic_common = { workspace = true, features = ["glommio"] }
aquatic_toml_config = { version = "0.2.0", path = "../aquatic_toml_config" } aquatic_toml_config.workspace = true
aquatic_ws_protocol = { version = "0.2.0", path = "../aquatic_ws_protocol" } aquatic_ws_protocol.workspace = true
anyhow = "1" anyhow = "1"
async-tungstenite = "0.17" async-tungstenite = "0.17"

13
aquatic_ws_protocol/Cargo.toml
View file

@ -1,14 +1,15 @@
[package] [package]
name = "aquatic_ws_protocol" name = "aquatic_ws_protocol"
version = "0.2.0"
authors = ["Joakim Frostegård <joakim.frostegard@gmail.com>"]
edition = "2021"
license = "Apache-2.0"
description = "WebTorrent tracker protocol" description = "WebTorrent tracker protocol"
repository = "https://github.com/greatest-ape/aquatic"
exclude = ["target"] exclude = ["target"]
keywords = ["webtorrent", "protocol", "peer-to-peer", "torrent", "bittorrent"] keywords = ["webtorrent", "protocol", "peer-to-peer", "torrent", "bittorrent"]
readme = "../README.md" version.workspace = true
authors.workspace = true
edition.workspace = true
license.workspace = true
repository.workspace = true
readme.workspace = true
rust-version.workspace = true
[lib] [lib]
name = "aquatic_ws_protocol" name = "aquatic_ws_protocol"

2
scripts/env-native-cpu-without-avx-512
View file

@ -3,7 +3,7 @@
# Compile with target-cpu=native but without AVX512 features, since they # Compile with target-cpu=native but without AVX512 features, since they
# decrease performance. # decrease performance.
DISABLE_AVX512=$(rustc --print target-features | grep " avx512" | DISABLE_AVX512=$(rustc --print target-features | grep " avx512" | grep -v "avx512fp16" |
awk '{print $1}' | sed 's/^/-C target-feature=-/' | xargs) awk '{print $1}' | sed 's/^/-C target-feature=-/' | xargs)
export RUSTFLAGS="-C target-cpu=native $DISABLE_AVX512" export RUSTFLAGS="-C target-cpu=native $DISABLE_AVX512"