diff options
author | Brant Thomsen <brant.thomsen@harman.com> | 2017-07-31 14:11:41 -0600 |
---|---|---|
committer | Brant Thomsen <brant.thomsen@harman.com> | 2017-07-31 14:11:41 -0600 |
commit | e128e835a55b7ac38ed536e63eb99f9c601d74f2 (patch) | |
tree | 0f554ed90465169f7f5e738df6941b801b53e4a7 | |
parent | abe4cc033ad1007561bc228c2e8802b58feca5b7 (diff) | |
download | Open-AVB-e128e835a55b7ac38ed536e63eb99f9c601d74f2.tar.gz |
More logging fixes
Fixed description for IF_LOG_ONCE and IF_LOG_INTERVAL.
Make sure logging static variables are initialized to 0.
MAAP and Shaper test buffer logging level before calling shaperLogBuffer.
-rw-r--r-- | daemons/maap/common/maap_log.h | 10 | ||||
-rw-r--r-- | daemons/shaper/src/shaper_log.h | 20 | ||||
-rw-r--r-- | lib/avtp_pipeline/include/openavb_log_pub.h | 8 |
3 files changed, 22 insertions, 16 deletions
diff --git a/daemons/maap/common/maap_log.h b/daemons/maap/common/maap_log.h index 7d36c1a1..bb421c7b 100644 --- a/daemons/maap/common/maap_log.h +++ b/daemons/maap/common/maap_log.h @@ -162,11 +162,11 @@ typedef enum { #define LOG_VARX(x, y) x ## y #define LOG_VAR(x, y) LOG_VARX(x, y) -// Log a message once. Technically once every 4.2 billion attempts. Usage: LOG_ONCE MAAP_LOG_INFO(...) -#define IF_LOG_ONCE() static uint32_t LOG_VAR(logOnce,__LINE__); if (!LOG_VAR(logOnce,__LINE__)++) +// Log a message once. Technically once every 4.2 billion attempts. Usage: IF_LOG_ONCE() MAAP_LOG_INFO(...) +#define IF_LOG_ONCE() static uint32_t LOG_VAR(logOnce,__LINE__) = 0; if (!LOG_VAR(logOnce,__LINE__)++) -// Log a message at an interval. Usage: LOG_INTERVAL(100) MAAP_LOG_INFO(...) -#define IF_LOG_INTERVAL(x) static uint32_t LOG_VAR(logOnce,__LINE__); if (!(LOG_VAR(logOnce,__LINE__)++ % (x - 1))) +// Log a message at an interval. Usage: IF_LOG_INTERVAL(100) MAAP_LOG_INFO(...) +#define IF_LOG_INTERVAL(x) static uint32_t LOG_VAR(logOnce,__LINE__) = 0; if (!(LOG_VAR(logOnce,__LINE__)++ % (x - 1))) #define ETH_FORMAT "%02x:%02x:%02x:%02x:%02x:%02x" @@ -221,7 +221,7 @@ void maapLogBuffer( #define MAAP_LOGRT_STATUS(BEGIN, ITEM, END, FMT, TYPE, VAL) maapLogRT(MAAP_LOG_LEVEL_STATUS, BEGIN, ITEM, END, FMT, TYPE, VAL) #define MAAP_LOGRT_DEBUG(BEGIN, ITEM, END, FMT, TYPE, VAL) maapLogRT(MAAP_LOG_LEVEL_DEBUG, BEGIN, ITEM, END, FMT, TYPE, VAL) #define MAAP_LOGRT_VERBOSE(BEGIN, ITEM, END, FMT, TYPE, VAL) maapLogRT(MAAP_LOG_LEVEL_VERBOSE, BEGIN, ITEM, END, FMT, TYPE, VAL) -#define MAAP_LOG_BUFFER(LEVEL, DATA, DATALEN, LINELINE) maapLogBuffer(LEVEL, DATA, DATALEN, LINELINE, MAAP_LOG_COMPANY, MAAP_LOG_COMPONENT, __FILE__, __LINE__) +#define MAAP_LOG_BUFFER(LEVEL, DATA, DATALEN, LINELINE) do { if (LEVEL <= MAAP_LOG_LEVEL) maapLogBuffer(0, DATA, DATALEN, LINELINE, MAAP_LOG_COMPANY, MAAP_LOG_COMPONENT, __FILE__, __LINE__); } while(0) #else #define MAAP_LOGF_DEV(LEVEL, FMT, ...) #define MAAP_LOGF_ERROR(FMT, ...) diff --git a/daemons/shaper/src/shaper_log.h b/daemons/shaper/src/shaper_log.h index 2b97726d..6c7d987b 100644 --- a/daemons/shaper/src/shaper_log.h +++ b/daemons/shaper/src/shaper_log.h @@ -162,11 +162,11 @@ typedef enum { #define LOG_VARX(x, y) x ## y #define LOG_VAR(x, y) LOG_VARX(x, y) -// Log a message once. Technically once every 4.2 billion attempts. Usage: LOG_ONCE SHAPER_LOG_INFO(...) -#define IF_LOG_ONCE() static uint32_t LOG_VAR(logOnce,__LINE__); if (!LOG_VAR(logOnce,__LINE__)++) +// Log a message once. Technically once every 4.2 billion attempts. Usage: IF_LOG_ONCE() SHAPER_LOG_INFO(...) +#define IF_LOG_ONCE() static uint32_t LOG_VAR(logOnce,__LINE__) = 0; if (!LOG_VAR(logOnce,__LINE__)++) -// Log a message at an interval. Usage: LOG_INTERVAL(100) SHAPER_LOG_INFO(...) -#define IF_LOG_INTERVAL(x) static uint32_t LOG_VAR(logOnce,__LINE__); if (!(LOG_VAR(logOnce,__LINE__)++ % (x - 1))) +// Log a message at an interval. Usage: IF_LOG_INTERVAL(100) SHAPER_LOG_INFO(...) +#define IF_LOG_INTERVAL(x) static uint32_t LOG_VAR(logOnce,__LINE__) = 0; if (!(LOG_VAR(logOnce,__LINE__)++ % (x - 1))) #define ETH_FORMAT "%02x:%02x:%02x:%02x:%02x:%02x" @@ -203,10 +203,16 @@ void shaperLogBuffer( #define shaperLogFn2(level, tag, company, component, path, line, fmt, ...) \ - ({\ + {\ if (level <= SHAPER_LOG_LEVEL) \ shaperLogFn(0, tag, company, component, path, line, fmt, __VA_ARGS__); \ - }) + } + +#define shaperLogBuffer2(level, pData, dataLen, lineLen, company, component, path, line) \ + {\ + if (level <= AVB_LOG_LEVEL) \ + shaperLogBuffer(0, pData, dataLen, lineLen, company, component, path, line); \ + } #ifdef SHAPER_LOG_ON #define SHAPER_LOGF_DEV(LEVEL, FMT, ...) shaperLogFn2(LEVEL, "DEV", SHAPER_LOG_COMPANY, SHAPER_LOG_COMPONENT, __FILE__, __LINE__, FMT, __VA_ARGS__) @@ -229,7 +235,7 @@ void shaperLogBuffer( #define SHAPER_LOGRT_STATUS(BEGIN, ITEM, END, FMT, TYPE, VAL) shaperLogRT(SHAPER_LOG_LEVEL_STATUS, BEGIN, ITEM, END, FMT, TYPE, VAL) #define SHAPER_LOGRT_DEBUG(BEGIN, ITEM, END, FMT, TYPE, VAL) shaperLogRT(SHAPER_LOG_LEVEL_DEBUG, BEGIN, ITEM, END, FMT, TYPE, VAL) #define SHAPER_LOGRT_VERBOSE(BEGIN, ITEM, END, FMT, TYPE, VAL) shaperLogRT(SHAPER_LOG_LEVEL_VERBOSE, BEGIN, ITEM, END, FMT, TYPE, VAL) -#define SHAPER_LOG_BUFFER(LEVEL, DATA, DATALEN, LINELINE) shaperLogBuffer(LEVEL, DATA, DATALEN, LINELINE, SHAPER_LOG_COMPANY, SHAPER_LOG_COMPONENT, __FILE__, __LINE__) +#define SHAPER_LOG_BUFFER(LEVEL, DATA, DATALEN, LINELINE) shaperLogBuffer2(LEVEL, DATA, DATALEN, LINELINE, SHAPER_LOG_COMPANY, SHAPER_LOG_COMPONENT, __FILE__, __LINE__) #else #define SHAPER_LOGF_DEV(LEVEL, FMT, ...) #define SHAPER_LOGF_ERROR(FMT, ...) diff --git a/lib/avtp_pipeline/include/openavb_log_pub.h b/lib/avtp_pipeline/include/openavb_log_pub.h index 1e3a6d69..47b0bbbe 100644 --- a/lib/avtp_pipeline/include/openavb_log_pub.h +++ b/lib/avtp_pipeline/include/openavb_log_pub.h @@ -160,11 +160,11 @@ typedef enum { #define LOG_VARX(x, y) x ## y #define LOG_VAR(x, y) LOG_VARX(x, y) -// Log a message once. Technically once every 4.2 billion attempts. Usage: LOG_ONCE AVB_LOG_INFO(...) -#define IF_LOG_ONCE() static U32 LOG_VAR(logOnce,__LINE__); if (!LOG_VAR(logOnce,__LINE__)++) +// Log a message once. Technically once every 4.2 billion attempts. Usage: IF_LOG_ONCE() AVB_LOG_INFO(...) +#define IF_LOG_ONCE() static U32 LOG_VAR(logOnce,__LINE__) = 0; if (!LOG_VAR(logOnce,__LINE__)++) -// Log a message at an interval. Usage: LOG_INTERVAL(100) AVB_LOG_INFO(...) -#define IF_LOG_INTERVAL(x) static U32 LOG_VAR(logOnce,__LINE__); if (!(LOG_VAR(logOnce,__LINE__)++ % (x - 1))) +// Log a message at an interval. Usage: IF_LOG_INTERVAL(100) AVB_LOG_INFO(...) +#define IF_LOG_INTERVAL(x) static U32 LOG_VAR(logOnce,__LINE__) = 0; if (!(LOG_VAR(logOnce,__LINE__)++ % (x - 1))) #define ETH_FORMAT "%02x:%02x:%02x:%02x:%02x:%02x" |