trace: ensure .stp files are rebuilt if trace tool source changes

[Qemu-devel] [PATCH for 2.10] trace: ensure .stp files are rebuilt if trace tool source changes

Daniel P. Berrange posted 1 patch 6 years, 9 months ago

Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20170728133631.5449-1-berrange@redhat.com

Test FreeBSD passed

Test checkpatch passed

Test docker passed

Test s390x passed

Makefile.target | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)

Expand all Fold all

[Qemu-devel] [PATCH for 2.10] trace: ensure .stp files are rebuilt if trace tool source changes

Posted by Daniel P. Berrange 6 years, 9 months ago

The make rules for generating the .stp files forgot to add a dep
on $(tracetool-y) to trigger a rebuild if the trace tool source
changes.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
 Makefile.target | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Makefile.target b/Makefile.target
index 2baec9252f..7f42c45db8 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -48,7 +48,10 @@ else
 TARGET_TYPE=system
 endif
 
-$(QEMU_PROG).stp-installed: $(BUILD_DIR)/trace-events-all
+tracetool-y = $(SRC_PATH)/scripts/tracetool.py
+tracetool-y += $(shell find $(SRC_PATH)/scripts/tracetool -name "*.py")
+
+$(QEMU_PROG).stp-installed: $(BUILD_DIR)/trace-events-all $(tracetool-y)
 	$(call quiet-command,$(TRACETOOL) \
 		--group=all \
 		--format=stap \
@@ -58,7 +61,7 @@ $(QEMU_PROG).stp-installed: $(BUILD_DIR)/trace-events-all
 		--target-type=$(TARGET_TYPE) \
 		$< > $@,"GEN","$(TARGET_DIR)$(QEMU_PROG).stp-installed")
 
-$(QEMU_PROG).stp: $(BUILD_DIR)/trace-events-all
+$(QEMU_PROG).stp: $(BUILD_DIR)/trace-events-all $(tracetool-y)
 	$(call quiet-command,$(TRACETOOL) \
 		--group=all \
 		--format=stap \
@@ -68,7 +71,7 @@ $(QEMU_PROG).stp: $(BUILD_DIR)/trace-events-all
 		--target-type=$(TARGET_TYPE) \
 		$< > $@,"GEN","$(TARGET_DIR)$(QEMU_PROG).stp")
 
-$(QEMU_PROG)-simpletrace.stp: $(BUILD_DIR)/trace-events-all
+$(QEMU_PROG)-simpletrace.stp: $(BUILD_DIR)/trace-events-all $(tracetool-y)
 	$(call quiet-command,$(TRACETOOL) \
 		--group=all \
 		--format=simpletrace-stap \
-- 
2.13.3

Re: [Qemu-devel] [PATCH for 2.10] trace: ensure .stp files are rebuilt if trace tool source changes

Posted by Stefan Hajnoczi 6 years, 8 months ago

On Fri, Jul 28, 2017 at 02:36:31PM +0100, Daniel P. Berrange wrote:
> The make rules for generating the .stp files forgot to add a dep
> on $(tracetool-y) to trigger a rebuild if the trace tool source
> changes.
> 
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> ---
>  Makefile.target | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)

Thanks, applied to my tracing tree:
https://github.com/stefanha/qemu/commits/tracing

Stefan