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

Make source file strings unique, reduces a lot of memory.

This commit is contained in:
ZehMatt 2017-12-18 21:10:55 +01:00 committed by Duncan Ogilvie
parent bd08f67f47
commit 058c14d8bf
No known key found for this signature in database
GPG Key ID: FC89E0AAA0C1AAD8
2 changed files with 45 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/dbg/symbolsourcepdb.cpp
View File

@ -152,7 +152,6 @@ bool SymbolSourcePDB::loadSymbolsAsync(String path)
return true;
}
bool SymbolSourcePDB::loadSourceLinesAsync(String path)
{
ScopedDecrement ref(_loadCounter);
@ -188,15 +187,36 @@ bool SymbolSourcePDB::loadSourceLinesAsync(String path)
if(it != _lines.end())
continue;
LineInfo lineInfo;
lineInfo.addr = info.virtualAddress;
lineInfo.disp = 0;
CachedLineInfo lineInfo;
lineInfo.rva = info.virtualAddress;
lineInfo.lineNumber = info.lineNumber;
lineInfo.sourceFile = info.fileName;
uint32_t idx = -1;
for(uint32_t n = 0; n < _sourceFiles.size(); n++)
{
const String & str = _sourceFiles[n];
size_t size = str.size();
if(size != info.fileName.size())
continue;
if(str[0] != info.fileName[0])
continue;
if(str[size - 1] != info.fileName[size - 1])
continue;
if(str != info.fileName)
continue;
idx = n;
break;
}
if(idx == -1)
{
idx = _sourceFiles.size();
_sourceFiles.push_back(info.fileName);
}
lineInfo.sourceFileIdx = idx;
_lockLines.lock();
_lines.insert(std::make_pair(lineInfo.addr, lineInfo));
_lines.insert(std::make_pair(lineInfo.rva, lineInfo));
_lockLines.unlock();
}
@ -216,7 +236,6 @@ bool SymbolSourcePDB::loadSourceLinesAsync(String path)
return true;
}
bool SymbolSourcePDB::findSymbolExact(duint rva, SymbolInfo & symInfo)
{
ScopedSpinLock lock(_lockSymbols);
@ -292,9 +311,15 @@ bool SymbolSourcePDB::findSourceLineInfo(duint rva, LineInfo & lineInfo)
ScopedSpinLock lock(_lockLines);
auto it = _lines.find(rva);
if(it == _lines.end())
return false;
if(it != _lines.end())
{
const CachedLineInfo & cached = it->second;
lineInfo.lineNumber = cached.lineNumber;
lineInfo.disp = 0;
lineInfo.size = 0;
lineInfo.sourceFile = _sourceFiles[cached.sourceFileIdx];
return true;
}
lineInfo = it->second;
return true;
return false;
}

10
src/dbg/symbolsourcepdb.h
View File

@ -37,6 +37,13 @@ public:
class SymbolSourcePDB : public SymbolSourceBase
{
struct CachedLineInfo
{
uint32 rva;
uint32 lineNumber;
uint32 sourceFileIdx;
};
struct ScopedDecrement
{
private:
@ -49,11 +56,12 @@ class SymbolSourcePDB : public SymbolSourceBase
private:
PDBDiaFile _pdb;
std::map<duint, SymbolInfo> _sym;
std::map<duint, LineInfo> _lines;
std::map<duint, CachedLineInfo> _lines;
std::thread _symbolsThread;
std::thread _sourceLinesThread;
std::atomic<bool> _requiresShutdown;
std::atomic<duint> _loadCounter;
std::vector<String> _sourceFiles;
duint _imageBase;
duint _imageSize;
SpinLock _lockSymbols;