Skip to content

Commit

Permalink
Merge pull request #727 from vancem/Reformat
Browse files Browse the repository at this point in the history 
Ran format document on all files in the solution.
  • Loading branch information
@vancem
vancem authored Aug 15, 2018
2 parents bee7884 + 90d8ed8 commit ebc8046
Show file tree
Hide file tree
Showing 298 changed files with 36,613 additions and 18,135 deletions.
104 changes: 83 additions & 21 deletions src/CSVReader/CsvReader.cs
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
using System;
using ETLStackBrowse;
using EventSources;
using Microsoft.Diagnostics.Tracing.Stacks;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using ETLStackBrowse;
using System.Diagnostics;
using System.Text.RegularExpressions;
using System.Runtime.Remoting.Contexts;
using EventSources;
using Microsoft.Diagnostics.Tracing.Stacks;

namespace CSVReader
{
Expand Down Expand Up @@ -54,7 +51,9 @@ public List<string> StackEventNames
for (int i = 0; i < m_trace.StackTypes.Length; i++)
{
if (m_trace.StackTypes[i])
{
m_stackEventNames.Add(m_trace.RecordAtoms.MakeString(i));
}
}
m_stackEventNames.Sort();
}
Expand All @@ -81,7 +80,9 @@ public List<string> EventNames
for (int i = 0; i < m_trace.RecordAtoms.Count; i++)
{
if (m_trace.CommonFieldIds[i].count > 0)
{
m_EventNames.Add(m_trace.RecordAtoms.MakeString(i));
}
}
m_EventNames.Sort();
}
Expand Down Expand Up @@ -130,7 +131,9 @@ public bool[] GetProcessFilters()
for (int i = 0; i < ret.Length; i++)
{
if (!m_trace.Processes[i].ProcessName.StartsWith("Idle "))
{
ret[i] = true;
}
}
return ret;
}
Expand All @@ -141,7 +144,9 @@ public bool[] GetThreadFilters()
for (int i = 0; i < ret.Length; i++)
{
if (!m_trace.Threads[i].ProcessName.StartsWith("Idle "))
{
ret[i] = true;
}
}
return ret;
}
Expand Down Expand Up @@ -229,17 +234,20 @@ public bool[] GetFilters()
var ret = new bool[m_trace.RecordAtoms.Count];
int idSampleProfile = m_trace.RecordAtoms.Lookup(m_stackEventType);
if (idSampleProfile < 0)
{
throw new ApplicationException("Could not find StackEventType " + m_stackEventType);
}

ret[idSampleProfile] = true;
return ret;
}
#endregion

internal ETLTrace m_trace;
List<string> m_stackEventNames;
private List<string> m_stackEventNames;
internal string m_stackEventType; // typically "SampledProfile", and be any of the StackEventNames

List<string> m_EventNames;
private List<string> m_EventNames;
#endregion
}

Expand All @@ -254,23 +262,29 @@ public CSVStackSource(CSVReader reader, string eventName, double startRelativeMS
reader.T1 = long.MaxValue - 1000000;
double endusec = endRelativeMSec * 1000;
if (endusec < reader.T1)
{
reader.T1 = (long)endusec;
}

reader.m_trace.Parameters.T0 = reader.T0;
reader.m_trace.Parameters.T1 = reader.T1;

var result = reader.m_trace.StackStream(delegate(ETLTrace.Frame frame, ETLTrace.TreeComputer treeComputer, long timeUsec, ulong weight)
var result = reader.m_trace.StackStream(delegate (ETLTrace.Frame frame, ETLTrace.TreeComputer treeComputer, long timeUsec, ulong weight)
{
m_fullModulePaths = treeComputer.fullModuleNames;
StackSourceSample sample = new StackSourceSample(this);
sample.TimeRelativeMSec = timeUsec / 1000.0;
sample.Metric = weight;

if (reader.m_stackEventType == "CSwitch")
{
sample.Metric = sample.Metric / 1000.0F;
}

if (sample.Metric == 0)
{
sample.Metric = 1;
}

// Get rid of quotes.
treeComputer.fullModuleNames["\"Unknown\""] = "UNKNOWN";
Expand All @@ -293,7 +307,10 @@ public CSVStackSource(CSVReader reader, string eventName, double startRelativeMS
moduleName = fullFrameName.Substring(0, index);
string fullModuleName;
if (treeComputer.fullModuleNames.TryGetValue(moduleName, out fullModuleName))
{
moduleName = fullModuleName;
}

if (moduleName.Length > 4 && moduleName[moduleName.Length - 4] == '.')
{
#if false // TODO decide if we want to ignore the .NI.DLL and if so do it uniformly.
Expand All @@ -303,7 +320,7 @@ public CSVStackSource(CSVReader reader, string eventName, double startRelativeMS
moduleName = moduleName.Substring(0, moduleName.Length - 7);
else
#endif
moduleName = moduleName.Substring(0, moduleName.Length - 4);
moduleName = moduleName.Substring(0, moduleName.Length - 4);
}

// If the thread does not call into ntdll, we consider it broken
Expand All @@ -317,12 +334,16 @@ public CSVStackSource(CSVReader reader, string eventName, double startRelativeMS
{
Match m = Regex.Match(frameName, @"^tid *\( *(\d+)\)");
if (m.Success)
{
frameName = "Thread (" + m.Groups[1].Value + ")";
}
else
{
m = Regex.Match(frameName, @"^(.*?)(\.exe)? *\( *(\d+)\) *$");
if (m.Success)
{
frameName = "Process " + m.Groups[1].Value + " (" + m.Groups[3].Value + ")";
}
}
}

Expand All @@ -334,18 +355,18 @@ public CSVStackSource(CSVReader reader, string eventName, double startRelativeMS
}

sample.StackIndex = stackIndex;
this.AddSample(sample);
AddSample(sample);
});
Interner.DoneInterning();
}
}

#region private
Dictionary<string, string> m_fullModulePaths;
private Dictionary<string, string> m_fullModulePaths;
#endregion
}

class CsvEventSource : EventSource
internal class CsvEventSource : EventSource
{
public override ICollection<string> EventNames { get { return m_reader.EventNames; } }
public override void SetEventFilter(List<string> eventNames) { m_EventFilter = eventNames; }
Expand All @@ -355,7 +376,9 @@ public override void ForEach(Func<EventRecord, bool> callback)
foreach (var ev in Events)
{
if (!callback(ev))
{
break;
}
}
}
private IEnumerable<EventRecord> Events
Expand All @@ -381,51 +404,69 @@ private IEnumerable<EventRecord> Events
{
columnOrder = new Dictionary<string, int>();
for (int i = 0; i < ColumnsToDisplay.Count; i++)
{
columnOrder.Add(ColumnsToDisplay[i], i);
}

ColumnSums = new double[ColumnsToDisplay.Count];
}

trace.Parameters.T0 = (long)(StartTimeRelativeMSec * 1000);
var time = (EndTimeRelativeMSec * 1000.0);
if (time < long.MaxValue)
{
trace.Parameters.T1 = (long)time;
}
else
{
trace.Parameters.T1 = long.MaxValue - 100000;
}

var l = trace.StandardLineReader();

Regex processFilter = null;
if (!string.IsNullOrEmpty(ProcessFilterRegex))
{
processFilter = new Regex(ProcessFilterRegex, RegexOptions.IgnoreCase);
}

Regex textFilter = null;
if (!string.IsNullOrEmpty(TextFilterRegex))
{
textFilter = new Regex(TextFilterRegex, RegexOptions.IgnoreCase);
}

var count = 0;
var bTmp = new ByteWindow();
foreach (ByteWindow b in l.Lines())
{
string[] colNames = filter[l.idType];
if (colNames == null)
{
continue;
}

if (processFilter != null)
{
if (!processFilter.IsMatch(bTmp.Assign(b, 2).Trim().ToString()))
{
continue;
}
}

if (textFilter != null && !textFilter.IsMatch(b.ToString()))
{
continue;
}

var ret = new CsvEventRecord(b, this, colNames, columnOrder, ColumnSums);

// If we have exceeded MaxRet, then mark that fact TODO inefficient as we parse all other fields too!
count++;
if (MaxRet < count)
{
ret.m_EventName = null;
}

yield return ret;
}
Expand All @@ -439,8 +480,12 @@ public override ICollection<string> AllColumnNames(List<string> eventNames)
{
var recordId = m_reader.m_trace.RecordAtoms.Lookup(eventName);
foreach (var name in GetColumnNames(recordId))
{
if (name != null)
{
ret.Add(name);
}
}
}
ret.Sort();
return ret;
Expand All @@ -460,7 +505,10 @@ private string[] GetColumnNames(int recordId)
var ret = new string[colNames.Count];

for (int i = 3; i < ret.Length; i++)
{
ret[i] = m_reader.m_trace.FieldAtoms.MakeString(colNames[i]).Replace(" ", "");
}

return ret;
}

Expand All @@ -472,13 +520,13 @@ internal CsvEventSource(CSVReader reader)
MaxEventTimeRelativeMsec = double.PositiveInfinity;
}

CSVReader m_reader;
List<string> m_EventFilter;
private CSVReader m_reader;
private List<string> m_EventFilter;
internal StringBuilder m_sb;
#endregion
}

class CsvEventRecord : EventRecord
internal class CsvEventRecord : EventRecord
{
public override string EventName { get { return m_EventName; } }
public override double TimeStampRelatveMSec { get { return m_TimeStampRelativeMSec; } }
Expand All @@ -497,9 +545,14 @@ internal CsvEventRecord(ByteWindow window, CsvEventSource source, string[] colNa
putInRest = true;
string name;
if (fieldIdx < colNames.Length)
{
name = colNames[fieldIdx];
}
else
{
name = "unknown";
}

string valueStr = null;
if (columnOrder != null)
{
Expand All @@ -517,23 +570,32 @@ internal CsvEventRecord(ByteWindow window, CsvEventSource source, string[] colNa
{
long value;
if (long.TryParse(valueStr.Substring(2), out value))
{
columnSums[val] += value;
}
}
else
{
double numericVal;
if (double.TryParse(valueStr, out numericVal))
{
columnSums[val] += numericVal;
}
}
}
else
{
putInRest = true;
}
}
}
if (putInRest)
{
if (valueStr == null)
{
valueStr = window.Field(fieldIdx).Trim().ToString();
}

source.m_sb.Append(name).Append("=").Append(Quote(valueStr)).Append(' ');
}
}
Expand All @@ -544,7 +606,7 @@ internal CsvEventRecord(ByteWindow window, CsvEventSource source, string[] colNa
m_ProcessName = window.Field(2).Trim().ToString();
}

static public string Quote(string str)
public static string Quote(string str)
{
if (str.IndexOf('"') < 0)
{
Expand All @@ -555,9 +617,9 @@ static public string Quote(string str)
}

internal string m_EventName;
double m_TimeStampRelativeMSec;
string m_ProcessName;
string m_Data;
private double m_TimeStampRelativeMSec;
private string m_ProcessName;
private string m_Data;
#endregion
}
}
Loading

0 comments on commit ebc8046

Please # to comment.