Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions config/x_ac_debuglibs.m4
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,9 @@ AC_DEFUN([X_AC_DEBUGLIBS], [
)
LDFLAGS=$TMP_LDFLAGS
if test "$libstackwalk_found" = yes; then
BELIBS="-ldyninstAPI -lstackwalk -lpcontrol -lparseAPI -linstructionAPI -lsymtabAPI -lcommon -ldynElf -ldynDwarf -lsymLite $BELIBS"
BELIBS="-ldyninstAPI -lstackwalk -lpcontrol -lparseAPI -linstructionAPI -lsymtabAPI -lcommon -ldynElf -ldynDwarf -lsymLite -ltbb $BELIBS"
else
LDFLAGS="$LDFLAGS -lstackwalk -lsymtabAPI -lpcontrol -lparseAPI -linstructionAPI -lcommon -lpthread"
LDFLAGS="$LDFLAGS -lstackwalk -lsymtabAPI -lpcontrol -lparseAPI -linstructionAPI -lcommon -ltbb -lpthread"
AC_LINK_IFELSE([AC_LANG_PROGRAM(#include "walker.h"
using namespace Dyninst;
using namespace Dyninst::Stackwalker;
Expand All @@ -149,7 +149,7 @@ AC_DEFUN([X_AC_DEBUGLIBS], [
)
LDFLAGS=$TMP_LDFLAGS
if test "$libstackwalk_found" = yes; then
BELIBS="-ldyninstAPI -lstackwalk -lsymtabAPI -lpcontrol -lparseAPI -linstructionAPI -lcommon $BELIBS"
BELIBS="-ldyninstAPI -lstackwalk -lsymtabAPI -lpcontrol -lparseAPI -linstructionAPI -lcommon -ltbb $BELIBS"
else
LDFLAGS="$LDFLAGS -lstackwalk -lsymtabAPI -lcommon -lpthread"
AC_LINK_IFELSE([AC_LANG_PROGRAM(#include "walker.h"
Expand All @@ -161,7 +161,7 @@ AC_DEFUN([X_AC_DEBUGLIBS], [
)
LDFLAGS=$TMP_LDFLAGS
if test "$libstackwalk_found" = yes; then
BELIBS="-ldyninstAPI -lstackwalk -lsymtabAPI -lcommon $BELIBS"
BELIBS="-ldyninstAPI -lstackwalk -lsymtabAPI -lcommon -ltbb $BELIBS"
else
AC_MSG_ERROR([libstackwalk is required. Specify libstackwalk prefix with --with-stackwalker])
fi
Expand Down
15 changes: 10 additions & 5 deletions src/STAT_BackEnd.C
Original file line number Diff line number Diff line change
Expand Up @@ -2323,16 +2323,21 @@ std::string STAT_BackEnd::getFrameName(map<string, string> &nodeAttrs, const Fra
bool boolRet;
char buf[BUFSIZE], fileName[BUFSIZE], *pyFun = NULL, *pySource = NULL;
string name;
vector<string> namesVector;
Address addr;
StatError_t statError;

if (!(sampleType_ & STAT_SAMPLE_MODULE_OFFSET))
{
boolRet = frame.getName(name);
if (boolRet == false)
name = "[unknown]";
else if (name == "")
name = "[empty]";
name = "[unknown]";
Function *func = getFunctionForFrame(frame);
if (func != NULL)
{
for (auto iter = func->pretty_names_begin(); iter != func->pretty_names_end(); ++iter)
namesVector.push_back(iter->c_str());
sort(namesVector.begin(), namesVector.end());
name = *(namesVector.begin());
}
nodeAttrs["function"] = name;
}

Expand Down
Loading