From e2dde5ff0187c24cf7a44fb53adfa8eebb3828c6 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sat, 24 Mar 2018 20:30:05 -0500 Subject: [PATCH] buffer: kill push_front Signed-off-by: Sage Weil --- src/include/buffer.h | 15 ----------- src/test/bufferlist.cc | 60 ------------------------------------------ 2 files changed, 75 deletions(-) diff --git a/src/include/buffer.h b/src/include/buffer.h index 0f51d9d22d8..e110b74b2c0 100644 --- a/src/include/buffer.h +++ b/src/include/buffer.h @@ -751,21 +751,6 @@ namespace buffer CEPH_BUFFER_API { last_p = begin(); append_buffer = ptr(); } - void push_front(ptr& bp) { - if (bp.length() == 0) - return; - _buffers.push_front(bp); - _len += bp.length(); - } - void push_front(ptr&& bp) { - if (bp.length() == 0) - return; - _len += bp.length(); - _buffers.push_front(std::move(bp)); - } - void push_front(raw *r) { - push_front(ptr(r)); - } void push_back(const ptr& bp) { if (bp.length() == 0) return; diff --git a/src/test/bufferlist.cc b/src/test/bufferlist.cc index bb9e91e0f27..9fa151bc00c 100644 --- a/src/test/bufferlist.cc +++ b/src/test/bufferlist.cc @@ -1817,66 +1817,6 @@ TEST(BufferList, clear) { EXPECT_EQ((unsigned)0, bl.get_num_buffers()); } -TEST(BufferList, push_front) { - // - // void push_front(ptr& bp) - // - { - bufferlist bl; - bufferptr ptr; - bl.push_front(ptr); - EXPECT_EQ((unsigned)0, bl.length()); - EXPECT_EQ((unsigned)0, bl.get_num_buffers()); - } - unsigned len = 17; - { - bufferlist bl; - bl.append('A'); - bufferptr ptr(len); - ptr.c_str()[0] = 'B'; - bl.push_front(ptr); - EXPECT_EQ((unsigned)(1 + len), bl.length()); - EXPECT_EQ((unsigned)2, bl.get_num_buffers()); - EXPECT_EQ('B', bl.front()[0]); - EXPECT_EQ(ptr.get_raw(), bl.front().get_raw()); - } - // - // void push_front(raw *r) - // - { - bufferlist bl; - bl.append('A'); - bufferptr ptr(len); - ptr.c_str()[0] = 'B'; - bl.push_front(ptr.get_raw()); - EXPECT_EQ((unsigned)(1 + len), bl.length()); - EXPECT_EQ((unsigned)2, bl.get_num_buffers()); - EXPECT_EQ('B', bl.front()[0]); - EXPECT_EQ(ptr.get_raw(), bl.front().get_raw()); - } - // - // void push_front(ptr&& bp) - // - { - bufferlist bl; - bufferptr ptr; - bl.push_front(std::move(ptr)); - EXPECT_EQ((unsigned)0, bl.length()); - EXPECT_EQ((unsigned)0, bl.buffers().size()); - } - { - bufferlist bl; - bl.append('A'); - bufferptr ptr(len); - ptr.c_str()[0] = 'B'; - bl.push_front(std::move(ptr)); - EXPECT_EQ((unsigned)(1 + len), bl.length()); - EXPECT_EQ((unsigned)2, bl.buffers().size()); - EXPECT_EQ('B', bl.buffers().front()[0]); - EXPECT_FALSE(ptr.get_raw()); - } -} - TEST(BufferList, push_back) { // // void push_back(ptr& bp) -- 2.39.5