From: bdemsky <bdemsky>
Date: Thu, 16 Jul 2009 10:12:18 +0000 (+0000)
Subject: changes
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=07925af8b6b0f11c39ca70db732951e79728c77b;p=IRC.git

changes
---

diff --git a/Robust/src/Benchmarks/SingleTM/Vacation/Customer.java b/Robust/src/Benchmarks/SingleTM/Vacation/Customer.java
index f9f0ce2a..22daf531 100644
--- a/Robust/src/Benchmarks/SingleTM/Vacation/Customer.java
+++ b/Robust/src/Benchmarks/SingleTM/Vacation/Customer.java
@@ -106,9 +106,7 @@ public class Customer {
  * =============================================================================
  */
   boolean customer_addReservationInfo (int type, int id, int price) {
-    Reservation reservationInfoPtr;
-    
-    reservationInfoPtr = new Reservation(type, id, price);
+    Reservation_Info reservationInfoPtr= new Reservation_Info(type, id, price);
     //    assert(reservationInfoPtr != NULL);
     
     return reservationInfoListPtr.insert(reservationInfoPtr);
diff --git a/Robust/src/Benchmarks/SingleTM/Vacation/Vacation.java b/Robust/src/Benchmarks/SingleTM/Vacation/Vacation.java
index 67f8675a..d3b680fe 100644
--- a/Robust/src/Benchmarks/SingleTM/Vacation/Vacation.java
+++ b/Robust/src/Benchmarks/SingleTM/Vacation/Vacation.java
@@ -129,17 +129,17 @@ public class Vacation {
     for(int i=0;i<argv.length;i++) {
       String arg=argv[i];
       if (arg.equals("-c"))
-	CLIENTS=Integer.parseInt(argv[i++]);
+	CLIENTS=Integer.parseInt(argv[++i]);
       else if (arg.equals("-n"))
-	NUMBER=Integer.parseInt(argv[i++]);
+	NUMBER=Integer.parseInt(argv[++i]);
       else if (arg.equals("-q"))
-	QUERIES=Integer.parseInt(argv[i++]);
+	QUERIES=Integer.parseInt(argv[++i]);
       else if (arg.equals("-r"))
-	RELATIONS=Integer.parseInt(argv[i++]);
+	RELATIONS=Integer.parseInt(argv[++i]);
       else if (arg.equals("-t"))
-	TRANSACTIONS=Integer.parseInt(argv[i++]);
+	TRANSACTIONS=Integer.parseInt(argv[++i]);
       else if (arg.equals("-u"))
-	USER=Integer.parseInt(argv[i++]);
+	USER=Integer.parseInt(argv[++i]);
       else 
 	opterr++;
     }
@@ -216,6 +216,7 @@ public class Vacation {
     } /* for t */
     
     System.out.println("done.");
+    return managerPtr;
   }
 
 
@@ -298,7 +299,7 @@ public class Vacation {
     }
     clients[0].run();
 
-    thread_start(client_run, clients);
+    //    thread_start(client_run, clients);
     
     stop=System.currentTimeMillis();