From: Vu Pham Date: Fri, 12 Jun 2015 16:50:28 +0000 (-0700) Subject: xio: fix to work with the merge of pull request #4707 X-Git-Tag: v9.0.3~131^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=47a844785a5b4410e9bd31629a258686eb9beaab;p=ceph.git xio: fix to work with the merge of pull request #4707 fix xio to work with the merge of pull request " Removed unnecessary inclusion of iostream in several files #4707" Signed-off-by: Vu Pham --- diff --git a/src/msg/xio/XioPool.cc b/src/msg/xio/XioPool.cc index 8b13c5bbe63c0..5f0d77a27b6c7 100644 --- a/src/msg/xio/XioPool.cc +++ b/src/msg/xio/XioPool.cc @@ -12,6 +12,7 @@ * */ +#include #include "XioPool.h" XioPoolStats xp_stats; @@ -19,4 +20,22 @@ XioPoolStats xp_stats; bool XioPool::trace_mempool = 0; bool XioPool::trace_msgcnt = 0; - +void XioPoolStats::dump(const char* tag, uint64_t serial) +{ + std::cout + << tag << " #" << serial << ": " + << "pool objs: " + << "64: " << ctr_set[SLAB_64].read() << " " + << "256: " << ctr_set[SLAB_256].read() << " " + << "1024: " << ctr_set[SLAB_1024].read() << " " + << "page: " << ctr_set[SLAB_PAGE].read() << " " + << "max: " << ctr_set[SLAB_MAX].read() << " " + << "overflow: " << ctr_set[SLAB_OVERFLOW].read() << " " + << std::endl; + std::cout + << tag << " #" << serial << ": " + << " msg objs: " + << "in: " << hook_cnt.read() << " " + << "out: " << msg_cnt.read() << " " + << std::endl; +} diff --git a/src/msg/xio/XioPool.h b/src/msg/xio/XioPool.h index cd74803eae081..c8e7b87a76b36 100644 --- a/src/msg/xio/XioPool.h +++ b/src/msg/xio/XioPool.h @@ -107,24 +107,7 @@ public: } } - void dump(const char* tag, uint64_t serial) { - std::cout - << tag << " #" << serial << ": " - << "pool objs: " - << "64: " << ctr_set[SLAB_64].read() << " " - << "256: " << ctr_set[SLAB_256].read() << " " - << "1024: " << ctr_set[SLAB_1024].read() << " " - << "page: " << ctr_set[SLAB_PAGE].read() << " " - << "max: " << ctr_set[SLAB_MAX].read() << " " - << "overflow: " << ctr_set[SLAB_OVERFLOW].read() << " " - << std::endl; - std::cout - << tag << " #" << serial << ": " - << " msg objs: " - << "in: " << hook_cnt.read() << " " - << "out: " << msg_cnt.read() << " " - << std::endl; - } + void dump(const char* tag, uint64_t serial); void inc(uint64_t size) { if (size <= 64) {