From 8408e216072868985d8a0d2e716e9def95641a2f Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Tue, 9 Oct 2018 17:18:29 +0200 Subject: [PATCH] common: reorder bl::iter to reduce its size from 40 to 32 on x86_64. Signed-off-by: Radoslaw Zarzynski --- src/common/buffer.cc | 2 +- src/include/buffer.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/buffer.cc b/src/common/buffer.cc index c0c23f4bedc0..3779740ba1e6 100644 --- a/src/common/buffer.cc +++ b/src/common/buffer.cc @@ -839,7 +839,7 @@ using namespace ceph; template buffer::list::iterator_impl::iterator_impl(bl_t *l, unsigned o) - : bl(l), ls(&bl->_buffers), off(0), p(ls->begin()), p_off(0) + : bl(l), ls(&bl->_buffers), p(ls->begin()), off(0), p_off(0) { advance(o); } diff --git a/src/include/buffer.h b/src/include/buffer.h index 1c941db15ce0..784de0b0386e 100644 --- a/src/include/buffer.h +++ b/src/include/buffer.h @@ -412,8 +412,8 @@ namespace buffer CEPH_BUFFER_API { typename std::list::iterator>::type list_iter_t; bl_t* bl; list_t* ls; // meh.. just here to avoid an extra pointer dereference.. - unsigned off; // in bl list_iter_t p; + unsigned off; // in bl unsigned p_off; // in *p friend class iterator_impl; @@ -423,7 +423,7 @@ namespace buffer CEPH_BUFFER_API { : bl(0), ls(0), off(0), p_off(0) {} iterator_impl(bl_t *l, unsigned o=0); iterator_impl(bl_t *l, unsigned o, list_iter_t ip, unsigned po) - : bl(l), ls(&bl->_buffers), off(o), p(ip), p_off(po) {} + : bl(l), ls(&bl->_buffers), p(ip), off(o), p_off(po) {} iterator_impl(const list::iterator& i); /// get current iterator offset in buffer::list -- 2.47.3