This is an automated email from the ASF dual-hosted git repository.

wasphin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brpc.git


The following commit(s) were added to refs/heads/master by this push:
     new a3476c38 Optimize IOBuf deleter construction (#3701)
a3476c38 is described below

commit a3476c38046603e23f832d99d1697f76b51fca20
Author: Bright Chen <[email protected]>
AuthorDate: Tue Nov 3 13:19:31 2026 +0800

    Optimize IOBuf deleter construction (#3701)
---
 src/butil/iobuf_inl.h      |  5 ++--
 src/butil/single_iobuf.cpp |  2 +-
 test/iobuf_unittest.cpp    | 68 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 71 insertions(+), 4 deletions(-)

diff --git a/src/butil/iobuf_inl.h b/src/butil/iobuf_inl.h
index 71a449d2..7b41b935 100644
--- a/src/butil/iobuf_inl.h
+++ b/src/butil/iobuf_inl.h
@@ -492,7 +492,7 @@ struct IOBuf::Block {
         }
     }
 
-    Block(char* data_in, uint32_t data_size, UserDataDeleter deleter)
+    Block(char* data_in, uint32_t data_size, UserDataDeleter&& deleter)
         : nshared(1)
         , flags(IOBUF_BLOCK_FLAGS_USER_DATA)
         , abi_check(0)
@@ -500,8 +500,7 @@ struct IOBuf::Block {
         , cap(data_size)
         , u({0})
         , data(data_in) {
-        auto ext = new (get_user_data_extension()) UserDataExtension();
-        ext->deleter = std::move(deleter);
+        new (get_user_data_extension()) UserDataExtension{std::move(deleter)};
         if (is_samplable()) {
             SubmitIOBufSample(this, 1);
         }
diff --git a/src/butil/single_iobuf.cpp b/src/butil/single_iobuf.cpp
index f47d0761..2c93863e 100644
--- a/src/butil/single_iobuf.cpp
+++ b/src/butil/single_iobuf.cpp
@@ -271,7 +271,7 @@ int SingleIOBuf::assign_user_data(void* data, size_t size, 
std::function<void(vo
         deleter = ::free;
     }
     reset();
-    IOBuf::Block* b = new (mem) IOBuf::Block((char*)data, size, deleter);
+    IOBuf::Block* b = new (mem) IOBuf::Block((char*)data, size, 
std::move(deleter));
     _cur_ref.offset = 0;
     _cur_ref.length = b->cap;
     _cur_ref.block = b;
diff --git a/test/iobuf_unittest.cpp b/test/iobuf_unittest.cpp
index 9f9cc387..4ad485a3 100644
--- a/test/iobuf_unittest.cpp
+++ b/test/iobuf_unittest.cpp
@@ -1741,6 +1741,35 @@ TEST_F(IOBufTest, append_user_data_with_meta) {
     }
 }
 
+TEST_F(IOBufTest, append_stateful_user_data_with_meta) {
+    int calls = 0;
+    auto data = std::make_shared<std::string>("user data");
+    std::weak_ptr<std::string> weak_data = data;
+    butil::IOBuf buf;
+    ASSERT_EQ(0, buf.append_user_data_with_meta(
+        &(*data)[0], data->size(),
+        [data, &calls](void* ptr) {
+            EXPECT_EQ(data->data(), ptr);
+            ++calls;
+        }, UINT64_C(0x123456789abcdef0)));
+    data.reset();
+
+    butil::IOBuf prefix;
+    ASSERT_EQ(4u, buf.cutn(&prefix, 4));
+    butil::IOBuf shared(buf);
+    EXPECT_EQ(UINT64_C(0x123456789abcdef0), prefix.get_first_data_meta());
+    EXPECT_EQ(UINT64_C(0x123456789abcdef0), shared.get_first_data_meta());
+    EXPECT_EQ("user", prefix.to_string());
+    EXPECT_EQ(" data", shared.to_string());
+    buf.clear();
+    prefix.clear();
+    EXPECT_EQ(0, calls);
+    EXPECT_FALSE(weak_data.expired());
+    shared.clear();
+    EXPECT_EQ(1, calls);
+    EXPECT_TRUE(weak_data.expired());
+}
+
 TEST_F(IOBufTest, share_tls_block) {
     butil::iobuf::remove_tls_block_chain();
     butil::IOBuf::Block* b = butil::iobuf::acquire_tls_block();
@@ -1980,6 +2009,45 @@ TEST_F(IOBufTest, single_iobuf_assign_large_multi_block) 
{
               std::string((const char*)sbuf.get_begin(), n1 + n2));
 }
 
+TEST_F(IOBufTest, single_iobuf_assign_stateful_user_data) {
+    struct Deleter {
+        Deleter(std::shared_ptr<std::string> data, int* copies, int* calls)
+            : data(std::move(data)), copies(copies), calls(calls) {}
+        Deleter(const Deleter& other)
+            : data(other.data), copies(other.copies), calls(other.calls) {
+            ++*copies;
+        }
+        Deleter(Deleter&&) noexcept = default;
+        void operator()(void* ptr) {
+            EXPECT_EQ(data->data(), ptr);
+            ++*calls;
+        }
+        std::shared_ptr<std::string> data;
+        int* copies;
+        int* calls;
+    };
+
+    int copies = 0;
+    int calls = 0;
+    auto data = std::make_shared<std::string>("user data");
+    std::weak_ptr<std::string> weak_data = data;
+    butil::SingleIOBuf buf;
+    ASSERT_EQ(0, buf.assign_user_data(
+        &(*data)[0], data->size(), Deleter(data, &copies, &calls)));
+    EXPECT_EQ(0, copies);
+    data.reset();
+
+    butil::IOBuf shared;
+    buf.append_to(&shared);
+    buf.reset();
+    EXPECT_EQ("user data", shared.to_string());
+    EXPECT_EQ(0, calls);
+    EXPECT_FALSE(weak_data.expired());
+    shared.clear();
+    EXPECT_EQ(1, calls);
+    EXPECT_TRUE(weak_data.expired());
+}
+
 TEST_F(IOBufTest, as_input_stream_basic) {
     butil::IOBuf buf;
     buf.append("hello world");


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to