Skip to content

Commit e1531a6

Browse files
isheriffAndroid (Google) Code Review
isheriff
authored and
Android (Google) Code Review
committed
Merge "Log messages in dump"
2 parents 21d1251 + 6079237 commit e1531a6

File tree

2 files changed

+34
-39
lines changed

2 files changed

+34
-39
lines changed

‎services/java/com/android/server/WifiService.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1202,6 +1202,8 @@ protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
12021202
pw.println();
12031203
pw.println("WifiWatchdogStateMachine dump");
12041204
mWifiWatchdogStateMachine.dump(pw);
1205+
pw.println("WifiStateMachine dump");
1206+
mWifiStateMachine.dump(fd, pw, args);
12051207
}
12061208

12071209
private class WifiLock extends DeathRecipient {

‎wifi/java/android/net/wifi/WifiStateMachine.java‎

Lines changed: 32 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -669,6 +669,7 @@ public void onReceive(Context context, Intent intent) {
669669

670670
setInitialState(mInitialState);
671671

672+
setProcessedMessagesSize(100);
672673
if (DBG) setDbg(true);
673674

674675
//start the state machine
@@ -1121,6 +1122,37 @@ public String toString() {
11211122
return sb.toString();
11221123
}
11231124

1125+
@Override
1126+
protected boolean recordProcessedMessage(Message msg) {
1127+
//Ignore screen on/off & common messages when driver has started
1128+
if (getCurrentState() == mConnectedState || getCurrentState() == mDisconnectedState) {
1129+
switch (msg.what) {
1130+
case CMD_LOAD_DRIVER:
1131+
case CMD_START_SUPPLICANT:
1132+
case CMD_START_DRIVER:
1133+
case CMD_SET_SCAN_MODE:
1134+
case CMD_SET_HIGH_PERF_MODE:
1135+
case CMD_SET_SUSPEND_OPTIMIZATIONS:
1136+
case CMD_CLEAR_SUSPEND_OPTIMIZATIONS:
1137+
case CMD_ENABLE_BACKGROUND_SCAN:
1138+
case CMD_ENABLE_ALL_NETWORKS:
1139+
return false;
1140+
}
1141+
}
1142+
1143+
switch (msg.what) {
1144+
case CMD_START_SCAN:
1145+
case CMD_ENABLE_RSSI_POLL:
1146+
case CMD_RSSI_POLL:
1147+
case CMD_DELAYED_STOP_DRIVER:
1148+
case WifiMonitor.SCAN_RESULTS_EVENT:
1149+
case WifiWatchdogStateMachine.RSSI_FETCH:
1150+
return false;
1151+
default:
1152+
return true;
1153+
}
1154+
}
1155+
11241156
/*********************************************************
11251157
* Internal private functions
11261158
********************************************************/
@@ -2015,7 +2047,6 @@ public boolean processMessage(Message message) {
20152047
default:
20162048
return NOT_HANDLED;
20172049
}
2018-
EventLog.writeEvent(EVENTLOG_WIFI_EVENT_HANDLED, message.what);
20192050
return HANDLED;
20202051
}
20212052
}
@@ -2068,7 +2099,6 @@ public boolean processMessage(Message message) {
20682099
default:
20692100
return NOT_HANDLED;
20702101
}
2071-
EventLog.writeEvent(EVENTLOG_WIFI_EVENT_HANDLED, message.what);
20722102
return HANDLED;
20732103
}
20742104
}
@@ -2148,7 +2178,6 @@ public boolean processMessage(Message message) {
21482178
default:
21492179
return NOT_HANDLED;
21502180
}
2151-
EventLog.writeEvent(EVENTLOG_WIFI_EVENT_HANDLED, message.what);
21522181
return HANDLED;
21532182
}
21542183
}
@@ -2169,7 +2198,6 @@ public boolean processMessage(Message message) {
21692198
default:
21702199
return NOT_HANDLED;
21712200
}
2172-
EventLog.writeEvent(EVENTLOG_WIFI_EVENT_HANDLED, message.what);
21732201
return HANDLED;
21742202
}
21752203
}
@@ -2250,7 +2278,6 @@ public boolean processMessage(Message message) {
22502278
default:
22512279
return NOT_HANDLED;
22522280
}
2253-
EventLog.writeEvent(EVENTLOG_WIFI_EVENT_HANDLED, message.what);
22542281
return HANDLED;
22552282
}
22562283
}
@@ -2274,7 +2301,6 @@ public void enter() {
22742301
public boolean processMessage(Message message) {
22752302
if (DBG) log(getName() + message.toString() + "\n");
22762303
WifiConfiguration config;
2277-
boolean eventLoggingEnabled = true;
22782304
switch(message.what) {
22792305
case CMD_STOP_SUPPLICANT: /* Supplicant stopped by user */
22802306
transitionTo(mSupplicantStoppingState);
@@ -2291,7 +2317,6 @@ public boolean processMessage(Message message) {
22912317
sendMessageDelayed(CMD_START_SUPPLICANT, SUPPLICANT_RESTART_INTERVAL_MSECS);
22922318
break;
22932319
case WifiMonitor.SCAN_RESULTS_EVENT:
2294-
eventLoggingEnabled = false;
22952320
setScanResults(mWifiNative.scanResults());
22962321
sendScanResultsAvailableBroadcast();
22972322
mScanResultIsPending = false;
@@ -2381,9 +2406,6 @@ public boolean processMessage(Message message) {
23812406
default:
23822407
return NOT_HANDLED;
23832408
}
2384-
if (eventLoggingEnabled) {
2385-
EventLog.writeEvent(EVENTLOG_WIFI_EVENT_HANDLED, message.what);
2386-
}
23872409
return HANDLED;
23882410
}
23892411

@@ -2459,7 +2481,6 @@ public boolean processMessage(Message message) {
24592481
default:
24602482
return NOT_HANDLED;
24612483
}
2462-
EventLog.writeEvent(EVENTLOG_WIFI_EVENT_HANDLED, message.what);
24632484
return HANDLED;
24642485
}
24652486
}
@@ -2505,7 +2526,6 @@ public boolean processMessage(Message message) {
25052526
default:
25062527
return NOT_HANDLED;
25072528
}
2508-
EventLog.writeEvent(EVENTLOG_WIFI_EVENT_HANDLED, message.what);
25092529
return HANDLED;
25102530
}
25112531
}
@@ -2564,14 +2584,12 @@ public void enter() {
25642584
@Override
25652585
public boolean processMessage(Message message) {
25662586
if (DBG) log(getName() + message.toString() + "\n");
2567-
boolean eventLoggingEnabled = true;
25682587
switch(message.what) {
25692588
case CMD_SET_SCAN_TYPE:
25702589
mSetScanActive = (message.arg1 == SCAN_ACTIVE);
25712590
mWifiNative.setScanMode(mSetScanActive);
25722591
break;
25732592
case CMD_START_SCAN:
2574-
eventLoggingEnabled = false;
25752593
boolean forceActive = (message.arg1 == SCAN_ACTIVE);
25762594
if (forceActive && !mSetScanActive) {
25772595
mWifiNative.setScanMode(forceActive);
@@ -2681,9 +2699,6 @@ public boolean processMessage(Message message) {
26812699
default:
26822700
return NOT_HANDLED;
26832701
}
2684-
if (eventLoggingEnabled) {
2685-
EventLog.writeEvent(EVENTLOG_WIFI_EVENT_HANDLED, message.what);
2686-
}
26872702
return HANDLED;
26882703
}
26892704
@Override
@@ -2731,7 +2746,6 @@ public boolean processMessage(Message message) {
27312746
default:
27322747
return NOT_HANDLED;
27332748
}
2734-
EventLog.writeEvent(EVENTLOG_WIFI_EVENT_HANDLED, message.what);
27352749
return HANDLED;
27362750
}
27372751
}
@@ -2764,7 +2778,6 @@ public boolean processMessage(Message message) {
27642778
default:
27652779
return NOT_HANDLED;
27662780
}
2767-
EventLog.writeEvent(EVENTLOG_WIFI_EVENT_HANDLED, message.what);
27682781
return HANDLED;
27692782
}
27702783
}
@@ -2801,7 +2814,6 @@ public boolean processMessage(Message message) {
28012814
default:
28022815
return NOT_HANDLED;
28032816
}
2804-
EventLog.writeEvent(EVENTLOG_WIFI_EVENT_HANDLED, message.what);
28052817
return HANDLED;
28062818
}
28072819
}
@@ -2940,7 +2952,6 @@ public boolean processMessage(Message message) {
29402952
default:
29412953
return NOT_HANDLED;
29422954
}
2943-
EventLog.writeEvent(EVENTLOG_WIFI_EVENT_HANDLED, message.what);
29442955
return HANDLED;
29452956
}
29462957
}
@@ -2959,7 +2970,6 @@ public void enter() {
29592970
@Override
29602971
public boolean processMessage(Message message) {
29612972
if (DBG) log(getName() + message.toString() + "\n");
2962-
boolean eventLoggingEnabled = true;
29632973
switch (message.what) {
29642974
case DhcpStateMachine.CMD_PRE_DHCP_ACTION:
29652975
handlePreDhcpSetup();
@@ -2988,7 +2998,6 @@ public boolean processMessage(Message message) {
29882998
}
29892999
break;
29903000
case CMD_START_SCAN:
2991-
eventLoggingEnabled = false;
29923001
/* When the network is connected, re-scanning can trigger
29933002
* a reconnection. Put it in scan-only mode during scan.
29943003
* When scan results are received, the mode is switched
@@ -3031,7 +3040,6 @@ public boolean processMessage(Message message) {
30313040
case WifiMonitor.NETWORK_CONNECTION_EVENT:
30323041
break;
30333042
case CMD_RSSI_POLL:
3034-
eventLoggingEnabled = false;
30353043
if (message.arg1 == mRssiPollToken) {
30363044
// Get Info and continue polling
30373045
fetchRssiAndLinkSpeedNative();
@@ -3052,7 +3060,6 @@ public boolean processMessage(Message message) {
30523060
}
30533061
break;
30543062
case WifiWatchdogStateMachine.RSSI_FETCH:
3055-
eventLoggingEnabled = false;
30563063
fetchRssiAndLinkSpeedNative();
30573064
replyToMessage(message, WifiWatchdogStateMachine.RSSI_FETCH_SUCCEEDED,
30583065
mWifiInfo.getRssi());
@@ -3061,9 +3068,6 @@ public boolean processMessage(Message message) {
30613068
return NOT_HANDLED;
30623069
}
30633070

3064-
if (eventLoggingEnabled) {
3065-
EventLog.writeEvent(EVENTLOG_WIFI_EVENT_HANDLED, message.what);
3066-
}
30673071
return HANDLED;
30683072
}
30693073

@@ -3131,7 +3135,6 @@ public boolean processMessage(Message message) {
31313135
default:
31323136
return NOT_HANDLED;
31333137
}
3134-
EventLog.writeEvent(EVENTLOG_WIFI_EVENT_HANDLED, message.what);
31353138
return HANDLED;
31363139
}
31373140
}
@@ -3168,7 +3171,6 @@ public boolean processMessage(Message message) {
31683171
default:
31693172
return NOT_HANDLED;
31703173
}
3171-
EventLog.writeEvent(EVENTLOG_WIFI_EVENT_HANDLED, message.what);
31723174
return HANDLED;
31733175
}
31743176
}
@@ -3202,7 +3204,6 @@ public boolean processMessage(Message message) {
32023204
default:
32033205
return NOT_HANDLED;
32043206
}
3205-
EventLog.writeEvent(EVENTLOG_WIFI_EVENT_HANDLED, message.what);
32063207
return HANDLED;
32073208
}
32083209
@Override
@@ -3240,7 +3241,6 @@ public boolean processMessage(Message message) {
32403241
default:
32413242
return NOT_HANDLED;
32423243
}
3243-
EventLog.writeEvent(EVENTLOG_WIFI_EVENT_HANDLED, message.what);
32443244
return HANDLED;
32453245
}
32463246
}
@@ -3343,7 +3343,6 @@ public boolean processMessage(Message message) {
33433343
default:
33443344
return NOT_HANDLED;
33453345
}
3346-
EventLog.writeEvent(EVENTLOG_WIFI_EVENT_HANDLED, message.what);
33473346
return HANDLED;
33483347
}
33493348

@@ -3432,7 +3431,6 @@ public boolean processMessage(Message message) {
34323431
default:
34333432
return NOT_HANDLED;
34343433
}
3435-
EventLog.writeEvent(EVENTLOG_WIFI_EVENT_HANDLED, message.what);
34363434
return HANDLED;
34373435
}
34383436

@@ -3504,7 +3502,6 @@ public boolean processMessage(Message message) {
35043502
default:
35053503
return NOT_HANDLED;
35063504
}
3507-
EventLog.writeEvent(EVENTLOG_WIFI_EVENT_HANDLED, message.what);
35083505
return HANDLED;
35093506
}
35103507
}
@@ -3548,7 +3545,6 @@ public boolean processMessage(Message message) {
35483545
default:
35493546
return NOT_HANDLED;
35503547
}
3551-
EventLog.writeEvent(EVENTLOG_WIFI_EVENT_HANDLED, message.what);
35523548
return HANDLED;
35533549
}
35543550
}
@@ -3598,7 +3594,6 @@ public boolean processMessage(Message message) {
35983594
default:
35993595
return NOT_HANDLED;
36003596
}
3601-
EventLog.writeEvent(EVENTLOG_WIFI_EVENT_HANDLED, message.what);
36023597
return HANDLED;
36033598
}
36043599
}
@@ -3629,7 +3624,6 @@ public boolean processMessage(Message message) {
36293624
default:
36303625
return NOT_HANDLED;
36313626
}
3632-
EventLog.writeEvent(EVENTLOG_WIFI_EVENT_HANDLED, message.what);
36333627
return HANDLED;
36343628
}
36353629
}
@@ -3692,7 +3686,6 @@ public boolean processMessage(Message message) {
36923686
default:
36933687
return NOT_HANDLED;
36943688
}
3695-
EventLog.writeEvent(EVENTLOG_WIFI_EVENT_HANDLED, message.what);
36963689
return HANDLED;
36973690
}
36983691
}

0 commit comments

Comments
 (0)