Skip to content

Commit 78941be

Browse files
hevakehevake
committed
fix(log):0.13.8, 将LOG_LEVEL_XXX重命名为TBOX_LOG_LEVEL_XXX，防止与opencv2/core/utils/logger.hpp冲突
1 parent c8f7914 commit 78941be

17 files changed

Lines changed: 53 additions & 53 deletions

‎modules/base/backtrace_test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace tbox {
2727
TEST(Backtrace, _)
2828
{
2929
LogOutput_Enable();
30-
LogBacktrace(LOG_LEVEL_TRACE);
30+
LogBacktrace(TBOX_LOG_LEVEL_TRACE);
3131
LogOutput_Disable();
3232
}
3333

‎modules/base/log.h‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@
2222
#define TBOX_LOG_H_20170512
2323

2424
//! Define log levels
25-
#define LOG_LEVEL_FATAL 0 //!< Program will crash
26-
#define LOG_LEVEL_ERROR 1 //!< Got serious problem, program can't handle
27-
#define LOG_LEVEL_WARN 2 //!< Got inner abnormal situation, but program can handle it
28-
#define LOG_LEVEL_NOTICE 3 //!< It not big problem, but we should notice it, such as invalid data input
29-
#define LOG_LEVEL_IMPORTANT 4 //!< Important message
30-
#define LOG_LEVEL_INFO 5 //!< Normal message exchange with other program
31-
#define LOG_LEVEL_DEBUG 6 //!< Normal process inside program
32-
#define LOG_LEVEL_TRACE 7 //!< Temporary debugging log
33-
#define LOG_LEVEL_MAX 8 //!< MAX
25+
#define TBOX_LOG_LEVEL_FATAL 0 //!< Program will crash
26+
#define TBOX_LOG_LEVEL_ERROR 1 //!< Got serious problem, program can't handle
27+
#define TBOX_LOG_LEVEL_WARN 2 //!< Got inner abnormal situation, but program can handle it
28+
#define TBOX_LOG_LEVEL_NOTICE 3 //!< It not big problem, but we should notice it, such as invalid data input
29+
#define TBOX_LOG_LEVEL_IMPORTANT 4 //!< Important message
30+
#define TBOX_LOG_LEVEL_INFO 5 //!< Normal message exchange with other program
31+
#define TBOX_LOG_LEVEL_DEBUG 6 //!< Normal process inside program
32+
#define TBOX_LOG_LEVEL_TRACE 7 //!< Temporary debugging log
33+
#define TBOX_LOG_LEVEL_MAX 8 //!< MAX
3434

3535
//! Module ID
3636
#ifndef LOG_MODULE_ID
@@ -49,28 +49,28 @@
4949
#define LogPuts(level, text) \
5050
LogPrintfFunc(LOG_MODULE_ID, __func__, __FILE__, __LINE__, level, 0, text)
5151

52-
#define LogFatal(fmt, ...) LogPrintf(LOG_LEVEL_FATAL, fmt, ## __VA_ARGS__)
53-
#define LogErr(fmt, ...) LogPrintf(LOG_LEVEL_ERROR, fmt, ## __VA_ARGS__)
54-
#define LogWarn(fmt, ...) LogPrintf(LOG_LEVEL_WARN, fmt, ## __VA_ARGS__)
55-
#define LogNotice(fmt, ...) LogPrintf(LOG_LEVEL_NOTICE, fmt, ## __VA_ARGS__)
56-
#define LogImportant(fmt, ...) LogPrintf(LOG_LEVEL_IMPORTANT, fmt, ## __VA_ARGS__)
57-
#define LogInfo(fmt, ...) LogPrintf(LOG_LEVEL_INFO, fmt, ## __VA_ARGS__)
52+
#define LogFatal(fmt, ...) LogPrintf(TBOX_LOG_LEVEL_FATAL, fmt, ## __VA_ARGS__)
53+
#define LogErr(fmt, ...) LogPrintf(TBOX_LOG_LEVEL_ERROR, fmt, ## __VA_ARGS__)
54+
#define LogWarn(fmt, ...) LogPrintf(TBOX_LOG_LEVEL_WARN, fmt, ## __VA_ARGS__)
55+
#define LogNotice(fmt, ...) LogPrintf(TBOX_LOG_LEVEL_NOTICE, fmt, ## __VA_ARGS__)
56+
#define LogImportant(fmt, ...) LogPrintf(TBOX_LOG_LEVEL_IMPORTANT, fmt, ## __VA_ARGS__)
57+
#define LogInfo(fmt, ...) LogPrintf(TBOX_LOG_LEVEL_INFO, fmt, ## __VA_ARGS__)
5858

59-
#if !defined(STATIC_LOG_LEVEL) || (STATIC_LOG_LEVEL >= LOG_LEVEL_DEBUG)
60-
#define LogDbg(fmt, ...) LogPrintf(LOG_LEVEL_DEBUG, fmt, ## __VA_ARGS__)
59+
#if !defined(STATIC_LOG_LEVEL) || (STATIC_LOG_LEVEL >= TBOX_LOG_LEVEL_DEBUG)
60+
#define LogDbg(fmt, ...) LogPrintf(TBOX_LOG_LEVEL_DEBUG, fmt, ## __VA_ARGS__)
6161
#else
6262
#define LogDbg(fmt, ...)
6363
#endif
6464

65-
#if !defined(STATIC_LOG_LEVEL) || (STATIC_LOG_LEVEL >= LOG_LEVEL_TRACE)
66-
#define LogTrace(fmt, ...) LogPrintf(LOG_LEVEL_TRACE, fmt, ## __VA_ARGS__)
67-
#define LogTag() LogPuts(LOG_LEVEL_TRACE, "==> Run Here <==")
65+
#if !defined(STATIC_LOG_LEVEL) || (STATIC_LOG_LEVEL >= TBOX_LOG_LEVEL_TRACE)
66+
#define LogTrace(fmt, ...) LogPrintf(TBOX_LOG_LEVEL_TRACE, fmt, ## __VA_ARGS__)
67+
#define LogTag() LogPuts(TBOX_LOG_LEVEL_TRACE, "==> Run Here <==")
6868
#else
6969
#define LogTrace(fmt, ...)
7070
#define LogTag()
7171
#endif
7272

73-
#define LogUndo() LogPuts(LOG_LEVEL_NOTICE, "!!! Undo !!!")
73+
#define LogUndo() LogPuts(TBOX_LOG_LEVEL_NOTICE, "!!! Undo !!!")
7474

7575
//! 打印错误码，需要 #include <string.h>
7676
#define LogErrno(err, fmt, ...) LogErr("Errno:%d(%s) " fmt, (err), strerror(err), ## __VA_ARGS__)

‎modules/base/log_impl.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@ void Dispatch(const LogContent &content)
7272

7373
}
7474

75-
const char LOG_LEVEL_LEVEL_CODE[LOG_LEVEL_MAX] = {
75+
const char TBOX_LOG_LEVEL_LEVEL_CODE[TBOX_LOG_LEVEL_MAX] = {
7676
'F', 'E', 'W', 'N', 'I', 'I', 'D', 'T'
7777
};
7878

79-
const char* LOG_LEVEL_COLOR_CODE[LOG_LEVEL_MAX] = {
79+
const char* TBOX_LOG_LEVEL_COLOR_CODE[TBOX_LOG_LEVEL_MAX] = {
8080
"7;91", //! FATAL 文字黑，背景亮红
8181
"31", //! ERROR 红
8282
"7;93", //! WARN 文字黑，背景亮黄
@@ -116,7 +116,7 @@ void LogPrintfFunc(const char *module_id, const char *func_name, const char *fil
116116
return;
117117

118118
if (level < 0) level = 0;
119-
if (level >= LOG_LEVEL_MAX) level = (LOG_LEVEL_MAX - 1);
119+
if (level >= TBOX_LOG_LEVEL_MAX) level = (TBOX_LOG_LEVEL_MAX - 1);
120120

121121
const char *module_id_be_print = (module_id != nullptr) ? module_id : "???";
122122

‎modules/base/log_impl.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ struct LogContent {
5454
};
5555

5656
//! 日志等级颜色表
57-
extern const char LOG_LEVEL_LEVEL_CODE[LOG_LEVEL_MAX];
58-
extern const char* LOG_LEVEL_COLOR_CODE[LOG_LEVEL_MAX];
57+
extern const char TBOX_LOG_LEVEL_LEVEL_CODE[TBOX_LOG_LEVEL_MAX];
58+
extern const char* TBOX_LOG_LEVEL_COLOR_CODE[TBOX_LOG_LEVEL_MAX];
5959

6060
//! 定义日志输出函数
6161
typedef void (*LogPrintfFuncType)(const LogContent *content, void *ptr);

‎modules/base/log_output.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ namespace {
5757

5858
//! 打印色彩、等级、时间戳、线程号、模块名
5959
printf("\033[%sm%c %s %ld %s ",
60-
LOG_LEVEL_COLOR_CODE[content->level], LOG_LEVEL_LEVEL_CODE[content->level],
60+
TBOX_LOG_LEVEL_COLOR_CODE[content->level], TBOX_LOG_LEVEL_LEVEL_CODE[content->level],
6161
timestamp, content->thread_id, content->module_id);
6262

6363
if (content->func_name != nullptr)

‎modules/base/log_output_test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ TEST(Log, Format)
4949
TEST(Log, LogPuts)
5050
{
5151
LogOutput_Enable();
52-
LogPuts(LOG_LEVEL_INFO, "should be raw: %s, %d, %f");
52+
LogPuts(TBOX_LOG_LEVEL_INFO, "should be raw: %s, %d, %f");
5353
LogOutput_Disable();
5454
}
5555

‎modules/log/async_file_sink_test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ TEST(AsyncFileSink, AllLevel)
5050
ch.setFilePrefix("test");
5151
ch.enable();
5252
ch.enableColor(true);
53-
ch.setLevel("", LOG_LEVEL_TRACE);
53+
ch.setLevel("", TBOX_LOG_LEVEL_TRACE);
5454

5555
LogFatal("fatal");
5656
LogErr("err");

‎modules/log/async_sink.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,13 @@ void AsyncSink::onLogBackEnd(const LogContent &content)
9797

9898
//! 开启色彩，显示日志等级
9999
if (enable_color_) {
100-
len = snprintf(buff, sizeof(buff), "\033[%sm", LOG_LEVEL_COLOR_CODE[content.level]);
100+
len = snprintf(buff, sizeof(buff), "\033[%sm", TBOX_LOG_LEVEL_COLOR_CODE[content.level]);
101101
append(buff, len);
102102
}
103103

104104
//! 打印等级、时间戳、线程号、模块名
105105
len = snprintf(buff, sizeof(buff), "%c %s.%06u %ld %s ",
106-
LOG_LEVEL_LEVEL_CODE[content.level],
106+
TBOX_LOG_LEVEL_LEVEL_CODE[content.level],
107107
timestamp_str_, content.timestamp.usec,
108108
content.thread_id, content.module_id);
109109
append(buff, len);

‎modules/log/async_sink_test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ TEST(AsyncSink, AllLevel)
6868

6969
ch.enable();
7070
ch.enableColor(true);
71-
ch.setLevel("", LOG_LEVEL_TRACE);
71+
ch.setLevel("", TBOX_LOG_LEVEL_TRACE);
7272

7373
LogFatal("fatal");
7474
LogErr("err");

‎modules/log/async_stdout_sink_test.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ TEST(AsyncStdoutSink, TraceLevel)
4949
{
5050
AsyncStdoutSink ch;
5151
ch.enable();
52-
ch.setLevel("test.log", LOG_LEVEL_TRACE);
52+
ch.setLevel("test.log", TBOX_LOG_LEVEL_TRACE);
5353
cout << "Should print all level" << endl;
5454

5555
LogFatal("fatal");
@@ -71,7 +71,7 @@ TEST(AsyncStdoutSink, AllLevel)
7171

7272
ch.enable();
7373
ch.enableColor(true);
74-
ch.setLevel("", LOG_LEVEL_TRACE);
74+
ch.setLevel("", TBOX_LOG_LEVEL_TRACE);
7575

7676
LogFatal("fatal");
7777
LogErr("err");
@@ -93,7 +93,7 @@ TEST(AsyncStdoutSink, NullString)
9393
ch.enable();
9494

9595
LogInfo(nullptr);
96-
LogPuts(LOG_LEVEL_INFO, nullptr);
96+
LogPuts(TBOX_LOG_LEVEL_INFO, nullptr);
9797

9898
ch.cleanup();
9999
}
@@ -121,7 +121,7 @@ TEST(AsyncStdoutSink, EnableColor)
121121
AsyncStdoutSink ch;
122122
ch.enable();
123123
ch.enableColor(true);
124-
ch.setLevel("test.log", LOG_LEVEL_TRACE);
124+
ch.setLevel("test.log", TBOX_LOG_LEVEL_TRACE);
125125
cout << "Should with color" << endl;
126126

127127
LogFatal("fatal");

0 commit comments

Comments
 (0)