clean up trace options parsing (#473)

* clean up trace command line options
explicitly shut down worker pools
* some additional startup trace scopes

1 files changed, 6 insertions, 18 deletions

diff --git a/src/zencore/memtrack/memorytrace.cpp b/src/zencore/memtrack/memorytrace.cpp
index e4ae8148e..8f723866d 100644
--- a/src/zencore/memtrack/memorytrace.cpp
+++ b/src/zencore/memtrack/memorytrace.cpp
@@ -294,7 +294,7 @@ static FUndestructed<FTraceMalloc> GTraceMalloc;
 
 ////////////////////////////////////////////////////////////////////////////////
 static EMemoryTraceInit
-MemoryTrace_ShouldEnable()
+MemoryTrace_ShouldEnable(const TraceOptions& Options)
 {
 	EMemoryTraceInit Mode = EMemoryTraceInit::Disabled;
 
@@ -328,19 +328,7 @@ MemoryTrace_ShouldEnable()
 		}
 	};
 
-	constexpr std::string_view TraceOption = "--trace="sv;
-
-	std::function<void(const std::string_view&)> ProcessArg = [&](const std::string_view& Arg) {
-		if (Arg.starts_with(TraceOption))
-		{
-			const std::string_view OptionArgs = Arg.substr(TraceOption.size());
-
-			IterateCommaSeparatedValue(OptionArgs, ProcessTraceArg);
-		}
-	};
-
-	IterateCommandlineArgs(ProcessArg);
-
+	IterateCommaSeparatedValue(Options.Channels, ProcessTraceArg);
 	return Mode;
 }
 
@@ -388,17 +376,17 @@ MemoryTrace_CreateInternal(FMalloc* InMalloc, EMemoryTraceInit Mode)
 
 ////////////////////////////////////////////////////////////////////////////////
 FMalloc*
-MemoryTrace_CreateInternal(FMalloc* InMalloc)
+MemoryTrace_CreateInternal(FMalloc* InMalloc, const TraceOptions& Options)
 {
-	const EMemoryTraceInit Mode = MemoryTrace_ShouldEnable();
+	const EMemoryTraceInit Mode = MemoryTrace_ShouldEnable(Options);
 	return MemoryTrace_CreateInternal(InMalloc, Mode);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 FMalloc*
-MemoryTrace_Create(FMalloc* InMalloc)
+MemoryTrace_Create(FMalloc* InMalloc, const TraceOptions& Options)
 {
-	FMalloc* OutMalloc = MemoryTrace_CreateInternal(InMalloc);
+	FMalloc* OutMalloc = MemoryTrace_CreateInternal(InMalloc, Options);
 
 	if (OutMalloc != InMalloc)
 	{