x64dbg/x64dbg
x64dbg
/
x64dbg
1
0
Fork 0
Code Releases 5 Activity

DBG: improve memory usage and performance with line numbers

This commit is contained in:
Duncan Ogilvie 2018-09-27 13:02:45 +02:00
parent 25a67b778e
commit da69e828ea
6 changed files with 141 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

194
src/dbg/pdbdiafile.cpp
View File

@ -146,26 +146,16 @@ private:
public:
ScopedDiaType() : _sym(nullptr) {}
ScopedDiaType(T* sym) : _sym(sym) {}
~ScopedDiaType()
{
if(_sym != nullptr)
{
_sym->Release();
}
}
~ScopedDiaType() { if(_sym != nullptr) _sym->Release(); }
T** ref() { return &_sym; }
T* operator->()
{
return _sym;
}
operator T* ()
{
return _sym;
}
T** operator&() { return ref(); }
T* operator->() { return _sym; }
operator T* () { return _sym; }
void Attach(T* sym) { _sym = sym; }
};
typedef ScopedDiaType<IDiaSymbol> ScopedDiaSymbol;
typedef ScopedDiaType<IDiaEnumSymbols> ScopedDiaEnumSymbols;
template<typename T>
using CComPtr = ScopedDiaType<T>;
PDBDiaFile::PDBDiaFile() :
m_stream(nullptr),
@ -234,6 +224,13 @@ bool PDBDiaFile::open(const wchar_t* file, uint64_t loadAddress, DiaValidationDa
GuiSymbolLogAdd("Unable to open PDB file.\n");
return false;
}
/*std::vector<unsigned char> pdbData;
if (!FileHelper::ReadAllData(StringUtils::Utf16ToUtf8(file), pdbData))
{
GuiSymbolLogAdd("Unable to open PDB file.\n");
return false;
}
m_stream = SHCreateMemStream(pdbData.data(), pdbData.size());*/
if(validationData != nullptr)
{
@ -277,8 +274,8 @@ bool PDBDiaFile::open(const wchar_t* file, uint64_t loadAddress, DiaValidationDa
if(validationData != nullptr)
{
ScopedDiaType<IDiaSymbol> globalSym;
hr = m_session->get_globalScope(globalSym.ref());
CComPtr<IDiaSymbol> globalSym;
hr = m_session->get_globalScope(&globalSym);
if(testError(hr))
{
//??
@ -342,19 +339,25 @@ bool PDBDiaFile::close()
{
if(m_session)
{
m_session->Release();
auto refcount = m_session->Release();
if(refcount != 0)
dprintf("Memory leaks in IDiaSession (refcount: %u)\n", refcount);
m_session = nullptr;
}
if(m_dataSource)
{
m_dataSource->Release();
auto refcount = m_dataSource->Release();
if(refcount != 0)
dprintf("Memory leaks in IDiaDataSource (refcount: %u)\n", refcount);
m_dataSource = nullptr;
}
if(m_stream)
{
m_stream->Release();
auto refcount = m_stream->Release();
if(refcount != 0)
dprintf("Memory leaks in IStream (refcount: %u)\n", refcount);
m_stream = nullptr;
}
@ -423,15 +426,15 @@ std::string PDBDiaFile::getSymbolUndecoratedNameString(IDiaSymbol* sym)
return result;
}
bool PDBDiaFile::getFunctionLineNumbers(DWORD rva, ULONGLONG size, uint64_t imageBase, std::map<uint64_t, DiaLineInfo_t> & lines)
bool PDBDiaFile::enumerateLineNumbers(uint32_t rva, uint32_t size, std::vector<DiaLineInfo_t> & lines, std::map<DWORD, std::string> & files)
{
HRESULT hr;
DWORD lineNumber = 0;
DWORD relativeVirtualAddress = 0;
DWORD lineNumberEnd = 0;
ScopedDiaType<IDiaEnumLineNumbers> lineNumbersEnum;
hr = m_session->findLinesByRVA(rva, static_cast<DWORD>(size), lineNumbersEnum.ref());
CComPtr<IDiaEnumLineNumbers> lineNumbersEnum;
hr = m_session->findLinesByRVA(rva, size, &lineNumbersEnum);
if(!SUCCEEDED(hr))
return false;
@ -443,57 +446,50 @@ bool PDBDiaFile::getFunctionLineNumbers(DWORD rva, ULONGLONG size, uint64_t imag
if(lineCount == 0)
return true;
lines.reserve(lines.size() + lineCount);
std::vector<IDiaLineNumber*> lineNumbers;
lineNumbers.resize(lineCount);
ULONG fetched = 0;
hr = lineNumbersEnum->Next(lineCount, lineNumbers.data(), &fetched);
for(LONG n = 0; n < fetched; n++)
for(ULONG n = 0; n < fetched; n++)
{
ScopedDiaType<IDiaLineNumber> lineNumberInfo(lineNumbers[n]);
CComPtr<IDiaLineNumber> lineNumberInfo;
lineNumberInfo.Attach(lineNumbers[n]);
ScopedDiaType<IDiaSourceFile> sourceFile;
hr = lineNumberInfo->get_sourceFile(sourceFile.ref());
DWORD sourceFileId = 0;
hr = lineNumberInfo->get_sourceFileId(&sourceFileId);
if(!SUCCEEDED(hr))
continue;
hr = lineNumberInfo->get_lineNumber(&lineNumber);
if(!SUCCEEDED(hr))
continue;
if(!files.count(sourceFileId))
{
CComPtr<IDiaSourceFile> sourceFile;
hr = lineNumberInfo->get_sourceFile(&sourceFile);
if(!SUCCEEDED(hr))
continue;
hr = lineNumberInfo->get_relativeVirtualAddress(&relativeVirtualAddress);
if(!SUCCEEDED(hr))
continue;
BSTR fileName = nullptr;
hr = sourceFile->get_fileName(&fileName);
if(!SUCCEEDED(hr))
continue;
hr = lineNumberInfo->get_lineNumberEnd(&lineNumberEnd);
if(!SUCCEEDED(hr))
continue;
DWORD segment = -1;
hr = lineNumberInfo->get_addressSection(&segment);
if(!SUCCEEDED(hr))
continue;
DWORD offset = -1;
hr = lineNumberInfo->get_addressOffset(&offset);
if(!SUCCEEDED(hr))
continue;
BSTR fileName = nullptr;
hr = sourceFile->get_fileName(&fileName);
if(!SUCCEEDED(hr))
continue;
files.insert({ sourceFileId, StringUtils::Utf16ToUtf8(fileName) });
SysFreeString(fileName);
}
DiaLineInfo_t lineInfo;
lineInfo.fileName = StringUtils::Utf16ToUtf8(fileName);
lineInfo.lineNumber = lineNumber;
lineInfo.offset = offset;
lineInfo.segment = segment;
lineInfo.virtualAddress = relativeVirtualAddress;
lineInfo.sourceFileId = sourceFileId;
lines.emplace(lineInfo.virtualAddress, lineInfo);
hr = lineNumberInfo->get_lineNumber(&lineInfo.lineNumber);
if(!SUCCEEDED(hr))
continue;
SysFreeString(fileName);
hr = lineNumberInfo->get_relativeVirtualAddress(&lineInfo.rva);
if(!SUCCEEDED(hr))
continue;
lines.push_back(lineInfo);
}
return true;
@ -508,14 +504,14 @@ uint32_t getSymbolId(IDiaSymbol* sym)
bool PDBDiaFile::enumerateLexicalHierarchy(const Query_t & query)
{
ScopedDiaSymbol globalScope;
CComPtr<IDiaSymbol> globalScope;
IDiaSymbol* symbol = nullptr;
ULONG celt = 0;
HRESULT hr;
DiaSymbol_t symbolInfo;
bool res = true;
hr = m_session->get_globalScope(globalScope.ref());
hr = m_session->get_globalScope(&globalScope);
if(hr != S_OK)
return false;
@ -529,14 +525,14 @@ bool PDBDiaFile::enumerateLexicalHierarchy(const Query_t & query)
// Enumerate compilands.
{
ScopedDiaEnumSymbols enumSymbols;
CComPtr<IDiaEnumSymbols> enumSymbols;
hr = globalScope->findChildren(SymTagCompiland, nullptr, nsNone, enumSymbols.ref());
hr = globalScope->findChildren(SymTagCompiland, nullptr, nsNone, &enumSymbols);
if(hr == S_OK)
{
while((hr = enumSymbols->Next(1, &symbol, &celt)) == S_OK && celt == 1)
{
ScopedDiaSymbol sym(symbol);
CComPtr<IDiaSymbol> sym(symbol);
if(!enumerateCompilandScope(sym, context))
{
return false;
@ -547,14 +543,14 @@ bool PDBDiaFile::enumerateLexicalHierarchy(const Query_t & query)
// Enumerate publics.
{
ScopedDiaEnumSymbols enumSymbols;
CComPtr<IDiaEnumSymbols> enumSymbols;
hr = globalScope->findChildren(SymTagPublicSymbol, nullptr, nsNone, enumSymbols.ref());
hr = globalScope->findChildren(SymTagPublicSymbol, nullptr, nsNone, &enumSymbols);
if(hr == S_OK)
{
while((hr = enumSymbols->Next(1, &symbol, &celt)) == S_OK && celt == 1)
{
ScopedDiaSymbol sym(symbol);
CComPtr<IDiaSymbol> sym(symbol);
if(convertSymbolInfo(symbol, symbolInfo, context))
{
if(!context.callback(symbolInfo))
@ -568,14 +564,14 @@ bool PDBDiaFile::enumerateLexicalHierarchy(const Query_t & query)
// Enumerate global functions.
{
ScopedDiaEnumSymbols enumSymbols;
CComPtr<IDiaEnumSymbols> enumSymbols;
hr = globalScope->findChildren(SymTagFunction, nullptr, nsNone, enumSymbols.ref());
hr = globalScope->findChildren(SymTagFunction, nullptr, nsNone, &enumSymbols);
if(hr == S_OK)
{
while((hr = enumSymbols->Next(1, &symbol, &celt)) == S_OK && celt == 1)
{
ScopedDiaSymbol sym(symbol);
CComPtr<IDiaSymbol> sym(symbol);
if(convertSymbolInfo(sym, symbolInfo, context))
{
if(!context.callback(symbolInfo))
@ -589,14 +585,14 @@ bool PDBDiaFile::enumerateLexicalHierarchy(const Query_t & query)
// Enumerate global data.
{
ScopedDiaEnumSymbols enumSymbols;
CComPtr<IDiaEnumSymbols> enumSymbols;
hr = globalScope->findChildren(SymTagData, nullptr, nsNone, enumSymbols.ref());
hr = globalScope->findChildren(SymTagData, nullptr, nsNone, &enumSymbols);
if(hr == S_OK)
{
while((hr = enumSymbols->Next(1, &symbol, &celt)) == S_OK && celt == 1)
{
ScopedDiaSymbol sym(symbol);
CComPtr<IDiaSymbol> sym(symbol);
if(convertSymbolInfo(sym, symbolInfo, context))
{
if(!context.callback(symbolInfo))
@ -639,11 +635,11 @@ bool PDBDiaFile::findSymbolRVA(uint64_t address, DiaSymbol_t & sym, DiaSymbolTyp
}
long disp = 0;
hr = m_session->findSymbolByRVAEx(address, tag, &symbol, &disp);
hr = m_session->findSymbolByRVAEx((DWORD)address, tag, &symbol, &disp);
if(hr != S_OK)
return false;
ScopedDiaSymbol scopedSym(symbol);
CComPtr<IDiaSymbol> scopedSym(symbol);
sym.disp = disp;
@ -669,14 +665,14 @@ bool PDBDiaFile::enumerateCompilandScope(IDiaSymbol* compiland, InternalQueryCon
uint32_t symId = getSymbolId(compiland);
{
ScopedDiaEnumSymbols enumSymbols;
CComPtr<IDiaEnumSymbols> enumSymbols;
hr = compiland->findChildren(SymTagFunction, nullptr, nsNone, enumSymbols.ref());
hr = compiland->findChildren(SymTagFunction, nullptr, nsNone, &enumSymbols);
if(hr == S_OK)
{
while((hr = enumSymbols->Next(1, &symbol, &celt)) == S_OK && celt == 1)
{
ScopedDiaSymbol sym(symbol);
CComPtr<IDiaSymbol> sym(symbol);
hr = sym->get_symTag(&symTagType);
@ -693,14 +689,14 @@ bool PDBDiaFile::enumerateCompilandScope(IDiaSymbol* compiland, InternalQueryCon
}
{
ScopedDiaEnumSymbols enumSymbols;
CComPtr<IDiaEnumSymbols> enumSymbols;
hr = compiland->findChildren(SymTagData, nullptr, nsNone, enumSymbols.ref());
hr = compiland->findChildren(SymTagData, nullptr, nsNone, &enumSymbols);
if(hr == S_OK)
{
while((hr = enumSymbols->Next(1, &symbol, &celt)) == S_OK && celt == 1)
{
ScopedDiaSymbol sym(symbol);
CComPtr<IDiaSymbol> sym(symbol);
hr = sym->get_symTag(&symTagType);
@ -719,14 +715,14 @@ bool PDBDiaFile::enumerateCompilandScope(IDiaSymbol* compiland, InternalQueryCon
}
{
ScopedDiaEnumSymbols enumSymbols;
CComPtr<IDiaEnumSymbols> enumSymbols;
hr = compiland->findChildren(SymTagBlock, nullptr, nsNone, enumSymbols.ref());
hr = compiland->findChildren(SymTagBlock, nullptr, nsNone, &enumSymbols);
if(hr == S_OK)
{
while((hr = enumSymbols->Next(1, &symbol, &celt)) == S_OK && celt == 1)
{
ScopedDiaSymbol sym(symbol);
CComPtr<IDiaSymbol> sym(symbol);
hr = sym->get_symTag(&symTagType);
@ -745,14 +741,14 @@ bool PDBDiaFile::enumerateCompilandScope(IDiaSymbol* compiland, InternalQueryCon
}
{
ScopedDiaEnumSymbols enumSymbols;
CComPtr<IDiaEnumSymbols> enumSymbols;
hr = compiland->findChildren(SymTagLabel, nullptr, nsNone, enumSymbols.ref());
hr = compiland->findChildren(SymTagLabel, nullptr, nsNone, &enumSymbols);
if(hr == S_OK)
{
while((hr = enumSymbols->Next(1, &symbol, &celt)) == S_OK && celt == 1)
{
ScopedDiaSymbol sym(symbol);
CComPtr<IDiaSymbol> sym(symbol);
hr = sym->get_symTag(&symTagType);
@ -797,13 +793,13 @@ bool PDBDiaFile::processFunctionSymbol(IDiaSymbol* functionSym, InternalQueryCon
}
{
ScopedDiaEnumSymbols enumSymbols;
hr = functionSym->findChildren(SymTagData, nullptr, nsNone, enumSymbols.ref());
CComPtr<IDiaEnumSymbols> enumSymbols;
hr = functionSym->findChildren(SymTagData, nullptr, nsNone, &enumSymbols);
if(hr == S_OK)
{
while((hr = enumSymbols->Next(1, &symbol, &celt)) == S_OK && celt == 1)
{
ScopedDiaSymbol sym(symbol);
CComPtr<IDiaSymbol> sym(symbol);
hr = sym->get_symTag(&symTagType);
@ -825,13 +821,13 @@ bool PDBDiaFile::processFunctionSymbol(IDiaSymbol* functionSym, InternalQueryCon
}
{
ScopedDiaEnumSymbols enumSymbols;
hr = functionSym->findChildren(SymTagBlock, nullptr, nsNone, enumSymbols.ref());
CComPtr<IDiaEnumSymbols> enumSymbols;
hr = functionSym->findChildren(SymTagBlock, nullptr, nsNone, &enumSymbols);
if(hr == S_OK)
{
while((hr = enumSymbols->Next(1, &symbol, &celt)) == S_OK && celt == 1)
{
ScopedDiaSymbol sym(symbol);
CComPtr<IDiaSymbol> sym(symbol);
hr = sym->get_symTag(&symTagType);
@ -850,13 +846,13 @@ bool PDBDiaFile::processFunctionSymbol(IDiaSymbol* functionSym, InternalQueryCon
}
{
ScopedDiaEnumSymbols enumSymbols;
hr = functionSym->findChildren(SymTagLabel, nullptr, nsNone, enumSymbols.ref());
CComPtr<IDiaEnumSymbols> enumSymbols;
hr = functionSym->findChildren(SymTagLabel, nullptr, nsNone, &enumSymbols);
if(hr == S_OK)
{
while((hr = enumSymbols->Next(1, &symbol, &celt)) == S_OK && celt == 1)
{
ScopedDiaSymbol sym(symbol);
CComPtr<IDiaSymbol> sym(symbol);
hr = sym->get_symTag(&symTagType);
@ -886,8 +882,8 @@ bool PDBDiaFile::resolveSymbolSize(IDiaSymbol* symbol, uint64_t & size, uint32_t
if(symTag == SymTagData)
{
ScopedDiaSymbol symType;
hr = symbol->get_type(symType.ref());
CComPtr<IDiaSymbol> symType;
hr = symbol->get_type(&symType);
if(hr == S_OK && symType != nullptr)
{

2
src/dbg/pdbdiafile.h
View File

@ -50,7 +50,7 @@ public:
bool close();
bool getFunctionLineNumbers(DWORD rva, ULONGLONG size, uint64_t imageBase, std::map<uint64_t, DiaLineInfo_t> & lines);
bool enumerateLineNumbers(uint32_t rva, uint32_t size, std::vector<DiaLineInfo_t> & lines, std::map<DWORD, std::string> & files);
bool enumerateLexicalHierarchy(const Query_t & query);

6
src/dbg/pdbdiatypes.h
View File

@ -75,11 +75,9 @@ struct DiaSymbol_t
struct DiaLineInfo_t
{
std::string fileName;
DWORD sourceFileId;
DWORD lineNumber;
uint32_t offset;
uint32_t segment;
uint64_t virtualAddress;
DWORD rva;
};
#endif // PDBDIATYPES_H_

30
src/dbg/symbolsourcedia.cpp
View File

@ -121,7 +121,7 @@ bool SymbolSourceDIA::loadSymbolsAsync()
PDBDiaFile::Query_t query;
query.collectSize = true;
query.collectUndecoratedNames = true;
query.callback = [&](DiaSymbol_t & sym)->bool
query.callback = [&](DiaSymbol_t & sym) -> bool
{
if(_requiresShutdown)
return false;
@ -243,37 +243,41 @@ bool SymbolSourceDIA::loadSourceLinesAsync()
DWORD lineLoadStart = GetTickCount();
const size_t rangeSize = 1024 * 1024;
const uint32_t rangeSize = 1024 * 1024 * 10;
std::map<DWORD, String> files;
for(duint rva = 0; rva < _imageSize; rva += rangeSize)
{
if(_requiresShutdown)
return false;
std::map<uint64_t, DiaLineInfo_t> lines;
std::vector<DiaLineInfo_t> lines;
bool res = pdb.getFunctionLineNumbers(rva, rangeSize, _imageBase, lines);
bool res = pdb.enumerateLineNumbers(uint32_t(rva), rangeSize, lines, files);
for(const auto & line : lines)
{
if(_requiresShutdown)
return false;
const auto & info = line.second;
auto it = _lines.find(info.virtualAddress);
const auto & info = line;
auto it = _lines.find(info.rva);
if(it != _lines.end())
continue;
CachedLineInfo lineInfo;
lineInfo.rva = info.virtualAddress;
lineInfo.rva = info.rva;
lineInfo.lineNumber = info.lineNumber;
auto idx = findSourceFile(info.fileName);
if(idx == -1)
auto sourceFileId = info.sourceFileId;
auto found = _sourceIdMap.find(sourceFileId);
if(found == _sourceIdMap.end())
{
idx = _sourceFiles.size();
_sourceFiles.push_back(info.fileName);
auto idx = _sourceFiles.size();
_sourceFiles.push_back(files[sourceFileId]);
found = _sourceIdMap.insert({ sourceFileId, uint32_t(idx) }).first;
}
lineInfo.sourceFileIdx = idx;
lineInfo.sourceFileIdx = found->second;
_lockLines.lock();
@ -312,7 +316,7 @@ uint32_t SymbolSourceDIA::findSourceFile(const std::string & fileName) const
for(uint32_t n = 0; n < _sourceFiles.size(); n++)
{
const String & str = _sourceFiles[n];
if(stricmp(str.c_str(), fileName.c_str()) == 0)
if(_stricmp(str.c_str(), fileName.c_str()) == 0)
{
idx = n;
break;

3
src/dbg/symbolsourcedia.h
View File

@ -94,7 +94,8 @@ private: //line info
//TODO: make this source file stuff smarter
std::vector<CachedLineInfo> _linesData;
std::map<duint, size_t> _lines; //addr -> line
std::vector<String> _sourceFiles;
std::vector<String> _sourceFiles; // uniqueId + name
std::map<DWORD, uint32_t> _sourceIdMap; //uniqueId -> index in _sourceFiles
std::vector<std::map<int, size_t>> _sourceLines; //uses index in _sourceFiles
private: //general

24
src/dbg/symbolundecorator.h
View File

@ -1,5 +1,29 @@
#pragma once
/*
MIT License
Copyright (c) 2018 Duncan Ogilvie
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/
#include <stdlib.h>
#include <string>