From: Anthony Liguori <anthony@codemonkey.ws>
To: "Lluís Vilanova" <vilanova@ac.upc.edu>, qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH v2] build: Use separate makefile for "trace/"
Date: Sun, 23 Dec 2012 15:27:09 -0600 [thread overview]
Message-ID: <87d2y0tq6q.fsf@codemonkey.ws> (raw)
In-Reply-To: <20121214191309.4257.37190.stgit@fimbulvetr.bsc.es>
Lluís Vilanova <vilanova@ac.upc.edu> writes:
> Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu>
> --
> Changes in v2:
>
> * Do not depend on "qemu-timer-common.o".
> * Use "$(obj)" in rules to refer to the build sub-directory.
> * Remove dependencies against "$(GENERATED_HEADERS)".
>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
Applied. Thanks.
Regards,
Anthony Liguori
> ---
> .gitignore | 8 ++--
> Makefile | 15 +++++---
> Makefile.objs | 64 ++------------------------------
> scripts/tracetool/backend/dtrace.py | 2 +
> scripts/tracetool/format/h.py | 6 ++-
> trace.h | 6 +++
> trace/Makefile.objs | 70 +++++++++++++++++++++++++++++++++++
> 7 files changed, 96 insertions(+), 75 deletions(-)
> create mode 100644 trace.h
> create mode 100644 trace/Makefile.objs
>
> diff --git a/.gitignore b/.gitignore
> index bd6ba1c..0b75915 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -2,10 +2,10 @@ config-devices.*
> config-all-devices.*
> config-host.*
> config-target.*
> -trace.h
> -trace.c
> -trace-dtrace.h
> -trace-dtrace.dtrace
> +trace/generated-tracers.h
> +trace/generated-tracers.c
> +trace/generated-tracers-dtrace.h
> +trace/generated-tracers-dtrace.dtrace
> *-timestamp
> *-softmmu
> *-darwin-user
> diff --git a/Makefile b/Makefile
> index e9d6848..21a7912 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -31,12 +31,15 @@ ifneq ($(filter-out %clean,$(MAKECMDGOALS)),$(if $(MAKECMDGOALS),,fail))
> endif
> endif
>
> -GENERATED_HEADERS = config-host.h trace.h qemu-options.def
> +GENERATED_HEADERS = config-host.h qemu-options.def
> +GENERATED_HEADERS += qmp-commands.h qapi-types.h qapi-visit.h
> +GENERATED_SOURCES += qmp-marshal.c qapi-types.c qapi-visit.c
> +
> +GENERATED_HEADERS += trace/generated-tracers.h
> ifeq ($(TRACE_BACKEND),dtrace)
> -GENERATED_HEADERS += trace-dtrace.h
> +GENERATED_HEADERS += trace/generated-tracers-dtrace.h
> endif
> -GENERATED_HEADERS += qmp-commands.h qapi-types.h qapi-visit.h
> -GENERATED_SOURCES += qmp-marshal.c qapi-types.c qapi-visit.c trace.c
> +GENERATED_SOURCES += trace/generated-tracers.c
>
> # Don't try to regenerate Makefile or configure
> # We don't generate any of them
> @@ -252,9 +255,9 @@ clean:
> rm -f *.a *.lo $(TOOLS) $(HELPERS-y) qemu-ga TAGS cscope.* *.pod *~ */*~
> rm -Rf .libs
> rm -f qemu-img-cmds.h
> - rm -f trace-dtrace.dtrace trace-dtrace.dtrace-timestamp
> @# May not be present in GENERATED_HEADERS
> - rm -f trace-dtrace.h trace-dtrace.h-timestamp
> + rm -f trace/generated-tracers-dtrace.dtrace*
> + rm -f trace/generated-tracers-dtrace.h*
> rm -f $(foreach f,$(GENERATED_HEADERS),$(f) $(f)-timestamp)
> rm -f $(foreach f,$(GENERATED_SOURCES),$(f) $(f)-timestamp)
> rm -rf qapi-generated
> diff --git a/Makefile.objs b/Makefile.objs
> index 3c7abca..24832a2 100644
> --- a/Makefile.objs
> +++ b/Makefile.objs
> @@ -147,66 +147,7 @@ libdis-$(CONFIG_LM32_DIS) += lm32-dis.o
> ######################################################################
> # trace
>
> -ifeq ($(TRACE_BACKEND),dtrace)
> -TRACE_H_EXTRA_DEPS=trace-dtrace.h
> -endif
> -trace.h: trace.h-timestamp $(TRACE_H_EXTRA_DEPS)
> -trace.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak
> - $(call quiet-command,$(TRACETOOL) \
> - --format=h \
> - --backend=$(TRACE_BACKEND) \
> - < $< > $@," GEN trace.h")
> - @cmp -s $@ trace.h || cp $@ trace.h
> -
> -trace.c: trace.c-timestamp
> -trace.c-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak
> - $(call quiet-command,$(TRACETOOL) \
> - --format=c \
> - --backend=$(TRACE_BACKEND) \
> - < $< > $@," GEN trace.c")
> - @cmp -s $@ trace.c || cp $@ trace.c
> -
> -trace.o: trace.c $(GENERATED_HEADERS)
> -
> -trace-dtrace.h: trace-dtrace.dtrace
> - $(call quiet-command,dtrace -o $@ -h -s $<, " GEN trace-dtrace.h")
> -
> -# Normal practice is to name DTrace probe file with a '.d' extension
> -# but that gets picked up by QEMU's Makefile as an external dependency
> -# rule file. So we use '.dtrace' instead
> -trace-dtrace.dtrace: trace-dtrace.dtrace-timestamp
> -trace-dtrace.dtrace-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak
> - $(call quiet-command,$(TRACETOOL) \
> - --format=d \
> - --backend=$(TRACE_BACKEND) \
> - < $< > $@," GEN trace-dtrace.dtrace")
> - @cmp -s $@ trace-dtrace.dtrace || cp $@ trace-dtrace.dtrace
> -
> -trace-dtrace.o: trace-dtrace.dtrace $(GENERATED_HEADERS)
> - $(call quiet-command,dtrace -o $@ -G -s $<, " GEN trace-dtrace.o")
> -
> -ifeq ($(LIBTOOL),)
> -trace-dtrace.lo: trace-dtrace.dtrace
> - @echo "missing libtool. please install and rerun configure."; exit 1
> -else
> -trace-dtrace.lo: trace-dtrace.dtrace
> - $(call quiet-command,$(LIBTOOL) --mode=compile --tag=CC dtrace -o $@ -G -s $<, " lt GEN trace-dtrace.o")
> -endif
> -
> -trace/simple.o: trace/simple.c $(GENERATED_HEADERS)
> -
> -trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o
> -ifneq ($(TRACE_BACKEND),dtrace)
> -trace-obj-y = trace.o
> -endif
> -
> -trace-obj-$(CONFIG_TRACE_DEFAULT) += trace/default.o
> -trace-obj-$(CONFIG_TRACE_SIMPLE) += trace/simple.o
> -trace-obj-$(CONFIG_TRACE_SIMPLE) += qemu-timer-common.o
> -trace-obj-$(CONFIG_TRACE_STDERR) += trace/stderr.o
> -trace-obj-y += trace/control.o
> -
> -$(trace-obj-y): $(GENERATED_HEADERS)
> +trace-obj-y += trace/
>
> ######################################################################
> # smartcard
> @@ -250,5 +191,6 @@ nested-vars += \
> block-obj-y \
> user-obj-y \
> common-obj-y \
> - extra-obj-y
> + extra-obj-y \
> + trace-obj-y
> dummy := $(call unnest-vars)
> diff --git a/scripts/tracetool/backend/dtrace.py b/scripts/tracetool/backend/dtrace.py
> index 23c43e2..ad5eb3b 100644
> --- a/scripts/tracetool/backend/dtrace.py
> +++ b/scripts/tracetool/backend/dtrace.py
> @@ -37,7 +37,7 @@ def c(events):
>
>
> def h(events):
> - out('#include "trace-dtrace.h"',
> + out('#include "trace/generated-tracers-dtrace.h"',
> '')
>
> for e in events:
> diff --git a/scripts/tracetool/format/h.py b/scripts/tracetool/format/h.py
> index 6ffb3c2..9a58de1 100644
> --- a/scripts/tracetool/format/h.py
> +++ b/scripts/tracetool/format/h.py
> @@ -19,8 +19,8 @@ from tracetool import out
> def begin(events):
> out('/* This file is autogenerated by tracetool, do not edit. */',
> '',
> - '#ifndef TRACE_H',
> - '#define TRACE_H',
> + '#ifndef TRACE__GENERATED_TRACERS_H',
> + '#define TRACE__GENERATED_TRACERS_H',
> '',
> '#include "qemu-common.h"')
>
> @@ -32,7 +32,7 @@ def end(events):
> enabled = 1
> out('#define TRACE_%s_ENABLED %d' % (e.name.upper(), enabled))
> out('',
> - '#endif /* TRACE_H */')
> + '#endif /* TRACE__GENERATED_TRACERS_H */')
>
> def nop(events):
> for e in events:
> diff --git a/trace.h b/trace.h
> new file mode 100644
> index 0000000..c15f498
> --- /dev/null
> +++ b/trace.h
> @@ -0,0 +1,6 @@
> +#ifndef TRACE_H
> +#define TRACE_H
> +
> +#include "trace/generated-tracers.h"
> +
> +#endif /* TRACE_H */
> diff --git a/trace/Makefile.objs b/trace/Makefile.objs
> new file mode 100644
> index 0000000..b791723
> --- /dev/null
> +++ b/trace/Makefile.objs
> @@ -0,0 +1,70 @@
> +# -*- mode: makefile -*-
> +
> +######################################################################
> +# Auto-generated tracing routines
> +
> +ifeq ($(TRACE_BACKEND),dtrace)
> +TRACE_H_EXTRA_DEPS=$(obj)/generated-tracers-dtrace.h
> +endif
> +$(obj)/generated-tracers.h: $(obj)/generated-tracers.h-timestamp $(TRACE_H_EXTRA_DEPS)
> +$(obj)/generated-tracers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak
> + $(call quiet-command,$(TRACETOOL) \
> + --format=h \
> + --backend=$(TRACE_BACKEND) \
> + < $< > $@," GEN $(patsubst %-timestamp,%,$@)")
> + @cmp -s $@ $(patsubst %-timestamp,%,$@) || cp $@ $(patsubst %-timestamp,%,$@)
> +
> +$(obj)/generated-tracers.c: $(obj)/generated-tracers.c-timestamp
> +$(obj)/generated-tracers.c-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak
> + $(call quiet-command,$(TRACETOOL) \
> + --format=c \
> + --backend=$(TRACE_BACKEND) \
> + < $< > $@," GEN $(patsubst %-timestamp,%,$@)")
> + @cmp -s $@ $(patsubst %-timestamp,%,$@) || cp $@ $(patsubst %-timestamp,%,$@)
> +
> +$(obj)/generated-tracers.o: $(obj)/generated-tracers.c $(obj)/generated-tracers.h
> +
> +ifneq ($(TRACE_BACKEND),dtrace)
> +trace-obj-y += generated-tracers.o
> +endif
> +
> +
> +######################################################################
> +# Auto-generated DTrace code
> +
> +# Normal practice is to name DTrace probe file with a '.d' extension
> +# but that gets picked up by QEMU's Makefile as an external dependency
> +# rule file. So we use '.dtrace' instead
> +$(obj)/generated-tracers-dtrace.dtrace: $(obj)/generated-tracers-dtrace.dtrace-timestamp
> +$(obj)/generated-tracers-dtrace.dtrace-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak
> + $(call quiet-command,$(TRACETOOL) \
> + --format=d \
> + --backend=$(TRACE_BACKEND) \
> + < $< > $@," GEN $(patsubst %-timestamp,%,$@)")
> + @cmp -s $@ $(patsubst %-timestamp,%,$@) || cp $@ $(patsubst %-timestamp,%,$@)
> +
> +$(obj)/generated-tracers-dtrace.h: trace/generated-tracers-dtrace.dtrace
> + $(call quiet-command,dtrace -o $@ -h -s $<, " GEN $@")
> +
> +$(obj)/generated-tracers-dtrace.o: trace/generated-tracers-dtrace.dtrace
> + $(call quiet-command,dtrace -o $@ -G -s $<, " GEN $@")
> +
> +trace-obj-$(CONFIG_TRACE_DTRACE) += generated-tracers-dtrace.o
> +
> +
> +ifeq ($(LIBTOOL),)
> +$(obj)/generated-tracers-dtrace.lo: $(obj)/generated-tracers-dtrace.dtrace
> + @echo "missing libtool. please install and rerun configure."; exit 1
> +else
> +$(obj)/generated-tracers-dtrace.lo: $(obj)/generated-tracers-dtrace.dtrace
> + $(call quiet-command,$(LIBTOOL) --mode=compile --tag=CC dtrace -o $@ -G -s $<, " lt GEN $@")
> +endif
> +
> +
> +######################################################################
> +# Backend code
> +
> +trace-obj-$(CONFIG_TRACE_DEFAULT) += default.o
> +trace-obj-$(CONFIG_TRACE_SIMPLE) += simple.o
> +trace-obj-$(CONFIG_TRACE_STDERR) += stderr.o
> +trace-obj-y += control.o
next prev parent reply other threads:[~2012-12-23 21:27 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-14 19:13 [Qemu-devel] [PATCH v2] build: Use separate makefile for "trace/" Lluís Vilanova
2012-12-16 12:41 ` Paolo Bonzini
2012-12-23 21:27 ` Anthony Liguori [this message]
2012-12-24 12:17 ` Lluís Vilanova
-- strict thread matches above, loose matches on Subject: below --
2012-12-14 20:40 Lluís Vilanova
2012-12-14 21:13 ` Lluís Vilanova
2012-12-14 18:35 Lluís Vilanova
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=87d2y0tq6q.fsf@codemonkey.ws \
--to=anthony@codemonkey.ws \
--cc=qemu-devel@nongnu.org \
--cc=vilanova@ac.upc.edu \
/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.