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

Commit d4a941eb authored by Brad Ebinger's avatar Brad Ebinger
Browse files

Speculative fix for concurrency SessionManager issue 

Change the constraints for the session cleanup runnable to not
synchronize on the global instance. Instead, synchronize on the
Handler object to remove pressure on the hot path.

Flag: com.android.internal.telephony.flags.ims_resolver_user_aware
Bug: 375088362
Test: atest TelecomUnitTests
Change-Id: I65b82c1c8b74367d5611f6c3582a27073a2af6f2
parent 29e461a6

telecomm/java/android/telecom/Log.java

+18 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ public class Log { 
    // Used to synchronize singleton logging lazy initialization

    private static final Object sSingletonSync = new Object();

    private static EventManager sEventManager;

    private static SessionManager sSessionManager;

    private static volatile SessionManager sSessionManager;

    private static Object sLock = null;



    /**
@@ -379,6 +379,23 @@ public class Log { 
        return sSessionManager;

    }



    @VisibleForTesting

    public static SessionManager setSessionManager(Context context,

            java.lang.Runnable cleanSessionRunnable) {

        // Checking for null again outside of synchronization because we only need to synchronize

        // during the lazy loading of the session logger. We don't need to synchronize elsewhere.

        if (sSessionManager == null) {

            synchronized (sSingletonSync) {

                if (sSessionManager == null) {

                    sSessionManager = new SessionManager(cleanSessionRunnable);

                    sSessionManager.setContext(context);

                    return sSessionManager;

                }

            }

        }

        return sSessionManager;

    }



    public static void setTag(String tag) {

        TAG = tag;

        DEBUG = isLoggable(android.util.Log.DEBUG);

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

+21 −13
Original line number Diff line number Diff line
@@ -62,9 +62,7 @@ public class SessionManager { 


    @VisibleForTesting

    public final ConcurrentHashMap<Integer, Session> mSessionMapper = new ConcurrentHashMap<>(64);

    @VisibleForTesting

    public java.lang.Runnable mCleanStaleSessions = () ->

            cleanupStaleSessions(getSessionCleanupTimeoutMs());

    private final java.lang.Runnable mCleanStaleSessions;

    private final Handler mSessionCleanupHandler = new Handler(Looper.getMainLooper());



    // Overridden in LogTest to skip query to ContentProvider
@@ -110,27 +108,37 @@ public class SessionManager { 
    }



    public SessionManager() {

        mCleanStaleSessions = () -> cleanupStaleSessions(getSessionCleanupTimeoutMs());

    }



    @VisibleForTesting

    public SessionManager(java.lang.Runnable cleanStaleSessionsRunnable) {

        mCleanStaleSessions = cleanStaleSessionsRunnable;

    }



    private long getSessionCleanupTimeoutMs() {

        return mSessionCleanupTimeoutMs.get();

    }



    private synchronized void resetStaleSessionTimer() {

    private void resetStaleSessionTimer() {

        if (!Flags.endSessionImprovements()) {

            mSessionCleanupHandler.removeCallbacksAndMessages(null);

            resetStaleSessionTimerOld();

            return;

        }

        // Will be null in Log Testing

            if (mCleanStaleSessions != null) {

        if (mCleanStaleSessions == null) return;

        synchronized (mSessionCleanupHandler) {

            if (!mSessionCleanupHandler.hasCallbacks(mCleanStaleSessions)) {

                mSessionCleanupHandler.postDelayed(mCleanStaleSessions,

                        getSessionCleanupTimeoutMs());

            }

        } else {

            if (mCleanStaleSessions != null

                    && !mSessionCleanupHandler.hasCallbacks(mCleanStaleSessions)) {

                mSessionCleanupHandler.postDelayed(mCleanStaleSessions,

                        getSessionCleanupTimeoutMs());

        }

    }



    private synchronized void resetStaleSessionTimerOld() {

        if (mCleanStaleSessions == null) return;

        mSessionCleanupHandler.removeCallbacksAndMessages(null);

        mSessionCleanupHandler.postDelayed(mCleanStaleSessions, getSessionCleanupTimeoutMs());

    }



    /**