fix: issues with scopes

Author: qubka

include/plugify/profiler.hpp

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <memory>
 #include <string_view>
 
 namespace plugify {
@@ -50,7 +51,7 @@ namespace plugify {
 		//virtual void TrackFree(void* ptr, std::string_view pool = {}) = 0;
 
 		// Thread metadata
-		virtual void SetThreadName(std::string_view name) = 0;
+		virtual void SetThread(std::string_view name) = 0;
 
 		// Capability query
 		virtual std::string_view GetName() const = 0; // "Tracy", "Optick", …
@@ -59,17 +60,38 @@ namespace plugify {
 
 	class ScopedZone {
 	public:
-		ScopedZone(IProfiler* profiler, const ZoneDesc& desc) : _profiler(profiler) {
+		ScopedZone() = default;
+
+		ScopedZone(const std::shared_ptr<IProfiler>& profiler, const ZoneDesc& desc) : _profiler(profiler.get()) {
 			if (_profiler) _handle = _profiler->BeginZone(desc);
 		}
+
 		~ScopedZone() {
 			if (_profiler && _handle) _profiler->EndZone(_handle);
 		}
 
 		ScopedZone(const ScopedZone&) = delete;
 		ScopedZone& operator=(const ScopedZone&) = delete;
-		ScopedZone(ScopedZone&&) = delete;
-		ScopedZone& operator=(ScopedZone&&) = delete;
+
+		ScopedZone(ScopedZone&& other) noexcept
+			: _profiler(other._profiler)
+			, _handle(other._handle) {
+			other._profiler = nullptr;
+			other._handle = {};
+		}
+
+		ScopedZone& operator=(ScopedZone&& other) noexcept {
+			if (this != &other) {
+				if (_profiler && _handle) _profiler->EndZone(_handle);
+
+				_profiler = other._profiler;
+				_handle = other._handle;
+
+				other._profiler = nullptr;
+				other._handle = {};
+			}
+			return *this;
+		}
 
 	private:
 		IProfiler* _profiler = nullptr;

src/core/extension_loader.hpp

@@ -1,7 +1,6 @@
 #pragma once
 
 #include "plugify/assembly.hpp"
-#include "plugify/config.hpp"
 #include "plugify/extension.hpp"
 #include "plugify/file_system.hpp"
 #include "plugify/language_module.hpp"
@@ -14,14 +13,17 @@ namespace plugify {
 	class ScopedTimer {
 	public:
 		explicit ScopedTimer(Callback&& cb) noexcept(std::is_nothrow_move_constructible_v<Callback>)
-			: _callback(std::forward<Callback>(cb))
+			: _callback(std::in_place, std::forward<Callback>(cb))
 			, _start(std::chrono::steady_clock::now()) {
 		}
 
 		~ScopedTimer() noexcept(std::is_nothrow_invocable_v<Callback>) {
-			auto end = std::chrono::steady_clock::now();
-			auto elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(end - _start);
-			_callback(elapsed);
+			if (_callback) {
+				auto end = std::chrono::steady_clock::now();
+				auto elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(end - _start);
+
+				(*_callback)(elapsed);
+			}
 		}
 
 		ScopedTimer(const ScopedTimer&) = delete;
@@ -30,18 +32,23 @@ namespace plugify {
 		ScopedTimer(ScopedTimer&& other) noexcept
 			: _callback(std::move(other._callback))
 			, _start(other._start) {
+			other._callback.reset();
 		}
 
 		ScopedTimer& operator=(ScopedTimer&& other) noexcept {
 			if (this != &other) {
+				_callback.reset();
+
 				_callback = std::move(other._callback);
 				_start = other._start;
+
+				other._callback.reset();
 			}
 			return *this;
 		}
 
 	private:
-		PLUGIFY_NO_UNIQUE_ADDRESS Callback _callback;
+		std::optional<Callback> _callback;
 		std::chrono::steady_clock::time_point _start;
 	};