ceph-dencoder: add osd_reqid_t

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>

diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index e8381689010086e1675bd0192d3cac028ff79e2e..92096acf82a43cf923545a2997db6bd2aae1cad7 100644 (file)
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -34,6 +34,19 @@ void osd_reqid_t::decode(bufferlist::iterator &bl)
   ::decode(inc, bl);
 }
 
+void osd_reqid_t::dump(Formatter *f) const
+{
+  f->dump_stream("name") << name;
+  f->dump_int("inc", inc);
+  f->dump_unsigned("tid", tid);
+}
+
+void osd_reqid_t::generate_test_instances(list<osd_reqid_t*>& o)
+{
+  o.push_back(new osd_reqid_t);
+  o.push_back(new osd_reqid_t(entity_name_t::CLIENT(123), 1, 45678));
+}
+
 // -- osd_stat_t --
 void osd_stat_t::dump(Formatter *f) const
 {

diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index 23dde8eff25d3c08e9027a84a6e03b257c4bda3a..0b1e8bfeb8b51e47fb5d4bf82b7c1f4bebada1b4 100644 (file)
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -58,6 +58,8 @@ struct osd_reqid_t {
 
   void encode(bufferlist &bl) const;
   void decode(bufferlist::iterator &bl);
+  void dump(Formatter *f) const;
+  static void generate_test_instances(list<osd_reqid_t*>& o);
 };
 WRITE_CLASS_ENCODER(osd_reqid_t)
 

diff --git a/src/test/encoding/types.h b/src/test/encoding/types.h
index 131b3a24e60d1511e25ab6fc4c8e19782cac2443..92b53da2149f220521d94606ee7cc6446d8472dc 100644 (file)
--- a/src/test/encoding/types.h
+++ b/src/test/encoding/types.h
@@ -26,6 +26,7 @@ TYPE(PG::Interval)
 TYPE(PG::OndiskLog)
 
 #include "osd/osd_types.h"
+TYPE(osd_reqid_t)
 TYPE(pg_t)
 TYPE(coll_t)
 TYPE(osd_stat_t)