Commit 5dfe4b9c authored by Marc Vef's avatar Marc Vef
Browse files

Proxy build and working

parent d3230334

CMakeLists.txt

+1 −2
Original line number Diff line number Diff line
@@ -309,8 +309,7 @@ include_directories( 


add_subdirectory(src)

add_subdirectory(include)

add_subdirectory(src/proxy)

add_subdirectory(marc)

#add_subdirectory(marc)



### Mark any CMake variables imported from {fmt} and spdlog as advanced, so

### that they don't appear in cmake-gui or ccmake. Similarly for FETCHCONTENT

include/CMakeLists.txt

+3 −0
Original line number Diff line number Diff line
@@ -32,8 +32,11 @@ add_subdirectory(common) 
add_subdirectory(daemon)

# Client library

add_subdirectory(client)

# Proxy

add_subdirectory(proxy)



target_sources(gkfs_daemon PUBLIC config.hpp version.hpp.in)

target_sources(gkfs_proxy PUBLIC config.hpp version.hpp.in)



if(GKFS_ENABLE_FORWARDING)

  target_sources(gkfwd_daemon PUBLIC config.hpp version.hpp.in)

include/client/rpc/forward_data_proxy.hpp

+6 −9
Original line number Diff line number Diff line
@@ -16,22 +16,19 @@ 


#include <common/common_defs.hpp>



namespace gkfs {

namespace rpc {

namespace gkfs::rpc {



ssize_t

forward_write_proxy(const std::string& path, const void* buf, bool append_flag,

                    off64_t in_offset, size_t write_size,

                    int64_t updated_metadentry_size);

std::pair<int, ssize_t>

forward_write_proxy(const std::string& path, const void* buf, off64_t offset,

                    size_t write_size);



ssize_t

std::pair<int, ssize_t>

forward_read_proxy(const std::string& path, void* buf, off64_t offset,

                   size_t read_size);



std::pair<int, ChunkStat>

forward_get_chunk_stat_proxy();



} // namespace rpc

} // namespace gkfs

} // namespace gkfs::rpc



#endif // GEKKOFS_FORWARD_DATA_PROXY_HPP

include/client/rpc/rpc_types.hpp

+1 −1
Original line number Diff line number Diff line
@@ -3153,7 +3153,7 @@ struct update_metadentry_size_proxy { 


        explicit output(const rpc_update_metadentry_size_out_t& out) {

            m_err = out.err;

            m_ret_size = out.ret_size;

            m_ret_size = out.ret_offset;

        }



        int32_t

include/common/CMakeLists.txt

+6 −0
Original line number Diff line number Diff line
@@ -31,6 +31,12 @@ target_sources( 
                     rpc/rpc_util.hpp

)



target_sources(gkfs_proxy

    PUBLIC

    common_defs.hpp

    rpc/rpc_types.hpp

    rpc/rpc_util.hpp)



if(GKFS_ENABLE_FORWARDING)

  target_sources(

    gkfwd_daemon PUBLIC cmake_configure.hpp.in common_defs.hpp