From: Allen Samuels <allen.samuels@sandisk.com>
Date: Sat, 3 Dec 2016 00:51:27 +0000 (-0800)
Subject: mempool: Add string to mempool data types.
X-Git-Tag: v12.0.0~181^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=78125f7dc60e1a5d05a922dab8a0d2c2327e1daa;p=ceph-ci.git

mempool: Add string to mempool data types.

Signed-off-by: Allen Samuels <allen.samuels@sandisk.com>
---

diff --git a/src/include/mempool.h b/src/include/mempool.h
index a95ce57dab7..6d434e8dd17 100644
--- a/src/include/mempool.h
+++ b/src/include/mempool.h
@@ -366,23 +366,33 @@ public:
     static const mempool::pool_index_t id = mempool::mempool_##x;	\
     template<typename v>						\
     using pool_allocator = mempool::pool_allocator<id,v>;		\
+                                                                        \
+    using string = std::basic_string<char,std::char_traits<char>,       \
+                                     pool_allocator<char>>;             \
+                                                                        \
     template<typename k,typename v, typename cmp = std::less<k> >	\
     using map = std::map<k, v, cmp,					\
 			 pool_allocator<std::pair<k,v>>>;		\
+                                                                        \
     template<typename k,typename v, typename cmp = std::less<k> >	\
     using multimap = std::multimap<k,v,cmp,				\
 				   pool_allocator<std::pair<k,v>>>;	\
+                                                                        \
     template<typename k, typename cmp = std::less<k> >			\
     using set = std::set<k,cmp,pool_allocator<k>>;			\
+                                                                        \
     template<typename v>						\
     using list = std::list<v,pool_allocator<v>>;			\
+                                                                        \
     template<typename v>						\
     using vector = std::vector<v,pool_allocator<v>>;			\
+                                                                        \
     template<typename k, typename v,					\
 	     typename h=std::hash<k>,					\
 	     typename eq = std::equal_to<k>>				\
     using unordered_map =						\
       std::unordered_map<k,v,h,eq,pool_allocator<std::pair<k,v>>>;	\
+                                                                        \
     inline size_t allocated_bytes() {					\
       return mempool::get_pool(id).allocated_bytes();			\
     }									\
diff --git a/src/test/test_mempool.cc b/src/test/test_mempool.cc
index 4113c53d27e..e2a8895c3b6 100644
--- a/src/test/test_mempool.cc
+++ b/src/test/test_mempool.cc
@@ -277,6 +277,18 @@ TEST(mempool, bufferlist)
   ASSERT_GE(after, before + len);
 }
 
+TEST(mempool, string_test)
+{
+  mempool::unittest_2::string s;
+  s.reserve(100);
+  EXPECT_GE(mempool::unittest_2::allocated_items(), s.capacity() + 1u); // +1 for zero-byte termination :
+  for (size_t i = 0; i < 10; ++i) {
+    s += '1';
+    s.append(s);
+    EXPECT_GE(mempool::unittest_2::allocated_items(), s.capacity() + 1u);
+  }
+}
+
 int main(int argc, char **argv)
 {
   vector<const char*> args;