diff mbox

[lttng-modules] Fix: Add kernel configuration for lttng clock plugin

Message ID 20160722141047.29101-1-wallinux@gmail.com
State Accepted, archived
Headers show

Commit Message

Anders Wallin July 22, 2016, 2:10 p.m. UTC
Only one lttng clock plugin can be used when building the lttng-modules
in the kernel. To make it possible to use a custom clock plugin it must
be possible to unconfigure the test clock plugin

Signed-off-by: Anders Wallin <wallinux at gmail.com>
---
 Kconfig       | 2 ++
 Makefile      | 6 +++---
 tests/Kbuild  | 2 +-
 tests/Kconfig | 8 ++++++++
 4 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 tests/Kconfig

Comments

Mathieu Desnoyers July 22, 2016, 2:40 p.m. UTC | #1
Merged into lttng-modules master and stable-2.8, thanks!

Mathieu


----- On Jul 22, 2016, at 10:10 AM, Anders Wallin wallinux at gmail.com wrote:

> Only one lttng clock plugin can be used when building the lttng-modules
> in the kernel. To make it possible to use a custom clock plugin it must
> be possible to unconfigure the test clock plugin
> 
> Signed-off-by: Anders Wallin <wallinux at gmail.com>
> ---
> Kconfig       | 2 ++
> Makefile      | 6 +++---
> tests/Kbuild  | 2 +-
> tests/Kconfig | 8 ++++++++
> 4 files changed, 14 insertions(+), 4 deletions(-)
> create mode 100644 tests/Kconfig
> 
> diff --git a/Kconfig b/Kconfig
> index 6b4ad68..c350b9b 100644
> --- a/Kconfig
> +++ b/Kconfig
> @@ -10,3 +10,5 @@ config LTTNG
> 	  the Linux kernel image, choose Y.
> 
> 	  If unsure, say N.
> +
> +source "lttng/tests/Kconfig"
> diff --git a/Makefile b/Makefile
> index c2b1213..8602649 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -107,15 +107,15 @@ CFLAGS = $(EXTCFLAGS)
> default: modules
> 
> modules:
> -	$(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_LTTNG=m modules
> +	$(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_LTTNG=m
> CONFIG_LTTNG_CLOCK_PLUGIN_TEST=m modules
> 
> modules_install:
> -	$(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_LTTNG=m modules_install
> +	$(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_LTTNG=m
> CONFIG_LTTNG_CLOCK_PLUGIN_TEST=m modules_install
> 
> clean:
> 	$(MAKE) -C $(KERNELDIR) M=$(PWD) clean
> 
> %.i: %.c
> -	$(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_LTTNG=m $@
> +	$(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_LTTNG=m
> CONFIG_LTTNG_CLOCK_PLUGIN_TEST=m $@
> 
> endif # KERNELRELEASE
> diff --git a/tests/Kbuild b/tests/Kbuild
> index 5e49007..aabb8e2 100644
> --- a/tests/Kbuild
> +++ b/tests/Kbuild
> @@ -7,7 +7,7 @@ ccflags-y += -I$(TOP_LTTNG_MODULES_DIR)
> obj-$(CONFIG_LTTNG) += lttng-test.o
> lttng-test-objs := probes/lttng-test.o
> 
> -obj-$(CONFIG_LTTNG) += lttng-clock-plugin-test.o
> +obj-$(CONFIG_LTTNG_CLOCK_PLUGIN_TEST) += lttng-clock-plugin-test.o
> lttng-clock-plugin-test-objs := clock-plugin/lttng-clock-plugin-test.o
> 
> # vim:syntax=make
> diff --git a/tests/Kconfig b/tests/Kconfig
> new file mode 100644
> index 0000000..b1ab663
> --- /dev/null
> +++ b/tests/Kconfig
> @@ -0,0 +1,8 @@
> +config LTTNG_CLOCK_PLUGIN_TEST
> +       tristate "Use Test plugin as trace clock"
> +       depends on LTTNG
> +       help
> +	 Use the test clock as trace clock. This plugin freezes the
> +	 time with 1 KHz for regression test.
> +	 It's recommended to build this as a module to work with the
> +	 lttng-tools test suite.
> --
> 2.9.2
> 
> _______________________________________________
> lttng-dev mailing list
> lttng-dev at lists.lttng.org
> https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
diff mbox

Patch

diff --git a/Kconfig b/Kconfig
index 6b4ad68..c350b9b 100644
--- a/Kconfig
+++ b/Kconfig
@@ -10,3 +10,5 @@  config LTTNG
 	  the Linux kernel image, choose Y.
 
 	  If unsure, say N.
+
+source "lttng/tests/Kconfig"
diff --git a/Makefile b/Makefile
index c2b1213..8602649 100644
--- a/Makefile
+++ b/Makefile
@@ -107,15 +107,15 @@  CFLAGS = $(EXTCFLAGS)
 default: modules
 
 modules:
-	$(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_LTTNG=m modules
+	$(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_LTTNG=m CONFIG_LTTNG_CLOCK_PLUGIN_TEST=m modules
 
 modules_install:
-	$(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_LTTNG=m modules_install
+	$(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_LTTNG=m CONFIG_LTTNG_CLOCK_PLUGIN_TEST=m modules_install
 
 clean:
 	$(MAKE) -C $(KERNELDIR) M=$(PWD) clean
 
 %.i: %.c
-	$(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_LTTNG=m $@
+	$(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_LTTNG=m CONFIG_LTTNG_CLOCK_PLUGIN_TEST=m $@
 
 endif # KERNELRELEASE
diff --git a/tests/Kbuild b/tests/Kbuild
index 5e49007..aabb8e2 100644
--- a/tests/Kbuild
+++ b/tests/Kbuild
@@ -7,7 +7,7 @@  ccflags-y += -I$(TOP_LTTNG_MODULES_DIR)
 obj-$(CONFIG_LTTNG) += lttng-test.o
 lttng-test-objs := probes/lttng-test.o
 
-obj-$(CONFIG_LTTNG) += lttng-clock-plugin-test.o
+obj-$(CONFIG_LTTNG_CLOCK_PLUGIN_TEST) += lttng-clock-plugin-test.o
 lttng-clock-plugin-test-objs := clock-plugin/lttng-clock-plugin-test.o
 
 # vim:syntax=make
diff --git a/tests/Kconfig b/tests/Kconfig
new file mode 100644
index 0000000..b1ab663
--- /dev/null
+++ b/tests/Kconfig
@@ -0,0 +1,8 @@ 
+config LTTNG_CLOCK_PLUGIN_TEST
+       tristate "Use Test plugin as trace clock"
+       depends on LTTNG
+       help
+	 Use the test clock as trace clock. This plugin freezes the
+	 time with 1 KHz for regression test.
+	 It's recommended to build this as a module to work with the
+	 lttng-tools test suite.