Extract hash functions into header

Author: limbonaut

src/sentry/logging/sentry_godot_logger.cpp

@@ -4,6 +4,7 @@
 #include "sentry/logging/state.h"
 #include "sentry/sentry_options.h"
 #include "sentry/sentry_sdk.h"
+#include "sentry/util/hash.h"
 
 #include <godot_cpp/classes/engine.hpp>
 #include <godot_cpp/classes/resource_loader.hpp>
@@ -162,36 +163,6 @@ Vector<SentryEvent::StackFrame> _extract_error_stack_frames_from_backtraces(
 	return frames;
 }
 
-// FNV-1a hash - portable hash implementation that doesn't rely on std::hash<*>.
-// See https://en.wikipedia.org/wiki/Fowler%E2%80%93Noll%E2%80%93Vo_hash_function#FNV-1a_hash
-inline size_t _fnv1a_hash(const char *p_data, size_t p_len) {
-	// FNV-1a constants for 64-bit or 32-bit depending on platform
-	// See table: https://en.wikipedia.org/wiki/Fowler%E2%80%93Noll%E2%80%93Vo_hash_function#FNV_hash_parameters
-	constexpr size_t FNV_OFFSET_BASIS = sizeof(size_t) == 8 ? 14695981039346656037ULL : 2166136261U;
-	constexpr size_t FNV_PRIME = sizeof(size_t) == 8 ? 1099511628211ULL : 16777619U;
-
-	size_t hash = FNV_OFFSET_BASIS;
-	for (size_t i = 0; i < p_len; i++) {
-		hash ^= static_cast<uint64_t>(static_cast<unsigned char>(p_data[i]));
-		hash *= FNV_PRIME;
-	}
-	return hash;
-}
-
-inline size_t _hash(std::string_view p_value) {
-	return _fnv1a_hash(p_value.data(), p_value.size());
-}
-
-inline size_t _hash(int p_value) {
-	return p_value;
-}
-
-template <typename T>
-inline void _hash_combine(std::size_t &p_hash, T p_value) {
-	// NOTE: Hash combining technique, originally from boost.
-	p_hash ^= _hash(p_value) + 0x9e3779b9 + (p_hash << 6) + (p_hash >> 2);
-}
-
 String _strip_invisible(const String &p_text) {
 	String result;
 
@@ -240,9 +211,9 @@ std::size_t SentryGodotLogger::ErrorKeyHash::operator()(const ErrorKey &p_key) c
 	std::string_view message_sv{ message_cstr.get_data() };
 	std::string_view filename_sv{ filename_cstr.get_data() };
 
-	size_t hash_value = _hash(message_sv);
-	_hash_combine(hash_value, filename_sv);
-	_hash_combine(hash_value, p_key.line);
+	size_t hash_value = sentry::util::hash(message_sv);
+	sentry::util::hash_combine(hash_value, filename_sv);
+	sentry::util::hash_combine(hash_value, p_key.line);
 	return hash_value;
 }
 

src/sentry/util/hash.h

@@ -0,0 +1,38 @@
+#pragma once
+
+#include <godot_cpp/core/defs.hpp>
+#include <string_view>
+
+namespace sentry::util {
+
+// FNV-1a hash - portable hash implementation that doesn't rely on std::hash<*>.
+// See https://en.wikipedia.org/wiki/Fowler%E2%80%93Noll%E2%80%93Vo_hash_function#FNV-1a_hash
+_FORCE_INLINE_ size_t fnv1a_hash(const char *p_data, size_t p_len) {
+	// FNV-1a constants for 64-bit or 32-bit depending on platform
+	// See table: https://en.wikipedia.org/wiki/Fowler%E2%80%93Noll%E2%80%93Vo_hash_function#FNV_hash_parameters
+	constexpr size_t FNV_OFFSET_BASIS = sizeof(size_t) == 8 ? 14695981039346656037ULL : 2166136261U;
+	constexpr size_t FNV_PRIME = sizeof(size_t) == 8 ? 1099511628211ULL : 16777619U;
+
+	size_t hash = FNV_OFFSET_BASIS;
+	for (size_t i = 0; i < p_len; i++) {
+		hash ^= static_cast<uint64_t>(static_cast<unsigned char>(p_data[i]));
+		hash *= FNV_PRIME;
+	}
+	return hash;
+}
+
+_FORCE_INLINE_ size_t hash(std::string_view p_value) {
+	return fnv1a_hash(p_value.data(), p_value.size());
+}
+
+_FORCE_INLINE_ size_t hash(int p_value) {
+	return p_value;
+}
+
+template <class T>
+_FORCE_INLINE_ void hash_combine(std::size_t &p_hash, const T &p_value) {
+	// NOTE: Hash combining technique, originally from boost.
+	p_hash ^= hash(p_value) + 0x9e3779b9 + (p_hash << 6) + (p_hash >> 2);
+}
+
+} //namespace sentry::util