edits

diff --git a/generate.sh b/generate.sh
index 5727f3c45f9cd03121268610a37b7a8ee6cadd5b..38ec8b2a41e5e2f7e89678aa5877560158a5dbc8 100755 (executable)
--- a/generate.sh
+++ b/generate.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #!/bin/bash
 

-BENCH=(blocking-queue-example ms-queue linuxrwlocks mcs-lock \
-    chase-lev-deque-bugfix chase-lev-deque spsc-bugfix mpmp-queue ticket-lock \
+BENCH=(ms-queue linuxrwlocks mcs-lock \
+    chase-lev-deque-bugfix spsc-bugfix mpmc-queue ticket-lock \

     concurrent-hashmap seqlock read-copy-update)
 
 ClassPath=$(dirname ${BASH_SOURCE[0]})/classes
     concurrent-hashmap seqlock read-copy-update)
 
 ClassPath=$(dirname ${BASH_SOURCE[0]})/classes


@@ -14,4 +14,6 @@ Class=edu/uci/eecs/codeGenerator/CodeGenerator
 BenchDir=../benchmarks
 GenerateDir=../test-cdsspec
 
 BenchDir=../benchmarks
 GenerateDir=../test-cdsspec
 

+mkdir -p $GenerateDir
+

 java -cp $ClassPath $Class $BenchDir $GenerateDir ${BENCH[*]}
 java -cp $ClassPath $Class $BenchDir $GenerateDir ${BENCH[*]}

diff --git a/src/edu/uci/eecs/codeGenerator/CodeGenerator.java b/src/edu/uci/eecs/codeGenerator/CodeGenerator.java
index e727f0b7ba51de2d415492f4c292f8e9b8e8aa6e..ca6401d8bd19092ee09126cb8090a4cceaffc17b 100644 (file)
--- a/src/edu/uci/eecs/codeGenerator/CodeGenerator.java
+++ b/src/edu/uci/eecs/codeGenerator/CodeGenerator.java
@@ -346,11 +346,11 @@ public class CodeGenerator {
                
                // String[] dirNames = args;
                
                
                // String[] dirNames = args;
                

-//             String[] dirNames = new String[args.length - 2];
-//             for (int i = 0; i < args.length - 2; i++) {
-//                     dirNames[i] = args[i + 2];
-//             }
-               String[] dirNames = Environment.Benchmarks;
+               String[] dirNames = new String[args.length - 2];
+               for (int i = 0; i < args.length - 2; i++) {
+                       dirNames[i] = args[i + 2];
+               }
+//             String[] dirNames = Environment.Benchmarks;

 
                for (int i = 0; i < dirNames.length; i++) {
                        String dirName = dirNames[i];
 
                for (int i = 0; i < dirNames.length; i++) {
                        String dirName = dirNames[i];