Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Quiet excessive logging of missing lambdas during preload" am: 70b20ee0b8 am: 1f2781c323 am: f72a5498af

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424919

Change-Id: Icaa3321c187b2c4f64fc7d56d9917fdb5b4e216b
This commit is contained in:
Treehugger Robot
2020-09-11 21:16:58 +00:00
committed by Automerger Merge Worker
parent 6671acef6e f72a5498af
commit d39fbcc29e
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/java/com/android/internal/os/ZygoteInit.java
View File

@@ -86,9 +86,10 @@ import java.security.Security;
*/ */
public class ZygoteInit { public class ZygoteInit {
// TODO (chriswailes): Change this so it is set with Zygote or ZygoteSecondary as appropriate
private static final String TAG = "Zygote"; private static final String TAG = "Zygote";
private static final boolean LOGGING_DEBUG = Log.isLoggable(TAG, Log.DEBUG);
private static final String PROPERTY_DISABLE_GRAPHICS_DRIVER_PRELOADING = private static final String PROPERTY_DISABLE_GRAPHICS_DRIVER_PRELOADING =
"ro.zygote.disable_gl_preload"; "ro.zygote.disable_gl_preload";
@@ -284,6 +285,7 @@ public class ZygoteInit {
new BufferedReader(new InputStreamReader(is), Zygote.SOCKET_BUFFER_SIZE); new BufferedReader(new InputStreamReader(is), Zygote.SOCKET_BUFFER_SIZE);
int count = 0; int count = 0;
int missingLambdaCount = 0;
String line; String line;
while ((line = br.readLine()) != null) { while ((line = br.readLine()) != null) {
// Skip comments and blank lines. // Skip comments and blank lines.
@@ -302,24 +304,33 @@ public class ZygoteInit {
Class.forName(line, true, null); Class.forName(line, true, null);
count++; count++;
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {
Log.w(TAG, "Class not found for preloading: " + line); if (line.contains("$$Lambda$")) {
if (LOGGING_DEBUG) {
missingLambdaCount++;
}
} else {
Log.w(TAG, "Class not found for preloading: " + line);
}
} catch (UnsatisfiedLinkError e) { } catch (UnsatisfiedLinkError e) {
Log.w(TAG, "Problem preloading " + line + ": " + e); Log.w(TAG, "Problem preloading " + line + ": " + e);
} catch (Throwable t) { } catch (Throwable t) {
Log.e(TAG, "Error preloading " + line + ".", t); Log.e(TAG, "Error preloading " + line + ".", t);
if (t instanceof Error) { if (t instanceof Error) {
throw (Error) t; throw (Error) t;
} } else if (t instanceof RuntimeException) {
if (t instanceof RuntimeException) {
throw (RuntimeException) t; throw (RuntimeException) t;
} else {
throw new RuntimeException(t);
} }
throw new RuntimeException(t);
} }
Trace.traceEnd(Trace.TRACE_TAG_DALVIK); Trace.traceEnd(Trace.TRACE_TAG_DALVIK);
} }
Log.i(TAG, "...preloaded " + count + " classes in " Log.i(TAG, "...preloaded " + count + " classes in "
+ (SystemClock.uptimeMillis() - startTime) + "ms."); + (SystemClock.uptimeMillis() - startTime) + "ms.");
if (LOGGING_DEBUG && missingLambdaCount != 0) {
Log.i(TAG, "Unresolved lambda preloads: " + missingLambdaCount);
}
} catch (IOException e) { } catch (IOException e) {
Log.e(TAG, "Error reading " + PRELOADED_CLASSES + ".", e); Log.e(TAG, "Error reading " + PRELOADED_CLASSES + ".", e);
} finally { } finally {