diff options
| -rw-r--r-- | CMakeLists.txt | 20 | ||||
| -rw-r--r-- | src/chain.h (renamed from src/Chain.h) | 4 | ||||
| -rw-r--r-- | src/experiment.cpp (renamed from src/Experiment.cpp) | 7 | ||||
| -rw-r--r-- | src/experiment.h (renamed from src/Experiment.h) | 8 | ||||
| -rw-r--r-- | src/lock.cpp (renamed from src/Lock.cpp) | 2 | ||||
| -rw-r--r-- | src/lock.h (renamed from src/Lock.h) | 5 | ||||
| -rw-r--r-- | src/main.cpp (renamed from src/Main.cpp) | 10 | ||||
| -rw-r--r-- | src/output.cpp (renamed from src/Output.cpp) | 2 | ||||
| -rw-r--r-- | src/output.h (renamed from src/Output.h) | 8 | ||||
| -rw-r--r-- | src/run.cpp (renamed from src/Run.cpp) | 4 | ||||
| -rw-r--r-- | src/run.h (renamed from src/Run.h) | 16 | ||||
| -rw-r--r-- | src/spinbarrier.cpp (renamed from src/SpinBarrier.cpp) | 2 | ||||
| -rw-r--r-- | src/spinbarrier.h (renamed from src/SpinBarrier.h) | 4 | ||||
| -rw-r--r-- | src/thread.cpp (renamed from src/Thread.cpp) | 2 | ||||
| -rw-r--r-- | src/thread.h (renamed from src/Thread.h) | 6 | ||||
| -rw-r--r-- | src/timer.cpp (renamed from src/Timer.cpp) | 2 | ||||
| -rw-r--r-- | src/timer.h (renamed from src/Timer.h) | 6 | ||||
| -rw-r--r-- | src/types.h (renamed from src/Types.h) | 4 |
18 files changed, 56 insertions, 56 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6c88c0e..0bc1120 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,23 +21,23 @@ add_subdirectory(lib/AsmJit) # Code compilation # -add_library(Experiment src/Experiment.h src/Experiment.cpp) +add_library(experiment src/experiment.h src/experiment.cpp) -add_library(Thread src/Thread.h src/Thread.cpp) +add_library(thread src/thread.h src/thread.cpp) -add_library(Lock src/Lock.h src/Lock.cpp) +add_library(lock src/lock.h src/lock.cpp) -add_library(Output src/Output.h src/Output.cpp) +add_library(output src/output.h src/output.cpp) -add_library(Run src/Run.h src/Run.cpp) -target_link_libraries(Run Lock Thread) +add_library(run src/run.h src/run.cpp) +target_link_libraries(run lock thread) -add_library(SpinBarrier src/SpinBarrier.h src/SpinBarrier.cpp) +add_library(spinbarrier src/spinbarrier.h src/spinbarrier.cpp) -add_library(Timer src/Timer.h src/Timer.cpp) +add_library(timer src/timer.h src/timer.cpp) -add_executable (chase src/Main.cpp) -target_link_libraries(chase Run Timer Output Experiment SpinBarrier) +add_executable (chase src/main.cpp) +target_link_libraries(chase run timer output experiment spinbarrier) target_link_libraries(chase ${CMAKE_THREAD_LIBS_INIT}) if (USE_LIBNUMA) if(LIBNUMA) diff --git a/src/Chain.h b/src/chain.h index f3ec83f..b929c4f 100644 --- a/src/Chain.h +++ b/src/chain.h @@ -14,8 +14,8 @@ // // Include guard -#if !defined(Chain_h) -#define Chain_h +#if !defined(CHAIN_H) +#define CHAIN_H // diff --git a/src/Experiment.cpp b/src/experiment.cpp index 701647c..7e5d318 100644 --- a/src/Experiment.cpp +++ b/src/experiment.cpp @@ -14,7 +14,7 @@ // // Implementation header -#include "Experiment.h" +#include "experiment.h" // System includes #include <stdio.h> @@ -25,6 +25,9 @@ #include <numa.h> #endif +// Local includes +#include "chain.h" + // // Implementation @@ -634,8 +637,6 @@ void Experiment::alloc_map() { this->bytes_per_test = this->bytes_per_thread * this->num_threads; } -#include "Chain.h" - void Experiment::print() { printf("strict = %d\n", strict); printf("pointer_size = %d\n", pointer_size); diff --git a/src/Experiment.h b/src/experiment.h index b6a2bf5..87ffbbb 100644 --- a/src/Experiment.h +++ b/src/experiment.h @@ -14,12 +14,12 @@ // // Include guard -#if !defined(Experiment_h) -#define Experiment_h +#if !defined(EXPERIMENT_H) +#define EXPERIMENT_H // Local includes -#include "Chain.h" -#include "Types.h" +#include "chain.h" +#include "types.h" // diff --git a/src/Lock.cpp b/src/lock.cpp index c4262e2..5c37bea 100644 --- a/src/Lock.cpp +++ b/src/lock.cpp @@ -14,7 +14,7 @@ // // Implementation header -#include "Lock.h" +#include "lock.h" // System includes #include <cstdio> @@ -13,10 +13,9 @@ // Configuration // - // Include guard -#if !defined(Lock_h) -#define Lock_h +#if !defined(LOCK_H) +#define LOCK_H // System includes #include <pthread.h> diff --git a/src/Main.cpp b/src/main.cpp index 17ea869..7e297d8 100644 --- a/src/Main.cpp +++ b/src/main.cpp @@ -17,11 +17,11 @@ #include <cstdio> // Local includes -#include "Run.h" -#include "Timer.h" -#include "Types.h" -#include "Output.h" -#include "Experiment.h" +#include "run.h" +#include "timer.h" +#include "types.h" +#include "output.h" +#include "experiment.h" // This program allocates and accesses // a number of blocks of memory, one or more diff --git a/src/Output.cpp b/src/output.cpp index bfffe0d..0fcc74d 100644 --- a/src/Output.cpp +++ b/src/output.cpp @@ -14,7 +14,7 @@ // // Implementation header -#include "Output.h" +#include "output.h" // System includes #include <stdio.h> diff --git a/src/Output.h b/src/output.h index db7d912..2229b33 100644 --- a/src/Output.h +++ b/src/output.h @@ -14,12 +14,12 @@ // // Include guard -#if !defined(Output_h) -#define Output_h +#if !defined(OUTPUT_H) +#define OUTPUT_H // Local includes -#include "Types.h" -#include "Experiment.h" +#include "types.h" +#include "experiment.h" // diff --git a/src/Run.cpp b/src/run.cpp index 0de55c8..54ef7c1 100644 --- a/src/Run.cpp +++ b/src/run.cpp @@ -14,7 +14,7 @@ // // Implementation header -#include "Run.h" +#include "run.h" // System includes #include <cstdio> @@ -28,7 +28,7 @@ // Local includes #include <AsmJit/AsmJit.h> -#include "Timer.h" +#include "timer.h" // @@ -14,16 +14,16 @@ // // Include guard -#if !defined(Run_h) -#define Run_h +#if !defined(RUN_H) +#define RUN_H // Local includes -#include "Thread.h" -#include "Lock.h" -#include "Chain.h" -#include "Types.h" -#include "Experiment.h" -#include "SpinBarrier.h" +#include "thread.h" +#include "lock.h" +#include "chain.h" +#include "types.h" +#include "experiment.h" +#include "spinbarrier.h" // diff --git a/src/SpinBarrier.cpp b/src/spinbarrier.cpp index 5ff5ce1..e7d3b70 100644 --- a/src/SpinBarrier.cpp +++ b/src/spinbarrier.cpp @@ -27,7 +27,7 @@ //
// Implementation header
-#include "SpinBarrier.h"
+#include "spinbarrier.h"
// System includes
#include <cstdio>
diff --git a/src/SpinBarrier.h b/src/spinbarrier.h index a329f7c..b0faaed 100644 --- a/src/SpinBarrier.h +++ b/src/spinbarrier.h @@ -24,8 +24,8 @@ ******************************************************************************/
// Include guard
-#if !defined( SpinBarrier_h )
-#define SpinBarrier_h
+#if !defined(SPINBARRIER_H)
+#define SPINBARRIER_H
// System includes
#include <pthread.h>
diff --git a/src/Thread.cpp b/src/thread.cpp index c7ea37d..54902cc 100644 --- a/src/Thread.cpp +++ b/src/thread.cpp @@ -14,7 +14,7 @@ // // Implementation header -#include "Thread.h" +#include "thread.h" // System includes #include <cstdio> diff --git a/src/Thread.h b/src/thread.h index 8ca2b76..146bf92 100644 --- a/src/Thread.h +++ b/src/thread.h @@ -14,14 +14,14 @@ // // Include guard -#if !defined(Thread_h) -#define Thread_h +#if !defined(THREAD_H) +#define THREAD_H // System includes #include <pthread.h> // Local includes -#include "Lock.h" +#include "lock.h" // diff --git a/src/Timer.cpp b/src/timer.cpp index 24ec8e9..22015ff 100644 --- a/src/Timer.cpp +++ b/src/timer.cpp @@ -14,7 +14,7 @@ // // Implementation header -#include "Timer.h" +#include "timer.h" // System includes #include <cstdio> diff --git a/src/Timer.h b/src/timer.h index 7689f36..d10c926 100644 --- a/src/Timer.h +++ b/src/timer.h @@ -14,11 +14,11 @@ // // Include guard -#if !defined(Timer_h) -#define Timer_h +#if !defined(TIMER_H) +#define TIMER_H // Local includes -#include "Types.h" +#include "types.h" // diff --git a/src/Types.h b/src/types.h index 73bd501..a92e481 100644 --- a/src/Types.h +++ b/src/types.h @@ -14,8 +14,8 @@ // // Include guard -#if !defined(Types_h) -#define Types_h +#if !defined(TYPES_H) +#define TYPES_H // |