commit e70461ad2658371bc06adef2307fbdef6e39cca8
author Dominik Laskowski <domlaskowski@google.com> Tue Aug 30 14:42:01 2022 -0700
committer Dominik Laskowski <domlaskowski@google.com> Thu Sep 29 18:03:45 2022 -0400
tree fd51a46cc61c2d0259340e9b884c0f37f361db71
parent f2fdb56c787297cb92029ac107d407dc8d3f94d3

SF: Add utility class for dumpsys formatting

The Dumper class automates stringifying (a minimal set of types for now)
and indenting.

Bug: 241285876
Test: dumpsys SurfaceFlinger --displays
Change-Id: I5581cd9cb4235e2c710e303b6ab634847554cc30

services/surfaceflinger/Display/DisplaySnapshot.cpp

diff --git a/services/surfaceflinger/Display/DisplaySnapshot.cpp b/services/surfaceflinger/Display/DisplaySnapshot.cpp
index b4f104a..fca3a3d 100644
--- a/services/surfaceflinger/Display/DisplaySnapshot.cpp
+++ b/services/surfaceflinger/Display/DisplaySnapshot.cpp
@@ -41,18 +41,11 @@
             .transform(&ftl::to_key<DisplayModes>);
 }
 
-void DisplaySnapshot::dump(std::string& out) const {
-    using namespace std::string_literals;
+void DisplaySnapshot::dump(utils::Dumper& dumper) const {
+    using namespace std::string_view_literals;
 
-    out += "   connectionType="s;
-    out += ftl::enum_string(mConnectionType);
-
-    out += "\n   deviceProductInfo="s;
-    if (mDeviceProductInfo) {
-        mDeviceProductInfo->dump(out);
-    } else {
-        out += "{}"s;
-    }
+    dumper.dump("connectionType"sv, ftl::enum_string(mConnectionType));
+    dumper.dump("deviceProductInfo"sv, mDeviceProductInfo);
 }
 
 } // namespace android::display

services/surfaceflinger/Display/DisplaySnapshot.h

diff --git a/services/surfaceflinger/Display/DisplaySnapshot.h b/services/surfaceflinger/Display/DisplaySnapshot.h
index 0279220..3f34e39 100644
--- a/services/surfaceflinger/Display/DisplaySnapshot.h
+++ b/services/surfaceflinger/Display/DisplaySnapshot.h
@@ -17,12 +17,12 @@
 #pragma once
 
 #include <optional>
-#include <string>
 
 #include <ui/DisplayId.h>
 #include <ui/StaticDisplayInfo.h>
 
-#include "../DisplayHardware/DisplayMode.h"
+#include "DisplayHardware/DisplayMode.h"
+#include "Utils/Dumper.h"
 
 namespace android::display {
 
@@ -43,7 +43,7 @@
     const auto& displayModes() const { return mDisplayModes; }
     const auto& deviceProductInfo() const { return mDeviceProductInfo; }
 
-    void dump(std::string&) const;
+    void dump(utils::Dumper&) const;
 
 private:
     const PhysicalDisplayId mDisplayId;