]> git.baikalelectronics.ru Git - uboot.git/commitdiff
log: don't build the trace buffer when log is not ready
authorPatrick Delaunay <patrick.delaunay@st.com>
Fri, 27 Nov 2020 10:20:52 +0000 (11:20 +0100)
committerTom Rini <trini@konsulko.com>
Fri, 15 Jan 2021 19:36:11 +0000 (14:36 -0500)
Update _log function to drop any traces when log is yet initialized:
vsnprintf is no more executed in this case.

This patch allows to reduce the cost for the dropped early debug trace.

Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
common/log.c

index ce39918e045a249679d117bc07327945722ef184..212789d6b367aca767c18948e453c0823fdde0c0 100644 (file)
@@ -228,6 +228,9 @@ int _log(enum log_category_t cat, enum log_level_t level, const char *file,
        struct log_rec rec;
        va_list args;
 
+       if (!gd)
+               return -ENOSYS;
+
        /* Check for message continuation */
        if (cat == LOGC_CONT)
                cat = gd->logc_prev;
@@ -240,15 +243,15 @@ int _log(enum log_category_t cat, enum log_level_t level, const char *file,
        rec.file = file;
        rec.line = line;
        rec.func = func;
+
+       if (!(gd->flags & GD_FLG_LOG_READY)) {
+               gd->log_drop_count++;
+               return -ENOSYS;
+       }
        va_start(args, fmt);
        vsnprintf(buf, sizeof(buf), fmt, args);
        va_end(args);
        rec.msg = buf;
-       if (!gd || !(gd->flags & GD_FLG_LOG_READY)) {
-               if (gd)
-                       gd->log_drop_count++;
-               return -ENOSYS;
-       }
        if (!log_dispatch(&rec)) {
                gd->logc_prev = cat;
                gd->logl_prev = level;