Optimisation: Replace linear searches with binary searches for more consistent performance.

inkcpp/container_operations.cpp

@@ -13,40 +13,34 @@
 
 #include <iostream>
 
-namespace ink::runtime::internal {
+namespace ink::runtime::internal
+{
 
-	void operation<Command::READ_COUNT_VAR, value_type::divert, void>::operator()(
-			basic_eval_stack& stack, value* vals)
-	{
-		container_t id;
-		bool success = _story.get_container_id(
-			_story.instructions() + vals[0].get<value_type::divert>(),
-			id);
-		inkAssert(success, "failed to find container to read visit count!");
-		stack.push(value{}.set<value_type::int32>(
-				static_cast<int32_t>(_visit_counts.visits( id )
-			)));
-	}
-
-	void operation<Command::TURNS, value_type::divert, void>::operator()(
-		basic_eval_stack& stack, value* vals)
-	{
-		container_t id;
-		bool success = _story.get_container_id(
-			_story.instructions() + vals[0].get<value_type::divert>(),
-			id);
-		inkAssert(success, "failed to find container to read turn count!");
-		stack.push(value{}.set<value_type::int32>(
-						static_cast<int32_t>(_visit_counts.turns(id)
-					)));
-	}
+void operation<Command::READ_COUNT_VAR, value_type::divert, void>::operator()(
+    basic_eval_stack& stack, value* vals
+)
+{
+	container_t id;
+	bool        success = _story.find_container_id(vals[0].get<value_type::divert>(), id);
+	inkAssert(success, "failed to find container to read visit count!");
+	stack.push(value{}.set<value_type::int32>(static_cast<int32_t>(_visit_counts.visits(id))));
+}
 
-	void operation<Command::CHOICE_COUNT, value_type::none, void>::operator()
-		(basic_eval_stack& stack, value* vals)
-	{
-		stack.push(value{}.set<value_type::int32>(static_cast<int32_t>(
-						_runner.num_choices()
-					)));
-	}
+void operation<Command::TURNS, value_type::divert, void>::operator()(
+    basic_eval_stack& stack, value* vals
+)
+{
+	container_t id;
+	bool        success = _story.find_container_id(vals[0].get<value_type::divert>(), id);
+	inkAssert(success, "failed to find container to read turn count!");
+	stack.push(value{}.set<value_type::int32>(static_cast<int32_t>(_visit_counts.turns(id))));
+}
 
+void operation<Command::CHOICE_COUNT, value_type::none, void>::operator()(
+    basic_eval_stack& stack, value* vals
+)
+{
+	stack.push(value{}.set<value_type::int32>(static_cast<int32_t>(_runner.num_choices())));
 }
+
+} // namespace ink::runtime::internal

inkcpp/globals_impl.cpp

@@ -20,7 +20,7 @@ globals_impl::globals_impl(const story_impl* story)
     , _visit_counts_backup()
     , _owner(story)
     , _runners_start(nullptr)
-    , _lists(story->list_meta(), story->get_header())
+    , _lists(story->list_meta())
     , _globals_initialized(false)
 {
 	_visit_counts.resize(_num_containers);
@@ -46,13 +46,10 @@ globals_impl::globals_impl(const story_impl* story)
 	}
 }
 
-void globals_impl::visit(uint32_t container_id, bool entering_at_start)
+void globals_impl::visit(uint32_t container_id)
 {
-	if ((! (_owner->container_flag(container_id) & CommandFlag::CONTAINER_MARKER_ONLY_FIRST))
-	    || entering_at_start) {
-		_visit_counts[container_id].visits += 1;
-		_visit_counts[container_id].turns = 0;
-	}
+	_visit_counts[container_id].visits += 1;
+	_visit_counts[container_id].turns = 0;
 }
 
 uint32_t globals_impl::visits(uint32_t container_id) const

inkcpp/globals_impl.h

@@ -52,8 +52,7 @@ class globals_impl final
 
 public:
 	// Records a visit to a container
-	/// @param start_cmd iff the visit was initiatet through a MARKER_START_CONTAINER
-	void visit(uint32_t container_id, bool entering_at_start);
+	void visit(uint32_t container_id);
 
 	// Checks the number of visits to a container
 	uint32_t visits(uint32_t container_id) const;

inkcpp/header.cpp

@@ -7,38 +7,27 @@
 #include "header.h"
 #include "version.h"
 
-namespace ink::internal {
+namespace ink::internal
+{
 
-	header header::parse_header(const char *data)
-	{
-		header res;
-		const char* ptr = data;
-		res.endien = *reinterpret_cast<const header::endian_types*>(ptr);
-		ptr += sizeof(header::endian_types);
-
-		using v_t = decltype(header::ink_version_number);
-		using vcpp_t = decltype(header::ink_bin_version_number);
-
-		if (res.endien == header::endian_types::same) {
-			res.ink_version_number =
-				*reinterpret_cast<const v_t*>(ptr);
-			ptr += sizeof(v_t);
-			res.ink_bin_version_number =
-				*reinterpret_cast<const vcpp_t*>(ptr);
+bool header::verify() const
+{
+	if (endian() == endian_types::none) {
+		inkFail("Header magic number was wrong!");
+		return false;
+	}
 
-		} else if (res.endien == header::endian_types::differ) {
-			res.ink_version_number =
-				swap_bytes(*reinterpret_cast<const v_t*>(ptr));
-			ptr += sizeof(v_t);
-			res.ink_bin_version_number =
-				swap_bytes(*reinterpret_cast<const vcpp_t*>(ptr));
-		} else {
-			inkFail("Failed to parse endian encoding!");
-		}
+	if (endian() == endian_types::differ) {
+		inkFail("Can't load content with different endian-ness!");
+		return false;
+	}
 
-		if (res.ink_bin_version_number != InkBinVersion) {
-			inkFail("InkCpp-version mismatch: file was compiled with different InkCpp-version!");
-		}
-		return res;
+	if (ink_bin_version_number != InkBinVersion) {
+		inkFail("InkCpp-version mismatch: file was compiled with different InkCpp-version!");
+		return false;
 	}
+
+	return true;
 }
+
+} // namespace ink::internal

inkcpp/list_table.cpp

@@ -32,7 +32,7 @@ void list_table::copy_lists(const data_t* src, data_t* dst)
 	}
 }
 
-list_table::list_table(const char* data, const ink::internal::header& header)
+list_table::list_table(const char* data)
     : _valid{false}
 {
 	if (data == nullptr) {
@@ -41,7 +41,7 @@ list_table::list_table(const char* data, const ink::internal::header& header)
 	list_flag   flag;
 	const char* ptr   = data;
 	int         start = 0;
-	while ((flag = header.read_list_flag(ptr)) != null_flag) {
+	while ((flag = read_list_flag(ptr)) != null_flag) {
 		// start of new list
 		if (_list_end.size() == flag.list_id) {
 			start              = _list_end.size() == 0 ? 0 : _list_end.back();

inkcpp/list_table.h

@@ -107,7 +107,7 @@ class list_table : public snapshot_interface
 	list& add_inplace(list& lh, list_flag rh);
 
 	// parse binary list meta data
-	list_table(const char* data, const ink::internal::header&);
+	list_table(const char* data);
 
 	explicit list_table()
 	    : _entrySize{0}