From b1f1381538d649db299042cc215499bcf717a412 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 3 Dec 2014 22:39:29 -0800 Subject: [PATCH] ceph-dencoder: mark OSDMap as featureful, but with stray data Signed-off-by: Sage Weil --- src/test/encoding/ceph_dencoder.cc | 4 ++++ src/test/encoding/types.h | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/test/encoding/ceph_dencoder.cc b/src/test/encoding/ceph_dencoder.cc index 3d7d800cce2..d5068a1a4d4 100644 --- a/src/test/encoding/ceph_dencoder.cc +++ b/src/test/encoding/ceph_dencoder.cc @@ -12,12 +12,14 @@ #define TYPE(t) #define TYPEWITHSTRAYDATA(t) #define TYPE_FEATUREFUL(t) +#define TYPE_FEATUREFUL_STRAYDATA(t) #define TYPE_NOCOPY(t) #define MESSAGE(t) #include "types.h" #undef TYPE #undef TYPEWITHSTRAYDATA #undef TYPE_FEATUREFUL +#undef TYPE_FEATUREFUL_STRAYDATA #undef TYPE_NOCOPY #undef MESSAGE @@ -239,12 +241,14 @@ int main(int argc, const char **argv) #define TYPE(t) dencoders[T_STRINGIFY(t)] = new DencoderImplNoFeature(false); #define TYPEWITHSTRAYDATA(t) dencoders[T_STRINGIFY(t)] = new DencoderImplNoFeature(true); #define TYPE_FEATUREFUL(t) dencoders[T_STRINGIFY(t)] = new DencoderImplFeatureful(false); +#define TYPE_FEATUREFUL_STRAYDATA(t) dencoders[T_STRINGIFY(t)] = new DencoderImplFeatureful(true); #define TYPE_NOCOPY(t) dencoders[T_STRINGIFY(t)] = new DencoderImplNoFeatureNoCopy(false); #define MESSAGE(t) dencoders[T_STRINGIFY(t)] = new MessageDencoderImpl; #include "types.h" #undef TYPE #undef TYPEWITHSTRAYDATA #undef TYPE_FEATUREFUL +#undef TYPE_FEATUREFUL_STRAYDATA #undef T_STR #undef T_STRINGIFY diff --git a/src/test/encoding/types.h b/src/test/encoding/types.h index 9619072cb43..1b030c5bc83 100644 --- a/src/test/encoding/types.h +++ b/src/test/encoding/types.h @@ -30,8 +30,8 @@ TYPE(entity_addr_t) #include "osd/OSDMap.h" TYPE(osd_info_t) TYPE(osd_xinfo_t) -TYPEWITHSTRAYDATA(OSDMap) -TYPEWITHSTRAYDATA(OSDMap::Incremental) +TYPE_FEATUREFUL_STRAYDATA(OSDMap) +TYPE_FEATUREFUL_STRAYDATA(OSDMap::Incremental) #include "crush/CrushWrapper.h" TYPE_NOCOPY(CrushWrapper) -- 2.47.3