From 21afb1c506d7afc328b11089ed932c780adf4681 Mon Sep 17 00:00:00 2001
From: HappyZ <zhuyanzi@gmail.com>
Date: Sun, 26 Feb 2017 12:14:32 -0800
Subject: [PATCH] report throughput on screen if verbose mode

---
 OffloadingDemo/.idea/misc.xml                 |  2 +-
 OffloadingDemo/mobile/mobile.iml              | 16 +++++++-------
 .../offloadingdemo/Thread_TX_CNormal.java     | 20 ++++++++++--------
 .../offloadingdemo/Thread_TX_CNormalUDP.java  | 20 ++++++++++--------
 .../offloadingdemo/Thread_TX_CRawNormal.java  | 20 ++++++++++--------
 .../offloadingdemo/Thread_TX_CRawSplice.java  | 20 ++++++++++--------
 .../offloadingdemo/Thread_TX_CSendfile.java   | 20 ++++++++++--------
 .../offloadingdemo/Thread_TX_CSplice.java     | 21 ++++++++++---------
 8 files changed, 75 insertions(+), 64 deletions(-)

diff --git a/OffloadingDemo/.idea/misc.xml b/OffloadingDemo/.idea/misc.xml
index 95f0f03..1caa136 100755
--- a/OffloadingDemo/.idea/misc.xml
+++ b/OffloadingDemo/.idea/misc.xml
@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/OffloadingDemo/mobile/mobile.iml b/OffloadingDemo/mobile/mobile.iml
index ae10d2d..f15575d 100755
--- a/OffloadingDemo/mobile/mobile.iml
+++ b/OffloadingDemo/mobile/mobile.iml
@@ -66,14 +66,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -82,6 +74,14 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
diff --git a/OffloadingDemo/mobile/src/main/java/edu/ucsb/cs/sandlab/offloadingdemo/Thread_TX_CNormal.java b/OffloadingDemo/mobile/src/main/java/edu/ucsb/cs/sandlab/offloadingdemo/Thread_TX_CNormal.java
index 8245f00..7d29670 100755
--- a/OffloadingDemo/mobile/src/main/java/edu/ucsb/cs/sandlab/offloadingdemo/Thread_TX_CNormal.java
+++ b/OffloadingDemo/mobile/src/main/java/edu/ucsb/cs/sandlab/offloadingdemo/Thread_TX_CNormal.java
@@ -83,19 +83,21 @@ class Thread_TX_CNormal implements Runnable {
                 stdout = stdout_buf.readLine();
                 duration = Utilities.parseBinOutput(stdout);
                 MainActivity.reportedFinishTime = duration;
-                if (MainActivity.isVerbose) {
-                    MainActivity.myHandler.post(new Runnable() {
-                        @Override
-                        public void run() {
-                            MainActivity.txt_results.append(
-                                    "Sent " + sentBytes + "bytes in " + duration + "s\n");
-                        }
-                    });
-                }
 
                 // throughput
                 stdout = stdout_buf.readLine();
                 throughput = Utilities.parseBinOutput(stdout);
+
+                if (MainActivity.isVerbose) {
+                    MainActivity.myHandler.post(new Runnable() {
+                        @Override
+                        public void run() {
+                            MainActivity.txt_results.append("Sent " + sentBytes +
+                                    "bytes in " + duration +
+                                     "s (" +throughput/Utilities.oneMB +"Mbps)\n");
+                        }
+                    });
+                }
             }
 
             stdout_buf.close();
diff --git a/OffloadingDemo/mobile/src/main/java/edu/ucsb/cs/sandlab/offloadingdemo/Thread_TX_CNormalUDP.java b/OffloadingDemo/mobile/src/main/java/edu/ucsb/cs/sandlab/offloadingdemo/Thread_TX_CNormalUDP.java
index 94dc328..1b3f50a 100755
--- a/OffloadingDemo/mobile/src/main/java/edu/ucsb/cs/sandlab/offloadingdemo/Thread_TX_CNormalUDP.java
+++ b/OffloadingDemo/mobile/src/main/java/edu/ucsb/cs/sandlab/offloadingdemo/Thread_TX_CNormalUDP.java
@@ -84,19 +84,21 @@ class Thread_TX_CNormalUDP implements Runnable {
                 stdout = stdout_buf.readLine();
                 duration = Utilities.parseBinOutput(stdout);
                 MainActivity.reportedFinishTime = duration;
-                if (MainActivity.isVerbose) {
-                    MainActivity.myHandler.post(new Runnable() {
-                        @Override
-                        public void run() {
-                            MainActivity.txt_results.append(
-                                    "Sent " + sentBytes + "bytes in " + duration + "s\n");
-                        }
-                    });
-                }
 
                 // throughput
                 stdout = stdout_buf.readLine();
                 throughput = Utilities.parseBinOutput(stdout);
+
+                if (MainActivity.isVerbose) {
+                    MainActivity.myHandler.post(new Runnable() {
+                        @Override
+                        public void run() {
+                            MainActivity.txt_results.append("Sent " + sentBytes +
+                                    "bytes in " + duration +
+                                    "s (" +throughput/Utilities.oneMB +"Mbps)\n");
+                        }
+                    });
+                }
             }
 
         } catch (IOException | InterruptedException e) {
diff --git a/OffloadingDemo/mobile/src/main/java/edu/ucsb/cs/sandlab/offloadingdemo/Thread_TX_CRawNormal.java b/OffloadingDemo/mobile/src/main/java/edu/ucsb/cs/sandlab/offloadingdemo/Thread_TX_CRawNormal.java
index 3fe5e34..06da559 100755
--- a/OffloadingDemo/mobile/src/main/java/edu/ucsb/cs/sandlab/offloadingdemo/Thread_TX_CRawNormal.java
+++ b/OffloadingDemo/mobile/src/main/java/edu/ucsb/cs/sandlab/offloadingdemo/Thread_TX_CRawNormal.java
@@ -81,19 +81,21 @@ class Thread_TX_CRawNormal implements Runnable {
                 stdout = stdout_buf.readLine();
                 duration = Utilities.parseBinOutput(stdout);
                 MainActivity.reportedFinishTime = duration;
-                if (MainActivity.isVerbose) {
-                    MainActivity.myHandler.post(new Runnable() {
-                        @Override
-                        public void run() {
-                            MainActivity.txt_results.append(
-                                    "Sent " + sentBytes + "bytes in " + duration + "s\n");
-                        }
-                    });
-                }
 
                 // throughput
                 stdout = stdout_buf.readLine();
                 throughput = Utilities.parseBinOutput(stdout);
+
+                if (MainActivity.isVerbose) {
+                    MainActivity.myHandler.post(new Runnable() {
+                        @Override
+                        public void run() {
+                            MainActivity.txt_results.append("Sent " + sentBytes +
+                                    "bytes in " + duration +
+                                    "s (" +throughput/Utilities.oneMB +"Mbps)\n");
+                        }
+                    });
+                }
             }
 
         } catch (IOException | InterruptedException e) {
diff --git a/OffloadingDemo/mobile/src/main/java/edu/ucsb/cs/sandlab/offloadingdemo/Thread_TX_CRawSplice.java b/OffloadingDemo/mobile/src/main/java/edu/ucsb/cs/sandlab/offloadingdemo/Thread_TX_CRawSplice.java
index c0f1247..89a1807 100755
--- a/OffloadingDemo/mobile/src/main/java/edu/ucsb/cs/sandlab/offloadingdemo/Thread_TX_CRawSplice.java
+++ b/OffloadingDemo/mobile/src/main/java/edu/ucsb/cs/sandlab/offloadingdemo/Thread_TX_CRawSplice.java
@@ -77,19 +77,21 @@ class Thread_TX_CRawSplice implements Runnable {
                 stdout = stdout_buf.readLine();
                 duration = Utilities.parseBinOutput(stdout);
                 MainActivity.reportedFinishTime = duration;
-                if (MainActivity.isVerbose) {
-                    MainActivity.myHandler.post(new Runnable() {
-                        @Override
-                        public void run() {
-                            MainActivity.txt_results.append(
-                                    "Sent " + sentBytes + "bytes in " + duration + "s\n");
-                        }
-                    });
-                }
 
                 // throughput
                 stdout = stdout_buf.readLine();
                 throughput = Utilities.parseBinOutput(stdout);
+
+                if (MainActivity.isVerbose) {
+                    MainActivity.myHandler.post(new Runnable() {
+                        @Override
+                        public void run() {
+                            MainActivity.txt_results.append("Sent " + sentBytes +
+                                    "bytes in " + duration +
+                                    "s (" +throughput/Utilities.oneMB +"Mbps)\n");
+                        }
+                    });
+                }
             }
 
         } catch (IOException | InterruptedException e) {
diff --git a/OffloadingDemo/mobile/src/main/java/edu/ucsb/cs/sandlab/offloadingdemo/Thread_TX_CSendfile.java b/OffloadingDemo/mobile/src/main/java/edu/ucsb/cs/sandlab/offloadingdemo/Thread_TX_CSendfile.java
index 6def1b8..5bdf996 100755
--- a/OffloadingDemo/mobile/src/main/java/edu/ucsb/cs/sandlab/offloadingdemo/Thread_TX_CSendfile.java
+++ b/OffloadingDemo/mobile/src/main/java/edu/ucsb/cs/sandlab/offloadingdemo/Thread_TX_CSendfile.java
@@ -81,19 +81,21 @@ class Thread_TX_CSendfile implements Runnable {
                 stdout = stdout_buf.readLine();
                 duration = Utilities.parseBinOutput(stdout);
                 MainActivity.reportedFinishTime = duration;
-                if (MainActivity.isVerbose) {
-                    MainActivity.myHandler.post(new Runnable() {
-                        @Override
-                        public void run() {
-                            MainActivity.txt_results.append(
-                                    "Sent " + sentBytes + "bytes in " + duration + "s\n");
-                        }
-                    });
-                }
 
                 // throughput
                 stdout = stdout_buf.readLine();
                 throughput = Utilities.parseBinOutput(stdout);
+
+                if (MainActivity.isVerbose) {
+                    MainActivity.myHandler.post(new Runnable() {
+                        @Override
+                        public void run() {
+                            MainActivity.txt_results.append("Sent " + sentBytes +
+                                    "bytes in " + duration +
+                                    "s (" +throughput/Utilities.oneMB +"Mbps)\n");
+                        }
+                    });
+                }
             }
 
         } catch (IOException | InterruptedException e) {
diff --git a/OffloadingDemo/mobile/src/main/java/edu/ucsb/cs/sandlab/offloadingdemo/Thread_TX_CSplice.java b/OffloadingDemo/mobile/src/main/java/edu/ucsb/cs/sandlab/offloadingdemo/Thread_TX_CSplice.java
index 7209e57..237c861 100755
--- a/OffloadingDemo/mobile/src/main/java/edu/ucsb/cs/sandlab/offloadingdemo/Thread_TX_CSplice.java
+++ b/OffloadingDemo/mobile/src/main/java/edu/ucsb/cs/sandlab/offloadingdemo/Thread_TX_CSplice.java
@@ -80,20 +80,21 @@ class Thread_TX_CSplice implements Runnable {
                 // duration
                 stdout = stdout_buf.readLine();
                 duration = Utilities.parseBinOutput(stdout);
-                MainActivity.reportedFinishTime = duration;
-                if (MainActivity.isVerbose) {
-                    MainActivity.myHandler.post(new Runnable() {
-                        @Override
-                        public void run() {
-                            MainActivity.txt_results.append(
-                                    "Sent " + sentBytes + "bytes in " + duration + "s\n");
-                        }
-                    });
-                }
 
                 // throughput
                 stdout = stdout_buf.readLine();
                 throughput = Utilities.parseBinOutput(stdout);
+
+                if (MainActivity.isVerbose) {
+                    MainActivity.myHandler.post(new Runnable() {
+                        @Override
+                        public void run() {
+                            MainActivity.txt_results.append("Sent " + sentBytes +
+                                    "bytes in " + duration +
+                                    "s (" +throughput/Utilities.oneMB +"Mbps)\n");
+                        }
+                    });
+                }
             }
 
         } catch (IOException | InterruptedException e) {