From: Peizhao Ou <peizhaoo@uci.edu>
Date: Tue, 18 Mar 2014 00:25:52 +0000 (-0700)
Subject: more fix
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=01b38b1079dea8b5d197bc246d7aced60496edff;p=cdsspec-compiler.git

more fix
---

diff --git a/benchmark/chase-lev-deque-bugfix/deque.h b/benchmark/chase-lev-deque-bugfix/deque.h
index fa76d8d..8ddcdb6 100644
--- a/benchmark/chase-lev-deque-bugfix/deque.h
+++ b/benchmark/chase-lev-deque-bugfix/deque.h
@@ -1,5 +1,10 @@
 #ifndef DEQUE_H
 #define DEQUE_H
+#include <spec_lib.h>
+#include <stdlib.h>
+#include <cdsannotate.h>
+#include <specannotation.h>
+#include <model_memory.h>
 
 typedef struct {
 	atomic_size_t size;
diff --git a/benchmark/cliffc-hashtable/.nfs0000000001748028000000e7 b/benchmark/cliffc-hashtable/.nfs0000000001748028000000e7
new file mode 100644
index 0000000..3213571
Binary files /dev/null and b/benchmark/cliffc-hashtable/.nfs0000000001748028000000e7 differ
diff --git a/benchmark/cliffc-hashtable/cliffc_hashtable.h b/benchmark/cliffc-hashtable/cliffc_hashtable.h
index 756cbb9..9ac5995 100644
--- a/benchmark/cliffc-hashtable/cliffc_hashtable.h
+++ b/benchmark/cliffc-hashtable/cliffc_hashtable.h
@@ -11,6 +11,12 @@
 #include <model-assert.h>
 #endif
 
+#include <spec_lib.h>
+#include <stdlib.h>
+#include <cdsannotate.h>
+#include <specannotation.h>
+#include <model_memory.h>
+
 using namespace std;
 
 /**
@@ -163,7 +169,9 @@ class cliffc_hashtable {
 				ReplaceIfMatch(COND_ReplaceIfMatchSucc)
 			}
 		@Happens_before:
-			Write_interface -> Read_interface
+			//Write_interface -> Read_interface
+			Put->Get
+			Put->Put
 		@End
 	*/
 
@@ -436,7 +444,7 @@ friend class CHM;
 	}
 
 	/**
-		@Begin
+//		@Begin
 		@Interface: PutIfAbsent
 		@Commit_point_set:
 			Write_Success_Point | PutIfAbsent_Fail_Point
@@ -457,7 +465,7 @@ friend class CHM;
 	}
 
 	/**
-		@Begin
+//		@Begin
 		@Interface: RemoveAny
 		@Commit_point_set: Write_Success_Point
 		@ID: getKeyTag(key)
@@ -473,7 +481,7 @@ friend class CHM;
 	}
 
 	/**
-		@Begin
+//		@Begin
 		@Interface: RemoveIfMatch
 		@Commit_point_set:
 			Write_Success_Point | RemoveIfMatch_Fail_Point
@@ -496,7 +504,7 @@ friend class CHM;
 	}
 
 	/**
-		@Begin
+//		@Begin
 		@Interface: ReplaceAny
 		@Commit_point_set:
 			Write_Success_Point
@@ -512,7 +520,7 @@ friend class CHM;
 	}
 
 	/**
-		@Begin
+//		@Begin
 		@Interface: ReplaceIfMatch
 		@Commit_point_set:
 			Write_Success_Point | ReplaceIfMatch_Fail_Point
diff --git a/benchmark/linuxrwlocks/linuxrwlocks.c b/benchmark/linuxrwlocks/linuxrwlocks.c
index c96eb95..c7ef94c 100644
--- a/benchmark/linuxrwlocks/linuxrwlocks.c
+++ b/benchmark/linuxrwlocks/linuxrwlocks.c
@@ -2,6 +2,12 @@
 #include <threads.h>
 #include <stdatomic.h>
 
+#include <spec_lib.h>
+#include <stdlib.h>
+#include <cdsannotate.h>
+#include <specannotation.h>
+#include <model_memory.h>
+
 #include "librace.h"
 
 #define RW_LOCK_BIAS            0x00100000
diff --git a/benchmark/mcs-lock/mcs-lock.h b/benchmark/mcs-lock/mcs-lock.h
index 2be854b..27ce180 100644
--- a/benchmark/mcs-lock/mcs-lock.h
+++ b/benchmark/mcs-lock/mcs-lock.h
@@ -3,6 +3,12 @@
 #include <stdatomic.h>
 #include <unrelacy.h>
 
+#include <spec_lib.h>
+#include <stdlib.h>
+#include <cdsannotate.h>
+#include <specannotation.h>
+#include <model_memory.h>
+
 struct mcs_node {
 	std::atomic<mcs_node *> next;
 	std::atomic<int> gate;
diff --git a/benchmark/mpmc-queue/mpmc-queue.h b/benchmark/mpmc-queue/mpmc-queue.h
index ee3950d..d78ff6c 100644
--- a/benchmark/mpmc-queue/mpmc-queue.h
+++ b/benchmark/mpmc-queue/mpmc-queue.h
@@ -2,6 +2,12 @@
 #include <unrelacy.h>
 #include <common.h>
 
+#include <spec_lib.h>
+#include <stdlib.h>
+#include <cdsannotate.h>
+#include <specannotation.h>
+#include <model_memory.h>
+
 /**
 	@Begin
 	@Class_begin
diff --git a/benchmark/ms-queue/my_queue.h b/benchmark/ms-queue/my_queue.h
index fa64d60..9ef2d63 100644
--- a/benchmark/ms-queue/my_queue.h
+++ b/benchmark/ms-queue/my_queue.h
@@ -3,6 +3,12 @@
 
 #include <stdatomic.h>
 
+#include <spec_lib.h>
+#include <stdlib.h>
+#include <cdsannotate.h>
+#include <specannotation.h>
+#include <model_memory.h>
+
 #define MAX_NODES			0xf
 
 typedef unsigned long long pointer;
diff --git a/benchmark/read-copy-update/rcu.cc b/benchmark/read-copy-update/rcu.cc
index ebe36a9..cdd193f 100644
--- a/benchmark/read-copy-update/rcu.cc
+++ b/benchmark/read-copy-update/rcu.cc
@@ -4,6 +4,12 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+#include <spec_lib.h>
+#include <stdlib.h>
+#include <cdsannotate.h>
+#include <specannotation.h>
+#include <model_memory.h>
+
 #include "librace.h"
 
 /**
diff --git a/benchmark/spsc-bugfix/queue.h b/benchmark/spsc-bugfix/queue.h
index 8ff765e..76c5200 100644
--- a/benchmark/spsc-bugfix/queue.h
+++ b/benchmark/spsc-bugfix/queue.h
@@ -4,6 +4,12 @@
 #include <unrelacy.h>
 #include <atomic>
 
+#include <spec_lib.h>
+#include <stdlib.h>
+#include <cdsannotate.h>
+#include <specannotation.h>
+#include <model_memory.h>
+
 #include "eventcount.h"
 
 /**
diff --git a/grammer/util.jj b/grammer/util.jj
index 2be56d6..5194e64 100644
--- a/grammer/util.jj
+++ b/grammer/util.jj
@@ -331,8 +331,8 @@ String ParameterizedName() :
 }
 {
 	(str = <IDENTIFIER>.image {res = str;})
-	(<OPEN_BRACKET> str = Type() { res = res + "<" + str; }
-	(<COMMA> str = Type() { res = res + ", " + str; })* <CLOSE_BRACKET>
+	(<LESS_THAN> str = Type() { res = res + "<" + str; }
+	(<COMMA> str = Type() { res = res + ", " + str; })* <GREATER_THAN>
 	{ res = res + ">"; }
 	)?
 	{
@@ -385,7 +385,7 @@ ArrayList<VariableDeclaration> TemplateParamList() :
 		params = new ArrayList<VariableDeclaration>();
 	}
 	<TEMPLATE>
-	<OPEN_BRACKET>
+	<LESS_THAN>
 	(type = <IDENTIFIER>.image 
 	name = <IDENTIFIER>.image
 	{
@@ -399,7 +399,7 @@ ArrayList<VariableDeclaration> TemplateParamList() :
 		params.add(new VariableDeclaration(type, name));
 	}
 	)*
-	<CLOSE_BRACKET>
+	<GREATER_THAN>
 	{
 		//System.out.println(params);
 		return params;