Refactor verbosity code - try to avoid log calls if verbosity is not

set

audio/audio_driver.c

@@ -618,20 +618,20 @@ static void audio_driver_flush(const int16_t *data, size_t samples)
       double   direction   = (double)delta_mid / half_size;
       double   adjust      = 1.0 + audio_driver_rate_control_delta * direction;
 
-#if 0
-      RARCH_LOG_OUTPUT("[Audio]: Audio buffer is %u%% full\n",
-            (unsigned)(100 - (avail * 100) / audio_driver_buffer_size));
-#endif
-
       audio_driver_free_samples_buf
          [write_idx]               = avail;
       audio_source_ratio_current   =
          audio_source_ratio_original * adjust;
 
 #if 0
+      if (verbosity_is_enabled())
+      {
+         RARCH_LOG_OUTPUT("[Audio]: Audio buffer is %u%% full\n",
+               (unsigned)(100 - (avail * 100) / audio_driver_buffer_size));
          RARCH_LOG_OUTPUT("[Audio]: New rate: %lf, Orig rate: %lf\n",
                audio_source_ratio_current,
                audio_source_ratio_original);
+      }
 #endif
    }
 
@@ -861,6 +861,8 @@ bool audio_driver_find_driver(void)
    if (i >= 0)
       current_audio = (const audio_driver_t*)audio_driver_find_handle(i);
    else
+   {
+      if (verbosity_is_enabled())
       {
          unsigned d;
          RARCH_ERR("Couldn't find any audio driver named \"%s\"\n",
@@ -869,6 +871,7 @@ bool audio_driver_find_driver(void)
          for (d = 0; audio_driver_find_handle(d); d++)
             RARCH_LOG_OUTPUT("\t%s\n", audio_driver_find_ident(d));
          RARCH_WARN("Going to default to first audio driver...\n");
+      }
 
       current_audio = (const audio_driver_t*)audio_driver_find_handle(0);
 

camera/camera_driver.c

@@ -156,6 +156,8 @@ bool camera_driver_ctl(enum rarch_camera_ctl_state state, void *data)
             if (i >= 0)
                camera_driver = (const camera_driver_t*)camera_driver_find_handle(i);
             else
+            {
+               if (verbosity_is_enabled())
                {
                   unsigned d;
                   RARCH_ERR("Couldn't find any camera driver named \"%s\"\n",
@@ -165,6 +167,7 @@ bool camera_driver_ctl(enum rarch_camera_ctl_state state, void *data)
                      RARCH_LOG_OUTPUT("\t%s\n", camera_driver_find_ident(d));
 
                   RARCH_WARN("Going to default to first camera driver...\n");
+               }
 
                camera_driver = (const camera_driver_t*)camera_driver_find_handle(0);
 

dynamic.c

@@ -682,6 +682,9 @@ static void rarch_log_libretro(enum retro_log_level level,
    if ((unsigned)level < settings->uints.libretro_log_level)
       return;
 
+   if (!verbosity_is_enabled())
+      return;
+
    va_start(vp, fmt);
 
    switch (level)

gfx/video_driver.c

@@ -1842,6 +1842,8 @@ bool video_driver_find_driver(void)
    if (i >= 0)
       current_video = (video_driver_t*)video_driver_find_handle(i);
    else
+   {
+      if (verbosity_is_enabled())
       {
          unsigned d;
          RARCH_ERR("Couldn't find any video driver named \"%s\"\n",
@@ -1850,6 +1852,7 @@ bool video_driver_find_driver(void)
          for (d = 0; video_driver_find_handle(d); d++)
             RARCH_LOG_OUTPUT("\t%s\n", video_driver_find_ident(d));
          RARCH_WARN("Going to default to first video driver...\n");
+      }
 
       current_video = (video_driver_t*)video_driver_find_handle(0);
 

libretro-common/file/archive_file_7z.c

@@ -241,9 +241,6 @@ static int sevenzip_file_read(
          {
             size_t output_size   = 0;
 
-            /*RARCH_LOG_OUTPUT("Opened archive %s. Now trying to extract %s\n",
-                  path, needle);*/
-
             /* C LZMA SDK does not support chunked extraction - see here:
              * sourceforge.net/p/sevenzip/discussion/45798/thread/6fb59aaf/
              * */

location/location_driver.c

@@ -105,6 +105,9 @@ void find_location_driver(void)
    if (i >= 0)
       location_driver = (const location_driver_t*)location_driver_find_handle(i);
    else
+   {
+
+      if (verbosity_is_enabled())
       {
          unsigned d;
          RARCH_ERR("Couldn't find any location driver named \"%s\"\n",
@@ -114,6 +117,7 @@ void find_location_driver(void)
             RARCH_LOG_OUTPUT("\t%s\n", location_driver_find_ident(d));
 
          RARCH_WARN("Going to default to first location driver...\n");
+      }
 
       location_driver = (const location_driver_t*)location_driver_find_handle(0);
 

menu/menu_driver.c

@@ -1846,6 +1846,8 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
                menu_driver_ctx = (const menu_ctx_driver_t*)
                   menu_driver_find_handle(i);
             else
+            {
+               if (verbosity_is_enabled())
                {
                   unsigned d;
                   RARCH_WARN("Couldn't find any menu driver named \"%s\"\n",
@@ -1854,6 +1856,7 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
                   for (d = 0; menu_driver_find_handle(d); d++)
                      RARCH_LOG_OUTPUT("\t%s\n", menu_driver_find_ident(d));
                   RARCH_WARN("Going to default to first menu driver...\n");
+               }
 
                menu_driver_ctx = (const menu_ctx_driver_t*)
                   menu_driver_find_handle(0);

qb/config.params.sh

@@ -36,6 +36,7 @@ HAVE_MINIUPNPC=auto        # Mini UPnP client library (for NAT traversal)
 HAVE_BUILTINMINIUPNPC=yes  # Bake in Mini UPnP client library (for NAT traversal)
 C89_BUILTINMINIUPNPC=no
 HAVE_D3D9=yes              # Direct3D 9 support
+HAVE_D3DX=yes              # Direct3DX support
 HAVE_OPENGL=auto           # OpenGL support
 HAVE_MALI_FBDEV=no         # Mali fbdev context support
 HAVE_VIVANTE_FBDEV=no      # Vivante fbdev context support

record/record_driver.c

@@ -113,6 +113,8 @@ void find_record_driver(void)
    if (i >= 0)
       recording_driver = (const record_driver_t*)record_driver_find_handle(i);
    else
+   {
+      if (verbosity_is_enabled())
       {
          unsigned d;
 
@@ -122,6 +124,7 @@ void find_record_driver(void)
          for (d = 0; record_driver_find_handle(d); d++)
             RARCH_LOG_OUTPUT("\t%s\n", record_driver_find_ident(d));
          RARCH_WARN("Going to default to first record driver...\n");
+      }
 
       recording_driver = (const record_driver_t*)record_driver_find_handle(0);
 

verbosity.c

@@ -126,20 +126,18 @@ void RARCH_LOG_V(const char *tag, const char *fmt, va_list ap)
 #if !TARGET_IPHONE_SIMULATOR
    static aslclient asl_client;
 #endif
-#else
-   FILE *fp = NULL;
-   (void)fp;
 #endif
 
-   if (!verbosity_is_enabled())
-      return;
 #if TARGET_OS_IPHONE
 #if TARGET_IPHONE_SIMULATOR
    vprintf(fmt, ap);
 #else
    if (!asl_initialized)
    {
-      asl_client = asl_open(file_path_str(FILE_PATH_PROGRAM_NAME), "com.apple.console", ASL_OPT_STDERR | ASL_OPT_NO_DELAY);
+      asl_client      = asl_open(
+            file_path_str(FILE_PATH_PROGRAM_NAME),
+            "com.apple.console",
+            ASL_OPT_STDERR | ASL_OPT_NO_DELAY);
       asl_initialized = 1;
    }
    aslmsg msg = asl_new(ASL_TYPE_MSG);
@@ -164,6 +162,7 @@ static aslclient asl_client;
       OutputDebugStringA(buffer);
    }
 #elif defined(ANDROID)
+   {
       int prio = ANDROID_LOG_INFO;
       if (tag)
       {
@@ -176,17 +175,21 @@ static aslclient asl_client;
             file_path_str(FILE_PATH_PROGRAM_NAME),
             fmt,
             ap);
+   }
 #else
 
+   {
 #ifdef HAVE_FILE_LOGGER
-   fp = (FILE*)retro_main_log_file();
+      FILE *fp = (FILE*)retro_main_log_file();
 #else
-   fp = stderr;
+      FILE *fp = stderr;
 #endif
+
       fprintf(fp, "%s ",
             tag ? tag : file_path_str(FILE_PATH_LOG_INFO));
       vfprintf(fp, fmt, ap);
       fflush(fp);
+   }
 #endif
 }
 
@@ -202,11 +205,6 @@ void RARCH_LOG(const char *fmt, ...)
    va_end(ap);
 }
 
-void RARCH_LOG_OUTPUT_V(const char *tag, const char *msg, va_list ap)
-{
-   RARCH_LOG_V(tag, msg, ap);
-}
-
 void RARCH_LOG_OUTPUT(const char *msg, ...)
 {
    va_list ap;
@@ -215,28 +213,26 @@ void RARCH_LOG_OUTPUT(const char *msg, ...)
    va_end(ap);
 }
 
-void RARCH_WARN_V(const char *tag, const char *fmt, va_list ap)
-{
-   RARCH_LOG_V(tag, fmt, ap);
-}
-
 void RARCH_WARN(const char *fmt, ...)
 {
    va_list ap;
+
+   if (!verbosity_is_enabled())
+      return;
+
    va_start(ap, fmt);
    RARCH_WARN_V(file_path_str(FILE_PATH_LOG_WARN), fmt, ap);
    va_end(ap);
 }
 
-void RARCH_ERR_V(const char *tag, const char *fmt, va_list ap)
-{
-   RARCH_LOG_V(tag, fmt, ap);
-}
-
 void RARCH_ERR(const char *fmt, ...)
 {
    va_list ap;
    va_start(ap, fmt);
+
+   if (!verbosity_is_enabled())
+      return;
+
    RARCH_ERR_V(file_path_str(FILE_PATH_LOG_ERROR), fmt, ap);
    va_end(ap);
 }

verbosity.h

@@ -20,6 +20,7 @@
 
 #include <boolean.h>
 #include <retro_common_api.h>
+#include <retro_inline.h>
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -128,12 +129,27 @@ void logger_send_v(const char *__format, va_list args);
 #else
 void RARCH_LOG_V(const char *tag, const char *fmt, va_list ap);
 void RARCH_LOG(const char *fmt, ...);
-void RARCH_LOG_OUTPUT_V(const char *tag, const char *msg, va_list ap);
 void RARCH_LOG_OUTPUT(const char *msg, ...);
-void RARCH_WARN_V(const char *tag, const char *fmt, va_list ap);
 void RARCH_WARN(const char *fmt, ...);
-void RARCH_ERR_V(const char *tag, const char *fmt, va_list ap);
 void RARCH_ERR(const char *fmt, ...);
+
+static INLINE void RARCH_LOG_OUTPUT_V(const char *tag,
+      const char *msg, va_list ap)
+{
+   RARCH_LOG_V(tag, msg, ap);
+}
+
+static INLINE void RARCH_WARN_V(const char *tag,
+      const char *fmt, va_list ap)
+{
+   RARCH_LOG_V(tag, fmt, ap);
+}
+
+static INLINE void RARCH_ERR_V(const char *tag,
+      const char *fmt, va_list ap)
+{
+   RARCH_LOG_V(tag, fmt, ap);
+}
 #endif
 
 RETRO_END_DECLS

wifi/wifi_driver.c

@@ -154,6 +154,8 @@ bool wifi_driver_ctl(enum rarch_wifi_ctl_state state, void *data)
             if (i >= 0)
                wifi_driver = (const wifi_driver_t*)wifi_driver_find_handle(i);
             else
+            {
+               if (verbosity_is_enabled())
                {
                   unsigned d;
                   RARCH_ERR("Couldn't find any wifi driver named \"%s\"\n",
@@ -163,6 +165,7 @@ bool wifi_driver_ctl(enum rarch_wifi_ctl_state state, void *data)
                      RARCH_LOG_OUTPUT("\t%s\n", wifi_driver_find_ident(d));
 
                   RARCH_WARN("Going to default to first wifi driver...\n");
+               }
 
                wifi_driver = (const wifi_driver_t*)wifi_driver_find_handle(0);