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

send server_id instead of full context

parent bffc01fe

src/common/net/proto/rpc_types.h

+2 −3
Original line number Diff line number Diff line
@@ -349,14 +349,13 @@ MERCURY_GEN_PROC( 
MERCURY_GEN_PROC(

    ADM_update_adhoc_storage_in_t,

        ((ADM_adhoc_context_t)(adhoc_storage_ctx))

        ((ADM_storage_t)(adhoc_storage))

        ((hg_uint64_t)(server_id))

);



MERCURY_GEN_PROC(

    ADM_update_adhoc_storage_out_t,

        ((hg_uint64_t) (op_id))

        ((int32_t) (retval))

        ((uint64_t)(server_id))

        ((hg_int32_t) (retval))

);



/// ADM_remove_adhoc_storage

src/lib/detail/impl.cpp

+1 −2
Original line number Diff line number Diff line
@@ -424,9 +424,8 @@ update_adhoc_storage(const server& srv, 
                adhoc_storage_ctx);



    const auto rpc_ctx = api::convert(adhoc_storage_ctx);

    const auto rpc_adhoc_storage = api::convert(adhoc_storage);



    ADM_update_adhoc_storage_in_t in{rpc_ctx.get(), rpc_adhoc_storage.get()};

    ADM_update_adhoc_storage_in_t in{rpc_ctx.get(), adhoc_storage.id()};

    ADM_update_adhoc_storage_out_t out;



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

src/scord/rpc_handlers.cpp

+4 −3
Original line number Diff line number Diff line
@@ -337,12 +337,13 @@ ADM_update_adhoc_storage(hg_handle_t h) { 
    assert(ret == HG_SUCCESS);



    const admire::adhoc_storage::ctx adhoc_storage_ctx(in.adhoc_storage_ctx);

    const std::uint64_t server_id(in.server_id);



    const auto rpc_id = remote_procedure::new_id();

    LOGGER_INFO("rpc id: {} name: {} from: {} => "

                "body: {{adhoc_storage_id: {}}}",

                rpc_id, std::quoted(__FUNCTION__), std::quoted(get_address(h)),

                in.adhoc_storage->s_id);

                server_id);



    admire::error_code ec;
@@ -350,9 +351,9 @@ ADM_update_adhoc_storage(hg_handle_t h) { 
    out.retval = ec;



    LOGGER_INFO("rpc id: {} name: {} to: {} => "

                "body: {{retval: {}, server_id: {}}}",

                "body: {{retval: {}}}",

                rpc_id, std::quoted(__FUNCTION__), std::quoted(get_address(h)),

                ec, out.server_id);

                ec);



    ret = margo_respond(h, &out);

    assert(ret == HG_SUCCESS);