Code fixed and building successfully (f47ac5b4) · Commits · eu / ADMIRE / scord

src/common/api/types.cpp

+18 −18

Original line number	Diff line number	Diff line
		@@ -629,7 +629,6 @@ ADM_data_operation_destroy(ADM_data_operation_t op) {
		return ret;
		}


		ADM_adhoc_context_t
		ADM_adhoc_context_create(ADM_adhoc_mode_t exec_mode,
		ADM_adhoc_access_t access_type,
		@@ -1380,22 +1379,6 @@ private:
		adhoc_storage::ctx m_ctx;
		};

		void
		foo(ADM_storage_t storage) { // donde se coloca? como ayuda eso a c_wrapper?
		switch(storage->s_type) {
		case ADM_STORAGE_GEKKOFS:
		case ADM_STORAGE_DATACLAY:
		case ADM_STORAGE_EXPAND:
		case ADM_STORAGE_HERCULES:
		break;

		case ADM_STORAGE_LUSTRE:
		case ADM_STORAGE_GPFS:
		// lanzar excepcion
		break;
		}
		}

		adhoc_storage::adhoc_storage(enum storage::type type, std::string name,
		std::uint64_t id, execution_mode exec_mode,
		access_type access_type,
		@@ -1405,7 +1388,24 @@ adhoc_storage::adhoc_storage(enum storage::type type, std::string name,
		m_pimpl(std::make_unique<impl>(
		adhoc_storage::ctx{exec_mode, access_type, std::move(res),
		walltime, should_flush})) {}
		adhoc_storage::adhoc_storage(ADM_storage_t storage) : m_pimpl(storage) {}

		adhoc_storage::adhoc_storage(ADM_storage_t st)
		: storage(static_cast<enum storage::type>(st->s_type), st->s_name,
		st->s_id) {

		switch(st->s_type) {
		case ADM_STORAGE_LUSTRE:
		case ADM_STORAGE_GPFS:
		throw std::runtime_error(
		fmt::format("Invalid type {} for adhoc_storage",
		static_cast<enum storage::type>(st->s_type)));
		break;

		default:
		break;
		}
		m_pimpl = std::make_unique<impl>(adhoc_storage::ctx{st->s_adhoc_ctx});
		}

		adhoc_storage::adhoc_storage(enum storage::type type, std::string name,
		std::uint64_t id, ADM_adhoc_context_t ctx)

src/common/net/proto/rpc_types.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -349,7 +349,7 @@ MERCURY_GEN_PROC(
		MERCURY_GEN_PROC(
		ADM_update_adhoc_storage_in_t,
		((ADM_adhoc_context_t)(adhoc_storage_ctx))
		((hg_string_t)(adhoc_storage_id))
		((ADM_storage_t)(adhoc_storage))
		);

		MERCURY_GEN_PROC(

src/lib/admire.cpp

+0 −10

Original line number	Diff line number	Diff line
		@@ -252,17 +252,7 @@ ADM_return_t
		update_adhoc_storage(const server& srv,
		const adhoc_storage::ctx& adhoc_storage_ctx,
		const adhoc_storage& adhoc_storage) {

		return detail::update_adhoc_storage(srv, adhoc_storage_ctx, adhoc_storage);

		/*
		if(!rv) {
		throw std::runtime_error(
		fmt::format("ADM_update_adhoc_storage() error: {}",
		ADM_strerror(rv.error())));
		}

		return rv.value(); */
		}

		ADM_return_t

src/lib/admire.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -128,7 +128,7 @@ ADM_register_adhoc_storage(ADM_server_t server, const char* name,
		*/
		ADM_return_t
		ADM_update_adhoc_storage(ADM_server_t server, ADM_adhoc_context_t ctx,
		const char* adhoc_storage_id);
		ADM_storage_t adhoc_storage);

		/**
		* Remove an already-registered adhoc storage system.

src/lib/c_wrapper.cpp

+1 −10

Original line number	Diff line number	Diff line
		@@ -103,22 +103,13 @@ ADM_register_adhoc_storage(ADM_server_t server, const char* name,
		ADM_return_t
		ADM_update_adhoc_storage(ADM_server_t server,
		ADM_adhoc_context_t adhoc_storage_ctx,
		ADM_storage_t* adhoc_storage) {
		ADM_storage_t adhoc_storage) {

		const admire::server srv{server};

		return admire::detail::update_adhoc_storage(
		srv, admire::adhoc_storage::ctx{adhoc_storage_ctx},
		admire::adhoc_storage{adhoc_storage});

		/*
		if(!rv) {
		return rv.error();
		}

		adhoc_storage = admire::api::convert(rv).release(); */

		// return ADM_SUCCESS;
		}

		ADM_return_t