Fixes for the RTLA tooling:
- Fix tracer name in comments and prints - Fix setting up symlinks - Allow extra flags to be set in build - Consolidate and show all necessary libraries not found in build error -----BEGIN PGP SIGNATURE----- iIoEABYIADIWIQRRSw7ePDh/lE+zeZMp5XQQmuv6qgUCYv5O3xQccm9zdGVkdEBn b29kbWlzLm9yZwAKCRAp5XQQmuv6qlD4AQDxpm0ZS3qm62TAUiFySPUB7d4F7aUq 6acvEVEIa/4bygEA3VIfFzicJ659JYYZyJtIg3kdi9gnf+hKffXFKJNStAM= =CPxj -----END PGP SIGNATURE----- Merge tag 'trace-rtla-v6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace Pull rtla tool fixes from Steven Rostedt: "Fixes for the Real-Time Linux Analysis tooling: - Fix tracer name in comments and prints - Fix setting up symlinks - Allow extra flags to be set in build - Consolidate and show all necessary libraries not found in build error" * tag 'trace-rtla-v6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: rtla: Consolidate and show all necessary libraries that failed for building tools/rtla: Build with EXTRA_{C,LD}FLAGS tools/rtla: Fix command symlinks rtla: Fix tracer name
This commit is contained in:
commit
0de277d44e
|
@ -33,7 +33,7 @@ EXAMPLE
|
|||
=======
|
||||
In the example below, **rtla timerlat hist** is set to run for *10* minutes,
|
||||
in the cpus *0-4*, *skipping zero* only lines. Moreover, **rtla timerlat
|
||||
hist** will change the priority of the *timelat* threads to run under
|
||||
hist** will change the priority of the *timerlat* threads to run under
|
||||
*SCHED_DEADLINE* priority, with a *10us* runtime every *1ms* period. The
|
||||
*1ms* period is also passed to the *timerlat* tracer::
|
||||
|
||||
|
|
|
@ -30,8 +30,8 @@ WOPTS := -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_A
|
|||
|
||||
TRACEFS_HEADERS := $$($(PKG_CONFIG) --cflags libtracefs)
|
||||
|
||||
CFLAGS := -O -g -DVERSION=\"$(VERSION)\" $(FOPTS) $(MOPTS) $(WOPTS) $(TRACEFS_HEADERS)
|
||||
LDFLAGS := -ggdb
|
||||
CFLAGS := -O -g -DVERSION=\"$(VERSION)\" $(FOPTS) $(MOPTS) $(WOPTS) $(TRACEFS_HEADERS) $(EXTRA_CFLAGS)
|
||||
LDFLAGS := -ggdb $(EXTRA_LDFLAGS)
|
||||
LIBS := $$($(PKG_CONFIG) --libs libtracefs)
|
||||
|
||||
SRC := $(wildcard src/*.c)
|
||||
|
@ -61,40 +61,50 @@ endif
|
|||
LIBTRACEEVENT_MIN_VERSION = 1.5
|
||||
LIBTRACEFS_MIN_VERSION = 1.3
|
||||
|
||||
.PHONY: all warnings show_warnings
|
||||
all: warnings rtla
|
||||
|
||||
TEST_LIBTRACEEVENT = $(shell sh -c "$(PKG_CONFIG) --atleast-version $(LIBTRACEEVENT_MIN_VERSION) libtraceevent > /dev/null 2>&1 || echo n")
|
||||
ifeq ("$(TEST_LIBTRACEEVENT)", "n")
|
||||
.PHONY: warning_traceevent
|
||||
warning_traceevent:
|
||||
@echo "********************************************"
|
||||
@echo "** NOTICE: libtraceevent version $(LIBTRACEEVENT_MIN_VERSION) or higher not found"
|
||||
@echo "**"
|
||||
@echo "** Consider installing the latest libtraceevent from your"
|
||||
@echo "** distribution, e.g., 'dnf install libtraceevent' on Fedora,"
|
||||
@echo "** or from source:"
|
||||
@echo "**"
|
||||
@echo "** https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/ "
|
||||
@echo "**"
|
||||
@echo "********************************************"
|
||||
WARNINGS = show_warnings
|
||||
MISSING_LIBS += echo "** libtraceevent version $(LIBTRACEEVENT_MIN_VERSION) or higher";
|
||||
MISSING_PACKAGES += "libtraceevent-devel"
|
||||
MISSING_SOURCE += echo "** https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/ ";
|
||||
endif
|
||||
|
||||
TEST_LIBTRACEFS = $(shell sh -c "$(PKG_CONFIG) --atleast-version $(LIBTRACEFS_MIN_VERSION) libtracefs > /dev/null 2>&1 || echo n")
|
||||
ifeq ("$(TEST_LIBTRACEFS)", "n")
|
||||
.PHONY: warning_tracefs
|
||||
warning_tracefs:
|
||||
@echo "********************************************"
|
||||
@echo "** NOTICE: libtracefs version $(LIBTRACEFS_MIN_VERSION) or higher not found"
|
||||
@echo "**"
|
||||
@echo "** Consider installing the latest libtracefs from your"
|
||||
@echo "** distribution, e.g., 'dnf install libtracefs' on Fedora,"
|
||||
@echo "** or from source:"
|
||||
@echo "**"
|
||||
@echo "** https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/ "
|
||||
@echo "**"
|
||||
@echo "********************************************"
|
||||
WARNINGS = show_warnings
|
||||
MISSING_LIBS += echo "** libtracefs version $(LIBTRACEFS_MIN_VERSION) or higher";
|
||||
MISSING_PACKAGES += "libtracefs-devel"
|
||||
MISSING_SOURCE += echo "** https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/ ";
|
||||
endif
|
||||
|
||||
.PHONY: all
|
||||
all: rtla
|
||||
define show_dependencies
|
||||
@echo "********************************************"; \
|
||||
echo "** NOTICE: Failed build dependencies"; \
|
||||
echo "**"; \
|
||||
echo "** Required Libraries:"; \
|
||||
$(MISSING_LIBS) \
|
||||
echo "**"; \
|
||||
echo "** Consider installing the latest libtracefs from your"; \
|
||||
echo "** distribution, e.g., 'dnf install $(MISSING_PACKAGES)' on Fedora,"; \
|
||||
echo "** or from source:"; \
|
||||
echo "**"; \
|
||||
$(MISSING_SOURCE) \
|
||||
echo "**"; \
|
||||
echo "********************************************"
|
||||
endef
|
||||
|
||||
show_warnings:
|
||||
$(call show_dependencies);
|
||||
|
||||
ifneq ("$(WARNINGS)", "")
|
||||
ERROR_OUT = $(error Please add the necessary dependencies)
|
||||
|
||||
warnings: $(WARNINGS)
|
||||
$(ERROR_OUT)
|
||||
endif
|
||||
|
||||
rtla: $(OBJ)
|
||||
$(CC) -o rtla $(LDFLAGS) $(OBJ) $(LIBS)
|
||||
|
@ -108,9 +118,9 @@ install: doc_install
|
|||
$(INSTALL) rtla -m 755 $(DESTDIR)$(BINDIR)
|
||||
$(STRIP) $(DESTDIR)$(BINDIR)/rtla
|
||||
@test ! -f $(DESTDIR)$(BINDIR)/osnoise || rm $(DESTDIR)$(BINDIR)/osnoise
|
||||
ln -s $(DESTDIR)$(BINDIR)/rtla $(DESTDIR)$(BINDIR)/osnoise
|
||||
ln -s rtla $(DESTDIR)$(BINDIR)/osnoise
|
||||
@test ! -f $(DESTDIR)$(BINDIR)/timerlat || rm $(DESTDIR)$(BINDIR)/timerlat
|
||||
ln -s $(DESTDIR)$(BINDIR)/rtla $(DESTDIR)$(BINDIR)/timerlat
|
||||
ln -s rtla $(DESTDIR)$(BINDIR)/timerlat
|
||||
|
||||
.PHONY: clean tarball
|
||||
clean: doc_clean
|
||||
|
|
|
@ -892,7 +892,7 @@ int timerlat_hist_main(int argc, char *argv[])
|
|||
return_value = 0;
|
||||
|
||||
if (trace_is_off(&tool->trace, &record->trace)) {
|
||||
printf("rtla timelat hit stop tracing\n");
|
||||
printf("rtla timerlat hit stop tracing\n");
|
||||
if (params->trace_output) {
|
||||
printf(" Saving trace to %s\n", params->trace_output);
|
||||
save_trace_to_file(record->trace.inst, params->trace_output);
|
||||
|
|
|
@ -687,7 +687,7 @@ int timerlat_top_main(int argc, char *argv[])
|
|||
return_value = 0;
|
||||
|
||||
if (trace_is_off(&top->trace, &record->trace)) {
|
||||
printf("rtla timelat hit stop tracing\n");
|
||||
printf("rtla timerlat hit stop tracing\n");
|
||||
if (params->trace_output) {
|
||||
printf(" Saving trace to %s\n", params->trace_output);
|
||||
save_trace_to_file(record->trace.inst, params->trace_output);
|
||||
|
|
Loading…
Reference in New Issue