Merge pull request ceph#65403 from MaxKellermann/Formatter__split

common/Formatter: move {JSON,Table,XML}Formatter to separate files

Reviewed-by: Adam Emerson <[email protected]>
Reviewed-by: Ilya Dryomov <[email protected]>
Tested-by: anrao19

Author: MaxKellermann

src/ceph_mon.cc

@@ -35,6 +35,7 @@
 
 #include "common/ceph_argparse.h"
 #include "common/pick_address.h"
+#include "common/JSONFormatter.h"
 #include "common/Throttle.h"
 #include "common/Timer.h"
 #include "common/errno.h"

src/common/AsyncReserver.h

@@ -15,7 +15,7 @@
 #ifndef ASYNC_RESERVER_H
 #define ASYNC_RESERVER_H
 
-#include "common/Formatter.h"
+#include "common/JSONFormatter.h"
 #include "common/ceph_context.h"
 #include "common/ceph_mutex.h"
 #include "include/Context.h"

src/common/CMakeLists.txt

@@ -29,6 +29,7 @@ set(common_srcs
   FixedCDC.cc
   Formatter.cc
   Graylog.cc
+  JSONFormatter.cc
   HTMLFormatter.cc
   HeartbeatMap.cc
   LogClient.cc
@@ -39,12 +40,14 @@ set(common_srcs
   Readahead.cc
   RefCountedObj.cc
   SloppyCRCMap.cc
+  TableFormatter.cc
   Thread.cc
   Throttle.cc
   Timer.cc
   TracepointProvider.cc
   TrackedOp.cc
   WorkQueue.cc
+  XMLFormatter.cc
   admin_socket.cc
   admin_socket_client.cc
   assert.cc