Move CTF tracing plugin to plugins directory

A coming change to support streaming requires networking so having it in corelib is dubious. Pick-to: 6.5 Change-Id: Idc25abe23b5ed07823d749294796c9f318ef1744 Reviewed-by: Hatem ElKharashy <[email protected]> Reviewed-by: Tomi Korpipää <[email protected]> Reviewed-by: Janne Koskinen <[email protected]>
philipp-michelfeit · Mar 21, 2023 · aed3de3 · aed3de3
1 parent 643b6e5
commit aed3de3
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 19 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -43,9 +43,6 @@ endif()
 qt_install_3rdparty_library_wrap_config_extra_file(BundledZLIB)
 
 add_subdirectory(corelib)
-if (QT_FEATURE_ctf AND QT_FEATURE_library)
-    add_subdirectory(corelib/tracing)
-endif()
 
 # Needs to be after corelib, because some of them reference Core.
 add_subdirectory(3rdparty)

diff --git a/src/corelib/tracing/qctf.cpp b/src/corelib/tracing/qctf.cpp
@@ -8,7 +8,7 @@
 #include <qfileinfo.h>
 #include <qdir.h>
 
-#include "qctflib_p.h"
+#include "qctf_p.h"
 
 QT_BEGIN_NAMESPACE
 

diff --git a/src/corelib/tracing/qctf_p.h b/src/corelib/tracing/qctf_p.h
@@ -17,6 +17,7 @@
 //
 
 #include <qtcoreexports.h>
+#include <qobject.h>
 
 QT_REQUIRE_CONFIG(library);
 
@@ -220,6 +221,17 @@ inline QByteArray toByteArrayFromFlags(QFlags<T> value)
 
 #endif
 
+class Q_CORE_EXPORT QCtfLib : public QObject
+{
+    Q_OBJECT
+public:
+    virtual ~QCtfLib() = default;
+    virtual bool tracepointEnabled(const QCtfTracePointEvent &point) = 0;
+    virtual void doTracepoint(const QCtfTracePointEvent &point, const QByteArray &arr) = 0;
+    virtual bool sessionEnabled() = 0;
+    virtual QCtfTracePointPrivate *initializeTracepoint(const QCtfTracePointEvent &point) = 0;
+};
+
 QT_END_NAMESPACE
 
 #endif
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
@@ -25,3 +25,6 @@ if (TARGET Qt::Network)
     add_subdirectory(networkinformation)
     add_subdirectory(tls)
 endif()
+if (QT_FEATURE_ctf AND QT_FEATURE_library)
+    add_subdirectory(tracing)
+endif()
diff --git a/src/corelib/tracing/CMakeLists.txt → src/plugins/tracing/CMakeLists.txt b/src/corelib/tracing/CMakeLists.txt → src/plugins/tracing/CMakeLists.txt
@@ -18,6 +18,6 @@ qt_internal_add_plugin(QCtfTracePlugin
     SOURCES
         qctflib_p.h qctflib.cpp metadata_template.txt qctfplugin.cpp qctfplugin_p.h
     LIBRARIES
-        Qt6::Core
+        Qt6::Core Qt6::CorePrivate
 )
 
diff --git a/src/corelib/tracing/metadata_template.txt → src/plugins/tracing/metadata_template.txt b/src/corelib/tracing/metadata_template.txt → src/plugins/tracing/metadata_template.txt
diff --git a/src/corelib/tracing/qctflib.cpp → src/plugins/tracing/qctflib.cpp b/src/corelib/tracing/qctflib.cpp → src/plugins/tracing/qctflib.cpp
diff --git a/src/corelib/tracing/qctflib_p.h → src/plugins/tracing/qctflib_p.h b/src/corelib/tracing/qctflib_p.h → src/plugins/tracing/qctflib_p.h
@@ -16,7 +16,7 @@
 //
 //
 
-#include "qctf_p.h"
+#include <private/qctf_p.h>
 #include "qctfplugin_p.h"
 #include <qstring.h>
 #include <qmutex.h>

diff --git a/src/corelib/tracing/qctfplugin.cpp → src/plugins/tracing/qctfplugin.cpp b/src/corelib/tracing/qctfplugin.cpp → src/plugins/tracing/qctfplugin.cpp
@@ -8,7 +8,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QCtfTracePlugin : public QObject, public QCtfLib
+class QCtfTracePlugin : public QCtfLib
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QCtfLib" FILE "trace.json")

diff --git a/src/corelib/tracing/qctfplugin_p.h → src/plugins/tracing/qctfplugin_p.h b/src/corelib/tracing/qctfplugin_p.h → src/plugins/tracing/qctfplugin_p.h
@@ -16,22 +16,12 @@
 //
 //
 
-#include "qctf_p.h"
+#include <private/qctf_p.h>
 #include <qplugin.h>
 
 QT_BEGIN_NAMESPACE
 
-class QCtfLib
-{
-public:
-    virtual ~QCtfLib() = default;
-    virtual bool tracepointEnabled(const QCtfTracePointEvent &point) = 0;
-    virtual void doTracepoint(const QCtfTracePointEvent &point, const QByteArray &arr) = 0;
-    virtual bool sessionEnabled() = 0;
-    virtual QCtfTracePointPrivate *initializeTracepoint(const QCtfTracePointEvent &point) = 0;
-};
-
-Q_DECLARE_INTERFACE(QCtfLib, "org.qt-project.Qt.QCtfLib");
+Q_DECLARE_INTERFACE(QCtfLib, "org.qt-project.Qt.QCtfLib")
 
 QT_END_NAMESPACE
 

diff --git a/src/corelib/tracing/trace.json → src/plugins/tracing/trace.json b/src/corelib/tracing/trace.json → src/plugins/tracing/trace.json