buffer: hide iterator_impl symbols

buffer::list::iterator_impl symbols are referenced by const_iterator
and iterator, and are exposed as weak symbols. if a source file is
compiled using the buffer.h, the produced object file will reference
these symbols as well, so we'd better hiding them and avoid using
them in the header file.
as a side-effect, buffer::list::const_iterator is also hidden, but
currently we don't have any librados client using this class, so
we can just leave it as an internal class at this moment.

Fixes: #14788
Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/common/buffer.cc b/src/common/buffer.cc
index f819f039823baf1506d571e804e611b32d37d318..6a56c1b33b65494e47079a69a1d1d30de2e52898 100644 (file)
--- a/src/common/buffer.cc
+++ b/src/common/buffer.cc
@@ -961,6 +961,13 @@ static simple_spinlock_t buffer_debug_lock = SIMPLE_SPINLOCK_INITIALIZER;
     return *this;
     }*/
 
+  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)
+  {
+    advance(o);
+  }
+
   template<bool is_const>
   void buffer::list::iterator_impl<is_const>::advance(int o)
   {
@@ -1131,6 +1138,14 @@ static simple_spinlock_t buffer_debug_lock = SIMPLE_SPINLOCK_INITIALIZER;
   template class buffer::list::iterator_impl<true>;
   template class buffer::list::iterator_impl<false>;
 
+  buffer::list::iterator::iterator(bl_t *l, unsigned o)
+    : iterator_impl(l, o)
+  {}
+
+  buffer::list::iterator::iterator(bl_t *l, unsigned o, list_iter_t ip, unsigned po)
+    : iterator_impl(l, o, ip, po)
+  {}
+
   void buffer::list::iterator::advance(int o)
   {
     buffer::list::iterator_impl<false>::advance(o);

diff --git a/src/include/buffer.h b/src/include/buffer.h
index a1a273dd33177f07c1024d1e96e2585ad8a53ba1..815ff42b9ae8573fe35a0b49e9c316442fb91000 100644 (file)
--- a/src/include/buffer.h
+++ b/src/include/buffer.h
@@ -57,8 +57,10 @@
 
 #if __GNUC__ >= 4
   #define CEPH_BUFFER_API  __attribute__ ((visibility ("default")))
+  #define CEPH_BUFFER_DETAILS __attribute__ ((visibility ("hidden")))
 #else
   #define CEPH_BUFFER_API
+  #define CEPH_BUFFER_DETAILS
 #endif
 
 #if defined(HAVE_XIO)
@@ -263,7 +265,8 @@ namespace buffer CEPH_BUFFER_API {
     ptr append_buffer;  // where i put small appends.
 
     template <bool is_const>
-    class iterator_impl: public std::iterator<std::forward_iterator_tag, char> {
+    class CEPH_BUFFER_DETAILS iterator_impl
+      : public std::iterator<std::forward_iterator_tag, char> {
     protected:
       typedef typename std::conditional<is_const,
                                        const list,
@@ -284,10 +287,7 @@ namespace buffer CEPH_BUFFER_API {
       // constructor.  position.
       iterator_impl()
        : bl(0), ls(0), off(0), p_off(0) {}
-      iterator_impl(bl_t *l, unsigned o=0)
-       : bl(l), ls(&bl->_buffers), off(0), p(ls->begin()), p_off(0) {
-       advance(o);
-      }
+      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) {}
 
@@ -326,11 +326,9 @@ namespace buffer CEPH_BUFFER_API {
 
     class CEPH_BUFFER_API iterator : public iterator_impl<false> {
     public:
-      iterator(): iterator_impl() {}
-      iterator(bl_t *l, unsigned o=0) :
-       iterator_impl(l, o) {}
-      iterator(bl_t *l, unsigned o, list_iter_t ip, unsigned po) :
-       iterator_impl(l, o, ip, po) {}
+      iterator() = default;
+      iterator(bl_t *l, unsigned o=0);
+      iterator(bl_t *l, unsigned o, list_iter_t ip, unsigned po);
 
       void advance(int o);
       void seek(unsigned o);