Verified Commit a282f2a5 authored by Marc Vef's avatar Marc Vef
Browse files

Added lstat(). The ior benchmark is now supported in POSIX mode.

parent 9ffcaaa0

ifs/CMake/FindAbtIO.cmake→ifs/CMake/FindAbt-IO.cmake

+44 −0
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ find_path(ABT_IO_INCLUDE_DIR abt-io.h 
    HINTS

    ${ABT_IO_DIR}

    ${ADAFS_DEPS_INSTALL}

        $ENV{HOME}/opt

    /usr

    /usr/local

    /usr/local/adafs
@@ -23,7 +22,6 @@ find_library(ABT_IO_LIBRARY abt-io 
    HINTS

    ${ABT_IO_DIR}

    ${ADAFS_DEPS_INSTALL}

        $ENV{HOME}/opt

    /usr

    /usr/local

    /usr/local/adafs

ifs/CMakeLists.txt

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ find_package(Mercury REQUIRED) 
find_package(MercuryUtil REQUIRED)

find_package(Abt REQUIRED)

find_package(Abt-Snoozer REQUIRED)

find_package(Abt-IO REQUIRED)

find_package(Margo REQUIRED)



option(USE_OFI_VERBS "Use libfabric plugin with verbs." OFF)

ifs/include/daemon/adafs_daemon.hpp

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ 
// margo

extern "C" {

#include <abt.h>

#include <abt-snoozer.h>

#include <abt-io.h>

#include <mercury.h>

#include <margo.h>

}

ifs/include/daemon/adafs_ops/data.hpp

+11 −2
Original line number Diff line number Diff line
@@ -4,6 +4,16 @@ 


#include <daemon/adafs_daemon.hpp>



struct write_chunk_args {

    const std::string* path;

    const char* buf;

    const rpc_chnk_id_t* chnk_id;

    size_t size;

    off64_t off;

    abt_io_instance_id aid;

    ABT_eventual* eventual;

};



std::string path_to_fspath(const std::string& path);



int init_chunk_space(const std::string& path);
@@ -12,8 +22,7 @@ int destroy_chunk_space(const std::string& path); 


int read_file(const std::string& path, rpc_chnk_id_t chnk_id, size_t size, off_t off, char* buf, size_t& read_size);



int write_file(const std::string& path, const char* buf, rpc_chnk_id_t chnk_id, size_t size, off_t off,

               size_t& write_size);

void write_file_abt(void* _arg);



int write_chunks(const std::string& path, const std::vector<void*>& buf_ptrs, const std::vector<hg_size_t>& buf_sizes,

                 off_t offset, size_t& write_size);

ifs/include/global/configure.hpp

+3 −2
Original line number Diff line number Diff line
@@ -12,8 +12,9 @@ 


// If ACM time should be considered

#define ACMtime //unused

#define BLOCKSIZE 4 // in kilobytes

#define CHUNKSIZE 400 // in bytes

// XXX Should blocksize and chunksize be merged?

#define BLOCKSIZE 524288 // in bytes 512KB

#define CHUNKSIZE 524288 // in bytes 512KB



// What metadata is used TODO this has to be parametrized or put into a configuration file

#define MDATA_USE_ATIME false