Commit 1445f9f5 authored by Marc Vef's avatar Marc Vef
Browse files

ifs: configuration pull from daemon to lib. stat rpc/ipc done

parent 515c73d4

ifs/configure.hpp

+2 −3
Original line number Diff line number Diff line
@@ -5,8 +5,6 @@ 
#ifndef FS_CONFIGURE_H

#define FS_CONFIGURE_H



#define ADAFS_MOUNTDIR "/tmp/mountdir"



// To enabled logging with info level

//#define LOG_INFO

#define LOG_DEBUG
@@ -19,6 +17,7 @@ 


// If ACM time should be considered

#define ACMtime

#define BLOCKSIZE 4 // in kilobytes



// If access permissions should be checked while opening a file

//#define CHECK_ACCESS
@@ -28,7 +27,7 @@ 


// RPC configuration

#define RPCPORT 4433

#define RPC_TIMEOUT 15000

#define RPC_TIMEOUT 150000



// Debug configurations

//#define RPC_TEST

ifs/include/adafs_ops/metadentry.hpp

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ int create_metadentry(const std::string& path, mode_t mode); 


int db_val_to_stat(const std::string& path, std::string db_val, struct stat& attr);



int get_attr(const std::string& path, struct stat* attr);

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



int remove_metadentry(const std::string& path);

ifs/include/classes/fs_data.hpp

+5 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ private: 


    // paths

    std::string rootdir_;

    std::string mountdir_;

    std::string inode_path_;

    std::string dentry_path_;

    std::string chunk_path_;
@@ -108,6 +109,10 @@ public: 


    void rootdir(const std::string& rootdir_);



    const std::string& mountdir() const;



    void mountdir(const std::string& mountdir);



    const std::string& inode_path() const;



    void inode_path(const std::string& inode_path_);

ifs/include/daemon/fs_operations.hpp

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ int adafs_unlink(std::string& path); 


int adafs_close(std::string& path);



int adafs_stat(std::string& path, struct stat* buf);

std::string adafs_stat(std::string& path);



ssize_t adafs_write(std::string& path, char* buf, size_t size, off_t offset);

ifs/include/preload/ipc_types.hpp

+21 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
#ifndef IFS_IPC_TYPES_HPP

#define IFS_IPC_TYPES_HPP





#include <preload/preload.hpp>



MERCURY_GEN_PROC(ipc_res_out_t, ((hg_bool_t) (res))) // generic return type
@@ -14,10 +13,31 @@ MERCURY_GEN_PROC(rpc_minimal_in_tt, ((int32_t) (input))) 


MERCURY_GEN_PROC(rpc_minimal_out_tt, ((int32_t) (output)))



MERCURY_GEN_PROC(ipc_config_in_t, ((int32_t) (dummy)))



MERCURY_GEN_PROC(ipc_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) (uid_state)) \

((hg_bool_t) (gid_state)) \

((hg_bool_t) (inode_no_state)) \

((hg_bool_t) (link_cnt_state)) \

((hg_bool_t) (blocks_state)) \

((hg_uint32_t) (uid)) \

((hg_uint32_t) (gid)))





MERCURY_GEN_PROC(ipc_open_in_t, ((hg_const_string_t) (path))

        ((hg_int32_t) (flags)) \

((hg_uint32_t) (mode)))



MERCURY_GEN_PROC(ipc_stat_in_t, ((hg_const_string_t) (path)))



MERCURY_GEN_PROC(ipc_stat_out_t, ((hg_bool_t) (res))

        ((hg_const_string_t) (db_val)))



MERCURY_GEN_PROC(ipc_unlink_in_t, ((hg_const_string_t) (path)))



#endif //IFS_IPC_TYPES_HPP