LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 1ed1de7a: Merge "Modify logging to debug this issue" into jb-dev

Browse Source 
* commit '1ed1de7ab2ae03f82500dbf6272bf036d89bd0c9':
  Modify logging to debug this issue
This commit is contained in:
Robert Greenwalt
2012-05-24 12:30:20 -07:00
committed by Android Git Automerger
parent 9e584f2cfb 6c37b32a26
commit 0883995604
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/java/com/android/server/NativeDaemonConnector.java
View File

@@ -58,6 +58,7 @@ final class NativeDaemonConnector implements Runnable, Handler.Callback, Watchdo
private AtomicInteger mSequenceNumber; private AtomicInteger mSequenceNumber;
private static final int DEFAULT_TIMEOUT = 1 * 60 * 1000; /* 1 minute */ private static final int DEFAULT_TIMEOUT = 1 * 60 * 1000; /* 1 minute */
private static final long WARN_EXECUTE_DELAY_MS = 500; /* .5 sec */
/** Lock held whenever communicating with native daemon. */ /** Lock held whenever communicating with native daemon. */
private final Object mDaemonLock = new Object(); private final Object mDaemonLock = new Object();
@@ -148,7 +149,6 @@ final class NativeDaemonConnector implements Runnable, Handler.Callback, Watchdo
mCallbackHandler.sendMessage(mCallbackHandler.obtainMessage( mCallbackHandler.sendMessage(mCallbackHandler.obtainMessage(
event.getCode(), event.getRawEvent())); event.getCode(), event.getRawEvent()));
} else { } else {
log("POST<- {" + rawEvent + "}");
mResponseQueue.add(event.getCmdNumber(), event); mResponseQueue.add(event.getCmdNumber(), event);
} }
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
@@ -300,6 +300,7 @@ final class NativeDaemonConnector implements Runnable, Handler.Callback, Watchdo
final int sequenceNumber = mSequenceNumber.incrementAndGet(); final int sequenceNumber = mSequenceNumber.incrementAndGet();
final StringBuilder cmdBuilder = final StringBuilder cmdBuilder =
new StringBuilder(Integer.toString(sequenceNumber)).append(' '); new StringBuilder(Integer.toString(sequenceNumber)).append(' ');
final long startTime = SystemClock.elapsedRealtime();
makeCommand(cmdBuilder, cmd, args); makeCommand(cmdBuilder, cmd, args);
@@ -332,6 +333,11 @@ final class NativeDaemonConnector implements Runnable, Handler.Callback, Watchdo
events.add(event); events.add(event);
} while (event.isClassContinue()); } while (event.isClassContinue());
final long endTime = SystemClock.elapsedRealtime();
if (endTime - startTime > WARN_EXECUTE_DELAY_MS) {
loge("NDC Command {" + logCmd + "} took too long (" + (endTime - startTime) + "ms)");
}
if (event.isClassClientError()) { if (event.isClassClientError()) {
throw new NativeDaemonArgumentException(logCmd, event); throw new NativeDaemonArgumentException(logCmd, event);
} }
@@ -339,7 +345,6 @@ final class NativeDaemonConnector implements Runnable, Handler.Callback, Watchdo
throw new NativeDaemonFailureException(logCmd, event); throw new NativeDaemonFailureException(logCmd, event);
} }
log("RTN <- {" + logCmd + "}");
return events.toArray(new NativeDaemonEvent[events.size()]); return events.toArray(new NativeDaemonEvent[events.size()]);
} }