Skip to content
Snippets Groups Projects
Verified Commit 0a53bb0a authored by ANA MANZANO RODRIGUEZ's avatar ANA MANZANO RODRIGUEZ Committed by Alberto Miranda
Browse files

More rebase changes done

parent 1e3790b1
No related branches found
No related tags found
1 merge request!26Resolve "Refactor library RPC implementation of `admire::register_adhoc_storage`"
......@@ -303,6 +303,8 @@ struct adhoc_storage : public storage {
adhoc_storage(const adhoc_storage& other) noexcept;
/*adhoc_storage(enum storage::type type, std::string id, std::uint64_t server_id,
ADM_adhoc_context_t ctx);
//adhoc_storage(enum storage::type type, std::string id, std::uint64_t server_id,
//ADM_adhoc_context_t ctx);
adhoc_storage(enum storage::type type, std::string id,
const admire::adhoc_storage::ctx& ctx);*/
......@@ -608,7 +610,7 @@ struct fmt::formatter<admire::adhoc_storage> : formatter<std::string_view> {
const auto str =
fmt::format("{{type: {}, id: {}, context: {}}}", s.type(),
std::quoted(s.id()),
std::quoted(std::to_string(s.id())),
(pctx ? fmt::format("{}", *pctx) : "NULL"));
return formatter<std::string_view>::format(str, ctx);
}
......
......@@ -70,10 +70,10 @@ convert(const admire::adhoc_storage& st) {
auto managed_ctx =
convert(*std::static_pointer_cast<admire::adhoc_storage::ctx>(
st.context()));
st.context()));
ADM_storage_t c_st = ADM_storage_create(
st.id().c_str(), static_cast<ADM_storage_type_t>(st.type()),
(std::to_string(st.id())).c_str(), static_cast<ADM_storage_type_t>(st.type()),
managed_ctx.get());
return managed_ctype<ADM_storage_t>{c_st, std::move(managed_ctx)};
......
......@@ -231,7 +231,7 @@ remove_job(const server& srv, const job& job) {
return detail::remove_job(srv, job);
}
ADM_return_t
admire::adhoc_storage
register_adhoc_storage(const server& srv, const job& job, const std::string& id,
const adhoc_storage::ctx& ctx) {
......
......@@ -28,6 +28,7 @@
#include <stddef.h>
#include <stdint.h>
#include <stdbool.h>
#include <iostream>
#include "admire_types.h"
#ifdef __cplusplus
......
......@@ -56,14 +56,9 @@ update_job(const server& srv, const job&, const job_requirements& reqs);
ADM_return_t
remove_job(const server& srv, const job& job);
ADM_return_t
<<<<<<< HEAD
register_adhoc_storage(const server& srv, ADM_adhoc_context_t ctx,
ADM_storage_t* adhoc_storage);
=======
admire::adhoc_storage
register_adhoc_storage(const server& srv, const job& job, const std::string& id,
const adhoc_storage::ctx& ctx);
>>>>>>> 3eee4b5 (Files updated, some errors fixed)
ADM_return_t
update_adhoc_storage(const server& srv, ADM_adhoc_context_t ctx,
......
......@@ -224,14 +224,15 @@ ADM_register_adhoc_storage(hg_handle_t h) {
const admire::adhoc_storage::ctx ctx(in.ctx);
// const admire::job_requirements reqs(&in.reqs);
const auto server_id = remote_procedure::new_id();
LOGGER_INFO("RPC ID {} ({}) <= {{job: {{{}}}}}", server_id, __FUNCTION__, job);
const auto rpc_id = remote_procedure::new_id();
LOGGER_INFO("RPC ID {} ({}) <= {{job: {{{}}}}}", rpc_id, __FUNCTION__, job);
const auto adhoc_storage = admire::adhoc_storage(
admire::adhoc_storage::type::gekkofs, id, ctx); //ctx.get()
uint64_t server_id = adhoc_storage.id();
LOGGER_INFO("RPC ID {} ({}) <= {{server_id: {{{}}}}}", rpc_id, __FUNCTION__, server_id); //new
// admire::adhoc_storage::ctx{admire::adhoc_storage::execution_mode::in_job_shared, admire::adhoc_storage::access_type::write_only, 10, 10, false}
......@@ -240,7 +241,7 @@ ADM_register_adhoc_storage(hg_handle_t h) {
out.retval = rv;
out.adhoc_storage = admire::api::convert(adhoc_storage).get();
LOGGER_INFO("RPC ID {} ({}) => {{retval: {}, adhoc_storage: {{{}}}}}", id,
LOGGER_INFO("RPC ID {} ({}) => {{retval: {}, adhoc_storage: {{{}}}}}", rpc_id,
__FUNCTION__, rv, adhoc_storage);
ret = margo_respond(h, &out);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment