Verified Commit 9d411e8e authored by Marc Vef's avatar Marc Vef
Browse files

Reformat code adhering to clang-format-15

parent aac1cd48

include/common/rpc/rpc_types.hpp

+48 −42
Original line number Diff line number Diff line
@@ -50,7 +50,8 @@ MERCURY_GEN_PROC(rpc_stat_out_t, 


MERCURY_GEN_PROC(rpc_rm_node_in_t, ((hg_const_string_t) (path)))



MERCURY_GEN_PROC(rpc_rm_metadata_out_t,

MERCURY_GEN_PROC(

        rpc_rm_metadata_out_t,

        ((hg_int32_t) (err))((hg_int64_t) (size))((hg_uint32_t) (mode)))



MERCURY_GEN_PROC(rpc_trunc_in_t,
@@ -60,11 +61,12 @@ MERCURY_GEN_PROC( 
        rpc_update_metadentry_in_t,

        ((hg_const_string_t) (path))((uint64_t) (nlink))((hg_uint32_t) (mode))(

                (hg_uint32_t) (uid))((hg_uint32_t) (gid))((hg_int64_t) (size))(

                (hg_int64_t)(blocks))((hg_int64_t)(atime))((hg_int64_t)(mtime))(

                (hg_int64_t)(ctime))((hg_bool_t)(nlink_flag))(

                (hg_bool_t)(mode_flag))((hg_bool_t)(size_flag))(

                (hg_bool_t)(block_flag))((hg_bool_t)(atime_flag))(

                (hg_bool_t)(mtime_flag))((hg_bool_t)(ctime_flag)))

                (hg_int64_t) (blocks))((hg_int64_t) (atime))(

                (hg_int64_t) (mtime))((hg_int64_t) (ctime))(

                (hg_bool_t) (nlink_flag))((hg_bool_t) (mode_flag))(

                (hg_bool_t) (size_flag))((hg_bool_t) (block_flag))(

                (hg_bool_t) (atime_flag))((hg_bool_t) (mtime_flag))(

                (hg_bool_t) (ctime_flag)))



MERCURY_GEN_PROC(rpc_update_metadentry_size_in_t,

                 ((hg_const_string_t) (path))((hg_uint64_t) (size))(
@@ -77,27 +79,29 @@ MERCURY_GEN_PROC(rpc_get_metadentry_size_out_t, 
                 ((hg_int32_t) (err))((hg_int64_t) (ret_size)))



#ifdef HAS_SYMLINKS

MERCURY_GEN_PROC(rpc_mk_symlink_in_t,

                 ((hg_const_string_t)(path))((hg_const_string_t)(target_path)))

MERCURY_GEN_PROC(rpc_mk_symlink_in_t, ((hg_const_string_t) (path))((

                                              hg_const_string_t) (target_path)))



#endif



// data

MERCURY_GEN_PROC(

        rpc_read_data_in_t,

        ((hg_const_string_t)(path))((int64_t)(offset))((hg_uint64_t)(host_id))(

                (hg_uint64_t)(host_size))((hg_uint64_t)(chunk_n))(

                (hg_uint64_t)(chunk_start))((hg_uint64_t)(chunk_end))(

                (hg_uint64_t)(total_chunk_size))((hg_bulk_t)(bulk_handle)))

        ((hg_const_string_t) (path))((int64_t) (offset))(

                (hg_uint64_t) (host_id))((hg_uint64_t) (host_size))(

                (hg_uint64_t) (chunk_n))((hg_uint64_t) (chunk_start))(

                (hg_uint64_t) (chunk_end))((hg_uint64_t) (total_chunk_size))(

                (hg_bulk_t) (bulk_handle)))



MERCURY_GEN_PROC(rpc_data_out_t, ((int32_t) (err))((hg_size_t) (io_size)))



MERCURY_GEN_PROC(

        rpc_write_data_in_t,

        ((hg_const_string_t)(path))((int64_t)(offset))((hg_uint64_t)(host_id))(

                (hg_uint64_t)(host_size))((hg_uint64_t)(chunk_n))(

                (hg_uint64_t)(chunk_start))((hg_uint64_t)(chunk_end))(

                (hg_uint64_t)(total_chunk_size))((hg_bulk_t)(bulk_handle)))

        ((hg_const_string_t) (path))((int64_t) (offset))(

                (hg_uint64_t) (host_id))((hg_uint64_t) (host_size))(

                (hg_uint64_t) (chunk_n))((hg_uint64_t) (chunk_start))(

                (hg_uint64_t) (chunk_end))((hg_uint64_t) (total_chunk_size))(

                (hg_bulk_t) (bulk_handle)))



MERCURY_GEN_PROC(rpc_get_dirents_in_t,

                 ((hg_const_string_t) (path))((hg_bulk_t) (bulk_handle)))
@@ -106,7 +110,8 @@ MERCURY_GEN_PROC(rpc_get_dirents_out_t, 
                 ((hg_int32_t) (err))((hg_size_t) (dirents_size)))





MERCURY_GEN_PROC(rpc_config_out_t,

MERCURY_GEN_PROC(

        rpc_config_out_t,

        ((hg_const_string_t) (mountdir))((hg_const_string_t) (rootdir))(

                (hg_bool_t) (atime_state))((hg_bool_t) (mtime_state))(

                (hg_bool_t) (ctime_state))((hg_bool_t) (link_cnt_state))(
@@ -116,7 +121,8 @@ MERCURY_GEN_PROC(rpc_config_out_t, 


MERCURY_GEN_PROC(rpc_chunk_stat_in_t, ((hg_int32_t) (dummy)))



MERCURY_GEN_PROC(rpc_chunk_stat_out_t,

MERCURY_GEN_PROC(

        rpc_chunk_stat_out_t,

        ((hg_int32_t) (err))((hg_uint64_t) (chunk_size))(

                (hg_uint64_t) (chunk_total))((hg_uint64_t) (chunk_free)))

src/common/path_util.cpp

+2 −1
Original line number Diff line number Diff line
@@ -133,7 +133,8 @@ absolute_to_relative(const string& root_path, const string& absolute_path) { 
    auto rel_it_end = absolute_path.cend();



    // relative path start exactly after the root_path prefix

    assert((size_t)(rel_it_begin - absolute_path.cbegin()) == root_path.size());

    assert((size_t) (rel_it_begin - absolute_path.cbegin()) ==

           root_path.size());



    if(rel_it_begin == rel_it_end) {

        // relative path is empty, @absolute_path was equal to @root_path