[Bf-blender-cvs] [1a9ab43e8ce] soc-2020-info-editor: Change clog defaults

[Mateusz Grzeliński]

Commit: 1a9ab43e8ce143dc3ab79ab2f82d8d9f837c1539
Author: Mateusz Grzeliński
Date:   Fri Jul 31 10:17:03 2020 +0200
Branches: soc-2020-info-editor
https://developer.blender.org/rB1a9ab43e8ce143dc3ab79ab2f82d8d9f837c1539

Change clog defaults

- by default all loggers are enabled and set to severity warning (explicitly)
- now severity level is properly respected when logging

===================================================================

M	intern/clog/CLG_log.h
M	intern/clog/clog.c

===================================================================

diff --git a/intern/clog/CLG_log.h b/intern/clog/CLG_log.h
index cf94cf8a82c..87cce49f2d5 100644
--- a/intern/clog/CLG_log.h
+++ b/intern/clog/CLG_log.h
@@ -209,21 +209,27 @@ void CLG_logref_init(CLG_LogRef *clg_ref);
   ((void)CLOG_ENSURE(clg_ref), ((clg_ref)->type->flag & CLG_FLAG_USE))
 
 #define CLOG_CHECK_VERBOSITY(clg_ref, verbose_level, ...) \
-  ((void)CLOG_ENSURE(clg_ref), \
-   ((clg_ref)->type->flag & CLG_FLAG_USE) && ((clg_ref)->type->verbosity_level >= verbose_level))
+  (CLOG_CHECK_IN_USE(clg_ref) && ((clg_ref)->type->severity_level >= CLG_SEVERITY_VERBOSE) && \
+   ((clg_ref)->type->verbosity_level >= verbose_level))
 
-/** log at severity WARNING or higher is always logged, even if not in use */
 #define CLOG_AT_SEVERITY(clg_ref, severity, verbose_level, ...) \
   { \
     CLG_LogType *_lg_ty = CLOG_ENSURE(clg_ref); \
-    if (((_lg_ty->flag & CLG_FLAG_USE) && (_lg_ty->verbosity_level >= verbose_level)) || \
-        (severity >= CLG_SEVERITY_WARN)) { \
-      CLG_logf(_lg_ty, \
-               severity, \
-               verbose_level, \
-               __FILE__ ":" STRINGIFY(__LINE__), \
-               __func__, \
-               __VA_ARGS__); \
+    if ((_lg_ty->flag & CLG_FLAG_USE) && severity >= _lg_ty->severity_level) { \
+      switch (severity) { \
+        case CLG_SEVERITY_VERBOSE: \
+          if (verbose_level < _lg_ty->verbosity_level) { \
+            break; \
+          } \
+          __attribute__((fallthrough)); \
+        default: \
+          CLG_logf(_lg_ty, \
+                   severity, \
+                   verbose_level, \
+                   __FILE__ ":" STRINGIFY(__LINE__), \
+                   __func__, \
+                   __VA_ARGS__); \
+      } \
     } \
   } \
   ((void)0)
@@ -231,10 +237,17 @@ void CLG_logref_init(CLG_LogRef *clg_ref);
 #define CLOG_STR_AT_SEVERITY(clg_ref, severity, verbose_level, str) \
   { \
     CLG_LogType *_lg_ty = CLOG_ENSURE(clg_ref); \
-    if (((_lg_ty->flag & CLG_FLAG_USE) && (_lg_ty->verbosity_level >= verbose_level)) || \
-        (severity >= CLG_SEVERITY_WARN)) { \
-      CLG_log_str( \
-          _lg_ty, severity, verbose_level, __FILE__ ":" STRINGIFY(__LINE__), __func__, str); \
+    if ((_lg_ty->flag & CLG_FLAG_USE) && severity >= _lg_ty->severity_level) { \
+      switch (severity) { \
+        case CLG_SEVERITY_VERBOSE: \
+          if (verbose_level < _lg_ty->verbosity_level) { \
+            break; \
+          } \
+          __attribute__((fallthrough)); \
+        default: \
+          CLG_log_str( \
+              _lg_ty, severity, verbose_level, __FILE__ ":" STRINGIFY(__LINE__), __func__, str); \
+      } \
     } \
   } \
   ((void)0)
@@ -242,12 +255,20 @@ void CLG_logref_init(CLG_LogRef *clg_ref);
 #define CLOG_STR_AT_SEVERITY_N(clg_ref, severity, verbose_level, str) \
   { \
     CLG_LogType *_lg_ty = CLOG_ENSURE(clg_ref); \
-    if (((_lg_ty->flag & CLG_FLAG_USE) && (_lg_ty->verbosity_level >= verbose_level)) || \
-        (severity >= CLG_SEVERITY_WARN)) { \
-      const char *_str = str; \
-      CLG_log_str( \
-          _lg_ty, severity, verbose_level, __FILE__ ":" STRINGIFY(__LINE__), __func__, _str); \
-      MEM_freeN((void *)_str); \
+    if ((_lg_ty->flag & CLG_FLAG_USE) && severity >= _lg_ty->severity_level) { \
+      switch (severity) { \
+        case CLG_SEVERITY_VERBOSE: \
+          if (verbose_level < _lg_ty->verbosity_level) { \
+            break; \
+          } \
+          __attribute__((fallthrough)); \
+        default: { \
+          const char *_str = str; \
+          CLG_log_str( \
+              _lg_ty, severity, verbose_level, __FILE__ ":" STRINGIFY(__LINE__), __func__, _str); \
+          MEM_freeN((void *)_str); \
+        } \
+      } \
     } \
   } \
   ((void)0)
diff --git a/intern/clog/clog.c b/intern/clog/clog.c
index 13a5d81f99c..fd5307693d2 100644
--- a/intern/clog/clog.c
+++ b/intern/clog/clog.c
@@ -819,9 +819,10 @@ static CLogContext *CLG_ctx_init(void)
   pthread_mutex_init(&ctx->types_lock, NULL);
 #endif
   ctx->use_color = true;
-  ctx->default_type.severity_level = CLG_SEVERITY_INFO;
+  ctx->default_type.severity_level = CLG_SEVERITY_WARN;
   ctx->default_type.verbosity_level = 0;
   ctx->use_stdout = true;
+  CLG_ctx_type_filter_include(ctx, "*", strlen("*"));
   CLG_ctx_output_update(ctx);
 
   return ctx;