Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3edb4950 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

am 1d12d8a8: improve logging of external displays 

* commit '1d12d8a8':
  improve logging of external displays
parents 157bb2c1 1d12d8a8

services/surfaceflinger/DisplayDevice.cpp

+27 −7
Original line number Diff line number Diff line
@@ -235,13 +235,6 @@ uint32_t DisplayDevice::getFlags() const 
    return mFlags;

}



void DisplayDevice::dump(String8& res) const

{

    if (mFramebufferSurface != NULL) {

        mFramebufferSurface->dump(res);

    }

}



EGLBoolean DisplayDevice::makeCurrent(EGLDisplay dpy,

        const sp<const DisplayDevice>& hw, EGLContext ctx) {

    EGLBoolean result = EGL_TRUE;
@@ -406,3 +399,30 @@ void DisplayDevice::updateGeometryTransform() { 
        mGlobalTransform = R * TP * S * TL;

    }

}



void DisplayDevice::dump(String8& result, char* buffer, size_t SIZE) const {

    const Transform& tr(mGlobalTransform);

    snprintf(buffer, SIZE,

        "+ DisplayDevice: %s\n"

        "   type=%x, layerStack=%u, (%4dx%4d), ANativeWindow=%p, orient=%2d (type=%08x), "

        "flips=%u, secure=%d, acquired=%d, numLayers=%u\n"

        "   v:[%d,%d,%d,%d], f:[%d,%d,%d,%d], "

        "transform:[[%0.3f,%0.3f,%0.3f][%0.3f,%0.3f,%0.3f][%0.3f,%0.3f,%0.3f]]\n",

        mType, mDisplayName.string(),

        mLayerStack, mDisplayWidth, mDisplayHeight, mNativeWindow.get(),

        mOrientation, tr.getType(), getPageFlipCount(),

        mSecureLayerVisible, mScreenAcquired, mVisibleLayersSortedByZ.size(),

        mViewport.left, mViewport.top, mViewport.right, mViewport.bottom,

        mFrame.left, mFrame.top, mFrame.right, mFrame.bottom,

        tr[0][0], tr[1][0], tr[2][0],

        tr[0][1], tr[1][1], tr[2][1],

        tr[0][2], tr[1][2], tr[2][2]);



    result.append(buffer);



    String8 fbtargetDump;

    if (mFramebufferSurface != NULL) {

        mFramebufferSurface->dump(fbtargetDump);

        result.append(fbtargetDump);

    }

}

services/surfaceflinger/DisplayDevice.h

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ public: 
     * Debugging

     */

    uint32_t getPageFlipCount() const;

    void dump(String8& res) const;

    void dump(String8& result, char* buffer, size_t SIZE) const;



private:

    void init(EGLConfig config);

services/surfaceflinger/SurfaceFlinger.cpp

+1 −20
Original line number Diff line number Diff line
@@ -2025,25 +2025,7 @@ void SurfaceFlinger::dumpAllLocked( 
    result.append(buffer);

    for (size_t dpy=0 ; dpy<mDisplays.size() ; dpy++) {

        const sp<const DisplayDevice>& hw(mDisplays[dpy]);

        snprintf(buffer, SIZE,

                "+ DisplayDevice[%u] '%s'\n"

                "   type=%x, layerStack=%u, (%4dx%4d), orient=%2d (type=%08x), "

                "flips=%u, secure=%d, numLayers=%u, v:[%d,%d,%d,%d], f:[%d,%d,%d,%d], "

                "transform:[[%0.3f,%0.3f,%0.3f][%0.3f,%0.3f,%0.3f][%0.3f,%0.3f,%0.3f]]\n",

                dpy, (const char*) hw->getDisplayName(),

                hw->getDisplayType(), hw->getLayerStack(),

                hw->getWidth(), hw->getHeight(),

                hw->getOrientation(), hw->getTransform().getType(),

                hw->getPageFlipCount(),

                hw->getSecureLayerVisible(),

                hw->getVisibleLayersSortedByZ().size(),

                hw->getViewport().left, hw->getViewport().top, hw->getViewport().right, hw->getViewport().bottom,

                hw->getFrame().left, hw->getFrame().top, hw->getFrame().right, hw->getFrame().bottom,

                hw->getTransform()[0][0], hw->getTransform()[1][0], hw->getTransform()[2][0],

                hw->getTransform()[0][1], hw->getTransform()[1][1], hw->getTransform()[2][1],

                hw->getTransform()[0][2], hw->getTransform()[1][2], hw->getTransform()[2][2]);



        result.append(buffer);

        hw->dump(result, buffer, SIZE);

    }



    /*
@@ -2118,7 +2100,6 @@ void SurfaceFlinger::dumpAllLocked( 
     */

    const GraphicBufferAllocator& alloc(GraphicBufferAllocator::get());

    alloc.dump(result);

    hw->dump(result);

}



bool SurfaceFlinger::startDdmConnection()