Merge "Remove unnecessary finally blocks for tracing."

1 files changed, 44 insertions, 57 deletions

diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java
index 639d731c7762..915c075558fe 100644
--- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/core/java/com/android/internal/os/ZygoteInit.java
@@ -182,19 +182,15 @@ public class ZygoteInit {
 
     static void preload() {
         Log.d(TAG, "begin preload");
-        try {
-            Trace.traceBegin(Trace.TRACE_TAG_DALVIK, "PreloadClasses");
-            preloadClasses();
-        } finally {
-            Trace.traceEnd(Trace.TRACE_TAG_DALVIK);
-        }
-        try {
-            Trace.traceBegin(Trace.TRACE_TAG_DALVIK, "PreloadResources");
-            preloadResources();
-        } finally {
-            Trace.traceEnd(Trace.TRACE_TAG_DALVIK);
-        }
+        Trace.traceBegin(Trace.TRACE_TAG_DALVIK, "PreloadClasses");
+        preloadClasses();
+        Trace.traceEnd(Trace.TRACE_TAG_DALVIK);
+        Trace.traceBegin(Trace.TRACE_TAG_DALVIK, "PreloadResources");
+        preloadResources();
+        Trace.traceEnd(Trace.TRACE_TAG_DALVIK);
+        Trace.traceBegin(Trace.TRACE_TAG_DALVIK, "PreloadOpenGL");
         preloadOpenGL();
+        Trace.traceEnd(Trace.TRACE_TAG_DALVIK);
         preloadSharedLibraries();
         // Ask the WebViewFactory to do any initialization that must run in the zygote process,
         // for memory sharing purposes.
@@ -273,8 +269,8 @@ public class ZygoteInit {
                     continue;
                 }
 
+                Trace.traceBegin(Trace.TRACE_TAG_DALVIK, "PreloadClass " + line);
                 try {
-                    Trace.traceBegin(Trace.TRACE_TAG_DALVIK, "PreloadClass " + line);
                     if (false) {
                         Log.v(TAG, "Preloading " + line + "...");
                     }
@@ -298,9 +294,8 @@ public class ZygoteInit {
                         throw (RuntimeException) t;
                     }
                     throw new RuntimeException(t);
-                } finally {
-                    Trace.traceEnd(Trace.TRACE_TAG_DALVIK);
                 }
+                Trace.traceEnd(Trace.TRACE_TAG_DALVIK);
             }
 
             Log.i(TAG, "...preloaded " + count + " classes in "
@@ -576,56 +571,48 @@ public class ZygoteInit {
 
     public static void main(String argv[]) {
         try {
+            Trace.traceBegin(Trace.TRACE_TAG_DALVIK, "ZygoteInit");
+            RuntimeInit.enableDdms();
+            // Start profiling the zygote initialization.
+            SamplingProfilerIntegration.start();
+
             boolean startSystemServer = false;
             String socketName = "zygote";
             String abiList = null;
-            try {
-                Trace.traceBegin(Trace.TRACE_TAG_DALVIK, "ZygoteInit");
-                RuntimeInit.enableDdms();
-                // Start profiling the zygote initialization.
-                SamplingProfilerIntegration.start();
-
-                for (int i = 1; i < argv.length; i++) {
-                    if ("start-system-server".equals(argv[i])) {
-                        startSystemServer = true;
-                    } else if (argv[i].startsWith(ABI_LIST_ARG)) {
-                        abiList = argv[i].substring(ABI_LIST_ARG.length());
-                    } else if (argv[i].startsWith(SOCKET_NAME_ARG)) {
-                        socketName = argv[i].substring(SOCKET_NAME_ARG.length());
-                    } else {
-                        throw new RuntimeException("Unknown command line argument: " + argv[i]);
-                    }
+            for (int i = 1; i < argv.length; i++) {
+                if ("start-system-server".equals(argv[i])) {
+                    startSystemServer = true;
+                } else if (argv[i].startsWith(ABI_LIST_ARG)) {
+                    abiList = argv[i].substring(ABI_LIST_ARG.length());
+                } else if (argv[i].startsWith(SOCKET_NAME_ARG)) {
+                    socketName = argv[i].substring(SOCKET_NAME_ARG.length());
+                } else {
+                    throw new RuntimeException("Unknown command line argument: " + argv[i]);
                 }
+            }
 
-                if (abiList == null) {
-                    throw new RuntimeException("No ABI list supplied.");
-                }
+            if (abiList == null) {
+                throw new RuntimeException("No ABI list supplied.");
+            }
 
-                registerZygoteSocket(socketName);
-                try {
-                    Trace.traceBegin(Trace.TRACE_TAG_DALVIK, "ZygotePreload");
-                    EventLog.writeEvent(LOG_BOOT_PROGRESS_PRELOAD_START,
-                            SystemClock.uptimeMillis());
-                    preload();
-                    EventLog.writeEvent(LOG_BOOT_PROGRESS_PRELOAD_END,
-                            SystemClock.uptimeMillis());
-                } finally {
-                    Trace.traceEnd(Trace.TRACE_TAG_DALVIK);
-                }
+            registerZygoteSocket(socketName);
+            Trace.traceBegin(Trace.TRACE_TAG_DALVIK, "ZygotePreload");
+            EventLog.writeEvent(LOG_BOOT_PROGRESS_PRELOAD_START,
+                SystemClock.uptimeMillis());
+            preload();
+            EventLog.writeEvent(LOG_BOOT_PROGRESS_PRELOAD_END,
+                SystemClock.uptimeMillis());
+            Trace.traceEnd(Trace.TRACE_TAG_DALVIK);
 
-                // Finish profiling the zygote initialization.
-                SamplingProfilerIntegration.writeZygoteSnapshot();
+            // Finish profiling the zygote initialization.
+            SamplingProfilerIntegration.writeZygoteSnapshot();
 
-                // Do an initial gc to clean up after startup
-                try {
-                    Trace.traceBegin(Trace.TRACE_TAG_DALVIK, "PostZygoteInitGC");
-                    gcAndFinalize();
-                } finally {
-                    Trace.traceEnd(Trace.TRACE_TAG_DALVIK);
-                }
-            } finally {
-                Trace.traceEnd(Trace.TRACE_TAG_DALVIK);
-            }
+            // Do an initial gc to clean up after startup
+            Trace.traceBegin(Trace.TRACE_TAG_DALVIK, "PostZygoteInitGC");
+            gcAndFinalize();
+            Trace.traceEnd(Trace.TRACE_TAG_DALVIK);
+
+            Trace.traceEnd(Trace.TRACE_TAG_DALVIK);
 
             // Disable tracing so that forked processes do not inherit stale tracing tags from
             // Zygote.