Changeset 14de4106 in mainline

Timestamp:

2012-07-17T06:14:58Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

76d92db1

Parents:

3ab9de0

Message:

Speed-up logging when not recorded

Location:

uspace/lib/c

Files:

• generic/io/log.c (modified) (3 diffs)
• include/io/log.h (modified) (2 diffs)

uspace/lib/c/generic/io/log.c

@@ -194 +194 @@
 }
 
+bool __log_shall_record(log_level_t level)
+{
+        return get_current_observed_level() >= level;
+}
+
 /** Write an entry to the log.
  *
@@ -201 +206 @@
  * @param fmt           Format string (no traling newline).
  */
-void log_msg(log_level_t level, const char *fmt, ...)
+void __log_msg(log_level_t level, const char *fmt, ...)
 {
         va_list args;
 
         va_start(args, fmt);
-        log_msgv(level, fmt, args);
+        __log_msgv(level, fmt, args);
         va_end(args);
 }
@@ -217 +222 @@
  * @param fmt           Format string (no trailing newline)
  */
-void log_msgv(log_level_t level, const char *fmt, va_list args)
+void __log_msgv(log_level_t level, const char *fmt, va_list args)
 {
         assert(level < LVL_LIMIT);

uspace/lib/c/include/io/log.h

@@ -36 +36 @@
 
 #include <stdarg.h>
+#include <bool.h>
 
 typedef enum {
@@ -49 +50 @@
 } log_level_t;
 
+extern bool __log_shall_record(log_level_t);
 extern int log_init(const char *, log_level_t);
-extern void log_msg(log_level_t, const char *, ...);
-extern void log_msgv(log_level_t, const char *, va_list);
+
+#define log_msg(level, format, ...) \
+        do { \
+                if (__log_shall_record((level))) { \
+                        __log_msg(level, format, ##__VA_ARGS__); \
+                } \
+        } while (false)
+
+#define log_msgv(level, format, args) \
+        do { \
+                if (__log_shall_record((level))) { \
+                        __log_msgv(level, format, args); \
+                } \
+        } while (false)
+
+extern void __log_msg(log_level_t, const char *, ...);
+extern void __log_msgv(log_level_t, const char *, va_list);
 
 #endif