Skip to content

Commit

Permalink
Merge pull request #33 from Dynatrace/fix-dbgfiles
Browse files Browse the repository at this point in the history 
fix UNKNOWN frames
  • Loading branch information
@discostu105
discostu105 authored Mar 8, 2017
2 parents 66ad791 + d042b75 commit 7072a1a
Show file tree
Hide file tree
Showing 11 changed files with 27 additions and 17 deletions.
26 changes: 13 additions & 13 deletions src/SuperDump.sln
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26206.0
VisualStudioVersion = 15.0.26228.4
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "conf", "conf", "{F1C07791-3C2A-400E-8505-87F0AA3D21EC}"
ProjectSection(SolutionItems) = preProject
Expand Down Expand Up @@ -78,8 +78,8 @@ Global
{BB6EC51D-3ACC-4ADE-B09C-4217B4AD3C58}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BB6EC51D-3ACC-4ADE-B09C-4217B4AD3C58}.Debug|x64.ActiveCfg = Debug|Any CPU
{BB6EC51D-3ACC-4ADE-B09C-4217B4AD3C58}.Debug|x64.Build.0 = Debug|Any CPU
{BB6EC51D-3ACC-4ADE-B09C-4217B4AD3C58}.Debug|x86.ActiveCfg = Debug|x86
{BB6EC51D-3ACC-4ADE-B09C-4217B4AD3C58}.Debug|x86.Build.0 = Debug|x86
{BB6EC51D-3ACC-4ADE-B09C-4217B4AD3C58}.Debug|x86.ActiveCfg = Debug|Any CPU
{BB6EC51D-3ACC-4ADE-B09C-4217B4AD3C58}.Debug|x86.Build.0 = Debug|Any CPU
{BB6EC51D-3ACC-4ADE-B09C-4217B4AD3C58}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BB6EC51D-3ACC-4ADE-B09C-4217B4AD3C58}.Release|Any CPU.Build.0 = Release|Any CPU
{BB6EC51D-3ACC-4ADE-B09C-4217B4AD3C58}.Release|x64.ActiveCfg = Release|Any CPU
Expand All @@ -90,8 +90,8 @@ Global
{F362A805-CAD7-44A5-A6E3-6F69DD429C8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F362A805-CAD7-44A5-A6E3-6F69DD429C8E}.Debug|x64.ActiveCfg = Debug|Any CPU
{F362A805-CAD7-44A5-A6E3-6F69DD429C8E}.Debug|x64.Build.0 = Debug|Any CPU
{F362A805-CAD7-44A5-A6E3-6F69DD429C8E}.Debug|x86.ActiveCfg = Debug|x86
{F362A805-CAD7-44A5-A6E3-6F69DD429C8E}.Debug|x86.Build.0 = Debug|x86
{F362A805-CAD7-44A5-A6E3-6F69DD429C8E}.Debug|x86.ActiveCfg = Debug|Any CPU
{F362A805-CAD7-44A5-A6E3-6F69DD429C8E}.Debug|x86.Build.0 = Debug|Any CPU
{F362A805-CAD7-44A5-A6E3-6F69DD429C8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F362A805-CAD7-44A5-A6E3-6F69DD429C8E}.Release|Any CPU.Build.0 = Release|Any CPU
{F362A805-CAD7-44A5-A6E3-6F69DD429C8E}.Release|x64.ActiveCfg = Release|Any CPU
Expand All @@ -112,16 +112,16 @@ Global
{7AD98161-6822-47E6-8A68-9374D854599F}.Release|x86.Build.0 = Release|Any CPU
{68D2B1C2-740B-48B4-8CE0-88D8B9437541}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{68D2B1C2-740B-48B4-8CE0-88D8B9437541}.Debug|Any CPU.Build.0 = Debug|Any CPU
{68D2B1C2-740B-48B4-8CE0-88D8B9437541}.Debug|x64.ActiveCfg = Debug|x64
{68D2B1C2-740B-48B4-8CE0-88D8B9437541}.Debug|x64.Build.0 = Debug|x64
{68D2B1C2-740B-48B4-8CE0-88D8B9437541}.Debug|x86.ActiveCfg = Debug|x86
{68D2B1C2-740B-48B4-8CE0-88D8B9437541}.Debug|x86.Build.0 = Debug|x86
{68D2B1C2-740B-48B4-8CE0-88D8B9437541}.Debug|x64.ActiveCfg = Debug|Any CPU
{68D2B1C2-740B-48B4-8CE0-88D8B9437541}.Debug|x64.Build.0 = Debug|Any CPU
{68D2B1C2-740B-48B4-8CE0-88D8B9437541}.Debug|x86.ActiveCfg = Debug|Any CPU
{68D2B1C2-740B-48B4-8CE0-88D8B9437541}.Debug|x86.Build.0 = Debug|Any CPU
{68D2B1C2-740B-48B4-8CE0-88D8B9437541}.Release|Any CPU.ActiveCfg = Release|Any CPU
{68D2B1C2-740B-48B4-8CE0-88D8B9437541}.Release|Any CPU.Build.0 = Release|Any CPU
{68D2B1C2-740B-48B4-8CE0-88D8B9437541}.Release|x64.ActiveCfg = Release|x64
{68D2B1C2-740B-48B4-8CE0-88D8B9437541}.Release|x64.Build.0 = Release|x64
{68D2B1C2-740B-48B4-8CE0-88D8B9437541}.Release|x86.ActiveCfg = Release|x86
{68D2B1C2-740B-48B4-8CE0-88D8B9437541}.Release|x86.Build.0 = Release|x86
{68D2B1C2-740B-48B4-8CE0-88D8B9437541}.Release|x64.ActiveCfg = Release|Any CPU
{68D2B1C2-740B-48B4-8CE0-88D8B9437541}.Release|x64.Build.0 = Release|Any CPU
{68D2B1C2-740B-48B4-8CE0-88D8B9437541}.Release|x86.ActiveCfg = Release|Any CPU
{68D2B1C2-740B-48B4-8CE0-88D8B9437541}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
10 changes: 8 additions & 2 deletions src/SuperDump/SuperDump.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,14 +179,20 @@
<WCFMetadata Include="Service References\" />
</ItemGroup>
<ItemGroup Condition=" '$(Platform)' == 'x86'">
<NativeLibs Include="$(MSBuildThisFileDirectory)\dbgfiles\x86\*.dll" />
<NativeLibs Include="$(MSBuildThisFileDirectory)\dbgfiles\x86\dbgeng.dll" />
<NativeLibs Include="$(MSBuildThisFileDirectory)\dbgfiles\x86\dbghelp.dll" />
<NativeLibs Include="$(MSBuildThisFileDirectory)\dbgfiles\x86\msdia120.dll" />
<NativeLibs Include="$(MSBuildThisFileDirectory)\dbgfiles\x86\symsrv.dll" />
<None Include="@(NativeLibs)">
<Link>%(FileName)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup Condition=" '$(Platform)' == 'x64'">
<NativeLibs Include="$(MSBuildThisFileDirectory)\dbgfiles\x64\*.dll" />
<NativeLibs Include="$(MSBuildThisFileDirectory)\dbgfiles\x64\dbgeng.dll" />
<NativeLibs Include="$(MSBuildThisFileDirectory)\dbgfiles\x64\dbghelp.dll" />
<NativeLibs Include="$(MSBuildThisFileDirectory)\dbgfiles\x64\msdia120.dll" />
<NativeLibs Include="$(MSBuildThisFileDirectory)\dbgfiles\x64\symsrv.dll" />
<None Include="@(NativeLibs)">
<Link>%(FileName)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
Expand Down
Binary file added src/SuperDump/dbgfiles/x64/dbgeng.dll
View file
Binary file not shown.
Binary file added src/SuperDump/dbgfiles/x64/dbghelp.dll
View file
Binary file not shown.
Binary file added src/SuperDump/dbgfiles/x64/msdia120.dll
View file
Binary file not shown.
Binary file added src/SuperDump/dbgfiles/x64/symsrv.dll
View file
Binary file not shown.
Binary file added src/SuperDump/dbgfiles/x86/dbgeng.dll
View file
Binary file not shown.
Binary file added src/SuperDump/dbgfiles/x86/dbghelp.dll
View file
Binary file not shown.
Binary file added src/SuperDump/dbgfiles/x86/msdia120.dll
View file
Binary file not shown.
Binary file added src/SuperDump/dbgfiles/x86/symsrv.dll
View file
Binary file not shown.
8 changes: 6 additions & 2 deletions src/SuperDumpService/Services/AnalysisService.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ public async Task Analyze(DumpMetainfo dumpInfo, string dumpFilePath, string ana
private async Task AnalyzeWindows(DumpMetainfo dumpInfo, DirectoryInfo workingDir, string dumpFilePath) {
string dumpselector = pathHelper.GetDumpSelectorExePath();

Console.WriteLine($"launching '{dumpselector}' '{dumpFilePath}");
using (var process = await ProcessRunner.Run(dumpselector, workingDir, dumpFilePath, pathHelper.GetJsonPath(dumpInfo.BundleId, dumpInfo.DumpId))) {
Console.WriteLine($"launching '{dumpselector}' '{dumpFilePath}'");
using (var process = await ProcessRunner.Run(dumpselector, workingDir, WrapInQuotes(dumpFilePath), WrapInQuotes(pathHelper.GetJsonPath(dumpInfo.BundleId, dumpInfo.DumpId)))) {
string selectorLog = $"SuperDumpSelector exited with error code {process.ExitCode}" +
$"{Environment.NewLine}{Environment.NewLine}stdout:{Environment.NewLine}{process.StdOut}" +
$"{Environment.NewLine}{Environment.NewLine}stderr:{Environment.NewLine}{process.StdErr}";
Expand All @@ -74,6 +74,10 @@ private async Task AnalyzeWindows(DumpMetainfo dumpInfo, DirectoryInfo workingDi
await RunDebugDiagAnalysis(dumpInfo, workingDir, dumpFilePath);
}

private static string WrapInQuotes(string str) {
return $"\"{str}\"";
}

private async Task RunDebugDiagAnalysis(DumpMetainfo dumpInfo, DirectoryInfo workingDir, string dumpFilePath) {
//--dump = "C:\superdump\data\dumps\hno3391\iwb0664\iwb0664.dmp"--out= "C:\superdump\data\dumps\hno3391\iwb0664\debugdiagout.mht"--symbolPath = "cache*c:\localsymbols;http://msdl.microsoft.com/download/symbols"--overwrite
string reportFilePath = Path.Combine(pathHelper.GetDumpDirectory(dumpInfo.BundleId, dumpInfo.DumpId), "DebugDiagAnalysis.mht");
Expand Down

0 comments on commit 7072a1a

Please sign in to comment.