crush: factor out dump_rules from dump

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

diff --git a/src/crush/CrushWrapper.cc b/src/crush/CrushWrapper.cc
index 6001557e737ac89a5e4621b49a70f2575ac03f6c..bae264245f7b59c35d3403aee3c0ef0035cd3850 100644 (file)
--- a/src/crush/CrushWrapper.cc
+++ b/src/crush/CrushWrapper.cc
@@ -859,6 +859,12 @@ void CrushWrapper::dump(Formatter *f) const
   f->close_section();
 
   f->open_array_section("rules");
+  dump_rules(f);
+  f->close_section();
+}
+
+void CrushWrapper::dump_rules(Formatter *f) const
+{
   for (int i=0; i<get_max_rules(); i++) {
     if (!rule_exists(i))
       continue;
@@ -914,7 +920,6 @@ void CrushWrapper::dump(Formatter *f) const
     f->close_section();
     f->close_section();
   }
-  f->close_section();
 }
 
 void CrushWrapper::generate_test_instances(list<CrushWrapper*>& o)

diff --git a/src/crush/CrushWrapper.h b/src/crush/CrushWrapper.h
index 6e10b3ba417d7a0fdfebc925288135ea8257dd6f..df2c620a82e65dcd18571e6ee5bb11b4e53ad13b 100644 (file)
--- a/src/crush/CrushWrapper.h
+++ b/src/crush/CrushWrapper.h
@@ -739,6 +739,7 @@ public:
   void decode(bufferlist::iterator &blp);
   void decode_crush_bucket(crush_bucket** bptr, bufferlist::iterator &blp);
   void dump(Formatter *f) const;
+  void dump_rules(Formatter *f) const;
   static void generate_test_instances(list<CrushWrapper*>& o);
 };
 WRITE_CLASS_ENCODER(CrushWrapper)