Commit 074eec5c authored by Marc Vef's avatar Marc Vef
Browse files

ifs: open create connection between daemon and library finalized. workz. flags next.

parent 59f07a81

ifs/CMakeLists.txt

+5 −1
Original line number Diff line number Diff line
@@ -49,7 +49,11 @@ set(SOURCE_FILES main.cpp main.hpp configure.hpp util.cpp 
        include/rpc/rpc_defs.hpp include/rpc/rpc_types.hpp





        src/daemon/fs_operations.cpp src/daemon/fs_operations.cpp include/daemon/fs_operations.hpp src/adafs_ops/metadentry.cpp include/adafs_ops/metadentry.hpp src/db/db_ops.cpp src/db/db_ops.cpp include/db/db_ops.hpp src/rpc/handler/h_metadentry.cpp src/rpc/sender/c_metadentry.cpp include/rpc/sender/c_metadentry.hpp src/adafs_ops/data.cpp include/adafs_ops/data.hpp src/rpc/handler/h_data.cpp src/rpc/sender/c_data.cpp include/rpc/sender/c_data.hpp src/rpc/handler/h_preload.cpp)

        src/daemon/fs_operations.cpp src/daemon/fs_operations.cpp include/daemon/fs_operations.hpp src/adafs_ops/metadentry.cpp

        include/adafs_ops/metadentry.hpp src/db/db_ops.cpp src/db/db_ops.cpp include/db/db_ops.hpp

        src/rpc/handler/h_metadentry.cpp src/rpc/sender/c_metadentry.cpp include/rpc/sender/c_metadentry.hpp

        src/adafs_ops/data.cpp include/adafs_ops/data.hpp src/rpc/handler/h_data.cpp src/rpc/sender/c_data.cpp

        include/rpc/sender/c_data.hpp src/rpc/handler/h_preload.cpp)

add_executable(adafs_daemon ${SOURCE_FILES})

target_link_libraries(adafs_daemon ${ROCKSDB_LIBRARIES}

        # rocksdb libs

ifs/configure.hpp

+2 −2
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ 
#define FS_CONFIGURE_H



// To enabled logging with info level

#define LOG_INFO

//#define LOG_DEBUG

//#define LOG_INFO

#define LOG_DEBUG

//#define LOG_TRACE

#define LOG_PATH "/tmp/adafs.log"

ifs/include/daemon/adafs_daemon.hpp

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ bool init_rpc_server(); 


void register_server_rpcs();



bool init_ipc_client();

bool init_rpc_client();



void register_client_rpcs();

ifs/include/preload/ipc_types.hpp

+6 −4
Original line number Diff line number Diff line
@@ -5,14 +5,16 @@ 
#ifndef IFS_IPC_TYPES_HPP

#define IFS_IPC_TYPES_HPP



extern "C" {

#include <mercury_types.h>

}



#include <preload/preload.hpp>



MERCURY_GEN_PROC(ipc_res_out_t, ((hg_bool_t) (res))) // generic return type



MERCURY_GEN_PROC(rpc_minimal_in_tt, ((int32_t) (input)))



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



MERCURY_GEN_PROC(ipc_open_in_t, ((hg_string_t) (path))

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

        ((hg_int32_t) (flags)) \

((hg_uint32_t) (mode)))

ifs/include/preload/margo_ipc.hpp

0 → 100644
+15 −0
Original line number Diff line number Diff line 
//

// Created by aelycia on 9/13/17.

//



#ifndef IFS_MARGO_IPC_HPP

#define IFS_MARGO_IPC_HPP



#include <preload/preload.hpp>

#include <preload/ipc_types.hpp>



void send_minimal_rpc(const hg_id_t minimal_id);



int ipc_send_open(const char* path, int flags, const mode_t mode, const hg_id_t ipc_open_id);



#endif //IFS_MARGO_IPC_HPP