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

Commit 111aff95 authored by Adrian Roos's avatar Adrian Roos
Browse files

Add window manager tracing 

Bug: 64831661
Test: adb shell cmd wm tracing start && adb shell cmd wm tracing stop
Test: runtest -x services/tests/servicestests/src/com/android/server/wm/WindowTracingTest.java
Change-Id: I6ebbb25fea8dd07ac8773edad61cc8b14dcda6a7
parent 28fef15b

core/proto/android/server/windowmanagertrace.proto

0 → 100644
+56 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



syntax = "proto2";



import "frameworks/base/core/proto/android/content/configuration.proto";

import "frameworks/base/core/proto/android/graphics/rect.proto";

import "frameworks/base/core/proto/android/server/windowmanagerservice.proto";

import "frameworks/base/core/proto/android/view/displayinfo.proto";

import "frameworks/base/core/proto/android/view/windowlayoutparams.proto";



package com.android.server.wm.proto;



option java_multiple_files = true;



/* represents a file full of window manager trace entries.

   Encoded, it should start with 0x9 0x57 0x49 0x4e 0x54 0x52 0x41 0x43 0x45 (.WINTRACE), such

   that they can be easily identified. */

message WindowManagerTraceFileProto {



    /* constant; MAGIC_NUMBER = (long) MAGIC_NUMBER_H << 32 | MagicNumber.MAGIC_NUMBER_L

       (this is needed because enums have to be 32 bits and there's no nice way to put 64bit

        constants into .proto files. */

    enum MagicNumber {

        INVALID = 0;

        MAGIC_NUMBER_L = 0x544e4957;  /* WINT (little-endian ASCII) */

        MAGIC_NUMBER_H = 0x45434152;  /* RACE (little-endian ASCII) */

    }



    optional fixed64 magic_number = 1;  /* Must be the first field, set to value in MagicNumber */

    repeated WindowManagerTraceProto entry = 2;

}



/* one window manager trace entry. */

message WindowManagerTraceProto {

    /* required: elapsed realtime in nanos since boot of when this entry was logged */

    optional fixed64 elapsed_realtime_nanos = 1;



    /* where the trace originated */

    optional string where = 2;



    optional WindowManagerServiceProto window_manager_service = 3;

}

services/core/java/com/android/server/wm/DimLayer.java

+2 −2
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ public class DimLayer { 
        } catch (Exception e) {

            Slog.e(TAG_WM, "Exception creating Dim surface", e);

        } finally {

            service.closeSurfaceTransaction();

            service.closeSurfaceTransaction("DimLayer.constructSurface");

        }

    }
@@ -235,7 +235,7 @@ public class DimLayer { 
            } catch (RuntimeException e) {

                Slog.w(TAG, "Failure setting size", e);

            } finally {

                mService.closeSurfaceTransaction();

                mService.closeSurfaceTransaction("DimLayer.setBounds");

            }

        }

    }

services/core/java/com/android/server/wm/DisplayContent.java

+1 −1
Original line number Diff line number Diff line
@@ -1083,7 +1083,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 
            mService.mDisplayManagerInternal.performTraversalInTransactionFromWindowManager();

        } finally {

            if (!inTransaction) {

                mService.closeSurfaceTransaction();

                mService.closeSurfaceTransaction("setRotationUnchecked");

                if (SHOW_LIGHT_TRANSACTIONS) {

                    Slog.i(TAG_WM, "<<< CLOSE TRANSACTION setRotationUnchecked");

                }

services/core/java/com/android/server/wm/DockedStackDividerController.java

+2 −2
Original line number Diff line number Diff line
@@ -543,7 +543,7 @@ public class DockedStackDividerController implements DimLayerUser { 
                        mDimLayer.setBounds(mTmpRect);

                        mDimLayer.show(getResizeDimLayer(), alpha, 0 /* duration */);

                    } finally {

                        mService.closeSurfaceTransaction();

                        mService.closeSurfaceTransaction("setResizeDimLayer");

                    }

                }

                mLastDimLayerRect.set(mTmpRect);
@@ -558,7 +558,7 @@ public class DockedStackDividerController implements DimLayerUser { 
                    mService.openSurfaceTransaction();

                    mDimLayer.hide();

                } finally {

                    mService.closeSurfaceTransaction();

                    mService.closeSurfaceTransaction("setResizeDimLayer");

                }

            }

            mLastDimLayerAlpha = 0f;

services/core/java/com/android/server/wm/DragDropController.java

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ class DragDropController { 
                surfaceControl.setLayerStack(display.getLayerStack());

                surfaceControl.show();

            } finally {

                mService.closeSurfaceTransaction();

                mService.closeSurfaceTransaction("performDrag");

                if (SHOW_LIGHT_TRANSACTIONS) Slog.i(

                        TAG_WM, "<<< CLOSE TRANSACTION performDrag");

            }