common: reorder bl::iter to reduce its size from 40 to 32 on x86_64.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

diff --git a/src/common/buffer.cc b/src/common/buffer.cc
index c0c23f4bedc03d1ed4bc2c7afe8e2eace889be67..3779740ba1e6831d2f0d854160bc91c5ff1d7ba0 100644 (file)
--- a/src/common/buffer.cc
+++ b/src/common/buffer.cc
@@ -839,7 +839,7 @@ using namespace ceph;
 
   template<bool is_const>
   buffer::list::iterator_impl<is_const>::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 1c941db15ce0c807d4f2fa9bbe025cf8ac1fa322..784de0b0386ed223b813526704f30e0e919d5201 100644 (file)
--- a/src/include/buffer.h
+++ b/src/include/buffer.h
@@ -412,8 +412,8 @@ namespace buffer CEPH_BUFFER_API {
                                        typename std::list<ptr>::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<true>;
 
@@ -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