Skip to content

Commit 09f1d75

Browse files
committed
Code cleanup in order to better conform with the C11 standard.
1 parent 2f52a9a commit 09f1d75

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+253
-228
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ volatile int64_t object CACHE_ALIGN;
217217
int64_t d1 CACHE_ALIGN, d2;
218218
SynchBarrier bar CACHE_ALIGN;
219219

220-
inline static void *Execute(void *Arg) {
220+
static void *Execute(void *Arg) {
221221
long i, id;
222222

223223
id = synchGetThreadId();

benchmarks/activesetbench.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ volatile ToggleVector active_set CACHE_ALIGN;
1717
SynchBarrier bar CACHE_ALIGN;
1818
SynchBenchArgs bench_args CACHE_ALIGN;
1919

20-
inline static void *Execute(void *Arg) {
20+
static void *Execute(void *Arg) {
2121
long i, rnum, mybank;
2222
volatile long j;
2323
int id = synchGetThreadId();

benchmarks/ccheapbench.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ int64_t d1 CACHE_ALIGN, d2;
1717
SynchBarrier bar CACHE_ALIGN;
1818
SynchBenchArgs bench_args CACHE_ALIGN;
1919

20-
inline static void *Execute(void* Arg) {
20+
static void *Execute(void* Arg) {
2121
CCHeapThreadState *th_state;
2222
long i, rnum;
2323
volatile int j;

benchmarks/ccqueuebench.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ int64_t d1 CACHE_ALIGN, d2;
1818
SynchBarrier bar CACHE_ALIGN;
1919
SynchBenchArgs bench_args CACHE_ALIGN;
2020

21-
inline static void *Execute(void *Arg) {
21+
static void *Execute(void *Arg) {
2222
CCQueueThreadState *th_state;
2323
long i, rnum;
2424
volatile int j;

benchmarks/ccstackbench.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ int64_t d1 CACHE_ALIGN, d2;
1717
SynchBarrier bar CACHE_ALIGN;
1818
SynchBenchArgs bench_args CACHE_ALIGN;
1919

20-
inline static void *Execute(void *Arg) {
20+
static void *Execute(void *Arg) {
2121
CCStackThreadState *th_state;
2222
long i, rnum;
2323
volatile int j;

benchmarks/ccsynchbench.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ int64_t d1, d2;
1919
SynchBarrier bar CACHE_ALIGN;
2020
SynchBenchArgs bench_args CACHE_ALIGN;
2121

22-
inline static void *Execute(void *Arg) {
22+
static void *Execute(void *Arg) {
2323
CCSynchThreadState *th_state;
2424
long i, rnum;
2525
volatile long j;

benchmarks/clhbench.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ int64_t d1 CACHE_ALIGN, d2;
2222
SynchBarrier bar CACHE_ALIGN;
2323
SynchBenchArgs bench_args CACHE_ALIGN;
2424

25-
inline void apply_op(RetVal (*sfunc)(void *, ArgVal, int), void *state, ArgVal arg, int pid) {
25+
void apply_op(RetVal (*sfunc)(void *, ArgVal, int), void *state, ArgVal arg, int pid) {
2626
CLHLock(object_lock, pid);
2727
sfunc(state, arg, pid);
2828
#ifdef DEBUG
@@ -31,7 +31,7 @@ inline void apply_op(RetVal (*sfunc)(void *, ArgVal, int), void *state, ArgVal a
3131
CLHUnlock(object_lock, pid);
3232
}
3333

34-
inline static void *Execute(void *Arg) {
34+
static void *Execute(void *Arg) {
3535
long i, rnum;
3636
volatile long j;
3737
int id = synchGetThreadId();

benchmarks/clhhashbench.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ int64_t d1 CACHE_ALIGN, d2;
2525
SynchBarrier bar CACHE_ALIGN;
2626
SynchBenchArgs bench_args CACHE_ALIGN;
2727

28-
inline static void *Execute(void *Arg) {
28+
static void *Execute(void *Arg) {
2929
int64_t key, value;
3030
CLHHashThreadState *th_state;
3131
long i, rnum;

benchmarks/clhqueuebench.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ SynchBenchArgs bench_args CACHE_ALIGN;
3333

3434
__thread SynchPoolStruct pool_node;
3535

36-
inline static void enqueue(Object arg, int pid) {
36+
static void enqueue(Object arg, int pid) {
3737
Node *n = synchAllocObj(&pool_node);
3838

3939
n->val = (Object)arg;
@@ -48,7 +48,7 @@ inline static void enqueue(Object arg, int pid) {
4848
CLHUnlock(ltail, pid);
4949
}
5050

51-
inline static Object dequeue(int pid) {
51+
static Object dequeue(int pid) {
5252
Object result;
5353
Node *node = NULL;
5454

@@ -75,7 +75,7 @@ inline static Object dequeue(int pid) {
7575
return result;
7676
}
7777

78-
inline static void *Execute(void *Arg) {
78+
static void *Execute(void *Arg) {
7979
long i;
8080
long rnum;
8181
int id = synchGetThreadId();

benchmarks/clhstackbench.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ SynchBenchArgs bench_args CACHE_ALIGN;
2828

2929
__thread SynchPoolStruct pool_node;
3030

31-
inline static void push(Object arg, int pid) {
31+
static void push(Object arg, int pid) {
3232
volatile Node *n = synchAllocObj(&pool_node);
3333
n->val = (Object)arg;
3434
CLHLock(lock, pid); // Critical section
@@ -41,7 +41,7 @@ inline static void push(Object arg, int pid) {
4141
CLHUnlock(lock, pid);
4242
}
4343

44-
inline static Object pop(int pid) {
44+
static Object pop(int pid) {
4545
Object result;
4646
Node *n = NULL;
4747

@@ -63,7 +63,7 @@ inline static Object pop(int pid) {
6363
return result;
6464
}
6565

66-
inline static void *Execute(void *Arg) {
66+
static void *Execute(void *Arg) {
6767
long i;
6868
long rnum;
6969
int id = synchGetThreadId();

0 commit comments

Comments
 (0)