From af665edfa776fe27221ae357f356f428390b0a0d Mon Sep 17 00:00:00 2001
From: "Claudius \"keldu\" Holeksa" <mail@keldu.de>
Date: Mon, 20 May 2024 18:26:25 +0200
Subject: Fixing up minor parts of sycl and echo examples

---
 modules/io_codec/examples/echo_client.cpp | 2 ++
 modules/io_codec/examples/echo_server.cpp | 5 ++++-
 modules/remote-sycl/c++/remote.hpp        | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/modules/io_codec/examples/echo_client.cpp b/modules/io_codec/examples/echo_client.cpp
index a9fe2db..dadf5e0 100644
--- a/modules/io_codec/examples/echo_client.cpp
+++ b/modules/io_codec/examples/echo_client.cpp
@@ -43,6 +43,8 @@ int main(){
 			async_rmt->read(&read_data[0], 3, read_data.size()-1);
 
 			async_rmt->read_done().then([&](size_t b){
+	
+					std::cout<<"Received bytes:\n"<<std::endl;
 					for(uint64_t i = 0; i < b; ++i){
 						std::cout<<static_cast<char>(read_data[i]);
 					}
diff --git a/modules/io_codec/examples/echo_server.cpp b/modules/io_codec/examples/echo_server.cpp
index 54c4d55..23e29eb 100644
--- a/modules/io_codec/examples/echo_server.cpp
+++ b/modules/io_codec/examples/echo_server.cpp
@@ -37,6 +37,9 @@ void handle_echo_message(saw::io_stream& rmt_clt, bool& keep_running, message& s
 					break;
 				}
 			}
+			auto& read_bytes = eov.get_value();
+
+			std::cout<<"Read "<<read_bytes<<" bytes"<<std::endl;
 			auto read_bytes = eov.get_value();
 			if(read_bytes == 0u){
 				exit(-1);
@@ -53,7 +56,7 @@ void handle_echo_message(saw::io_stream& rmt_clt, bool& keep_running, message& s
 				if(eov.is_error()){
 					auto& err = eov.get_error();
 					if(err.is_critical()){
-						std::cerr<<err.get_category()<<std::endl;
+						std::cerr<<"After triggered write: "<<err.get_category()<<std::endl;
 						exit(err.get_id());
 					}else {
 						break;
diff --git a/modules/remote-sycl/c++/remote.hpp b/modules/remote-sycl/c++/remote.hpp
index 70c8032..86799b6 100644
--- a/modules/remote-sycl/c++/remote.hpp
+++ b/modules/remote-sycl/c++/remote.hpp
@@ -78,7 +78,7 @@ public:
 
 	template<typename IdT>
 	remote_data<IdT, Encoding, rmt::Sycl> request_data(id<IdT> dat){
-		return {data, std::get<id_map<data<IdT, Encoding>>>(storage_.maps)};
+		return {dat, std::get<id_map<data<IdT, Encoding>>>(storage_.maps)};
 	}
 
 	/**
@@ -91,7 +91,7 @@ public:
 		>
 	> call(data_or_id<typename schema_member_type<Name, Iface>::type::ValueType::RequestT, Encoding> input){
 
-		auto eod = cmd_queue_.template call<Name>(std::move(input), &cmd_queue_);
+		auto eod = cl_interface_.template call<Name>(std::move(input), &cmd_queue_);
 
 		if(eod.is_error()){
 			return std::move(eod.get_error());
-- 
cgit v1.2.3