commit bbf0b4d9d1cd2ea498222485405912d6ab76a8db
author Marin Shalamanov <shalamanov@google.com> Thu Sep 03 18:26:21 2020 +0200
committer Marin Shalamanov <shalamanov@google.com> Thu Sep 03 18:27:47 2020 +0200
tree 895733523f22daaec6671e01b2a40cf421c7f5d0
parent a52ade19d81810937fac4b86d99f9edc843c1194

SF: In dumpsys add head row for "Allocated buffers" table

Now the table looks like this:

    Handle |        Size |     W (Stride) x H | Layers |   Format |      Usage | Requestor
0xead7d500 | 8100.00 KiB | 1920 (1920) x 1080 |      1 |       2B | 0x20000b00 | BootAnimation#0
0xeaf17000 | 8100.00 KiB | 1920 (1920) x 1080 |      1 |        1 | 0x    1a00 | FramebufferSurface
0xeaf17100 | 8100.00 KiB | 1920 (1920) x 1080 |      1 |        1 | 0x    1a00 | FramebufferSurface

Test: adb shell dumpsys SurfaceFlinger
Change-Id: I5f8c77375818e5232d98b8631a39a0a0545d9224

libs/ui/GraphicBufferAllocator.cpp

diff --git a/libs/ui/GraphicBufferAllocator.cpp b/libs/ui/GraphicBufferAllocator.cpp
index 943d13e..91d2d58 100644
--- a/libs/ui/GraphicBufferAllocator.cpp
+++ b/libs/ui/GraphicBufferAllocator.cpp
@@ -83,20 +83,17 @@
     KeyedVector<buffer_handle_t, alloc_rec_t>& list(sAllocList);
     uint64_t total = 0;
     result.append("GraphicBufferAllocator buffers:\n");
-    const size_t c = list.size();
-    for (size_t i=0 ; i<c ; i++) {
+    const size_t count = list.size();
+    StringAppendF(&result, "%10s | %11s | %18s | %s | %8s | %10s | %s\n", "Handle", "Size",
+                  "W (Stride) x H", "Layers", "Format", "Usage", "Requestor");
+    for (size_t i = 0; i < count; i++) {
         const alloc_rec_t& rec(list.valueAt(i));
-        if (rec.size) {
-            StringAppendF(&result,
-                          "%10p: %7.2f KiB | %4u (%4u) x %4u | %4u | %8X | 0x%" PRIx64 " | %s\n",
-                          list.keyAt(i), static_cast<double>(rec.size) / 1024.0, rec.width, rec.stride, rec.height,
-                          rec.layerCount, rec.format, rec.usage, rec.requestorName.c_str());
-        } else {
-            StringAppendF(&result,
-                          "%10p: unknown     | %4u (%4u) x %4u | %4u | %8X | 0x%" PRIx64 " | %s\n",
-                          list.keyAt(i), rec.width, rec.stride, rec.height, rec.layerCount,
-                          rec.format, rec.usage, rec.requestorName.c_str());
-        }
+        std::string sizeStr = (rec.size)
+                ? base::StringPrintf("%7.2f KiB", static_cast<double>(rec.size) / 1024.0)
+                : "unknown";
+        StringAppendF(&result, "%10p | %11s | %4u (%4u) x %4u | %6u | %8X | 0x%8" PRIx64 " | %s\n",
+                      list.keyAt(i), sizeStr.c_str(), rec.width, rec.stride, rec.height,
+                      rec.layerCount, rec.format, rec.usage, rec.requestorName.c_str());
         total += rec.size;
     }
     StringAppendF(&result, "Total allocated by GraphicBufferAllocator (estimate): %.2f KB\n",