From 87be74215cbabd85fe7beca065d33565e331cdea Mon Sep 17 00:00:00 2001
From: jihoonl <jihoonl>
Date: Wed, 8 Jul 2009 19:26:48 +0000
Subject: [PATCH] changes

---
 .../Benchmarks/SingleTM/Intruder/Decoder.java |  4 ++--
 .../Benchmarks/SingleTM/Intruder/Stream.java  |  2 +-
 .../src/Benchmarks/SingleTM/Intruder/makefile | 21 +++----------------
 3 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/Robust/src/Benchmarks/SingleTM/Intruder/Decoder.java b/Robust/src/Benchmarks/SingleTM/Intruder/Decoder.java
index fcbfdb05..41bfe2b1 100644
--- a/Robust/src/Benchmarks/SingleTM/Intruder/Decoder.java
+++ b/Robust/src/Benchmarks/SingleTM/Intruder/Decoder.java
@@ -243,14 +243,14 @@ public class Decoder {
                             i++;
                     }
 
-                    String data;
+                    String data = new String();
 
                     it.reset(fragmentListPtr);
                     while(it.hasNext(fragmentListPtr)) {
 
                         Packet fragmentPtr = (Packet)it.next(fragmentListPtr);
                         
-                        data = new String(fragmentPtr.data);
+                        data = (new String(fragmentPtr.data));
                     }
                         
                     Decoded decodedPtr = new Decoded();
diff --git a/Robust/src/Benchmarks/SingleTM/Intruder/Stream.java b/Robust/src/Benchmarks/SingleTM/Intruder/Stream.java
index b7b2ac54..33a2577f 100644
--- a/Robust/src/Benchmarks/SingleTM/Intruder/Stream.java
+++ b/Robust/src/Benchmarks/SingleTM/Intruder/Stream.java
@@ -151,7 +151,6 @@ public class Stream {
       } else {
         /* Create random string */
         int length = (randomPtr.random_generate() % maxLength) + 1;
-        status = allocVectorPtr.vector_pushBack(str);
         
         if (!status) {
           System.out.printString("Assert failed: status is null\n");
@@ -165,6 +164,7 @@ public class Stream {
         c[l] = '\0';
         str = new String(c);
         String str2 = new String(c);
+        status = allocVectorPtr.vector_pushBack(str);
         int err = detectorPtr.process(str2);
         if (err == error.SIGNATURE) {
           status = MAP_INSERT(attackMapPtr, f, str);
diff --git a/Robust/src/Benchmarks/SingleTM/Intruder/makefile b/Robust/src/Benchmarks/SingleTM/Intruder/makefile
index d4dd8ed0..77cbe56e 100644
--- a/Robust/src/Benchmarks/SingleTM/Intruder/makefile
+++ b/Robust/src/Benchmarks/SingleTM/Intruder/makefile
@@ -21,10 +21,10 @@ SRC=ttttmp${MAINCLASS}.java \
 	Arg.java \
 	../../../ClassLibrary/JavaSTM/Barrier.java 
 
+include ../common/Makefile.flags
+include ../common/Makefile.builds
 
-FLAGS=-nooptimize -debug -thread -mainclass ${MAINCLASS}
-
-default:
+prep:
 	cpp ${MAINCLASS}.java > tmp${MAINCLASS}.java
 	cpp Stream.java > tmpStream.java
 	cpp Decoder.java > tmpDecoder.java
@@ -35,7 +35,6 @@ default:
 	./extractLines tmpStream.java
 	./extractLines tmpDecoder.java
 	./extractLines tmpRBTree.java
-	../../../buildscript ${FLAGS} -o ${MAINCLASS} ${SRC}
 
 clean:
 	rm tmp*.java
@@ -43,18 +42,4 @@ clean:
 	rm -rf tmpbuilddirectory
 	rm *.bin
 
-test:
-	cpp ${MAINCLASS}.java > tmp${MAINCLASS}.java
-	cpp Stream.java > tmpStream.java
-	cpp Decoder.java > tmpDecoder.java
-	cpp RBTree.java > tmpRBTree.java
-	cpp Queue_t.java > tmpQueue_t.java
-	./extractLines tmp${MAINCLASS}.java
-	./extractLines tmpQueue_t.java
-	./extractLines tmpStream.java
-	./extractLines tmpDecoder.java
-	./extractLines tmpRBTree.java
-	../../../buildscript ${FLAGS} -o ${MAINCLASS} ${SRC}
-	./Intruder.bin -a 10 -l 4 -n 2038 -s 1
-
 
-- 
2.34.1