From: jihoonl <jihoonl>
Date: Wed, 11 Nov 2009 01:17:34 +0000 (+0000)
Subject: Spider dsm version
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9d0bfadee5da1dc017046b0c59d9ffdc068786c3;p=IRC.git

Spider dsm version
---

diff --git a/Robust/src/Benchmarks/Spider/dsm/QueryThread.java b/Robust/src/Benchmarks/Spider/dsm/QueryThread.java
index 18dee05e..8be6bd66 100644
--- a/Robust/src/Benchmarks/Spider/dsm/QueryThread.java
+++ b/Robust/src/Benchmarks/Spider/dsm/QueryThread.java
@@ -40,7 +40,7 @@ public class QueryThread extends Thread {
       atomic {
         myWork = (GlobalQuery)todoList.pop();
         
-        if(null == myWork)  // no work in todolist
+        if(myWork == null)  // no work in todolist
         {
           chk = checkCurrentWorkList(this);        
         }
@@ -51,6 +51,10 @@ public class QueryThread extends Thread {
       }
 
       if(chk == 1) { // it has query
+        atomic {
+          if(myWork == null) 
+            System.out.println("myWork is null");
+        }
         QueryThread.execute(this);
 
         atomic {
diff --git a/Robust/src/Benchmarks/Spider/dsm/Spider.java b/Robust/src/Benchmarks/Spider/dsm/Spider.java
index 67be18e0..c3a965dd 100644
--- a/Robust/src/Benchmarks/Spider/dsm/Spider.java
+++ b/Robust/src/Benchmarks/Spider/dsm/Spider.java
@@ -11,10 +11,15 @@ public class Spider {
     GlobalString firstmachine;
     GlobalString firstpage;
 
-		int mid[] = new int[NUM_THREADS];
+		int mid[] = new int[8];
 		mid[0] = (128<<24)|(195<<16)|(136<<8)|162;	 //dc-1
 		mid[1] = (128<<24)|(195<<16)|(136<<8)|163;	 //dc-2
 		mid[2] = (128<<24)|(195<<16)|(136<<8)|164;	 //dc-3
+		mid[3] = (128<<24)|(195<<16)|(136<<8)|165;	 //dc-4
+		mid[4] = (128<<24)|(195<<16)|(136<<8)|166;	 //dc-5
+		mid[5] = (128<<24)|(195<<16)|(136<<8)|167;	 //dc-6
+		mid[6] = (128<<24)|(195<<16)|(136<<8)|168;	 //dc-7
+		mid[7] = (128<<24)|(195<<16)|(136<<8)|169;	 //dc-8
 
 		atomic {
 			firstmachine = global new GlobalString(args[1]);
diff --git a/Robust/src/Benchmarks/Spider/dsm/dstm.conf b/Robust/src/Benchmarks/Spider/dsm/dstm.conf
index eff447b8..29eec1e8 100644
--- a/Robust/src/Benchmarks/Spider/dsm/dstm.conf
+++ b/Robust/src/Benchmarks/Spider/dsm/dstm.conf
@@ -4,3 +4,8 @@
 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
diff --git a/Robust/src/Benchmarks/Spider/dsm/makefile b/Robust/src/Benchmarks/Spider/dsm/makefile
index 30c37963..be6b9e14 100644
--- a/Robust/src/Benchmarks/Spider/dsm/makefile
+++ b/Robust/src/Benchmarks/Spider/dsm/makefile
@@ -3,7 +3,7 @@ SUBCLASS=Query
 SRC1=${MAINCLASS}.java
 SRC2=Global${SUBCLASS}.java
 SRC3=${SUBCLASS}Thread.java
-FLAGS= -dsm -nooptimize -debug -mainclass ${MAINCLASS}
+FLAGS= -dsm -transstats -nooptimize -debug -mainclass ${MAINCLASS}
 default:
 	../../../buildscript ${FLAGS} -o ${MAINCLASS} ${SRC2} ${SRC3} ${SRC1}