feat: make ETW configurable, doesn't actually do anything yet because we're stuck on .NET 5

Dalamud.Boot/DalamudStartInfo.cpp

@@ -86,6 +86,7 @@ void from_json(const nlohmann::json& json, DalamudStartInfo& config) {
     config.BootWaitDebugger = json.value("BootWaitDebugger", config.BootWaitDebugger);
     config.BootVehEnabled = json.value("BootVehEnabled", config.BootVehEnabled);
     config.BootVehFull = json.value("BootVehFull", config.BootVehFull);
+    config.BootEnableEtw = json.value("BootEnableEtw", config.BootEnableEtw);
     config.BootDotnetOpenProcessHookMode = json.value("BootDotnetOpenProcessHookMode", config.BootDotnetOpenProcessHookMode);
     if (const auto it = json.find("BootEnabledGameFixes"); it != json.end() && it->is_array()) {
         config.BootEnabledGameFixes.clear();
@@ -107,6 +108,7 @@ void DalamudStartInfo::from_envvars() {
     BootWaitDebugger = utils::get_env<bool>(L"DALAMUD_WAIT_DEBUGGER");
     BootVehEnabled = utils::get_env<bool>(L"DALAMUD_IS_VEH");
     BootVehFull = utils::get_env<bool>(L"DALAMUD_IS_VEH_FULL");
+    BootEnableEtw = utils::get_env<bool>(L"DALAMUD_ENABLE_ETW");
     BootDotnetOpenProcessHookMode = static_cast<DotNetOpenProcessHookMode>(utils::get_env<int>(L"DALAMUD_DOTNET_OPENPROCESS_HOOKMODE"));
     for (const auto& item : utils::get_env_list<std::string>(L"DALAMUD_GAMEFIX_LIST"))
         BootEnabledGameFixes.insert(unicode::convert<std::string>(item, &unicode::lower));

Dalamud.Boot/DalamudStartInfo.h

@@ -38,6 +38,7 @@ struct DalamudStartInfo {
     bool BootWaitDebugger = false;
     bool BootVehEnabled = false;
     bool BootVehFull = false;
+    bool BootEnableEtw = false;
     DotNetOpenProcessHookMode BootDotnetOpenProcessHookMode = DotNetOpenProcessHookMode::ImportHooks;
     std::set<std::string> BootEnabledGameFixes{};
     std::set<std::string> BootUnhookDlls{};

Dalamud.Boot/dllmain.cpp

@@ -116,6 +116,7 @@ DllExport DWORD WINAPI Initialize(LPVOID lpParam, HANDLE hMainThreadContinue) {
     void* entrypoint_vfn;
     int result = InitializeClrAndGetEntryPoint(
         g_hModule,
+        g_startInfo.BootEnableEtw,
         runtimeconfig_path,
         module_path,
         L"Dalamud.EntryPoint, Dalamud",

Dalamud.Injector.Boot/main.cpp

@@ -24,6 +24,7 @@ int wmain(int argc, wchar_t** argv)
     void* entrypoint_vfn;
     int result = InitializeClrAndGetEntryPoint(
         GetModuleHandleW(nullptr),
+        false,
         runtimeconfig_path,
         module_path,
         L"Dalamud.Injector.EntryPoint, Dalamud.Injector",

Dalamud.Injector/EntryPoint.cs

@@ -83,7 +83,8 @@ namespace Dalamud.Injector
             }
 
             startInfo = ExtractAndInitializeStartInfoFromArguments(startInfo, args);
-            args.Remove("--console"); // Remove "console" flag
+            args.Remove("--console"); // Remove "console" flag, already handled
+            args.Remove("--etw"); // Remove "etw" flag, already handled
 
             var mainCommand = args[1].ToLowerInvariant();
             if (mainCommand.Length > 0 && mainCommand.Length <= 6 && "inject"[..mainCommand.Length] == mainCommand)
@@ -321,6 +322,7 @@ namespace Dalamud.Injector
 
             // Set boot defaults
             startInfo.BootShowConsole = args.Contains("--console");
+            startInfo.BootEnableEtw = args.Contains("--etw");
             startInfo.BootLogPath = GetLogPath("dalamud.boot");
             startInfo.BootEnabledGameFixes = new List<string> { "prevent_devicechange_crashes", "disable_game_openprocess_access_check", "redirect_openprocess" };
             startInfo.BootDotnetOpenProcessHookMode = 0;
@@ -361,6 +363,7 @@ namespace Dalamud.Injector
 
             Console.WriteLine("Verbose logging:\t[-v]");
             Console.WriteLine("Show Console:\t[--console]");
+            Console.WriteLine("Enable ETW:\t[--etw]");
 
             return 0;
         }

Dalamud/DalamudStartInfo.cs

@@ -41,6 +41,7 @@ namespace Dalamud
             this.BootWaitDebugger = other.BootWaitDebugger;
             this.BootVehEnabled = other.BootVehEnabled;
             this.BootVehFull = other.BootVehFull;
+            this.BootEnableEtw = other.BootEnableEtw;
             this.BootDotnetOpenProcessHookMode = other.BootDotnetOpenProcessHookMode;
             this.BootEnabledGameFixes = other.BootEnabledGameFixes;
             this.BootUnhookDlls = other.BootUnhookDlls;
@@ -122,6 +123,11 @@ namespace Dalamud
         /// </summary>
         public bool BootVehFull { get; set; }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether or not ETW should be enabled.
+        /// </summary>
+        public bool BootEnableEtw { get; set; }
+
         /// <summary>
         /// Gets or sets a value choosing the OpenProcess hookmode.
         /// </summary>

lib/CoreCLR/boot.cpp

@@ -29,6 +29,7 @@ std::optional<CoreCLR> g_clr;
 
 int InitializeClrAndGetEntryPoint(
     void* calling_module,
+    bool enableEtw,
     std::wstring runtimeconfig_path,
     std::wstring module_path,
     std::wstring entrypoint_assembly_name,
@@ -49,10 +50,7 @@ int InitializeClrAndGetEntryPoint(
     SetEnvironmentVariable(L"DOTNET_TC_QuickJitForLoops", L"1");
     SetEnvironmentVariable(L"DOTNET_ReadyToRun", L"1");
 
-#if NDEBUG
+    SetEnvironmentVariable(L"COMPlus_ETWEnabled", enableEtw ? L"1" : L"0");
-    // This might fix extremely bad performance in some algorithms on insider builds
-    SetEnvironmentVariable(L"COMPlus_ETWEnabled", L"0");
-#endif
 
     wchar_t* dotnet_path;
     wchar_t* _appdata;

lib/CoreCLR/boot.h

@@ -3,6 +3,7 @@ void ConsoleTeardown();
 
 int InitializeClrAndGetEntryPoint(
     void* calling_module,
+    bool enableEtw,
     std::wstring runtimeconfig_path,
     std::wstring module_path,
     std::wstring entrypoint_assembly_name,