diff mbox

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

Message ID CAF2baFdgQy5JUFH3yJTMeS-xrNjBK-VTX1B7m0RNA4HwUB503Q@mail.gmail.com
State Rejected, archived
Headers show

Commit Message

Anders Wallin July 22, 2016, 7:46 a.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 | 6 ++++++
 4 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 tests/Kconfig


--
2.9.2

Comments

Mathieu Desnoyers July 22, 2016, 12:26 p.m. UTC | #1
----- On Jul 22, 2016, at 3:46 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

Good idea. Same problem with tabs turned into spaces. Check your
mail client and resubmit please.

One more comment below,

> 
> Signed-off-by: Anders Wallin <wallinux at gmail.com>
> ---
> Kconfig       | 2 ++
> Makefile      | 6 +++---
> tests/Kbuild  | 2 +-
> tests/Kconfig | 6 ++++++
> 4 files changed, 12 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..250791c
> --- /dev/null
> +++ b/tests/Kconfig
> @@ -0,0 +1,6 @@
> +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

Test -> test

> +        time with 1 KHz for regression test

Add "." at the end of sentence.

We could also recommend to build it as a module in this help text, since
this is what is expected by the lttng-tools test suite.

Thanks,

Mathieu

> 
> --
> 2.9.2
> _______________________________________________
> lttng-dev mailing list
> lttng-dev at lists.lttng.org
> https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
Mathieu Desnoyers July 22, 2016, 12:40 p.m. UTC | #2
----- On Jul 22, 2016, at 8:26 AM, Mathieu Desnoyers mathieu.desnoyers at efficios.com wrote:

> ----- On Jul 22, 2016, at 3:46 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
> 
> Good idea. Same problem with tabs turned into spaces. Check your
> mail client and resubmit please.
> 
> One more comment below,

One more comment:

If many clock plugins are built into the kernel, we could choose
which clock plugin we effectively use through a kernel boot cmd
line parameter, e.g. lttng_clock_plugin=test-clock

Thoughts ?

Thanks,

Mathieu

> 
>> 
>> Signed-off-by: Anders Wallin <wallinux at gmail.com>
>> ---
>> Kconfig       | 2 ++
>> Makefile      | 6 +++---
>> tests/Kbuild  | 2 +-
>> tests/Kconfig | 6 ++++++
>> 4 files changed, 12 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..250791c
>> --- /dev/null
>> +++ b/tests/Kconfig
>> @@ -0,0 +1,6 @@
>> +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
> 
> Test -> test
> 
>> +        time with 1 KHz for regression test
> 
> Add "." at the end of sentence.
> 
> We could also recommend to build it as a module in this help text, since
> this is what is expected by the lttng-tools test suite.
> 
> Thanks,
> 
> Mathieu
> 
>> 
>> --
>> 2.9.2
>> _______________________________________________
>> lttng-dev mailing list
>> lttng-dev at lists.lttng.org
>> https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
> 
> --
> Mathieu Desnoyers
> EfficiOS Inc.
> http://www.efficios.com
> _______________________________________________
> 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..250791c
--- /dev/null
+++ b/tests/Kconfig
@@ -0,0 +1,6 @@ 
+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