Commit 52c3aec3 authored by Tunahan Kaya's avatar Tunahan Kaya
Browse files

solved merge conflicts from rebasing

parents 7d334e9a 60bae8e1

src/daemon/daemon.cpp

+2 −1
Original line number Diff line number Diff line
@@ -179,6 +179,7 @@ void init_environment() { 
        throw;

    }

#endif



    // Initialize data backend

    std::string chunk_storage_path = GKFS_DATA->rootdir() + "/data/chunks"s;

    GKFS_DATA->spdlogger()->debug("{}() Initializing storage backend: '{}'", __func__, chunk_storage_path);
@@ -360,6 +361,7 @@ void parse_input(const po::variables_map& vm) { 
    GKFS_DATA->spdlogger()->debug("{}() Shared memory (auto_sm) for intra-node communication (IPCs) set to '{}'.",

                                  __func__, use_auto_sm);





    string addr{};

    if (vm.count("listen")) {

        addr = vm["listen"].as<string>();
@@ -437,7 +439,6 @@ void parse_input(const po::variables_map& vm) { 
#endif

    }





}



int main(int argc, const char* argv[]) {

src/daemon/handler/srv_data.cpp

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <global/chunk_calc_util.hpp>

#include "leaf/handle_errors.hpp"





#ifdef GKFS_ENABLE_AGIOS

#include <daemon/scheduler/agios.hpp>
@@ -31,6 +32,7 @@ 
#define AGIOS_SERVER_ID_IGNORE 0

#endif





using namespace std;



/*