Commit 2c1fdd05 authored by Ramon Nou's avatar Ramon Nou
Browse files

Added common, rebased with error code

parent b73f0ac1

examples/cxx/ADM_deploy_adhoc_storage.cpp

+7 −7
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 


#include <fmt/format.h>

#include <admire.hpp>



#include "common.hpp"



int

main(int argc, char* argv[]) {
@@ -37,19 +37,19 @@ main(int argc, char* argv[]) { 
    }



    admire::server server{"tcp", argv[1]};

    std::vector<admire::node> nodes{admire::node{"node1"},admire::node{"node2"}};



    std::vector<admire::node> nodes = prepare_nodes(10);

    admire::adhoc_storage::resources res(nodes);



    admire::adhoc_storage adhoc_storage(

            admire::storage::type::dataclay, "foobar", 1,

            admire::adhoc_storage::execution_mode::separate_new,

        admire::adhoc_storage::access_type::read_write, 

        res, 100, false);

            admire::adhoc_storage::access_type::read_write, res, 100, false);



    ADM_return_t ret = ADM_SUCCESS;



    try {

        ret = admire::deploy_adhoc_storage(server, adhoc_storage);

        admire::deploy_adhoc_storage(server, adhoc_storage);

    } catch(const std::exception& e) {

        fmt::print(stderr, "FATAL: ADM_deploy_adhoc_storage() failed: {}\n",

                   e.what());

src/lib/admire.cpp

+9 −2
Original line number Diff line number Diff line
@@ -283,9 +283,16 @@ remove_adhoc_storage(const server& srv, const adhoc_storage& adhoc_storage) { 
    }

}



ADM_return_t

void

deploy_adhoc_storage(const server& srv, const admire::adhoc_storage& adhoc_storage) {

    return detail::deploy_adhoc_storage(srv, adhoc_storage);

   

    const auto ec = detail::deploy_adhoc_storage(srv, adhoc_storage);



    if(!ec) {

        throw std::runtime_error(fmt::format(

                "ADM_deploy_adhoc_storage() error: {}", ec.message()));

    }

  

}



ADM_return_t

src/lib/admire.hpp

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ update_adhoc_storage(const server& srv, const adhoc_storage& adhoc_storage, 
void

remove_adhoc_storage(const server& srv, const adhoc_storage& adhoc_storage);



ADM_return_t

void

deploy_adhoc_storage(const server& srv, const adhoc_storage& reqs);



ADM_return_t

src/lib/c_wrapper.cpp

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ ADM_deploy_adhoc_storage(ADM_server_t server, ADM_storage_t adhoc_storage) { 
            adhoc_storage->s_name,

            adhoc_storage->s_id, adhoc_storage->s_adhoc_ctx};



    return admire::deploy_adhoc_storage(srv, storage);

    return admire::detail::deploy_adhoc_storage(srv, storage);

}



ADM_return_t