From 9dbc3d6deb5599d5e5480e2759b5e5975b2967b2 Mon Sep 17 00:00:00 2001
From: jihoonl <jihoonl>
Date: Thu, 24 Sep 2009 18:28:37 +0000
Subject: [PATCH]  changes

---
 .../Prefetch/MicroBenchmarks/dsm/Drinker.java | 23 ++++++++-----------
 .../Prefetch/MicroBenchmarks/dsm/dstm.conf    | 17 +++++++-------
 .../Prefetch/MicroBenchmarks/dsm/makefile     |  4 ++--
 3 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/Robust/src/Benchmarks/Prefetch/MicroBenchmarks/dsm/Drinker.java b/Robust/src/Benchmarks/Prefetch/MicroBenchmarks/dsm/Drinker.java
index 2d900caf..0ef18601 100644
--- a/Robust/src/Benchmarks/Prefetch/MicroBenchmarks/dsm/Drinker.java
+++ b/Robust/src/Benchmarks/Prefetch/MicroBenchmarks/dsm/Drinker.java
@@ -29,19 +29,16 @@ public class Drinker extends Task {
     return null;
 	}
 
-	public void execute(Object myWork) {
-    Segment work = (Segment)myWork;
-
-    int numApple = work.x;
-
-    ownTotal += numApple;
-
+	public void execute() {
+    Segment s;
+    atomic {
+      s = (Segment)myWork;
+      ownTotal += s.x;    
+    }
   }
 
 	public void done(Object work) {
-		atomic {
 			doneList.push(work);
-		}
 	}
 
   public static void main(String[] args) {
@@ -59,14 +56,14 @@ public class Drinker extends Task {
 		}
 
 		int[] mid = new int[NUM_THREADS];
-//		mid[0] = (128<<24)|(195<<16)|(136<<8)|162; //dc1
-//		mid[1] = (128<<24)|(195<<16)|(136<<8)|163; //dc2
-		mid[0] = (128<<24)|(195<<16)|(136<<8)|164; //dc3
+		mid[0] = (128<<24)|(195<<16)|(180<<8)|21; //dw-2
+		mid[1] = (128<<24)|(195<<16)|(180<<8)|24; //dw-5
+/*		mid[0] = (128<<24)|(195<<16)|(136<<8)|164; //dc3
 		mid[1] = (128<<24)|(195<<16)|(136<<8)|165; //dc4
 		mid[2] = (128<<24)|(195<<16)|(136<<8)|166; //dc5
 		mid[3] = (128<<24)|(195<<16)|(136<<8)|167; //dc6
 		mid[4] = (128<<24)|(195<<16)|(136<<8)|168; //dc7
-		mid[5] = (128<<24)|(195<<16)|(136<<8)|169; //dc8
+		mid[5] = (128<<24)|(195<<16)|(136<<8)|169; //dc8*/
 
 		atomic {
 			drinkers = global new Drinker[NUM_THREADS];
diff --git a/Robust/src/Benchmarks/Prefetch/MicroBenchmarks/dsm/dstm.conf b/Robust/src/Benchmarks/Prefetch/MicroBenchmarks/dsm/dstm.conf
index 21e620a8..afab605b 100644
--- a/Robust/src/Benchmarks/Prefetch/MicroBenchmarks/dsm/dstm.conf
+++ b/Robust/src/Benchmarks/Prefetch/MicroBenchmarks/dsm/dstm.conf
@@ -1,11 +1,10 @@
-#128.195.180.24
-#128.195.180.21
-#128.195.180.26
+128.195.180.21
+128.195.180.24
 #128.195.136.162
 #128.195.136.163
-128.195.136.164
-128.195.136.165
-128.195.136.166
-128.195.136.167
-128.195.136.168
-128.195.136.169
+#128.195.136.164
+#128.195.136.165
+#128.195.136.166
+#128.195.136.167
+#128.195.136.168
+#128.195.136.169
diff --git a/Robust/src/Benchmarks/Prefetch/MicroBenchmarks/dsm/makefile b/Robust/src/Benchmarks/Prefetch/MicroBenchmarks/dsm/makefile
index 93734256..16acd250 100644
--- a/Robust/src/Benchmarks/Prefetch/MicroBenchmarks/dsm/makefile
+++ b/Robust/src/Benchmarks/Prefetch/MicroBenchmarks/dsm/makefile
@@ -2,8 +2,8 @@ MAINCLASS1=Drinker
 MAINCLASS2=Simple
 SRC1=${MAINCLASS1}.java
 SRC2=${MAINCLASS2}.java
-FLAGS1= -dsm -nooptimize -recovery -debug -mainclass ${MAINCLASS1}
-FLAGS2= -dsm -nooptimize -recovery -debug -mainclass ${MAINCLASS2}
+FLAGS1= -dsm -nooptimize -debug -recovery -mainclass ${MAINCLASS1}
+FLAGS2= -dsm -nooptimize -debug -recovery -mainclass ${MAINCLASS2}
 default:
 	../../../../buildscript ${FLAGS1} -o ${MAINCLASS1} ${SRC1}
 	../../../../buildscript ${FLAGS2} -o ${MAINCLASS2} ${SRC2}
-- 
2.34.1