more fix

diff --git a/benchmark/chase-lev-deque-bugfix/deque.h b/benchmark/chase-lev-deque-bugfix/deque.h
index fa76d8dc4e7073e52fc72c234430e21c6d219a7c..8ddcdb6b27fb878b2a356acb086ab0a8ca3b8f81 100644 (file)
--- 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 (file)
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 756cbb964dc370eebef555341903d0a29afadbca..9ac59952580d26725aebe62ec10ea5b37d99ce6f 100644 (file)
--- 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 c96eb956e9728b73bb443c55530508ae62e5a869..c7ef94c0e739d20681a0b077b63e5a0c0eb902c3 100644 (file)
--- 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 2be854b67c27533fda1284140f8e8ba17a73381c..27ce1807f2c3b25fb266e170139fd009d221b169 100644 (file)
--- 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 ee3950d8219d14dcc7a2ed2b7924e1d07c7bbdb7..d78ff6cfe03d3496e3e173c2b90eb7018f3449ea 100644 (file)
--- 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 fa64d6083a7abb9f1e4f67568da97b1d51c0b149..9ef2d6399cc00ff6fb63fd995d2a5728df682e5f 100644 (file)
--- 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 ebe36a9f1a3fc924f0895f3b08c158cb6cc602ce..cdd193f1385f4ec6d35266b0524d101ffe4cce20 100644 (file)
--- 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 8ff765e66cf0d95ab34227f22ab06053eed36f04..76c520036e7dc3b37aaf436e75014c987dfa6397 100644 (file)
--- 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 2be56d6f9f6fc7b211ff1a0cd0e510ff19bdccba..5194e6427989097d6194874efa3910d85ddeb845 100644 (file)
--- 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;