diff options
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiMetrics.java | 56 | ||||
| -rw-r--r-- | service/java/com/android/server/wifi/WifiStateMachine.java | 4 |
2 files changed, 58 insertions, 2 deletions
diff --git a/service/java/com/android/server/wifi/WifiMetrics.java b/service/java/com/android/server/wifi/WifiMetrics.java index 15f65c980..86d8549bc 100644 --- a/service/java/com/android/server/wifi/WifiMetrics.java +++ b/service/java/com/android/server/wifi/WifiMetrics.java @@ -29,7 +29,6 @@ import android.os.Handler; import android.os.Looper; import android.os.Message; import android.os.SystemProperties; - import android.util.Base64; import android.util.Log; import android.util.Pair; @@ -49,6 +48,7 @@ import com.android.server.wifi.nano.WifiMetricsProto.PnoScanMetrics; import com.android.server.wifi.nano.WifiMetricsProto.SoftApConnectedClientsEvent; import com.android.server.wifi.nano.WifiMetricsProto.StaEvent; import com.android.server.wifi.nano.WifiMetricsProto.StaEvent.ConfigInfo; +import com.android.server.wifi.nano.WifiMetricsProto.WifiLinkLayerUsageStats; import com.android.server.wifi.nano.WifiMetricsProto.WpsMetrics; import com.android.server.wifi.rtt.RttMetrics; import com.android.server.wifi.util.InformationElementUtil; @@ -115,12 +115,14 @@ public class WifiMetrics { private WifiAwareMetrics mWifiAwareMetrics; private RttMetrics mRttMetrics; private final PnoScanMetrics mPnoScanMetrics = new PnoScanMetrics(); + private final WifiLinkLayerUsageStats mWifiLinkLayerUsageStats = new WifiLinkLayerUsageStats(); private final WpsMetrics mWpsMetrics = new WpsMetrics(); private Handler mHandler; private ScoringParams mScoringParams; private WifiConfigManager mWifiConfigManager; private WifiNetworkSelector mWifiNetworkSelector; private PasspointManager mPasspointManager; + private WifiLinkLayerStats mLastLinkLayerStats; /** * Metrics are stored within an instance of the WifiLog proto during runtime, * The ConnectionEvent, SystemStateEntries & ScanReturnEntries metrics are stored during @@ -484,6 +486,45 @@ public class WifiMetrics { } /** + * Increment cumulative counters for link layer stats. + * @param newStats + */ + public void incrementWifiLinkLayerUsageStats(WifiLinkLayerStats newStats) { + if (newStats == null) { + return; + } + if (mLastLinkLayerStats == null) { + mLastLinkLayerStats = newStats; + return; + } + if (!newLinkLayerStatsIsValid(mLastLinkLayerStats, newStats)) { + // This could mean the radio chip is reset or the data is incorrectly reported. + // Don't increment any counts and discard the possibly corrupt |newStats| completely. + mLastLinkLayerStats = null; + return; + } + mWifiLinkLayerUsageStats.loggingDurationMs += + (newStats.timeStampInMs - mLastLinkLayerStats.timeStampInMs); + mWifiLinkLayerUsageStats.radioOnTimeMs += (newStats.on_time - mLastLinkLayerStats.on_time); + mWifiLinkLayerUsageStats.radioTxTimeMs += (newStats.tx_time - mLastLinkLayerStats.tx_time); + mWifiLinkLayerUsageStats.radioRxTimeMs += (newStats.rx_time - mLastLinkLayerStats.rx_time); + mWifiLinkLayerUsageStats.radioScanTimeMs += + (newStats.on_time_scan - mLastLinkLayerStats.on_time_scan); + mLastLinkLayerStats = newStats; + } + + private boolean newLinkLayerStatsIsValid(WifiLinkLayerStats oldStats, + WifiLinkLayerStats newStats) { + if (newStats.on_time < oldStats.on_time + || newStats.tx_time < oldStats.tx_time + || newStats.rx_time < oldStats.rx_time + || newStats.on_time_scan < oldStats.on_time_scan) { + return false; + } + return true; + } + + /** * Increment total number of attempts to start a pno scan */ public void incrementPnoScanStartAttempCount() { @@ -2092,6 +2133,17 @@ public class WifiMetrics { pw.println("mPnoScanMetrics.numPnoFoundNetworkEvents=" + mPnoScanMetrics.numPnoFoundNetworkEvents); + pw.println("mWifiLinkLayerUsageStats.loggingDurationMs=" + + mWifiLinkLayerUsageStats.loggingDurationMs); + pw.println("mWifiLinkLayerUsageStats.radioOnTimeMs=" + + mWifiLinkLayerUsageStats.radioOnTimeMs); + pw.println("mWifiLinkLayerUsageStats.radioTxTimeMs=" + + mWifiLinkLayerUsageStats.radioTxTimeMs); + pw.println("mWifiLinkLayerUsageStats.radioRxTimeMs=" + + mWifiLinkLayerUsageStats.radioRxTimeMs); + pw.println("mWifiLinkLayerUsageStats.radioScanTimeMs=" + + mWifiLinkLayerUsageStats.radioScanTimeMs); + pw.println("mWifiLogProto.connectToNetworkNotificationCount=" + mConnectToNetworkNotificationCount.toString()); pw.println("mWifiLogProto.connectToNetworkNotificationActionCount=" @@ -2433,6 +2485,7 @@ public class WifiMetrics { mWifiLogProto.wifiRttLog = mRttMetrics.consolidateProto(); mWifiLogProto.pnoScanMetrics = mPnoScanMetrics; + mWifiLogProto.wifiLinkLayerUsageStats = mWifiLinkLayerUsageStats; /** * Convert the SparseIntArray of "Connect to Network" notification types and counts to @@ -2597,6 +2650,7 @@ public class WifiMetrics { mAvailableSavedPasspointProviderProfilesInScanHistogram.clear(); mAvailableSavedPasspointProviderBssidsInScanHistogram.clear(); mPnoScanMetrics.clear(); + mWifiLinkLayerUsageStats.clear(); mConnectToNetworkNotificationCount.clear(); mConnectToNetworkNotificationActionCount.clear(); mNumOpenNetworkRecommendationUpdates = 0; diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java index ef5eb027f..901059dbf 100644 --- a/service/java/com/android/server/wifi/WifiStateMachine.java +++ b/service/java/com/android/server/wifi/WifiStateMachine.java @@ -4857,7 +4857,9 @@ public class WifiStateMachine extends StateMachine { break; case CMD_RSSI_POLL: if (message.arg1 == mRssiPollToken) { - getWifiLinkLayerStats(); + WifiLinkLayerStats stats = getWifiLinkLayerStats(); + mWifiMetrics.incrementWifiLinkLayerUsageStats(stats); + // Get Info and continue polling fetchRssiLinkSpeedAndFrequencyNative(); // Send the update score to network agent. |