From: "Yordan Karadzhov (VMware)" <y.karadz@gmail.com>
To: rostedt@goodmis.org
Cc: linux-trace-devel@vger.kernel.org,
"Yordan Karadzhov (VMware)" <y.karadz@gmail.com>
Subject: [PATCH v6 09/27] kernel-shark: Start introducing KernelShark 2.0
Date: Wed, 9 Dec 2020 15:41:45 +0200 [thread overview]
Message-ID: <20201209134203.428068-10-y.karadz@gmail.com> (raw)
In-Reply-To: <20201209134203.428068-1-y.karadz@gmail.com>
This is the very first patch from a series of patches that will
introduce KernelShark 2.0. The new version will take advantage
of the definition of Data streams and will imply significant
changes in the low level C API, used by the KernelShark GUI. As
a consequence of the API modifications, significant changes are
needed in every source file of the project. Because, we want to
avoid having a huge and ugly single commit that will be extremely
hard to review, we will introduce a regression. We will first
disable the compilation of all sub-components of KernelShark,
except the API itself. This is done by bypassing the search of
the necessary third party components (OpenGL and Qt). Later we
will introduce the changes of the API in several sub-steps and
will re-enable one by one the modified components of the GUI.
Signed-off-by: Yordan Karadzhov (VMware) <y.karadz@gmail.com>
---
CMakeLists.txt | 10 ++++----
build/deff.h.cmake | 14 ++---------
examples/CMakeLists.txt | 54 ++++++++++++++++++++---------------------
src/CMakeLists.txt | 6 ++---
4 files changed, 37 insertions(+), 47 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c95249e..ccca95c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,12 +26,12 @@ include(${KS_DIR}/build/FindJSONC.cmake)
find_package(Doxygen)
-set(OpenGL_GL_PREFERENCE LEGACY)
-find_package(OpenGL)
-find_package(GLUT)
+# set(OpenGL_GL_PREFERENCE LEGACY)
+# find_package(OpenGL)
+# find_package(GLUT)
-find_package(Qt5Widgets 5.7.1)
-find_package(Qt5Network)
+# find_package(Qt5Widgets 5.7.1)
+# find_package(Qt5Network)
if (Qt5Widgets_FOUND)
message(STATUS "Found Qt5Widgets: (version ${Qt5Widgets_VERSION})")
diff --git a/build/deff.h.cmake b/build/deff.h.cmake
index 79726ff..e398c0c 100644
--- a/build/deff.h.cmake
+++ b/build/deff.h.cmake
@@ -23,17 +23,7 @@
/** "pkexec" executable. */
#cmakedefine DO_AS_ROOT "@DO_AS_ROOT@"
-#ifdef __cplusplus
-
- #include <QString>
-
- /**
- * String containing semicolon-separated list of plugin names.
- * The plugins to be loaded when KernelShark starts are tagged
- * with "default".
- */
- const QString plugins = "@PLUGINS@";
-
-#endif /* __cplusplus */
+/** Semicolon-separated list of plugin names. */
+#define KS_BUILTIN_PLUGINS "@PLUGINS@"
#endif // _KS_CONFIG_H
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 032f305..f6ed897 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -4,30 +4,30 @@ message(STATUS "dataload")
add_executable(dload dataload.c)
target_link_libraries(dload kshark)
-message(STATUS "datafilter")
-add_executable(dfilter datafilter.c)
-target_link_libraries(dfilter kshark)
-
-message(STATUS "datahisto")
-add_executable(dhisto datahisto.c)
-target_link_libraries(dhisto kshark)
-
-message(STATUS "confogio")
-add_executable(confio configio.c)
-target_link_libraries(confio kshark)
-
-message(STATUS "dataplot")
-add_executable(dplot dataplot.cpp)
-target_link_libraries(dplot kshark-plot)
-
-if (Qt5Widgets_FOUND)
-
- message(STATUS "widgetdemo")
- add_executable(widgetdemo widgetdemo.cpp)
- target_link_libraries(widgetdemo kshark-gui)
-
- message(STATUS "cmd_split")
- add_executable(cmd_split cmd_split.cpp)
- target_link_libraries(cmd_split kshark-gui)
-
-endif (Qt5Widgets_FOUND)
+# message(STATUS "datafilter")
+# add_executable(dfilter datafilter.c)
+# target_link_libraries(dfilter kshark)
+#
+# message(STATUS "datahisto")
+# add_executable(dhisto datahisto.c)
+# target_link_libraries(dhisto kshark)
+#
+# message(STATUS "confogio")
+# add_executable(confio configio.c)
+# target_link_libraries(confio kshark)
+#
+# message(STATUS "dataplot")
+# add_executable(dplot dataplot.cpp)
+# target_link_libraries(dplot kshark-plot)
+#
+# if (Qt5Widgets_FOUND)
+#
+# message(STATUS "widgetdemo")
+# add_executable(widgetdemo widgetdemo.cpp)
+# target_link_libraries(widgetdemo kshark-gui)
+#
+# message(STATUS "cmd_split")
+# add_executable(cmd_split cmd_split.cpp)
+# target_link_libraries(cmd_split kshark-gui)
+#
+# endif (Qt5Widgets_FOUND)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4d4f37b..2bdab1a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,10 +3,10 @@ message("\n src ...")
message(STATUS "libkshark")
add_library(kshark SHARED libkshark.c
libkshark-hash.c
- libkshark-model.c
+# libkshark-model.c
libkshark-plugin.c
libkshark-tepdata.c
- libkshark-configio.c
+# libkshark-configio.c
libkshark-collection.c)
target_link_libraries(kshark ${TRACECMD_LIBRARY}
@@ -101,7 +101,7 @@ if (Qt5Widgets_FOUND AND Qt5Network_FOUND)
endif (Qt5Widgets_FOUND AND Qt5Network_FOUND)
-add_subdirectory(plugins)
+# add_subdirectory(plugins)
find_program(DO_AS_ROOT pkexec)
--
2.25.1
next prev parent reply other threads:[~2020-12-09 13:43 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-09 13:41 [PATCH v6 00/27] Start KernelShark v2 transformation Yordan Karadzhov (VMware)
2020-12-09 13:41 ` [PATCH v6 01/27] kernel-shark: Use only signed types in kshark_entry Yordan Karadzhov (VMware)
2020-12-09 13:41 ` [PATCH v6 02/27] kernel-shark: Add stream_id to kshark_entry Yordan Karadzhov (VMware)
2020-12-09 13:41 ` [PATCH v6 03/27] kernel-shark: Introduce libkshark-hash Yordan Karadzhov (VMware)
2020-12-09 13:41 ` [PATCH v6 04/27] kernel-shark: Introduce Data streams Yordan Karadzhov (VMware)
2020-12-09 13:41 ` [PATCH v6 05/27] kernel-shark: Rename static methods in libkshark Yordan Karadzhov (VMware)
2020-12-09 13:41 ` [PATCH v6 06/27] kernel-shark: Add basic methods for Data streams Yordan Karadzhov (VMware)
2020-12-09 13:41 ` [PATCH v6 07/27] kernel-shark: Housekeeping before implementing stream interface Yordan Karadzhov (VMware)
2020-12-09 13:41 ` [PATCH v6 08/27] kernel-shark: Add stream interface for trace-cmd data Yordan Karadzhov (VMware)
2020-12-09 13:41 ` Yordan Karadzhov (VMware) [this message]
2020-12-09 13:41 ` [PATCH v6 10/27] kernel-shark: Start using data streams Yordan Karadzhov (VMware)
2020-12-09 13:41 ` [PATCH v6 11/27] kernel-shark: Remove dead code Yordan Karadzhov (VMware)
2020-12-09 13:41 ` [PATCH v6 12/27] kernel-shark: Redesign the plugin interface Yordan Karadzhov (VMware)
2020-12-09 13:41 ` [PATCH v6 13/27] kernel-shark: Complete the stream integration Yordan Karadzhov (VMware)
2020-12-09 13:41 ` [PATCH v6 14/27] kernel-shark: Provide merging of multiple data streams Yordan Karadzhov (VMware)
2020-12-09 13:41 ` [PATCH v6 15/27] kernel-shark: Integrate the stream definitions with data model Yordan Karadzhov (VMware)
2020-12-09 13:41 ` [PATCH v6 16/27] kernel-shark: Use only signed types for model defs Yordan Karadzhov (VMware)
2020-12-09 13:41 ` [PATCH v6 17/27] kernel-shark: Add ksmodel_get_bin() Yordan Karadzhov (VMware)
2020-12-09 13:41 ` [PATCH v6 18/27] kernel-shark: Protect ksmodel_set_in_range_bining() Yordan Karadzhov (VMware)
2020-12-09 13:41 ` [PATCH v6 19/27] kernel-shark: Add methods for time calibration Yordan Karadzhov (VMware)
2020-12-09 13:41 ` [PATCH v6 20/27] kernel-shark: Integrate streams with libkshark-configio Yordan Karadzhov (VMware)
2020-12-09 13:41 ` [PATCH v6 21/27] kernel-shark: Add support for drawing text Yordan Karadzhov (VMware)
2020-12-09 13:41 ` [PATCH v6 22/27] kernel-shark: Make GLUT optional dependency Yordan Karadzhov (VMware)
2020-12-09 13:41 ` [PATCH v6 23/27] kernel-shark: Add ksplot_draw_polyline() Yordan Karadzhov (VMware)
2020-12-09 13:42 ` [PATCH v6 24/27] kernel-shark: Optimize ksplot_draw_polygon() Yordan Karadzhov (VMware)
2020-12-09 13:42 ` [PATCH v6 25/27] kernel-shark: Do not use the ARRAY_SIZE macro Yordan Karadzhov (VMware)
2020-12-09 13:42 ` [PATCH v6 26/27] kernel-shark: Add basic infrastructure for testing Yordan Karadzhov (VMware)
2020-12-09 13:42 ` [PATCH v6 27/27] kernel-shark: Add "github Actions" workflow Yordan Karadzhov (VMware)
2020-12-10 2:38 ` [PATCH v6 00/27] Start KernelShark v2 transformation Steven Rostedt
2020-12-10 8:48 ` David Runge
2020-12-10 14:38 ` Yordan Karadzhov (VMware)
2020-12-10 14:42 ` Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201209134203.428068-10-y.karadz@gmail.com \
--to=y.karadz@gmail.com \
--cc=linux-trace-devel@vger.kernel.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).