From 816760c8480e8e76c7f4021a845161eb697e215c Mon Sep 17 00:00:00 2001 From: Claudius 'keldu' Holeksa Date: Mon, 15 Jul 2024 15:29:12 +0200 Subject: Moving remote definitions from codec to remote module --- modules/codec/c++/remote.hpp | 116 ---------------------- modules/codec/c++/remote_loopback.hpp | 99 ------------------- modules/codec/c++/remote_loopback_base.hpp | 7 -- modules/codec/c++/transfer.hpp | 21 ---- modules/codec/c++/transfer_loopback.hpp | 152 ----------------------------- 5 files changed, 395 deletions(-) delete mode 100644 modules/codec/c++/remote.hpp delete mode 100644 modules/codec/c++/remote_loopback.hpp delete mode 100644 modules/codec/c++/remote_loopback_base.hpp delete mode 100644 modules/codec/c++/transfer.hpp delete mode 100644 modules/codec/c++/transfer_loopback.hpp (limited to 'modules/codec') diff --git a/modules/codec/c++/remote.hpp b/modules/codec/c++/remote.hpp deleted file mode 100644 index 5803154..0000000 --- a/modules/codec/c++/remote.hpp +++ /dev/null @@ -1,116 +0,0 @@ -#pragma once - -#include -#include - -#include "data.hpp" -#include "interface.hpp" - -#include - -namespace saw { -/** - * This class acts as a helper for rpc calls and representing data on the remote. - */ -template -class data_or_id { -private: - /** - * Variant representing the either id or data class. - */ - std::variant, data> doi_; -public: - /** - * Constructor for instantiating. - */ - data_or_id(const id& val): - doi_{val} - {} - - /** - * Constructor for instantiating. - */ - data_or_id(data val): - doi_{std::move(val)} - {} - - /** - * Check if this class holds an id. - */ - bool is_id() const { - return std::holds_alternative>(doi_); - } - - /** - * Check if this class holds data. - */ - bool is_data() const { - return std::holds_alternative>(doi_); - } - - /** - * Returns the id. - */ - id get_id() const { - return std::get>(doi_); - } - - /** - * Return a data reference. - */ - data& get_data(){ - return std::get>(doi_); - } - - /** - * Return a data reference. - */ - const data& get_data() const { - return std::get>(doi_); - } -}; - - -/** - * Representing data on the remote - */ -template -class remote_data; - -template -class rpc_client; - -/** - * Implementation of a remote server on the backend - */ -template -class rpc_server { -private: - interface iface_; -public: - rpc_server(interface iface): - iface_{std::move(iface)} - {} -}; - -/** - * Representation of a remote. - * Partially similar to a network address - */ -template -class remote_address { - static_assert(always_false, "Type of remote not supported"); - - /** - * - */ -}; - -/** - * Reference Backend structure - */ -template -class remote { - static_assert(always_false, "Type of backend not supported"); -}; -} diff --git a/modules/codec/c++/remote_loopback.hpp b/modules/codec/c++/remote_loopback.hpp deleted file mode 100644 index 2949243..0000000 --- a/modules/codec/c++/remote_loopback.hpp +++ /dev/null @@ -1,99 +0,0 @@ -#pragma once - -#include - -#include "interface.hpp" -#include "remote.hpp" -#include "transfer_loopback.hpp" - -namespace saw { - -template -class remote_data { -private: - id id_; -public: - remote_data(const id& id): - id_{id} - {} - - /** - * Wait until data arrives - */ - error_or> wait(wait_scope& wait); - - /** - * Asynchronously wait for a result - */ - conveyor> on_receive(); -}; - -/** - * Client RPC reference structure - */ -template -class rpc_client { - /** - * request the data from the remote - */ - template - remote_data request_data(id data); - - /** @todo - * Determine type based on Name - */ - /* - template - error_or< - id< - typename schema_member_type::type - > - > call(data_or_id inp); - */ -}; - -template<> -class remote_address { -}; - -template -class rpc_server { -public: - using InterfaceT = interface; -private: - const remote_address* addr_; - InterfaceT iface_; -public: - rpc_server(const remote_address& addr__, InterfaceT iface__): - addr_{&addr__}, - iface_{std::move(iface__)} - {} - - // error_or> -}; - -template<> -class remote { -public: - /** - * Resolves an address for the remote - */ - error_or>> parse_address(){ - return heap>(); - } - - /** - * Connect to a remote - */ - template - conveyor> connect(const remote_address& addr); - - /** - * Start listening - */ - template - rpc_server listen(const remote_address& addr, typename rpc_server::InterfaceT iface){ - return {addr, std::move(iface)}; - } -}; -} diff --git a/modules/codec/c++/remote_loopback_base.hpp b/modules/codec/c++/remote_loopback_base.hpp deleted file mode 100644 index 823c516..0000000 --- a/modules/codec/c++/remote_loopback_base.hpp +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -namespace saw { -namespace rmt { -struct Loopback {}; -} -} diff --git a/modules/codec/c++/transfer.hpp b/modules/codec/c++/transfer.hpp deleted file mode 100644 index 2fdd0b9..0000000 --- a/modules/codec/c++/transfer.hpp +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -namespace saw { -template -class data_server; - -template -class data_client; - -namespace impl { -template -struct data_server_redux { - using type = std::tuple<>; -}; - -template -struct data_server_redux> { - using type = std::tuple>...>; -}; -} -} diff --git a/modules/codec/c++/transfer_loopback.hpp b/modules/codec/c++/transfer_loopback.hpp deleted file mode 100644 index 6c81c9c..0000000 --- a/modules/codec/c++/transfer_loopback.hpp +++ /dev/null @@ -1,152 +0,0 @@ -#pragma once - -#include - -#include "transfer.hpp" - -namespace saw { -namespace rmt { -struct Loopback {}; -} - -template -class data_server, Encoding, rmt::Loopback> { -private: - typename impl::data_server_redux>::type>::type values_; -public: - /** - * Get data from client - */ - template - error_or send(const data& dat, id store_id){ - auto& vals = std::get>>(values_); - - try { - auto insert_res = vals.emplace(std::make_pair(store_id.get_value(), std::move(dat))); - if(!insert_res.second){ - return make_error(); - } - }catch(std::exception& ){ - return make_error(); - } - return void_t{}; - } - - template - error_or> receive(id store_id){ - auto& vals = std::get>>(values_); - - auto find_res = vals.find(store_id.get_value()); - if(find_res == vals.end()){ - return make_error(); - } - - auto& dat = find_res->second; - return dat; - } - - template - error_or erase(id store_id){ - auto& vals = std::get>>(values_); - auto erase_op = vals.erase(store_id.get_value()); - if(erase_op == 0u){ - return make_error(); - } - return void_t{}; - } - - template - error_or*> find(id store_id){ - auto& vals = std::get>>(values_); - auto find_res = vals.find(store_id.get_value()); - if(find_res == vals.end()){ - return make_error(); - } - - auto& dat = find_res->second; - return &dat; - } -}; - -/** - * Client for transporting data to remote and receiving data back - */ -template -class data_client, Encoding, rmt::Loopback> { -private: - /** - * Corresponding server for this client - */ - data_server, Encoding, rmt::Loopback>* srv_; - - /** - * The next id for identifying issues on the remote side. - */ - uint64_t next_id_; -public: - /** - * Main constructor - */ - data_client(data_server, Encoding, rmt::Loopback>& srv__): - srv_{&srv__}, - next_id_{0u} - {} - - /** - * Send data to the remote. - */ - template - error_or> send(const data& dat){ - id dat_id{next_id_}; - auto eov = srv_->send(dat, dat_id); - if(eov.is_error()){ - auto& err = eov.get_error(); - return std::move(err); - } - - ++next_id_; - return dat_id; - } - - /** - * Receive data - */ - template - conveyor> receive(id dat_id){ - auto eov = srv_->receive(dat_id); - if(eov.is_error()){ - auto& err = eov.get_error(); - return std::move(err); - } - - auto& val = eov.get_value(); - return std::move(val); - } - - /** - * Erase data - */ - template - error_or erase(id dat_id){ - return srv_->erase(dat_id); - } - - /** - * An exception for the Loopback backend. Here we can safely use find from - * the client side. - */ - template - error_or*> find(id dat_id){ - auto eov = srv_->find(dat_id); - if(eov.is_error()){ - auto& err = eov.get_error(); - return std::move(err); - } - - auto val = eov.get_value(); - return val; - } - -}; - -} -- cgit v1.2.3