Commit 59f07a81 authored by Marc Vef's avatar Marc Vef
Browse files

Merge branch 'ifs_ipc_rpc'

parents 0a9f2ad2 a94b4992

ifs/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 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/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

+3 −0
Original line number Diff line number Diff line
@@ -31,4 +31,7 @@ 
// Debug configurations

//#define RPC_TEST



// Using Margo for IPC or raw sockets

#define MARGOIPC



#endif //FS_CONFIGURE_H

ifs/include/daemon/adafs_daemon.hpp

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ void destroy_argobots(); 
bool init_rpc_server();



void register_server_rpcs();

bool init_rpc_client();



bool init_ipc_client();



void register_client_rpcs();

ifs/include/daemon/fs_operations.hpp

+6 −6
Original line number Diff line number Diff line
@@ -7,17 +7,17 @@ 


#include "../../main.hpp"



int adafs_open(char* path, int flags, mode_t mode);

int adafs_open(std::string& path, int flags, mode_t mode);



FILE* adafs_fopen(char* path, const char* mode);

FILE* adafs_fopen(std::string& path, const char* mode);



int adafs_close(char* path);

int adafs_close(std::string& path);



int adafs_stat(char* path, struct stat* buf);

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



ssize_t adafs_write(char* path, char* buf, size_t size, off_t offset);

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



ssize_t adafs_read(char* path, char* buf, size_t size, off_t offset);

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





#endif //IFS_FS_OPERATIONS_HPP

ifs/include/preload/ipc_types.hpp

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

// Created by evie on 9/12/17.

//



#ifndef IFS_IPC_TYPES_HPP

#define IFS_IPC_TYPES_HPP



extern "C" {

#include <mercury_types.h>

}



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





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

        ((hg_int32_t) (flags)) \

((hg_uint32_t) (mode)))



#endif //IFS_IPC_TYPES_HPP