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

Commit ea8483c0 authored by Chalard Jean's avatar Chalard Jean Committed by Gerrit Code Review
Browse files

Merge changes from topic "NS-A44_lingerstate" 

* changes:
  [NS B10] Cleanup : remove mRematchedNetworks
  [NS B09] Create NetworkRanker
  [NS B08] More simplification
  [NS B07] More simplification
  [NS B06] Simplification
  [NS B05] Remove old dead code
  [NS B04] Make the network selection request-major.
  [NS B03] Add debug log showing the reassignment
  [NS B02] Split out a function to apply a NetworkReassignment
  [NS B01] Move the computation loop to a separate function
  [NS A44 2/2] Apply requests after all networks rematching is computed
  [NS A44 1/2] Update linger state before processing listens
parents 97c24fb1 fbb758f6

services/core/java/com/android/server/ConnectivityService.java

+142 −199

File changed.

Preview size limit exceeded, changes collapsed.

services/core/java/com/android/server/connectivity/KeepaliveTracker.java

+10 −9
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ public class KeepaliveTracker { 
            mSlot = slot;

            int error = isValid();

            if (error == SUCCESS) {

                Log.d(TAG, "Starting keepalive " + mSlot + " on " + mNai.name());

                Log.d(TAG, "Starting keepalive " + mSlot + " on " + mNai.toShortString());

                switch (mType) {

                    case TYPE_NATT:

                        mNai.asyncChannel.sendMessage(
@@ -365,7 +365,8 @@ public class KeepaliveTracker { 
                    Log.e(TAG, "Cannot stop unowned keepalive " + mSlot + " on " + mNai.network);

                }

            }

            Log.d(TAG, "Stopping keepalive " + mSlot + " on " + mNai.name() + ": " + reason);

            Log.d(TAG, "Stopping keepalive " + mSlot + " on " + mNai.toShortString()

                    + ": " + reason);

            switch (mStartedState) {

                case NOT_STARTED:

                    // Remove the reference of the keepalive that meet error before starting,
@@ -476,7 +477,7 @@ public class KeepaliveTracker { 
    }



    public void handleStopKeepalive(NetworkAgentInfo nai, int slot, int reason) {

        String networkName = (nai == null) ? "(null)" : nai.name();

        final String networkName = NetworkAgentInfo.toShortString(nai);

        HashMap <Integer, KeepaliveInfo> networkKeepalives = mKeepalives.get(nai);

        if (networkKeepalives == null) {

            Log.e(TAG, "Attempt to stop keepalive on nonexistent network " + networkName);
@@ -493,7 +494,7 @@ public class KeepaliveTracker { 
    }



    private void cleanupStoppedKeepalive(NetworkAgentInfo nai, int slot) {

        String networkName = (nai == null) ? "(null)" : nai.name();

        final String networkName = NetworkAgentInfo.toShortString(nai);

        HashMap<Integer, KeepaliveInfo> networkKeepalives = mKeepalives.get(nai);

        if (networkKeepalives == null) {

            Log.e(TAG, "Attempt to remove keepalive on nonexistent network " + networkName);
@@ -540,7 +541,7 @@ public class KeepaliveTracker { 
        } catch(NullPointerException e) {}

        if (ki == null) {

            Log.e(TAG, "Event " + message.what + "," + slot + "," + reason

                    + " for unknown keepalive " + slot + " on " + nai.name());

                    + " for unknown keepalive " + slot + " on " + nai.toShortString());

            return;

        }
@@ -562,7 +563,7 @@ public class KeepaliveTracker { 
        if (KeepaliveInfo.STARTING == ki.mStartedState) {

            if (SUCCESS == reason) {

                // Keepalive successfully started.

                Log.d(TAG, "Started keepalive " + slot + " on " + nai.name());

                Log.d(TAG, "Started keepalive " + slot + " on " + nai.toShortString());

                ki.mStartedState = KeepaliveInfo.STARTED;

                try {

                    ki.mCallback.onStarted(slot);
@@ -570,14 +571,14 @@ public class KeepaliveTracker { 
                    Log.w(TAG, "Discarded onStarted(" + slot + ") callback");

                }

            } else {

                Log.d(TAG, "Failed to start keepalive " + slot + " on " + nai.name()

                Log.d(TAG, "Failed to start keepalive " + slot + " on " + nai.toShortString()

                        + ": " + reason);

                // The message indicated some error trying to start: do call handleStopKeepalive.

                handleStopKeepalive(nai, slot, reason);

            }

        } else if (KeepaliveInfo.STOPPING == ki.mStartedState) {

            // The message indicated result of stopping : clean up keepalive slots.

            Log.d(TAG, "Stopped keepalive " + slot + " on " + nai.name()

            Log.d(TAG, "Stopped keepalive " + slot + " on " + nai.toShortString()

                    + " stopped: " + reason);

            ki.mStartedState = KeepaliveInfo.NOT_STARTED;

            cleanupStoppedKeepalive(nai, slot);
@@ -733,7 +734,7 @@ public class KeepaliveTracker { 
        pw.println("Socket keepalives:");

        pw.increaseIndent();

        for (NetworkAgentInfo nai : mKeepalives.keySet()) {

            pw.println(nai.name());

            pw.println(nai.toShortString());

            pw.increaseIndent();

            for (int slot : mKeepalives.get(nai).keySet()) {

                KeepaliveInfo ki = mKeepalives.get(nai).get(slot);

services/core/java/com/android/server/connectivity/LingerMonitor.java

+9 −7
Original line number Diff line number Diff line
@@ -200,8 +200,9 @@ public class LingerMonitor { 
        }



        if (DBG) {

            Log.d(TAG, "Notifying switch from=" + fromNai.name() + " to=" + toNai.name() +

                    " type=" + sNotifyTypeNames.get(notifyType, "unknown(" + notifyType + ")"));

            Log.d(TAG, "Notifying switch from=" + fromNai.toShortString()

                    + " to=" + toNai.toShortString()

                    + " type=" + sNotifyTypeNames.get(notifyType, "unknown(" + notifyType + ")"));

        }



        mNotifications.put(fromNai.network.netId, toNai.network.netId);
@@ -222,10 +223,10 @@ public class LingerMonitor { 
    public void noteLingerDefaultNetwork(@NonNull final NetworkAgentInfo fromNai,

            @Nullable final NetworkAgentInfo toNai) {

        if (VDBG) {

            Log.d(TAG, "noteLingerDefaultNetwork from=" + fromNai.name() +

                    " everValidated=" + fromNai.everValidated +

                    " lastValidated=" + fromNai.lastValidated +

                    " to=" + toNai.name());

            Log.d(TAG, "noteLingerDefaultNetwork from=" + fromNai.toShortString()

                    + " everValidated=" + fromNai.everValidated

                    + " lastValidated=" + fromNai.lastValidated

                    + " to=" + toNai.toShortString());

        }



        // If we are currently notifying the user because the device switched to fromNai, now that
@@ -270,7 +271,8 @@ public class LingerMonitor { 
        // TODO: should we do this?

        if (everNotified(fromNai)) {

            if (VDBG) {

                Log.d(TAG, "Not notifying handover from " + fromNai.name() + ", already notified");

                Log.d(TAG, "Not notifying handover from " + fromNai.toShortString()

                        + ", already notified");

            }

            return;

        }

services/core/java/com/android/server/connectivity/Nat464Xlat.java

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ public class Nat464Xlat extends BaseNetworkObserver { 
        try {

            mNMService.registerObserver(this);

        } catch (RemoteException e) {

            Slog.e(TAG, "Can't register interface observer for clat on " + mNetwork.name());

            Slog.e(TAG, "Can't register iface observer for clat on " + mNetwork.toShortString());

            return;

        }

services/core/java/com/android/server/connectivity/NetworkAgentInfo.java

+25 −7
Original line number Diff line number Diff line
@@ -16,7 +16,10 @@ 


package com.android.server.connectivity;



import static android.net.NetworkCapabilities.transportNamesOf;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.content.Context;

import android.net.IDnsResolver;

import android.net.INetd;
@@ -372,7 +375,7 @@ public class NetworkAgentInfo implements Comparable<NetworkAgentInfo> { 
            // Should only happen if the requestId wraps. If that happens lots of other things will

            // be broken as well.

            Log.wtf(TAG, String.format("Duplicate requestId for %s and %s on %s",

                    networkRequest, existing, name()));

                    networkRequest, existing, toShortString()));

            updateRequestCounts(REMOVE, existing);

        }

        mNetworkRequests.put(networkRequest.requestId, networkRequest);
@@ -542,11 +545,11 @@ public class NetworkAgentInfo implements Comparable<NetworkAgentInfo> { 
            // Cannot happen. Once a request is lingering on a particular network, we cannot

            // re-linger it unless that network becomes the best for that request again, in which

            // case we should have unlingered it.

            Log.wtf(TAG, this.name() + ": request " + request.requestId + " already lingered");

            Log.wtf(TAG, toShortString() + ": request " + request.requestId + " already lingered");

        }

        final long expiryMs = now + duration;

        LingerTimer timer = new LingerTimer(request, expiryMs);

        if (VDBG) Log.d(TAG, "Adding LingerTimer " + timer + " to " + this.name());

        if (VDBG) Log.d(TAG, "Adding LingerTimer " + timer + " to " + toShortString());

        mLingerTimers.add(timer);

        mLingerTimerForRequest.put(request.requestId, timer);

    }
@@ -558,7 +561,7 @@ public class NetworkAgentInfo implements Comparable<NetworkAgentInfo> { 
    public boolean unlingerRequest(NetworkRequest request) {

        LingerTimer timer = mLingerTimerForRequest.get(request.requestId);

        if (timer != null) {

            if (VDBG) Log.d(TAG, "Removing LingerTimer " + timer + " from " + this.name());

            if (VDBG) Log.d(TAG, "Removing LingerTimer " + timer + " from " + toShortString());

            mLingerTimers.remove(timer);

            mLingerTimerForRequest.remove(request.requestId);

            return true;
@@ -645,9 +648,16 @@ public class NetworkAgentInfo implements Comparable<NetworkAgentInfo> { 
                + "}";

    }



    public String name() {

        return "NetworkAgentInfo [" + networkInfo.getTypeName() + " (" +

                networkInfo.getSubtypeName() + ") - " + Objects.toString(network) + "]";

    /**

     * Show a short string representing a Network.

     *

     * This is often not enough for debugging purposes for anything complex, but the full form

     * is very long and hard to read, so this is useful when there isn't a lot of ambiguity.

     * This represents the network with something like "[100 WIFI|VPN]" or "[108 MOBILE]".

     */

    public String toShortString() {

        return "[" + network.netId + " "

                + transportNamesOf(networkCapabilities.getTransportTypes()) + "]";

    }



    // Enables sorting in descending order of score.
@@ -655,4 +665,12 @@ public class NetworkAgentInfo implements Comparable<NetworkAgentInfo> { 
    public int compareTo(NetworkAgentInfo other) {

        return other.getCurrentScore() - getCurrentScore();

    }



    /**

     * Null-guarding version of NetworkAgentInfo#toShortString()

     */

    @NonNull

    public static String toShortString(@Nullable final NetworkAgentInfo nai) {

        return null != nai ? nai.toShortString() : "[null]";

    }

}