kernel-shark-qt: Add "-O2" compiler flag
PATCH 1/2 kernel-shark-qt: Add "-O2" compiler flag
"-O2" compiler option is added to both C and C++ compiler flags.
Signed-off-by Yordan Karadzhov (VMware) <[email protected]>
--- kernel-shark-qt/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel-shark-qt/CMakeLists.txt +2 -2
@@ -23,8 +23,8 @@ find_package(GLUT) set(LIBRARY_OUTPUT_PATH "${KS_DIR}/lib") set(EXECUTABLE_OUTPUT_PATH "${KS_DIR}/bin") -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -pthread") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++11 -pthread") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -O2 -pthread") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -O2 -std=c++11 -pthread") include_directories(${KS_DIR}/src/ ${KS_DIR}/build/src/
Signature · 1 line
2.17.1
PATCH 2/2 kernel-shark-qt: Fix all problems revealed after adding "-O2" compiler flag
This patch fixes all problems detected by the compiler after adding the "-O2" flag.
Signed-off-by Yordan Karadzhov (VMware) <[email protected]>
--- kernel-shark-qt/examples/configio.c | 2 +- kernel-shark-qt/src/libkshark-configio.c | 40 +++++++++++++++--------- 2 files changed, 27 insertions(+), 15 deletions(-)
kernel-shark-qt/examples/configio.c +1 -1
@@ -7,7 +7,7 @@ int main(int argc, char **argv) {struct kshark_config_doc *conf, *filter, *hello;struct kshark_context *kshark_ctx; -int *ids, i; +int *ids =NULL , i;/* Create a new kshark session. */ kshark_ctx =NULL ;
kernel-shark-qt/src/libkshark-configio.c +26 -14
@@ -694,6 +694,8 @@ static bool kshark_event_filter_to_json(struct tep_handle *pevent,int i, evt, *ids;char *temp; + jevent = jsystem = jname =NULL ; +/* * If this Json document already contains a description of the filter, * delete this description.
@@ -869,7 +871,7 @@ static bool kshark_task_filter_to_json(struct tracecmd_filter_id *filter,const char *filter_name, struct json_object *jobj) { - json_object *jfilter_data, *jpid; + json_object *jfilter_data, *jpid = NULL;int i, *ids;/*
@@ -1013,6 +1015,8 @@ static bool kshark_adv_filters_to_json(struct kshark_context *kshark_ctx,char *str;int i; + jevent = jsystem = jname = jfilter =NULL ; +/* * If this Json document already contains a description of the model, * delete this description.
@@ -1105,8 +1109,8 @@ static bool kshark_adv_filters_from_json(struct kshark_context *kshark_ctx, {struct event_filter *adv_filter = kshark_ctx->advanced_event_filter;json_object *jfilter, *jsystem, *jname, *jcond; -int i, length, ret; -char *filter_str; +int i, length, n, ret =0 ; +char *filter_str =NULL ;/* * Use the name of the filter to find the array of events associated
@@ -1131,10 +1135,15 @@ static bool kshark_adv_filters_from_json(struct kshark_context *kshark_ctx, !json_object_object_get_ex(jfilter, "condition", &jcond)) goto fail; -asprintf (&filter_str,"%s/%s:%s" , -json_object_get_string (jsystem), -json_object_get_string (jname), -json_object_get_string (jcond)); + n =asprintf (&filter_str,"%s/%s:%s" , +json_object_get_string (jsystem), +json_object_get_string (jname), +json_object_get_string (jcond)); + +if (n <=0 ) { + filter_str =NULL ; + goto fail; + } ret =tep_filter_add_filter_str (adv_filter, filter_str);
@@ -1146,13 +1155,16 @@ static bool kshark_adv_filters_from_json(struct kshark_context *kshark_ctx, fail:fprintf (stderr,"Failed to laod Advanced filters.\n" ); -char error_str[200 ]; -int error_status = -tep_strerror (kshark_ctx->pevent, ret, error_str, -sizeof (error_str)); - -if (error_status ==0 ) -fprintf (stderr,"filter failed due to: %s\n" , error_str); +if (ret <0 ) { +char error_str[200 ]; +int error_status = +tep_strerror (kshark_ctx->pevent, ret, error_str, +sizeof (error_str)); + +if (error_status ==0 ) +fprintf (stderr,"filter failed due to: %s\n" , + error_str); + }free (filter_str);return false;
Signature · 1 line
2.17.1
Quoted 1 line · On Mon, 17 Sep 2018 17:29:41 +0300 "Yordan Karadzhov (VMware)"…
"-O2" compiler option is added to both C and C++ compiler flags.
Can you add -g as well. I know that somewhat contradicts the -O2 flag, but it is also useful for debugging (even with optimization).
We can also add a debug option to not compile with -O2, but that can be dealt with later.
-- Steve
Quoted 21 lines
Signed-off-by Yordan Karadzhov (VMware) <[email protected]>--- kernel-shark-qt/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)kernel-shark-qt/CMakeLists.txt +2
-2@@ -23,8 +23,8 @@ find_package(GLUT) set(LIBRARY_OUTPUT_PATH "${KS_DIR}/lib") set(EXECUTABLE_OUTPUT_PATH "${KS_DIR}/bin") -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -pthread") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++11 -pthread") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -O2 -pthread") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -O2 -std=c++11 -pthread") include_directories(${KS_DIR}/src/ ${KS_DIR}/build/src/