From 8a4fc0d9c308d667b72ccdb1e7e4878937f8a497 Mon Sep 17 00:00:00 2001 From: Jamie Reece Wilson Date: Thu, 13 Jul 2023 19:50:18 +0100 Subject: [PATCH] [*] Amend runtime config typo: Prefer* [-] Redundant AuTime header (ExtendedTimer.hpp) --- Include/Aurora/Runtime.hpp | 6 +++--- Include/Aurora/Time/ExtendedTimer.hpp | 0 Include/Aurora/Time/_Time.hpp | 3 +-- Source/AuProcAddresses.NT.cpp | 2 +- Source/Threading/Primitives/AuConditionVariable.NT.cpp | 8 ++++---- 5 files changed, 9 insertions(+), 10 deletions(-) delete mode 100644 Include/Aurora/Time/ExtendedTimer.hpp diff --git a/Include/Aurora/Runtime.hpp b/Include/Aurora/Runtime.hpp index 03946b08..848898d4 100644 --- a/Include/Aurora/Runtime.hpp +++ b/Include/Aurora/Runtime.hpp @@ -329,9 +329,9 @@ namespace Aurora bool bEnableAggressiveScheduling { false }; bool bEnableAgrSchedulingRatelimit { true }; bool bPreferNt51XpMutexesOver8 { false }; - bool bPerferNt51XpCondvarsOver8 { false }; - bool bPerferNtCondvarModernWinSpin { true }; // to reevaluate (true could cause double spinning depending on the nt version! prediction: true regardless) - bool bPerferNtCondvarOlderWinSpin { true }; // to reevaluate (true could cause excessive context switching in signaling thread! prediction: back to false) + bool bPreferNt51XpCondvarsOver8 { false }; + bool bPreferNtCondvarModernWinSpin { true }; // to reevaluate (true could cause double spinning depending on the nt version! prediction: true regardless) + bool bPreferNtCondvarOlderWinSpin { true }; // to reevaluate (true could cause excessive context switching in signaling thread! prediction: back to false) }; struct RuntimeStartInfo diff --git a/Include/Aurora/Time/ExtendedTimer.hpp b/Include/Aurora/Time/ExtendedTimer.hpp deleted file mode 100644 index e69de29b..00000000 diff --git a/Include/Aurora/Time/_Time.hpp b/Include/Aurora/Time/_Time.hpp index 2bd8c834..3b1fbbdc 100644 --- a/Include/Aurora/Time/_Time.hpp +++ b/Include/Aurora/Time/_Time.hpp @@ -27,5 +27,4 @@ namespace Aurora::Time } #include "Stopwatch.hpp" -#include "DebugBenchmark.hpp" -#include "ExtendedTimer.hpp" \ No newline at end of file +#include "DebugBenchmark.hpp" \ No newline at end of file diff --git a/Source/AuProcAddresses.NT.cpp b/Source/AuProcAddresses.NT.cpp index 411c5f54..05948e7c 100644 --- a/Source/AuProcAddresses.NT.cpp +++ b/Source/AuProcAddresses.NT.cpp @@ -131,7 +131,7 @@ namespace Aurora !pNtWaitForKeyedEvent; gUseNativeWaitCondvar = (pWaitOnAddress && - !gRuntimeConfig.threadingConfig.bPerferNt51XpCondvarsOver8 && + !gRuntimeConfig.threadingConfig.bPreferNt51XpCondvarsOver8 && (pRtlWaitOnAddress || AuBuild::kCurrentPlatform != AuBuild::EPlatform::ePlatformWin32)) || !pNtWaitForKeyedEvent; diff --git a/Source/Threading/Primitives/AuConditionVariable.NT.cpp b/Source/Threading/Primitives/AuConditionVariable.NT.cpp index fc59f604..a622b891 100644 --- a/Source/Threading/Primitives/AuConditionVariable.NT.cpp +++ b/Source/Threading/Primitives/AuConditionVariable.NT.cpp @@ -93,7 +93,7 @@ namespace Aurora::Threading::Primitives if (gUseNativeWaitCondvar) { // Reverted: 5b495f7fd9495aa55395666e166ac499955215dc - if (gRuntimeConfig.threadingConfig.bPerferNtCondvarModernWinSpin) + if (gRuntimeConfig.threadingConfig.bPreferNtCondvarModernWinSpin) { if (!bIOU) { @@ -115,7 +115,7 @@ namespace Aurora::Threading::Primitives else { // Reverted: 5b495f7fd9495aa55395666e166ac499955215dc - if (gRuntimeConfig.threadingConfig.bPerferNtCondvarOlderWinSpin) + if (gRuntimeConfig.threadingConfig.bPreferNtCondvarOlderWinSpin) { if (!bIOU) { @@ -234,7 +234,7 @@ namespace Aurora::Threading::Primitives if (gUseNativeWaitCondvar) { - if (gRuntimeConfig.threadingConfig.bPerferNtCondvarModernWinSpin) + if (gRuntimeConfig.threadingConfig.bPreferNtCondvarModernWinSpin) { if (!bIOU) { @@ -251,7 +251,7 @@ namespace Aurora::Threading::Primitives } else { - if (gRuntimeConfig.threadingConfig.bPerferNtCondvarOlderWinSpin) + if (gRuntimeConfig.threadingConfig.bPreferNtCondvarOlderWinSpin) { if (!bIOU) {