Commit d771e7c0 authored by Marc Vef's avatar Marc Vef
Browse files

ifs: unlink implemented

parent 2c428718

ifs/configure.hpp

+3 −3
Original line number Diff line number Diff line
@@ -17,11 +17,11 @@ 
#define LOG_PRELOAD_PATH "/tmp/adafs_preload.log"



// If ACM time should be considered

#define ACMtime

#define ACMtime //unused

#define BLOCKSIZE 4 // in kilobytes



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

//#define CHECK_ACCESS

//#define CHECK_ACCESS //unused



// Write-ahead logging of rocksdb

//#define RDB_WOL
@@ -32,7 +32,7 @@ 
#define RPC_PROTOCOL "bmi+tcp"



// Debug configurations

//#define RPC_TEST

//#define RPC_TEST //unused



// Using Margo for IPC or raw sockets

#define MARGOIPC

ifs/include/preload/ipc_types.hpp

+2 −6
Original line number Diff line number Diff line
@@ -7,13 +7,9 @@ 


#include <preload/preload.hpp>



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

MERCURY_GEN_PROC(ipc_err_out_t, ((hg_int32_t) (err))) // 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_config_in_t, ((int32_t) (dummy))) // XXX remove that.

MERCURY_GEN_PROC(ipc_config_in_t, ((hg_int32_t) (dummy))) // XXX remove that.



MERCURY_GEN_PROC(ipc_config_out_t, ((hg_const_string_t) (mountdir))

        ((hg_const_string_t) (rootdir)) \

ifs/include/preload/preload.hpp

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ extern FILE* debug_fd; 
            do { if (LOG_PRELOAD_TRACE) fprintf(fd, "[" __DATE__ ":" __TIME__ "] [trace] " fmt); fflush(fd); } while (0)

#define LD_LOG_ERROR0(fd, fmt) \

            do { fprintf(fd, "[" __DATE__ ":" __TIME__ "] [err]" fmt); fflush(fd); } while (0)



#define EUNKNOWN -1



bool init_ld_argobots();

ifs/include/rpc/rpc_types.hpp

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ MERCURY_GEN_PROC(rpc_minimal_in_t, ((int32_t) (input))) 


MERCURY_GEN_PROC(rpc_minimal_out_t, ((int32_t) (output)))

// misc generic rpc types

MERCURY_GEN_PROC(rpc_res_out_t, ((hg_bool_t) (res)))

MERCURY_GEN_PROC(rpc_err_out_t, ((hg_int32_t) (err)))



// Metadentry

MERCURY_GEN_PROC(rpc_create_node_in_t,

ifs/src/adafs_ops/metadentry.cpp

+2 −1
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ int remove_metadentry(const string& path) { 
int remove_node(const string& path) {

    auto err = remove_metadentry(path);

    if (err == 0)

        destroy_chunk_space(path);

        destroy_chunk_space(

                path); // XXX This removes only the data on that node. Leaving everything in inconsistent state

    return err;

}
 
 No newline at end of file