From 9028a35252b0f25bae2fa1c36b32d63786106c88 Mon Sep 17 00:00:00 2001 From: tkaya Date: Sat, 3 Apr 2021 22:18:53 +0200 Subject: [PATCH 1/2] renamed global directory into common & edited occurences accordingly --- CMakeLists.txt | 6 +++--- include/client/gkfs_functions.hpp | 2 +- include/client/preload_util.hpp | 2 +- include/client/rpc/rpc_types.hpp | 4 ++-- .../{global => common}/arithmetic/arithmetic.hpp | 0 include/{global => common}/cmake_configure.hpp.in | 0 include/{global => common}/env_util.hpp | 0 include/{global => common}/global_defs.hpp | 0 include/{global => common}/log_util.hpp | 0 include/{global => common}/metadata.hpp | 0 include/{global => common}/path_util.hpp | 0 include/{global => common}/rpc/distributor.hpp | 0 include/{global => common}/rpc/rpc_types.hpp | 0 include/{global => common}/rpc/rpc_util.hpp | 0 include/config.hpp | 2 +- include/daemon/backend/data/chunk_storage.hpp | 2 +- include/daemon/backend/metadata/merge.hpp | 2 +- include/daemon/daemon.hpp | 2 +- include/daemon/ops/data.hpp | 2 +- include/daemon/ops/metadentry.hpp | 2 +- src/client/CMakeLists.txt | 14 +++++++------- src/client/gkfs_functions.cpp | 2 +- src/client/hooks.cpp | 2 +- src/client/path.cpp | 2 +- src/client/preload.cpp | 4 ++-- src/client/preload_context.cpp | 4 ++-- src/client/preload_util.cpp | 8 ++++---- src/client/rpc/forward_data.cpp | 4 ++-- src/client/rpc/forward_metadata.cpp | 6 +++--- src/{global => common}/CMakeLists.txt | 8 ++++---- src/{global => common}/arithmetic/CMakeLists.txt | 4 ++-- src/{global => common}/env_util.cpp | 3 +-- src/{global => common}/log_util.cpp | 2 +- src/{global => common}/metadata.cpp | 2 +- src/{global => common}/path_util.cpp | 2 +- src/{global => common}/rpc/distributor.cpp | 2 +- src/{global => common}/rpc/rpc_util.cpp | 2 +- src/daemon/CMakeLists.txt | 14 +++++++------- src/daemon/backend/data/CMakeLists.txt | 4 ++-- src/daemon/backend/data/chunk_storage.cpp | 2 +- src/daemon/backend/metadata/CMakeLists.txt | 2 +- src/daemon/backend/metadata/db.cpp | 4 ++-- src/daemon/daemon.cpp | 8 ++++---- src/daemon/handler/srv_data.cpp | 6 +++--- src/daemon/handler/srv_management.cpp | 2 +- src/daemon/handler/srv_metadata.cpp | 2 +- src/daemon/ops/data.cpp | 2 +- src/daemon/util.cpp | 2 +- 48 files changed, 72 insertions(+), 73 deletions(-) rename include/{global => common}/arithmetic/arithmetic.hpp (100%) rename include/{global => common}/cmake_configure.hpp.in (100%) rename include/{global => common}/env_util.hpp (100%) rename include/{global => common}/global_defs.hpp (100%) rename include/{global => common}/log_util.hpp (100%) rename include/{global => common}/metadata.hpp (100%) rename include/{global => common}/path_util.hpp (100%) rename include/{global => common}/rpc/distributor.hpp (100%) rename include/{global => common}/rpc/rpc_types.hpp (100%) rename include/{global => common}/rpc/rpc_util.hpp (100%) rename src/{global => common}/CMakeLists.txt (95%) rename src/{global => common}/arithmetic/CMakeLists.txt (96%) rename src/{global => common}/env_util.cpp (97%) rename src/{global => common}/log_util.cpp (99%) rename src/{global => common}/metadata.cpp (99%) rename src/{global => common}/path_util.cpp (99%) rename src/{global => common}/rpc/distributor.cpp (98%) rename src/{global => common}/rpc/rpc_util.cpp (98%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 41f0b6673..7fe5aa9ec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -178,7 +178,7 @@ add_definitions(-DLIBGKFS_LOG_MESSAGE_SIZE=${CLIENT_LOG_MESSAGE_SIZE}) message(STATUS "[gekkofs] Maximum log message size in the client library: ${CLIENT_LOG_MESSAGE_SIZE}") mark_as_advanced(CLIENT_LOG_MESSAGE_SIZE) -configure_file(include/global/cmake_configure.hpp.in include/global/cmake_configure.hpp) +configure_file(include/common/cmake_configure.hpp.in include/common/cmake_configure.hpp) # Imported target add_library(RocksDB INTERFACE IMPORTED GLOBAL) @@ -235,8 +235,8 @@ include_directories( include(GNUInstallDirs) -# Global components -add_subdirectory(src/global) +# Common components +add_subdirectory(src/common) # Daemon add_subdirectory(src/daemon) # Client library diff --git a/include/client/gkfs_functions.hpp b/include/client/gkfs_functions.hpp index ec4e4f97a..f64b50215 100644 --- a/include/client/gkfs_functions.hpp +++ b/include/client/gkfs_functions.hpp @@ -31,7 +31,7 @@ #define GEKKOFS_GKFS_FUNCTIONS_HPP #include -#include +#include struct statfs; struct statvfs; diff --git a/include/client/preload_util.hpp b/include/client/preload_util.hpp index 2efca4525..a2354ce24 100644 --- a/include/client/preload_util.hpp +++ b/include/client/preload_util.hpp @@ -31,7 +31,7 @@ #define GEKKOFS_PRELOAD_UTIL_HPP #include -#include +#include #include #include diff --git a/include/client/rpc/rpc_types.hpp b/include/client/rpc/rpc_types.hpp index 68695e540..332b6203c 100644 --- a/include/client/rpc/rpc_types.hpp +++ b/include/client/rpc/rpc_types.hpp @@ -46,8 +46,8 @@ #endif -#include -#include +#include +#include namespace hermes { namespace detail { diff --git a/include/global/arithmetic/arithmetic.hpp b/include/common/arithmetic/arithmetic.hpp similarity index 100% rename from include/global/arithmetic/arithmetic.hpp rename to include/common/arithmetic/arithmetic.hpp diff --git a/include/global/cmake_configure.hpp.in b/include/common/cmake_configure.hpp.in similarity index 100% rename from include/global/cmake_configure.hpp.in rename to include/common/cmake_configure.hpp.in diff --git a/include/global/env_util.hpp b/include/common/env_util.hpp similarity index 100% rename from include/global/env_util.hpp rename to include/common/env_util.hpp diff --git a/include/global/global_defs.hpp b/include/common/global_defs.hpp similarity index 100% rename from include/global/global_defs.hpp rename to include/common/global_defs.hpp diff --git a/include/global/log_util.hpp b/include/common/log_util.hpp similarity index 100% rename from include/global/log_util.hpp rename to include/common/log_util.hpp diff --git a/include/global/metadata.hpp b/include/common/metadata.hpp similarity index 100% rename from include/global/metadata.hpp rename to include/common/metadata.hpp diff --git a/include/global/path_util.hpp b/include/common/path_util.hpp similarity index 100% rename from include/global/path_util.hpp rename to include/common/path_util.hpp diff --git a/include/global/rpc/distributor.hpp b/include/common/rpc/distributor.hpp similarity index 100% rename from include/global/rpc/distributor.hpp rename to include/common/rpc/distributor.hpp diff --git a/include/global/rpc/rpc_types.hpp b/include/common/rpc/rpc_types.hpp similarity index 100% rename from include/global/rpc/rpc_types.hpp rename to include/common/rpc/rpc_types.hpp diff --git a/include/global/rpc/rpc_util.hpp b/include/common/rpc/rpc_util.hpp similarity index 100% rename from include/global/rpc/rpc_util.hpp rename to include/common/rpc/rpc_util.hpp diff --git a/include/config.hpp b/include/config.hpp index 094c6077e..7dd6d2ba7 100644 --- a/include/config.hpp +++ b/include/config.hpp @@ -29,7 +29,7 @@ #ifndef GEKKOFS_CONFIG_HPP #define GEKKOFS_CONFIG_HPP -#include +#include // environment prefixes (are concatenated in env module at compile time) #define CLIENT_ENV_PREFIX "LIBGKFS_" diff --git a/include/daemon/backend/data/chunk_storage.hpp b/include/daemon/backend/data/chunk_storage.hpp index 18a6bf9f0..6650d9161 100644 --- a/include/daemon/backend/data/chunk_storage.hpp +++ b/include/daemon/backend/data/chunk_storage.hpp @@ -29,7 +29,7 @@ #ifndef GEKKOFS_CHUNK_STORAGE_HPP #define GEKKOFS_CHUNK_STORAGE_HPP -#include +#include #include #include diff --git a/include/daemon/backend/metadata/merge.hpp b/include/daemon/backend/metadata/merge.hpp index 879221e66..dcd2b4a26 100644 --- a/include/daemon/backend/metadata/merge.hpp +++ b/include/daemon/backend/metadata/merge.hpp @@ -31,7 +31,7 @@ #include -#include +#include namespace rdb = rocksdb; diff --git a/include/daemon/daemon.hpp b/include/daemon/daemon.hpp index 3f9fa7f56..c44543a17 100644 --- a/include/daemon/daemon.hpp +++ b/include/daemon/daemon.hpp @@ -34,7 +34,7 @@ #include #include -#include +#include // margo extern "C" { #include diff --git a/include/daemon/ops/data.hpp b/include/daemon/ops/data.hpp index c2e901acc..8069fac96 100644 --- a/include/daemon/ops/data.hpp +++ b/include/daemon/ops/data.hpp @@ -30,7 +30,7 @@ #define GEKKOFS_DAEMON_DATA_HPP #include -#include +#include #include #include diff --git a/include/daemon/ops/metadentry.hpp b/include/daemon/ops/metadentry.hpp index 9c5538e8f..aabcdbc49 100644 --- a/include/daemon/ops/metadentry.hpp +++ b/include/daemon/ops/metadentry.hpp @@ -30,7 +30,7 @@ #define GEKKOFS_METADENTRY_HPP #include -#include +#include namespace gkfs { namespace metadata { diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt index b79ea63b9..79291a4c0 100644 --- a/src/client/CMakeLists.txt +++ b/src/client/CMakeLists.txt @@ -38,8 +38,8 @@ set(PRELOAD_SRC preload.cpp preload_context.cpp preload_util.cpp - ../global/path_util.cpp - ../global/rpc/rpc_util.cpp + ../common/path_util.cpp + ../common/rpc/rpc_util.cpp rpc/rpc_types.cpp rpc/forward_data.cpp rpc/forward_management.cpp @@ -70,11 +70,11 @@ set(PRELOAD_HEADERS ../../include/client/syscalls/rets.hpp ../../include/client/syscalls/syscall.hpp ../../include/client/syscalls/detail/syscall_info.h - ../../include/global/cmake_configure.hpp - ../../include/global/global_defs.hpp - ../../include/global/path_util.hpp - ../../include/global/rpc/rpc_types.hpp - ../../include/global/rpc/rpc_util.hpp + ../../include/common/cmake_configure.hpp + ../../include/common/global_defs.hpp + ../../include/common/path_util.hpp + ../../include/common/rpc/rpc_types.hpp + ../../include/common/rpc/rpc_util.hpp ) set(PRELOAD_LINK_LIBRARIES # internal diff --git a/src/client/gkfs_functions.cpp b/src/client/gkfs_functions.cpp index 58b6280d4..36054c23a 100644 --- a/src/client/gkfs_functions.cpp +++ b/src/client/gkfs_functions.cpp @@ -36,7 +36,7 @@ #include #include -#include +#include extern "C" { #include // used for file types in the getdents{,64}() functions diff --git a/src/client/hooks.cpp b/src/client/hooks.cpp index 326838482..34d18a6aa 100644 --- a/src/client/hooks.cpp +++ b/src/client/hooks.cpp @@ -35,7 +35,7 @@ #include #include -#include +#include #include diff --git a/src/client/path.cpp b/src/client/path.cpp index ae0e6085e..3b2164b59 100644 --- a/src/client/path.cpp +++ b/src/client/path.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include diff --git a/src/client/preload.cpp b/src/client/preload.cpp index ff1eb1267..d4310ecbc 100644 --- a/src/client/preload.cpp +++ b/src/client/preload.cpp @@ -34,8 +34,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/src/client/preload_context.cpp b/src/client/preload_context.cpp index 4d26437c3..8762e7aeb 100644 --- a/src/client/preload_context.cpp +++ b/src/client/preload_context.cpp @@ -34,8 +34,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/src/client/preload_util.cpp b/src/client/preload_util.cpp index 255588a8f..2e37d42d6 100644 --- a/src/client/preload_util.cpp +++ b/src/client/preload_util.cpp @@ -32,10 +32,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/src/client/rpc/forward_data.cpp b/src/client/rpc/forward_data.cpp index d45ebfbfc..151c4f70b 100644 --- a/src/client/rpc/forward_data.cpp +++ b/src/client/rpc/forward_data.cpp @@ -32,8 +32,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/src/client/rpc/forward_metadata.cpp b/src/client/rpc/forward_metadata.cpp index e5882dfce..1cb51ab86 100644 --- a/src/client/rpc/forward_metadata.cpp +++ b/src/client/rpc/forward_metadata.cpp @@ -34,9 +34,9 @@ #include #include -#include -#include -#include +#include +#include +#include using namespace std; diff --git a/src/global/CMakeLists.txt b/src/common/CMakeLists.txt similarity index 95% rename from src/global/CMakeLists.txt rename to src/common/CMakeLists.txt index e80874fd4..4c6698ed6 100644 --- a/src/global/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -32,7 +32,7 @@ add_library(distributor STATIC) set_property(TARGET distributor PROPERTY POSITION_INDEPENDENT_CODE ON) target_sources(distributor PUBLIC - ${INCLUDE_DIR}/global/rpc/distributor.hpp + ${INCLUDE_DIR}/common/rpc/distributor.hpp PRIVATE ${CMAKE_CURRENT_LIST_DIR}/rpc/distributor.cpp ) @@ -45,7 +45,7 @@ add_library(log_util STATIC) set_property(TARGET log_util PROPERTY POSITION_INDEPENDENT_CODE ON) target_sources(log_util PUBLIC - ${INCLUDE_DIR}/global/log_util.hpp + ${INCLUDE_DIR}/common/log_util.hpp PRIVATE ${CMAKE_CURRENT_LIST_DIR}/log_util.cpp ) @@ -62,7 +62,7 @@ add_library(env_util STATIC) set_property(TARGET env_util PROPERTY POSITION_INDEPENDENT_CODE ON) target_sources(env_util PUBLIC - ${INCLUDE_DIR}/global/env_util.hpp + ${INCLUDE_DIR}/common/env_util.hpp PRIVATE ${INCLUDE_DIR}/config.hpp ${CMAKE_CURRENT_LIST_DIR}/env_util.cpp @@ -76,7 +76,7 @@ add_library(metadata STATIC) set_property(TARGET metadata PROPERTY POSITION_INDEPENDENT_CODE ON) target_sources(metadata PUBLIC - ${INCLUDE_DIR}/global/metadata.hpp + ${INCLUDE_DIR}/common/metadata.hpp PRIVATE ${CMAKE_CURRENT_LIST_DIR}/metadata.cpp ) diff --git a/src/global/arithmetic/CMakeLists.txt b/src/common/arithmetic/CMakeLists.txt similarity index 96% rename from src/global/arithmetic/CMakeLists.txt rename to src/common/arithmetic/CMakeLists.txt index 326e5038d..5e9cdc8f5 100644 --- a/src/global/arithmetic/CMakeLists.txt +++ b/src/common/arithmetic/CMakeLists.txt @@ -29,12 +29,12 @@ add_library(arithmetic INTERFACE) target_sources(arithmetic INTERFACE - ${INCLUDE_DIR}/global/arithmetic/arithmetic.hpp + ${INCLUDE_DIR}/common/arithmetic/arithmetic.hpp ) target_include_directories(arithmetic INTERFACE - ${INCLUDE_DIR}/global/arithmetic/ + ${INCLUDE_DIR}/common/arithmetic/ ) target_code_coverage(arithmetic INTERFACE) diff --git a/src/global/env_util.cpp b/src/common/env_util.cpp similarity index 97% rename from src/global/env_util.cpp rename to src/common/env_util.cpp index 728b43557..c5e726877 100644 --- a/src/global/env_util.cpp +++ b/src/common/env_util.cpp @@ -25,8 +25,7 @@ SPDX-License-Identifier: GPL-3.0-or-later */ - -#include +#include #include #include diff --git a/src/global/log_util.cpp b/src/common/log_util.cpp similarity index 99% rename from src/global/log_util.cpp rename to src/common/log_util.cpp index 5f1957e27..9280e1ac8 100644 --- a/src/global/log_util.cpp +++ b/src/common/log_util.cpp @@ -26,7 +26,7 @@ SPDX-License-Identifier: GPL-3.0-or-later */ -#include +#include #include #include diff --git a/src/global/metadata.cpp b/src/common/metadata.cpp similarity index 99% rename from src/global/metadata.cpp rename to src/common/metadata.cpp index d46d0c797..c3948847e 100644 --- a/src/global/metadata.cpp +++ b/src/common/metadata.cpp @@ -26,7 +26,7 @@ SPDX-License-Identifier: GPL-3.0-or-later */ -#include +#include #include #include diff --git a/src/global/path_util.cpp b/src/common/path_util.cpp similarity index 99% rename from src/global/path_util.cpp rename to src/common/path_util.cpp index 0a64bb85b..7b6782129 100644 --- a/src/global/path_util.cpp +++ b/src/common/path_util.cpp @@ -26,7 +26,7 @@ SPDX-License-Identifier: GPL-3.0-or-later */ -#include +#include #include #include diff --git a/src/global/rpc/distributor.cpp b/src/common/rpc/distributor.cpp similarity index 98% rename from src/global/rpc/distributor.cpp rename to src/common/rpc/distributor.cpp index 7409d2eaa..3b1c4011f 100644 --- a/src/global/rpc/distributor.cpp +++ b/src/common/rpc/distributor.cpp @@ -26,7 +26,7 @@ SPDX-License-Identifier: GPL-3.0-or-later */ -#include +#include using namespace std; diff --git a/src/global/rpc/rpc_util.cpp b/src/common/rpc/rpc_util.cpp similarity index 98% rename from src/global/rpc/rpc_util.cpp rename to src/common/rpc/rpc_util.cpp index 1a9251358..5f045ed82 100644 --- a/src/global/rpc/rpc_util.cpp +++ b/src/common/rpc/rpc_util.cpp @@ -26,7 +26,7 @@ SPDX-License-Identifier: GPL-3.0-or-later */ -#include +#include extern "C" { #include diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt index f490a4be3..329798324 100644 --- a/src/daemon/CMakeLists.txt +++ b/src/daemon/CMakeLists.txt @@ -30,8 +30,8 @@ add_subdirectory(backend/metadata) add_subdirectory(backend/data) set(DAEMON_SRC - ../global/rpc/rpc_util.cpp - ../global/path_util.cpp + ../common/rpc/rpc_util.cpp + ../common/path_util.cpp daemon.cpp util.cpp ops/metadentry.cpp @@ -45,11 +45,11 @@ set(DAEMON_SRC set(DAEMON_HEADERS ../../include/config.hpp ../../include/version.hpp - ../../include/global/cmake_configure.hpp - ../../include/global/global_defs.hpp - ../../include/global/rpc/rpc_types.hpp - ../../include/global/rpc/rpc_util.hpp - ../../include/global/path_util.hpp + ../../include/common/cmake_configure.hpp + ../../include/common/global_defs.hpp + ../../include/common/rpc/rpc_types.hpp + ../../include/common/rpc/rpc_util.hpp + ../../include/common/path_util.hpp ../../include/daemon/daemon.hpp ../../include/daemon/util.hpp ../../include/daemon/ops/data.hpp diff --git a/src/daemon/backend/data/CMakeLists.txt b/src/daemon/backend/data/CMakeLists.txt index 0f63647a7..1749b82c1 100644 --- a/src/daemon/backend/data/CMakeLists.txt +++ b/src/daemon/backend/data/CMakeLists.txt @@ -32,8 +32,8 @@ target_sources(storage PUBLIC ${INCLUDE_DIR}/daemon/backend/data/chunk_storage.hpp PRIVATE - ${INCLUDE_DIR}/global/path_util.hpp - ${INCLUDE_DIR}/global/global_defs.hpp + ${INCLUDE_DIR}/common/path_util.hpp + ${INCLUDE_DIR}/common/global_defs.hpp ${INCLUDE_DIR}/daemon/backend/data/data_module.hpp ${INCLUDE_DIR}/daemon/backend/data/file_handle.hpp ${CMAKE_CURRENT_LIST_DIR}/chunk_storage.cpp diff --git a/src/daemon/backend/data/chunk_storage.cpp b/src/daemon/backend/data/chunk_storage.cpp index dbe5f90c9..338885bf1 100644 --- a/src/daemon/backend/data/chunk_storage.cpp +++ b/src/daemon/backend/data/chunk_storage.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include diff --git a/src/daemon/backend/metadata/CMakeLists.txt b/src/daemon/backend/metadata/CMakeLists.txt index f2ac88359..d04c8d91e 100644 --- a/src/daemon/backend/metadata/CMakeLists.txt +++ b/src/daemon/backend/metadata/CMakeLists.txt @@ -33,7 +33,7 @@ target_sources(metadata_db ${INCLUDE_DIR}/daemon/backend/metadata/db.hpp ${INCLUDE_DIR}/daemon/backend/exceptions.hpp PRIVATE - ${INCLUDE_DIR}/global/path_util.hpp + ${INCLUDE_DIR}/common/path_util.hpp ${INCLUDE_DIR}/daemon/backend/metadata/merge.hpp ${CMAKE_CURRENT_LIST_DIR}/merge.cpp ${CMAKE_CURRENT_LIST_DIR}/db.cpp diff --git a/src/daemon/backend/metadata/db.cpp b/src/daemon/backend/metadata/db.cpp index c56a7567d..9389d3557 100644 --- a/src/daemon/backend/metadata/db.cpp +++ b/src/daemon/backend/metadata/db.cpp @@ -30,8 +30,8 @@ #include #include -#include -#include +#include +#include extern "C" { #include diff --git a/src/daemon/daemon.cpp b/src/daemon/daemon.cpp index a8537ccdd..452f76ef3 100644 --- a/src/daemon/daemon.cpp +++ b/src/daemon/daemon.cpp @@ -28,10 +28,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/src/daemon/handler/srv_data.cpp b/src/daemon/handler/srv_data.cpp index 172202f99..697ca86e4 100644 --- a/src/daemon/handler/srv_data.cpp +++ b/src/daemon/handler/srv_data.cpp @@ -32,9 +32,9 @@ #include #include -#include -#include -#include +#include +#include +#include #ifdef GKFS_ENABLE_AGIOS #include diff --git a/src/daemon/handler/srv_management.cpp b/src/daemon/handler/srv_management.cpp index 95d36ee7e..ec43dc2f8 100644 --- a/src/daemon/handler/srv_management.cpp +++ b/src/daemon/handler/srv_management.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include using namespace std; diff --git a/src/daemon/handler/srv_metadata.cpp b/src/daemon/handler/srv_metadata.cpp index 5f2c76352..9eda0cd54 100644 --- a/src/daemon/handler/srv_metadata.cpp +++ b/src/daemon/handler/srv_metadata.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include using namespace std; diff --git a/src/daemon/ops/data.cpp b/src/daemon/ops/data.cpp index a551221b9..ab30f542d 100644 --- a/src/daemon/ops/data.cpp +++ b/src/daemon/ops/data.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include extern "C" { diff --git a/src/daemon/util.cpp b/src/daemon/util.cpp index d2e96c8c7..5dfe97cf9 100644 --- a/src/daemon/util.cpp +++ b/src/daemon/util.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include -- GitLab From cf033c94b6e1e4d7077a7355bf2254438e03873e Mon Sep 17 00:00:00 2001 From: Marc Vef Date: Fri, 28 May 2021 16:42:07 +0200 Subject: [PATCH 2/2] Rename: global_defs.hpp to common_defs.hpp --- include/client/rpc/rpc_types.hpp | 2 +- include/common/arithmetic/arithmetic.hpp | 6 +++--- include/common/{global_defs.hpp => common_defs.hpp} | 6 +++--- include/common/rpc/rpc_util.hpp | 6 +++--- include/daemon/backend/data/chunk_storage.hpp | 2 +- include/daemon/daemon.hpp | 2 +- include/daemon/ops/data.hpp | 2 +- src/client/CMakeLists.txt | 2 +- src/client/preload.cpp | 2 +- src/client/preload_util.cpp | 2 +- src/daemon/CMakeLists.txt | 4 ++-- src/daemon/backend/data/CMakeLists.txt | 2 +- 12 files changed, 19 insertions(+), 19 deletions(-) rename include/common/{global_defs.hpp => common_defs.hpp} (96%) diff --git a/include/client/rpc/rpc_types.hpp b/include/client/rpc/rpc_types.hpp index 332b6203c..973e34727 100644 --- a/include/client/rpc/rpc_types.hpp +++ b/include/client/rpc/rpc_types.hpp @@ -46,7 +46,7 @@ #endif -#include +#include #include namespace hermes { diff --git a/include/common/arithmetic/arithmetic.hpp b/include/common/arithmetic/arithmetic.hpp index e00e49941..afab3c540 100644 --- a/include/common/arithmetic/arithmetic.hpp +++ b/include/common/arithmetic/arithmetic.hpp @@ -26,8 +26,8 @@ SPDX-License-Identifier: GPL-3.0-or-later */ -#ifndef GKFS_GLOBAL_ARITHMETIC_HPP -#define GKFS_GLOBAL_ARITHMETIC_HPP +#ifndef GKFS_COMMON_ARITHMETIC_HPP +#define GKFS_COMMON_ARITHMETIC_HPP #include #include @@ -215,4 +215,4 @@ block_count(const uint64_t offset, const size_t size, const size_t block_size) { } // namespace gkfs::utils::arithmetic -#endif // GKFS_GLOBAL_ARITHMETIC_HPP \ No newline at end of file +#endif // GKFS_COMMON_ARITHMETIC_HPP \ No newline at end of file diff --git a/include/common/global_defs.hpp b/include/common/common_defs.hpp similarity index 96% rename from include/common/global_defs.hpp rename to include/common/common_defs.hpp index 08a4adc1a..5acc81230 100644 --- a/include/common/global_defs.hpp +++ b/include/common/common_defs.hpp @@ -26,8 +26,8 @@ SPDX-License-Identifier: GPL-3.0-or-later */ -#ifndef GEKKOFS_GLOBAL_DEFS_HPP -#define GEKKOFS_GLOBAL_DEFS_HPP +#ifndef GEKKOFS_COMMON_DEFS_HPP +#define GEKKOFS_COMMON_DEFS_HPP // These constexpr set the RPC's identity and which handler the receiver end // should use @@ -66,4 +66,4 @@ constexpr auto na_sm = "na+sm"; } // namespace protocol } // namespace gkfs::rpc -#endif // GEKKOFS_GLOBAL_DEFS_HPP +#endif // GEKKOFS_COMMON_DEFS_HPP diff --git a/include/common/rpc/rpc_util.hpp b/include/common/rpc/rpc_util.hpp index 0d2623388..3a0f61571 100644 --- a/include/common/rpc/rpc_util.hpp +++ b/include/common/rpc/rpc_util.hpp @@ -26,8 +26,8 @@ SPDX-License-Identifier: GPL-3.0-or-later */ -#ifndef GEKKOFS_GLOBAL_RPC_UTILS_HPP -#define GEKKOFS_GLOBAL_RPC_UTILS_HPP +#ifndef GEKKOFS_COMMON_RPC_UTILS_HPP +#define GEKKOFS_COMMON_RPC_UTILS_HPP extern "C" { #include @@ -49,4 +49,4 @@ get_host_by_name(const std::string& hostname); } // namespace gkfs::rpc -#endif // GEKKOFS_GLOBAL_RPC_UTILS_HPP +#endif // GEKKOFS_COMMON_RPC_UTILS_HPP diff --git a/include/daemon/backend/data/chunk_storage.hpp b/include/daemon/backend/data/chunk_storage.hpp index 6650d9161..dd6f7ee68 100644 --- a/include/daemon/backend/data/chunk_storage.hpp +++ b/include/daemon/backend/data/chunk_storage.hpp @@ -29,7 +29,7 @@ #ifndef GEKKOFS_CHUNK_STORAGE_HPP #define GEKKOFS_CHUNK_STORAGE_HPP -#include +#include #include #include diff --git a/include/daemon/daemon.hpp b/include/daemon/daemon.hpp index c44543a17..612712b63 100644 --- a/include/daemon/daemon.hpp +++ b/include/daemon/daemon.hpp @@ -34,7 +34,7 @@ #include #include -#include +#include // margo extern "C" { #include diff --git a/include/daemon/ops/data.hpp b/include/daemon/ops/data.hpp index 8069fac96..4754fa0ce 100644 --- a/include/daemon/ops/data.hpp +++ b/include/daemon/ops/data.hpp @@ -30,7 +30,7 @@ #define GEKKOFS_DAEMON_DATA_HPP #include -#include +#include #include #include diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt index 79291a4c0..4fbda13f6 100644 --- a/src/client/CMakeLists.txt +++ b/src/client/CMakeLists.txt @@ -71,7 +71,7 @@ set(PRELOAD_HEADERS ../../include/client/syscalls/syscall.hpp ../../include/client/syscalls/detail/syscall_info.h ../../include/common/cmake_configure.hpp - ../../include/common/global_defs.hpp + ../../include/common/common_defs.hpp ../../include/common/path_util.hpp ../../include/common/rpc/rpc_types.hpp ../../include/common/rpc/rpc_util.hpp diff --git a/src/client/preload.cpp b/src/client/preload.cpp index d4310ecbc..e5b0eff9d 100644 --- a/src/client/preload.cpp +++ b/src/client/preload.cpp @@ -35,7 +35,7 @@ #include #include -#include +#include #include diff --git a/src/client/preload_util.cpp b/src/client/preload_util.cpp index 2e37d42d6..5ca518038 100644 --- a/src/client/preload_util.cpp +++ b/src/client/preload_util.cpp @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt index 329798324..143555315 100644 --- a/src/daemon/CMakeLists.txt +++ b/src/daemon/CMakeLists.txt @@ -46,8 +46,8 @@ set(DAEMON_HEADERS ../../include/config.hpp ../../include/version.hpp ../../include/common/cmake_configure.hpp - ../../include/common/global_defs.hpp - ../../include/common/rpc/rpc_types.hpp + ../../include/common/common_defs.hpp + ../../include/common/rpc/rpc_types.hpp ../../include/common/rpc/rpc_util.hpp ../../include/common/path_util.hpp ../../include/daemon/daemon.hpp diff --git a/src/daemon/backend/data/CMakeLists.txt b/src/daemon/backend/data/CMakeLists.txt index 1749b82c1..50795377a 100644 --- a/src/daemon/backend/data/CMakeLists.txt +++ b/src/daemon/backend/data/CMakeLists.txt @@ -33,7 +33,7 @@ target_sources(storage ${INCLUDE_DIR}/daemon/backend/data/chunk_storage.hpp PRIVATE ${INCLUDE_DIR}/common/path_util.hpp - ${INCLUDE_DIR}/common/global_defs.hpp + ${INCLUDE_DIR}/common/common_defs.hpp ${INCLUDE_DIR}/daemon/backend/data/data_module.hpp ${INCLUDE_DIR}/daemon/backend/data/file_handle.hpp ${CMAKE_CURRENT_LIST_DIR}/chunk_storage.cpp -- GitLab