From: jihoonl <jihoonl>
Date: Wed, 24 Feb 2010 21:44:13 +0000 (+0000)
Subject: changes
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=bdc9612819448b63674dc7884fa10dbaba2185d4;p=IRC.git

changes
---

diff --git a/Robust/src/Benchmarks/Recovery/FileSystem/recovery/FileSystem.java b/Robust/src/Benchmarks/Recovery/FileSystem/recovery/FileSystem.java
index 3c0778c6..071b42ab 100644
--- a/Robust/src/Benchmarks/Recovery/FileSystem/recovery/FileSystem.java
+++ b/Robust/src/Benchmarks/Recovery/FileSystem/recovery/FileSystem.java
@@ -83,9 +83,12 @@ public class FileSystem extends Thread {
 			file = inputfile.toLocalString();
 		}
 
-		LinkedList todoList = new LinkedList();
+    LinkedList todoList = new LinkedList();
 		fillTodoList(file, todoList);
 
+    long st = System.currentTimeMillis();
+    long fi;
+
 		while (!todoList.isEmpty()) {
 			t = (Transaction)(todoList.removeFirst());
 
@@ -132,6 +135,8 @@ public class FileSystem extends Thread {
 	  	}
     }
 
+    fi = System.currentTimeMillis();
+
 		sleep(3000000);
 		atomic {
 			output();
@@ -139,8 +144,7 @@ public class FileSystem extends Thread {
 
     RecoveryStat.printRecoveryStat();
 
-
-    System.out.println("\n\n\n I'm done\n\n\n");
+    System.out.println("\n\n\n I'm done - Time Elapse : "+ ((double)(fi-st)/1000) + "\n\n\n");
 
     while(true) {
       sleep(100000);
diff --git a/Robust/src/Benchmarks/Recovery/SpamFilter/recovery/SpamFilter.java b/Robust/src/Benchmarks/Recovery/SpamFilter/recovery/SpamFilter.java
index a04fa60e..2bed4b34 100644
--- a/Robust/src/Benchmarks/Recovery/SpamFilter/recovery/SpamFilter.java
+++ b/Robust/src/Benchmarks/Recovery/SpamFilter/recovery/SpamFilter.java
@@ -46,6 +46,9 @@ public class SpamFilter extends Thread {
     Random rand = new Random(thid);
     int i;
 
+    long st = System.currentTimeMillis();
+    long fi;
+
     for(i=0; i<niter; i++) {
       correct =0;
       wrong = 0;
@@ -111,8 +114,10 @@ public class SpamFilter extends Thread {
 //      System.out.println((i+1)+"th iteration correct = " + correct + " Wrong = " + wrong + " percentage = " + ((float)correct/(float)nemails));
     }//end num iter
     // Sanity check
+    fi = System.currentTimeMillis();
+
     System.out.println((i)+"th iteration correct = " + correct + " Wrong = " + wrong + " percentage = " + ((float)correct/(float)nemails));
-    System.out.println("\n\n\n I'm Done\n\n\n");
+    System.out.println("\n\n\n I'm Done - Time Elapse : " + (double)((fi-st)/1000) +"\n\n\n");
     
     RecoveryStat.printRecoveryStat();
 
diff --git a/Robust/src/Benchmarks/Recovery/bm_args.txt b/Robust/src/Benchmarks/Recovery/bm_args.txt
index 43e569e5..000b06e7 100644
--- a/Robust/src/Benchmarks/Recovery/bm_args.txt
+++ b/Robust/src/Benchmarks/Recovery/bm_args.txt
@@ -1 +1 @@
-testcase 8 Spider:www.uci.edu 4
+testcase 8 MatrixMultiply:1600 80
diff --git a/Robust/src/Benchmarks/Recovery/runjava.sh b/Robust/src/Benchmarks/Recovery/runjava.sh
index 934b0c84..824ec333 100755
--- a/Robust/src/Benchmarks/Recovery/runjava.sh
+++ b/Robust/src/Benchmarks/Recovery/runjava.sh
@@ -8,7 +8,7 @@
 BASEDIR=`pwd`
 RECOVERYDIR='recovery'
 JAVASINGLEDIR='java'
-WAITTIME=1500
+WAITTIME=1200
 KILLDELAY=20
 
 # 0 mean new test