Merge "Add window manager tracing" (a754bf8f) · Commits · e / os / android_frameworks_base

core/proto/android/server/windowmanagertrace.proto

0 → 100644

+56 −0

Original line number	Original line	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	Original line	Diff line number	Diff line
	@@ -119,7 +119,7 @@ public class DimLayer {
	} catch (Exception e) {		} catch (Exception e) {
	Slog.e(TAG_WM, "Exception creating Dim surface", e);		Slog.e(TAG_WM, "Exception creating Dim surface", e);
	} finally {		} finally {
	service.closeSurfaceTransaction();		service.closeSurfaceTransaction("DimLayer.constructSurface");
	}		}
	}		}

	@@ -235,7 +235,7 @@ public class DimLayer {
	} catch (RuntimeException e) {		} catch (RuntimeException e) {
	Slog.w(TAG, "Failure setting size", e);		Slog.w(TAG, "Failure setting size", e);
	} finally {		} finally {
	mService.closeSurfaceTransaction();		mService.closeSurfaceTransaction("DimLayer.setBounds");
	}		}
	}		}
	}		}

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1083,7 +1083,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
	mService.mDisplayManagerInternal.performTraversalInTransactionFromWindowManager();		mService.mDisplayManagerInternal.performTraversalInTransactionFromWindowManager();
	} finally {		} finally {
	if (!inTransaction) {		if (!inTransaction) {
	mService.closeSurfaceTransaction();		mService.closeSurfaceTransaction("setRotationUnchecked");
	if (SHOW_LIGHT_TRANSACTIONS) {		if (SHOW_LIGHT_TRANSACTIONS) {
	Slog.i(TAG_WM, "<<< CLOSE TRANSACTION setRotationUnchecked");		Slog.i(TAG_WM, "<<< CLOSE TRANSACTION setRotationUnchecked");
	}		}

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -543,7 +543,7 @@ public class DockedStackDividerController implements DimLayerUser {
	mDimLayer.setBounds(mTmpRect);		mDimLayer.setBounds(mTmpRect);
	mDimLayer.show(getResizeDimLayer(), alpha, 0 /* duration */);		mDimLayer.show(getResizeDimLayer(), alpha, 0 /* duration */);
	} finally {		} finally {
	mService.closeSurfaceTransaction();		mService.closeSurfaceTransaction("setResizeDimLayer");
	}		}
	}		}
	mLastDimLayerRect.set(mTmpRect);		mLastDimLayerRect.set(mTmpRect);
	@@ -558,7 +558,7 @@ public class DockedStackDividerController implements DimLayerUser {
	mService.openSurfaceTransaction();		mService.openSurfaceTransaction();
	mDimLayer.hide();		mDimLayer.hide();
	} finally {		} finally {
	mService.closeSurfaceTransaction();		mService.closeSurfaceTransaction("setResizeDimLayer");
	}		}
	}		}
	mLastDimLayerAlpha = 0f;		mLastDimLayerAlpha = 0f;

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -185,7 +185,7 @@ class DragDropController {
	surfaceControl.setLayerStack(display.getLayerStack());		surfaceControl.setLayerStack(display.getLayerStack());
	surfaceControl.show();		surfaceControl.show();
	} finally {		} finally {
	mService.closeSurfaceTransaction();		mService.closeSurfaceTransaction("performDrag");
	if (SHOW_LIGHT_TRANSACTIONS) Slog.i(		if (SHOW_LIGHT_TRANSACTIONS) Slog.i(
	TAG_WM, "<<< CLOSE TRANSACTION performDrag");		TAG_WM, "<<< CLOSE TRANSACTION performDrag");
	}		}