Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(s2n-quic-platform): use socket ring for tokio #1792

Merged
merged 3 commits into from
Jun 15, 2023
Merged

refactor(s2n-quic-platform): use socket ring for tokio #1792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d99646
refactor(s2n-quic-platform): use socket ring for tokio
camshaft May 18, 2023
dff112a
fix turmoil builds on non-linux
camshaft Jun 15, 2023
0d69d19
pr feedback
camshaft Jun 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions quic/s2n-quic-platform/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,13 @@ xdp = ["s2n-quic-xdp"]
bach = { version = "0.0.6", optional = true }
bolero-generator = { version = "0.9", optional = true }
cfg-if = "1"
errno = "0.3"
futures = { version = "0.3", default-features = false, features = ["async-await"], optional = true }
lazy_static = { version = "1", optional = true }
s2n-quic-core = { version = "=0.22.0", path = "../s2n-quic-core", default-features = false }
s2n-quic-xdp = { version = "=0.2.0", path = "../../tools/xdp/s2n-quic-xdp", optional = true }
socket2 = { version = "0.5", features = ["all"], optional = true }
tokio = { version = "1", default-features = false, features = ["macros", "net", "rt", "time"], optional = true }
turmoil = { version = "0.5.2", optional = true }
zeroize = { version = "1", default-features = false }

[target.'cfg(unix)'.dependencies]
libc = "0.2"
Expand Down
23 changes: 0 additions & 23 deletions quic/s2n-quic-platform/src/buffer.rs
View file
Open in desktop

This file was deleted.

91 changes: 0 additions & 91 deletions quic/s2n-quic-platform/src/buffer/vec.rs
View file
Open in desktop

This file was deleted.

11 changes: 1 addition & 10 deletions quic/s2n-quic-platform/src/features/gso.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,6 @@ mod gso_enabled {
self.0.load(Ordering::Relaxed)
}

#[inline]
pub fn default_max_segments(&self) -> usize {
self.max_segments().min(MaxSegments::default().0.into())
}

#[inline]
pub fn disable(&self) {
self.0.store(1, Ordering::Relaxed);
Expand Down Expand Up @@ -137,11 +132,7 @@ mod gso_disabled {
}

#[inline]
pub fn default_max_segments(&self) -> usize {
1
}

#[inline]
#[allow(dead_code)] // this may or may not be used on certain platforms
pub fn disable(&self) {
// it's already disabled
}
Expand Down
Loading