Commit d441ffa2 authored by Julius Athenstaedt's avatar Julius Athenstaedt
Browse files

GKFS_ Prefix for MAX_INTERNAL_FDS

parent 91d69338

.gitignore

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

.run/



# clangd

.clangd



# OS generated files

.DS_Store

.DS_Store?

CMake/gkfs-options.cmake

+1 −1
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ 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

)

CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -266,8 +266,8 @@ 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)

CMakePresets.json

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ 
        "GKFS_ENABLE_PROMETHEUS": true,

        "GKFS_RENAME_SUPPORT": true,

        "MAX_OPEN_FDS": "10000",

        "MAX_INTERNAL_FDS": "1024"

        "GKFS_MAX_INTERNAL_FDS": "1024"

      }

    },

    {

include/client/preload_context.hpp

+2 −2
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ enum class RelativizeStatus { internal, external, fd_unknown, fd_not_a_dir }; 
 */

class PreloadContext {



    static auto constexpr MIN_INTERNAL_FD = MAX_OPEN_FDS - MAX_INTERNAL_FDS;

    static auto constexpr MIN_INTERNAL_FD = MAX_OPEN_FDS - GKFS_MAX_INTERNAL_FDS;

    static auto constexpr MAX_USER_FDS = MIN_INTERNAL_FD;



private:
@@ -99,7 +99,7 @@ private: 


    bool interception_enabled_;



    std::bitset<MAX_INTERNAL_FDS> internal_fds_;

    std::bitset<GKFS_MAX_INTERNAL_FDS> internal_fds_;

    mutable std::mutex internal_fds_mutex_;

    bool internal_fds_must_relocate_;

    std::bitset<MAX_USER_FDS> protected_fds_;