From e13f6a5e91ffeac86c32ab3a9048b810b1931061 Mon Sep 17 00:00:00 2001 From: Claudius 'keldu' Holeksa Date: Mon, 12 Aug 2024 13:42:48 +0200 Subject: wip --- modules/remote/c++/transfer_loopback.hpp | 136 +++++++++++++++++++++++++------ 1 file changed, 112 insertions(+), 24 deletions(-) (limited to 'modules/remote/c++/transfer_loopback.hpp') diff --git a/modules/remote/c++/transfer_loopback.hpp b/modules/remote/c++/transfer_loopback.hpp index 55a43fa..9e3c7f6 100644 --- a/modules/remote/c++/transfer_loopback.hpp +++ b/modules/remote/c++/transfer_loopback.hpp @@ -2,12 +2,10 @@ #include +#include "remote_loopback.hpp" #include "transfer.hpp" namespace saw { -namespace rmt { -struct Loopback {}; -} template<> class remote; @@ -22,15 +20,17 @@ private: ptr> remote_; remote_address rmt_address_; public: + static constexpr std::pair class_id{schema_hash::apply(), schema_hash::apply()}; + data_server(ptr> remote__, const remote_address& addr): remote_{remote__}, rmt_address_{addr} { - remote_().register_server(addr); + remote_().register_data_server(addr, *this); } ~data_server(){ - remote_().deregister_server(addr); + remote_().deregister_data_server(rmt_address_, *this); } SAW_FORBID_COPY(data_server); @@ -40,10 +40,19 @@ public: * Return the schema id */ std::pair get_class_id() const override { - uint32_t schema_hash = schema_hash::apply(); - uint32_t encode_hash = schema_hash::apply(); - - return std::make_pair(schema_hash, encode_hash); + return class_id; + } + + error_or send(const data& dat, id store_id){ + try { + auto insert_res = values_.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{}; } }; @@ -55,15 +64,17 @@ private: ptr> remote_; remote_address rmt_address_; public: + static constexpr std::pair class_id{schema_hash>::apply(), schema_hash::apply()}; + data_server(ptr> remote__, const remote_address& addr): remote_{remote__}, rmt_address_{addr} { - remote_().register_server(addr); + remote_().register_data_server(addr,*this); } ~data_server(){ - remote_().deregister_server(addr); + remote_().deregister_data_server(rmt_address_,*this); } SAW_FORBID_COPY(data_server); @@ -73,10 +84,7 @@ public: * Return the schema id */ std::pair get_class_id() const override { - uint32_t schema_hash = schema_hash>::apply(); - uint32_t encode_hash = schema_hash::apply(); - - return std::make_pair(schema_hash, encode_hash); + return class_id; } /** @@ -150,6 +158,84 @@ public: } }; +template +class data_client final { +private: + ptr> srv_; + + uint64_t next_id_; +public: + data_client(ptr> srv__): + srv_{srv__}, + next_id_{0u} + {} + + /** + * Send data to the remote. + */ + 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; + } + + /** + * Preallocate data + */ + error_or> allocate(const data::MetaSchema, Encoding>& meta){ + id dat_id{next_id_}; + auto eov = srv_().allocate(meta, dat_id); + if(eov.is_error()){ + auto& err = eov.get_error(); + return std::move(err); + } + ++next_id_; + return dat_id; + } + + /** + * Receive data + */ + 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 + */ + 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. + */ + 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}; + } +}; + /** * Client for transporting data to remote and receiving data back */ @@ -159,7 +245,7 @@ private: /** * Corresponding server for this client */ - data_server, Encoding, rmt::Loopback>* srv_; + ptr, Encoding, rmt::Loopback>> srv_; /** * The next id for identifying issues on the remote side. @@ -169,18 +255,21 @@ public: /** * Main constructor */ - data_client(data_server, Encoding, rmt::Loopback>& srv__): - srv_{&srv__}, + data_client(ptr, Encoding, rmt::Loopback>> srv__): + srv_{srv__}, next_id_{0u} {} + SAW_FORBID_COPY(data_client); + SAW_DEFAULT_MOVE(data_client); + /** * Send data to the remote. */ template error_or> send(const data& dat){ id dat_id{next_id_}; - auto eov = srv_->send(dat, dat_id); + auto eov = srv_().send(dat, dat_id); if(eov.is_error()){ auto& err = eov.get_error(); return std::move(err); @@ -196,7 +285,7 @@ public: template error_or> allocate(const data::MetaSchema, Encoding>& meta){ id dat_id{next_id_}; - auto eov = srv_->allocate(meta, dat_id); + auto eov = srv_().allocate(meta, dat_id); if(eov.is_error()){ auto& err = eov.get_error(); return std::move(err); @@ -210,7 +299,7 @@ public: */ template conveyor> receive(id dat_id){ - auto eov = srv_->receive(dat_id); + auto eov = srv_().receive(dat_id); if(eov.is_error()){ auto& err = eov.get_error(); return std::move(err); @@ -225,7 +314,7 @@ public: */ template error_or erase(id dat_id){ - return srv_->erase(dat_id); + return srv_().erase(dat_id); } /** @@ -234,7 +323,7 @@ public: */ template error_or*> find(id dat_id){ - auto eov = srv_->find(dat_id); + auto eov = srv_().find(dat_id); if(eov.is_error()){ auto& err = eov.get_error(); return std::move(err); @@ -243,7 +332,6 @@ public: auto val = eov.get_value(); return val; } - }; } -- cgit v1.2.3