From: "Daniel P. Berrange" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: Stefan Hajnoczi <stefanha@redhat.com>,
Peter Maydell <peter.maydell@linaro.org>,
"Daniel P. Berrange" <berrange@redhat.com>
Subject: [Qemu-devel] [PATCH v1 01/40] trace: add build framework for merging trace-events files
Date: Thu, 9 Jun 2016 17:57:55 +0100 [thread overview]
Message-ID: <1465491514-7365-2-git-send-email-berrange@redhat.com> (raw)
In-Reply-To: <1465491514-7365-1-git-send-email-berrange@redhat.com>
Switch make rules over to use trace-events-all as the
master trace events input file. Add rule that will
construct trace-events-all from $(trace-events-y).
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
.gitignore | 1 +
Makefile | 2 +-
Makefile.objs | 4 ++++
Makefile.target | 6 +++---
trace/Makefile.objs | 25 ++++++++++++++-----------
5 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/.gitignore b/.gitignore
index 38ee1c5..9b6a968 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
/config-target.*
/config.status
/config-temp
+/trace-events-all
/trace/generated-tracers.h
/trace/generated-tracers.c
/trace/generated-tracers-dtrace.h
diff --git a/Makefile b/Makefile
index ed4032a..18da481 100644
--- a/Makefile
+++ b/Makefile
@@ -487,7 +487,7 @@ endif
set -e; for x in $(KEYMAPS); do \
$(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadir)/keymaps"; \
done
- $(INSTALL_DATA) $(SRC_PATH)/trace-events "$(DESTDIR)$(qemu_datadir)/trace-events"
+ $(INSTALL_DATA) $(SRC_PATH)/trace-events-all "$(DESTDIR)$(qemu_datadir)/trace-events"
for d in $(TARGET_DIRS); do \
$(MAKE) $(SUBDIR_MAKEFLAGS) TARGET_DIR=$$d/ -C $$d $@ || exit 1 ; \
done
diff --git a/Makefile.objs b/Makefile.objs
index da49b71..697fc66 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -115,3 +115,7 @@ qga-vss-dll-obj-y = qga/
# contrib
ivshmem-client-obj-y = contrib/ivshmem-client/
ivshmem-server-obj-y = contrib/ivshmem-server/
+
+
+######################################################################
+trace-events-y = trace-events
diff --git a/Makefile.target b/Makefile.target
index 495b474..d720b3e 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -48,7 +48,7 @@ else
TARGET_TYPE=system
endif
-$(QEMU_PROG).stp-installed: $(SRC_PATH)/trace-events
+$(QEMU_PROG).stp-installed: $(BUILD_DIR)/trace-events-all
$(call quiet-command,$(TRACETOOL) \
--format=stap \
--backends=$(TRACE_BACKENDS) \
@@ -57,7 +57,7 @@ $(QEMU_PROG).stp-installed: $(SRC_PATH)/trace-events
--target-type=$(TARGET_TYPE) \
< $< > $@," GEN $(TARGET_DIR)$(QEMU_PROG).stp-installed")
-$(QEMU_PROG).stp: $(SRC_PATH)/trace-events
+$(QEMU_PROG).stp: $(BUILD_DIR)/trace-events-all
$(call quiet-command,$(TRACETOOL) \
--format=stap \
--backends=$(TRACE_BACKENDS) \
@@ -66,7 +66,7 @@ $(QEMU_PROG).stp: $(SRC_PATH)/trace-events
--target-type=$(TARGET_TYPE) \
< $< > $@," GEN $(TARGET_DIR)$(QEMU_PROG).stp")
-$(QEMU_PROG)-simpletrace.stp: $(SRC_PATH)/trace-events
+$(QEMU_PROG)-simpletrace.stp: $(BUILD_DIR)/trace-events-all
$(call quiet-command,$(TRACETOOL) \
--format=simpletrace-stap \
--backends=$(TRACE_BACKENDS) \
diff --git a/trace/Makefile.objs b/trace/Makefile.objs
index 5145b34..cbe188e 100644
--- a/trace/Makefile.objs
+++ b/trace/Makefile.objs
@@ -8,13 +8,16 @@
tracetool-y = $(SRC_PATH)/scripts/tracetool.py
tracetool-y += $(shell find $(SRC_PATH)/scripts/tracetool -name "*.py")
+$(BUILD_DIR)/trace-events-all: $(trace-events-y:%=$(SRC_PATH)/%)
+ $(call quiet-command,cat $^ > $@)
+
######################################################################
# Auto-generated event descriptions for LTTng ust code
ifeq ($(findstring ust,$(TRACE_BACKENDS)),ust)
$(obj)/generated-ust-provider.h: $(obj)/generated-ust-provider.h-timestamp
@cmp $< $@ >/dev/null 2>&1 || cp $< $@
-$(obj)/generated-ust-provider.h-timestamp: $(SRC_PATH)/trace-events $(tracetool-y)
+$(obj)/generated-ust-provider.h-timestamp: $(BUILD_DIR)/trace-events-all $(tracetool-y)
$(call quiet-command,$(TRACETOOL) \
--format=ust-events-h \
--backends=$(TRACE_BACKENDS) \
@@ -22,7 +25,7 @@ $(obj)/generated-ust-provider.h-timestamp: $(SRC_PATH)/trace-events $(tracetool-
$(obj)/generated-ust.c: $(obj)/generated-ust.c-timestamp $(BUILD_DIR)/config-host.mak
@cmp $< $@ >/dev/null 2>&1 || cp $< $@
-$(obj)/generated-ust.c-timestamp: $(SRC_PATH)/trace-events $(tracetool-y)
+$(obj)/generated-ust.c-timestamp: $(BUILD_DIR)/trace-events-all $(tracetool-y)
$(call quiet-command,$(TRACETOOL) \
--format=ust-events-c \
--backends=$(TRACE_BACKENDS) \
@@ -37,7 +40,7 @@ endif
$(obj)/generated-events.h: $(obj)/generated-events.h-timestamp
@cmp $< $@ >/dev/null 2>&1 || cp $< $@
-$(obj)/generated-events.h-timestamp: $(SRC_PATH)/trace-events $(tracetool-y)
+$(obj)/generated-events.h-timestamp: $(BUILD_DIR)/trace-events-all $(tracetool-y)
$(call quiet-command,$(TRACETOOL) \
--format=events-h \
--backends=$(TRACE_BACKENDS) \
@@ -45,7 +48,7 @@ $(obj)/generated-events.h-timestamp: $(SRC_PATH)/trace-events $(tracetool-y)
$(obj)/generated-events.c: $(obj)/generated-events.c-timestamp $(BUILD_DIR)/config-host.mak
@cmp $< $@ >/dev/null 2>&1 || cp $< $@
-$(obj)/generated-events.c-timestamp: $(SRC_PATH)/trace-events $(tracetool-y)
+$(obj)/generated-events.c-timestamp: $(BUILD_DIR)/trace-events-all $(tracetool-y)
$(call quiet-command,$(TRACETOOL) \
--format=events-c \
--backends=$(TRACE_BACKENDS) \
@@ -62,7 +65,7 @@ util-obj-y += generated-events.o
$(obj)/generated-tracers.h: $(obj)/generated-tracers.h-timestamp
@cmp -s $< $@ || cp $< $@
-$(obj)/generated-tracers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(tracetool-y)
+$(obj)/generated-tracers.h-timestamp: $(BUILD_DIR)/trace-events-all $(BUILD_DIR)/config-host.mak $(tracetool-y)
$(call quiet-command,$(TRACETOOL) \
--format=h \
--backends=$(TRACE_BACKENDS) \
@@ -73,7 +76,7 @@ $(obj)/generated-tracers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/conf
$(obj)/generated-tracers.c: $(obj)/generated-tracers.c-timestamp
@cmp -s $< $@ || cp $< $@
-$(obj)/generated-tracers.c-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(tracetool-y)
+$(obj)/generated-tracers.c-timestamp: $(BUILD_DIR)/trace-events-all $(BUILD_DIR)/config-host.mak $(tracetool-y)
$(call quiet-command,$(TRACETOOL) \
--format=c \
--backends=$(TRACE_BACKENDS) \
@@ -90,7 +93,7 @@ $(obj)/generated-tracers.o: $(obj)/generated-tracers.c $(obj)/generated-tracers.
ifeq ($(findstring dtrace,$(TRACE_BACKENDS)),dtrace)
$(obj)/generated-tracers-dtrace.dtrace: $(obj)/generated-tracers-dtrace.dtrace-timestamp
@cmp $< $@ >/dev/null 2>&1 || cp $< $@
-$(obj)/generated-tracers-dtrace.dtrace-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(tracetool-y)
+$(obj)/generated-tracers-dtrace.dtrace-timestamp: $(BUILD_DIR)/trace-events-all $(BUILD_DIR)/config-host.mak $(tracetool-y)
$(call quiet-command,$(TRACETOOL) \
--format=d \
--backends=$(TRACE_BACKENDS) \
@@ -109,7 +112,7 @@ endif
$(obj)/generated-helpers-wrappers.h: $(obj)/generated-helpers-wrappers.h-timestamp
@cmp $< $@ >/dev/null 2>&1 || cp $< $@
-$(obj)/generated-helpers-wrappers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(tracetool-y)
+$(obj)/generated-helpers-wrappers.h-timestamp: $(BUILD_DIR)/trace-events-all $(BUILD_DIR)/config-host.mak $(tracetool-y)
$(call quiet-command,$(TRACETOOL) \
--format=tcg-helper-wrapper-h \
--backend=$(TRACE_BACKENDS) \
@@ -117,7 +120,7 @@ $(obj)/generated-helpers-wrappers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_
$(obj)/generated-helpers.h: $(obj)/generated-helpers.h-timestamp
@cmp $< $@ >/dev/null 2>&1 || cp $< $@
-$(obj)/generated-helpers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(tracetool-y)
+$(obj)/generated-helpers.h-timestamp: $(BUILD_DIR)/trace-events-all $(BUILD_DIR)/config-host.mak $(tracetool-y)
$(call quiet-command,$(TRACETOOL) \
--format=tcg-helper-h \
--backend=$(TRACE_BACKENDS) \
@@ -125,7 +128,7 @@ $(obj)/generated-helpers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/conf
$(obj)/generated-helpers.c: $(obj)/generated-helpers.c-timestamp
@cmp $< $@ >/dev/null 2>&1 || cp $< $@
-$(obj)/generated-helpers.c-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(tracetool-y)
+$(obj)/generated-helpers.c-timestamp: $(BUILD_DIR)/trace-events-all $(BUILD_DIR)/config-host.mak $(tracetool-y)
$(call quiet-command,$(TRACETOOL) \
--format=tcg-helper-c \
--backend=$(TRACE_BACKENDS) \
@@ -138,7 +141,7 @@ target-obj-y += generated-helpers.o
$(obj)/generated-tcg-tracers.h: $(obj)/generated-tcg-tracers.h-timestamp
@cmp $< $@ >/dev/null 2>&1 || cp $< $@
-$(obj)/generated-tcg-tracers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(tracetool-y)
+$(obj)/generated-tcg-tracers.h-timestamp: $(BUILD_DIR)/trace-events-all $(BUILD_DIR)/config-host.mak $(tracetool-y)
$(call quiet-command,$(TRACETOOL) \
--format=tcg-h \
--backend=$(TRACE_BACKENDS) \
--
2.5.5
next prev parent reply other threads:[~2016-06-09 16:58 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-09 16:57 [Qemu-devel] [PATCH v1 00/40] Split up the trace-events file Daniel P. Berrange
2016-06-09 16:57 ` Daniel P. Berrange [this message]
2016-06-10 5:16 ` [Qemu-devel] [PATCH v1 01/40] trace: add build framework for merging trace-events files Gerd Hoffmann
2016-06-14 12:26 ` Stefan Hajnoczi
2016-06-14 21:53 ` Eric Blake
2016-06-15 8:39 ` Stefan Hajnoczi
2016-06-09 16:57 ` [Qemu-devel] [PATCH v1 02/40] trace: split out trace events for util/ directory Daniel P. Berrange
2016-06-14 12:28 ` Stefan Hajnoczi
2016-06-09 16:57 ` [Qemu-devel] [PATCH v1 03/40] trace: split out trace events for crypto/ directory Daniel P. Berrange
2016-06-09 16:57 ` [Qemu-devel] [PATCH v1 04/40] trace: split out trace events for io/ directory Daniel P. Berrange
2016-06-09 16:57 ` [Qemu-devel] [PATCH v1 05/40] trace: split out trace events for migration/ directory Daniel P. Berrange
2016-06-09 16:58 ` [Qemu-devel] [PATCH v1 06/40] trace: split out trace events for block/ directory Daniel P. Berrange
2016-06-09 16:58 ` [Qemu-devel] [PATCH v1 07/40] trace: split out trace events for hw/block/ directory Daniel P. Berrange
2016-06-09 16:58 ` [Qemu-devel] [PATCH v1 08/40] trace: split out trace events for hw/char/ directory Daniel P. Berrange
2016-06-09 16:58 ` [Qemu-devel] [PATCH v1 09/40] trace: split out trace events for hw/intc/ directory Daniel P. Berrange
2016-06-09 16:58 ` [Qemu-devel] [PATCH v1 10/40] trace: split out trace events for hw/net/ directory Daniel P. Berrange
2016-06-09 16:58 ` [Qemu-devel] [PATCH v1 11/40] trace: split out trace events for hw/virtio/ directory Daniel P. Berrange
2016-06-09 16:58 ` [Qemu-devel] [PATCH v1 12/40] trace: split out trace events for hw/audio/ directory Daniel P. Berrange
2016-06-09 16:58 ` [Qemu-devel] [PATCH v1 13/40] trace: split out trace events for hw/misc/ directory Daniel P. Berrange
2016-06-09 16:58 ` [Qemu-devel] [PATCH v1 14/40] trace: split out trace events for hw/usb/ directory Daniel P. Berrange
2016-06-09 16:58 ` [Qemu-devel] [PATCH v1 15/40] trace: split out trace events for hw/scsi/ directory Daniel P. Berrange
2016-06-09 16:58 ` [Qemu-devel] [PATCH v1 16/40] trace: split out trace events for hw/nvram/ directory Daniel P. Berrange
2016-06-09 16:58 ` [Qemu-devel] [PATCH v1 17/40] trace: split out trace events for hw/display/ directory Daniel P. Berrange
2016-06-09 16:58 ` [Qemu-devel] [PATCH v1 18/40] trace: split out trace events for hw/input/ directory Daniel P. Berrange
2016-06-09 16:58 ` [Qemu-devel] [PATCH v1 19/40] trace: split out trace events for hw/timer/ directory Daniel P. Berrange
2016-06-09 16:58 ` [Qemu-devel] [PATCH v1 20/40] trace: split out trace events for hw/dma/ directory Daniel P. Berrange
2016-06-09 16:58 ` [Qemu-devel] [PATCH v1 21/40] trace: split out trace events for hw/sparc/ directory Daniel P. Berrange
2016-06-09 16:58 ` [Qemu-devel] [PATCH v1 22/40] trace: split out trace events for hw/sd/ directory Daniel P. Berrange
2016-06-09 16:58 ` [Qemu-devel] [PATCH v1 23/40] trace: split out trace events for hw/isa/ directory Daniel P. Berrange
2016-06-09 16:58 ` [Qemu-devel] [PATCH v1 24/40] trace: split out trace events for hw/i386/ directory Daniel P. Berrange
2016-06-09 16:58 ` [Qemu-devel] [PATCH v1 25/40] trace: split out trace events for hw/9pfs/ directory Daniel P. Berrange
2016-06-09 16:58 ` [Qemu-devel] [PATCH v1 26/40] trace: split out trace events for hw/ppc/ directory Daniel P. Berrange
2016-06-09 16:58 ` [Qemu-devel] [PATCH v1 27/40] trace: split out trace events for hw/pci/ directory Daniel P. Berrange
2016-06-09 16:58 ` [Qemu-devel] [PATCH v1 28/40] trace: split out trace events for hw/s390x/ directory Daniel P. Berrange
2016-06-09 16:58 ` [Qemu-devel] [PATCH v1 29/40] trace: split out trace events for hw/vfio/ directory Daniel P. Berrange
2016-06-09 16:58 ` [Qemu-devel] [PATCH v1 30/40] trace: split out trace events for hw/acpi/ directory Daniel P. Berrange
2016-06-09 16:58 ` [Qemu-devel] [PATCH v1 31/40] trace: split out trace events for hw/arm/ directory Daniel P. Berrange
2016-06-09 16:58 ` [Qemu-devel] [PATCH v1 32/40] trace: split out trace events for hw/alpha/ directory Daniel P. Berrange
2016-06-09 16:58 ` [Qemu-devel] [PATCH v1 33/40] trace: split out trace events for ui/ directory Daniel P. Berrange
2016-06-09 16:58 ` [Qemu-devel] [PATCH v1 34/40] trace: split out trace events for audio/ directory Daniel P. Berrange
2016-06-09 16:58 ` [Qemu-devel] [PATCH v1 35/40] trace: split out trace events for net/ directory Daniel P. Berrange
2016-06-09 16:58 ` [Qemu-devel] [PATCH v1 36/40] trace: split out trace events for target-sparc/ directory Daniel P. Berrange
2016-06-09 16:58 ` [Qemu-devel] [PATCH v1 37/40] trace: split out trace events for target-s390x/ directory Daniel P. Berrange
2016-06-09 16:58 ` [Qemu-devel] [PATCH v1 38/40] trace: split out trace events for target-ppc/ directory Daniel P. Berrange
2016-06-09 16:58 ` [Qemu-devel] [PATCH v1 39/40] trace: split out trace events for qom/ directory Daniel P. Berrange
2016-06-09 16:58 ` [Qemu-devel] [PATCH v1 40/40] trace: split out trace events for linux-user/ directory Daniel P. Berrange
2016-06-09 18:10 ` [Qemu-devel] [PATCH v1 00/40] Split up the trace-events file Lluís Vilanova
2016-06-14 12:33 ` Stefan Hajnoczi
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=1465491514-7365-2-git-send-email-berrange@redhat.com \
--to=berrange@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.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.