From f4da6504442ba16829ddd206ef73329a7b02ad8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= <kjetil.orbekk@gmail.com>
Date: Mon, 9 Apr 2012 21:58:36 +0200
Subject: Run benchmark from Activities.

---
 .../orbekk/same/android/benchmark/ExampleHttpServerActivity.java   | 4 ++++
 .../same/android/benchmark/ExampleProtobufServerActivity.java      | 7 +++++++
 same/src/main/java/com/orbekk/same/benchmark/ClientBenchmark.java  | 3 +--
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/same-android/src/main/java/com/orbekk/same/android/benchmark/ExampleHttpServerActivity.java b/same-android/src/main/java/com/orbekk/same/android/benchmark/ExampleHttpServerActivity.java
index 695988d..700030c 100644
--- a/same-android/src/main/java/com/orbekk/same/android/benchmark/ExampleHttpServerActivity.java
+++ b/same-android/src/main/java/com/orbekk/same/android/benchmark/ExampleHttpServerActivity.java
@@ -3,6 +3,7 @@ package com.orbekk.same.android.benchmark;
 import android.app.Activity;
 
 import com.orbekk.same.benchmark.ExampleServer;
+import com.orbekk.same.benchmark.HttpClientBenchmark;
 import com.orbekk.same.benchmark.HttpExampleServer;
 
 public class ExampleHttpServerActivity extends Activity {
@@ -12,6 +13,9 @@ public class ExampleHttpServerActivity extends Activity {
         super.onResume();
         try {
             server.runServer(12000);
+            HttpClientBenchmark.benchmark(
+                    "http://localhost:12000/HttpExampleService.json",
+                    100, 2000);
         } catch (Exception e) {
             e.printStackTrace();
             throw new RuntimeException(e);
diff --git a/same-android/src/main/java/com/orbekk/same/android/benchmark/ExampleProtobufServerActivity.java b/same-android/src/main/java/com/orbekk/same/android/benchmark/ExampleProtobufServerActivity.java
index c6be5a4..f4a2f05 100644
--- a/same-android/src/main/java/com/orbekk/same/android/benchmark/ExampleProtobufServerActivity.java
+++ b/same-android/src/main/java/com/orbekk/same/android/benchmark/ExampleProtobufServerActivity.java
@@ -1,7 +1,9 @@
 package com.orbekk.same.android.benchmark;
 
 import android.app.Activity;
+import android.os.Debug;
 
+import com.orbekk.same.benchmark.ClientBenchmark;
 import com.orbekk.same.benchmark.ExampleServer;
 
 public class ExampleProtobufServerActivity extends Activity {
@@ -10,6 +12,11 @@ public class ExampleProtobufServerActivity extends Activity {
     @Override public void onResume() {
         super.onResume();
         server.runServer(12000);
+        try {
+            ClientBenchmark.benchmark("localhost", 12000, 100, 2000);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
     }
     
     @Override public void onStop() {
diff --git a/same/src/main/java/com/orbekk/same/benchmark/ClientBenchmark.java b/same/src/main/java/com/orbekk/same/benchmark/ClientBenchmark.java
index ea23979..85d839e 100644
--- a/same/src/main/java/com/orbekk/same/benchmark/ClientBenchmark.java
+++ b/same/src/main/java/com/orbekk/same/benchmark/ClientBenchmark.java
@@ -50,7 +50,6 @@ public class ClientBenchmark {
                 }
             });
         }
-        
         finished.await();
     }
     
@@ -75,7 +74,7 @@ public class ClientBenchmark {
         String host = args[0];
         int port = Integer.valueOf(args[1]);
         try {
-            benchmark(host, port, 1000, 10000);
+            benchmark(host, port, 100, 100000);
         } catch (InterruptedException e) {
             System.out.println("Benchmark failed.");
         }
-- 
cgit v1.2.3