Resolve "Add lseek tests"

Ramon Nourequested to merge
105-add-lseek-tests into master

Closes #105 (closed)

Edited by Ramon Nou

Merge request reports

include/client/rpc/rpc_types.hpp

+1 −1
Changes for include/client/rpc/rpc_types.hpp: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -1012,7 +1012,7 @@ struct get_metadentry_size { 


    // Mercury callback to serialize output arguments

    constexpr static const auto mercury_out_proc_cb =

            HG_GEN_PROC_NAME(rpc_err_out_t);

            HG_GEN_PROC_NAME(rpc_get_metadentry_size_out_t);



    class input {

src/client/gkfs_functions.cpp

+6 −0
Changes for src/client/gkfs_functions.cpp: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -319,10 +319,16 @@ off_t gkfs_lseek(shared_ptr<gkfs::filemap::OpenFile> gkfs_fd, off_t offset, unsi 
        case SEEK_END: {

            off64_t file_size;

            auto err = gkfs::rpc::forward_get_metadentry_size(gkfs_fd->path(), file_size);

          

            if (err < 0) {

                errno = err; // Negative numbers are explicitly for error codes

                return -1;

            }

            

            if (offset < 0 and file_size < -offset) {

                errno = EINVAL;

                return -1;

            }

            gkfs_fd->pos(file_size + offset);

            break;

        }

tests/integration/harness/gkfs.io/commands.hpp

+3 −0
Changes for tests/integration/harness/gkfs.io/commands.hpp: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -62,4 +62,7 @@ pwritev_init(CLI::App& app); 
void

statx_init(CLI::App& app);



void

lseek_init(CLI::App& app);



#endif // IO_COMMANDS_HPP

tests/integration/harness/gkfs.io/lseek.cpp

0 → 100644
+148 −0
Changes for tests/integration/harness/gkfs.io/lseek.cpp: 148 added lines, 0 removed lines.
Original line number Diff line number Diff line 
/*

  Copyright 2018-2020, Barcelona Supercomputing Center (BSC), Spain

  Copyright 2015-2020, Johannes Gutenberg Universitaet Mainz, Germany



  This software was partially supported by the

  EC H2020 funded project NEXTGenIO (Project ID: 671951, www.nextgenio.eu).



  This software was partially supported by the

  ADA-FS project under the SPPEXA project funded by the DFG.



  SPDX-License-Identifier: MIT

*/



/* C++ includes */

#include <CLI/CLI.hpp>

#include <nlohmann/json.hpp>

#include <memory>

#include <fmt/format.h>

#include <commands.hpp>

#include <reflection.hpp>

#include <serialize.hpp>

#include <binary_buffer.hpp>



/* C includes */

#include <sys/types.h>

#include <sys/stat.h>

#include <fcntl.h>

#include <unistd.h>



using json = nlohmann::json;



struct lseek_options {

    bool verbose;

    std::string pathname;

    ::off_t offset;

    int whence;



    REFL_DECL_STRUCT(lseek_options,

        REFL_DECL_MEMBER(bool, verbose),

        REFL_DECL_MEMBER(std::string, pathname),

        REFL_DECL_MEMBER(::off_t, offset),

        REFL_DECL_MEMBER(int, whence)

    );

};



struct lseek_output {

    ::off_t retval;

    int errnum;



    REFL_DECL_STRUCT(lseek_output,

        REFL_DECL_MEMBER(::off_t, retval),

        REFL_DECL_MEMBER(int, errnum)

    );

};



void

to_json(json& record, 

        const lseek_output& out) {

    record = serialize(out);

}



std::string 

whence2str(int whence) {

    switch (whence) {

       case SEEK_SET : return "SEEK_SET";

       case SEEK_CUR : return "SEEK_CUR";

       case SEEK_END : return "SEEK_END";

       default : return "UNKNOWN";

   }

    return "UNKNOWN";

}



void 

lseek_exec(const lseek_options& opts) {



    int fd = ::open(opts.pathname.c_str(), O_RDONLY);



    if(fd == -1) {

        if(opts.verbose) {

            fmt::print("open(pathname=\"{}\") = {}, errno: {} [{}]\n", 

                    opts.pathname, fd, errno, ::strerror(errno));

            return;

        }



        json out = lseek_output{fd, errno};

        fmt::print("{}\n", out.dump(2));



        return;

    }



    int rv = ::lseek(fd, opts.offset, opts.whence);



    if(opts.verbose) {

        fmt::print("lseek(pathname=\"{}\", offset='{}', whence='{}') = {}, errno: {} [{}]\n", 

                   opts.pathname, opts.offset, whence2str(opts.whence), rv, errno, ::strerror(errno));

        return;

    }



    json out = lseek_output{rv, errno};

    fmt::print("{}\n", out.dump(2));

}



void

lseek_init(CLI::App& app) {



    // Create the option and subcommand objects

    auto opts = std::make_shared<lseek_options>();

    auto* cmd = app.add_subcommand(

            "lseek", 

            "Execute the lseek() system call");



    // Add options to cmd, binding them to opts

    cmd->add_flag(

            "-v,--verbose",

            opts->verbose,

            "Produce human writeable output"

        );



    cmd->add_option(

            "pathname", 

            opts->pathname,

            "Directory name"

        )

        ->required()

        ->type_name("");



    cmd->add_option(

            "offset", 

            opts->offset,

            "offset used"

        )

        ->required()

        ->type_name("");



    cmd->add_option(

            "whence", 

            opts->whence,

            "Whence the action is done"

        )

        ->required()

        ->type_name("");



    cmd->callback([opts]() { 

        lseek_exec(*opts); 

    });

}

tests/integration/harness/gkfs.io/main.cpp

+1 −0
Changes for tests/integration/harness/gkfs.io/main.cpp: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ init_commands(CLI::App& app) { 
    writev_init(app);

    pwritev_init(app);

    statx_init(app);

    lseek_init(app);

}