Verified Commit 053cd9a5 authored by Marc Vef's avatar Marc Vef
Browse files

Code Maintenance: Configurations, definitions, adafs to gkfs 

Restructuring code w.r.t. configurations and definitions:
- #defines have been mostly removed from configurations
- a dedicated config file has been added for configurations with constexpr
- past configure file is now only a cmake wrapper
- wrapping global functions into namespaces

Removed all adafs and ifs occurrences. Now called gkfs
parent 1ec0d0fd

CHANGELOG.md

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 
- Intercept I/O syscalls instead of GlibC function using [syscall intercept library](https://github.com/pmem/syscall_intercept)



## [0.4.0] - 2019-04-18

First GekkoFS pubblic release

First GekkoFS public release



This version provides a client library that uses GLibC I/O function interception.

CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ option(USE_SHM "Use shared memory for intra-node communication" OFF) 
message(STATUS "[gekkofs] Shared-memory communication: ${USE_SHM}")



option(CREATE_CHECK_PARENTS "Check parent directory existance before creating child node" ON)

message(STATUS "Create checks parents: ${CREATE_CHECK_PARENTS}")

message(STATUS "[gekkofs] Create checks parents: ${CREATE_CHECK_PARENTS}")



option(SYMLINK_SUPPORT "Compile with support for symlinks" ON)

if(SYMLINK_SUPPORT)
@@ -146,7 +146,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/configure.hpp.in include/global/configure.hpp)

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



# Imported target

add_library(RocksDB INTERFACE IMPORTED GLOBAL)

include/client/adafs_functions.hpp

deleted100644 → 0
+0 −82
Original line number Diff line number Diff line 
/*

  Copyright 2018-2019, Barcelona Supercomputing Center (BSC), Spain

  Copyright 2015-2019, Johannes Gutenberg Universitaet Mainz, Germany



  This software was partially supported by the

  EC H2020 funded project NEXTGenIO (Project ID: 671951, www.nextgenio.eu).



  This software was partially supported by the

  ADA-FS project under the SPPEXA project funded by the DFG.



  SPDX-License-Identifier: MIT

*/



#ifndef IFS_ADAFS_FUNCTIONS_HPP

#define IFS_ADAFS_FUNCTIONS_HPP



#include <client/open_file_map.hpp>

#include <global/metadata.hpp>



std::shared_ptr<Metadata> adafs_metadata(const std::string& path, bool follow_links = false);



int adafs_open(const std::string& path, mode_t mode, int flags);



int check_parent_dir(const std::string& path);



int adafs_mk_node(const std::string& path, mode_t mode);



int check_parent_dir(const std::string& path);



int adafs_rm_node(const std::string& path);



int adafs_access(const std::string& path, int mask, bool follow_links = true);



int adafs_stat(const std::string& path, struct stat* buf, bool follow_links = true);



int adafs_statvfs(struct statvfs* buf);



int adafs_statfs(struct statfs* buf);



off64_t adafs_lseek(unsigned int fd, off64_t offset, unsigned int whence);



off64_t adafs_lseek(std::shared_ptr<OpenFile> adafs_fd, off64_t offset, unsigned int whence);



int adafs_truncate(const std::string& path, off_t offset);



int adafs_truncate(const std::string& path, off_t old_size, off_t new_size);



int adafs_dup(int oldfd);



int adafs_dup2(int oldfd, int newfd);



#ifdef HAS_SYMLINKS

int adafs_mk_symlink(const std::string& path, const std::string& target_path);

int adafs_readlink(const std::string& path, char *buf, int bufsize);

#endif





ssize_t adafs_pwrite(std::shared_ptr<OpenFile> file,

                     const char * buf, size_t count, off64_t offset);

ssize_t adafs_pwrite_ws(int fd, const void* buf, size_t count, off64_t offset);

ssize_t adafs_write(int fd, const void * buf, size_t count);

ssize_t adafs_pwritev(int fd, const struct iovec *iov, int iovcnt, off_t offset);

ssize_t adafs_writev(int fd, const struct iovec * iov, int iovcnt);



ssize_t adafs_pread(std::shared_ptr<OpenFile> file, char * buf, size_t count, off64_t offset);

ssize_t adafs_pread_ws(int fd, void* buf, size_t count, off64_t offset);

ssize_t adafs_read(int fd, void* buf, size_t count);





int adafs_opendir(const std::string& path);



int getdents(unsigned int fd,

             struct linux_dirent *dirp,

             unsigned int count);



int getdents64(unsigned int fd,

             struct linux_dirent64 *dirp,

             unsigned int count);



int adafs_rmdir(const std::string& path);



#endif //IFS_ADAFS_FUNCTIONS_HPP

include/client/env.hpp

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#ifndef GKFS_CLIENT_ENV

#define GKFS_CLIENT_ENV



#include <global/configure.hpp>

#include <config.hpp>



#define ADD_PREFIX(str) CLIENT_ENV_PREFIX str

include/client/gkfs_functions.hpp

0 → 100644
+89 −0
Original line number Diff line number Diff line 
/*

  Copyright 2018-2019, Barcelona Supercomputing Center (BSC), Spain

  Copyright 2015-2019, Johannes Gutenberg Universitaet Mainz, Germany



  This software was partially supported by the

  EC H2020 funded project NEXTGenIO (Project ID: 671951, www.nextgenio.eu).



  This software was partially supported by the

  ADA-FS project under the SPPEXA project funded by the DFG.



  SPDX-License-Identifier: MIT

*/



#ifndef GEKKOFS_GKFS_FUNCTIONS_HPP

#define GEKKOFS_GKFS_FUNCTIONS_HPP



#include <client/open_file_map.hpp>

#include <global/metadata.hpp>



std::shared_ptr<Metadata> gkfs_metadata(const std::string& path, bool follow_links = false);



int check_parent_dir(const std::string& path);



int gkfs_open(const std::string& path, mode_t mode, int flags);



int gkfs_mk_node(const std::string& path, mode_t mode);



int gkfs_rm_node(const std::string& path);



int gkfs_access(const std::string& path, int mask, bool follow_links = true);



int gkfs_stat(const std::string& path, struct stat* buf, bool follow_links = true);



int gkfs_statvfs(struct statvfs* buf);



int gkfs_statfs(struct statfs* buf);



off64_t gkfs_lseek(unsigned int fd, off64_t offset, unsigned int whence);



off64_t gkfs_lseek(std::shared_ptr<OpenFile> gkfs_fd, off64_t offset, unsigned int whence);



int gkfs_truncate(const std::string& path, off_t offset);



int gkfs_truncate(const std::string& path, off_t old_size, off_t new_size);



int gkfs_dup(int oldfd);



int gkfs_dup2(int oldfd, int newfd);



#ifdef HAS_SYMLINKS



int gkfs_mk_symlink(const std::string& path, const std::string& target_path);



int gkfs_readlink(const std::string& path, char* buf, int bufsize);



#endif





ssize_t gkfs_pwrite(std::shared_ptr<OpenFile> file,

                    const char* buf, size_t count, off64_t offset);



ssize_t gkfs_pwrite_ws(int fd, const void* buf, size_t count, off64_t offset);



ssize_t gkfs_write(int fd, const void* buf, size_t count);



ssize_t gkfs_pwritev(int fd, const struct iovec* iov, int iovcnt, off_t offset);



ssize_t gkfs_writev(int fd, const struct iovec* iov, int iovcnt);



ssize_t gkfs_pread(std::shared_ptr<OpenFile> file, char* buf, size_t count, off64_t offset);



ssize_t gkfs_pread_ws(int fd, void* buf, size_t count, off64_t offset);



ssize_t gkfs_read(int fd, void* buf, size_t count);





int gkfs_opendir(const std::string& path);



int getdents(unsigned int fd,

             struct linux_dirent* dirp,

             unsigned int count);



int getdents64(unsigned int fd,

               struct linux_dirent64* dirp,

               unsigned int count);



int gkfs_rmdir(const std::string& path);



#endif //GEKKOFS_GKFS_FUNCTIONS_HPP