From: Steven Rostedt <rostedt@goodmis.org>
To: "Yordan Karadzhov (VMware)" <y.karadz@gmail.com>
Cc: linux-trace-devel@vger.kernel.org
Subject: Re: [PATCH v2] trace-cmd: Re-enable the build of KernelShark v1
Date: Wed, 16 Dec 2020 15:26:43 -0500 [thread overview]
Message-ID: <20201216152643.0ae516fc@gandalf.local.home> (raw)
In-Reply-To: <20201216130715.181002-1-y.karadz@gmail.com>
On Wed, 16 Dec 2020 15:07:15 +0200
"Yordan Karadzhov (VMware)" <y.karadz@gmail.com> wrote:
> 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 the path to the
> tarce-cmd private headers to the list of header file locations.
>
> We also remove the inclusion of event-utils.h in parse-utils.c in order
> to fix a compilation error when building libtraceevent.a.
>
> Signed-off-by: Yordan Karadzhov (VMware) <y.karadz@gmail.com>
> ---
> Makefile | 16 ++++++++-------
> kernel-shark/CMakeLists.txt | 1 +
> kernel-shark/build/FindTraceCmd.cmake | 29 ++++++---------------------
> kernel-shark/src/libkshark.c | 14 ++++++++-----
> kernel-shark/src/libkshark.h | 2 +-
> lib/traceevent/parse-utils.c | 2 --
> 6 files changed, 26 insertions(+), 38 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index ab91ae7..a2a41ae 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -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"
> +
>
The above didn't seem to work, so I changed it to:
gui: force $(CMD_TARGETS) $(LIBTRACEEVENT_STATIC) $(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"
And let the make dependencies do the work for us. And this appears to have
worked.
Want to send a v3?
Thanks,
-- Steve
next prev parent reply other threads:[~2020-12-16 20:27 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-16 13:07 [PATCH v2] trace-cmd: Re-enable the build of KernelShark v1 Yordan Karadzhov (VMware)
2020-12-16 20:26 ` Steven Rostedt [this message]
2020-12-16 20:28 ` Steven Rostedt
2020-12-16 22:19 ` Steven Rostedt
2020-12-16 23:00 ` 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=20201216152643.0ae516fc@gandalf.local.home \
--to=rostedt@goodmis.org \
--cc=linux-trace-devel@vger.kernel.org \
--cc=y.karadz@gmail.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.