Commit 242354fc authored by Ramon Nou's avatar Ramon Nou
Browse files

remove hermes

parent 8701c673

CMakeLists.txt

+1 −10
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ message(STATUS "[${PROJECT_NAME}] Build type: ${CMAKE_BUILD_TYPE}") 
# Compiler flags for various cmake build types

set(WARNINGS_FLAGS "-Wall -Wextra --pedantic -Wno-unused-parameter -Wno-missing-field-initializers")

set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG -O3")

set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${WARNINGS_FLAGS} -g -O0 -DGKFS_DEBUG_BUILD -DHERMES_DEBUG_BUILD")

set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${WARNINGS_FLAGS} -g -O0 -DGKFS_DEBUG_BUILD")

set(CMAKE_CXX_FLAGS_MEMCHECK "${WARNINGS_FLAGS} -g -O0 -fsanitize=address -fno-omit-frame-pointer")

set(CMAKE_CXX_FLAGS_MAINTAINER "${WARNINGS_FLAGS} -g -O0 -pg -no-pie")

set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNDEBUG -O3")
@@ -334,15 +334,6 @@ endif () 


configure_file(include/common/cmake_configure.hpp.in include/common/cmake_configure.hpp)



if (GKFS_ENABLE_CLIENT_LOG)

    option(HERMES_LOGGING "" ON)

    option(HERMES_LOGGING_FMT_USE_BUNDLED "" OFF)

    option(HERMES_LOGGING_FMT_HEADER_ONLY "" OFF)

endif ()



option(HERMES_MARGO_COMPATIBLE_RPCS "" ON)

add_subdirectory(external/hermes)

target_include_directories(hermes INTERFACE external/hermes/include)



set(INCLUDE_DIR "${CMAKE_SOURCE_DIR}/include")

CMakePresets.json

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
      "hidden": true,

      "cacheVariables": {

        "CMAKE_BUILD_TYPE": "Debug",

        "CMAKE_CXX_FLAGS": "-Wall -Wextra -fdiagnostics-color=always --pedantic -Wno-unused-parameter -Wno-missing-field-initializers -DGKFS_DEBUG_BUILD -DHERMES_DEBUG_BUILD"

        "CMAKE_CXX_FLAGS": "-Wall -Wextra -fdiagnostics-color=always --pedantic -Wno-unused-parameter -Wno-missing-field-initializers -DGKFS_DEBUG_BUILD"

      }

    },

    {

docs/sphinx/devs/coverage.md

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ Preset CMake variables: 


  CMAKE_BUILD_TYPE="Coverage"

  CMAKE_CXX_COMPILER="/usr/bin/g++"

  CMAKE_CXX_FLAGS="-Wall -Wextra -fdiagnostics-color=always --pedantic -Wno-unused-parameter -Wno-missing-field-initializers -DGKFS_DEBUG_BUILD -DHERMES_DEBUG_BUILD"

  CMAKE_CXX_FLAGS="-Wall -Wextra -fdiagnostics-color=always --pedantic -Wno-unused-parameter -Wno-missing-field-initializers -DGKFS_DEBUG_BUILD"

  CMAKE_CXX_FLAGS_COVERAGE="-Og -g --coverage -fkeep-static-functions"

  CMAKE_C_COMPILER="/usr/bin/gcc"

  CMAKE_C_FLAGS_COVERAGE="-Og -g --coverage -fkeep-static-functions"

hermes @ 072c0332

Original line number Diff line number Diff line 
Subproject commit 072c033225057aefdbdcc852ba0a360706668800

include/client/logging.hpp

+3 −16
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ enum class log_level : unsigned int { 
    print_critical = 1 << 3,

    print_errors = 1 << 4,

    print_warnings = 1 << 5,

    print_hermes = 1 << 6,

    print_mercury = 1 << 7,

    print_debug = 1 << 8,

    print_trace_reads = 1 << 9,
@@ -73,8 +72,8 @@ enum class log_level : unsigned int { 
    // for internal use

    print_none = 0,

    print_all = print_syscalls | print_syscalls_entry | print_info |

                print_critical | print_errors | print_warnings | print_hermes |

                print_mercury | print_debug,

                print_critical | print_errors | print_warnings | print_mercury |

                print_debug,

    print_most = print_all & ~print_syscalls_entry,

    print_help = 1 << 10

};
@@ -126,7 +125,6 @@ static const auto constexpr info = log_level::print_info; 
static const auto constexpr critical = log_level::print_critical;

static const auto constexpr error = log_level::print_errors;

static const auto constexpr warning = log_level::print_warnings;

static const auto constexpr hermes = log_level::print_hermes;

static const auto constexpr mercury = log_level::print_mercury;

static const auto constexpr debug = log_level::print_debug;

static const auto constexpr trace_reads = log_level::print_trace_reads;
@@ -138,7 +136,7 @@ static const auto constexpr help = log_level::print_help; 
static const auto constexpr level_names = utils::make_array(

        "syscall",

        "syscall", // sycall_entry uses the same name as syscall

        "info", "critical", "error", "warning", "hermes", "mercury", "debug",

        "info", "critical", "error", "warning", "mercury", "debug",

        "trace_reads");



inline constexpr auto
@@ -582,9 +580,6 @@ destroy_global_logger() { 
#define LOG_CRITICAL(...)                                                      \

    do {                                                                       \

    } while(0);

#define LOG_HERMES(...)                                                        \

    do {                                                                       \

    } while(0);

#define LOG_MERCURY(...)                                                       \

    do {                                                                       \

    } while(0);
@@ -632,14 +627,6 @@ destroy_global_logger() { 
        }                                                                      \

    } while(0);



#define LOG_HERMES(...)                                                        \

    do {                                                                       \

        if(gkfs::log::get_global_logger()) {                                   \

            gkfs::log::get_global_logger()->log(gkfs::log::hermes, __func__,   \

                                                __LINE__, __VA_ARGS__);        \

        }                                                                      \

    } while(0);



#define LOG_MERCURY(...)                                                       \

    do {                                                                       \

        if(gkfs::log::get_global_logger()) {                                   \