mirror of
https://github.com/tokio-rs/bytes.git
synced 2026-08-08 00:00:26 +02:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
19d1427c97 | ||
|
|
36675436cc | ||
|
|
e0f3a25fae | ||
|
|
16fd473d5c | ||
|
|
71824b095c | ||
|
|
7a876609a2 | ||
|
|
3ab876fee6 | ||
|
|
a1b1208127 | ||
|
|
aae4969fde | ||
|
|
103d7bf9e0 | ||
|
|
16cc574fea | ||
|
|
0e9e4fc2f1 | ||
|
|
f7072c9267 | ||
|
|
d0a14deeb5 | ||
|
|
54f1c26f69 | ||
|
|
4cd8969e85 | ||
|
|
2d996a2b41 | ||
|
|
30ee8e9cba | ||
|
|
c45697ce42 | ||
|
|
0ac54ca706 | ||
|
|
d7c1d658d9 | ||
|
|
ac46ebdd46 | ||
|
|
79fb85323c | ||
|
|
291df5acc9 | ||
|
|
ed7d5ff39e | ||
|
|
dc4fb3e8f4 | ||
|
|
f488be48d0 | ||
|
|
03fdde9dcf | ||
|
|
f8c7b574c0 | ||
|
|
fd13c7dcdb | ||
|
|
6b4b0eda29 | ||
|
|
9965a04b56 | ||
|
|
3443ca5a0b | ||
|
|
8cc940779f | ||
|
|
7a5154ba8b | ||
|
|
fa1daac3ae | ||
|
|
caf520ac7f | ||
|
|
4950c50376 | ||
|
|
86694b0564 | ||
|
|
0c17e99283 | ||
|
|
cb7f8449b5 | ||
|
|
a8806c2457 | ||
|
|
baa5053572 | ||
|
|
ce09d7d358 | ||
|
|
9d3ec1cffb | ||
|
|
4e2c9c065a | ||
|
|
327615e5d4 | ||
|
|
b5fbfc3edb | ||
|
|
4eb62b912a | ||
|
|
e4af48633c | ||
|
|
0d4cc7ffed |
+50
-19
@@ -13,7 +13,7 @@ on:
|
||||
env:
|
||||
RUSTFLAGS: -Dwarnings
|
||||
RUST_BACKTRACE: 1
|
||||
nightly: nightly-2022-11-12
|
||||
nightly: nightly-2024-09-15
|
||||
|
||||
defaults:
|
||||
run:
|
||||
@@ -63,6 +63,7 @@ jobs:
|
||||
matrix:
|
||||
os:
|
||||
- ubuntu-latest
|
||||
- ubuntu-22.04-arm # TODO: update to 24.04 when https://github.com/rust-lang/rust/issues/135867 solved
|
||||
- macos-latest
|
||||
- windows-latest
|
||||
runs-on: ${{ matrix.os }}
|
||||
@@ -89,34 +90,61 @@ jobs:
|
||||
- name: Test
|
||||
run: ci/test-stable.sh test
|
||||
|
||||
panic-abort:
|
||||
name: panic=abort tests
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Install Rust
|
||||
run: rustup update $nightly && rustup default $nightly
|
||||
- name: Run tests with -Cpanic=abort
|
||||
run: ci/panic-abort.sh
|
||||
|
||||
# Run tests on some extra platforms
|
||||
cross:
|
||||
name: cross
|
||||
strategy:
|
||||
matrix:
|
||||
target:
|
||||
- i686-unknown-linux-gnu
|
||||
- armv7-unknown-linux-gnueabihf
|
||||
- powerpc-unknown-linux-gnu
|
||||
- powerpc64-unknown-linux-gnu
|
||||
- wasm32-unknown-unknown
|
||||
include:
|
||||
- target: i686-unknown-linux-gnu
|
||||
os: ubuntu-latest
|
||||
- target: armv7-unknown-linux-gnueabihf
|
||||
os: ubuntu-22.04-arm # TODO: update to 24.04 when https://github.com/rust-lang/rust/issues/135867 solved
|
||||
- target: powerpc-unknown-linux-gnu
|
||||
os: ubuntu-latest
|
||||
- target: powerpc64-unknown-linux-gnu
|
||||
os: ubuntu-latest
|
||||
- target: wasm32-wasip1
|
||||
os: ubuntu-latest
|
||||
runs-on: ${{ matrix.os }}
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Install Rust
|
||||
run: rustup update stable
|
||||
- uses: taiki-e/setup-cross-toolchain-action@v1
|
||||
with:
|
||||
target: ${{ matrix.target }}
|
||||
- name: Test
|
||||
run: cargo test --target ${{ matrix.target }}
|
||||
|
||||
# Build for no_std environment.
|
||||
no-std:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Install Rust
|
||||
run: rustup update stable
|
||||
- name: Install cross
|
||||
uses: taiki-e/install-action@cross
|
||||
if: matrix.target != 'wasm32-unknown-unknown'
|
||||
- name: cross build --target ${{ matrix.target }}
|
||||
run: cross build --target ${{ matrix.target }}
|
||||
if: matrix.target != 'wasm32-unknown-unknown'
|
||||
# WASM support
|
||||
- name: cargo build --target ${{ matrix.target }}
|
||||
run: |
|
||||
rustup target add ${{ matrix.target }}
|
||||
cargo build --target ${{ matrix.target }}
|
||||
if: matrix.target == 'wasm32-unknown-unknown'
|
||||
- name: Install cargo-hack
|
||||
uses: taiki-e/install-action@cargo-hack
|
||||
# thumbv6m-none-eabi supports atomic, but not atomic CAS.
|
||||
# thumbv7m-none-eabi supports atomic CAS.
|
||||
- run: rustup target add thumbv6m-none-eabi thumbv7m-none-eabi
|
||||
# * --optional-deps is needed for serde feature
|
||||
# * --no-dev-deps is needed to avoid https://github.com/rust-lang/cargo/issues/4866
|
||||
- run: cargo hack build --target thumbv7m-none-eabi --feature-powerset --skip std,default --optional-deps --no-dev-deps
|
||||
# A sound way to provide atomic CAS on platforms without native atomic CAS is system-dependent.
|
||||
# portable-atomic provides major ways via cfgs and accepts user-defined implementations via critical-section feature.
|
||||
- run: cargo hack build --target thumbv6m-none-eabi --feature-powerset --skip std,default --optional-deps --no-dev-deps --features extra-platforms,extra-platforms/critical-section
|
||||
|
||||
# Sanitizers
|
||||
tsan:
|
||||
@@ -136,6 +164,8 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Install Rust
|
||||
run: rustup update $nightly && rustup default $nightly
|
||||
- name: Miri
|
||||
run: ci/miri.sh
|
||||
|
||||
@@ -160,6 +190,7 @@ jobs:
|
||||
- minrust
|
||||
- cross
|
||||
- tsan
|
||||
- miri
|
||||
- loom
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
|
||||
@@ -1,3 +1,98 @@
|
||||
# 1.10.1 (March 5th, 2025)
|
||||
|
||||
### Fixed
|
||||
|
||||
- Fix memory leak when using `to_vec` with `Bytes::from_owner` (#773)
|
||||
|
||||
# 1.10.0 (February 3rd, 2025)
|
||||
|
||||
### Added
|
||||
|
||||
- Add feature to support platforms without atomic CAS (#467)
|
||||
- `try_get_*` methods for `Buf` trait (#753)
|
||||
- Implement `Buf::chunks_vectored` for `Take` (#617)
|
||||
- Implement `Buf::chunks_vectored` for `VecDeque<u8>` (#708)
|
||||
|
||||
### Fixed
|
||||
|
||||
- Remove incorrect guarantee for `chunks_vectored` (#754)
|
||||
- Ensure that tests pass under `panic=abort` (#749)
|
||||
|
||||
# 1.9.0 (November 27, 2024)
|
||||
|
||||
### Added
|
||||
|
||||
- Add `Bytes::from_owner` to enable externally-allocated memory (#742)
|
||||
|
||||
### Documented
|
||||
|
||||
- Fix typo in Buf::chunk() comment (#744)
|
||||
|
||||
### Internal changes
|
||||
|
||||
- Replace BufMut::put with BufMut::put_slice in Writer impl (#745)
|
||||
- Rename hex_impl! to fmt_impl! and reuse it for fmt::Debug (#743)
|
||||
|
||||
# 1.8.0 (October 21, 2024)
|
||||
|
||||
- Guarantee address in `split_off`/`split_to` for empty slices (#740)
|
||||
|
||||
# 1.7.2 (September 17, 2024)
|
||||
|
||||
### Fixed
|
||||
|
||||
- Fix default impl of `Buf::{get_int, get_int_le}` (#732)
|
||||
|
||||
### Documented
|
||||
|
||||
- Fix double spaces in comments and doc comments (#731)
|
||||
|
||||
### Internal changes
|
||||
|
||||
- Ensure BytesMut::advance reduces capacity (#728)
|
||||
|
||||
# 1.7.1 (August 1, 2024)
|
||||
|
||||
This release reverts the following change due to a regression:
|
||||
|
||||
- Reuse capacity when possible in `<BytesMut as Buf>::advance` impl (#698)
|
||||
|
||||
The revert can be found at #726.
|
||||
|
||||
# 1.7.0 (July 31, 2024)
|
||||
|
||||
### Added
|
||||
|
||||
- Add conversion from `Bytes` to `BytesMut` (#695, #710)
|
||||
- Add reclaim method without additional allocation (#686)
|
||||
|
||||
### Documented
|
||||
|
||||
- Clarify how `BytesMut::zeroed` works (#714)
|
||||
- Clarify the behavior of `Buf::chunk` (#717)
|
||||
|
||||
### Changed
|
||||
|
||||
- Change length condition of `BytesMut::truncate`
|
||||
- Reuse capacity when possible in `<BytesMut as Buf>::advance` impl (#698)
|
||||
- Improve `must_use` suggestion of `BytesMut::split` (#699)
|
||||
|
||||
### Internal changes
|
||||
|
||||
- Use `ManuallyDrop` instead of `mem::forget` (#678)
|
||||
- Don't set `len` in `BytesMut::reserve` (#682)
|
||||
- Optimize `Bytes::copy_to_bytes` (#688)
|
||||
- Refactor `BytesMut::truncate` (#694)
|
||||
- Refactor `BytesMut::resize` (#696)
|
||||
- Reorder assertion in `Bytes::split_to`, `Bytes::split_off` (#689, #693)
|
||||
- Use `offset_from` in more places (#705)
|
||||
- Correct the wrong usage of `IntoIter` (#707)
|
||||
|
||||
# 1.6.1 (July 13, 2024)
|
||||
|
||||
This release fixes a bug where `Bytes::is_unique` returns incorrect values when
|
||||
the `Bytes` originates from a shared `BytesMut`. (#718)
|
||||
|
||||
# 1.6.0 (March 22, 2024)
|
||||
|
||||
### Added
|
||||
|
||||
+11
-1
@@ -4,7 +4,7 @@ name = "bytes"
|
||||
# When releasing to crates.io:
|
||||
# - Update CHANGELOG.md.
|
||||
# - Create "v1.x.y" git tag.
|
||||
version = "1.6.0"
|
||||
version = "1.10.1"
|
||||
edition = "2018"
|
||||
rust-version = "1.39"
|
||||
license = "MIT"
|
||||
@@ -24,6 +24,11 @@ std = []
|
||||
|
||||
[dependencies]
|
||||
serde = { version = "1.0.60", optional = true, default-features = false, features = ["alloc"] }
|
||||
# Use portable-atomic crate to support platforms without atomic CAS.
|
||||
# See "no_std support" section in readme for more information.
|
||||
#
|
||||
# Enable require-cas feature to provide a better error message if the end user forgets to use the cfg or feature.
|
||||
extra-platforms = { package = "portable-atomic", version = "1.3", optional = true, default-features = false, features = ["require-cas"] }
|
||||
|
||||
[dev-dependencies]
|
||||
serde_test = "1.0"
|
||||
@@ -33,3 +38,8 @@ loom = "0.7"
|
||||
|
||||
[package.metadata.docs.rs]
|
||||
rustdoc-args = ["--cfg", "docsrs"]
|
||||
|
||||
[lints.rust]
|
||||
unexpected_cfgs = { level = "warn", check-cfg = [
|
||||
'cfg(loom)',
|
||||
] }
|
||||
|
||||
@@ -27,6 +27,21 @@ Next, add this to your crate:
|
||||
use bytes::{Bytes, BytesMut, Buf, BufMut};
|
||||
```
|
||||
|
||||
## no_std support
|
||||
|
||||
To use `bytes` with no_std environment, disable the (enabled by default) `std` feature.
|
||||
|
||||
```toml
|
||||
[dependencies]
|
||||
bytes = { version = "1", default-features = false }
|
||||
```
|
||||
|
||||
To use `bytes` with no_std environment without atomic CAS, such as thumbv6m, you also need to enable
|
||||
the `extra-platforms` feature. See the [documentation for the `portable-atomic`
|
||||
crate](https://docs.rs/portable-atomic) for more information.
|
||||
|
||||
The MSRV when `extra-platforms` feature is enabled depends on the MSRV of `portable-atomic`.
|
||||
|
||||
## Serde support
|
||||
|
||||
Serde support is optional and disabled by default. To enable use the feature `serde`.
|
||||
@@ -36,6 +51,8 @@ Serde support is optional and disabled by default. To enable use the feature `se
|
||||
bytes = { version = "1", features = ["serde"] }
|
||||
```
|
||||
|
||||
The MSRV when `serde` feature is enabled depends on the MSRV of `serde`.
|
||||
|
||||
## Building documentation
|
||||
|
||||
When building the `bytes` documentation the `docsrs` option should be used, otherwise
|
||||
|
||||
+3
-3
@@ -47,7 +47,7 @@ fn clone_static(b: &mut Bencher) {
|
||||
|
||||
b.iter(|| {
|
||||
for _ in 0..1024 {
|
||||
test::black_box(&bytes.clone());
|
||||
test::black_box(test::black_box(&bytes).clone());
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -58,7 +58,7 @@ fn clone_shared(b: &mut Bencher) {
|
||||
|
||||
b.iter(|| {
|
||||
for _ in 0..1024 {
|
||||
test::black_box(&bytes.clone());
|
||||
test::black_box(test::black_box(&bytes).clone());
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -70,7 +70,7 @@ fn clone_arc_vec(b: &mut Bencher) {
|
||||
|
||||
b.iter(|| {
|
||||
for _ in 0..1024 {
|
||||
test::black_box(&bytes.clone());
|
||||
test::black_box(test::black_box(&bytes).clone());
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
+1
-2
@@ -1,8 +1,7 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
rustup toolchain install nightly --component miri
|
||||
rustup override set nightly
|
||||
rustup component add miri
|
||||
cargo miri setup
|
||||
|
||||
export MIRIFLAGS="-Zmiri-strict-provenance"
|
||||
|
||||
Executable
+4
@@ -0,0 +1,4 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -ex
|
||||
RUSTFLAGS="$RUSTFLAGS -Cpanic=abort -Zpanic-abort-tests" cargo test --all-features --test '*'
|
||||
+5
-2
@@ -16,7 +16,10 @@ if [[ "${RUST_VERSION}" == "nightly"* ]]; then
|
||||
cargo check --benches
|
||||
|
||||
# Check minimal versions
|
||||
cargo clean
|
||||
cargo update -Zminimal-versions
|
||||
# Remove dev-dependencies from Cargo.toml to prevent the next `cargo update`
|
||||
# from determining minimal versions based on dev-dependencies.
|
||||
cargo hack --remove-dev-deps --workspace
|
||||
# Update Cargo.lock to minimal version dependencies.
|
||||
cargo update -Z minimal-versions
|
||||
cargo check --all-features
|
||||
fi
|
||||
|
||||
+1540
-42
File diff suppressed because it is too large
Load Diff
+47
-17
@@ -1,7 +1,7 @@
|
||||
use crate::buf::{limit, Chain, Limit, UninitSlice};
|
||||
#[cfg(feature = "std")]
|
||||
use crate::buf::{writer, Writer};
|
||||
use crate::{panic_advance, panic_does_not_fit};
|
||||
use crate::{panic_advance, panic_does_not_fit, TryGetError};
|
||||
|
||||
use core::{mem, ptr, usize};
|
||||
|
||||
@@ -165,7 +165,7 @@ pub unsafe trait BufMut {
|
||||
///
|
||||
/// # Implementer notes
|
||||
///
|
||||
/// This function should never panic. `chunk_mut` should return an empty
|
||||
/// This function should never panic. `chunk_mut()` should return an empty
|
||||
/// slice **if and only if** `remaining_mut()` returns 0. In other words,
|
||||
/// `chunk_mut()` returning an empty slice implies that `remaining_mut()` will
|
||||
/// return 0 and `remaining_mut()` returning 0 implies that `chunk_mut()` will
|
||||
@@ -204,7 +204,10 @@ pub unsafe trait BufMut {
|
||||
Self: Sized,
|
||||
{
|
||||
if self.remaining_mut() < src.remaining() {
|
||||
panic_advance(src.remaining(), self.remaining_mut());
|
||||
panic_advance(&TryGetError {
|
||||
requested: src.remaining(),
|
||||
available: self.remaining_mut(),
|
||||
});
|
||||
}
|
||||
|
||||
while src.has_remaining() {
|
||||
@@ -242,7 +245,10 @@ pub unsafe trait BufMut {
|
||||
#[inline]
|
||||
fn put_slice(&mut self, mut src: &[u8]) {
|
||||
if self.remaining_mut() < src.len() {
|
||||
panic_advance(src.len(), self.remaining_mut());
|
||||
panic_advance(&TryGetError {
|
||||
requested: src.len(),
|
||||
available: self.remaining_mut(),
|
||||
});
|
||||
}
|
||||
|
||||
while !src.is_empty() {
|
||||
@@ -285,7 +291,10 @@ pub unsafe trait BufMut {
|
||||
#[inline]
|
||||
fn put_bytes(&mut self, val: u8, mut cnt: usize) {
|
||||
if self.remaining_mut() < cnt {
|
||||
panic_advance(cnt, self.remaining_mut());
|
||||
panic_advance(&TryGetError {
|
||||
requested: cnt,
|
||||
available: self.remaining_mut(),
|
||||
})
|
||||
}
|
||||
|
||||
while cnt > 0 {
|
||||
@@ -1107,7 +1116,7 @@ pub unsafe trait BufMut {
|
||||
}
|
||||
}
|
||||
|
||||
/// Writes an IEEE754 single-precision (4 bytes) floating point number to
|
||||
/// Writes an IEEE754 single-precision (4 bytes) floating point number to
|
||||
/// `self` in big-endian byte order.
|
||||
///
|
||||
/// The current position is advanced by 4.
|
||||
@@ -1131,7 +1140,7 @@ pub unsafe trait BufMut {
|
||||
self.put_u32(n.to_bits());
|
||||
}
|
||||
|
||||
/// Writes an IEEE754 single-precision (4 bytes) floating point number to
|
||||
/// Writes an IEEE754 single-precision (4 bytes) floating point number to
|
||||
/// `self` in little-endian byte order.
|
||||
///
|
||||
/// The current position is advanced by 4.
|
||||
@@ -1183,7 +1192,7 @@ pub unsafe trait BufMut {
|
||||
self.put_u32_ne(n.to_bits());
|
||||
}
|
||||
|
||||
/// Writes an IEEE754 double-precision (8 bytes) floating point number to
|
||||
/// Writes an IEEE754 double-precision (8 bytes) floating point number to
|
||||
/// `self` in big-endian byte order.
|
||||
///
|
||||
/// The current position is advanced by 8.
|
||||
@@ -1207,7 +1216,7 @@ pub unsafe trait BufMut {
|
||||
self.put_u64(n.to_bits());
|
||||
}
|
||||
|
||||
/// Writes an IEEE754 double-precision (8 bytes) floating point number to
|
||||
/// Writes an IEEE754 double-precision (8 bytes) floating point number to
|
||||
/// `self` in little-endian byte order.
|
||||
///
|
||||
/// The current position is advanced by 8.
|
||||
@@ -1231,7 +1240,7 @@ pub unsafe trait BufMut {
|
||||
self.put_u64_le(n.to_bits());
|
||||
}
|
||||
|
||||
/// Writes an IEEE754 double-precision (8 bytes) floating point number to
|
||||
/// Writes an IEEE754 double-precision (8 bytes) floating point number to
|
||||
/// `self` in native-endian byte order.
|
||||
///
|
||||
/// The current position is advanced by 8.
|
||||
@@ -1487,7 +1496,10 @@ unsafe impl BufMut for &mut [u8] {
|
||||
#[inline]
|
||||
unsafe fn advance_mut(&mut self, cnt: usize) {
|
||||
if self.len() < cnt {
|
||||
panic_advance(cnt, self.len());
|
||||
panic_advance(&TryGetError {
|
||||
requested: cnt,
|
||||
available: self.len(),
|
||||
});
|
||||
}
|
||||
|
||||
// Lifetime dance taken from `impl Write for &mut [u8]`.
|
||||
@@ -1498,7 +1510,10 @@ unsafe impl BufMut for &mut [u8] {
|
||||
#[inline]
|
||||
fn put_slice(&mut self, src: &[u8]) {
|
||||
if self.len() < src.len() {
|
||||
panic_advance(src.len(), self.len());
|
||||
panic_advance(&TryGetError {
|
||||
requested: src.len(),
|
||||
available: self.len(),
|
||||
});
|
||||
}
|
||||
|
||||
self[..src.len()].copy_from_slice(src);
|
||||
@@ -1509,7 +1524,10 @@ unsafe impl BufMut for &mut [u8] {
|
||||
#[inline]
|
||||
fn put_bytes(&mut self, val: u8, cnt: usize) {
|
||||
if self.len() < cnt {
|
||||
panic_advance(cnt, self.len());
|
||||
panic_advance(&TryGetError {
|
||||
requested: cnt,
|
||||
available: self.len(),
|
||||
});
|
||||
}
|
||||
|
||||
// SAFETY: We just checked that the pointer is valid for `cnt` bytes.
|
||||
@@ -1534,7 +1552,10 @@ unsafe impl BufMut for &mut [core::mem::MaybeUninit<u8>] {
|
||||
#[inline]
|
||||
unsafe fn advance_mut(&mut self, cnt: usize) {
|
||||
if self.len() < cnt {
|
||||
panic_advance(cnt, self.len());
|
||||
panic_advance(&TryGetError {
|
||||
requested: cnt,
|
||||
available: self.len(),
|
||||
});
|
||||
}
|
||||
|
||||
// Lifetime dance taken from `impl Write for &mut [u8]`.
|
||||
@@ -1545,7 +1566,10 @@ unsafe impl BufMut for &mut [core::mem::MaybeUninit<u8>] {
|
||||
#[inline]
|
||||
fn put_slice(&mut self, src: &[u8]) {
|
||||
if self.len() < src.len() {
|
||||
panic_advance(src.len(), self.len());
|
||||
panic_advance(&TryGetError {
|
||||
requested: src.len(),
|
||||
available: self.len(),
|
||||
});
|
||||
}
|
||||
|
||||
// SAFETY: We just checked that the pointer is valid for `src.len()` bytes.
|
||||
@@ -1558,7 +1582,10 @@ unsafe impl BufMut for &mut [core::mem::MaybeUninit<u8>] {
|
||||
#[inline]
|
||||
fn put_bytes(&mut self, val: u8, cnt: usize) {
|
||||
if self.len() < cnt {
|
||||
panic_advance(cnt, self.len());
|
||||
panic_advance(&TryGetError {
|
||||
requested: cnt,
|
||||
available: self.len(),
|
||||
});
|
||||
}
|
||||
|
||||
// SAFETY: We just checked that the pointer is valid for `cnt` bytes.
|
||||
@@ -1582,7 +1609,10 @@ unsafe impl BufMut for Vec<u8> {
|
||||
let remaining = self.capacity() - len;
|
||||
|
||||
if remaining < cnt {
|
||||
panic_advance(cnt, remaining);
|
||||
panic_advance(&TryGetError {
|
||||
requested: cnt,
|
||||
available: remaining,
|
||||
});
|
||||
}
|
||||
|
||||
// Addition will not overflow since the sum is at most the capacity.
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
use crate::buf::{IntoIter, UninitSlice};
|
||||
use crate::{Buf, BufMut, Bytes};
|
||||
use crate::{Buf, BufMut};
|
||||
|
||||
#[cfg(feature = "std")]
|
||||
use std::io::IoSlice;
|
||||
@@ -169,7 +169,7 @@ where
|
||||
n
|
||||
}
|
||||
|
||||
fn copy_to_bytes(&mut self, len: usize) -> Bytes {
|
||||
fn copy_to_bytes(&mut self, len: usize) -> crate::Bytes {
|
||||
let a_rem = self.a.remaining();
|
||||
if a_rem >= len {
|
||||
self.a.copy_to_bytes(len)
|
||||
|
||||
+51
-2
@@ -1,7 +1,10 @@
|
||||
use crate::{Buf, Bytes};
|
||||
use crate::Buf;
|
||||
|
||||
use core::cmp;
|
||||
|
||||
#[cfg(feature = "std")]
|
||||
use std::io::IoSlice;
|
||||
|
||||
/// A `Buf` adapter which limits the bytes read from an underlying buffer.
|
||||
///
|
||||
/// This struct is generally created by calling `take()` on `Buf`. See
|
||||
@@ -145,11 +148,57 @@ impl<T: Buf> Buf for Take<T> {
|
||||
self.limit -= cnt;
|
||||
}
|
||||
|
||||
fn copy_to_bytes(&mut self, len: usize) -> Bytes {
|
||||
fn copy_to_bytes(&mut self, len: usize) -> crate::Bytes {
|
||||
assert!(len <= self.remaining(), "`len` greater than remaining");
|
||||
|
||||
let r = self.inner.copy_to_bytes(len);
|
||||
self.limit -= len;
|
||||
r
|
||||
}
|
||||
|
||||
#[cfg(feature = "std")]
|
||||
fn chunks_vectored<'a>(&'a self, dst: &mut [IoSlice<'a>]) -> usize {
|
||||
if self.limit == 0 {
|
||||
return 0;
|
||||
}
|
||||
|
||||
const LEN: usize = 16;
|
||||
let mut slices: [IoSlice<'a>; LEN] = [
|
||||
IoSlice::new(&[]),
|
||||
IoSlice::new(&[]),
|
||||
IoSlice::new(&[]),
|
||||
IoSlice::new(&[]),
|
||||
IoSlice::new(&[]),
|
||||
IoSlice::new(&[]),
|
||||
IoSlice::new(&[]),
|
||||
IoSlice::new(&[]),
|
||||
IoSlice::new(&[]),
|
||||
IoSlice::new(&[]),
|
||||
IoSlice::new(&[]),
|
||||
IoSlice::new(&[]),
|
||||
IoSlice::new(&[]),
|
||||
IoSlice::new(&[]),
|
||||
IoSlice::new(&[]),
|
||||
IoSlice::new(&[]),
|
||||
];
|
||||
|
||||
let cnt = self
|
||||
.inner
|
||||
.chunks_vectored(&mut slices[..dst.len().min(LEN)]);
|
||||
let mut limit = self.limit;
|
||||
for (i, (dst, slice)) in dst[..cnt].iter_mut().zip(slices.iter()).enumerate() {
|
||||
if let Some(buf) = slice.get(..limit) {
|
||||
// SAFETY: We could do this safely with `IoSlice::advance` if we had a larger MSRV.
|
||||
let buf = unsafe { std::mem::transmute::<&[u8], &'a [u8]>(buf) };
|
||||
*dst = IoSlice::new(buf);
|
||||
return i + 1;
|
||||
} else {
|
||||
// SAFETY: We could do this safely with `IoSlice::advance` if we had a larger MSRV.
|
||||
let buf = unsafe { std::mem::transmute::<&[u8], &'a [u8]>(slice) };
|
||||
*dst = IoSlice::new(buf);
|
||||
limit -= slice.len();
|
||||
}
|
||||
}
|
||||
cnt
|
||||
}
|
||||
}
|
||||
|
||||
@@ -110,7 +110,7 @@ impl UninitSlice {
|
||||
unsafe { self[index..].as_mut_ptr().write(byte) }
|
||||
}
|
||||
|
||||
/// Copies bytes from `src` into `self`.
|
||||
/// Copies bytes from `src` into `self`.
|
||||
///
|
||||
/// The length of `src` must be the same as `self`.
|
||||
///
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
use alloc::collections::VecDeque;
|
||||
#[cfg(feature = "std")]
|
||||
use std::io;
|
||||
|
||||
use super::Buf;
|
||||
|
||||
@@ -16,6 +18,22 @@ impl Buf for VecDeque<u8> {
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(feature = "std")]
|
||||
fn chunks_vectored<'a>(&'a self, dst: &mut [io::IoSlice<'a>]) -> usize {
|
||||
if self.is_empty() || dst.is_empty() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
let (s1, s2) = self.as_slices();
|
||||
dst[0] = io::IoSlice::new(s1);
|
||||
if s2.is_empty() || dst.len() == 1 {
|
||||
return 1;
|
||||
}
|
||||
|
||||
dst[1] = io::IoSlice::new(s2);
|
||||
2
|
||||
}
|
||||
|
||||
fn advance(&mut self, cnt: usize) {
|
||||
self.drain(..cnt);
|
||||
}
|
||||
|
||||
+1
-1
@@ -78,7 +78,7 @@ impl<B: BufMut + Sized> io::Write for Writer<B> {
|
||||
fn write(&mut self, src: &[u8]) -> io::Result<usize> {
|
||||
let n = cmp::min(self.buf.remaining_mut(), src.len());
|
||||
|
||||
self.buf.put(&src[0..n]);
|
||||
self.buf.put_slice(&src[..n]);
|
||||
Ok(n)
|
||||
}
|
||||
|
||||
|
||||
+370
-41
@@ -1,6 +1,8 @@
|
||||
use core::iter::FromIterator;
|
||||
use core::mem::{self, ManuallyDrop};
|
||||
use core::ops::{Deref, RangeBounds};
|
||||
use core::{cmp, fmt, hash, mem, ptr, slice, usize};
|
||||
use core::ptr::NonNull;
|
||||
use core::{cmp, fmt, hash, ptr, slice, usize};
|
||||
|
||||
use alloc::{
|
||||
alloc::{dealloc, Layout},
|
||||
@@ -14,7 +16,7 @@ use crate::buf::IntoIter;
|
||||
#[allow(unused)]
|
||||
use crate::loom::sync::atomic::AtomicMut;
|
||||
use crate::loom::sync::atomic::{AtomicPtr, AtomicUsize, Ordering};
|
||||
use crate::Buf;
|
||||
use crate::{offset_from, Buf, BytesMut};
|
||||
|
||||
/// A cheaply cloneable and sliceable chunk of contiguous memory.
|
||||
///
|
||||
@@ -112,6 +114,7 @@ pub(crate) struct Vtable {
|
||||
///
|
||||
/// takes `Bytes` to value
|
||||
pub to_vec: unsafe fn(&AtomicPtr<()>, *const u8, usize) -> Vec<u8>,
|
||||
pub to_mut: unsafe fn(&AtomicPtr<()>, *const u8, usize) -> BytesMut,
|
||||
/// fn(data)
|
||||
pub is_unique: unsafe fn(&AtomicPtr<()>) -> bool,
|
||||
/// fn(data, ptr, len)
|
||||
@@ -140,6 +143,7 @@ impl Bytes {
|
||||
Bytes::from_static(EMPTY)
|
||||
}
|
||||
|
||||
/// Creates a new empty `Bytes`.
|
||||
#[cfg(all(loom, test))]
|
||||
pub fn new() -> Self {
|
||||
const EMPTY: &[u8] = &[];
|
||||
@@ -170,6 +174,7 @@ impl Bytes {
|
||||
}
|
||||
}
|
||||
|
||||
/// Creates a new `Bytes` from a static slice.
|
||||
#[cfg(all(loom, test))]
|
||||
pub fn from_static(bytes: &'static [u8]) -> Self {
|
||||
Bytes {
|
||||
@@ -180,6 +185,110 @@ impl Bytes {
|
||||
}
|
||||
}
|
||||
|
||||
/// Creates a new `Bytes` with length zero and the given pointer as the address.
|
||||
fn new_empty_with_ptr(ptr: *const u8) -> Self {
|
||||
debug_assert!(!ptr.is_null());
|
||||
|
||||
// Detach this pointer's provenance from whichever allocation it came from, and reattach it
|
||||
// to the provenance of the fake ZST [u8;0] at the same address.
|
||||
let ptr = without_provenance(ptr as usize);
|
||||
|
||||
Bytes {
|
||||
ptr,
|
||||
len: 0,
|
||||
data: AtomicPtr::new(ptr::null_mut()),
|
||||
vtable: &STATIC_VTABLE,
|
||||
}
|
||||
}
|
||||
|
||||
/// Create [Bytes] with a buffer whose lifetime is controlled
|
||||
/// via an explicit owner.
|
||||
///
|
||||
/// A common use case is to zero-copy construct from mapped memory.
|
||||
///
|
||||
/// ```
|
||||
/// # struct File;
|
||||
/// #
|
||||
/// # impl File {
|
||||
/// # pub fn open(_: &str) -> Result<Self, ()> {
|
||||
/// # Ok(Self)
|
||||
/// # }
|
||||
/// # }
|
||||
/// #
|
||||
/// # mod memmap2 {
|
||||
/// # pub struct Mmap;
|
||||
/// #
|
||||
/// # impl Mmap {
|
||||
/// # pub unsafe fn map(_file: &super::File) -> Result<Self, ()> {
|
||||
/// # Ok(Self)
|
||||
/// # }
|
||||
/// # }
|
||||
/// #
|
||||
/// # impl AsRef<[u8]> for Mmap {
|
||||
/// # fn as_ref(&self) -> &[u8] {
|
||||
/// # b"buf"
|
||||
/// # }
|
||||
/// # }
|
||||
/// # }
|
||||
/// use bytes::Bytes;
|
||||
/// use memmap2::Mmap;
|
||||
///
|
||||
/// # fn main() -> Result<(), ()> {
|
||||
/// let file = File::open("upload_bundle.tar.gz")?;
|
||||
/// let mmap = unsafe { Mmap::map(&file) }?;
|
||||
/// let b = Bytes::from_owner(mmap);
|
||||
/// # Ok(())
|
||||
/// # }
|
||||
/// ```
|
||||
///
|
||||
/// The `owner` will be transferred to the constructed [Bytes] object, which
|
||||
/// will ensure it is dropped once all remaining clones of the constructed
|
||||
/// object are dropped. The owner will then be responsible for dropping the
|
||||
/// specified region of memory as part of its [Drop] implementation.
|
||||
///
|
||||
/// Note that converting [Bytes] constructed from an owner into a [BytesMut]
|
||||
/// will always create a deep copy of the buffer into newly allocated memory.
|
||||
pub fn from_owner<T>(owner: T) -> Self
|
||||
where
|
||||
T: AsRef<[u8]> + Send + 'static,
|
||||
{
|
||||
// Safety & Miri:
|
||||
// The ownership of `owner` is first transferred to the `Owned` wrapper and `Bytes` object.
|
||||
// This ensures that the owner is pinned in memory, allowing us to call `.as_ref()` safely
|
||||
// since the lifetime of the owner is controlled by the lifetime of the new `Bytes` object,
|
||||
// and the lifetime of the resulting borrowed `&[u8]` matches that of the owner.
|
||||
// Note that this remains safe so long as we only call `.as_ref()` once.
|
||||
//
|
||||
// There are some additional special considerations here:
|
||||
// * We rely on Bytes's Drop impl to clean up memory should `.as_ref()` panic.
|
||||
// * Setting the `ptr` and `len` on the bytes object last (after moving the owner to
|
||||
// Bytes) allows Miri checks to pass since it avoids obtaining the `&[u8]` slice
|
||||
// from a stack-owned Box.
|
||||
// More details on this: https://github.com/tokio-rs/bytes/pull/742/#discussion_r1813375863
|
||||
// and: https://github.com/tokio-rs/bytes/pull/742/#discussion_r1813316032
|
||||
|
||||
let owned = Box::into_raw(Box::new(Owned {
|
||||
lifetime: OwnedLifetime {
|
||||
ref_cnt: AtomicUsize::new(1),
|
||||
drop: owned_box_and_drop::<T>,
|
||||
},
|
||||
owner,
|
||||
}));
|
||||
|
||||
let mut ret = Bytes {
|
||||
ptr: NonNull::dangling().as_ptr(),
|
||||
len: 0,
|
||||
data: AtomicPtr::new(owned.cast()),
|
||||
vtable: &OWNED_VTABLE,
|
||||
};
|
||||
|
||||
let buf = unsafe { &*owned }.owner.as_ref();
|
||||
ret.ptr = buf.as_ptr();
|
||||
ret.len = buf.len();
|
||||
|
||||
ret
|
||||
}
|
||||
|
||||
/// Returns the number of bytes contained in this `Bytes`.
|
||||
///
|
||||
/// # Examples
|
||||
@@ -210,14 +319,16 @@ impl Bytes {
|
||||
self.len == 0
|
||||
}
|
||||
|
||||
/// Returns true if this is the only reference to the data.
|
||||
/// Returns true if this is the only reference to the data and
|
||||
/// `Into<BytesMut>` would avoid cloning the underlying buffer.
|
||||
///
|
||||
/// Always returns false if the data is backed by a static slice.
|
||||
/// Always returns false if the data is backed by a [static slice](Bytes::from_static),
|
||||
/// or an [owner](Bytes::from_owner).
|
||||
///
|
||||
/// The result of this method may be invalidated immediately if another
|
||||
/// thread clones this value while this is being called. Ensure you have
|
||||
/// unique access to this value (`&mut Bytes`) first if you need to be
|
||||
/// certain the result is valid (i.e. for safety reasons)
|
||||
/// certain the result is valid (i.e. for safety reasons).
|
||||
/// # Examples
|
||||
///
|
||||
/// ```
|
||||
@@ -362,7 +473,9 @@ impl Bytes {
|
||||
/// Splits the bytes into two at the given index.
|
||||
///
|
||||
/// Afterwards `self` contains elements `[0, at)`, and the returned `Bytes`
|
||||
/// contains elements `[at, len)`.
|
||||
/// contains elements `[at, len)`. It's guaranteed that the memory does not
|
||||
/// move, that is, the address of `self` does not change, and the address of
|
||||
/// the returned slice is `at` bytes after that.
|
||||
///
|
||||
/// This is an `O(1)` operation that just increases the reference count and
|
||||
/// sets a few indices.
|
||||
@@ -384,6 +497,14 @@ impl Bytes {
|
||||
/// Panics if `at > len`.
|
||||
#[must_use = "consider Bytes::truncate if you don't need the other half"]
|
||||
pub fn split_off(&mut self, at: usize) -> Self {
|
||||
if at == self.len() {
|
||||
return Bytes::new_empty_with_ptr(self.ptr.wrapping_add(at));
|
||||
}
|
||||
|
||||
if at == 0 {
|
||||
return mem::replace(self, Bytes::new_empty_with_ptr(self.ptr));
|
||||
}
|
||||
|
||||
assert!(
|
||||
at <= self.len(),
|
||||
"split_off out of bounds: {:?} <= {:?}",
|
||||
@@ -391,14 +512,6 @@ impl Bytes {
|
||||
self.len(),
|
||||
);
|
||||
|
||||
if at == self.len() {
|
||||
return Bytes::new();
|
||||
}
|
||||
|
||||
if at == 0 {
|
||||
return mem::replace(self, Bytes::new());
|
||||
}
|
||||
|
||||
let mut ret = self.clone();
|
||||
|
||||
self.len = at;
|
||||
@@ -433,6 +546,15 @@ impl Bytes {
|
||||
/// Panics if `at > len`.
|
||||
#[must_use = "consider Bytes::advance if you don't need the other half"]
|
||||
pub fn split_to(&mut self, at: usize) -> Self {
|
||||
if at == self.len() {
|
||||
let end_ptr = self.ptr.wrapping_add(at);
|
||||
return mem::replace(self, Bytes::new_empty_with_ptr(end_ptr));
|
||||
}
|
||||
|
||||
if at == 0 {
|
||||
return Bytes::new_empty_with_ptr(self.ptr);
|
||||
}
|
||||
|
||||
assert!(
|
||||
at <= self.len(),
|
||||
"split_to out of bounds: {:?} <= {:?}",
|
||||
@@ -440,14 +562,6 @@ impl Bytes {
|
||||
self.len(),
|
||||
);
|
||||
|
||||
if at == self.len() {
|
||||
return mem::replace(self, Bytes::new());
|
||||
}
|
||||
|
||||
if at == 0 {
|
||||
return Bytes::new();
|
||||
}
|
||||
|
||||
let mut ret = self.clone();
|
||||
|
||||
unsafe { self.inc_start(at) };
|
||||
@@ -506,6 +620,32 @@ impl Bytes {
|
||||
self.truncate(0);
|
||||
}
|
||||
|
||||
/// Try to convert self into `BytesMut`.
|
||||
///
|
||||
/// If `self` is unique for the entire original buffer, this will succeed
|
||||
/// and return a `BytesMut` with the contents of `self` without copying.
|
||||
/// If `self` is not unique for the entire original buffer, this will fail
|
||||
/// and return self.
|
||||
///
|
||||
/// This will also always fail if the buffer was constructed via either
|
||||
/// [from_owner](Bytes::from_owner) or [from_static](Bytes::from_static).
|
||||
///
|
||||
/// # Examples
|
||||
///
|
||||
/// ```
|
||||
/// use bytes::{Bytes, BytesMut};
|
||||
///
|
||||
/// let bytes = Bytes::from(b"hello".to_vec());
|
||||
/// assert_eq!(bytes.try_into_mut(), Ok(BytesMut::from(&b"hello"[..])));
|
||||
/// ```
|
||||
pub fn try_into_mut(self) -> Result<BytesMut, Bytes> {
|
||||
if self.is_unique() {
|
||||
Ok(self.into())
|
||||
} else {
|
||||
Err(self)
|
||||
}
|
||||
}
|
||||
|
||||
#[inline]
|
||||
pub(crate) unsafe fn with_vtable(
|
||||
ptr: *const u8,
|
||||
@@ -581,13 +721,7 @@ impl Buf for Bytes {
|
||||
}
|
||||
|
||||
fn copy_to_bytes(&mut self, len: usize) -> Self {
|
||||
if len == self.remaining() {
|
||||
core::mem::replace(self, Bytes::new())
|
||||
} else {
|
||||
let ret = self.slice(..len);
|
||||
self.advance(len);
|
||||
ret
|
||||
}
|
||||
self.split_to(len)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -828,13 +962,15 @@ impl From<&'static str> for Bytes {
|
||||
}
|
||||
|
||||
impl From<Vec<u8>> for Bytes {
|
||||
fn from(mut vec: Vec<u8>) -> Bytes {
|
||||
fn from(vec: Vec<u8>) -> Bytes {
|
||||
let mut vec = ManuallyDrop::new(vec);
|
||||
let ptr = vec.as_mut_ptr();
|
||||
let len = vec.len();
|
||||
let cap = vec.capacity();
|
||||
|
||||
// Avoid an extra allocation if possible.
|
||||
if len == cap {
|
||||
let vec = ManuallyDrop::into_inner(vec);
|
||||
return Bytes::from(vec.into_boxed_slice());
|
||||
}
|
||||
|
||||
@@ -843,7 +979,6 @@ impl From<Vec<u8>> for Bytes {
|
||||
cap,
|
||||
ref_cnt: AtomicUsize::new(1),
|
||||
});
|
||||
mem::forget(vec);
|
||||
|
||||
let shared = Box::into_raw(shared);
|
||||
// The pointer should be aligned, so this assert should
|
||||
@@ -892,6 +1027,28 @@ impl From<Box<[u8]>> for Bytes {
|
||||
}
|
||||
}
|
||||
|
||||
impl From<Bytes> for BytesMut {
|
||||
/// Convert self into `BytesMut`.
|
||||
///
|
||||
/// If `bytes` is unique for the entire original buffer, this will return a
|
||||
/// `BytesMut` with the contents of `bytes` without copying.
|
||||
/// If `bytes` is not unique for the entire original buffer, this will make
|
||||
/// a copy of `bytes` subset of the original buffer in a new `BytesMut`.
|
||||
///
|
||||
/// # Examples
|
||||
///
|
||||
/// ```
|
||||
/// use bytes::{Bytes, BytesMut};
|
||||
///
|
||||
/// let bytes = Bytes::from(b"hello".to_vec());
|
||||
/// assert_eq!(BytesMut::from(bytes), BytesMut::from(&b"hello"[..]));
|
||||
/// ```
|
||||
fn from(bytes: Bytes) -> Self {
|
||||
let bytes = ManuallyDrop::new(bytes);
|
||||
unsafe { (bytes.vtable.to_mut)(&bytes.data, bytes.ptr, bytes.len) }
|
||||
}
|
||||
}
|
||||
|
||||
impl From<String> for Bytes {
|
||||
fn from(s: String) -> Bytes {
|
||||
Bytes::from(s.into_bytes())
|
||||
@@ -900,7 +1057,7 @@ impl From<String> for Bytes {
|
||||
|
||||
impl From<Bytes> for Vec<u8> {
|
||||
fn from(bytes: Bytes) -> Vec<u8> {
|
||||
let bytes = mem::ManuallyDrop::new(bytes);
|
||||
let bytes = ManuallyDrop::new(bytes);
|
||||
unsafe { (bytes.vtable.to_vec)(&bytes.data, bytes.ptr, bytes.len) }
|
||||
}
|
||||
}
|
||||
@@ -921,6 +1078,7 @@ impl fmt::Debug for Vtable {
|
||||
const STATIC_VTABLE: Vtable = Vtable {
|
||||
clone: static_clone,
|
||||
to_vec: static_to_vec,
|
||||
to_mut: static_to_mut,
|
||||
is_unique: static_is_unique,
|
||||
drop: static_drop,
|
||||
};
|
||||
@@ -935,6 +1093,11 @@ unsafe fn static_to_vec(_: &AtomicPtr<()>, ptr: *const u8, len: usize) -> Vec<u8
|
||||
slice.to_vec()
|
||||
}
|
||||
|
||||
unsafe fn static_to_mut(_: &AtomicPtr<()>, ptr: *const u8, len: usize) -> BytesMut {
|
||||
let slice = slice::from_raw_parts(ptr, len);
|
||||
BytesMut::from(slice)
|
||||
}
|
||||
|
||||
fn static_is_unique(_: &AtomicPtr<()>) -> bool {
|
||||
false
|
||||
}
|
||||
@@ -943,11 +1106,93 @@ unsafe fn static_drop(_: &mut AtomicPtr<()>, _: *const u8, _: usize) {
|
||||
// nothing to drop for &'static [u8]
|
||||
}
|
||||
|
||||
// ===== impl OwnedVtable =====
|
||||
|
||||
#[repr(C)]
|
||||
struct OwnedLifetime {
|
||||
ref_cnt: AtomicUsize,
|
||||
drop: unsafe fn(*mut ()),
|
||||
}
|
||||
|
||||
#[repr(C)]
|
||||
struct Owned<T> {
|
||||
lifetime: OwnedLifetime,
|
||||
owner: T,
|
||||
}
|
||||
|
||||
unsafe fn owned_box_and_drop<T>(ptr: *mut ()) {
|
||||
let b: Box<Owned<T>> = Box::from_raw(ptr as _);
|
||||
drop(b);
|
||||
}
|
||||
|
||||
unsafe fn owned_clone(data: &AtomicPtr<()>, ptr: *const u8, len: usize) -> Bytes {
|
||||
let owned = data.load(Ordering::Relaxed);
|
||||
let ref_cnt = &(*owned.cast::<OwnedLifetime>()).ref_cnt;
|
||||
let old_cnt = ref_cnt.fetch_add(1, Ordering::Relaxed);
|
||||
if old_cnt > usize::MAX >> 1 {
|
||||
crate::abort()
|
||||
}
|
||||
|
||||
Bytes {
|
||||
ptr,
|
||||
len,
|
||||
data: AtomicPtr::new(owned as _),
|
||||
vtable: &OWNED_VTABLE,
|
||||
}
|
||||
}
|
||||
|
||||
unsafe fn owned_to_vec(data: &AtomicPtr<()>, ptr: *const u8, len: usize) -> Vec<u8> {
|
||||
let slice = slice::from_raw_parts(ptr, len);
|
||||
let vec = slice.to_vec();
|
||||
owned_drop_impl(data.load(Ordering::Relaxed));
|
||||
vec
|
||||
}
|
||||
|
||||
unsafe fn owned_to_mut(data: &AtomicPtr<()>, ptr: *const u8, len: usize) -> BytesMut {
|
||||
BytesMut::from_vec(owned_to_vec(data, ptr, len))
|
||||
}
|
||||
|
||||
unsafe fn owned_is_unique(_data: &AtomicPtr<()>) -> bool {
|
||||
false
|
||||
}
|
||||
|
||||
unsafe fn owned_drop_impl(owned: *mut ()) {
|
||||
let lifetime = owned.cast::<OwnedLifetime>();
|
||||
let ref_cnt = &(*lifetime).ref_cnt;
|
||||
|
||||
let old_cnt = ref_cnt.fetch_sub(1, Ordering::Release);
|
||||
debug_assert!(
|
||||
old_cnt > 0 && old_cnt <= usize::MAX >> 1,
|
||||
"expected non-zero refcount and no underflow"
|
||||
);
|
||||
if old_cnt != 1 {
|
||||
return;
|
||||
}
|
||||
ref_cnt.load(Ordering::Acquire);
|
||||
|
||||
let drop_fn = &(*lifetime).drop;
|
||||
drop_fn(owned)
|
||||
}
|
||||
|
||||
unsafe fn owned_drop(data: &mut AtomicPtr<()>, _ptr: *const u8, _len: usize) {
|
||||
let owned = data.load(Ordering::Relaxed);
|
||||
owned_drop_impl(owned);
|
||||
}
|
||||
|
||||
static OWNED_VTABLE: Vtable = Vtable {
|
||||
clone: owned_clone,
|
||||
to_vec: owned_to_vec,
|
||||
to_mut: owned_to_mut,
|
||||
is_unique: owned_is_unique,
|
||||
drop: owned_drop,
|
||||
};
|
||||
|
||||
// ===== impl PromotableVtable =====
|
||||
|
||||
static PROMOTABLE_EVEN_VTABLE: Vtable = Vtable {
|
||||
clone: promotable_even_clone,
|
||||
to_vec: promotable_even_to_vec,
|
||||
to_mut: promotable_even_to_mut,
|
||||
is_unique: promotable_is_unique,
|
||||
drop: promotable_even_drop,
|
||||
};
|
||||
@@ -955,6 +1200,7 @@ static PROMOTABLE_EVEN_VTABLE: Vtable = Vtable {
|
||||
static PROMOTABLE_ODD_VTABLE: Vtable = Vtable {
|
||||
clone: promotable_odd_clone,
|
||||
to_vec: promotable_odd_to_vec,
|
||||
to_mut: promotable_odd_to_mut,
|
||||
is_unique: promotable_is_unique,
|
||||
drop: promotable_odd_drop,
|
||||
};
|
||||
@@ -989,7 +1235,7 @@ unsafe fn promotable_to_vec(
|
||||
|
||||
let buf = f(shared);
|
||||
|
||||
let cap = (ptr as usize - buf as usize) + len;
|
||||
let cap = offset_from(ptr, buf) + len;
|
||||
|
||||
// Copy back buffer
|
||||
ptr::copy(ptr, buf, len);
|
||||
@@ -998,12 +1244,47 @@ unsafe fn promotable_to_vec(
|
||||
}
|
||||
}
|
||||
|
||||
unsafe fn promotable_to_mut(
|
||||
data: &AtomicPtr<()>,
|
||||
ptr: *const u8,
|
||||
len: usize,
|
||||
f: fn(*mut ()) -> *mut u8,
|
||||
) -> BytesMut {
|
||||
let shared = data.load(Ordering::Acquire);
|
||||
let kind = shared as usize & KIND_MASK;
|
||||
|
||||
if kind == KIND_ARC {
|
||||
shared_to_mut_impl(shared.cast(), ptr, len)
|
||||
} else {
|
||||
// KIND_VEC is a view of an underlying buffer at a certain offset.
|
||||
// The ptr + len always represents the end of that buffer.
|
||||
// Before truncating it, it is first promoted to KIND_ARC.
|
||||
// Thus, we can safely reconstruct a Vec from it without leaking memory.
|
||||
debug_assert_eq!(kind, KIND_VEC);
|
||||
|
||||
let buf = f(shared);
|
||||
let off = offset_from(ptr, buf);
|
||||
let cap = off + len;
|
||||
let v = Vec::from_raw_parts(buf, cap, cap);
|
||||
|
||||
let mut b = BytesMut::from_vec(v);
|
||||
b.advance_unchecked(off);
|
||||
b
|
||||
}
|
||||
}
|
||||
|
||||
unsafe fn promotable_even_to_vec(data: &AtomicPtr<()>, ptr: *const u8, len: usize) -> Vec<u8> {
|
||||
promotable_to_vec(data, ptr, len, |shared| {
|
||||
ptr_map(shared.cast(), |addr| addr & !KIND_MASK)
|
||||
})
|
||||
}
|
||||
|
||||
unsafe fn promotable_even_to_mut(data: &AtomicPtr<()>, ptr: *const u8, len: usize) -> BytesMut {
|
||||
promotable_to_mut(data, ptr, len, |shared| {
|
||||
ptr_map(shared.cast(), |addr| addr & !KIND_MASK)
|
||||
})
|
||||
}
|
||||
|
||||
unsafe fn promotable_even_drop(data: &mut AtomicPtr<()>, ptr: *const u8, len: usize) {
|
||||
data.with_mut(|shared| {
|
||||
let shared = *shared;
|
||||
@@ -1035,6 +1316,10 @@ unsafe fn promotable_odd_to_vec(data: &AtomicPtr<()>, ptr: *const u8, len: usize
|
||||
promotable_to_vec(data, ptr, len, |shared| shared.cast())
|
||||
}
|
||||
|
||||
unsafe fn promotable_odd_to_mut(data: &AtomicPtr<()>, ptr: *const u8, len: usize) -> BytesMut {
|
||||
promotable_to_mut(data, ptr, len, |shared| shared.cast())
|
||||
}
|
||||
|
||||
unsafe fn promotable_odd_drop(data: &mut AtomicPtr<()>, ptr: *const u8, len: usize) {
|
||||
data.with_mut(|shared| {
|
||||
let shared = *shared;
|
||||
@@ -1063,7 +1348,7 @@ unsafe fn promotable_is_unique(data: &AtomicPtr<()>) -> bool {
|
||||
}
|
||||
|
||||
unsafe fn free_boxed_slice(buf: *mut u8, offset: *const u8, len: usize) {
|
||||
let cap = (offset as usize - buf as usize) + len;
|
||||
let cap = offset_from(offset, buf) + len;
|
||||
dealloc(buf, Layout::from_size_align(cap, 1).unwrap())
|
||||
}
|
||||
|
||||
@@ -1091,6 +1376,7 @@ const _: [(); 0 - mem::align_of::<Shared>() % 2] = []; // Assert that the alignm
|
||||
static SHARED_VTABLE: Vtable = Vtable {
|
||||
clone: shared_clone,
|
||||
to_vec: shared_to_vec,
|
||||
to_mut: shared_to_mut,
|
||||
is_unique: shared_is_unique,
|
||||
drop: shared_drop,
|
||||
};
|
||||
@@ -1116,11 +1402,11 @@ unsafe fn shared_to_vec_impl(shared: *mut Shared, ptr: *const u8, len: usize) ->
|
||||
.compare_exchange(1, 0, Ordering::AcqRel, Ordering::Relaxed)
|
||||
.is_ok()
|
||||
{
|
||||
let buf = (*shared).buf;
|
||||
let cap = (*shared).cap;
|
||||
|
||||
// Deallocate Shared
|
||||
drop(Box::from_raw(shared as *mut mem::ManuallyDrop<Shared>));
|
||||
// Deallocate the `Shared` instance without running its destructor.
|
||||
let shared = *Box::from_raw(shared);
|
||||
let shared = ManuallyDrop::new(shared);
|
||||
let buf = shared.buf;
|
||||
let cap = shared.cap;
|
||||
|
||||
// Copy back buffer
|
||||
ptr::copy(ptr, buf, len);
|
||||
@@ -1137,6 +1423,45 @@ unsafe fn shared_to_vec(data: &AtomicPtr<()>, ptr: *const u8, len: usize) -> Vec
|
||||
shared_to_vec_impl(data.load(Ordering::Relaxed).cast(), ptr, len)
|
||||
}
|
||||
|
||||
unsafe fn shared_to_mut_impl(shared: *mut Shared, ptr: *const u8, len: usize) -> BytesMut {
|
||||
// The goal is to check if the current handle is the only handle
|
||||
// that currently has access to the buffer. This is done by
|
||||
// checking if the `ref_cnt` is currently 1.
|
||||
//
|
||||
// The `Acquire` ordering synchronizes with the `Release` as
|
||||
// part of the `fetch_sub` in `release_shared`. The `fetch_sub`
|
||||
// operation guarantees that any mutations done in other threads
|
||||
// are ordered before the `ref_cnt` is decremented. As such,
|
||||
// this `Acquire` will guarantee that those mutations are
|
||||
// visible to the current thread.
|
||||
//
|
||||
// Otherwise, we take the other branch, copy the data and call `release_shared`.
|
||||
if (*shared).ref_cnt.load(Ordering::Acquire) == 1 {
|
||||
// Deallocate the `Shared` instance without running its destructor.
|
||||
let shared = *Box::from_raw(shared);
|
||||
let shared = ManuallyDrop::new(shared);
|
||||
let buf = shared.buf;
|
||||
let cap = shared.cap;
|
||||
|
||||
// Rebuild Vec
|
||||
let off = offset_from(ptr, buf);
|
||||
let v = Vec::from_raw_parts(buf, len + off, cap);
|
||||
|
||||
let mut b = BytesMut::from_vec(v);
|
||||
b.advance_unchecked(off);
|
||||
b
|
||||
} else {
|
||||
// Copy the data from Shared in a new Vec, then release it
|
||||
let v = slice::from_raw_parts(ptr, len).to_vec();
|
||||
release_shared(shared);
|
||||
BytesMut::from_vec(v)
|
||||
}
|
||||
}
|
||||
|
||||
unsafe fn shared_to_mut(data: &AtomicPtr<()>, ptr: *const u8, len: usize) -> BytesMut {
|
||||
shared_to_mut_impl(data.load(Ordering::Relaxed).cast(), ptr, len)
|
||||
}
|
||||
|
||||
pub(crate) unsafe fn shared_is_unique(data: &AtomicPtr<()>) -> bool {
|
||||
let shared = data.load(Ordering::Acquire);
|
||||
let ref_cnt = (*shared.cast::<Shared>()).ref_cnt.load(Ordering::Relaxed);
|
||||
@@ -1172,7 +1497,7 @@ unsafe fn shallow_clone_vec(
|
||||
offset: *const u8,
|
||||
len: usize,
|
||||
) -> Bytes {
|
||||
// If the buffer is still tracked in a `Vec<u8>`. It is time to
|
||||
// If the buffer is still tracked in a `Vec<u8>`. It is time to
|
||||
// promote the vec to an `Arc`. This could potentially be called
|
||||
// concurrently, so some care must be taken.
|
||||
|
||||
@@ -1185,7 +1510,7 @@ unsafe fn shallow_clone_vec(
|
||||
// vector.
|
||||
let shared = Box::new(Shared {
|
||||
buf,
|
||||
cap: (offset as usize - buf as usize) + len,
|
||||
cap: offset_from(offset, buf) + len,
|
||||
// Initialize refcount to 2. One for this reference, and one
|
||||
// for the new clone that will be returned from
|
||||
// `shallow_clone`.
|
||||
@@ -1295,6 +1620,10 @@ where
|
||||
new_addr as *mut u8
|
||||
}
|
||||
|
||||
fn without_provenance(ptr: usize) -> *const u8 {
|
||||
core::ptr::null::<u8>().wrapping_add(ptr)
|
||||
}
|
||||
|
||||
// compile-fails
|
||||
|
||||
/// ```compile_fail
|
||||
|
||||
+161
-46
@@ -17,7 +17,7 @@ use crate::bytes::Vtable;
|
||||
#[allow(unused)]
|
||||
use crate::loom::sync::atomic::AtomicMut;
|
||||
use crate::loom::sync::atomic::{AtomicPtr, AtomicUsize, Ordering};
|
||||
use crate::{Buf, BufMut, Bytes};
|
||||
use crate::{offset_from, Buf, BufMut, Bytes, TryGetError};
|
||||
|
||||
/// A unique reference to a contiguous slice of memory.
|
||||
///
|
||||
@@ -264,7 +264,14 @@ impl BytesMut {
|
||||
}
|
||||
}
|
||||
|
||||
/// Creates a new `BytesMut`, which is initialized with zero.
|
||||
/// Creates a new `BytesMut` containing `len` zeros.
|
||||
///
|
||||
/// The resulting object has a length of `len` and a capacity greater
|
||||
/// than or equal to `len`. The entire length of the object will be filled
|
||||
/// with zeros.
|
||||
///
|
||||
/// On some platforms or allocators this function may be faster than
|
||||
/// a manual implementation.
|
||||
///
|
||||
/// # Examples
|
||||
///
|
||||
@@ -273,6 +280,7 @@ impl BytesMut {
|
||||
///
|
||||
/// let zeros = BytesMut::zeroed(42);
|
||||
///
|
||||
/// assert!(zeros.capacity() >= 42);
|
||||
/// assert_eq!(zeros.len(), 42);
|
||||
/// zeros.into_iter().for_each(|x| assert_eq!(x, 0));
|
||||
/// ```
|
||||
@@ -283,7 +291,9 @@ impl BytesMut {
|
||||
/// Splits the bytes into two at the given index.
|
||||
///
|
||||
/// Afterwards `self` contains elements `[0, at)`, and the returned
|
||||
/// `BytesMut` contains elements `[at, capacity)`.
|
||||
/// `BytesMut` contains elements `[at, capacity)`. It's guaranteed that the
|
||||
/// memory does not move, that is, the address of `self` does not change,
|
||||
/// and the address of the returned slice is `at` bytes after that.
|
||||
///
|
||||
/// This is an `O(1)` operation that just increases the reference count
|
||||
/// and sets a few indices.
|
||||
@@ -349,7 +359,7 @@ impl BytesMut {
|
||||
///
|
||||
/// assert_eq!(other, b"hello world"[..]);
|
||||
/// ```
|
||||
#[must_use = "consider BytesMut::advance(len()) if you don't need the other half"]
|
||||
#[must_use = "consider BytesMut::clear if you don't need the other half"]
|
||||
pub fn split(&mut self) -> BytesMut {
|
||||
let len = self.len();
|
||||
self.split_to(len)
|
||||
@@ -423,9 +433,8 @@ impl BytesMut {
|
||||
/// ```
|
||||
pub fn truncate(&mut self, len: usize) {
|
||||
if len <= self.len() {
|
||||
unsafe {
|
||||
self.set_len(len);
|
||||
}
|
||||
// SAFETY: Shrinking the buffer cannot expose uninitialized bytes.
|
||||
unsafe { self.set_len(len) };
|
||||
}
|
||||
}
|
||||
|
||||
@@ -441,7 +450,8 @@ impl BytesMut {
|
||||
/// assert!(buf.is_empty());
|
||||
/// ```
|
||||
pub fn clear(&mut self) {
|
||||
self.truncate(0);
|
||||
// SAFETY: Setting the length to zero cannot expose uninitialized bytes.
|
||||
unsafe { self.set_len(0) };
|
||||
}
|
||||
|
||||
/// Resizes the buffer so that `len` is equal to `new_len`.
|
||||
@@ -467,18 +477,26 @@ impl BytesMut {
|
||||
/// assert_eq!(&buf[..], &[0x1, 0x1, 0x3, 0x3]);
|
||||
/// ```
|
||||
pub fn resize(&mut self, new_len: usize, value: u8) {
|
||||
let len = self.len();
|
||||
if new_len > len {
|
||||
let additional = new_len - len;
|
||||
self.reserve(additional);
|
||||
unsafe {
|
||||
let dst = self.chunk_mut().as_mut_ptr();
|
||||
ptr::write_bytes(dst, value, additional);
|
||||
self.set_len(new_len);
|
||||
}
|
||||
let additional = if let Some(additional) = new_len.checked_sub(self.len()) {
|
||||
additional
|
||||
} else {
|
||||
self.truncate(new_len);
|
||||
return;
|
||||
};
|
||||
|
||||
if additional == 0 {
|
||||
return;
|
||||
}
|
||||
|
||||
self.reserve(additional);
|
||||
let dst = self.spare_capacity_mut().as_mut_ptr();
|
||||
// SAFETY: `spare_capacity_mut` returns a valid, properly aligned pointer and we've
|
||||
// reserved enough space to write `additional` bytes.
|
||||
unsafe { ptr::write_bytes(dst, value, additional) };
|
||||
|
||||
// SAFETY: There are at least `new_len` initialized bytes in the buffer so no
|
||||
// uninitialized bytes are being exposed.
|
||||
unsafe { self.set_len(new_len) };
|
||||
}
|
||||
|
||||
/// Sets the length of the buffer.
|
||||
@@ -581,12 +599,13 @@ impl BytesMut {
|
||||
return;
|
||||
}
|
||||
|
||||
self.reserve_inner(additional);
|
||||
// will always succeed
|
||||
let _ = self.reserve_inner(additional, true);
|
||||
}
|
||||
|
||||
// In separate function to allow the short-circuits in `reserve` to
|
||||
// be inline-able. Significant helps performance.
|
||||
fn reserve_inner(&mut self, additional: usize) {
|
||||
// In separate function to allow the short-circuits in `reserve` and `try_reclaim` to
|
||||
// be inline-able. Significantly helps performance. Returns false if it did not succeed.
|
||||
fn reserve_inner(&mut self, additional: usize, allocate: bool) -> bool {
|
||||
let len = self.len();
|
||||
let kind = self.kind();
|
||||
|
||||
@@ -631,6 +650,9 @@ impl BytesMut {
|
||||
// can gain capacity back.
|
||||
self.cap += off;
|
||||
} else {
|
||||
if !allocate {
|
||||
return false;
|
||||
}
|
||||
// Not enough space, or reusing might be too much overhead:
|
||||
// allocate more space!
|
||||
let mut v =
|
||||
@@ -639,11 +661,11 @@ impl BytesMut {
|
||||
|
||||
// Update the info
|
||||
self.ptr = vptr(v.as_mut_ptr().add(off));
|
||||
self.len = v.len() - off;
|
||||
self.cap = v.capacity() - off;
|
||||
debug_assert_eq!(self.len, v.len() - off);
|
||||
}
|
||||
|
||||
return;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -654,7 +676,11 @@ impl BytesMut {
|
||||
// allocating a new vector with the requested capacity.
|
||||
//
|
||||
// Compute the new capacity
|
||||
let mut new_cap = len.checked_add(additional).expect("overflow");
|
||||
let mut new_cap = match len.checked_add(additional) {
|
||||
Some(new_cap) => new_cap,
|
||||
None if !allocate => return false,
|
||||
None => panic!("overflow"),
|
||||
};
|
||||
|
||||
unsafe {
|
||||
// First, try to reclaim the buffer. This is possible if the current
|
||||
@@ -685,6 +711,9 @@ impl BytesMut {
|
||||
self.ptr = vptr(ptr);
|
||||
self.cap = v.capacity();
|
||||
} else {
|
||||
if !allocate {
|
||||
return false;
|
||||
}
|
||||
// calculate offset
|
||||
let off = (self.ptr.as_ptr() as usize) - (v.as_ptr() as usize);
|
||||
|
||||
@@ -723,9 +752,12 @@ impl BytesMut {
|
||||
self.cap = v.capacity() - off;
|
||||
}
|
||||
|
||||
return;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
if !allocate {
|
||||
return false;
|
||||
}
|
||||
|
||||
let original_capacity_repr = unsafe { (*shared).original_capacity_repr };
|
||||
let original_capacity = original_capacity_from_repr(original_capacity_repr);
|
||||
@@ -746,8 +778,69 @@ impl BytesMut {
|
||||
let data = (original_capacity_repr << ORIGINAL_CAPACITY_OFFSET) | KIND_VEC;
|
||||
self.data = invalid_ptr(data);
|
||||
self.ptr = vptr(v.as_mut_ptr());
|
||||
self.len = v.len();
|
||||
self.cap = v.capacity();
|
||||
debug_assert_eq!(self.len, v.len());
|
||||
return true;
|
||||
}
|
||||
|
||||
/// Attempts to cheaply reclaim already allocated capacity for at least `additional` more
|
||||
/// bytes to be inserted into the given `BytesMut` and returns `true` if it succeeded.
|
||||
///
|
||||
/// `try_reclaim` behaves exactly like `reserve`, except that it never allocates new storage
|
||||
/// and returns a `bool` indicating whether it was successful in doing so:
|
||||
///
|
||||
/// `try_reclaim` returns false under these conditions:
|
||||
/// - The spare capacity left is less than `additional` bytes AND
|
||||
/// - The existing allocation cannot be reclaimed cheaply or it was less than
|
||||
/// `additional` bytes in size
|
||||
///
|
||||
/// Reclaiming the allocation cheaply is possible if the `BytesMut` has no outstanding
|
||||
/// references through other `BytesMut`s or `Bytes` which point to the same underlying
|
||||
/// storage.
|
||||
///
|
||||
/// # Examples
|
||||
///
|
||||
/// ```
|
||||
/// use bytes::BytesMut;
|
||||
///
|
||||
/// let mut buf = BytesMut::with_capacity(64);
|
||||
/// assert_eq!(true, buf.try_reclaim(64));
|
||||
/// assert_eq!(64, buf.capacity());
|
||||
///
|
||||
/// buf.extend_from_slice(b"abcd");
|
||||
/// let mut split = buf.split();
|
||||
/// assert_eq!(60, buf.capacity());
|
||||
/// assert_eq!(4, split.capacity());
|
||||
/// assert_eq!(false, split.try_reclaim(64));
|
||||
/// assert_eq!(false, buf.try_reclaim(64));
|
||||
/// // The split buffer is filled with "abcd"
|
||||
/// assert_eq!(false, split.try_reclaim(4));
|
||||
/// // buf is empty and has capacity for 60 bytes
|
||||
/// assert_eq!(true, buf.try_reclaim(60));
|
||||
///
|
||||
/// drop(buf);
|
||||
/// assert_eq!(false, split.try_reclaim(64));
|
||||
///
|
||||
/// split.clear();
|
||||
/// assert_eq!(4, split.capacity());
|
||||
/// assert_eq!(true, split.try_reclaim(64));
|
||||
/// assert_eq!(64, split.capacity());
|
||||
/// ```
|
||||
// I tried splitting out try_reclaim_inner after the short circuits, but it was inlined
|
||||
// regardless with Rust 1.78.0 so probably not worth it
|
||||
#[inline]
|
||||
#[must_use = "consider BytesMut::reserve if you need an infallible reservation"]
|
||||
pub fn try_reclaim(&mut self, additional: usize) -> bool {
|
||||
let len = self.len();
|
||||
let rem = self.capacity() - len;
|
||||
|
||||
if additional <= rem {
|
||||
// The handle can already store at least `additional` more bytes, so
|
||||
// there is no further work needed to be done.
|
||||
return true;
|
||||
}
|
||||
|
||||
self.reserve_inner(additional, false)
|
||||
}
|
||||
|
||||
/// Appends given bytes to this `BytesMut`.
|
||||
@@ -860,7 +953,7 @@ impl BytesMut {
|
||||
/// # SAFETY
|
||||
///
|
||||
/// The caller must ensure that `count` <= `self.cap`.
|
||||
unsafe fn advance_unchecked(&mut self, count: usize) {
|
||||
pub(crate) unsafe fn advance_unchecked(&mut self, count: usize) {
|
||||
// Setting the start to 0 is a no-op, so return early if this is the
|
||||
// case.
|
||||
if count == 0 {
|
||||
@@ -1085,7 +1178,10 @@ unsafe impl BufMut for BytesMut {
|
||||
unsafe fn advance_mut(&mut self, cnt: usize) {
|
||||
let remaining = self.cap - self.len();
|
||||
if cnt > remaining {
|
||||
super::panic_advance(cnt, remaining);
|
||||
super::panic_advance(&TryGetError {
|
||||
requested: cnt,
|
||||
available: remaining,
|
||||
});
|
||||
}
|
||||
// Addition won't overflow since it is at most `self.cap`.
|
||||
self.len = self.len() + cnt;
|
||||
@@ -1668,23 +1764,6 @@ fn invalid_ptr<T>(addr: usize) -> *mut T {
|
||||
ptr.cast::<T>()
|
||||
}
|
||||
|
||||
/// Precondition: dst >= original
|
||||
///
|
||||
/// The following line is equivalent to:
|
||||
///
|
||||
/// ```rust,ignore
|
||||
/// self.ptr.as_ptr().offset_from(ptr) as usize;
|
||||
/// ```
|
||||
///
|
||||
/// But due to min rust is 1.39 and it is only stabilized
|
||||
/// in 1.47, we cannot use it.
|
||||
#[inline]
|
||||
fn offset_from(dst: *mut u8, original: *mut u8) -> usize {
|
||||
debug_assert!(dst >= original);
|
||||
|
||||
dst as usize - original as usize
|
||||
}
|
||||
|
||||
unsafe fn rebuild_vec(ptr: *mut u8, mut len: usize, mut cap: usize, off: usize) -> Vec<u8> {
|
||||
let ptr = ptr.sub(off);
|
||||
len += off;
|
||||
@@ -1698,7 +1777,8 @@ unsafe fn rebuild_vec(ptr: *mut u8, mut len: usize, mut cap: usize, off: usize)
|
||||
static SHARED_VTABLE: Vtable = Vtable {
|
||||
clone: shared_v_clone,
|
||||
to_vec: shared_v_to_vec,
|
||||
is_unique: crate::bytes::shared_is_unique,
|
||||
to_mut: shared_v_to_mut,
|
||||
is_unique: shared_v_is_unique,
|
||||
drop: shared_v_drop,
|
||||
};
|
||||
|
||||
@@ -1732,6 +1812,41 @@ unsafe fn shared_v_to_vec(data: &AtomicPtr<()>, ptr: *const u8, len: usize) -> V
|
||||
}
|
||||
}
|
||||
|
||||
unsafe fn shared_v_to_mut(data: &AtomicPtr<()>, ptr: *const u8, len: usize) -> BytesMut {
|
||||
let shared: *mut Shared = data.load(Ordering::Relaxed).cast();
|
||||
|
||||
if (*shared).is_unique() {
|
||||
let shared = &mut *shared;
|
||||
|
||||
// The capacity is always the original capacity of the buffer
|
||||
// minus the offset from the start of the buffer
|
||||
let v = &mut shared.vec;
|
||||
let v_capacity = v.capacity();
|
||||
let v_ptr = v.as_mut_ptr();
|
||||
let offset = offset_from(ptr as *mut u8, v_ptr);
|
||||
let cap = v_capacity - offset;
|
||||
|
||||
let ptr = vptr(ptr as *mut u8);
|
||||
|
||||
BytesMut {
|
||||
ptr,
|
||||
len,
|
||||
cap,
|
||||
data: shared,
|
||||
}
|
||||
} else {
|
||||
let v = slice::from_raw_parts(ptr, len).to_vec();
|
||||
release_shared(shared);
|
||||
BytesMut::from_vec(v)
|
||||
}
|
||||
}
|
||||
|
||||
unsafe fn shared_v_is_unique(data: &AtomicPtr<()>) -> bool {
|
||||
let shared = data.load(Ordering::Acquire);
|
||||
let ref_count = (*shared.cast::<Shared>()).ref_count.load(Ordering::Relaxed);
|
||||
ref_count == 1
|
||||
}
|
||||
|
||||
unsafe fn shared_v_drop(data: &mut AtomicPtr<()>, _ptr: *const u8, _len: usize) {
|
||||
data.with_mut(|shared| {
|
||||
release_shared(*shared as *mut Shared);
|
||||
|
||||
+2
-11
@@ -36,14 +36,5 @@ impl Debug for BytesRef<'_> {
|
||||
}
|
||||
}
|
||||
|
||||
impl Debug for Bytes {
|
||||
fn fmt(&self, f: &mut Formatter<'_>) -> Result {
|
||||
Debug::fmt(&BytesRef(self.as_ref()), f)
|
||||
}
|
||||
}
|
||||
|
||||
impl Debug for BytesMut {
|
||||
fn fmt(&self, f: &mut Formatter<'_>) -> Result {
|
||||
Debug::fmt(&BytesRef(self.as_ref()), f)
|
||||
}
|
||||
}
|
||||
fmt_impl!(Debug, Bytes);
|
||||
fmt_impl!(Debug, BytesMut);
|
||||
|
||||
+4
-14
@@ -21,17 +21,7 @@ impl UpperHex for BytesRef<'_> {
|
||||
}
|
||||
}
|
||||
|
||||
macro_rules! hex_impl {
|
||||
($tr:ident, $ty:ty) => {
|
||||
impl $tr for $ty {
|
||||
fn fmt(&self, f: &mut Formatter<'_>) -> Result {
|
||||
$tr::fmt(&BytesRef(self.as_ref()), f)
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
hex_impl!(LowerHex, Bytes);
|
||||
hex_impl!(LowerHex, BytesMut);
|
||||
hex_impl!(UpperHex, Bytes);
|
||||
hex_impl!(UpperHex, BytesMut);
|
||||
fmt_impl!(LowerHex, Bytes);
|
||||
fmt_impl!(LowerHex, BytesMut);
|
||||
fmt_impl!(UpperHex, Bytes);
|
||||
fmt_impl!(UpperHex, BytesMut);
|
||||
|
||||
@@ -1,3 +1,13 @@
|
||||
macro_rules! fmt_impl {
|
||||
($tr:ident, $ty:ty) => {
|
||||
impl $tr for $ty {
|
||||
fn fmt(&self, f: &mut Formatter<'_>) -> Result {
|
||||
$tr::fmt(&BytesRef(self.as_ref()), f)
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
mod debug;
|
||||
mod hex;
|
||||
|
||||
|
||||
+52
-2
@@ -131,12 +131,47 @@ fn min_u64_usize(a: u64, b: usize) -> usize {
|
||||
}
|
||||
}
|
||||
|
||||
/// Error type for the `try_get_` methods of [`Buf`].
|
||||
/// Indicates that there were not enough remaining
|
||||
/// bytes in the buffer while attempting
|
||||
/// to get a value from a [`Buf`] with one
|
||||
/// of the `try_get_` methods.
|
||||
#[derive(Debug, PartialEq, Eq)]
|
||||
pub struct TryGetError {
|
||||
/// The number of bytes necessary to get the value
|
||||
pub requested: usize,
|
||||
|
||||
/// The number of bytes available in the buffer
|
||||
pub available: usize,
|
||||
}
|
||||
|
||||
impl core::fmt::Display for TryGetError {
|
||||
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> Result<(), core::fmt::Error> {
|
||||
write!(
|
||||
f,
|
||||
"Not enough bytes remaining in buffer to read value (requested {} but only {} available)",
|
||||
self.requested,
|
||||
self.available
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(feature = "std")]
|
||||
impl std::error::Error for TryGetError {}
|
||||
|
||||
#[cfg(feature = "std")]
|
||||
impl From<TryGetError> for std::io::Error {
|
||||
fn from(error: TryGetError) -> Self {
|
||||
std::io::Error::new(std::io::ErrorKind::Other, error)
|
||||
}
|
||||
}
|
||||
|
||||
/// Panic with a nice error message.
|
||||
#[cold]
|
||||
fn panic_advance(idx: usize, len: usize) -> ! {
|
||||
fn panic_advance(error_info: &TryGetError) -> ! {
|
||||
panic!(
|
||||
"advance out of bounds: the len is {} but advancing by {}",
|
||||
len, idx
|
||||
error_info.available, error_info.requested
|
||||
);
|
||||
}
|
||||
|
||||
@@ -147,3 +182,18 @@ fn panic_does_not_fit(size: usize, nbytes: usize) -> ! {
|
||||
size, nbytes
|
||||
);
|
||||
}
|
||||
|
||||
/// Precondition: dst >= original
|
||||
///
|
||||
/// The following line is equivalent to:
|
||||
///
|
||||
/// ```rust,ignore
|
||||
/// self.ptr.as_ptr().offset_from(ptr) as usize;
|
||||
/// ```
|
||||
///
|
||||
/// But due to min rust is 1.39 and it is only stabilized
|
||||
/// in 1.47, we cannot use it.
|
||||
#[inline]
|
||||
fn offset_from(dst: *const u8, original: *const u8) -> usize {
|
||||
dst as usize - original as usize
|
||||
}
|
||||
|
||||
@@ -1,7 +1,10 @@
|
||||
#[cfg(not(all(test, loom)))]
|
||||
pub(crate) mod sync {
|
||||
pub(crate) mod atomic {
|
||||
#[cfg(not(feature = "extra-platforms"))]
|
||||
pub(crate) use core::sync::atomic::{AtomicPtr, AtomicUsize, Ordering};
|
||||
#[cfg(feature = "extra-platforms")]
|
||||
pub(crate) use extra_platforms::{AtomicPtr, AtomicUsize, Ordering};
|
||||
|
||||
pub(crate) trait AtomicMut<T> {
|
||||
fn with_mut<F, R>(&mut self, f: F) -> R
|
||||
|
||||
+387
-69
@@ -1,75 +1,410 @@
|
||||
#![warn(rust_2018_idioms)]
|
||||
|
||||
use bytes::Buf;
|
||||
use ::bytes::{Buf, Bytes, BytesMut};
|
||||
use core::{cmp, mem};
|
||||
use std::collections::VecDeque;
|
||||
#[cfg(feature = "std")]
|
||||
use std::io::IoSlice;
|
||||
|
||||
#[test]
|
||||
fn test_fresh_cursor_vec() {
|
||||
let mut buf = &b"hello"[..];
|
||||
// A random 64-byte ascii string, with the first 8 bytes altered to
|
||||
// give valid representations of f32 and f64 (making them easier to compare)
|
||||
// and negative signed numbers when interpreting as big endian
|
||||
// (testing Sign Extension for `Buf::get_int' and `Buf::get_int_ne`).
|
||||
const INPUT: &[u8] = b"\xffFqrjrDqPhvTc45vvq33f6bJrUtyHESuTeklWKgYd64xgzxJwvAkpYYnpNJyZSRn";
|
||||
|
||||
assert_eq!(buf.remaining(), 5);
|
||||
assert_eq!(buf.chunk(), b"hello");
|
||||
|
||||
buf.advance(2);
|
||||
|
||||
assert_eq!(buf.remaining(), 3);
|
||||
assert_eq!(buf.chunk(), b"llo");
|
||||
|
||||
buf.advance(3);
|
||||
|
||||
assert_eq!(buf.remaining(), 0);
|
||||
assert_eq!(buf.chunk(), b"");
|
||||
macro_rules! e {
|
||||
($big_endian_val:expr, $little_endian_val:expr) => {
|
||||
if cfg!(target_endian = "big") {
|
||||
$big_endian_val
|
||||
} else {
|
||||
$little_endian_val
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_get_u8() {
|
||||
let mut buf = &b"\x21zomg"[..];
|
||||
assert_eq!(0x21, buf.get_u8());
|
||||
macro_rules! buf_tests {
|
||||
($make_input:ident) => {
|
||||
buf_tests!($make_input, true);
|
||||
};
|
||||
($make_input:ident, $checks_vectored_is_complete:expr) => {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn empty_state() {
|
||||
let buf = $make_input(&[]);
|
||||
assert_eq!(buf.remaining(), 0);
|
||||
assert!(!buf.has_remaining());
|
||||
assert!(buf.chunk().is_empty());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn fresh_state() {
|
||||
let buf = $make_input(INPUT);
|
||||
assert_eq!(buf.remaining(), 64);
|
||||
assert!(buf.has_remaining());
|
||||
|
||||
let chunk = buf.chunk();
|
||||
assert!(chunk.len() <= 64);
|
||||
assert!(INPUT.starts_with(chunk));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn advance() {
|
||||
let mut buf = $make_input(INPUT);
|
||||
buf.advance(8);
|
||||
assert_eq!(buf.remaining(), 64 - 8);
|
||||
assert!(buf.has_remaining());
|
||||
|
||||
let chunk = buf.chunk();
|
||||
assert!(chunk.len() <= 64 - 8);
|
||||
assert!(INPUT[8..].starts_with(chunk));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn advance_to_end() {
|
||||
let mut buf = $make_input(INPUT);
|
||||
buf.advance(64);
|
||||
assert_eq!(buf.remaining(), 0);
|
||||
assert!(!buf.has_remaining());
|
||||
|
||||
let chunk = buf.chunk();
|
||||
assert!(chunk.is_empty());
|
||||
}
|
||||
|
||||
#[test]
|
||||
#[should_panic]
|
||||
fn advance_past_end() {
|
||||
let mut buf = $make_input(INPUT);
|
||||
buf.advance(65);
|
||||
}
|
||||
|
||||
#[test]
|
||||
#[cfg(feature = "std")]
|
||||
fn chunks_vectored_empty() {
|
||||
let buf = $make_input(&[]);
|
||||
let mut bufs = [IoSlice::new(&[]); 16];
|
||||
|
||||
let n = buf.chunks_vectored(&mut bufs);
|
||||
assert_eq!(n, 0);
|
||||
assert!(bufs.iter().all(|buf| buf.is_empty()));
|
||||
}
|
||||
|
||||
#[test]
|
||||
#[cfg(feature = "std")]
|
||||
fn chunks_vectored_is_complete() {
|
||||
let buf = $make_input(INPUT);
|
||||
let mut bufs = [IoSlice::new(&[]); 16];
|
||||
|
||||
let n = buf.chunks_vectored(&mut bufs);
|
||||
assert!(n > 0);
|
||||
assert!(n <= 16);
|
||||
|
||||
let bufs_concat = bufs[..n]
|
||||
.iter()
|
||||
.flat_map(|b| b.iter().copied())
|
||||
.collect::<Vec<u8>>();
|
||||
if $checks_vectored_is_complete {
|
||||
assert_eq!(bufs_concat, INPUT);
|
||||
} else {
|
||||
// If this panics then `buf` implements `chunks_vectored`.
|
||||
// Remove the `false` argument from `buf_tests!` for that type.
|
||||
assert!(bufs_concat.len() < INPUT.len());
|
||||
assert!(INPUT.starts_with(&bufs_concat));
|
||||
}
|
||||
|
||||
for i in n..16 {
|
||||
assert!(bufs[i].is_empty());
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn copy_to_slice() {
|
||||
let mut buf = $make_input(INPUT);
|
||||
|
||||
let mut chunk = [0u8; 8];
|
||||
buf.copy_to_slice(&mut chunk);
|
||||
assert_eq!(buf.remaining(), 64 - 8);
|
||||
assert!(buf.has_remaining());
|
||||
assert_eq!(chunk, INPUT[..8]);
|
||||
|
||||
let chunk = buf.chunk();
|
||||
assert!(chunk.len() <= 64 - 8);
|
||||
assert!(INPUT[8..].starts_with(chunk));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn copy_to_slice_big() {
|
||||
let mut buf = $make_input(INPUT);
|
||||
|
||||
let mut chunk = [0u8; 56];
|
||||
buf.copy_to_slice(&mut chunk);
|
||||
assert_eq!(buf.remaining(), 64 - 56);
|
||||
assert!(buf.has_remaining());
|
||||
assert_eq!(chunk, INPUT[..56]);
|
||||
|
||||
let chunk = buf.chunk();
|
||||
assert!(chunk.len() <= 64 - 56);
|
||||
assert!(INPUT[56..].starts_with(chunk));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn copy_to_slice_to_end() {
|
||||
let mut buf = $make_input(INPUT);
|
||||
|
||||
let mut chunk = [0u8; 64];
|
||||
buf.copy_to_slice(&mut chunk);
|
||||
assert_eq!(buf.remaining(), 0);
|
||||
assert!(!buf.has_remaining());
|
||||
assert_eq!(chunk, INPUT);
|
||||
|
||||
assert!(buf.chunk().is_empty());
|
||||
}
|
||||
|
||||
#[test]
|
||||
#[should_panic]
|
||||
fn copy_to_slice_overflow() {
|
||||
let mut buf = $make_input(INPUT);
|
||||
|
||||
let mut chunk = [0u8; 65];
|
||||
buf.copy_to_slice(&mut chunk);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn copy_to_bytes() {
|
||||
let mut buf = $make_input(INPUT);
|
||||
|
||||
let chunk = buf.copy_to_bytes(8);
|
||||
assert_eq!(buf.remaining(), 64 - 8);
|
||||
assert!(buf.has_remaining());
|
||||
assert_eq!(chunk, INPUT[..8]);
|
||||
|
||||
let chunk = buf.chunk();
|
||||
assert!(chunk.len() <= 64 - 8);
|
||||
assert!(INPUT[8..].starts_with(chunk));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn copy_to_bytes_big() {
|
||||
let mut buf = $make_input(INPUT);
|
||||
|
||||
let chunk = buf.copy_to_bytes(56);
|
||||
assert_eq!(buf.remaining(), 64 - 56);
|
||||
assert!(buf.has_remaining());
|
||||
assert_eq!(chunk, INPUT[..56]);
|
||||
|
||||
let chunk = buf.chunk();
|
||||
assert!(chunk.len() <= 64 - 56);
|
||||
assert!(INPUT[56..].starts_with(chunk));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn copy_to_bytes_to_end() {
|
||||
let mut buf = $make_input(INPUT);
|
||||
|
||||
let chunk = buf.copy_to_bytes(64);
|
||||
assert_eq!(buf.remaining(), 0);
|
||||
assert!(!buf.has_remaining());
|
||||
assert_eq!(chunk, INPUT);
|
||||
|
||||
assert!(buf.chunk().is_empty());
|
||||
}
|
||||
|
||||
#[test]
|
||||
#[should_panic]
|
||||
fn copy_to_bytes_overflow() {
|
||||
let mut buf = $make_input(INPUT);
|
||||
|
||||
let _ = buf.copy_to_bytes(65);
|
||||
}
|
||||
|
||||
buf_tests!(number $make_input, get_u8, get_u8_overflow, u8, get_u8, 0xff);
|
||||
buf_tests!(number $make_input, get_i8, get_i8_overflow, i8, get_i8, 0xffu8 as i8);
|
||||
buf_tests!(number $make_input, get_u16_be, get_u16_be_overflow, u16, get_u16, 0xff46);
|
||||
buf_tests!(number $make_input, get_u16_le, get_u16_le_overflow, u16, get_u16_le, 0x46ff);
|
||||
buf_tests!(number $make_input, get_u16_ne, get_u16_ne_overflow, u16, get_u16_ne, e!(0xff46, 0x46ff));
|
||||
buf_tests!(number $make_input, get_i16_be, get_i16_be_overflow, i16, get_i16, 0xff46u16 as i16);
|
||||
buf_tests!(number $make_input, get_i16_le, get_i16_le_overflow, i16, get_i16_le, 0x46ff);
|
||||
buf_tests!(number $make_input, get_i16_ne, get_i16_ne_overflow, i16, get_i16_ne, e!(0xff46u16 as i16, 0x46ff));
|
||||
buf_tests!(number $make_input, get_u32_be, get_u32_be_overflow, u32, get_u32, 0xff467172);
|
||||
buf_tests!(number $make_input, get_u32_le, get_u32_le_overflow, u32, get_u32_le, 0x727146ff);
|
||||
buf_tests!(number $make_input, get_u32_ne, get_u32_ne_overflow, u32, get_u32_ne, e!(0xff467172, 0x727146ff));
|
||||
buf_tests!(number $make_input, get_i32_be, get_i32_be_overflow, i32, get_i32, 0xff467172u32 as i32);
|
||||
buf_tests!(number $make_input, get_i32_le, get_i32_le_overflow, i32, get_i32_le, 0x727146ff);
|
||||
buf_tests!(number $make_input, get_i32_ne, get_i32_ne_overflow, i32, get_i32_ne, e!(0xff467172u32 as i32, 0x727146ff));
|
||||
buf_tests!(number $make_input, get_u64_be, get_u64_be_overflow, u64, get_u64, 0xff4671726a724471);
|
||||
buf_tests!(number $make_input, get_u64_le, get_u64_le_overflow, u64, get_u64_le, 0x7144726a727146ff);
|
||||
buf_tests!(number $make_input, get_u64_ne, get_u64_ne_overflow, u64, get_u64_ne, e!(0xff4671726a724471, 0x7144726a727146ff));
|
||||
buf_tests!(number $make_input, get_i64_be, get_i64_be_overflow, i64, get_i64, 0xff4671726a724471u64 as i64);
|
||||
buf_tests!(number $make_input, get_i64_le, get_i64_le_overflow, i64, get_i64_le, 0x7144726a727146ff);
|
||||
buf_tests!(number $make_input, get_i64_ne, get_i64_ne_overflow, i64, get_i64_ne, e!(0xff4671726a724471u64 as i64, 0x7144726a727146ff));
|
||||
buf_tests!(number $make_input, get_u128_be, get_u128_be_overflow, u128, get_u128, 0xff4671726a7244715068765463343576);
|
||||
buf_tests!(number $make_input, get_u128_le, get_u128_le_overflow, u128, get_u128_le, 0x76353463547668507144726a727146ff);
|
||||
buf_tests!(number $make_input, get_u128_ne, get_u128_ne_overflow, u128, get_u128_ne, e!(0xff4671726a7244715068765463343576, 0x76353463547668507144726a727146ff));
|
||||
buf_tests!(number $make_input, get_i128_be, get_i128_be_overflow, i128, get_i128, 0xff4671726a7244715068765463343576u128 as i128);
|
||||
buf_tests!(number $make_input, get_i128_le, get_i128_le_overflow, i128, get_i128_le, 0x76353463547668507144726a727146ff);
|
||||
buf_tests!(number $make_input, get_i128_ne, get_i128_ne_overflow, i128, get_i128_ne, e!(0xff4671726a7244715068765463343576u128 as i128, 0x76353463547668507144726a727146ff));
|
||||
buf_tests!(number $make_input, get_f32_be, get_f32_be_overflow, f32, get_f32, f32::from_bits(0xff467172));
|
||||
buf_tests!(number $make_input, get_f32_le, get_f32_le_overflow, f32, get_f32_le, f32::from_bits(0x727146ff));
|
||||
buf_tests!(number $make_input, get_f32_ne, get_f32_ne_overflow, f32, get_f32_ne, f32::from_bits(e!(0xff467172, 0x727146ff)));
|
||||
buf_tests!(number $make_input, get_f64_be, get_f64_be_overflow, f64, get_f64, f64::from_bits(0xff4671726a724471));
|
||||
buf_tests!(number $make_input, get_f64_le, get_f64_le_overflow, f64, get_f64_le, f64::from_bits(0x7144726a727146ff));
|
||||
buf_tests!(number $make_input, get_f64_ne, get_f64_ne_overflow, f64, get_f64_ne, f64::from_bits(e!(0xff4671726a724471, 0x7144726a727146ff)));
|
||||
|
||||
buf_tests!(var_number $make_input, get_uint_be, get_uint_be_overflow, u64, get_uint, 3, 0xff4671);
|
||||
buf_tests!(var_number $make_input, get_uint_le, get_uint_le_overflow, u64, get_uint_le, 3, 0x7146ff);
|
||||
buf_tests!(var_number $make_input, get_uint_ne, get_uint_ne_overflow, u64, get_uint_ne, 3, e!(0xff4671, 0x7146ff));
|
||||
buf_tests!(var_number $make_input, get_int_be, get_int_be_overflow, i64, get_int, 3, 0xffffffffffff4671u64 as i64);
|
||||
buf_tests!(var_number $make_input, get_int_le, get_int_le_overflow, i64, get_int_le, 3, 0x7146ff);
|
||||
buf_tests!(var_number $make_input, get_int_ne, get_int_ne_overflow, i64, get_int_ne, 3, e!(0xffffffffffff4671u64 as i64, 0x7146ff));
|
||||
};
|
||||
(number $make_input:ident, $ok_name:ident, $panic_name:ident, $number:ty, $method:ident, $value:expr) => {
|
||||
#[test]
|
||||
fn $ok_name() {
|
||||
let mut buf = $make_input(INPUT);
|
||||
|
||||
let value = buf.$method();
|
||||
assert_eq!(buf.remaining(), 64 - mem::size_of::<$number>());
|
||||
assert!(buf.has_remaining());
|
||||
assert_eq!(value, $value);
|
||||
}
|
||||
|
||||
#[test]
|
||||
#[should_panic]
|
||||
fn $panic_name() {
|
||||
let mut buf = $make_input(&[]);
|
||||
|
||||
let _ = buf.$method();
|
||||
}
|
||||
};
|
||||
(var_number $make_input:ident, $ok_name:ident, $panic_name:ident, $number:ty, $method:ident, $len:expr, $value:expr) => {
|
||||
#[test]
|
||||
fn $ok_name() {
|
||||
let mut buf = $make_input(INPUT);
|
||||
|
||||
let value = buf.$method($len);
|
||||
assert_eq!(buf.remaining(), 64 - $len);
|
||||
assert!(buf.has_remaining());
|
||||
assert_eq!(value, $value);
|
||||
}
|
||||
|
||||
#[test]
|
||||
#[should_panic]
|
||||
fn $panic_name() {
|
||||
let mut buf = $make_input(&[]);
|
||||
|
||||
let _ = buf.$method($len);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_get_u16() {
|
||||
let mut buf = &b"\x21\x54zomg"[..];
|
||||
assert_eq!(0x2154, buf.get_u16());
|
||||
let mut buf = &b"\x21\x54zomg"[..];
|
||||
assert_eq!(0x5421, buf.get_u16_le());
|
||||
mod u8_slice {
|
||||
fn make_input(buf: &'static [u8]) -> &'static [u8] {
|
||||
buf
|
||||
}
|
||||
|
||||
buf_tests!(make_input);
|
||||
}
|
||||
|
||||
#[test]
|
||||
#[should_panic]
|
||||
fn test_get_u16_buffer_underflow() {
|
||||
let mut buf = &b"\x21"[..];
|
||||
buf.get_u16();
|
||||
mod bytes {
|
||||
fn make_input(buf: &'static [u8]) -> impl Buf {
|
||||
Bytes::from_static(buf)
|
||||
}
|
||||
|
||||
buf_tests!(make_input);
|
||||
}
|
||||
|
||||
mod bytes_mut {
|
||||
fn make_input(buf: &'static [u8]) -> impl Buf {
|
||||
BytesMut::from(buf)
|
||||
}
|
||||
|
||||
buf_tests!(make_input);
|
||||
}
|
||||
|
||||
mod vec_deque {
|
||||
fn make_input(buf: &'static [u8]) -> impl Buf {
|
||||
let mut deque = VecDeque::new();
|
||||
|
||||
if !buf.is_empty() {
|
||||
// Construct |b|some bytes|a| `VecDeque`
|
||||
let mid = buf.len() / 2;
|
||||
let (a, b) = buf.split_at(mid);
|
||||
|
||||
deque.reserve_exact(buf.len() + 1);
|
||||
|
||||
let extra_space = deque.capacity() - b.len() - 1;
|
||||
deque.resize(extra_space, 0);
|
||||
|
||||
deque.extend(a);
|
||||
deque.drain(..extra_space);
|
||||
deque.extend(b);
|
||||
|
||||
let (a, b) = deque.as_slices();
|
||||
assert!(
|
||||
!a.is_empty(),
|
||||
"could not setup test - attempt to create discontiguous VecDeque failed"
|
||||
);
|
||||
assert!(
|
||||
!b.is_empty(),
|
||||
"could not setup test - attempt to create discontiguous VecDeque failed"
|
||||
);
|
||||
}
|
||||
|
||||
deque
|
||||
}
|
||||
|
||||
buf_tests!(make_input, true);
|
||||
}
|
||||
|
||||
#[cfg(feature = "std")]
|
||||
#[test]
|
||||
fn test_bufs_vec() {
|
||||
let buf = &b"hello world"[..];
|
||||
mod cursor {
|
||||
use std::io::Cursor;
|
||||
|
||||
let b1: &[u8] = &mut [];
|
||||
let b2: &[u8] = &mut [];
|
||||
fn make_input(buf: &'static [u8]) -> impl Buf {
|
||||
Cursor::new(buf)
|
||||
}
|
||||
|
||||
let mut dst = [IoSlice::new(b1), IoSlice::new(b2)];
|
||||
|
||||
assert_eq!(1, buf.chunks_vectored(&mut dst[..]));
|
||||
buf_tests!(make_input);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_vec_deque() {
|
||||
use std::collections::VecDeque;
|
||||
mod box_bytes {
|
||||
fn make_input(buf: &'static [u8]) -> impl Buf {
|
||||
Box::new(Bytes::from_static(buf))
|
||||
}
|
||||
|
||||
let mut buffer: VecDeque<u8> = VecDeque::new();
|
||||
buffer.extend(b"hello world");
|
||||
assert_eq!(11, buffer.remaining());
|
||||
assert_eq!(b"hello world", buffer.chunk());
|
||||
buffer.advance(6);
|
||||
assert_eq!(b"world", buffer.chunk());
|
||||
buffer.extend(b" piece");
|
||||
let mut out = [0; 11];
|
||||
buffer.copy_to_slice(&mut out);
|
||||
assert_eq!(b"world piece", &out[..]);
|
||||
buf_tests!(make_input);
|
||||
}
|
||||
|
||||
mod chain_u8_slice {
|
||||
fn make_input(buf: &'static [u8]) -> impl Buf {
|
||||
let (a, b) = buf.split_at(buf.len() / 2);
|
||||
Buf::chain(a, b)
|
||||
}
|
||||
|
||||
buf_tests!(make_input);
|
||||
}
|
||||
|
||||
mod chain_small_big_u8_slice {
|
||||
fn make_input(buf: &'static [u8]) -> impl Buf {
|
||||
let mid = cmp::min(1, buf.len());
|
||||
let (a, b) = buf.split_at(mid);
|
||||
Buf::chain(a, b)
|
||||
}
|
||||
|
||||
buf_tests!(make_input);
|
||||
}
|
||||
|
||||
mod chain_limited_slices {
|
||||
fn make_input(buf: &'static [u8]) -> impl Buf {
|
||||
let buf3 = &buf[cmp::min(buf.len(), 3)..];
|
||||
let a = Buf::take(buf3, 0);
|
||||
let b = Buf::take(buf, 3);
|
||||
let c = Buf::take(buf3, usize::MAX);
|
||||
let d = buf;
|
||||
Buf::take(Buf::chain(Buf::chain(a, b), Buf::chain(c, d)), buf.len())
|
||||
}
|
||||
|
||||
buf_tests!(make_input, true);
|
||||
}
|
||||
|
||||
#[allow(unused_allocation)] // This is intentional.
|
||||
@@ -102,20 +437,3 @@ fn test_deref_buf_forwards() {
|
||||
assert_eq!((Box::new(Special) as Box<dyn Buf>).get_u8(), b'x');
|
||||
assert_eq!(Box::new(Special).get_u8(), b'x');
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn copy_to_bytes_less() {
|
||||
let mut buf = &b"hello world"[..];
|
||||
|
||||
let bytes = buf.copy_to_bytes(5);
|
||||
assert_eq!(bytes, &b"hello"[..]);
|
||||
assert_eq!(buf, &b" world"[..])
|
||||
}
|
||||
|
||||
#[test]
|
||||
#[should_panic]
|
||||
fn copy_to_bytes_overflow() {
|
||||
let mut buf = &b"hello world"[..];
|
||||
|
||||
let _bytes = buf.copy_to_bytes(12);
|
||||
}
|
||||
|
||||
@@ -1,7 +1,10 @@
|
||||
#![warn(rust_2018_idioms)]
|
||||
|
||||
use bytes::{Buf, BufMut, Bytes, BytesMut};
|
||||
use std::sync::atomic::{AtomicUsize, Ordering};
|
||||
use std::sync::Arc;
|
||||
|
||||
use std::panic::{self, AssertUnwindSafe};
|
||||
use std::usize;
|
||||
|
||||
const LONG: &[u8] = b"mary had a little lamb, little lamb, little lamb";
|
||||
@@ -288,6 +291,7 @@ fn split_to_uninitialized() {
|
||||
}
|
||||
|
||||
#[test]
|
||||
#[cfg_attr(not(panic = "unwind"), ignore)]
|
||||
fn split_off_to_at_gt_len() {
|
||||
fn make_bytes() -> Bytes {
|
||||
let mut bytes = BytesMut::with_capacity(100);
|
||||
@@ -676,6 +680,43 @@ fn advance_bytes_mut() {
|
||||
assert_eq!(a, b"d zomg wat wat"[..]);
|
||||
}
|
||||
|
||||
// Ensures BytesMut::advance reduces always capacity
|
||||
//
|
||||
// See https://github.com/tokio-rs/bytes/issues/725
|
||||
#[test]
|
||||
fn advance_bytes_mut_remaining_capacity() {
|
||||
// reduce the search space under miri
|
||||
let max_capacity = if cfg!(miri) { 16 } else { 256 };
|
||||
for capacity in 0..=max_capacity {
|
||||
for len in 0..=capacity {
|
||||
for advance in 0..=len {
|
||||
eprintln!("testing capacity={capacity}, len={len}, advance={advance}");
|
||||
let mut buf = BytesMut::with_capacity(capacity);
|
||||
|
||||
buf.resize(len, 42);
|
||||
assert_eq!(buf.len(), len, "resize should write `len` bytes");
|
||||
assert_eq!(
|
||||
buf.remaining(),
|
||||
len,
|
||||
"Buf::remaining() should equal BytesMut::len"
|
||||
);
|
||||
|
||||
buf.advance(advance);
|
||||
assert_eq!(
|
||||
buf.remaining(),
|
||||
len - advance,
|
||||
"Buf::advance should reduce the remaining len"
|
||||
);
|
||||
assert_eq!(
|
||||
buf.capacity(),
|
||||
capacity - advance,
|
||||
"Buf::advance should reduce the remaining capacity"
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
#[should_panic]
|
||||
fn advance_past_len() {
|
||||
@@ -687,6 +728,7 @@ fn advance_past_len() {
|
||||
// Only run these tests on little endian systems. CI uses qemu for testing
|
||||
// big endian... and qemu doesn't really support threading all that well.
|
||||
#[cfg(any(miri, target_endian = "little"))]
|
||||
#[cfg(not(target_family = "wasm"))] // wasm without experimental threads proposal doesn't support threads
|
||||
fn stress() {
|
||||
// Tests promoting a buffer from a vec -> shared in a concurrent situation
|
||||
use std::sync::{Arc, Barrier};
|
||||
@@ -1172,3 +1214,436 @@ fn shared_is_unique() {
|
||||
drop(b);
|
||||
assert!(c.is_unique());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn mut_shared_is_unique() {
|
||||
let mut b = BytesMut::from(LONG);
|
||||
let c = b.split().freeze();
|
||||
assert!(!c.is_unique());
|
||||
drop(b);
|
||||
assert!(c.is_unique());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_bytesmut_from_bytes_static() {
|
||||
let bs = b"1b23exfcz3r";
|
||||
|
||||
// Test STATIC_VTABLE.to_mut
|
||||
let bytes_mut = BytesMut::from(Bytes::from_static(bs));
|
||||
assert_eq!(bytes_mut, bs[..]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_bytesmut_from_bytes_bytes_mut_vec() {
|
||||
let bs = b"1b23exfcz3r";
|
||||
let bs_long = b"1b23exfcz3r1b23exfcz3r";
|
||||
|
||||
// Test case where kind == KIND_VEC
|
||||
let mut bytes_mut: BytesMut = bs[..].into();
|
||||
bytes_mut = BytesMut::from(bytes_mut.freeze());
|
||||
assert_eq!(bytes_mut, bs[..]);
|
||||
bytes_mut.extend_from_slice(&bs[..]);
|
||||
assert_eq!(bytes_mut, bs_long[..]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_bytesmut_from_bytes_bytes_mut_shared() {
|
||||
let bs = b"1b23exfcz3r";
|
||||
|
||||
// Set kind to KIND_ARC so that after freeze, Bytes will use bytes_mut.SHARED_VTABLE
|
||||
let mut bytes_mut: BytesMut = bs[..].into();
|
||||
drop(bytes_mut.split_off(bs.len()));
|
||||
|
||||
let b1 = bytes_mut.freeze();
|
||||
let b2 = b1.clone();
|
||||
|
||||
// shared.is_unique() = False
|
||||
let mut b1m = BytesMut::from(b1);
|
||||
assert_eq!(b1m, bs[..]);
|
||||
b1m[0] = b'9';
|
||||
|
||||
// shared.is_unique() = True
|
||||
let b2m = BytesMut::from(b2);
|
||||
assert_eq!(b2m, bs[..]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_bytesmut_from_bytes_bytes_mut_offset() {
|
||||
let bs = b"1b23exfcz3r";
|
||||
|
||||
// Test bytes_mut.SHARED_VTABLE.to_mut impl where offset != 0
|
||||
let mut bytes_mut1: BytesMut = bs[..].into();
|
||||
let bytes_mut2 = bytes_mut1.split_off(9);
|
||||
|
||||
let b1 = bytes_mut1.freeze();
|
||||
let b2 = bytes_mut2.freeze();
|
||||
|
||||
let b1m = BytesMut::from(b1);
|
||||
let b2m = BytesMut::from(b2);
|
||||
|
||||
assert_eq!(b2m, bs[9..]);
|
||||
assert_eq!(b1m, bs[..9]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_bytesmut_from_bytes_promotable_even_vec() {
|
||||
let vec = vec![33u8; 1024];
|
||||
|
||||
// Test case where kind == KIND_VEC
|
||||
let b1 = Bytes::from(vec.clone());
|
||||
let b1m = BytesMut::from(b1);
|
||||
assert_eq!(b1m, vec);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_bytesmut_from_bytes_promotable_even_arc_1() {
|
||||
let vec = vec![33u8; 1024];
|
||||
|
||||
// Test case where kind == KIND_ARC, ref_cnt == 1
|
||||
let b1 = Bytes::from(vec.clone());
|
||||
drop(b1.clone());
|
||||
let b1m = BytesMut::from(b1);
|
||||
assert_eq!(b1m, vec);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_bytesmut_from_bytes_promotable_even_arc_2() {
|
||||
let vec = vec![33u8; 1024];
|
||||
|
||||
// Test case where kind == KIND_ARC, ref_cnt == 2
|
||||
let b1 = Bytes::from(vec.clone());
|
||||
let b2 = b1.clone();
|
||||
let b1m = BytesMut::from(b1);
|
||||
assert_eq!(b1m, vec);
|
||||
|
||||
// Test case where vtable = SHARED_VTABLE, kind == KIND_ARC, ref_cnt == 1
|
||||
let b2m = BytesMut::from(b2);
|
||||
assert_eq!(b2m, vec);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_bytesmut_from_bytes_promotable_even_arc_offset() {
|
||||
let vec = vec![33u8; 1024];
|
||||
|
||||
// Test case where offset != 0
|
||||
let mut b1 = Bytes::from(vec.clone());
|
||||
let b2 = b1.split_off(20);
|
||||
let b1m = BytesMut::from(b1);
|
||||
let b2m = BytesMut::from(b2);
|
||||
|
||||
assert_eq!(b2m, vec[20..]);
|
||||
assert_eq!(b1m, vec[..20]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn try_reclaim_empty() {
|
||||
let mut buf = BytesMut::new();
|
||||
assert_eq!(false, buf.try_reclaim(6));
|
||||
buf.reserve(6);
|
||||
assert_eq!(true, buf.try_reclaim(6));
|
||||
let cap = buf.capacity();
|
||||
assert!(cap >= 6);
|
||||
assert_eq!(false, buf.try_reclaim(cap + 1));
|
||||
|
||||
let mut buf = BytesMut::new();
|
||||
buf.reserve(6);
|
||||
let cap = buf.capacity();
|
||||
assert!(cap >= 6);
|
||||
let mut split = buf.split();
|
||||
drop(buf);
|
||||
assert_eq!(0, split.capacity());
|
||||
assert_eq!(true, split.try_reclaim(6));
|
||||
assert_eq!(false, split.try_reclaim(cap + 1));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn try_reclaim_vec() {
|
||||
let mut buf = BytesMut::with_capacity(6);
|
||||
buf.put_slice(b"abc");
|
||||
// Reclaiming a ludicrous amount of space should calmly return false
|
||||
assert_eq!(false, buf.try_reclaim(usize::MAX));
|
||||
|
||||
assert_eq!(false, buf.try_reclaim(6));
|
||||
buf.advance(2);
|
||||
assert_eq!(4, buf.capacity());
|
||||
// We can reclaim 5 bytes, because the byte in the buffer can be moved to the front. 6 bytes
|
||||
// cannot be reclaimed because there is already one byte stored
|
||||
assert_eq!(false, buf.try_reclaim(6));
|
||||
assert_eq!(true, buf.try_reclaim(5));
|
||||
buf.advance(1);
|
||||
assert_eq!(true, buf.try_reclaim(6));
|
||||
assert_eq!(6, buf.capacity());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn try_reclaim_arc() {
|
||||
let mut buf = BytesMut::with_capacity(6);
|
||||
buf.put_slice(b"abc");
|
||||
let x = buf.split().freeze();
|
||||
buf.put_slice(b"def");
|
||||
// Reclaiming a ludicrous amount of space should calmly return false
|
||||
assert_eq!(false, buf.try_reclaim(usize::MAX));
|
||||
|
||||
let y = buf.split().freeze();
|
||||
let z = y.clone();
|
||||
assert_eq!(false, buf.try_reclaim(6));
|
||||
drop(x);
|
||||
drop(z);
|
||||
assert_eq!(false, buf.try_reclaim(6));
|
||||
drop(y);
|
||||
assert_eq!(true, buf.try_reclaim(6));
|
||||
assert_eq!(6, buf.capacity());
|
||||
assert_eq!(0, buf.len());
|
||||
buf.put_slice(b"abc");
|
||||
buf.put_slice(b"def");
|
||||
assert_eq!(6, buf.capacity());
|
||||
assert_eq!(6, buf.len());
|
||||
assert_eq!(false, buf.try_reclaim(6));
|
||||
buf.advance(4);
|
||||
assert_eq!(true, buf.try_reclaim(4));
|
||||
buf.advance(2);
|
||||
assert_eq!(true, buf.try_reclaim(6));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn split_off_empty_addr() {
|
||||
let mut buf = Bytes::from(vec![0; 1024]);
|
||||
|
||||
let ptr_start = buf.as_ptr();
|
||||
let ptr_end = ptr_start.wrapping_add(1024);
|
||||
|
||||
let empty_end = buf.split_off(1024);
|
||||
assert_eq!(empty_end.len(), 0);
|
||||
assert_eq!(empty_end.as_ptr(), ptr_end);
|
||||
|
||||
let _ = buf.split_off(0);
|
||||
assert_eq!(buf.len(), 0);
|
||||
assert_eq!(buf.as_ptr(), ptr_start);
|
||||
|
||||
// Is miri happy about the provenance?
|
||||
let _ = &empty_end[..];
|
||||
let _ = &buf[..];
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn split_to_empty_addr() {
|
||||
let mut buf = Bytes::from(vec![0; 1024]);
|
||||
|
||||
let ptr_start = buf.as_ptr();
|
||||
let ptr_end = ptr_start.wrapping_add(1024);
|
||||
|
||||
let empty_start = buf.split_to(0);
|
||||
assert_eq!(empty_start.len(), 0);
|
||||
assert_eq!(empty_start.as_ptr(), ptr_start);
|
||||
|
||||
let _ = buf.split_to(1024);
|
||||
assert_eq!(buf.len(), 0);
|
||||
assert_eq!(buf.as_ptr(), ptr_end);
|
||||
|
||||
// Is miri happy about the provenance?
|
||||
let _ = &empty_start[..];
|
||||
let _ = &buf[..];
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn split_off_empty_addr_mut() {
|
||||
let mut buf = BytesMut::from([0; 1024].as_slice());
|
||||
|
||||
let ptr_start = buf.as_ptr();
|
||||
let ptr_end = ptr_start.wrapping_add(1024);
|
||||
|
||||
let empty_end = buf.split_off(1024);
|
||||
assert_eq!(empty_end.len(), 0);
|
||||
assert_eq!(empty_end.as_ptr(), ptr_end);
|
||||
|
||||
let _ = buf.split_off(0);
|
||||
assert_eq!(buf.len(), 0);
|
||||
assert_eq!(buf.as_ptr(), ptr_start);
|
||||
|
||||
// Is miri happy about the provenance?
|
||||
let _ = &empty_end[..];
|
||||
let _ = &buf[..];
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn split_to_empty_addr_mut() {
|
||||
let mut buf = BytesMut::from([0; 1024].as_slice());
|
||||
|
||||
let ptr_start = buf.as_ptr();
|
||||
let ptr_end = ptr_start.wrapping_add(1024);
|
||||
|
||||
let empty_start = buf.split_to(0);
|
||||
assert_eq!(empty_start.len(), 0);
|
||||
assert_eq!(empty_start.as_ptr(), ptr_start);
|
||||
|
||||
let _ = buf.split_to(1024);
|
||||
assert_eq!(buf.len(), 0);
|
||||
assert_eq!(buf.as_ptr(), ptr_end);
|
||||
|
||||
// Is miri happy about the provenance?
|
||||
let _ = &empty_start[..];
|
||||
let _ = &buf[..];
|
||||
}
|
||||
|
||||
#[derive(Clone)]
|
||||
struct SharedAtomicCounter(Arc<AtomicUsize>);
|
||||
|
||||
impl SharedAtomicCounter {
|
||||
pub fn new() -> Self {
|
||||
SharedAtomicCounter(Arc::new(AtomicUsize::new(0)))
|
||||
}
|
||||
|
||||
pub fn increment(&self) {
|
||||
self.0.fetch_add(1, Ordering::AcqRel);
|
||||
}
|
||||
|
||||
pub fn get(&self) -> usize {
|
||||
self.0.load(Ordering::Acquire)
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone)]
|
||||
struct OwnedTester<const L: usize> {
|
||||
buf: [u8; L],
|
||||
drop_count: SharedAtomicCounter,
|
||||
pub panic_as_ref: bool,
|
||||
}
|
||||
|
||||
impl<const L: usize> OwnedTester<L> {
|
||||
fn new(buf: [u8; L], drop_count: SharedAtomicCounter) -> Self {
|
||||
Self {
|
||||
buf,
|
||||
drop_count,
|
||||
panic_as_ref: false,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl<const L: usize> AsRef<[u8]> for OwnedTester<L> {
|
||||
fn as_ref(&self) -> &[u8] {
|
||||
if self.panic_as_ref {
|
||||
panic!("test-triggered panic in `AsRef<[u8]> for OwnedTester`");
|
||||
}
|
||||
self.buf.as_slice()
|
||||
}
|
||||
}
|
||||
|
||||
impl<const L: usize> Drop for OwnedTester<L> {
|
||||
fn drop(&mut self) {
|
||||
self.drop_count.increment();
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn owned_is_unique_always_false() {
|
||||
let b1 = Bytes::from_owner([1, 2, 3, 4, 5, 6, 7]);
|
||||
assert!(!b1.is_unique()); // even if ref_cnt == 1
|
||||
let b2 = b1.clone();
|
||||
assert!(!b1.is_unique());
|
||||
assert!(!b2.is_unique());
|
||||
drop(b1);
|
||||
assert!(!b2.is_unique()); // even if ref_cnt == 1
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn owned_buf_sharing() {
|
||||
let buf = [1, 2, 3, 4, 5, 6, 7];
|
||||
let b1 = Bytes::from_owner(buf);
|
||||
let b2 = b1.clone();
|
||||
assert_eq!(&buf[..], &b1[..]);
|
||||
assert_eq!(&buf[..], &b2[..]);
|
||||
assert_eq!(b1.as_ptr(), b2.as_ptr());
|
||||
assert_eq!(b1.len(), b2.len());
|
||||
assert_eq!(b1.len(), buf.len());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn owned_buf_slicing() {
|
||||
let b1 = Bytes::from_owner(SHORT);
|
||||
assert_eq!(SHORT, &b1[..]);
|
||||
let b2 = b1.slice(1..(b1.len() - 1));
|
||||
assert_eq!(&SHORT[1..(SHORT.len() - 1)], b2);
|
||||
assert_eq!(unsafe { SHORT.as_ptr().add(1) }, b2.as_ptr());
|
||||
assert_eq!(SHORT.len() - 2, b2.len());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn owned_dropped_exactly_once() {
|
||||
let buf: [u8; 5] = [1, 2, 3, 4, 5];
|
||||
let drop_counter = SharedAtomicCounter::new();
|
||||
let owner = OwnedTester::new(buf, drop_counter.clone());
|
||||
let b1 = Bytes::from_owner(owner);
|
||||
let b2 = b1.clone();
|
||||
assert_eq!(drop_counter.get(), 0);
|
||||
drop(b1);
|
||||
assert_eq!(drop_counter.get(), 0);
|
||||
let b3 = b2.slice(1..b2.len() - 1);
|
||||
drop(b2);
|
||||
assert_eq!(drop_counter.get(), 0);
|
||||
drop(b3);
|
||||
assert_eq!(drop_counter.get(), 1);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn owned_to_mut() {
|
||||
let buf: [u8; 10] = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
|
||||
let drop_counter = SharedAtomicCounter::new();
|
||||
let owner = OwnedTester::new(buf, drop_counter.clone());
|
||||
let b1 = Bytes::from_owner(owner);
|
||||
|
||||
// Holding an owner will fail converting to a BytesMut,
|
||||
// even when the bytes instance has a ref_cnt == 1.
|
||||
let b1 = b1.try_into_mut().unwrap_err();
|
||||
|
||||
// That said, it's still possible, just not cheap.
|
||||
let bm1: BytesMut = b1.into();
|
||||
let new_buf = &bm1[..];
|
||||
assert_eq!(new_buf, &buf[..]);
|
||||
|
||||
// `.into::<BytesMut>()` has correctly dropped the owner
|
||||
assert_eq!(drop_counter.get(), 1);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn owned_to_vec() {
|
||||
let buf: [u8; 10] = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
|
||||
let drop_counter = SharedAtomicCounter::new();
|
||||
let owner = OwnedTester::new(buf, drop_counter.clone());
|
||||
let b1 = Bytes::from_owner(owner);
|
||||
|
||||
let v1 = b1.to_vec();
|
||||
assert_eq!(&v1[..], &buf[..]);
|
||||
assert_eq!(&v1[..], &b1[..]);
|
||||
|
||||
drop(b1);
|
||||
assert_eq!(drop_counter.get(), 1);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn owned_into_vec() {
|
||||
let drop_counter = SharedAtomicCounter::new();
|
||||
let buf: [u8; 10] = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
|
||||
let owner = OwnedTester::new(buf, drop_counter.clone());
|
||||
let b1 = Bytes::from_owner(owner);
|
||||
|
||||
let v1: Vec<u8> = b1.into();
|
||||
assert_eq!(&v1[..], &buf[..]);
|
||||
// into() vec will copy out of the owner and drop it
|
||||
assert_eq!(drop_counter.get(), 1);
|
||||
}
|
||||
|
||||
#[test]
|
||||
#[cfg_attr(not(panic = "unwind"), ignore)]
|
||||
fn owned_safe_drop_on_as_ref_panic() {
|
||||
let buf: [u8; 10] = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
|
||||
let drop_counter = SharedAtomicCounter::new();
|
||||
let mut owner = OwnedTester::new(buf, drop_counter.clone());
|
||||
owner.panic_as_ref = true;
|
||||
|
||||
let result = panic::catch_unwind(AssertUnwindSafe(|| {
|
||||
let _ = Bytes::from_owner(owner);
|
||||
}));
|
||||
|
||||
assert!(result.is_err());
|
||||
assert_eq!(drop_counter.get(), 1);
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
use std::alloc::{GlobalAlloc, Layout, System};
|
||||
use std::ptr;
|
||||
|
||||
use bytes::Bytes;
|
||||
use bytes::{Bytes, BytesMut};
|
||||
|
||||
#[global_allocator]
|
||||
static ODD: Odd = Odd;
|
||||
@@ -95,3 +95,53 @@ fn test_bytes_into_vec() {
|
||||
assert_eq!(Vec::from(b2), vec[20..]);
|
||||
assert_eq!(Vec::from(b1), vec[..20]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_bytesmut_from_bytes_vec() {
|
||||
let vec = vec![33u8; 1024];
|
||||
|
||||
// Test case where kind == KIND_VEC
|
||||
let b1 = Bytes::from(vec.clone());
|
||||
let b1m = BytesMut::from(b1);
|
||||
assert_eq!(b1m, vec);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_bytesmut_from_bytes_arc_1() {
|
||||
let vec = vec![33u8; 1024];
|
||||
|
||||
// Test case where kind == KIND_ARC, ref_cnt == 1
|
||||
let b1 = Bytes::from(vec.clone());
|
||||
drop(b1.clone());
|
||||
let b1m = BytesMut::from(b1);
|
||||
assert_eq!(b1m, vec);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_bytesmut_from_bytes_arc_2() {
|
||||
let vec = vec![33u8; 1024];
|
||||
|
||||
// Test case where kind == KIND_ARC, ref_cnt == 2
|
||||
let b1 = Bytes::from(vec.clone());
|
||||
let b2 = b1.clone();
|
||||
let b1m = BytesMut::from(b1);
|
||||
assert_eq!(b1m, vec);
|
||||
|
||||
// Test case where vtable = SHARED_VTABLE, kind == KIND_ARC, ref_cnt == 1
|
||||
let b2m = BytesMut::from(b2);
|
||||
assert_eq!(b2m, vec);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_bytesmut_from_bytes_arc_offset() {
|
||||
let vec = vec![33u8; 1024];
|
||||
|
||||
// Test case where offset != 0
|
||||
let mut b1 = Bytes::from(vec.clone());
|
||||
let b2 = b1.split_off(20);
|
||||
let b1m = BytesMut::from(b1);
|
||||
let b2m = BytesMut::from(b2);
|
||||
|
||||
assert_eq!(b2m, vec[20..]);
|
||||
assert_eq!(b1m, vec[..20]);
|
||||
}
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
#![cfg(not(miri))]
|
||||
use std::alloc::{GlobalAlloc, Layout, System};
|
||||
use std::ptr::null_mut;
|
||||
use std::sync::atomic::{AtomicPtr, AtomicUsize, Ordering};
|
||||
@@ -7,7 +8,7 @@ use bytes::{Buf, Bytes};
|
||||
#[global_allocator]
|
||||
static LEDGER: Ledger = Ledger::new();
|
||||
|
||||
const LEDGER_LENGTH: usize = 2048;
|
||||
const LEDGER_LENGTH: usize = 1024 * 1024;
|
||||
|
||||
struct Ledger {
|
||||
alloc_table: [(AtomicPtr<u8>, AtomicUsize); LEDGER_LENGTH],
|
||||
@@ -31,9 +32,11 @@ impl Ledger {
|
||||
.is_ok()
|
||||
{
|
||||
entry_size.store(size, Ordering::SeqCst);
|
||||
break;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
panic!("Ledger ran out of space.");
|
||||
}
|
||||
|
||||
fn remove(&self, ptr: *mut u8) -> usize {
|
||||
|
||||
+4
-4
@@ -1,11 +1,11 @@
|
||||
#![warn(rust_2018_idioms)]
|
||||
|
||||
use bytes::Bytes;
|
||||
use bytes::{buf::IntoIter, Bytes};
|
||||
|
||||
#[test]
|
||||
fn iter_len() {
|
||||
let buf = Bytes::from_static(b"hello world");
|
||||
let iter = buf.iter();
|
||||
let iter = IntoIter::new(buf);
|
||||
|
||||
assert_eq!(iter.size_hint(), (11, Some(11)));
|
||||
assert_eq!(iter.len(), 11);
|
||||
@@ -13,8 +13,8 @@ fn iter_len() {
|
||||
|
||||
#[test]
|
||||
fn empty_iter_len() {
|
||||
let buf = Bytes::from_static(b"");
|
||||
let iter = buf.iter();
|
||||
let buf = Bytes::new();
|
||||
let iter = IntoIter::new(buf);
|
||||
|
||||
assert_eq!(iter.size_hint(), (0, Some(0)));
|
||||
assert_eq!(iter.len(), 0);
|
||||
|
||||
@@ -30,3 +30,55 @@ fn take_copy_to_bytes_panics() {
|
||||
let abcd = Bytes::copy_from_slice(b"abcd");
|
||||
abcd.take(2).copy_to_bytes(3);
|
||||
}
|
||||
|
||||
#[cfg(feature = "std")]
|
||||
#[test]
|
||||
fn take_chunks_vectored() {
|
||||
fn chain() -> impl Buf {
|
||||
Bytes::from([1, 2, 3].to_vec()).chain(Bytes::from([4, 5, 6].to_vec()))
|
||||
}
|
||||
|
||||
{
|
||||
let mut dst = [std::io::IoSlice::new(&[]); 2];
|
||||
let take = chain().take(0);
|
||||
assert_eq!(take.chunks_vectored(&mut dst), 0);
|
||||
}
|
||||
|
||||
{
|
||||
let mut dst = [std::io::IoSlice::new(&[]); 2];
|
||||
let take = chain().take(1);
|
||||
assert_eq!(take.chunks_vectored(&mut dst), 1);
|
||||
assert_eq!(&*dst[0], &[1]);
|
||||
}
|
||||
|
||||
{
|
||||
let mut dst = [std::io::IoSlice::new(&[]); 2];
|
||||
let take = chain().take(3);
|
||||
assert_eq!(take.chunks_vectored(&mut dst), 1);
|
||||
assert_eq!(&*dst[0], &[1, 2, 3]);
|
||||
}
|
||||
|
||||
{
|
||||
let mut dst = [std::io::IoSlice::new(&[]); 2];
|
||||
let take = chain().take(4);
|
||||
assert_eq!(take.chunks_vectored(&mut dst), 2);
|
||||
assert_eq!(&*dst[0], &[1, 2, 3]);
|
||||
assert_eq!(&*dst[1], &[4]);
|
||||
}
|
||||
|
||||
{
|
||||
let mut dst = [std::io::IoSlice::new(&[]); 2];
|
||||
let take = chain().take(6);
|
||||
assert_eq!(take.chunks_vectored(&mut dst), 2);
|
||||
assert_eq!(&*dst[0], &[1, 2, 3]);
|
||||
assert_eq!(&*dst[1], &[4, 5, 6]);
|
||||
}
|
||||
|
||||
{
|
||||
let mut dst = [std::io::IoSlice::new(&[]); 2];
|
||||
let take = chain().take(7);
|
||||
assert_eq!(take.chunks_vectored(&mut dst), 2);
|
||||
assert_eq!(&*dst[0], &[1, 2, 3]);
|
||||
assert_eq!(&*dst[1], &[4, 5, 6]);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user