Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87498f9b authored by Henri Chataing's avatar Henri Chataing
Browse files

system/gd: Deprecate LOG_xx macros from os/log.h 

All logs have been converted to fmt log functions.
Removes the definitions for:
  - LOG_VERBOSE
  - LOG_DEBUG
  - LOG_INFO
  - LOG_WARNING
  - LOG_ERROR

Test: m com.android.btservices
Bug: 305066880
Flag: EXEMPT, mechanical refactor
Change-Id: I324677fa1f66ab1a6cb5fdca86d8b738e21910d1
parent 11c6e082

system/gd/os/log.h

+3 −60
Original line number Diff line number Diff line
@@ -33,15 +33,6 @@ static_assert(LOG_TAG != nullptr, "LOG_TAG should never be NULL"); 


#if defined(FUZZ_TARGET)



#define LOG_VERBOSE_INT(...)

#define LOG_DEBUG_INT(...)

#define LOG_INFO_INT(...)

#define LOG_WARN_INT(...)



#define LOG_ERROR_INT(...) do {     \

  fprintf(stderr, __VA_ARGS__);     \

} while (false)



// for fuzz targets, we just

// need to abort in this statement

// to catch the bug
@@ -57,25 +48,6 @@ static_assert(LOG_TAG != nullptr, "LOG_TAG should never be NULL"); 
#include <log/log.h>

#include <log/log_event_list.h>



#define LOG_VERBOSE_INT(fmt, args...)                                                     \

  do {                                                                                    \

    if (!__android_log_is_loggable(ANDROID_LOG_VERBOSE, LOG_TAG, ANDROID_LOG_INFO) &&     \

        !__android_log_is_loggable(ANDROID_LOG_VERBOSE, "bluetooth", ANDROID_LOG_INFO)) { \

      ALOGV(fmt, ##args);                                                                 \

    }                                                                                     \

  } while (false)



#define LOG_DEBUG_INT(fmt, args...)                                                     \

  do {                                                                                  \

    if (!__android_log_is_loggable(ANDROID_LOG_DEBUG, LOG_TAG, ANDROID_LOG_INFO) &&     \

        !__android_log_is_loggable(ANDROID_LOG_DEBUG, "bluetooth", ANDROID_LOG_INFO)) { \

      ALOGD(fmt, ##args);                                                               \

    }                                                                                   \

  } while (false)



#define LOG_INFO_INT(fmt, args...) ALOGI(fmt, ##args)

#define LOG_WARN_INT(fmt, args...) ALOGW(fmt, ##args)

#define LOG_ERROR_INT(fmt, args...) ALOGE(fmt, ##args)

#define LOG_ALWAYS_FATAL_INT(fmt, args...) do { \

  ALOGE(fmt, ##args);                           \

  abort();                                      \
@@ -88,28 +60,19 @@ static_assert(LOG_TAG != nullptr, "LOG_TAG should never be NULL"); 
#define LOGWRAPPER(fmt, args...) VERBOSE_INFO(bluetooth, "bluetooth: " fmt, \

                                               ##args)



#define LOG_VEBOSE_INT(...) LOGWRAPPER(__VA_ARGS__)

#define LOG_DEBUG_INT(...)  LOGWRAPPER(__VA_ARGS__)

#define LOG_INFO_INT(...)   LOGWRAPPER(__VA_ARGS__)

#define LOG_WARN_INT(...)   LOGWRAPPER(__VA_ARGS__)

#define LOG_ERROR_INT(...)  LOGWRAPPER(__VA_ARGS__)

#define LOG_ALWAYS_FATAL_INT(fmt, args...)                                          \

  do {                                                                              \

    fprintf(stderr, fmt "\n", ##args);                                              \

    abort();                                                                        \

  } while (false)



#elif defined(TARGET_FLOSS) /* end of defined (ANDROID_EMULATOR) */



#include "os/syslog.h"



// Prefix the log with tag, file, line and function

#define LOGWRAPPER(tag, fmt, args...) write_syslog(tag, LOG_TAG, "%s: " fmt, LOG_TAG, ##args)



#define LOG_VERBOSE_INT(...) LOGWRAPPER(LOG_TAG_VERBOSE, __VA_ARGS__)

#define LOG_DEBUG_INT(...) LOGWRAPPER(LOG_TAG_DEBUG, __VA_ARGS__)

#define LOG_INFO_INT(...) LOGWRAPPER(LOG_TAG_INFO, __VA_ARGS__)

#define LOG_WARN_INT(...) LOGWRAPPER(LOG_TAG_WARN, __VA_ARGS__)

#define LOG_ERROR_INT(...) LOGWRAPPER(LOG_TAG_ERROR, __VA_ARGS__)



#define LOG_ALWAYS_FATAL_INT(...)           \

  do {                                      \

    LOGWRAPPER(LOG_TAG_FATAL, __VA_ARGS__); \
@@ -148,12 +111,6 @@ static_assert(LOG_TAG != nullptr, "LOG_TAG should never be NULL"); 
        ##args);                                                                                                    \

  } while (false)



#define LOG_VERBOSE_INT(...) LOGWRAPPER(__VA_ARGS__)

#define LOG_DEBUG_INT(...) LOGWRAPPER(__VA_ARGS__)

#define LOG_INFO_INT(...) LOGWRAPPER(__VA_ARGS__)

#define LOG_WARN_INT(...) LOGWRAPPER(__VA_ARGS__)

#define LOG_ERROR_INT(...) LOGWRAPPER(__VA_ARGS__)



#ifndef LOG_ALWAYS_FATAL

#define LOG_ALWAYS_FATAL_INT(...) \

  do {                            \
@@ -169,6 +126,7 @@ static_assert(LOG_TAG != nullptr, "LOG_TAG should never be NULL"); 
#define _LOG_SRC_FMT_STR "%s:%d - %s: "

#define _PREPEND_SRC_LOC_IN_LOG(fmt, args...) \

  _LOG_SRC_FMT_STR fmt, __FILE__, __LINE__, __func__, ##args



// ---------------------------------------------------------

// All MACROs defined above are internal and should *not* be

// used directly (use LOG_XXX defined below instead).
@@ -176,21 +134,6 @@ static_assert(LOG_TAG != nullptr, "LOG_TAG should never be NULL"); 
// location of the log emitting statement, so far they are only used by

// LogMsg, where the source locations is passed in.



#define LOG_VERBOSE(fmt, args...)                                             \

  LOG_VERBOSE_INT(_PREPEND_SRC_LOC_IN_LOG(fmt, ##args))



#define LOG_DEBUG(fmt, args...)                                               \

  LOG_DEBUG_INT(_PREPEND_SRC_LOC_IN_LOG(fmt, ##args))



#define LOG_INFO(fmt, args...)                                                \

  LOG_INFO_INT(_PREPEND_SRC_LOC_IN_LOG(fmt, ##args))



#define LOG_WARN(fmt, args...)                                                \

  LOG_WARN_INT(_PREPEND_SRC_LOC_IN_LOG(fmt, ##args))



#define LOG_ERROR(fmt, args...)                                               \

  LOG_ERROR_INT(_PREPEND_SRC_LOC_IN_LOG(fmt, ##args))



#ifndef LOG_ALWAYS_FATAL

#define LOG_ALWAYS_FATAL(fmt, args...)                                        \

  LOG_ALWAYS_FATAL_INT(_PREPEND_SRC_LOC_IN_LOG(fmt, ##args))