trace-cmd: Re-enable the build of KernelShark v1
RFC PATCH 1/1 trace-cmd: Re-enable the build of KernelShark v1
libtraceevent and libtracefs are now stand-alone libraries, independent from trace-cmd, but nevertheless trace-cmd still provides legacy/obsolete versions of this libraries. Since we are "freezing" KernelShark v1 and all active development is now focused on KernelShark v2, we will keep v1 use the legacy/obsolete versions of the libraries.
An additional problem is that trace-filter-hash.h is no longer a public header of libtracecmd. For this reason we are adding a copy of it to kernel-shark/src/.
We also remove the inclusion of event-utils.h in parse-utils.c in order to fix a compilation error when building libtraceevent.a.
--- Makefile | 16 ++++--- kernel-shark/build/FindTraceCmd.cmake | 21 --------- kernel-shark/src/libkshark.c | 14 +++--- kernel-shark/src/libkshark.h | 2 +- kernel-shark/src/trace-filter-hash.h | 64 +++++++++++++++++++++++++++ lib/traceevent/parse-utils.c | 2 - 6 files changed, 83 insertions(+), 36 deletions(-) create mode 100644 kernel-shark/src/trace-filter-hash.h
Makefile +9 -7
@@ -356,13 +356,6 @@ $(PKG_CONFIG_FILE) : ${PKG_CONFIG_SOURCE_FILE}.template $(kshark-dir)/build/Makefile: $(kshark-dir)/CMakeLists.txt $(Q) cd $(kshark-dir)/build && $(CMAKE_COMMAND) -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -D_INSTALL_PREFIX=$(prefix) -D_LIBDIR=$(libdir) .. -gui: force - $(MAKE) $(CMD_TARGETS) - $(MAKE) $(kshark-dir)/build/Makefile - $(Q)$(MAKE) $(S) -C $(kshark-dir)/build - @echo "gui build complete" - @echo " kernelshark located at $(kshark-dir)/bin" - trace-cmd: force $(LIBTRACEEVENT_STATIC_BUILD) $(LIBTRACECMD_STATIC) $(LIBTRACEFS_STATIC_BUILD) \ force $(obj)/lib/trace-cmd/plugins/tracecmd_plugin_dir $(Q)$(MAKE) -C $(src)/tracecmd $(obj)/tracecmd/$@
@@ -387,6 +380,15 @@ libtracefs.a: $(LIBTRACEFS_STATIC) libs: $(LIBTRACECMD_SHARED) $(LIBTRACEEVENT_STATIC_BUILD) $(LIBTRACEFS_STATIC_BUILD) +gui: force + $(MAKE) $(CMD_TARGETS) + $(MAKE) $(LIBTRACEEVENT_STATIC) + $(MAKE) $(LIBTRACEFS_STATIC) + $(MAKE) $(kshark-dir)/build/Makefile + $(Q)$(MAKE) $(S) -C $(kshark-dir)/build + @echo "gui build complete" + @echo " kernelshark located at $(kshark-dir)/bin" + test: force $(LIBTRACEEVENT_STATIC_BUILD) $(LIBTRACEFS_STATIC_BUILD) $(LIBTRACECMD_STATIC) ifneq ($(CUNIT_INSTALLED),1) $(error CUnit framework not installed, cannot build unit tests))
kernel-shark/build/FindTraceCmd.cmake +0 -21
@@ -14,20 +14,6 @@ # MESSAGE(" Looking for trace-cmd ...") # First search in the user provided paths. -if (CMAKE_BUILD_TYPE MATCHES Debug) - - find_program(TRACECMD_EXECUTABLE NAMES trace-cmd - PATHS $ENV{TRACE_CMD}/tracecmd/ - ${CMAKE_SOURCE_DIR}/../tracecmd/ - NO_DEFAULT_PATH) - -endif (CMAKE_BUILD_TYPE MATCHES Debug) - -if (NOT TRACECMD_EXECUTABLE) - - set(TRACECMD_EXECUTABLE "${_INSTALL_PREFIX}/bin/trace-cmd") - -endif (NOT TRACECMD_EXECUTABLE) find_path(TRACECMD_INCLUDE_DIR NAMES trace-cmd/trace-cmd.h PATHS $ENV{TRACE_CMD}/include/
@@ -53,14 +39,7 @@ find_library(TRACEEVENT_LIBRARY NAMES traceevent/libtraceevent.a ${CMAKE_SOURCE_DIR}/../lib/ NO_DEFAULT_PATH) -# If not found, search in the default system paths. Note that if the previous -# search was successful "find_path" will do nothing this time. find_program(TRACECMD_EXECUTABLE NAMES trace-cmd) -find_path(TRACECMD_INCLUDE_DIR NAMES trace-cmd/trace-cmd.h) -find_path(TRACEFS_INCLUDE_DIR NAMES tracefs/tracefs.h) -find_library(TRACECMD_LIBRARY NAMES trace-cmd/libtracecmd.so) -find_library(TRACEFS_LIBRARY NAMES tracefs/libtracefs.so) -find_library(TRACEEVENT_LIBRARY NAMES traceevent/libtraceevent.so) IF (TRACECMD_INCLUDE_DIR AND TRACECMD_LIBRARY)
kernel-shark/src/libkshark.c +9 -5
@@ -141,10 +141,14 @@ bool kshark_open(struct kshark_context *kshark_ctx, const char *file)kshark_free_task_list (kshark_ctx); - handle =tracecmd_open (file); + handle =tracecmd_open_head (file);if (!handle)return false; +/* Read the tracing data from the file. */ +if (tracecmd_init_data (handle) <0 ) +return false; +if (pthread_mutex_init (&kshark_ctx->input_mutex,NULL ) !=0 ) {tracecmd_close (handle);return false;
@@ -696,7 +700,7 @@ static ssize_t get_records(struct kshark_context *kshark_ctx,int pid;int cpu; - n_cpus =tracecmd_cpus (kshark_ctx->handle); + n_cpus =tep_get_cpus (kshark_ctx->pevent);; cpu_list =calloc (n_cpus,sizeof (*cpu_list));if (!cpu_list)return -ENOMEM ;
@@ -867,7 +871,7 @@ ssize_t kshark_load_data_entries(struct kshark_context *kshark_ctx,if (total <0 ) goto fail; - n_cpus =tracecmd_cpus (kshark_ctx->handle); + n_cpus =tep_get_cpus (kshark_ctx->pevent);; rows =calloc (total,sizeof (struct kshark_entry *));if (!rows)
@@ -923,7 +927,7 @@ ssize_t kshark_load_data_records(struct kshark_context *kshark_ctx,if (total <0 ) goto fail; - n_cpus =tracecmd_cpus (kshark_ctx->handle); + n_cpus =tep_get_cpus (kshark_ctx->pevent);; rows =calloc (total,sizeof (struct tep_record *));if (!rows)
@@ -1047,7 +1051,7 @@ size_t kshark_load_data_matrix(struct kshark_context *kshark_ctx,if (total <0 ) goto fail; - n_cpus =tracecmd_cpus (kshark_ctx->handle); + n_cpus =tep_get_cpus (kshark_ctx->pevent);; status = data_matrix_alloc(total, offset_array, cpu_array,
kernel-shark/src/libkshark.h +1 -1
@@ -26,7 +26,7 @@ extern "C" {// trace-cmd #include "trace-cmd/trace-cmd.h" -#include "trace-cmd/trace-filter-hash.h" +#include "trace-filter-hash.h" #include "traceevent/event-parse.h" #include "tracefs/tracefs.h"
kernel-shark/src/trace-filter-hash.h new file +64 -0
64 lines not on this page · raw message
lib/traceevent/parse-utils.c +0 -2
@@ -9,8 +9,6 @@#include <stdarg.h> #include <errno.h> -#include "event-utils.h" -#define __weak __attribute__((weak))void __vwarning (const char *fmt,va_list ap)
Signature · 1 line
2.25.1
kernel-shark/src/trace-filter-hash.h
Quoted 5 lines · On Mon, 14 Dec 2020 21:30:57 +0200 "Yordan Karadzhov (VMware)"…
kernel-shark/src/trace-filter-hash.h new file +0
-0
Hi Yordan,
So far the patch looks good, but can you not copy this file, and just change cmake to find where it's located in the source tree?
"lib/trace-cmd/include/private/trace-filter-hash.h"
Thanks!
-- Steve
Quoted 78 lines
kernel-shark/src/trace-filter-hash.h new file +64
-0@@ -0,0 +1,64 @@ +/* SPDX-License-Identifier: LGPL-2.1 */ +/* +* Copyright (C) 2009, 2010 Red Hat Inc, Steven Rostedt <[email protected]> +* Copyright (C) 2018 VMware Inc, Steven Rostedt <[email protected]> +* +*/ +#ifndef _TRACE_FILTER_HASH_H +#define _TRACE_FILTER_HASH_H + +#include <stdint.h> + +struct tracecmd_filter_id_item { +struct tracecmd_filter_id_item *next; +int id; +}; + +struct tracecmd_filter_id { +struct tracecmd_filter_id_item **hash; +int count; +}; + +/** +* tracecmd_quick_hash - A quick (non secured) hash alogirthm +* @val: The value to perform the hash on +* @bits: The size in bits you need to return +* +* This is a quick hashing function adapted from Donald E. Knuth's 32 +* bit multiplicative hash. See The Art of Computer Programming (TAOCP). +* Multiplication by the Prime number, closest to the golden ratio of +* 2^32. +* +* @bits is used to max the result for use cases that require +* a power of 2 return value that is less than 32 bits. Any value +* of @bits greater than 31 (or zero), will simply return the full hash on @val. +*/ +static inline uint32_t tracecmd_quick_hash (uint32_t val,unsigned int bits) +{ + val *=UINT32_C (2654435761 ); + +if (!bits || bits >31 ) +return val; + +return val & ((1 << bits) -1 ); +} + +struct tracecmd_filter_id_item * +tracecmd_filter_id_find (struct tracecmd_filter_id *hash,int id); +void tracecmd_filter_id_add (struct tracecmd_filter_id *hash,int id); +void tracecmd_filter_id_remove (struct tracecmd_filter_id *hash,int id); +void tracecmd_filter_id_clear (struct tracecmd_filter_id *hash); +struct tracecmd_filter_id *tracecmd_filter_id_hash_alloc (void ); +void tracecmd_filter_id_hash_free (struct tracecmd_filter_id *hash); +struct tracecmd_filter_id * +tracecmd_filter_id_hash_copy (struct tracecmd_filter_id *hash); +int *tracecmd_filter_ids (struct tracecmd_filter_id *hash); +int tracecmd_filter_id_compare (struct tracecmd_filter_id *hash1, +struct tracecmd_filter_id *hash2); + +static inline int tracecmd_filter_task_count (struct tracecmd_filter_id *hash) +{ +return hash->count; +} + +#endif /* _TRACE_FILTER_HASH_H */ lib/traceevent/parse-utils.c +0
-2@@ -9,8 +9,6 @@#include <stdarg.h> #include <errno.h> -#include "event-utils.h" -#define __weak __attribute__((weak))void __vwarning (const char *fmt,va_list ap)