Commit 2974fd23 authored by Ramon Nou's avatar Ramon Nou
Browse files

Merge branch 'rnou/356-update-fmt-spdlog' into 'master' 

Resolve "update fmt, spdlog"

Closes #356

Closes #356

See merge request !249
parents 0cc7ae35 5fb1ed2f

CHANGELOG.md

+2 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). 
  - Update CLI11 in modules ([!232](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/232)).

  - Faster initialization relaying on host_files information instead of server RPC ([!242](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/242))

  - Directories shows . and .. to support scandir ([!248](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/248))

  - updated fmt, spdlog and pytest versions ([!249](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/249))



### Fixed

  - Dup3 is supported if O_CLOEXEC is not used (i.e. hexdump) ([!228](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/228))

CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ include_from_source(fmt 
    MESSAGE "[${PROJECT_NAME}] Searching for {fmt}"

    SOURCE_DIR ${GKFS_DEPENDENCIES_PATH}/fmt

    GIT_REPOSITORY https://github.com/fmtlib/fmt

    GIT_TAG e69e5f977d458f2650bb346dadf2ad30c5320281 # v10.1.0

    GIT_TAG 40626af88bd7df9a5fb80be7b25ac85b122d6c21 # v11.2.0

)



# ensure that fmt is linked as PIC
@@ -240,7 +240,7 @@ include_from_source(spdlog 
    MESSAGE "[${PROJECT_NAME}] Searching for spdlog"

    SOURCE_DIR ${GKFS_DEPENDENCIES_PATH}/spdlog

    GIT_REPOSITORY https://github.com/gabime/spdlog.git

    GIT_TAG eb3220622e73a4889eee355ffa37972b3cac3df5 # v1.9.2

    GIT_TAG 6fa36017cfd5731d617e1a934f0e5ea9c4445b13 # v1.15.3

)



### CLI11: used for parsing command-line options

fmt @ 40626af8

Compare e69e5f97 to 40626af8
Original line number Diff line number Diff line 
Subproject commit e69e5f977d458f2650bb346dadf2ad30c5320281
 
Subproject commit 40626af88bd7df9a5fb80be7b25ac85b122d6c21

spdlog @ 6fa36017

Compare eb322062 to 6fa36017
Original line number Diff line number Diff line 
Subproject commit eb3220622e73a4889eee355ffa37972b3cac3df5
 
Subproject commit 6fa36017cfd5731d617e1a934f0e5ea9c4445b13

include/daemon/daemon.hpp

+15 −0
Original line number Diff line number Diff line
@@ -55,6 +55,21 @@ extern "C" { 
#include <margo.h>

}



#include <spdlog/fmt/ostr.h> // Must include before any spdlog headers



// If hg_return is your custom type

namespace fmt {

template <>

struct formatter<hg_return> : formatter<string_view> {

    auto

    format(const hg_return& value, format_context& ctx) const {

        // Implement your formatting logic

        return formatter<string_view>::format(

                fmt::format("hg_return({})", static_cast<int>(value)), ctx);

    }

};

} // namespace fmt



#include <daemon/classes/fs_data.hpp>

#include <daemon/classes/rpc_data.hpp>

#include <common/rpc/distributor.hpp>