Removed pending registry, opted for serialization instead. Data problems are gone!

Author: Kelwan

reference/async_reference/async_reference.cc

@@ -11,8 +11,6 @@ ecsact_async_request_id async_reference::connect(const char* connection_string
 	std::string connect_str(connection_string);
 
 	registry_id = ecsact_create_registry("async_reference_impl_reg");
-	pending_registry_id =
-		ecsact_create_registry("pending_async_reference_impl_reg");
 
 	auto req_id = next_request_id();
 	// The good and bad strings simulate the outcome of connections
@@ -46,8 +44,7 @@ ecsact_async_request_id async_reference::enqueue_execution_options(
 		return req_id;
 	}
 
-	auto cpp_options =
-		util::c_to_cpp_execution_options(options, *pending_registry_id);
+	auto cpp_options = util::c_to_cpp_execution_options(options);
 
 	types::pending_execution_options pending_options{
 		.request_id = req_id,
@@ -86,11 +83,7 @@ void async_reference::execute_systems() {
 
 			if(cpp_options) {
 				options = std::make_unique<ecsact_execution_options>(
-					util::cpp_to_c_execution_options(
-						*cpp_options,
-						*registry_id,
-						*pending_registry_id
-					)
+					util::cpp_to_c_execution_options(*cpp_options, *registry_id)
 				);
 			}
 
@@ -104,7 +97,6 @@ void async_reference::execute_systems() {
 
 			for(auto& entity_request_id : pending_entities) {
 				auto entity = ecsact_create_entity(*registry_id);
-				auto pended_entity = ecsact_create_entity(*pending_registry_id);
 
 				types::entity created_entity{
 					.entity_id = entity,

reference/async_reference/async_reference.hh

@@ -18,16 +18,6 @@
 #include "ecsact/runtime/core.hh"
 #include "ecsact/runtime/async.h"
 
-// Have one container to hold ALL requests
-// Use an std::variant to account for entity and other types
-// Separate classes, you are simulating global state by having so much
-// functionality that don't involve each other
-
-// Async possibilities:
-// 	Tick manager
-// 	Requests (Async callbacks)
-//
-
 class async_reference {
 public:
 	ecsact_async_request_id enqueue_execution_options(
@@ -51,7 +41,6 @@ private:
 	std::atomic_int32_t _last_request_id = 0;
 
 	std::optional<ecsact_registry_id> registry_id;
-	std::optional<ecsact_registry_id> pending_registry_id;
 
 	tick_manager        tick_manager;
 	execution_callbacks exec_callbacks;

reference/async_reference/test/async_ref_test.cc

@@ -54,99 +54,7 @@ TEST(AsyncRef, Disconnect) {
 	ecsact_async_disconnect();
 }
 
-// TEST(AsyncRef, AddUpdateAndRemove) {
-// 	auto connect_req_id = ecsact_async_connect("good");
-
-// 	async_test::NeededComponent my_needed_component{};
-
-// 	ecsact_component needed_component{
-// 		.component_id = async_test::NeededComponent::id,
-// 		.component_data = &my_needed_component,
-// 	};
-
-// 	async_test::ComponentUpdate my_update_component{};
-// 	auto                        update_comp_id =
-// async_test::ComponentUpdate::id; 	my_update_component.value_to_update = 1;
-// 	const void* update_component_data = &my_update_component;
-
-// 	ecsact_component update_component{
-// 		.component_id = update_comp_id,
-// 		.component_data = update_component_data,
-// 	};
-
-// 	auto entity_request = ecsact_async_create_entity();
-
-// 	entity_cb_info cb_info{};
-
-// 	auto entity_cb = //
-// 		[](
-// 			ecsact_entity_id        entity_id,
-// 			ecsact_async_request_id request_id,
-// 			void*                   callback_user_data
-// 		) {
-// 			entity_cb_info& entity_info =
-// 				*static_cast<entity_cb_info*>(callback_user_data);
-// 			entity_info.wait = true;
-// 			entity_info.entity = entity_id;
-// 		};
-
-// 	ecsact_async_events_collector async_evc{};
-// 	async_evc.async_entity_callback = entity_cb;
-// 	async_evc.async_entity_error_callback_user_data = &cb_info;
-
-// 	int check_count = 0;
-
-// 	while(cb_info.wait != true) {
-// 		ASSERT_LT(++check_count, 10000);
-// 		ecsact_async_flush_events(nullptr, &async_evc);
-// 	}
-
-// 	std::array<ecsact_component, 2> components{
-// 		needed_component,
-// 		update_component,
-// 	};
-// 	std::array<ecsact_entity_id, 2> components_entities = {
-// 		cb_info.entity,
-// 		cb_info.entity};
-
-// 	ecsact_execution_options add_options{};
-
-// 	add_options.add_components_length = components.size();
-// 	add_options.add_components_entities = components_entities.data();
-// 	add_options.add_components = components.data();
-
-// 	ecsact_async_enqueue_execution_options(add_options);
-
-// 	ecsact_async_flush_events(nullptr, nullptr);
-
-// 	my_update_component.value_to_update += 5;
-
-// 	std::array<ecsact_component, 1> update_components = {update_component};
-
-// 	ecsact_execution_options update_options{};
-// 	update_options.update_components_length = update_components.size();
-// 	update_options.update_components_entities = components_entities.data();
-// 	update_options.update_components = update_components.data();
-
-// 	ecsact_async_enqueue_execution_options(update_options);
-
-// 	ecsact_async_flush_events(nullptr, nullptr);
-
-// 	std::array<ecsact_component_id, 1> remove_components = {update_comp_id};
-
-// 	ecsact_execution_options remove_options{};
-// 	remove_options.remove_components_length = 1;
-// 	remove_options.remove_components_entities = components_entities.data();
-// 	remove_options.remove_components = remove_components.data();
-
-// 	ecsact_async_enqueue_execution_options(remove_options);
-
-// 	ecsact_async_flush_events(nullptr, nullptr);
-
-// 	ecsact_async_disconnect();
-// }
-
-TEST(AsyncRef, AddUpdateAndRemoveDelayed) {
+TEST(AsyncRef, AddUpdateAndRemove) {
 	using namespace std::chrono_literals;
 
 	auto connect_req_id = ecsact_async_connect("good");
@@ -250,10 +158,12 @@ TEST(AsyncRef, TryMergeFailure) {
 	auto connect_req_id = ecsact_async_connect("good");
 
 	async_test::NeededComponent my_needed_component{};
-	auto                        needed_comp_id = async_test::NeededComponent::id;
-	const void*                 needed_component_data = &my_needed_component;
+
+	auto        needed_comp_id = async_test::NeededComponent::id;
+	const void* needed_component_data = &my_needed_component;
 
 	async_test::NeededComponent another_my_needed_component{};
+
 	auto        another_needed_comp_id = async_test::NeededComponent::id;
 	const void* another_needed_component_data = &my_needed_component;
 
@@ -300,10 +210,17 @@ TEST(AsyncRef, TryMergeFailure) {
 			int                      request_ids_length,
 			ecsact_async_request_id* request_ids,
 			void*                    callback_user_data
-		) { ASSERT_EQ(async_err, ECSACT_ASYNC_ERR_EXECUTION_MERGE_FAILURE); };
+		) {
+			ASSERT_EQ(async_err, ECSACT_ASYNC_ERR_EXECUTION_MERGE_FAILURE);
+			auto& entity_request =
+				*reinterpret_cast<ecsact_async_request_id*>(callback_user_data);
+			auto request_id = request_ids[0];
+			ASSERT_EQ(entity_request, request_id);
+		};
 
 	ecsact_async_events_collector async_evc{};
 	async_evc.async_error_callback = async_err_cb;
+	async_evc.async_error_callback_user_data = &entity_request;
 
 	std::array<ecsact_entity_id, 2> entities{cb_info.entity, cb_info.entity};
 	std::array<ecsact_component, 2> components{

reference/async_reference/test/index.bzl

@@ -13,6 +13,7 @@ def ecsact_reference_async_module_test(name = None, srcs = [], deps = [], **kwar
             "@ecsact//codegen_plugins:cpp_systems_header",
             "@ecsact//codegen_plugins:systems_header",
             "@ecsact//codegen_plugins:cpp_systems_source",
+            "@ecsact_runtime//reference/serialize_reference/codegen",
         ],
     )
 
@@ -31,6 +32,7 @@ def ecsact_reference_async_module_test(name = None, srcs = [], deps = [], **kwar
             "@ecsact_runtime//reference/async_reference:async",
             "@com_google_googletest//:gtest",
             "@com_google_googletest//:gtest_main",
+            "@ecsact_runtime//reference/serialize_reference",
         ],
         **kwargs
     )

reference/async_reference/util/types.hh

@@ -27,8 +27,9 @@ struct entity {
 };
 
 struct cpp_execution_component {
-	ecsact_entity_id    entity_id;
-	ecsact_component_id _id;
+	ecsact_entity_id       entity_id;
+	ecsact_component_id    _id;
+	std::vector<std::byte> data;
 };
 
 struct action_info {