Merge pull request #73 from scs-lab/revert-71-70-create-local-develop…

…ment-enviornments-with-docker

Revert "70 create local development enviornments with docker"

CMakeLists.txt

@@ -84,7 +84,6 @@ option(CHRONOLOG_ENABLE_DOXYGEN "Enable Doxygen documentation generation." OFF)
 #    add_compile_options(-Wextra)
 #endif()
 
-#set(CMAKE_BUILD_TYPE "Debug")
 # Change some compilation flags depending on the build type
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
     message("Compiling ChronoLog in Debug Mode")
@@ -134,7 +133,7 @@ endif()
 #-----------------------------------------------------------------------------
 # Dependencies common to all subdirectories
 #-----------------------------------------------------------------------------
-#find_package(MPI REQUIRED COMPONENTS CXX)
+find_package(MPI REQUIRED COMPONENTS CXX)
 find_package(Boost REQUIRED)
 find_package(Thallium REQUIRED)
 #find_library(ROCKSDB_LIB rocksdb)
@@ -202,22 +201,18 @@ if(CHRONOLOG_BUILD_TESTING)
 endif()
 
 # External header only libraries
-#add_subdirectory(external_libs)
+add_subdirectory(external_libs)
 
-#add_subdirectory(tools)
-
-# ChronoLog client library
-add_subdirectory(Client)
+add_subdirectory(tools)
 
 # ChronoVisor
-#add_subdirectory(ChronoAPI)
+add_subdirectory(ChronoAPI)
 
 # ChronoVisor
 add_subdirectory(ChronoVisor)
 
-# ChronoKeeper
-add_subdirectory(ChronoKeeper)
-
+# ChronoLog client library
+add_subdirectory(Client)
 
 # custom
 add_custom_target(make_all cd ${CMAKE_BINARY_DIR} && make)

ChronoAPI/ChronoLog/include/ChronoLog.h

@@ -0,0 +1,12 @@
+//
+// Created by jaime on 2/14/2022.
+//
+
+#ifndef SOCKETPP_API_INCLUDE_CHRONOLOG_H_
+#define SOCKETPP_API_INCLUDE_CHRONOLOG_H_
+
+class ChronoLog {
+
+};
+
+#endif //SOCKETPP_API_INCLUDE_CHRONOLOG_H_

ChronoAPI/ChronoLog/include/ClocksourceManager.h

@@ -10,15 +10,12 @@
 #include <ctime>
 #include <typeinfo>
 #include <unistd.h>
-//#include <emmintrin.h>
+#include <emmintrin.h>
 #include <enum.h>
 #include <log.h>
 
-#ifdef TSC_ENABLED
-#include <emmintrin.h>
 #define   lfence()  _mm_lfence()
 #define   mfence()  _mm_mfence()
-#endif
 
 class Clocksource {
 public:
@@ -41,7 +38,6 @@ class ClocksourceCStyle : public Clocksource {
     }
 };
 
-#ifdef TSC_ENABLED
 class ClocksourceTSC : public Clocksource {
 public:
     uint64_t getTimestamp() override {
@@ -51,8 +47,6 @@ class ClocksourceTSC : public Clocksource {
         return t;
     }
 };
-#endif
-
 class ClocksourceCPPStyle : public Clocksource {
 public:
     uint64_t getTimestamp() override {

chrono_common/ConfigurationManager.h → ChronoAPI/ChronoLog/include/ConfigurationManager.h

@@ -1,3 +1,7 @@
+//
+// Created by kfeng on 3/30/22.
+//
+
 #ifndef CHRONOLOG_CONFIGURATIONMANAGER_H
 #define CHRONOLOG_CONFIGURATIONMANAGER_H