Commit 9fb74a90 authored by Marc Vef's avatar Marc Vef
Browse files

Merge branch '127-rename-global-directory-to-common' into 'master' 

Resolve "Rename 'global' directory to 'common'"

Closes #127

See merge request !84
parents 8e0a60d2 cf033c94

CMakeLists.txt

+3 −3
Original line number Diff line number Diff line
@@ -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

include/client/gkfs_functions.hpp

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
#define GEKKOFS_GKFS_FUNCTIONS_HPP



#include <client/open_file_map.hpp>

#include <global/metadata.hpp>

#include <common/metadata.hpp>



struct statfs;

struct statvfs;

include/client/preload_util.hpp

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
#define GEKKOFS_PRELOAD_UTIL_HPP



#include <client/preload.hpp>

#include <global/metadata.hpp>

#include <common/metadata.hpp>



#include <string>

#include <iostream>

include/client/rpc/rpc_types.hpp

+2 −2
Original line number Diff line number Diff line
@@ -46,8 +46,8 @@ 
#endif





#include <global/global_defs.hpp>

#include <global/rpc/rpc_types.hpp>

#include <common/common_defs.hpp>

#include <common/rpc/rpc_types.hpp>



namespace hermes {

namespace detail {

include/global/arithmetic/arithmetic.hpp→include/common/arithmetic/arithmetic.hpp

+3 −3
Original line number Diff line number Diff line
@@ -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 <cstdint>

#include <unistd.h>
@@ -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