Merge remote-tracking branch 'origin/7.0'8.0

Change-Id: I8ea621b1f308692591c256e22eeebe070740a3c9

6 files changed, 15 insertions, 10 deletions

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index b324907..6efe84b 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -25,9 +25,9 @@ add_qtc_library(perfparser_lib STATIC
 )
 
 if (Zstd_FOUND)
-    target_include_directories(perfparser_lib PRIVATE ${Zstd_INCLUDE_DIR})
-    target_link_libraries(perfparser_lib PRIVATE ${Zstd_LIBRARY})
-    target_compile_definitions(perfparser_lib PRIVATE HAVE_ZSTD=1)
+    target_include_directories(perfparser_lib PUBLIC ${Zstd_INCLUDE_DIR})
+    target_link_libraries(perfparser_lib PUBLIC ${Zstd_LIBRARY})
+    target_compile_definitions(perfparser_lib PUBLIC HAVE_ZSTD=1)
 endif()
 
 add_qtc_executable(perfparser
diff --git a/app/main.cpp b/app/main.cpp
index fe47c36..df233e8 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -80,7 +80,7 @@ int main(int argc, char *argv[])
 {
     QCoreApplication app(argc, argv);
     app.setApplicationName(QLatin1String("perfparser"));
-    app.setApplicationVersion(QLatin1String("4.14"));
+    app.setApplicationVersion(QLatin1String("7.0"));
 
     if (qEnvironmentVariableIsSet("PERFPARSER_DEBUG_WAIT")) {
 #ifdef Q_OS_LINUX
diff --git a/app/perfattributes.cpp b/app/perfattributes.cpp
index 3493d6b..311a689 100644
--- a/app/perfattributes.cpp
+++ b/app/perfattributes.cpp
@@ -204,6 +204,8 @@ bool PerfEventAttributes::operator==(const PerfEventAttributes &rhs) const
         && m_sampleIdAll == rhs.m_sampleIdAll
         && m_excludeHost == rhs.m_excludeHost
         && m_excludeGuest == rhs.m_excludeGuest
+        && m_excludeCallchainKernel == rhs.m_excludeCallchainKernel
+        && m_excludeCallchainUser == rhs.m_excludeCallchainUser
         && m_reserved1 == rhs.m_reserved1
         && m_wakeupEvents == rhs.m_wakeupEvents
         && m_bpType == rhs.m_bpType
diff --git a/app/perfattributes.h b/app/perfattributes.h
index b95ebf9..85fd7ae 100644
--- a/app/perfattributes.h
+++ b/app/perfattributes.h
@@ -240,8 +240,8 @@ private:
             m_excludeHost   : 1, /* don't count in host    */
             m_excludeGuest  : 1, /* don't count in guest   */
 
-            /* m_excludeCallchainKernel */ : 1, /* exclude kernel callchains */
-            /* m_excludeCallchainUser */ : 1, /* exclude user callchains   */
+            m_excludeCallchainKernel : 1, /* exclude kernel callchains */
+            m_excludeCallchainUser   : 1, /* exclude user callchains   */
 
             m_reserved1     : 41;
 
diff --git a/app/perfdwarfdiecache.cpp b/app/perfdwarfdiecache.cpp
index 4b70c0b..12dbb67 100644
--- a/app/perfdwarfdiecache.cpp
+++ b/app/perfdwarfdiecache.cpp
@@ -17,6 +17,8 @@
 **
 ****************************************************************************/
 
+#include <time.h>
+
 #include "perfdwarfdiecache.h"
 #include "perfeucompat.h"
 
@@ -186,7 +188,7 @@ void prependScopeNames(QByteArray &name, Dwarf_Die *die, QHash<Dwarf_Off, QByteA
         if (auto scopeLinkageName = linkageName(scope)) {
             // prepend the fully qualified linkage name
             name.prepend("::");
-            cacheOps.append({scopeOffset, name.size()});
+            cacheOps.append({scopeOffset, int(name.size())});
             // we have to demangle the scope linkage name, otherwise we get a
             // mish-mash of mangled and non-mangled names
             name.prepend(demangle(scopeLinkageName));
@@ -197,15 +199,15 @@ void prependScopeNames(QByteArray &name, Dwarf_Die *die, QHash<Dwarf_Off, QByteA
         if (auto scopeName = dwarf_diename(scope)) {
             // prepend this scope's name, e.g. the class or namespace name
             name.prepend("::");
-            cacheOps.append({scopeOffset, name.size()});
+            cacheOps.append({scopeOffset, int(name.size())});
             name.prepend(scopeName);
         }
 
         if (auto specification = specificationDie(scope, &dieMem)) {
             eu_compat_free(scopes);
             scopes = nullptr;
-            cacheOps.append({scopeOffset, name.size()});
-            cacheOps.append({dwarf_dieoffset(specification), name.size()});
+            cacheOps.append({scopeOffset, int(name.size())});
+            cacheOps.append({dwarf_dieoffset(specification), int(name.size())});
             // follow the scope's specification DIE instead
             prependScopeNames(name, specification, cache);
             break;
diff --git a/app/perfkallsyms.cpp b/app/perfkallsyms.cpp
index 6330357..123549a 100644
--- a/app/perfkallsyms.cpp
+++ b/app/perfkallsyms.cpp
@@ -20,6 +20,7 @@
 #include "perfkallsyms.h"
 
 #include <QFile>
+#include <QLocale>
 #include <QTextStream>
 
 #include <algorithm>