From 01b38b1079dea8b5d197bc246d7aced60496edff Mon Sep 17 00:00:00 2001 From: Peizhao Ou Date: Mon, 17 Mar 2014 17:25:52 -0700 Subject: [PATCH] more fix --- benchmark/chase-lev-deque-bugfix/deque.h | 5 +++++ .../.nfs0000000001748028000000e7 | Bin 0 -> 16384 bytes benchmark/cliffc-hashtable/cliffc_hashtable.h | 20 ++++++++++++------ benchmark/linuxrwlocks/linuxrwlocks.c | 6 ++++++ benchmark/mcs-lock/mcs-lock.h | 6 ++++++ benchmark/mpmc-queue/mpmc-queue.h | 6 ++++++ benchmark/ms-queue/my_queue.h | 6 ++++++ benchmark/read-copy-update/rcu.cc | 6 ++++++ benchmark/spsc-bugfix/queue.h | 6 ++++++ grammer/util.jj | 8 +++---- 10 files changed, 59 insertions(+), 10 deletions(-) create mode 100644 benchmark/cliffc-hashtable/.nfs0000000001748028000000e7 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 +#include +#include +#include +#include typedef struct { atomic_size_t size; diff --git a/benchmark/cliffc-hashtable/.nfs0000000001748028000000e7 b/benchmark/cliffc-hashtable/.nfs0000000001748028000000e7 new file mode 100644 index 0000000000000000000000000000000000000000..32135716b835cbf7a9e6334163f1c62b8648bdab GIT binary patch literal 16384 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 literal 0 HcmV?d00001 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 #endif +#include +#include +#include +#include +#include + 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 #include +#include +#include +#include +#include +#include + #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 #include +#include +#include +#include +#include +#include + struct mcs_node { std::atomic next; std::atomic 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 #include +#include +#include +#include +#include +#include + /** @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 +#include +#include +#include +#include +#include + #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 #include +#include +#include +#include +#include +#include + #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 #include +#include +#include +#include +#include +#include + #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 = .image {res = str;}) - ( str = Type() { res = res + "<" + str; } - ( str = Type() { res = res + ", " + str; })* + ( str = Type() { res = res + "<" + str; } + ( str = Type() { res = res + ", " + str; })* { res = res + ">"; } )? { @@ -385,7 +385,7 @@ ArrayList TemplateParamList() : params = new ArrayList(); }