Skip to contentSkip to conversation

Fixes needed befor KS 1.0

PATCH In review Yordan Karadzhov (VMware) 2 participants 4 messages Jul 5, 2019

lore
Share & tools
lore
#0 lore raw

cover Fixes needed befor KS 1.0

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(-)
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/2 kernel-shark: Line up the table of the loaded Advanced filters

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.

---
 kernel-shark/src/KsAdvFilteringDialog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel-shark/src/KsAdvFilteringDialog.cpp +1 -1
index 1edf68b..6af1aea 100644
@@ -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);
Signature · 1 line
2.20.1
#2 lore raw

PATCH 2/2 kernel-shark: Separate the target instalation instructions

In reply to 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.

---
 kernel-shark/src/CMakeLists.txt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
kernel-shark/src/CMakeLists.txt +5 -1
index 6cbc00f..1228993 100644
@@ -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}/)
 
Signature · 1 line
2.20.1
Reviewed-by on the v1 series
#3 lore raw
In reply to Yordan Karadzhov (VMware)
Quoted 5 lines · 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

Quoted 7 lines
 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.

Cheers,

-- Slavi