diff options
-rw-r--r-- | app/demangler.h | 4 | ||||
-rw-r--r-- | app/perfdwarfdiecache.cpp | 4 | ||||
-rw-r--r-- | app/perfdwarfdiecache.h | 10 | ||||
-rw-r--r-- | app/perfelfmap.h | 4 | ||||
-rw-r--r-- | app/perffeatures.h | 2 | ||||
-rw-r--r-- | app/perfkallsyms.h | 4 | ||||
-rw-r--r-- | app/perfsymboltable.cpp | 4 | ||||
-rw-r--r-- | app/perfsymboltable.h | 4 | ||||
-rw-r--r-- | app/perftracingdata.h | 10 | ||||
-rw-r--r-- | app/perfunwind.cpp | 4 | ||||
-rw-r--r-- | app/perfunwind.h | 4 | ||||
-rw-r--r-- | tests/auto/elfmap/tst_elfmap.cpp | 8 | ||||
-rw-r--r-- | tests/auto/perfdata/tst_perfdata.cpp | 2 |
13 files changed, 32 insertions, 32 deletions
diff --git a/app/demangler.h b/app/demangler.h index edb1244..91233ba 100644 --- a/app/demangler.h +++ b/app/demangler.h @@ -20,7 +20,7 @@ #ifndef DEMANGLER_H #define DEMANGLER_H -#include <QVector> +#include <QList> class Demangler { @@ -38,7 +38,7 @@ private: demangler_t demangler; }; - QVector<DemangleInfo> m_demanglers; + QList<DemangleInfo> m_demanglers; }; #endif // DEMANGLER_H diff --git a/app/perfdwarfdiecache.cpp b/app/perfdwarfdiecache.cpp index 10e432e..1445767 100644 --- a/app/perfdwarfdiecache.cpp +++ b/app/perfdwarfdiecache.cpp @@ -258,9 +258,9 @@ QByteArray demangle(const QByteArray &mangledName) return mangledName; } -QVector<Dwarf_Die> findInlineScopes(Dwarf_Die *subprogram, Dwarf_Addr offset) +QList<Dwarf_Die> findInlineScopes(Dwarf_Die *subprogram, Dwarf_Addr offset) { - QVector<Dwarf_Die> scopes; + QList<Dwarf_Die> scopes; walkDieTree([offset, &scopes](Dwarf_Die *die) { if (dwarf_tag(die) != DW_TAG_inlined_subroutine) return WalkResult::Recurse; diff --git a/app/perfdwarfdiecache.h b/app/perfdwarfdiecache.h index cede942..185acec 100644 --- a/app/perfdwarfdiecache.h +++ b/app/perfdwarfdiecache.h @@ -21,8 +21,8 @@ #include <libdwfl.h> -#include <QVector> #include <QHash> +#include <QList> #include <algorithm> @@ -44,7 +44,7 @@ struct DwarfRange struct DieRanges { Dwarf_Die die; - QVector<DwarfRange> ranges; + QList<DwarfRange> ranges; bool contains(Dwarf_Addr addr) const { @@ -97,7 +97,7 @@ private: Dwarf_Addr m_bias = 0; DieRanges m_cuDieRanges; - QVector<SubProgramDie> m_subPrograms; + QList<SubProgramDie> m_subPrograms; QHash<Dwarf_Off, QByteArray> m_dieNameCache; }; @@ -106,7 +106,7 @@ private: * @p subprogram DIE sub tree that should be traversed to look for inlined scopes * @p offset bias-corrected address that is checked against the dwarf ranges of the DIEs */ -QVector<Dwarf_Die> findInlineScopes(Dwarf_Die *subprogram, Dwarf_Addr offset); +QList<Dwarf_Die> findInlineScopes(Dwarf_Die *subprogram, Dwarf_Addr offset); /** * @return the absolute source path for a @p path that may be absolute already or relative to the compilation directory @@ -149,7 +149,7 @@ public: CuDieRangeMapping *findCuDie(Dwarf_Addr addr); public: - QVector<CuDieRangeMapping> m_cuDieRanges; + QList<CuDieRangeMapping> m_cuDieRanges; }; QT_BEGIN_NAMESPACE Q_DECLARE_TYPEINFO(DwarfRange, Q_MOVABLE_TYPE); diff --git a/app/perfelfmap.h b/app/perfelfmap.h index 01ba722..de1d478 100644 --- a/app/perfelfmap.h +++ b/app/perfelfmap.h @@ -21,7 +21,7 @@ #pragma once #include <QFileInfo> -#include <QVector> +#include <QList> #include <limits> class PerfElfMap : public QObject @@ -117,7 +117,7 @@ signals: private: // elf sorted by start address - QVector<ElfInfo> m_elfs; + QList<ElfInfo> m_elfs; // last registered elf with zero pgoff ElfInfo m_lastBase; }; diff --git a/app/perffeatures.h b/app/perffeatures.h index a946e2f..409f6b1 100644 --- a/app/perffeatures.h +++ b/app/perffeatures.h @@ -25,7 +25,7 @@ #include "perftracingdata.h" #include <QHash> -#include <QVector> +#include <QList> struct PerfEventHeader { PerfEventHeader() : type(0), misc(0), size(0) {} diff --git a/app/perfkallsyms.h b/app/perfkallsyms.h index 38acca8..e140d7a 100644 --- a/app/perfkallsyms.h +++ b/app/perfkallsyms.h @@ -21,7 +21,7 @@ #include <QByteArray> #include <QCoreApplication> -#include <QVector> +#include <QList> struct PerfKallsymEntry { @@ -45,6 +45,6 @@ public: PerfKallsymEntry findEntry(quint64 address) const; private: - QVector<PerfKallsymEntry> m_entries; + QList<PerfKallsymEntry> m_entries; QString m_errorString; }; diff --git a/app/perfsymboltable.cpp b/app/perfsymboltable.cpp index e5e7bbb..a70694c 100644 --- a/app/perfsymboltable.cpp +++ b/app/perfsymboltable.cpp @@ -246,7 +246,7 @@ int PerfSymbolTable::parseDie(CuDieRangeMapping *cudie, Dwarf_Die *top, quint64 } } -qint32 PerfSymbolTable::parseDwarf(CuDieRangeMapping *cudie, SubProgramDie *subprogram, const QVector<Dwarf_Die> &inlined, +qint32 PerfSymbolTable::parseDwarf(CuDieRangeMapping *cudie, SubProgramDie *subprogram, const QList<Dwarf_Die> &inlined, Dwarf_Addr bias, quint64 offset, quint64 size, quint64 relAddr, qint32 binaryId, qint32 binaryPathId, qint32 actualPathId, bool isKernel) { Dwarf_Files *files = nullptr; @@ -779,7 +779,7 @@ static bool operator<(const PerfSymbolTable::PerfMapSymbol &a, QByteArray PerfSymbolTable::symbolFromPerfMap(quint64 ip, GElf_Off *offset) const { - QVector<PerfMapSymbol>::ConstIterator sym + QList<PerfMapSymbol>::ConstIterator sym = std::upper_bound(m_perfMap.begin(), m_perfMap.end(), PerfMapSymbol(ip)); if (sym != m_perfMap.begin()) { --sym; diff --git a/app/perfsymboltable.h b/app/perfsymboltable.h index 3387245..39f44a2 100644 --- a/app/perfsymboltable.h +++ b/app/perfsymboltable.h @@ -109,7 +109,7 @@ private: }; QFile m_perfMapFile; - QVector<PerfMapSymbol> m_perfMap; + QList<PerfMapSymbol> m_perfMap; bool m_hasPerfMap; bool m_cacheIsDirty; @@ -129,7 +129,7 @@ private: Dwarf_Files *files, Dwarf_Addr entry, qint32 parentLocationId); int insertSubprogram(CuDieRangeMapping *cudie, Dwarf_Die *top, Dwarf_Addr entry, quint64 offset, quint64 size, quint64 relAddr, qint32 binaryId, qint32 binaryPathId, qint32 actualPathId, qint32 inlineParent, bool isKernel); - qint32 parseDwarf(CuDieRangeMapping *cudie, SubProgramDie *subprogram, const QVector<Dwarf_Die> &inlined, + qint32 parseDwarf(CuDieRangeMapping *cudie, SubProgramDie *subprogram, const QList<Dwarf_Die> &inlined, Dwarf_Addr bias, quint64 offset, quint64 size, quint64 relAddr, qint32 binaryId, qint32 binaryPathId, qint32 actualPathId, bool isKernel); }; diff --git a/app/perftracingdata.h b/app/perftracingdata.h index 3c83daf..8654a4c 100644 --- a/app/perftracingdata.h +++ b/app/perftracingdata.h @@ -22,7 +22,7 @@ #include <QByteArray> #include <QHash> -#include <QVector> +#include <QList> enum FormatFlags: quint32 { @@ -63,8 +63,8 @@ struct EventFormat { QByteArray name; QByteArray system; - QVector<FormatField> commonFields; - QVector<FormatField> fields; + QList<FormatField> commonFields; + QList<FormatField> fields; quint32 flags = 0; }; @@ -95,9 +95,9 @@ private: qint32 m_filePageSize = false; QHash<qint32, EventFormat> m_eventFormats; - QVector<FormatField> m_headerFields; + QList<FormatField> m_headerFields; QHash<quint64, QByteArray> m_ftracePrintk; - QVector<QByteArray> m_savedCmdlines; + QList<QByteArray> m_savedCmdlines; friend QDataStream &operator>>(QDataStream &stream, PerfTracingData &record); }; diff --git a/app/perfunwind.cpp b/app/perfunwind.cpp index e8607fb..e0aa9ba 100644 --- a/app/perfunwind.cpp +++ b/app/perfunwind.cpp @@ -553,7 +553,7 @@ void PerfUnwind::unwindStack() dwfl_getthread_frames(dwfl, m_currentUnwind.sample->pid(), frameCallback, &m_currentUnwind); if (m_currentUnwind.isInterworking) { - QVector<qint32> savedFrames = m_currentUnwind.frames; + QList<qint32> savedFrames = m_currentUnwind.frames; // If it's an ARM interworking veneer, we assume that we can find a return address in LR and // no stack has been used for the veneer itself. @@ -790,7 +790,7 @@ void PerfUnwind::analyze(const PerfRecordSample &sample) } } - QVector<QPair<qint32, quint64>> values; + QList<QPair<qint32, quint64>> values; const auto readFormats = sample.readFormats(); if (readFormats.isEmpty()) { values.push_back({ attributesId, sample.period() }); diff --git a/app/perfunwind.h b/app/perfunwind.h index fdb78b0..574e9e7 100644 --- a/app/perfunwind.h +++ b/app/perfunwind.h @@ -101,7 +101,7 @@ public: firstGuessedFrame(-1), isInterworking(false) {} QHash<qint32, QHash<quint64, Dwarf_Word>> stackValues; - QVector<qint32> frames; + QList<qint32> frames; PerfUnwind *unwind; const PerfRecordSample *sample; int maxFrames; @@ -303,7 +303,7 @@ private: QHash<Location, qint32> m_locations; QHash<qint32, Symbol> m_symbols; QHash<quint64, qint32> m_attributeIds; - QVector<PerfEventAttributes> m_attributes; + QList<PerfEventAttributes> m_attributes; QHash<QByteArray, QByteArray> m_buildIds; uint m_lastEventBufferSize; diff --git a/tests/auto/elfmap/tst_elfmap.cpp b/tests/auto/elfmap/tst_elfmap.cpp index 5b70758..9d27eee 100644 --- a/tests/auto/elfmap/tst_elfmap.cpp +++ b/tests/auto/elfmap/tst_elfmap.cpp @@ -100,7 +100,7 @@ private slots: QCOMPARE(map.findElf(110), first); PerfElfMap::ElfInfo second(file1, 105, 20, 0); - QCOMPARE(registerElf(&map, second), QVector<PerfElfMap::ElfInfo>{first}); + QCOMPARE(registerElf(&map, second), QList<PerfElfMap::ElfInfo>{first}); if (firstIsFile) second.baseAddr = first.addr; QCOMPARE(map.findElf(110), second); @@ -109,7 +109,7 @@ private slots: QCOMPARE(map.findElf(97), fragment1); const PerfElfMap::ElfInfo third(file2, 100, 20, 0); - QVector<PerfElfMap::ElfInfo> invalidatedByThird = {fragment1, second}; + QList<PerfElfMap::ElfInfo> invalidatedByThird = {fragment1, second}; QCOMPARE(registerElf(&map, third), invalidatedByThird); QCOMPARE(map.findElf(110), third); QCOMPARE(map.findElf(110), third); @@ -345,9 +345,9 @@ private slots: } private: - QVector<PerfElfMap::ElfInfo> registerElf(PerfElfMap *map, const PerfElfMap::ElfInfo &info) + QList<PerfElfMap::ElfInfo> registerElf(PerfElfMap *map, const PerfElfMap::ElfInfo &info) { - QVector<PerfElfMap::ElfInfo> invalidated; + QList<PerfElfMap::ElfInfo> invalidated; auto connection = connect(map, &PerfElfMap::aboutToInvalidate, this, [&invalidated](const PerfElfMap::ElfInfo& other) { // clazy:exclude=lambda-in-connect invalidated.push_back(other); diff --git a/tests/auto/perfdata/tst_perfdata.cpp b/tests/auto/perfdata/tst_perfdata.cpp index 5b6894c..9855172 100644 --- a/tests/auto/perfdata/tst_perfdata.cpp +++ b/tests/auto/perfdata/tst_perfdata.cpp @@ -173,7 +173,7 @@ void TestPerfData::testTracingData() PerfParserTestClient client; client.extractTrace(&output); - const QVector<PerfParserTestClient::SampleEvent> samples = client.samples(); + const QList<PerfParserTestClient::SampleEvent> samples = client.samples(); QVERIFY(samples.length() > 0); for (const PerfParserTestClient::SampleEvent &sample : samples) { QCOMPARE(sample.values.size(), 1); |