mirrors/ntex
1
0
Fork 0
mirror of https://github.com/ntex-rs/ntex.git synced 2025-04-04 21:37:58 +03:00
Code Issues Projects Releases Packages Wiki Activity

Miri error

Browse source
This commit is contained in:
Nikolay Kim 2024-01-16 13:24:25 +06:00
parent 112c127eb9
commit f40608633e
2 changed files with 45 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

13
ntex-bytes/README.md
View file

@ -11,7 +11,7 @@ A utility library for working with bytes. This is fork of bytes crate (https://g
## Usage ## Usage
To use `bytes`, first add this to your `Cargo.toml`: To use `ntex-bytes`, first add this to your `Cargo.toml`:
```toml ```toml
[dependencies] [dependencies]
@ -35,10 +35,7 @@ ntex-bytes = { version = "0.1", features = ["serde"] }
## License ## License
This project is licensed under the [MIT license](LICENSE). * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
[http://www.apache.org/licenses/LICENSE-2.0])
### Contribution * MIT license ([LICENSE-MIT](LICENSE-MIT) or
[http://opensource.org/licenses/MIT])
Unless you explicitly state otherwise, any contribution intentionally submitted
for inclusion in `ntex-bytes` by you, shall be licensed as MIT, without any additional
terms or conditions.

78
ntex-bytes/src/bytes.rs
View file

@ -2588,10 +2588,11 @@ impl InnerVec {
#[inline] #[inline]
fn from_slice(cap: usize, src: &[u8], pool: PoolRef) -> InnerVec { fn from_slice(cap: usize, src: &[u8], pool: PoolRef) -> InnerVec {
// vec must be aligned to SharedVec instead of u8 // vec must be aligned to SharedVec instead of u8
let mut vec_cap = (cap / SHARED_VEC_SIZE) + 1; let vec_cap = if cap % SHARED_VEC_SIZE != 0 {
if cap % SHARED_VEC_SIZE != 0 { (cap / SHARED_VEC_SIZE) + 2
vec_cap += 1; } else {
} (cap / SHARED_VEC_SIZE) + 1
};
let mut vec = Vec::<SharedVec>::with_capacity(vec_cap); let mut vec = Vec::<SharedVec>::with_capacity(vec_cap);
unsafe { unsafe {
// Store data in vec // Store data in vec
@ -2974,38 +2975,33 @@ impl Inner {
vec_cap += 1; vec_cap += 1;
} }
let mut vec = Vec::<SharedVec>::with_capacity(vec_cap); let mut vec = Vec::<SharedVec>::with_capacity(vec_cap);
unsafe {
// Store data in vec
let len = src.len();
let full_cap = vec.capacity() * SHARED_VEC_SIZE;
let cap = full_cap - SHARED_VEC_SIZE;
let shared_ptr = vec.as_mut_ptr();
mem::forget(vec);
pool.acquire(full_cap);
// Store data in vec
let len = src.len();
let full_cap = vec.capacity() * SHARED_VEC_SIZE;
let cap = full_cap - SHARED_VEC_SIZE;
vec.push(SharedVec {
pool,
cap: full_cap,
ref_count: AtomicUsize::new(1),
len: 0,
offset: 0,
});
pool.acquire(full_cap);
let shared_ptr = vec.as_mut_ptr();
mem::forget(vec);
let (ptr, arc) = unsafe {
let ptr = shared_ptr.add(1) as *mut u8; let ptr = shared_ptr.add(1) as *mut u8;
ptr::copy_nonoverlapping(src.as_ptr(), ptr, src.len()); ptr::copy_nonoverlapping(src.as_ptr(), ptr, src.len());
ptr::write( let arc =
shared_ptr, NonNull::new_unchecked((shared_ptr as usize ^ KIND_VEC) as *mut Shared);
SharedVec { (ptr, arc)
pool, };
cap: full_cap,
ref_count: AtomicUsize::new(1),
len: 0,
offset: 0,
},
);
// Create new arc, so atomic operations can be avoided. // Create new arc, so atomic operations can be avoided.
Inner { Inner { len, cap, ptr, arc }
len,
cap,
ptr,
arc: NonNull::new_unchecked(
(shared_ptr as usize ^ KIND_VEC) as *mut Shared,
),
}
}
} }
#[inline] #[inline]
@ -3069,7 +3065,7 @@ impl Inner {
fn as_ref(&self) -> &[u8] { fn as_ref(&self) -> &[u8] {
unsafe { unsafe {
if self.is_inline() { if self.is_inline() {
slice::from_raw_parts(self.inline_ptr(), self.inline_len()) slice::from_raw_parts(self.inline_ptr_ro(), self.inline_len())
} else { } else {
slice::from_raw_parts(self.ptr, self.len) slice::from_raw_parts(self.ptr, self.len)
} }
@ -3143,8 +3139,14 @@ impl Inner {
/// Pointer to the start of the inline buffer /// Pointer to the start of the inline buffer
#[inline] #[inline]
unsafe fn inline_ptr(&self) -> *mut u8 { unsafe fn inline_ptr(&mut self) -> *mut u8 {
(self as *const Inner as *mut Inner as *mut u8).offset(INLINE_DATA_OFFSET) (self as *mut Inner as *mut u8).offset(INLINE_DATA_OFFSET)
}
/// Pointer to the start of the inline buffer
#[inline]
unsafe fn inline_ptr_ro(&self) -> *const u8 {
(self as *const Inner as *const u8).offset(INLINE_DATA_OFFSET)
} }
#[inline] #[inline]
@ -3660,11 +3662,11 @@ fn release_shared_vec(ptr: *mut SharedVec) {
// [1]: (www.boost.org/doc/libs/1_55_0/doc/html/atomic/usage_examples.html) // [1]: (www.boost.org/doc/libs/1_55_0/doc/html/atomic/usage_examples.html)
atomic::fence(Acquire); atomic::fence(Acquire);
// Drop the data // Drop vec
let cap = (*ptr).cap; let cap = (*ptr).cap;
(*ptr).pool.release(cap); (*ptr).pool.release(cap);
ptr::drop_in_place(ptr);
Vec::<u8>::from_raw_parts(ptr as *mut u8, 0, cap); Vec::<SharedVec>::from_raw_parts(ptr, 1, cap / SHARED_VEC_SIZE);
} }
} }