From 64ae61a516112574b5a3f54ffd9935e43a61a6e2 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 25 Apr 2017 18:26:08 -0400 Subject: [PATCH] osd/OSDMap: put OSDMap[::Incremental] itself in mempool too Signed-off-by: Sage Weil --- src/osd/OSDMap.cc | 4 ++++ src/osd/OSDMap.h | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc index 10223af137e..9fb9000a0dc 100644 --- a/src/osd/OSDMap.cc +++ b/src/osd/OSDMap.cc @@ -30,6 +30,10 @@ #define dout_subsys ceph_subsys_osd +MEMPOOL_DEFINE_OBJECT_FACTORY(OSDMap, osdmap, osdmap); +MEMPOOL_DEFINE_OBJECT_FACTORY(OSDMap::Incremental, osdmap_inc, osdmap); + + // ---------------------------------- // osd_info_t diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h index 691a413b60e..aa431389dc0 100644 --- a/src/osd/OSDMap.h +++ b/src/osd/OSDMap.h @@ -117,10 +117,13 @@ ostream& operator<<(ostream& out, const osd_xinfo_t& xi); /** OSDMap */ class OSDMap { - public: + MEMPOOL_CLASS_HELPERS(); + class Incremental { public: + MEMPOOL_CLASS_HELPERS(); + /// feature bits we were encoded with. the subsequent OSDMap /// encoding should match. uint64_t encode_features; -- 2.39.5