* [PATCH 0/2] Fixes needed befor KS 1.0
@ 2019-07-05 14:10 Yordan Karadzhov (VMware)
2019-07-05 14:10 ` [PATCH 1/2] kernel-shark: Line up the table of the loaded Advanced filters Yordan Karadzhov (VMware)
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Yordan Karadzhov (VMware) @ 2019-07-05 14:10 UTC (permalink / raw)
To: rostedt; +Cc: linux-trace-devel, Yordan Karadzhov (VMware)
Yordan Karadzhov (VMware) (2):
kernel-shark: Line up the table of the loaded Advanced filters
kernel-shark: Separate the target instalation instructions
kernel-shark/src/CMakeLists.txt | 6 +++++-
kernel-shark/src/KsAdvFilteringDialog.cpp | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
--
2.20.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/2] kernel-shark: Line up the table of the loaded Advanced filters
2019-07-05 14:10 [PATCH 0/2] Fixes needed befor KS 1.0 Yordan Karadzhov (VMware)
@ 2019-07-05 14:10 ` Yordan Karadzhov (VMware)
2019-07-05 14:10 ` [PATCH 2/2] kernel-shark: Separate the target instalation instructions Yordan Karadzhov (VMware)
2019-07-05 14:25 ` [PATCH 0/2] Fixes needed befor KS 1.0 Slavomir Kaslev
2 siblings, 0 replies; 4+ messages in thread
From: Yordan Karadzhov (VMware) @ 2019-07-05 14:10 UTC (permalink / raw)
To: rostedt; +Cc: linux-trace-devel, Yordan Karadzhov (VMware)
The Advanced filtering dialog shows a table of the already loaded filters.
The new line that is added at the end of the string breaks the alignment
of the last column of this tables.
Signed-off-by: Yordan Karadzhov (VMware) <y.karadz@gmail.com>
---
kernel-shark/src/KsAdvFilteringDialog.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel-shark/src/KsAdvFilteringDialog.cpp b/kernel-shark/src/KsAdvFilteringDialog.cpp
index 1edf68b..6af1aea 100644
--- a/kernel-shark/src/KsAdvFilteringDialog.cpp
+++ b/kernel-shark/src/KsAdvFilteringDialog.cpp
@@ -216,7 +216,7 @@ void KsAdvFilteringDialog::_getFilters(struct kshark_context *kshark_ctx)
continue;
_filters.insert(events[i]->id,
- QString("%1/%2:%3\n").arg(events[i]->system,
+ QString("%1/%2:%3").arg(events[i]->system,
events[i]->name, str));
free(str);
--
2.20.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] kernel-shark: Separate the target instalation instructions
2019-07-05 14:10 [PATCH 0/2] Fixes needed befor KS 1.0 Yordan Karadzhov (VMware)
2019-07-05 14:10 ` [PATCH 1/2] kernel-shark: Line up the table of the loaded Advanced filters Yordan Karadzhov (VMware)
@ 2019-07-05 14:10 ` Yordan Karadzhov (VMware)
2019-07-05 14:25 ` [PATCH 0/2] Fixes needed befor KS 1.0 Slavomir Kaslev
2 siblings, 0 replies; 4+ messages in thread
From: Yordan Karadzhov (VMware) @ 2019-07-05 14:10 UTC (permalink / raw)
To: rostedt; +Cc: linux-trace-devel, Yordan Karadzhov (VMware)
Having all target installation destinations given in one instruction may
result in an error in the case when some of the third-party dependencies
are missing. This will happen because you are trying to install a target
that hasn't been built.
Signed-off-by: Yordan Karadzhov (VMware) <y.karadz@gmail.com>
---
kernel-shark/src/CMakeLists.txt | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/kernel-shark/src/CMakeLists.txt b/kernel-shark/src/CMakeLists.txt
index 6cbc00f..1228993 100644
--- a/kernel-shark/src/CMakeLists.txt
+++ b/kernel-shark/src/CMakeLists.txt
@@ -14,6 +14,8 @@ target_link_libraries(kshark ${CMAKE_DL_LIBS}
set_target_properties(kshark PROPERTIES SUFFIX ".so.${KS_VERSION_STRING}")
+install(TARGETS kshark LIBRARY DESTINATION ${_INSTALL_PREFIX}/lib/${KS_APP_NAME})
+
if (OPENGL_FOUND AND GLUT_FOUND)
message(STATUS "libkshark-plot")
@@ -26,6 +28,8 @@ if (OPENGL_FOUND AND GLUT_FOUND)
set_target_properties(kshark-plot PROPERTIES SUFFIX ".so.${KS_VERSION_STRING}")
+ install(TARGETS kshark-plot LIBRARY DESTINATION ${_INSTALL_PREFIX}/lib/${KS_APP_NAME})
+
endif (OPENGL_FOUND AND GLUT_FOUND)
if (Qt5Widgets_FOUND AND Qt5Network_FOUND)
@@ -77,7 +81,7 @@ if (Qt5Widgets_FOUND AND Qt5Network_FOUND)
add_executable(kshark-record kshark-record.cpp)
target_link_libraries(kshark-record kshark-gui)
- install(TARGETS ${KS_APP_NAME} kshark-record kshark kshark-plot kshark-gui
+ install(TARGETS ${KS_APP_NAME} kshark-record kshark-gui
RUNTIME DESTINATION ${_INSTALL_PREFIX}/bin/
LIBRARY DESTINATION ${_INSTALL_PREFIX}/lib/${KS_APP_NAME}/)
--
2.20.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 0/2] Fixes needed befor KS 1.0
2019-07-05 14:10 [PATCH 0/2] Fixes needed befor KS 1.0 Yordan Karadzhov (VMware)
2019-07-05 14:10 ` [PATCH 1/2] kernel-shark: Line up the table of the loaded Advanced filters Yordan Karadzhov (VMware)
2019-07-05 14:10 ` [PATCH 2/2] kernel-shark: Separate the target instalation instructions Yordan Karadzhov (VMware)
@ 2019-07-05 14:25 ` Slavomir Kaslev
2 siblings, 0 replies; 4+ messages in thread
From: Slavomir Kaslev @ 2019-07-05 14:25 UTC (permalink / raw)
To: Yordan Karadzhov (VMware); +Cc: Steven Rostedt, linux-trace-devel
On Fri, Jul 5, 2019 at 5:16 PM Yordan Karadzhov (VMware)
<y.karadz@gmail.com> wrote:
>
> Yordan Karadzhov (VMware) (2):
> kernel-shark: Line up the table of the loaded Advanced filters
> kernel-shark: Separate the target instalation instructions
>
> kernel-shark/src/CMakeLists.txt | 6 +++++-
> kernel-shark/src/KsAdvFilteringDialog.cpp | 2 +-
> 2 files changed, 6 insertions(+), 2 deletions(-)
>
> --
> 2.20.1
>
Both patches look good to me.
Reviewed-by: Slavomir Kaslev <kaslevs@vmware.com>
Cheers,
-- Slavi
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-07-05 14:25 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-05 14:10 [PATCH 0/2] Fixes needed befor KS 1.0 Yordan Karadzhov (VMware)
2019-07-05 14:10 ` [PATCH 1/2] kernel-shark: Line up the table of the loaded Advanced filters Yordan Karadzhov (VMware)
2019-07-05 14:10 ` [PATCH 2/2] kernel-shark: Separate the target instalation instructions Yordan Karadzhov (VMware)
2019-07-05 14:25 ` [PATCH 0/2] Fixes needed befor KS 1.0 Slavomir Kaslev
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).