diff options
Diffstat (limited to 'gd/os/log.h')
| -rw-r--r-- | gd/os/log.h | 88 |
1 files changed, 23 insertions, 65 deletions
diff --git a/gd/os/log.h b/gd/os/log.h index 312de3dec..29ff7517e 100644 --- a/gd/os/log.h +++ b/gd/os/log.h @@ -21,43 +21,25 @@ #include <cstdlib> #ifndef LOG_TAG -#define LOG_TAG "bluetooth" +#define LOG_TAG "bt" #endif -static_assert(LOG_TAG != nullptr, "LOG_TAG should never be NULL"); - #if defined(OS_ANDROID) #include <log/log.h> -#ifdef FUZZ_TARGET -#define LOG_VERBOSE(...) -#define LOG_DEBUG(...) -#define LOG_INFO(...) -#define LOG_WARN(...) -#else - -static_assert(LOG_TAG != nullptr, "LOG_TAG is null after header inclusion"); - -#define LOG_VERBOSE(fmt, args...) \ - do { \ - if (bluetooth::common::InitFlags::IsDebugLoggingEnabledForTag(LOG_TAG)) { \ - ALOGV("%s:%d %s: " fmt, __FILE__, __LINE__, __func__, ##args); \ - } \ - } while (false) - -#define LOG_DEBUG(fmt, args...) \ - do { \ - if (bluetooth::common::InitFlags::IsDebugLoggingEnabledForTag(LOG_TAG)) { \ - ALOGD("%s:%d %s: " fmt, __FILE__, __LINE__, __func__, ##args); \ - } \ - } while (false) +/* When including headers from legacy stack, this log definitions collide with existing logging system. Remove once we + * get rid of legacy stack. */ +#ifndef LOG_VERBOSE +#define LOG_VERBOSE(fmt, args...) ALOGV("%s:%d %s: " fmt, __FILE__, __LINE__, __func__, ##args) +#define LOG_DEBUG(fmt, args...) ALOGD("%s:%d %s: " fmt, __FILE__, __LINE__, __func__, ##args) #define LOG_INFO(fmt, args...) ALOGI("%s:%d %s: " fmt, __FILE__, __LINE__, __func__, ##args) #define LOG_WARN(fmt, args...) ALOGW("%s:%d %s: " fmt, __FILE__, __LINE__, __func__, ##args) -#endif /* FUZZ_TARGET */ #define LOG_ERROR(fmt, args...) ALOGE("%s:%d %s: " fmt, __FILE__, __LINE__, __func__, ##args) +#endif /* LOG_VERBOSE*/ + #else /* syslog didn't work well here since we would be redefining LOG_DEBUG. */ @@ -65,52 +47,34 @@ static_assert(LOG_TAG != nullptr, "LOG_TAG is null after header inclusion"); #include <cstdio> #include <ctime> -#define LOGWRAPPER(fmt, args...) \ - do { \ - auto _now = std::chrono::system_clock::now(); \ - auto _now_ms = std::chrono::time_point_cast<std::chrono::milliseconds>(_now); \ - auto _now_t = std::chrono::system_clock::to_time_t(_now); \ - /* YYYY-MM-DD_HH:MM:SS.sss is 23 byte long, plus 1 for null terminator */ \ - char _buf[24]; \ - auto l = std::strftime(_buf, sizeof(_buf), "%Y-%m-%d %H:%M:%S", std::localtime(&_now_t)); \ - snprintf( \ - _buf + l, sizeof(_buf) - l, ".%03u", static_cast<unsigned int>(_now_ms.time_since_epoch().count() % 1000)); \ - fprintf(stderr, "%s %s - %s:%d - %s: " fmt "\n", _buf, LOG_TAG, __FILE__, __LINE__, __func__, ##args); \ +/* When including headers from legacy stack, this log definitions collide with existing logging system. Remove once we + * get rid of legacy stack. */ +#ifndef LOG_VERBOSE + +#define LOGWRAPPER(fmt, args...) \ + do { \ + auto now = std::chrono::system_clock::now(); \ + auto now_ms = std::chrono::time_point_cast<std::chrono::milliseconds>(now); \ + auto now_t = std::chrono::system_clock::to_time_t(now); \ + /* YYYY-MM-DD_HH:MM:SS.sss is 23 byte long, plus 1 for null terminator */ \ + char buf[24]; \ + auto l = std::strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", std::localtime(&now_t)); \ + snprintf(buf + l, sizeof(buf) - l, ".%03u", static_cast<unsigned int>(now_ms.time_since_epoch().count() % 1000)); \ + fprintf(stderr, "%s %s - %s:%d - %s: " fmt "\n", buf, LOG_TAG, __FILE__, __LINE__, __func__, ##args); \ } while (false) -#ifdef FUZZ_TARGET -#define LOG_VERBOSE(...) -#define LOG_DEBUG(...) -#define LOG_INFO(...) -#define LOG_WARN(...) -#else #define LOG_VERBOSE(...) LOGWRAPPER(__VA_ARGS__) #define LOG_DEBUG(...) LOGWRAPPER(__VA_ARGS__) #define LOG_INFO(...) LOGWRAPPER(__VA_ARGS__) #define LOG_WARN(...) LOGWRAPPER(__VA_ARGS__) -#endif /* FUZZ_TARGET */ #define LOG_ERROR(...) LOGWRAPPER(__VA_ARGS__) - -#ifndef LOG_ALWAYS_FATAL #define LOG_ALWAYS_FATAL(...) \ do { \ LOGWRAPPER(__VA_ARGS__); \ abort(); \ } while (false) -#endif -#ifndef android_errorWriteLog -#define android_errorWriteLog(tag, subTag) LOG_ERROR("ERROR tag: 0x%x, sub_tag: %s", tag, subTag) -#endif - -#ifndef android_errorWriteWithInfoLog -#define android_errorWriteWithInfoLog(tag, subTag, uid, data, dataLen) \ - LOG_ERROR("ERROR tag: 0x%x, sub_tag: %s", tag, subTag) -#endif - -#ifndef LOG_EVENT_INT -#define LOG_EVENT_INT(...) -#endif +#endif /* LOG_VERBOE */ #endif /* defined(OS_ANDROID) */ @@ -127,9 +91,3 @@ static_assert(LOG_TAG != nullptr, "LOG_TAG is null after header inclusion"); LOG_ALWAYS_FATAL("assertion '" #condition "' failed - " fmt, ##args); \ } \ } while (false) - -#ifndef CASE_RETURN_TEXT -#define CASE_RETURN_TEXT(code) \ - case code: \ - return #code -#endif |