Verified Commit 04e58352 authored by ANA MANZANO RODRIGUEZ's avatar ANA MANZANO RODRIGUEZ Committed by Alberto Miranda
Browse files

lib files updated

parent 9d032dbb

src/lib/admire.cpp

+4 −0
Original line number Diff line number Diff line
@@ -219,6 +219,7 @@ register_job(const server& srv, const job_requirements& reqs) { 
    }



    return rv.value();

    

}



ADM_return_t
@@ -234,6 +235,9 @@ remove_job(const server& srv, const job& job) { 
admire::adhoc_storage

register_adhoc_storage(const server& srv, const job& job, const std::string& id,

                       const adhoc_storage::ctx& ctx) {

    //return detail::register_adhoc_storage(srv, job, id, ctx);



    



    const auto rv = detail::register_adhoc_storage(srv, job, id, ctx);

src/lib/admire.h

+1 −2
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include <stddef.h>

#include <stdint.h>

#include <stdbool.h>

#include <iostream>

#include "admire_types.h"



#ifdef __cplusplus
@@ -95,7 +94,7 @@ ADM_remove_job(ADM_server_t server, ADM_job_t job); 
 * successfully.

 */

ADM_return_t

ADM_register_adhoc_storage(ADM_server_t server, ADM_job_t job, std::string id,

ADM_register_adhoc_storage(ADM_server_t server, ADM_job_t job, const char* id,

                           ADM_adhoc_context_t ctx,

                           ADM_storage_t* adhoc_storage);

src/lib/c_wrapper.cpp

+6 −2
Original line number Diff line number Diff line
@@ -79,12 +79,16 @@ ADM_remove_job(ADM_server_t server, ADM_job_t job) { 
}



ADM_return_t

ADM_register_adhoc_storage(ADM_server_t server, ADM_job_t job, std::string id,

ADM_register_adhoc_storage(ADM_server_t server, ADM_job_t job, const char* id,

                           ADM_adhoc_context_t ctx,

                           ADM_storage_t* adhoc_storage) { 



    const admire::server srv{server};



    //return admire::detail::register_adhoc_storage(srv, admire::job{job}, id, admire::adhoc_storage::ctx{ctx});



    



    const auto rv =

            admire::detail::register_adhoc_storage(srv, admire::job{job}, id, admire::adhoc_storage::ctx{ctx});

src/lib/detail/impl.cpp

+7 −6
Original line number Diff line number Diff line
@@ -325,17 +325,18 @@ register_adhoc_storage(const server& srv, const job& job, const std::string& id, 
    ADM_register_adhoc_storage_in_t in{rpc_job.get(), rpc_id, rpc_ctx.get()};

    ADM_register_adhoc_storage_out_t out;



    endp.call("ADM_register_adhoc_storage", &in, &out);

    const auto rpc = endp.call("ADM_register_adhoc_storage", &in, &out);



    if(out.retval < 0) {

        const auto retval = static_cast<admire::error_code>(out.retval);

        LOGGER_ERROR("RPC (ADM_{}) <= {{retval: {}}}", __FUNCTION__, retval);

        return retval;

        LOGGER_ERROR("RPC (ADM_{}) <= {}", __FUNCTION__, out.retval);

        return tl::make_unexpected(static_cast<admire::error_code>(out.retval));

    }



    const auto rpc_adhoc_storage = admire::adhoc_storage{admire::storage::type::gekkofs, id, 64, ctx};



    LOGGER_INFO("RPC (ADM_{}) <= {{retval: {}}}", __FUNCTION__, ADM_SUCCESS);

    return ADM_SUCCESS;



    return rpc_adhoc_storage;

}



tl::expected<transfer, error_code>