Merge "Clean flag for enable_session_improvements" into main (8233b61b) · Commits · e / os / android_frameworks_base

telecomm/framework/java/android/telecom/Logging/Session.java

+0 −109

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ import android.telecom.Log;
		import android.text.TextUtils;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.server.telecom.flags.Flags;

		import java.util.ArrayDeque;
		import java.util.ArrayList;
		@@ -263,7 +262,6 @@ public class Session {
		// Builds full session ID, which incliudes the optional external indicators (E),
		// base session ID, and the optional sub-session IDs (_X): @[E-]...[ID][_X][_Y]...
		private String getFullSessionId() {
		if (!Flags.endSessionImprovements()) return getFullSessionIdRecursive(0);
		int currParentCount = 0;
		StringBuilder id = new StringBuilder();
		Session currSession = this;
		@@ -288,36 +286,6 @@ public class Session {
		}
		return id.toString();
		}

		// keep track of calls and bail if we hit the recursion limit
		private String getFullSessionIdRecursive(int parentCount) {
		if (parentCount >= SESSION_RECURSION_LIMIT) {
		// Don't use Telecom's Log.w here or it will cause infinite recursion because it will
		// try to add session information to this logging statement, which will cause it to hit
		// this condition again and so on...
		android.util.Slog.w(LOG_TAG, "getFullSessionId: Hit recursion limit!");
		return TRUNCATE_STRING + mSessionId;
		}
		// Cache mParentSession locally to prevent a concurrency problem where
		// Log.endParentSessions() is called while a logging statement is running (Log.i, for
		// example) and setting mParentSession to null in a different thread after the null check
		// occurred.
		Session parentSession = mParentSession;
		if (parentSession == null) {
		return mSessionId;
		} else {
		if (Log.VERBOSE) {
		return parentSession.getFullSessionIdRecursive(parentCount + 1)
		// Append "_X" to subsession to show subsession designation.
		+ SESSION_SEPARATION_CHAR_CHILD + mSessionId;
		} else {
		// Only worry about the base ID at the top of the tree.
		return parentSession.getFullSessionIdRecursive(parentCount + 1);
		}

		}
		}

		private Session getRootSession(String callingMethod) {
		int currParentCount = 0;
		Session topNode = this;
		@@ -345,10 +313,6 @@ public class Session {

		private String printSessionTree() {
		StringBuilder sb = new StringBuilder();
		if (!Flags.endSessionImprovements()) {
		printSessionTreeRecursive(0, sb, 0);
		return sb.toString();
		}
		int depth = 0;
		ArrayDeque<Session> deque = new ArrayDeque<>();
		deque.add(this);
		@@ -375,29 +339,6 @@ public class Session {
		return sb.toString();
		}

		// Recursively move down session tree using DFS, but print out each node when it is reached.
		private void printSessionTreeRecursive(int tabI, StringBuilder sb, int currChildCount) {
		// Prevent infinite recursion.
		if (currChildCount >= SESSION_RECURSION_LIMIT) {
		// Don't use Telecom's Log.w here or it will cause infinite recursion because it will
		// try to add session information to this logging statement, which will cause it to hit
		// this condition again and so on...
		android.util.Slog.w(LOG_TAG, "printSessionTree: Hit recursion limit!");
		sb.append(TRUNCATE_STRING);
		return;
		}
		sb.append(toString());
		for (Session child : mChildSessions) {
		sb.append("\n");
		for (int i = 0; i <= tabI; i++) {
		sb.append("\t");
		}
		child.printSessionTreeRecursive(tabI + 1, sb, currChildCount + 1);
		}
		}

		//

		/**
		* Concatenate the short method name with the parent Sessions to create full method path.
		* @param truncatePath if truncatePath is set to true, all other external sessions (except for
		@@ -407,10 +348,6 @@ public class Session {
		@VisibleForTesting
		public String getFullMethodPath(boolean truncatePath) {
		StringBuilder sb = new StringBuilder();
		if (!Flags.endSessionImprovements()) {
		getFullMethodPathRecursive(sb, truncatePath, 0);
		return sb.toString();
		}
		// Check to see if the session has been renamed yet. If it has not, then the session
		// has not been continued.
		Session parentSession = getParentSession();
		@@ -464,52 +401,6 @@ public class Session {
		return sb.toString();
		}

		private synchronized void getFullMethodPathRecursive(StringBuilder sb, boolean truncatePath,
		int parentCount) {
		if (parentCount >= SESSION_RECURSION_LIMIT) {
		// Don't use Telecom's Log.w here or it will cause infinite recursion because it will
		// try to add session information to this logging statement, which will cause it to hit
		// this condition again and so on...
		android.util.Slog.w(LOG_TAG, "getFullMethodPathRecursive: Hit recursion limit!");
		sb.append(TRUNCATE_STRING);
		return;
		}
		// Return cached value for method path. When returning the truncated path, recalculate the
		// full path without using the cached value.
		if (!TextUtils.isEmpty(mFullMethodPathCache) && !truncatePath) {
		sb.append(mFullMethodPathCache);
		return;
		}
		Session parentSession = getParentSession();
		boolean isSessionStarted = false;
		if (parentSession != null) {
		// Check to see if the session has been renamed yet. If it has not, then the session
		// has not been continued.
		isSessionStarted = !mShortMethodName.equals(parentSession.mShortMethodName);
		parentSession.getFullMethodPathRecursive(sb, truncatePath, parentCount + 1);
		sb.append(SUBSESSION_SEPARATION_CHAR);
		}
		// Encapsulate the external session's method name so it is obvious what part of the session
		// is external or truncate it if we do not want the entire history.
		if (isExternal()) {
		if (truncatePath) {
		sb.append(TRUNCATE_STRING);
		} else {
		sb.append("(");
		sb.append(mShortMethodName);
		sb.append(")");
		}
		} else {
		sb.append(mShortMethodName);
		}
		// If we are returning the truncated path, do not save that path as the full path.
		if (isSessionStarted && !truncatePath) {
		// Cache this value so that we do not have to do this work next time!
		// We do not cache the value if the session being evaluated hasn't been continued yet.
		mFullMethodPathCache = sb.toString();
		}
		}

		// Recursively move to the top of the tree to see if the parent session is external.
		private boolean isSessionExternal() {
		return getRootSession("isSessionExternal").isExternal();

telecomm/framework/java/android/telecom/Logging/SessionManager.java

+0 −61

Original line number	Diff line number	Diff line
		@@ -27,7 +27,6 @@ import android.telecom.Log;
		import android.util.Base64;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.server.telecom.flags.Flags;

		import java.nio.ByteBuffer;
		import java.util.ArrayList;
		@@ -121,10 +120,6 @@ public class SessionManager {
		}

		private void resetStaleSessionTimer() {
		if (!Flags.endSessionImprovements()) {
		resetStaleSessionTimerOld();
		return;
		}
		// Will be null in Log Testing
		if (mCleanStaleSessions == null) return;
		synchronized (mSessionCleanupHandler) {
		@@ -135,12 +130,6 @@ public class SessionManager {
		}
		}

		private synchronized void resetStaleSessionTimerOld() {
		if (mCleanStaleSessions == null) return;
		mSessionCleanupHandler.removeCallbacksAndMessages(null);
		mSessionCleanupHandler.postDelayed(mCleanStaleSessions, getSessionCleanupTimeoutMs());
		}

		/**
		* Determines whether or not to start a new session or continue an existing session based on
		* the {@link Session.Info} info passed into startSession. If info is null, a new Session is
		@@ -365,10 +354,6 @@ public class SessionManager {
		*/
		private void cleanupSessionTreeAndNotify(Session session) {
		if (session == null) return;
		if (!Flags.endSessionImprovements()) {
		endParentSessionsRecursive(session);
		return;
		}
		Session currSession = session;
		// Traverse upwards and unlink until we either hit the root node or a node that isn't
		// complete yet.
		@@ -398,38 +383,6 @@ public class SessionManager {
		}
		}

		// Recursively deletes all complete parent sessions of the current subsession if it is a leaf.
		private void endParentSessionsRecursive(Session subsession) {
		// Session is not completed or not currently a leaf, so we can not remove because a child is
		// still running
		if (!subsession.isSessionCompleted() \|\| subsession.getChildSessions().size() != 0) {
		return;
		}
		Session parentSession = subsession.getParentSession();
		if (parentSession != null) {
		subsession.setParentSession(null);
		parentSession.removeChild(subsession);
		// Report the child session of the external session as being complete to the listeners,
		// not the external session itself.
		if (parentSession.isExternal()) {
		long fullSessionTimeMs =
		System.currentTimeMillis() - subsession.getExecutionStartTimeMilliseconds();
		notifySessionCompleteListeners(subsession.getShortMethodName(), fullSessionTimeMs);
		}
		endParentSessionsRecursive(parentSession);
		} else {
		// All of the subsessions have been completed and it is time to report on the full
		// running time of the session.
		long fullSessionTimeMs =
		System.currentTimeMillis() - subsession.getExecutionStartTimeMilliseconds();
		Log.d(LOGGING_TAG, Session.END_SESSION + " (dur: " + fullSessionTimeMs
		+ " ms): " + subsession.toString());
		if (!subsession.isExternal()) {
		notifySessionCompleteListeners(subsession.getShortMethodName(), fullSessionTimeMs);
		}
		}
		}

		private void notifySessionCompleteListeners(String methodName, long sessionTimeMs) {
		synchronized (mSessionListeners) {
		for (ISessionListener l : mSessionListeners) {
		@@ -472,20 +425,6 @@ public class SessionManager {
		return mCurrentThreadId.get();
		}

		/**
		* @return A String representation of the active sessions at the time that this method is
		* called.
		*/
		@VisibleForTesting
		public synchronized String printActiveSessions() {
		StringBuilder message = new StringBuilder();
		for (ConcurrentHashMap.Entry<Integer, Session> entry : mSessionMapper.entrySet()) {
		message.append(entry.getValue().printFullSessionTree());
		message.append("\n");
		}
		return message.toString();
		}

		@VisibleForTesting
		public synchronized void cleanupStaleSessions(long timeoutMs) {
		StringBuilder logMessage = new StringBuilder("Stale Sessions Cleaned:");