Merge branch 'main' into hdfconverter-improvements

microsoft · Jul 24, 2023 · ed04f1e · ed04f1e
2 parents b923703 + 5b72930
commit ed04f1e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/Sarif.Driver/DumpEventsCommand.cs b/src/Sarif.Driver/DumpEventsCommand.cs
@@ -64,14 +64,14 @@ public int Run(DumpEventsOptions options)
 
                     if (traceEvent.Opcode == TraceEventOpcode.Start)
                     {
-                        string keyText = $"{traceEvent.PayloadByName(nameof(ruleId))}:{traceEvent.PayloadByName(nameof(ruleName))}:{traceEvent.ThreadID}";
+                        string keyText = $"{traceEvent.PayloadByName(nameof(filePath))}:{traceEvent.PayloadByName(nameof(ruleId))}:{traceEvent.PayloadByName(nameof(ruleName))}:{traceEvent.PayloadByName(nameof(context))}:{traceEvent.ThreadID}";
                         startStopKey = new StartStopKey(traceEvent.ProviderGuid, traceEvent.Task, keyText);
                         timingData.Add(startStopKey, traceEvent.TimeStampRelativeMSec);
                     }
 
                     if (traceEvent.Opcode == TraceEventOpcode.Stop)
                     {
-                        string keyText = $"{traceEvent.PayloadByName(nameof(ruleId))}:{traceEvent.PayloadByName(nameof(ruleName))}:{traceEvent.ThreadID}";
+                        string keyText = $"{traceEvent.PayloadByName(nameof(filePath))}:{traceEvent.PayloadByName(nameof(ruleId))}:{traceEvent.PayloadByName(nameof(ruleName))}:{traceEvent.PayloadByName(nameof(context))}:{traceEvent.ThreadID}";
                         startStopKey = new StartStopKey(traceEvent.ProviderGuid, traceEvent.Task, keyText);
                     }
 

diff --git a/src/Sarif.Driver/Sdk/MultithreadedAnalyzeCommandBase.cs b/src/Sarif.Driver/Sdk/MultithreadedAnalyzeCommandBase.cs
@@ -89,7 +89,7 @@ public virtual int Run(TOptions options, ref TContext globalContext)
                     if (globalContext.EventsFilePath.Equals("console", StringComparison.OrdinalIgnoreCase))
                     {
                         globalContext.TraceEventSession = new TraceEventSession($"Sarif-Driver-{Guid.NewGuid()}");
-                        globalContext.TraceEventSession.BufferSizeMB = 512;
+                        globalContext.TraceEventSession.BufferSizeMB = 2096;
                         TraceEventSession traceEventSession = globalContext.TraceEventSession;
                         globalContext.TraceEventSession.Source.Dynamic.All += (e =>
                         {
@@ -111,7 +111,7 @@ public virtual int Run(TOptions options, ref TContext globalContext)
                             : globalContext.EventsFilePath;
 
                         globalContext.TraceEventSession = new TraceEventSession($"Sarif-Driver-{Guid.NewGuid()}", etlFilePath);
-                        globalContext.TraceEventSession.BufferSizeMB = 512;
+                        globalContext.TraceEventSession.BufferSizeMB = 2096;
                         globalContext.TraceEventSession.EnableProvider(guid);
                     }
                 }
@@ -301,7 +301,7 @@ public virtual TContext InitializeGlobalContextFromOptions(TOptions options, ref
             context.EventsFilePath = Environment.GetEnvironmentVariable("SPMI_ETW") ?? options.EventsFilePath ?? context.EventsFilePath;
             context.PostUri = options.PostUri != null ? options.PostUri : context.PostUri;
             context.Recurse = options.Recurse != null ? options.Recurse.Value : context.Recurse;
-            context.Traces = options.Trace != null ? InitializeStringSet(options.Trace) : context.Traces;
+            context.Traces = options.Trace.Any() ? InitializeStringSet(options.Trace) : context.Traces;
             context.BaselineFilePath = options.BaselineFilePath != null ? options.BaselineFilePath : context.BaselineFilePath;
             context.DataToInsert = options.DataToInsert?.Any() == true ? options.DataToInsert.ToFlags() : context.DataToInsert;
             context.DataToRemove = options.DataToRemove?.Any() == true ? options.DataToRemove.ToFlags() : context.DataToRemove;