Commit 0ba03e5f authored by Marc Vef's avatar Marc Vef
Browse files

Merge branch 'jathenst/129-add-gkfs_-prefix-to-cmake-options' into 'master' 

Resolve "Add GKFS_ prefix to CMake options"

Closes #129

Closes #129

See merge request !173
parents 91d69338 e9a691e3

.gitignore

+4 −0
Original line number Diff line number Diff line
@@ -66,6 +66,10 @@ 
*.idea/

.run/



# clangd

.clangd

.cache



# OS generated files

.DS_Store

.DS_Store?

CHANGELOG.md

+1 −1
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). 
- Paths inside kernel pseudo filesystems (`/sys`, `/proc`) are forwarded directly to the kernel and internal path

  resolution will be skipped. Be aware that also paths like  `/sys/../tmp/gkfs_mountpoint/asd` will be forwarded to the

  kernel

- Added new Cmake flag `CREATE_CHECK_PARENTS` to controls if the existance of the parent node needs to be checked during

- Added new Cmake flag `GKFS_CREATE_CHECK_PARENTS` to controls if the existance of the parent node needs to be checked during

  the creation of a child node.



### Changed

CMake/gkfs-options.cmake

+5 −11
Original line number Diff line number Diff line
@@ -235,16 +235,14 @@ cmake_dependent_option(GKFS_INSTALL_TESTS "Install GekkoFS self tests" OFF "GKFS 
################################################################################



## check before create

# FIXME: should be prefixed with GKFS_

gkfs_define_option(

  CREATE_CHECK_PARENTS

  GKFS_CREATE_CHECK_PARENTS

  HELP_TEXT "Enable checking parent directory for existence before creating children"

  DEFAULT_VALUE ON

  DESCRIPTION "Verify that a parent directory exists before creating new files or directories"

)



## symbolic link support

# FIXME: should be prefixed with GKFS_

gkfs_define_option(

  GKFS_SYMLINK_SUPPORT

  HELP_TEXT "Enable support for symlinks"
@@ -266,13 +264,11 @@ gkfs_define_option( 
################################################################################



## Maximum number of internal file descriptors reserved for GekkoFS

# FIXME: should be prefixed with GKFS_

gkfs_define_variable(MAX_INTERNAL_FDS 256

gkfs_define_variable(GKFS_MAX_INTERNAL_FDS 256

  STRING "Number of file descriptors reserved for internal use" ADVANCED

)



## Maximum number of open file descriptors for GekkoFS

# FIXME: should be prefixed with GKFS_

execute_process(COMMAND getconf OPEN_MAX

  OUTPUT_VARIABLE _GETCONF_MAX_FDS

  OUTPUT_STRIP_TRAILING_WHITESPACE
@@ -282,7 +278,7 @@ if (NOT _GETCONF_MAX_FDS) 
endif ()



gkfs_define_variable(

  MAX_OPEN_FDS

  GKFS_MAX_OPEN_FDS

  ${_GETCONF_MAX_FDS}

  STRING

  "Maximum number of open file descriptors supported"
@@ -326,15 +322,13 @@ gkfs_define_option( 
################################################################################



## Client logging support

# FIXME: should be prefixed with GKFS_

gkfs_define_option(

  ENABLE_CLIENT_LOG HELP_TEXT "Enable logging messages in clients"

  GKFS_ENABLE_CLIENT_LOG HELP_TEXT "Enable logging messages in clients"

  DEFAULT_VALUE ON

)



# FIXME: should be prefixed with GKFS_

gkfs_define_variable(

  CLIENT_LOG_MESSAGE_SIZE

  GKFS_CLIENT_LOG_MESSAGE_SIZE

  1024

  STRING

  "Maximum size of a log message in the client library"

CMakeLists.txt

+8 −8
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ include(gkfs-utils) 
################################################################################

include(gkfs-options)



set(CMAKE_EXPORT_COMPILE_COMMANDS 0)

set(CMAKE_EXPORT_COMPILE_COMMANDS 1)





# ##############################################################################
@@ -266,17 +266,17 @@ if (GKFS_RENAME_SUPPORT) 
    add_definitions(-DHAS_RENAME)

endif ()



if(MAX_INTERNAL_FDS)

    add_definitions(-DMAX_INTERNAL_FDS=${MAX_INTERNAL_FDS})

if(GKFS_MAX_INTERNAL_FDS)

    add_definitions(-DGKFS_MAX_INTERNAL_FDS=${GKFS_MAX_INTERNAL_FDS})

endif()



if(MAX_OPEN_FDS)

    add_definitions(-DMAX_OPEN_FDS=${MAX_OPEN_FDS})

if(GKFS_MAX_OPEN_FDS)

    add_definitions(-DGKFS_MAX_OPEN_FDS=${GKFS_MAX_OPEN_FDS})

endif()



if(ENABLE_CLIENT_LOG)

if(GKFS_ENABLE_CLIENT_LOG)

    add_definitions(-DGKFS_ENABLE_LOGGING)

    add_definitions(-DLIBGKFS_LOG_MESSAGE_SIZE=${CLIENT_LOG_MESSAGE_SIZE})

    add_definitions(-DLIBGKFS_LOG_MESSAGE_SIZE=${GKFS_CLIENT_LOG_MESSAGE_SIZE})

endif ()



if(GKFS_ENABLE_UNUSED_FUNCTIONS)
@@ -289,7 +289,7 @@ endif () 


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



if(ENABLE_CLIENT_LOG)

if(GKFS_ENABLE_CLIENT_LOG)

    option(HERMES_LOGGING "" ON)

    option(HERMES_LOGGING_FMT_USE_BUNDLED "" OFF)

    option(HERMES_LOGGING_FMT_HEADER_ONLY "" OFF)

CMakePresets.json

+4 −4
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
        "GKFS_ENABLE_PARALLAX": false,

        "GKFS_BUILD_TESTS": false,

        "GKFS_INSTALL_TESTS": false,

        "ENABLE_CLIENT_LOG": true,

        "CLIENT_LOG_MESSAGE_SIZE": "1024",

        "GKFS_ENABLE_CLIENT_LOG": true,

        "GKFS_CLIENT_LOG_MESSAGE_SIZE": "1024",

        "GKFS_SYMLINK_SUPPORT": false

      },

      "warnings": {
@@ -85,8 +85,8 @@ 
        "GKFS_CHUNK_STATS": true,

        "GKFS_ENABLE_PROMETHEUS": true,

        "GKFS_RENAME_SUPPORT": true,

        "MAX_OPEN_FDS": "10000",

        "MAX_INTERNAL_FDS": "1024"

        "GKFS_MAX_OPEN_FDS": "10000",

        "GKFS_MAX_INTERNAL_FDS": "1024"

      }

    },

    {