Code cleanup in order to better conform with the C11 standard.

nkallima · Dec 12, 2024 · 09f1d75 · 09f1d75
1 parent 2f52a9a
commit 09f1d75
Show file tree

Hide file tree

Showing 61 changed files with 253 additions and 228 deletions.
diff --git a/README.md b/README.md
@@ -217,7 +217,7 @@ volatile int64_t object CACHE_ALIGN;
 int64_t d1 CACHE_ALIGN, d2;
 SynchBarrier bar CACHE_ALIGN;
 
-inline static void *Execute(void *Arg) {
+static void *Execute(void *Arg) {
     long i, id;
 
     id = synchGetThreadId();

diff --git a/benchmarks/activesetbench.c b/benchmarks/activesetbench.c
@@ -17,7 +17,7 @@ volatile ToggleVector active_set CACHE_ALIGN;
 SynchBarrier bar CACHE_ALIGN;
 SynchBenchArgs bench_args CACHE_ALIGN;
 
-inline static void *Execute(void *Arg) {
+static void *Execute(void *Arg) {
     long i, rnum, mybank;
     volatile long j;
     int id = synchGetThreadId();

diff --git a/benchmarks/ccheapbench.c b/benchmarks/ccheapbench.c
@@ -17,7 +17,7 @@ int64_t d1 CACHE_ALIGN, d2;
 SynchBarrier bar CACHE_ALIGN;
 SynchBenchArgs bench_args CACHE_ALIGN;
 
-inline static void *Execute(void* Arg) {
+static void *Execute(void* Arg) {
     CCHeapThreadState *th_state;
     long i, rnum;
     volatile int j;

diff --git a/benchmarks/ccqueuebench.c b/benchmarks/ccqueuebench.c
@@ -18,7 +18,7 @@ int64_t d1 CACHE_ALIGN, d2;
 SynchBarrier bar CACHE_ALIGN;
 SynchBenchArgs bench_args CACHE_ALIGN;
 
-inline static void *Execute(void *Arg) {
+static void *Execute(void *Arg) {
     CCQueueThreadState *th_state;
     long i, rnum;
     volatile int j;

diff --git a/benchmarks/ccstackbench.c b/benchmarks/ccstackbench.c
@@ -17,7 +17,7 @@ int64_t d1 CACHE_ALIGN, d2;
 SynchBarrier bar CACHE_ALIGN;
 SynchBenchArgs bench_args CACHE_ALIGN;
 
-inline static void *Execute(void *Arg) {
+static void *Execute(void *Arg) {
     CCStackThreadState *th_state;
     long i, rnum;
     volatile int j;

diff --git a/benchmarks/ccsynchbench.c b/benchmarks/ccsynchbench.c
@@ -19,7 +19,7 @@ int64_t d1, d2;
 SynchBarrier bar CACHE_ALIGN;
 SynchBenchArgs bench_args CACHE_ALIGN;
 
-inline static void *Execute(void *Arg) {
+static void *Execute(void *Arg) {
     CCSynchThreadState *th_state;
     long i, rnum;
     volatile long j;

diff --git a/benchmarks/clhbench.c b/benchmarks/clhbench.c
@@ -22,7 +22,7 @@ int64_t d1 CACHE_ALIGN, d2;
 SynchBarrier bar CACHE_ALIGN;
 SynchBenchArgs bench_args CACHE_ALIGN;
 
-inline void apply_op(RetVal (*sfunc)(void *, ArgVal, int), void *state, ArgVal arg, int pid) {
+void apply_op(RetVal (*sfunc)(void *, ArgVal, int), void *state, ArgVal arg, int pid) {
     CLHLock(object_lock, pid);
     sfunc(state, arg, pid);
 #ifdef DEBUG
@@ -31,7 +31,7 @@ inline void apply_op(RetVal (*sfunc)(void *, ArgVal, int), void *state, ArgVal a
     CLHUnlock(object_lock, pid);
 }
 
-inline static void *Execute(void *Arg) {
+static void *Execute(void *Arg) {
     long i, rnum;
     volatile long j;
     int id = synchGetThreadId();

diff --git a/benchmarks/clhhashbench.c b/benchmarks/clhhashbench.c
@@ -25,7 +25,7 @@ int64_t d1 CACHE_ALIGN, d2;
 SynchBarrier bar CACHE_ALIGN;
 SynchBenchArgs bench_args CACHE_ALIGN;
 
-inline static void *Execute(void *Arg) {
+static void *Execute(void *Arg) {
     int64_t key, value;
     CLHHashThreadState *th_state;
     long i, rnum;

diff --git a/benchmarks/clhqueuebench.c b/benchmarks/clhqueuebench.c
@@ -33,7 +33,7 @@ SynchBenchArgs bench_args CACHE_ALIGN;
 
 __thread SynchPoolStruct pool_node;
 
-inline static void enqueue(Object arg, int pid) {
+static void enqueue(Object arg, int pid) {
     Node *n = synchAllocObj(&pool_node);
 
     n->val = (Object)arg;
@@ -48,7 +48,7 @@ inline static void enqueue(Object arg, int pid) {
     CLHUnlock(ltail, pid);
 }
 
-inline static Object dequeue(int pid) {
+static Object dequeue(int pid) {
     Object result;
     Node *node = NULL;
 
@@ -75,7 +75,7 @@ inline static Object dequeue(int pid) {
     return result;
 }
 
-inline static void *Execute(void *Arg) {
+static void *Execute(void *Arg) {
     long i;
     long rnum;
     int id = synchGetThreadId();

diff --git a/benchmarks/clhstackbench.c b/benchmarks/clhstackbench.c
@@ -28,7 +28,7 @@ SynchBenchArgs bench_args CACHE_ALIGN;
 
 __thread SynchPoolStruct pool_node;
 
-inline static void push(Object arg, int pid) {
+static void push(Object arg, int pid) {
     volatile Node *n = synchAllocObj(&pool_node);
     n->val = (Object)arg;
     CLHLock(lock, pid);  // Critical section
@@ -41,7 +41,7 @@ inline static void push(Object arg, int pid) {
     CLHUnlock(lock, pid);
 }
 
-inline static Object pop(int pid) {
+static Object pop(int pid) {
     Object result;
     Node *n = NULL;
 
@@ -63,7 +63,7 @@ inline static Object pop(int pid) {
     return result;
 }
 
-inline static void *Execute(void *Arg) {
+static void *Execute(void *Arg) {
     long i;
     long rnum;
     int id = synchGetThreadId();

diff --git a/benchmarks/dsmhashbench.c b/benchmarks/dsmhashbench.c
@@ -25,7 +25,7 @@ int64_t d1 CACHE_ALIGN, d2;
 SynchBarrier bar CACHE_ALIGN;
 SynchBenchArgs bench_args CACHE_ALIGN;
 
-inline static void *Execute(void *Arg) {
+static void *Execute(void *Arg) {
     int64_t key, value;
     DSMHashThreadState *th_state;
     long i, rnum;

diff --git a/benchmarks/dsmheapbench.c b/benchmarks/dsmheapbench.c
@@ -17,7 +17,7 @@ int64_t d1 CACHE_ALIGN, d2;
 SynchBarrier bar CACHE_ALIGN;
 SynchBenchArgs bench_args CACHE_ALIGN;
 
-inline static void *Execute(void* Arg) {
+static void *Execute(void* Arg) {
     DSMHeapThreadState *th_state;
     long i, rnum;
     volatile int j;

diff --git a/benchmarks/dsmqueuebench.c b/benchmarks/dsmqueuebench.c
@@ -18,7 +18,7 @@ int64_t d1 CACHE_ALIGN, d2;
 SynchBarrier bar CACHE_ALIGN;
 SynchBenchArgs bench_args CACHE_ALIGN;
 
-inline static void *Execute(void *Arg) {
+static void *Execute(void *Arg) {
     DSMQueueThreadState *th_state;
     long i, rnum;
     volatile int j;

diff --git a/benchmarks/dsmstackbench.c b/benchmarks/dsmstackbench.c
@@ -17,7 +17,7 @@ int64_t d1 CACHE_ALIGN, d2;
 SynchBarrier bar CACHE_ALIGN;
 SynchBenchArgs bench_args CACHE_ALIGN;
 
-inline static void *Execute(void *Arg) {
+static void *Execute(void *Arg) {
     DSMStackThreadState *th_state;
     long i, rnum;
     volatile int j;

diff --git a/benchmarks/dsmsynchbench.c b/benchmarks/dsmsynchbench.c
@@ -19,7 +19,7 @@ int64_t d1, d2;
 SynchBarrier bar CACHE_ALIGN;
 SynchBenchArgs bench_args CACHE_ALIGN;
 
-inline static void *Execute(void *Arg) {
+static void *Execute(void *Arg) {
     DSMSynchThreadState *th_state;
     long i, rnum;
     volatile long j;

diff --git a/benchmarks/fadbench.c b/benchmarks/fadbench.c
@@ -16,7 +16,7 @@ int64_t d1 CACHE_ALIGN, d2;
 SynchBarrier bar CACHE_ALIGN;
 SynchBenchArgs bench_args CACHE_ALIGN;
 
-inline static void *Execute(void *Arg) {
+static void *Execute(void *Arg) {
     long i, rnum;
     volatile int j;
     int id = synchGetThreadId();

diff --git a/benchmarks/fcbench.c b/benchmarks/fcbench.c
@@ -19,7 +19,7 @@ int64_t d1, d2;
 SynchBarrier bar CACHE_ALIGN;
 SynchBenchArgs bench_args CACHE_ALIGN;
 
-inline static void *Execute(void *Arg) {
+static void *Execute(void *Arg) {
     FCThreadState *th_state;
     long i, rnum;
     volatile long j;

diff --git a/benchmarks/fcheapbench.c b/benchmarks/fcheapbench.c
@@ -17,7 +17,7 @@ int64_t d1 CACHE_ALIGN, d2;
 SynchBarrier bar CACHE_ALIGN;
 SynchBenchArgs bench_args CACHE_ALIGN;
 
-inline static void *Execute(void* Arg) {
+static void *Execute(void* Arg) {
     FCHeapThreadState *th_state;
     long i, rnum;
     volatile int j;

diff --git a/benchmarks/fcqueuebench.c b/benchmarks/fcqueuebench.c
@@ -18,7 +18,7 @@ int64_t d1 CACHE_ALIGN, d2;
 SynchBarrier bar CACHE_ALIGN;
 SynchBenchArgs bench_args CACHE_ALIGN;
 
-inline static void *Execute(void *Arg) {
+static void *Execute(void *Arg) {
     FCQueueThreadState *th_state;
     long i, rnum;
     volatile int j;

diff --git a/benchmarks/fcstackbench.c b/benchmarks/fcstackbench.c
@@ -17,7 +17,7 @@ int64_t d1 CACHE_ALIGN, d2;
 SynchBarrier bar CACHE_ALIGN;
 SynchBenchArgs bench_args CACHE_ALIGN;
 
-inline static void *Execute(void *Arg) {
+static void *Execute(void *Arg) {
     FCStackThreadState *th_state;
     long i, rnum;
     volatile int j;

diff --git a/benchmarks/hheapbench.c b/benchmarks/hheapbench.c
@@ -17,7 +17,7 @@ int64_t d1 CACHE_ALIGN, d2;
 SynchBarrier bar CACHE_ALIGN;
 SynchBenchArgs bench_args CACHE_ALIGN;
 
-inline static void *Execute(void* Arg) {
+static void *Execute(void* Arg) {
     HSynchHeapThreadState *th_state;
     long i, rnum;
     volatile int j;

diff --git a/benchmarks/hqueuebench.c b/benchmarks/hqueuebench.c
@@ -18,7 +18,7 @@ int64_t d1 CACHE_ALIGN, d2;
 SynchBarrier bar CACHE_ALIGN;
 SynchBenchArgs bench_args CACHE_ALIGN;
 
-inline static void *Execute(void *Arg) {
+static void *Execute(void *Arg) {
     HQueueThreadState *th_state;
     long i, rnum;
     volatile int j;

diff --git a/benchmarks/hstackbench.c b/benchmarks/hstackbench.c
@@ -17,7 +17,7 @@ int64_t d1 CACHE_ALIGN, d2;
 SynchBarrier bar CACHE_ALIGN;
 SynchBenchArgs bench_args CACHE_ALIGN;
 
-inline static void *Execute(void *Arg) {
+static void *Execute(void *Arg) {
     HStackThreadState *th_state;
     long i, rnum;
     volatile int j;

diff --git a/benchmarks/hsynchbench.c b/benchmarks/hsynchbench.c
@@ -19,7 +19,7 @@ int64_t d1, d2;
 SynchBarrier bar CACHE_ALIGN;
 SynchBenchArgs bench_args CACHE_ALIGN;
 
-inline static void *Execute(void *Arg) {
+static void *Execute(void *Arg) {
     HSynchThreadState th_state;
     long i, rnum;
     volatile int j;

diff --git a/benchmarks/lcrqbench.c b/benchmarks/lcrqbench.c
@@ -15,7 +15,7 @@ int64_t d1 CACHE_ALIGN, d2;
 SynchBarrier bar CACHE_ALIGN;
 SynchBenchArgs bench_args CACHE_ALIGN;
 
-inline static void *Execute(void *Arg) {
+static void *Execute(void *Arg) {
     LCRQThreadState thread_state;
     long i, rnum;
     volatile int j;

diff --git a/benchmarks/lfstackbench.c b/benchmarks/lfstackbench.c
@@ -12,7 +12,7 @@ int MIN_BAK, MAX_BAK;
 SynchBarrier bar CACHE_ALIGN;
 SynchBenchArgs bench_args CACHE_ALIGN;
 
-inline static void *Execute(void *Arg) {
+static void *Execute(void *Arg) {
     LFStackThreadState *th_state;
     long i;
     int id = synchGetThreadId();

diff --git a/benchmarks/lfuobjectbench.c b/benchmarks/lfuobjectbench.c
@@ -20,7 +20,7 @@ int MIN_BAK, MAX_BAK;
 SynchBarrier bar CACHE_ALIGN;
 SynchBenchArgs bench_args CACHE_ALIGN;
 
-inline static void *Execute(void *Arg) {
+static void *Execute(void *Arg) {
     LFUObjectThreadState *th_state;
     long i, rnum;
     volatile long j;

diff --git a/benchmarks/mcsbench.c b/benchmarks/mcsbench.c
@@ -23,7 +23,7 @@ SynchBarrier bar CACHE_ALIGN;
 SynchBenchArgs bench_args CACHE_ALIGN;
 
 
-inline void apply_op(RetVal (*sfunc)(void *, ArgVal, int), void *state, ArgVal arg, MCSThreadState *thread_state, int pid) {
+void apply_op(RetVal (*sfunc)(void *, ArgVal, int), void *state, ArgVal arg, MCSThreadState *thread_state, int pid) {
     MCSLock(object_lock, thread_state, pid);
     sfunc(state, arg, pid);
 #ifdef DEBUG
@@ -32,7 +32,7 @@ inline void apply_op(RetVal (*sfunc)(void *, ArgVal, int), void *state, ArgVal a
     MCSUnlock(object_lock, thread_state, pid);
 }
 
-inline static void *Execute(void *Arg) {
+static void *Execute(void *Arg) {
     long i, rnum;
     volatile long j;
     int id = synchGetThreadId();

diff --git a/benchmarks/msqueuebench.c b/benchmarks/msqueuebench.c
@@ -19,7 +19,7 @@ int MIN_BAK, MAX_BAK;
 SynchBarrier bar CACHE_ALIGN;
 SynchBenchArgs bench_args CACHE_ALIGN;
 
-inline static void *Execute(void *Arg) {
+static void *Execute(void *Arg) {
     MSQueueThreadState *th_state;
     long i;
     int id = synchGetThreadId();

diff --git a/benchmarks/oscibench.c b/benchmarks/oscibench.c
@@ -19,7 +19,7 @@ int64_t d1 CACHE_ALIGN, d2;
 SynchBarrier bar CACHE_ALIGN;
 SynchBenchArgs bench_args CACHE_ALIGN;
 
-inline static void *Execute(void *Arg) {
+static void *Execute(void *Arg) {
     OsciThreadState *th_state;
     long i, rnum;
     volatile int j;

diff --git a/benchmarks/osciqueuebench.c b/benchmarks/osciqueuebench.c
@@ -17,7 +17,7 @@ int64_t d1 CACHE_ALIGN, d2;
 SynchBarrier bar CACHE_ALIGN;
 SynchBenchArgs bench_args CACHE_ALIGN;
 
-inline static void *Execute(void *Arg) {
+static void *Execute(void *Arg) {
     OsciQueueThreadState *th_state;
     long i, rnum;
     volatile int j;

diff --git a/benchmarks/oscistackbench.c b/benchmarks/oscistackbench.c
@@ -17,7 +17,7 @@ int64_t d1 CACHE_ALIGN, d2;
 SynchBarrier bar CACHE_ALIGN;
 SynchBenchArgs bench_args CACHE_ALIGN;
 
-inline static void *Execute(void *Arg) {
+static void *Execute(void *Arg) {
     OsciStackThreadState *th_state;
     long i, rnum;
     volatile int j;

diff --git a/benchmarks/oyamabench.c b/benchmarks/oyamabench.c
@@ -19,17 +19,17 @@ int64_t d1 CACHE_ALIGN, d2;
 SynchBarrier bar CACHE_ALIGN;
 SynchBenchArgs bench_args CACHE_ALIGN;
 
-inline static RetVal fetchAndMultiply(ArgVal arg, int pid);
+static RetVal fetchAndMultiply(ArgVal arg, int pid);
 
-inline static RetVal fetchAndMultiply(ArgVal arg, int pid) {
+static RetVal fetchAndMultiply(ArgVal arg, int pid) {
     Object old_val;
 
     old_val = object;
     object += 1;
     return old_val;
 }
 
-inline static void *Execute(void *Arg) {
+static void *Execute(void *Arg) {
     OyamaThreadState *th_state;
     long i, rnum;
     volatile int j;

diff --git a/benchmarks/pthreadsbench.c b/benchmarks/pthreadsbench.c
@@ -18,7 +18,7 @@ int64_t d1 CACHE_ALIGN, d2;
 SynchBarrier bar CACHE_ALIGN;
 SynchBenchArgs bench_args CACHE_ALIGN;
 
-inline static void *Execute(void *Arg) {
+static void *Execute(void *Arg) {
     long i, rnum;
     volatile int j;
     int id = synchGetThreadId();

diff --git a/benchmarks/simbench.c b/benchmarks/simbench.c
@@ -16,7 +16,7 @@ SynchBarrier bar CACHE_ALIGN;
 SynchBenchArgs bench_args CACHE_ALIGN;
 int MAX_BACK CACHE_ALIGN;
 
-inline static void *Execute(void *Arg) {
+static void *Execute(void *Arg) {
     SimThreadState th_state;
     long i, rnum;
     int id = synchGetThreadId();

diff --git a/benchmarks/simstackbench.c b/benchmarks/simstackbench.c
@@ -16,7 +16,7 @@ int64_t d1, d2;
 SynchBarrier bar CACHE_ALIGN;
 SynchBenchArgs bench_args CACHE_ALIGN;
 
-inline static void *Execute(void *Arg) {
+static void *Execute(void *Arg) {
     SimStackThreadState *th_state;
     long i = 0;
     int id = synchGetThreadId();