Spider dsm version

diff --git a/Robust/src/Benchmarks/Spider/dsm/QueryThread.java b/Robust/src/Benchmarks/Spider/dsm/QueryThread.java
index 18dee05e73b12968a37aeff67675284a738d5e15..8be6bd666a4dcba6ae3de62d09473fd446143d02 100644 (file)
--- 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 67be18e04f6efca604450ab5dbf76c76c189431a..c3a965ddaa52530c0a8caa8944eb3faad4254623 100644 (file)
--- 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 eff447b84ee46f8283d2f55e0e45f4c543ef1333..29eec1e816e69b7e2caa7fe3016ec1d4e076b5ee 100644 (file)
--- 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 30c3796395922a69a3f3a01b174ef6da5e29a78a..be6b9e14da3feba9ed66b7de025782af3a56211c 100644 (file)
--- 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}