* [PATCH v2] introduce runtime loglevel
@ 2013-09-27 17:19 Sascha Hauer
2013-09-29 10:18 ` Sascha Hauer
0 siblings, 1 reply; 2+ messages in thread
From: Sascha Hauer @ 2013-09-27 17:19 UTC (permalink / raw)
To: barebox
With this the verbosity of barebox can be controlled during runtime
using the 'loglevel' globalvar.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
changes since v1:
- Make loglevel configurable via Kconfig
common/Kconfig | 18 +++++++++++++++++-
common/console_common.c | 27 +++++++++++++++++++++++++++
drivers/base/driver.c | 6 +++++-
include/console.h | 2 ++
include/printk.h | 9 ++++++---
5 files changed, 57 insertions(+), 5 deletions(-)
diff --git a/common/Kconfig b/common/Kconfig
index 5d92284..626f583 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -607,7 +607,7 @@ endmenu
menu "Debugging"
config COMPILE_LOGLEVEL
- int "loglevel"
+ int "compile loglevel"
default 6
help
This defines the maximum loglevel compiled into the binary. Less important
@@ -622,6 +622,22 @@ config COMPILE_LOGLEVEL
6 informational (info)
7 debug-level messages (debug)
+config DEFAULT_LOGLEVEL
+ int "default loglevel"
+ default 6
+ help
+ This defines the default runtime loglevel. It can be changed using the
+ global.loglevel variable. Available logelevels are:
+
+ 0 system is unusable (emerg)
+ 1 action must be taken immediately (alert)
+ 2 critical conditions (crit)
+ 3 error conditions (err)
+ 4 warning conditions (warn)
+ 5 normal but significant condition (notice)
+ 6 informational (info)
+ 7 debug-level messages (debug)
+
config DEBUG_INFO
bool
prompt "enable debug symbols"
diff --git a/common/console_common.c b/common/console_common.c
index d1b823e..18b7676 100644
--- a/common/console_common.c
+++ b/common/console_common.c
@@ -57,6 +57,33 @@ void console_allow_input(bool val)
console_input_allow = val;
}
+int barebox_loglevel = CONFIG_DEFAULT_LOGLEVEL;
+
+int pr_print(int level, const char *fmt, ...)
+{
+ va_list args;
+ uint i;
+ char printbuffer[CFG_PBSIZE];
+
+ if (level > barebox_loglevel)
+ return 0;
+
+ va_start(args, fmt);
+ i = vsprintf(printbuffer, fmt, args);
+ va_end(args);
+
+ /* Print the string */
+ puts(printbuffer);
+
+ return i;
+}
+
+static int loglevel_init(void)
+{
+ return globalvar_add_simple_int("loglevel", &barebox_loglevel, "%d");
+}
+device_initcall(loglevel_init);
+
int printf(const char *fmt, ...)
{
va_list args;
diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index 16b7f06..e587e3a 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -26,6 +26,7 @@
#include <command.h>
#include <driver.h>
#include <malloc.h>
+#include <console.h>
#include <linux/ctype.h>
#include <errno.h>
#include <fs.h>
@@ -370,11 +371,14 @@ const char *dev_id(const struct device_d *dev)
return buf;
}
-int dev_printf(const struct device_d *dev, const char *format, ...)
+int dev_printf(int level, const struct device_d *dev, const char *format, ...)
{
va_list args;
int ret = 0;
+ if (level > barebox_loglevel)
+ return 0;
+
if (dev->driver && dev->driver->name)
ret += printf("%s ", dev->driver->name);
diff --git a/include/console.h b/include/console.h
index e94c5ae..393579b 100644
--- a/include/console.h
+++ b/include/console.h
@@ -57,4 +57,6 @@ extern struct list_head console_list;
bool console_is_input_allow(void);
void console_allow_input(bool val);
+extern int barebox_loglevel;
+
#endif
diff --git a/include/printk.h b/include/printk.h
index 86bf208..f550f07 100644
--- a/include/printk.h
+++ b/include/printk.h
@@ -18,12 +18,15 @@
/* debugging and troubleshooting/diagnostic helpers. */
-int dev_printf(const struct device_d *dev, const char *format, ...)
+int pr_print(int level, const char *format, ...)
__attribute__ ((format(__printf__, 2, 3)));
+int dev_printf(int level, const struct device_d *dev, const char *format, ...)
+ __attribute__ ((format(__printf__, 3, 4)));
+
#define __dev_printf(level, dev, format, args...) \
({ \
- (level) <= LOGLEVEL ? dev_printf((dev), (format), ##args) : 0; \
+ (level) <= LOGLEVEL ? dev_printf((level), (dev), (format), ##args) : 0; \
})
@@ -46,7 +49,7 @@ int dev_printf(const struct device_d *dev, const char *format, ...)
#define __pr_printk(level, format, args...) \
({ \
- (level) <= LOGLEVEL ? printk((format), ##args) : 0; \
+ (level) <= LOGLEVEL ? pr_print((level), (format), ##args) : 0; \
})
#ifndef pr_fmt
--
1.8.4.rc3
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH v2] introduce runtime loglevel
2013-09-27 17:19 [PATCH v2] introduce runtime loglevel Sascha Hauer
@ 2013-09-29 10:18 ` Sascha Hauer
0 siblings, 0 replies; 2+ messages in thread
From: Sascha Hauer @ 2013-09-29 10:18 UTC (permalink / raw)
To: barebox
On Fri, Sep 27, 2013 at 07:19:57PM +0200, Sascha Hauer wrote:
> With this the verbosity of barebox can be controlled during runtime
> using the 'loglevel' globalvar.
>
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
>
> +config DEFAULT_LOGLEVEL
> + int "default loglevel"
> + default 6
Changed the default to '7'. Reason is that normally when we #define
DEBUG in a file we see the debug messages. With a default loglevel of
'6' we wouldn't see them even if DEBUG is defined.
Sascha
> + help
> + This defines the default runtime loglevel. It can be changed using the
> + global.loglevel variable. Available logelevels are:
> +
> + 0 system is unusable (emerg)
> + 1 action must be taken immediately (alert)
> + 2 critical conditions (crit)
> + 3 error conditions (err)
> + 4 warning conditions (warn)
> + 5 normal but significant condition (notice)
> + 6 informational (info)
> + 7 debug-level messages (debug)
> +
> config DEBUG_INFO
> bool
> prompt "enable debug symbols"
> diff --git a/common/console_common.c b/common/console_common.c
> index d1b823e..18b7676 100644
> --- a/common/console_common.c
> +++ b/common/console_common.c
> @@ -57,6 +57,33 @@ void console_allow_input(bool val)
> console_input_allow = val;
> }
>
> +int barebox_loglevel = CONFIG_DEFAULT_LOGLEVEL;
> +
> +int pr_print(int level, const char *fmt, ...)
> +{
> + va_list args;
> + uint i;
> + char printbuffer[CFG_PBSIZE];
> +
> + if (level > barebox_loglevel)
> + return 0;
> +
> + va_start(args, fmt);
> + i = vsprintf(printbuffer, fmt, args);
> + va_end(args);
> +
> + /* Print the string */
> + puts(printbuffer);
> +
> + return i;
> +}
> +
> +static int loglevel_init(void)
> +{
> + return globalvar_add_simple_int("loglevel", &barebox_loglevel, "%d");
> +}
> +device_initcall(loglevel_init);
> +
> int printf(const char *fmt, ...)
> {
> va_list args;
> diff --git a/drivers/base/driver.c b/drivers/base/driver.c
> index 16b7f06..e587e3a 100644
> --- a/drivers/base/driver.c
> +++ b/drivers/base/driver.c
> @@ -26,6 +26,7 @@
> #include <command.h>
> #include <driver.h>
> #include <malloc.h>
> +#include <console.h>
> #include <linux/ctype.h>
> #include <errno.h>
> #include <fs.h>
> @@ -370,11 +371,14 @@ const char *dev_id(const struct device_d *dev)
> return buf;
> }
>
> -int dev_printf(const struct device_d *dev, const char *format, ...)
> +int dev_printf(int level, const struct device_d *dev, const char *format, ...)
> {
> va_list args;
> int ret = 0;
>
> + if (level > barebox_loglevel)
> + return 0;
> +
> if (dev->driver && dev->driver->name)
> ret += printf("%s ", dev->driver->name);
>
> diff --git a/include/console.h b/include/console.h
> index e94c5ae..393579b 100644
> --- a/include/console.h
> +++ b/include/console.h
> @@ -57,4 +57,6 @@ extern struct list_head console_list;
> bool console_is_input_allow(void);
> void console_allow_input(bool val);
>
> +extern int barebox_loglevel;
> +
> #endif
> diff --git a/include/printk.h b/include/printk.h
> index 86bf208..f550f07 100644
> --- a/include/printk.h
> +++ b/include/printk.h
> @@ -18,12 +18,15 @@
>
> /* debugging and troubleshooting/diagnostic helpers. */
>
> -int dev_printf(const struct device_d *dev, const char *format, ...)
> +int pr_print(int level, const char *format, ...)
> __attribute__ ((format(__printf__, 2, 3)));
>
> +int dev_printf(int level, const struct device_d *dev, const char *format, ...)
> + __attribute__ ((format(__printf__, 3, 4)));
> +
> #define __dev_printf(level, dev, format, args...) \
> ({ \
> - (level) <= LOGLEVEL ? dev_printf((dev), (format), ##args) : 0; \
> + (level) <= LOGLEVEL ? dev_printf((level), (dev), (format), ##args) : 0; \
> })
>
>
> @@ -46,7 +49,7 @@ int dev_printf(const struct device_d *dev, const char *format, ...)
>
> #define __pr_printk(level, format, args...) \
> ({ \
> - (level) <= LOGLEVEL ? printk((format), ##args) : 0; \
> + (level) <= LOGLEVEL ? pr_print((level), (format), ##args) : 0; \
> })
>
> #ifndef pr_fmt
> --
> 1.8.4.rc3
>
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-09-29 10:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-09-27 17:19 [PATCH v2] introduce runtime loglevel Sascha Hauer
2013-09-29 10:18 ` Sascha Hauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox