Show function, file and module information

diff --git a/gui/model.cpp b/gui/model.cpp
index 315d9c6735e3a01e3c477c312d816d89b8020ffa..aa6329a999e8a0206c2764df45c3f182d7c7a9dd 100644 (file)
--- a/gui/model.cpp
+++ b/gui/model.cpp
@@ -56,8 +56,12 @@ QVariant Model::headerData(int section, Qt::Orientation orientation, int role) c
         return QVariant();
     }
     switch (static_cast<Columns>(section)) {
-        case LocationColumn:
-            return tr("Location");
+        case FileColumn:
+            return tr("File");
+        case FunctionColumn:
+            return tr("Function");
+        case ModuleColumn:
+            return tr("Module");
         case AllocationsColumn:
             return tr("Allocations");
         case PeakColumn:
@@ -92,8 +96,24 @@ QVariant Model::data(const QModelIndex& index, int role) const
             return static_cast<quint64>(allocation.leaked);
         case AllocatedColumn:
             return static_cast<quint64>(allocation.allocated);
-        case LocationColumn:
+        case FileColumn:
+        case ModuleColumn:
+        case FunctionColumn: {
+            const auto& ip = m_data.findIp(allocation.ipIndex);
+            if (index.column() == FunctionColumn) {
+                if (ip.functionIndex) {
+                    return QString::fromStdString(m_data.prettyFunction(m_data.stringify(ip.functionIndex)));
+                } else {
+                    return QLatin1String("0x") + QString::number(ip.instructionPointer, 16);
+                }
+            } else if (index.column() == ModuleColumn) {
+                return QString::fromStdString(m_data.stringify(ip.moduleIndex));
+            } else if (ip.fileIndex) {
+                auto file = QString::fromStdString(m_data.stringify(ip.fileIndex));
+                return file + QLatin1Char(':') + QString::number(ip.line);
+            }
             return QVariant();
+        }
         case NUM_COLUMNS:
             break;
         }

diff --git a/gui/model.h b/gui/model.h
index fae921bde643aada486cef853d9b83626e26ce9c..d9ad24df4ed1721ce3465072cabf6338e192cd11 100644 (file)
--- a/gui/model.h
+++ b/gui/model.h
@@ -36,7 +36,9 @@ public:
         PeakColumn,
         LeakedColumn,
         AllocatedColumn,
-        LocationColumn,
+        FunctionColumn,
+        FileColumn,
+        ModuleColumn,
         NUM_COLUMNS
     };