From 18680ea05b8dbdacd0c48a5a58ecb92921d1fa5c Mon Sep 17 00:00:00 2001 From: Nikolay Kim Date: Fri, 19 Jan 2024 17:17:08 +0600 Subject: [PATCH] Revert changes to release shared_vec --- ntex-bytes/CHANGELOG.md | 4 ++++ ntex-bytes/Cargo.toml | 2 +- ntex-bytes/src/bytes.rs | 6 +++--- ntex/Cargo.toml | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ntex-bytes/CHANGELOG.md b/ntex-bytes/CHANGELOG.md index 63db3bc5..6ac9cadf 100644 --- a/ntex-bytes/CHANGELOG.md +++ b/ntex-bytes/CHANGELOG.md @@ -1,5 +1,9 @@ # Changes +## [0.1.23] (2024-01-19) + +* Revert changes to release shared_vec + ## [0.1.22] (2024-01-16) * Use const generics for helper traits (From, PartialEq, PartialOrd) diff --git a/ntex-bytes/Cargo.toml b/ntex-bytes/Cargo.toml index 077e0288..627574ba 100644 --- a/ntex-bytes/Cargo.toml +++ b/ntex-bytes/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ntex-bytes" -version = "0.1.22" +version = "0.1.23" authors = ["Nikolay Kim ", "Carl Lerche "] description = "Types and traits for working with bytes (bytes crate fork)" documentation = "https://docs.rs/ntex-bytes" diff --git a/ntex-bytes/src/bytes.rs b/ntex-bytes/src/bytes.rs index f04d634c..dae5dd0e 100644 --- a/ntex-bytes/src/bytes.rs +++ b/ntex-bytes/src/bytes.rs @@ -3662,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) atomic::fence(Acquire); - // Drop vec + // Drop the data let cap = (*ptr).cap; (*ptr).pool.release(cap); - - Vec::::from_raw_parts(ptr, 1, cap / SHARED_VEC_SIZE); + ptr::drop_in_place(ptr); + Vec::::from_raw_parts(ptr as *mut u8, 0, cap); } } diff --git a/ntex/Cargo.toml b/ntex/Cargo.toml index 79550163..5c7707ff 100644 --- a/ntex/Cargo.toml +++ b/ntex/Cargo.toml @@ -55,7 +55,7 @@ ntex-router = "0.5.3" ntex-service = "2.0.0" ntex-macros = "0.1.3" ntex-util = "1.0.0" -ntex-bytes = "0.1.21" +ntex-bytes = "0.1.23" ntex-h2 = "0.5.0" ntex-rt = "0.4.11" ntex-io = "1.0.0"