wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Alloc instrumentation backtraces use format_backtrace; Magnesium detects backtraces from binaries besides fdbserver.

This commit is contained in:
A.J. Beamon 2017-10-12 08:39:13 -07:00
parent 9648f96200
commit b20ae356b1
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
flow/Platform.cpp
View File

@ -2183,15 +2183,15 @@ void outOfMemory() {
for( auto i = traceCounts.begin(); i != traceCounts.end(); ++i ) {
char buf[1024];
std::vector<void *> *frames = i->second.backTrace;
std::string backTraceStr = "addr2line -e fdbserver.debug -p -C -f -i ";
for (int j = 1; j < frames->size(); j++) {
std::string backTraceStr;
#if defined(_WIN32)
for (int j = 1; j < frames->size(); j++) {
_snprintf(buf, 1024, "%p ", frames->at(j));
#else
snprintf(buf, 1024, "%p ", frames->at(j));
#endif
backTraceStr += buf;
}
#else
backTraceStr = format_backtrace(&(*frames)[0], frames->size());
#endif
TraceEvent("MemSample")
.detail("Count", (int64_t)i->second.count)
.detail("TotalSize", i->second.totalSize)

10
flow/SystemMonitor.cpp
View File

@ -186,15 +186,15 @@ SystemStatistics customSystemMonitor(std::string eventName, StatisticsState *sta
for( auto i = traceCounts.begin(); i != traceCounts.end(); ++i ) {
char buf[1024];
std::vector<void *> *frames = i->second.backTrace;
std::string backTraceStr = "addr2line -e fdbserver.debug -p -C -f -i ";
for (int j = 1; j < frames->size(); j++) {
std::string backTraceStr;
#if defined(_WIN32)
for (int j = 1; j < frames->size(); j++) {
_snprintf(buf, 1024, "%p ", frames->at(j));
#else
snprintf(buf, 1024, "%p ", frames->at(j));
#endif
backTraceStr += buf;
}
#else
backTraceStr = platform::format_backtrace(&(*frames)[0], frames->size());
#endif
TraceEvent("MemSample")
.detail("Count", (int64_t)i->second.count)