diff mbox series

[v2,1/6] log: Set up a flag byte for log records

Message ID 20210121031057.559301-2-sjg@chromium.org
State Accepted
Commit 79d5983b61e41d5c586489b03e75a75961d31041
Delegated to: Tom Rini
Headers show
Series log: Allow multiple lines and conversion to printf() | expand

Commit Message

Simon Glass Jan. 21, 2021, 3:10 a.m. UTC 
At present only a single flag (force_debug) is used in log records. Before
adding more, convert this into a bitfield, so more can be added without
using more space.

To avoid expanding the log_record struct itself (which some drivers may
wish to store in memory) reduce the line-number field to 16 bits. This
provides for up to 64K lines which should be enough for anyone.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

(no changes since v1)

 common/log.c  |  9 ++++++---
 include/log.h | 14 ++++++++++----
 2 files changed, 16 insertions(+), 7 deletions(-)

Comments

Tom Rini March 15, 2021, 3:52 p.m. UTC | #1 
On Wed, Jan 20, 2021 at 08:10:52PM -0700, Simon Glass wrote:

> At present only a single flag (force_debug) is used in log records. Before
> adding more, convert this into a bitfield, so more can be added without
> using more space.
> 
> To avoid expanding the log_record struct itself (which some drivers may
> wish to store in memory) reduce the line-number field to 16 bits. This
> provides for up to 64K lines which should be enough for anyone.
> 
> Signed-off-by: Simon Glass <sjg@chromium.org>

Applied to u-boot/next, thanks!
diff mbox series

Patch

diff --git a/common/log.c b/common/log.c
index 767f0febc51..02f4cbe3fdb 100644
--- a/common/log.c
+++ b/common/log.c
@@ -152,7 +152,7 @@  static bool log_passes_filters(struct log_device *ldev, struct log_rec *rec)
 {
 	struct log_filter *filt;
 
-	if (rec->force_debug)
+	if (rec->flags & LOGRECF_FORCE_DEBUG)
 		return true;
 
 	/* If there are no filters, filter on the default log level */
@@ -244,7 +244,9 @@  int _log(enum log_category_t cat, enum log_level_t level, const char *file,
 
 	rec.cat = cat;
 	rec.level = level & LOGL_LEVEL_MASK;
-	rec.force_debug = level & LOGL_FORCE_DEBUG;
+	rec.flags = 0;
+	if (level & LOGL_FORCE_DEBUG)
+		rec.flags |= LOGRECF_FORCE_DEBUG;
 	rec.file = file;
 	rec.line = line;
 	rec.func = func;
@@ -254,7 +256,8 @@  int _log(enum log_category_t cat, enum log_level_t level, const char *file,
 		gd->log_drop_count++;
 
 		/* display dropped traces with console puts and DEBUG_UART */
-		if (rec.level <= CONFIG_LOG_DEFAULT_LEVEL || rec.force_debug) {
+		if (rec.level <= CONFIG_LOG_DEFAULT_LEVEL ||
+		    rec.flags & LOGRECF_FORCE_DEBUG) {
 			char buf[CONFIG_SYS_CBSIZE];
 
 			va_start(args, fmt);
diff --git a/include/log.h b/include/log.h
index 2d27f9f657e..da053b0a6e8 100644
--- a/include/log.h
+++ b/include/log.h
@@ -322,6 +322,12 @@  void __assert_fail(const char *assertion, const char *file, unsigned int line,
 #define log_msg_ret(_msg, _ret) ((void)(_msg), _ret)
 #endif
 
+/** * enum log_rec_flags - Flags for a log record */
+enum log_rec_flags {
+	/** @LOGRECF_FORCE_DEBUG: Force output of debug record */
+	LOGRECF_FORCE_DEBUG	= BIT(0),
+};
+
 /**
  * struct log_rec - a single log record
  *
@@ -337,18 +343,18 @@  void __assert_fail(const char *assertion, const char *file, unsigned int line,
  *
  * @cat: Category, representing a uclass or part of U-Boot
  * @level: Severity level, less severe is higher
- * @force_debug: Force output of debug
- * @file: Name of file where the log record was generated (not allocated)
  * @line: Line number where the log record was generated
+ * @flags: Flags for log record (enum log_rec_flags)
+ * @file: Name of file where the log record was generated (not allocated)
  * @func: Function where the log record was generated (not allocated)
  * @msg: Log message (allocated)
  */
 struct log_rec {
 	enum log_category_t cat;
 	enum log_level_t level;
-	bool force_debug;
+	u16 line;
+	u8 flags;
 	const char *file;
-	int line;
 	const char *func;
 	const char *msg;
 };