diff options
7 files changed, 19 insertions, 7 deletions
diff --git a/services/surfaceflinger/CompositionEngine/src/DumpHelpers.cpp b/services/surfaceflinger/CompositionEngine/src/DumpHelpers.cpp index c49701315b..959843050c 100644 --- a/services/surfaceflinger/CompositionEngine/src/DumpHelpers.cpp +++ b/services/surfaceflinger/CompositionEngine/src/DumpHelpers.cpp @@ -24,7 +24,7 @@ namespace android::compositionengine::impl { using android::base::StringAppendF; void dumpVal(std::string& out, const char* name, bool value) { - StringAppendF(&out, "%s=%c ", name, value ? 'T' : 'F'); + StringAppendF(&out, "%s=%s ", name, value ? "true" : "false"); } void dumpVal(std::string& out, const char* name, const void* value) { @@ -56,7 +56,7 @@ void dumpVal(std::string& out, const char* name, const std::string& value) { } void dumpVal(std::string& out, const char* name, const char* valueName, int value) { - StringAppendF(&out, "%s=%s (%d)", name, valueName, value); + StringAppendF(&out, "%s=%s (%d) ", name, valueName, value); } void dumpVal(std::string& out, const char* name, const std::string& valueName, int value) { diff --git a/services/surfaceflinger/CompositionEngine/src/Layer.cpp b/services/surfaceflinger/CompositionEngine/src/Layer.cpp index 109e9f8438..96e9731768 100644 --- a/services/surfaceflinger/CompositionEngine/src/Layer.cpp +++ b/services/surfaceflinger/CompositionEngine/src/Layer.cpp @@ -52,7 +52,9 @@ LayerCompositionState& Layer::editState() { } void Layer::dump(std::string& out) const { - android::base::StringAppendF(&out, " Layer %p\n", this); + auto layerFE = getLayerFE(); + android::base::StringAppendF(&out, "* compositionengine::Layer %p (%s)\n", this, + layerFE ? layerFE->getDebugName() : "<unknown>"); mState.dump(out); } diff --git a/services/surfaceflinger/CompositionEngine/src/Output.cpp b/services/surfaceflinger/CompositionEngine/src/Output.cpp index ad4c7bf501..d22bdaf625 100644 --- a/services/surfaceflinger/CompositionEngine/src/Output.cpp +++ b/services/surfaceflinger/CompositionEngine/src/Output.cpp @@ -147,7 +147,7 @@ void Output::dumpBase(std::string& out) const { out.append(" No render surface!\n"); } - out.append("\n %d Layers", mOutputLayersOrderedByZ.size()); + android::base::StringAppendF(&out, "\n %zu Layers\b", mOutputLayersOrderedByZ.size()); for (const auto& outputLayer : mOutputLayersOrderedByZ) { if (!outputLayer) { continue; diff --git a/services/surfaceflinger/CompositionEngine/src/OutputCompositionState.cpp b/services/surfaceflinger/CompositionEngine/src/OutputCompositionState.cpp index 78807ffa9f..9549054bd6 100644 --- a/services/surfaceflinger/CompositionEngine/src/OutputCompositionState.cpp +++ b/services/surfaceflinger/CompositionEngine/src/OutputCompositionState.cpp @@ -20,6 +20,7 @@ namespace android::compositionengine::impl { void OutputCompositionState::dump(std::string& out) const { + out.append(" "); dumpVal(out, "isEnabled", isEnabled); dumpVal(out, "isSecure", isSecure); @@ -37,7 +38,7 @@ void OutputCompositionState::dump(std::string& out) const { dumpVal(out, "scissor", scissor); dumpVal(out, "needsFiltering", needsFiltering); - out.append("\n"); + out.append("\n "); dumpVal(out, "colorMode", toString(colorMode), colorMode); dumpVal(out, "renderIntent", toString(renderIntent), renderIntent); diff --git a/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp b/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp index 13485b45d8..5ce72b0879 100644 --- a/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp +++ b/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp @@ -379,7 +379,8 @@ void OutputLayer::writeStateToHWC(bool includeGeometry) const { void OutputLayer::dump(std::string& out) const { using android::base::StringAppendF; - StringAppendF(&out, " Output Layer %p\n", this); + StringAppendF(&out, " - Output Layer %p (Composition layer %p) (%s)\n", this, mLayer.get(), + mLayerFE->getDebugName()); mState.dump(out); } diff --git a/services/surfaceflinger/CompositionEngine/src/OutputLayerCompositionState.cpp b/services/surfaceflinger/CompositionEngine/src/OutputLayerCompositionState.cpp index 10f27b86f9..861ea5757b 100644 --- a/services/surfaceflinger/CompositionEngine/src/OutputLayerCompositionState.cpp +++ b/services/surfaceflinger/CompositionEngine/src/OutputLayerCompositionState.cpp @@ -46,7 +46,7 @@ void OutputLayerCompositionState::dump(std::string& out) const { dumpVal(out, "clearClientTarget", clearClientTarget); dumpVal(out, "displayFrame", displayFrame); dumpVal(out, "sourceCrop", sourceCrop); - dumpVal(out, "bufferTransform%", toString(bufferTransform), bufferTransform); + dumpVal(out, "bufferTransform", toString(bufferTransform), bufferTransform); dumpVal(out, "z-index", z); if (hwc) { diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index a7353d71ad..4205842c63 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -4720,6 +4720,14 @@ void SurfaceFlinger::dumpAllLocked(const DumpArgs& args, std::string& result) co result.append("\n"); } + { + StringAppendF(&result, "Composition layers\n"); + mDrawingState.traverseInZOrder([&](Layer* layer) { + auto compositionLayer = layer->getCompositionLayer(); + if (compositionLayer) compositionLayer->dump(result); + }); + } + /* * Dump Display state */ |