From 23a4e8816266e2cac98d7980ca66748a55b0e09f Mon Sep 17 00:00:00 2001
From: Guang Zhu <guangzhu@google.com>
Date: Thu, 16 Apr 2009 10:16:36 -0700
Subject: [PATCH 1/3] * Update the way that run_page_cycler.py detectes
 instrumentation failures. * Use Debug.getMemoryInfo to collect memory
 information in LoadTestAutoTest.

---
 tests/DumpRenderTree/run_page_cycler.py       |  3 +-
 .../dumprendertree/LoadTestsAutoTest.java     | 60 ++++++++++++-------
 2 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/tests/DumpRenderTree/run_page_cycler.py b/tests/DumpRenderTree/run_page_cycler.py
index 9a099b52694b4..7f728a38245ab 100755
--- a/tests/DumpRenderTree/run_page_cycler.py
+++ b/tests/DumpRenderTree/run_page_cycler.py
@@ -59,7 +59,8 @@ def main(options, args):
   run_load_test_cmd = run_load_test_cmd_prefix + " -e class com.android.dumprendertree.LoadTestsAutoTest#runTest -e path \"" + path + "\" -e timeout " + timeout_ms + run_load_test_cmd_postfix
 
   (adb_output, adb_error) = subprocess.Popen(run_load_test_cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
-  if adb_output.find('INSTRUMENTATION_FAILED') != -1:
+  if adb_output.find('INSTRUMENTATION_FAILED') != -1 or \
+      adb_output.find('Process crashed.') != -1:
     logging.error("Error happened : " + adb_output)
     sys.exit(1)
 
diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/LoadTestsAutoTest.java b/tests/DumpRenderTree/src/com/android/dumprendertree/LoadTestsAutoTest.java
index b064dbb404290..637f1259bf2d7 100644
--- a/tests/DumpRenderTree/src/com/android/dumprendertree/LoadTestsAutoTest.java
+++ b/tests/DumpRenderTree/src/com/android/dumprendertree/LoadTestsAutoTest.java
@@ -16,14 +16,14 @@
 
 package com.android.dumprendertree;
 
-import android.app.Activity;
 import android.app.Instrumentation;
-import android.app.Instrumentation.ActivityMonitor;
 import android.content.Intent;
 
 import android.util.Log;
 
 import android.os.Bundle;
+import android.os.Debug;
+import android.os.Debug.MemoryInfo;
 import android.test.ActivityInstrumentationTestCase2;
 
 import com.android.dumprendertree.TestShellActivity;
@@ -33,6 +33,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.PrintStream;
 
 class StreamPipe extends Thread {
     InputStream in;
@@ -92,35 +93,54 @@ public class LoadTestsAutoTest extends ActivityInstrumentationTestCase2<TestShel
 
         // TODO(fqian): let am instrumentation pass in the command line, currently
         // am instrument does not allow spaces in the command.
-        runPostShellCommand("/system/bin/dumpsys meminfo");
+        dumpMemoryInfo();
         
         // Kill activity
         activity.finish();
     }
 
-    private void runPostShellCommand(String cmd) {
-        if (cmd == null || cmd.length() == 0)
-            return;
-        
+    private void dumpMemoryInfo() {
         try {
-            // Call dumpsys meminfo
-            Process proc = Runtime.getRuntime().exec(cmd);
-            // Append output to LOAD_TEST_RESULT
-            InputStream input = proc.getInputStream();
-            InputStream error = proc.getErrorStream();
+            Log.v(LOGTAG, "Dumping memory information.");
+            
             FileOutputStream out = new FileOutputStream(LOAD_TEST_RESULT, true);
-
-            StreamPipe p_in = new StreamPipe(input, out);
-            StreamPipe p_err = new StreamPipe(error, System.err);
+            PrintStream ps = new PrintStream(out);
             
-            p_in.start();
-            p_err.start();
+            MemoryInfo mi = new MemoryInfo();
+            Debug.getMemoryInfo(mi);
             
-            proc.waitFor();
+            //try to fake the dumpsys format
+            //this will eventually be changed to XML
+            String format = "%15s:%9d%9d%9d%9d";
+            String pss =
+              String.format(format, "(Pss)",
+                  mi.nativePss, mi.dalvikPss, mi.otherPss,
+                  mi.nativePss + mi.dalvikPss + mi.otherPss);
+            String sd =
+              String.format(format, "(shared dirty)",
+                  mi.nativeSharedDirty, mi.dalvikSharedDirty, mi.otherSharedDirty,
+                  mi.nativeSharedDirty + mi.dalvikSharedDirty + mi.otherSharedDirty);
+            String pd =
+              String.format(format, "(priv dirty)",
+                  mi.nativePrivateDirty, mi.dalvikPrivateDirty, mi.otherPrivateDirty,
+                  mi.nativePrivateDirty + mi.dalvikPrivateDirty + mi.otherPrivateDirty);
+            
+            ps.print("\n\n\n");
+            ps.println("** MEMINFO in pid 0 [com.android.dumprendertree] **");
+            ps.println("                   native   dalvik    other    total");
+            ps.println("           size:    12060     5255      N/A    17315");
+            ps.println("      allocated:    12060     5255      N/A    17315");
+            ps.println("           free:    12060     5255      N/A    17315");
+            ps.println(pss);
+            ps.println(sd);
+            ps.println(pd);
+            ps.print("\n\n\n");
+            ps.flush();
+            ps.close();
+            out.flush();
+            out.close();
         } catch (IOException e) {
             Log.e(LOGTAG, e.getMessage());
-        } catch (InterruptedException e) {
-            Log.e(LOGTAG, e.getMessage());
         }      
     }
     

From 4722251d933b74e0f03a45740cad30c4b366843f Mon Sep 17 00:00:00 2001
From: Guang Zhu <guangzhu@google.com>
Date: Thu, 16 Apr 2009 10:25:54 -0700
Subject: [PATCH 2/3] Removing unused StreamPipe class, also stripping some
 white spaces

---
 .../dumprendertree/LoadTestsAutoTest.java     | 53 +++++--------------
 1 file changed, 14 insertions(+), 39 deletions(-)

diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/LoadTestsAutoTest.java b/tests/DumpRenderTree/src/com/android/dumprendertree/LoadTestsAutoTest.java
index 637f1259bf2d7..9e1e9ed253b0d 100644
--- a/tests/DumpRenderTree/src/com/android/dumprendertree/LoadTestsAutoTest.java
+++ b/tests/DumpRenderTree/src/com/android/dumprendertree/LoadTestsAutoTest.java
@@ -29,40 +29,15 @@ import android.test.ActivityInstrumentationTestCase2;
 import com.android.dumprendertree.TestShellActivity;
 import com.android.dumprendertree.TestShellCallback;
 
-import java.io.InputStream;
-import java.io.OutputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
 
-class StreamPipe extends Thread {
-    InputStream in;
-    OutputStream out;
-    
-    StreamPipe(InputStream in, OutputStream out) {
-        this.in = in;
-        this.out = out;
-    }
-    
-    public void run() {
-        try {
-            byte[] buf = new byte[1024];
-            int nofb = this.in.read(buf);
-            while (nofb != -1) {
-                this.out.write(buf, 0, nofb);
-                nofb = this.in.read(buf);
-            }          
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-}
-
 public class LoadTestsAutoTest extends ActivityInstrumentationTestCase2<TestShellActivity> {
 
     private final static String LOGTAG = "LoadTest";
     private final static String LOAD_TEST_RESULT = "/sdcard/load_test_result.txt";
-    
+
     public LoadTestsAutoTest() {
         super("com.android.dumprendertree", TestShellActivity.class);
     }
@@ -75,7 +50,7 @@ public class LoadTestsAutoTest extends ActivityInstrumentationTestCase2<TestShel
         bundle.putBoolean(file, result);
         inst.sendStatus(0, bundle);
     }
-    
+
     // Invokes running of layout tests
     // and waits till it has finished running.
     public void runTest() {
@@ -85,7 +60,7 @@ public class LoadTestsAutoTest extends ActivityInstrumentationTestCase2<TestShel
             Log.e(LOGTAG, "No test specified");
             return;
         }
-        
+
         TestShellActivity activity = (TestShellActivity) getActivity();
 
         // Run tests
@@ -94,7 +69,7 @@ public class LoadTestsAutoTest extends ActivityInstrumentationTestCase2<TestShel
         // TODO(fqian): let am instrumentation pass in the command line, currently
         // am instrument does not allow spaces in the command.
         dumpMemoryInfo();
-        
+
         // Kill activity
         activity.finish();
     }
@@ -102,13 +77,13 @@ public class LoadTestsAutoTest extends ActivityInstrumentationTestCase2<TestShel
     private void dumpMemoryInfo() {
         try {
             Log.v(LOGTAG, "Dumping memory information.");
-            
+
             FileOutputStream out = new FileOutputStream(LOAD_TEST_RESULT, true);
             PrintStream ps = new PrintStream(out);
-            
+
             MemoryInfo mi = new MemoryInfo();
             Debug.getMemoryInfo(mi);
-            
+
             //try to fake the dumpsys format
             //this will eventually be changed to XML
             String format = "%15s:%9d%9d%9d%9d";
@@ -124,7 +99,7 @@ public class LoadTestsAutoTest extends ActivityInstrumentationTestCase2<TestShel
               String.format(format, "(priv dirty)",
                   mi.nativePrivateDirty, mi.dalvikPrivateDirty, mi.otherPrivateDirty,
                   mi.nativePrivateDirty + mi.dalvikPrivateDirty + mi.otherPrivateDirty);
-            
+
             ps.print("\n\n\n");
             ps.println("** MEMINFO in pid 0 [com.android.dumprendertree] **");
             ps.println("                   native   dalvik    other    total");
@@ -141,9 +116,9 @@ public class LoadTestsAutoTest extends ActivityInstrumentationTestCase2<TestShel
             out.close();
         } catch (IOException e) {
             Log.e(LOGTAG, e.getMessage());
-        }      
+        }
     }
-    
+
     // A convenient method to be called by another activity.
     private void runTestAndWaitUntilDone(TestShellActivity activity, String url, int timeout) {
         activity.setCallback(new TestShellCallback() {
@@ -151,9 +126,9 @@ public class LoadTestsAutoTest extends ActivityInstrumentationTestCase2<TestShel
                 synchronized (LoadTestsAutoTest.this) {
                     LoadTestsAutoTest.this.notifyAll();
                 }
-            }         
+            }
         });
-        
+
         Intent intent = new Intent(Intent.ACTION_VIEW);
         intent.setClass(activity, TestShellActivity.class);
         intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
@@ -161,12 +136,12 @@ public class LoadTestsAutoTest extends ActivityInstrumentationTestCase2<TestShel
         intent.putExtra(TestShellActivity.TIMEOUT_IN_MILLIS, timeout);
         intent.putExtra(TestShellActivity.RESULT_FILE, LOAD_TEST_RESULT);
         activity.startActivity(intent);
-        
+
         // Wait until done.
         synchronized (this) {
             try {
                 this.wait();
             } catch (InterruptedException e) { }
         }
-    }   
+    }
 }

From 025950db010e8e3ebae7b0ef4425c6f4c4fd9a51 Mon Sep 17 00:00:00 2001
From: Guang Zhu <guangzhu@google.com>
Date: Thu, 16 Apr 2009 10:41:27 -0700
Subject: [PATCH 3/3] update onCreate method to work around
 InstrumentationTestRunner limitation.

---
 .../src/com/android/dumprendertree/LayoutTestsAutoRunner.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/LayoutTestsAutoRunner.java b/tests/DumpRenderTree/src/com/android/dumprendertree/LayoutTestsAutoRunner.java
index 8f968b43972a0..ebdc9c72305c5 100755
--- a/tests/DumpRenderTree/src/com/android/dumprendertree/LayoutTestsAutoRunner.java
+++ b/tests/DumpRenderTree/src/com/android/dumprendertree/LayoutTestsAutoRunner.java
@@ -51,7 +51,6 @@ public class LayoutTestsAutoRunner extends InstrumentationTestRunner {
 
     @Override
     public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
         this.mTestPath = (String) icicle.get("path");
         String timeout_str = (String) icicle.get("timeout");
         if (timeout_str != null) {
@@ -64,6 +63,7 @@ public class LayoutTestsAutoRunner extends InstrumentationTestRunner {
         
         String r = (String)icicle.get("rebaseline");
         this.mRebaseline = (r != null && r.toLowerCase().equals("true"));
+        super.onCreate(icicle);
     }
     
     public String mTestPath = null;