Create a Task2Interface for better handling the new features for Task…

…s exeuction. Fix some issues
llde · Sep 2, 2023 · d062910 · d062910
1 parent 23939fc
commit d062910
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 19 deletions.
diff --git a/obse/obse/EventManager.cpp b/obse/obse/EventManager.cpp
@@ -1352,6 +1352,8 @@ UInt32 EventIDForMessage(UInt32 msgID)
 			return kEventID_ExitToMainMenu;
 		case OBSEMessagingInterface::kMessage_PostLoadGame:
 			return kEventID_PostLoadGame;
+		case OBSEMessagingInterface::kMessage_GameInitialized:
+			_MESSAGE("kMessage_GameInitialized Unhandled"); //FIXME
 		default:
 			return kEventID_INVALID;
 	}

diff --git a/obse/obse/PluginAPI.h b/obse/obse/PluginAPI.h
@@ -46,6 +46,7 @@ enum
     kInterface_Tasks,
 	kInterface_Input,
     kInterface_EventManager,
+	kInterface_Tasks2,
 	kInterface_Max
 };
 
@@ -181,7 +182,7 @@ struct OBSEMessagingInterface
 		void		* data;
 	};
 
-	typedef void (* EventCallback)(Message* msg);
+	using EventCallback = void (*)(Message*);
 
 	enum {
 		kVersion = 1
@@ -593,11 +594,23 @@ struct OBSESerializationInterface
  */
 #if OBLIVION
 struct OBSETasksInterface {
-	Task<void>* (*EnqueueTask)(TaskFunc f);
+	Task<void>* (*EnqueueTask)(TaskFunc<void> f);
+	void (*RemoveTask)(Task<void>* f);
+	bool (*IsTaskPresent)(Task<void>* f);
+};
+
+struct OBSETasks2Interface {
+	enum {
+		kVersion = 1,
+	};
+
+
+	UInt32 version;
+	Task<void>* (*EnqueueTask)(TaskFunc<void> f);
 	void (*RemoveTask)(Task<void>* f);
 	bool (*IsTaskPresent)(Task<void>* f);
 	void (*ReEnqueueTask)(Task<void>* f);
-	Task<bool>* (*EnqueueTaskRemovable)(TaskFuncT<bool> f);
+	Task<bool>* (*EnqueueTaskRemovable)(TaskFunc<bool> f);
 	void (*RemoveTaskRemovable)(Task<bool>* f);
 	bool (*IsTaskPresentRemovable)(Task<bool>* f);
 	void (*ReEnqueueTaskRemovable)(Task<bool>* f);

diff --git a/obse/obse/PluginManager.cpp b/obse/obse/PluginManager.cpp
@@ -80,6 +80,13 @@ static OBSETasksInterface g_TasksInterface = {
 	PluginAPI::EnqueueTask,
 	PluginAPI::Remove,
 	PluginAPI::IsTaskEnqueued,
+};
+
+static OBSETasks2Interface g_Tasks2Interface = {
+	OBSETasks2Interface::kVersion,
+	PluginAPI::EnqueueTask,
+	PluginAPI::Remove,
+	PluginAPI::IsTaskEnqueued,
 	PluginAPI::ReEnqueueTask,
 	PluginAPI::EnqueueTask,
 	PluginAPI::Remove,
@@ -88,6 +95,7 @@ static OBSETasksInterface g_TasksInterface = {
 	PluginAPI::HasTasks
 };
 
+
 static OBSEInputInterface g_InputInterface = {
 	PluginAPI::DisableKey,
 	PluginAPI::EnableKey,
@@ -407,6 +415,9 @@ void * PluginManager::QueryInterface(UInt32 id)
 		case kInterface_Tasks:
 			result = &g_TasksInterface;
 			break;
+		case kInterface_Tasks2:
+			result = &g_Tasks2Interface;
+			break;
 		case kInterface_Input:
 			result = &g_InputInterface;
 			break;

diff --git a/obse/obse/Tasks.cpp b/obse/obse/Tasks.cpp
@@ -30,14 +30,14 @@ void Task<void>::Run() noexcept {
 ///TODO put CS in place.
 template<IsIntOrVoid T>
 void TaskManager::Enqueue(Task<T>* task)  {
-    auto queue = TaskManager::getQueue(task);
+    auto& queue = TaskManager::getQueue(task);
     queue.push_back(task);
 }
 
 template<IsIntOrVoid T>
-Task<T>* TaskManager::Enqueue(TaskFuncT<T> task) {
+Task<T>* TaskManager::Enqueue(TaskFunc<T> task) {
     Task<T>* func = new Task(task);
-    auto queue = TaskManager::getQueue(func);
+    auto& queue = TaskManager::getQueue(func);
     queue.push_back(func);
     return func;
 }
@@ -94,11 +94,11 @@ void TaskManager::Run() {
 
 namespace PluginAPI {
     void ReEnqueueTask(Task<void>* task) { return TaskManager::Enqueue(task); }
-    Task<void>* EnqueueTask(TaskFuncT<void> task) { return TaskManager::Enqueue(task); }
+    Task<void>* EnqueueTask(TaskFunc<void> task) { return TaskManager::Enqueue(task); }
     bool IsTaskEnqueued(Task<void>* task) { return TaskManager::IsTaskEnqueued(task); }
     void Remove(Task<void>* toRemove) { return TaskManager::Remove(toRemove); }
     void ReEnqueueTask(Task<bool>* task) { return TaskManager::Enqueue(task); }
-    Task<bool>* EnqueueTask(TaskFuncT<bool> task) { return TaskManager::Enqueue(task); }
+    Task<bool>* EnqueueTask(TaskFunc<bool> task) { return TaskManager::Enqueue(task); }
     bool IsTaskEnqueued(Task<bool>* task) { return TaskManager::IsTaskEnqueued(task); }
     void Remove(Task<bool>* toRemove) { return TaskManager::Remove(toRemove); }
 

diff --git a/obse/obse/Tasks.h b/obse/obse/Tasks.h
@@ -8,24 +8,23 @@ template<typename T>
 concept IsIntOrVoid = std::is_same<T, bool>::value || std::is_same<T, void>::value;
 
 
-template<IsIntOrVoid T> using TaskFuncT = T (*)();
+template<IsIntOrVoid T> using TaskFunc = T (*)();
 
-using TaskFunc = TaskFuncT<void>;
 
 template<IsIntOrVoid T>
 class Task {
-    TaskFuncT<T> task;
+    TaskFunc<T> task;
 
 public:
-    Task(TaskFuncT<T> task) noexcept: task(task) {}
+    Task(TaskFunc<T> task) noexcept: task(task) {}
 	T Run() noexcept;
 };
 
 class TaskManager {
 public:
-    static bool HasTasks() noexcept { return !s_taskQueue.empty(); }
+    static bool HasTasks() noexcept { return !s_taskQueue.empty() || !taskRemovableQueue.empty(); }
     template<IsIntOrVoid T> static void Enqueue(Task<T>* task);
-	template<IsIntOrVoid T> static Task<T>* Enqueue(TaskFuncT<T> task);
+	template<IsIntOrVoid T> static Task<T>* Enqueue(TaskFunc<T> task);
     template<IsIntOrVoid T> static bool IsTaskEnqueued(Task<T>* task);
     template<IsIntOrVoid T> static void Remove(Task<T>* task);
 	static void Run();
@@ -42,11 +41,11 @@ class TaskManager {
 
 namespace PluginAPI{
     void ReEnqueueTask(Task<void>* task);
-    Task<void>* EnqueueTask(TaskFuncT<void> task);
+    Task<void>* EnqueueTask(TaskFunc<void> task);
     bool IsTaskEnqueued(Task<void>* task);
     void Remove(Task<void>* task);
     void ReEnqueueTask(Task<bool>* task);
-    Task<bool>* EnqueueTask(TaskFuncT<bool> task);
+    Task<bool>* EnqueueTask(TaskFunc<bool> task);
     bool IsTaskEnqueued(Task<bool>* task);
     void Remove(Task<bool>* task);
 

diff --git a/obse/obse/obse.vcxproj b/obse/obse/obse.vcxproj
@@ -85,9 +85,10 @@
       <ForcedIncludeFiles>StdAfx.h;obse_common/obse_prefix.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <ControlFlowGuard>false</ControlFlowGuard>
-      <LanguageStandard>stdcpplatest</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
       <LanguageStandard_C>stdc17</LanguageStandard_C>
       <ConformanceMode>true</ConformanceMode>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
     </ClCompile>
     <Link>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -127,6 +128,7 @@
       <ConformanceMode>true</ConformanceMode>
       <EnableModules>true</EnableModules>
       <ExceptionHandling>Sync</ExceptionHandling>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>

diff --git a/obse/obse_editor/obse_editor.vcxproj b/obse/obse_editor/obse_editor.vcxproj
@@ -80,8 +80,9 @@
       <ForcedIncludeFiles>StdAfx.h;obse_common/obse_prefix.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpplatest</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
       <LanguageStandard_C>stdc17</LanguageStandard_C>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -110,9 +111,10 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <BufferSecurityCheck>false</BufferSecurityCheck>
-      <LanguageStandard>stdcpplatest</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
       <LanguageStandard_C>stdc17</LanguageStandard_C>
       <ExceptionHandling>Sync</ExceptionHandling>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>