Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
1d9119df
T
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1187
Star
22018
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
1d9119df
编写于
3月 04, 2022
作者:
S
Shengliang Guan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
record num of logs for monitoring
上级
51e2870c
变更
21
隐藏空白更改
内联
并排
Showing
21 changed file
with
333 addition
and
361 deletion
+333
-361
include/libs/monitor/monitor.h
include/libs/monitor/monitor.h
+4
-10
include/libs/qcom/query.h
include/libs/qcom/query.h
+7
-9
include/libs/wal/wal.h
include/libs/wal/wal.h
+30
-32
include/util/tlog.h
include/util/tlog.h
+23
-21
source/client/inc/clientLog.h
source/client/inc/clientLog.h
+7
-7
source/dnode/mgmt/impl/inc/dndInt.h
source/dnode/mgmt/impl/inc/dndInt.h
+6
-8
source/dnode/mnode/impl/inc/mndDef.h
source/dnode/mnode/impl/inc/mndDef.h
+0
-40
source/dnode/mnode/impl/inc/mndInt.h
source/dnode/mnode/impl/inc/mndInt.h
+7
-0
source/dnode/mnode/sdb/inc/sdbInt.h
source/dnode/mnode/sdb/inc/sdbInt.h
+6
-6
source/dnode/vnode/src/inc/tqInt.h
source/dnode/vnode/src/inc/tqInt.h
+30
-32
source/dnode/vnode/src/inc/tsdbLog.h
source/dnode/vnode/src/inc/tsdbLog.h
+6
-6
source/dnode/vnode/src/inc/vnd.h
source/dnode/vnode/src/inc/vnd.h
+30
-33
source/libs/index/inc/indexInt.h
source/libs/index/inc/indexInt.h
+30
-30
source/libs/monitor/src/monitor.c
source/libs/monitor/src/monitor.c
+9
-9
source/libs/monitor/test/monTest.cpp
source/libs/monitor/test/monTest.cpp
+5
-5
source/libs/sync/inc/syncInt.h
source/libs/sync/inc/syncInt.h
+30
-32
source/libs/tfs/inc/tfsInt.h
source/libs/tfs/inc/tfsInt.h
+6
-8
source/libs/transport/inc/rpcLog.h
source/libs/transport/inc/rpcLog.h
+30
-33
source/util/src/thttp.c
source/util/src/thttp.c
+1
-1
source/util/src/tlog.c
source/util/src/tlog.c
+31
-4
source/util/src/ttimer.c
source/util/src/ttimer.c
+35
-35
未找到文件。
include/libs/monitor/monitor.h
浏览文件 @
1d9119df
...
...
@@ -18,6 +18,7 @@
#include "tarray.h"
#include "tdef.h"
#include "tlog.h"
#ifdef __cplusplus
extern
"C"
{
...
...
@@ -126,17 +127,10 @@ typedef struct {
SMonDiskDesc
tempdir
;
}
SMonDiskInfo
;
typedef
enum
{
MON_LEVEL_ERROR
=
0
,
MON_LEVEL_INFO
=
1
,
MON_LEVEL_DEBUG
=
2
,
MON_LEVEL_TRACE
=
3
,
}
EMonLogLevel
;
typedef
struct
{
int64_t
ts
;
E
Mon
LogLevel
level
;
char
content
[
MON_LOG_LEN
];
int64_t
ts
;
ELogLevel
level
;
char
content
[
MON_LOG_LEN
];
}
SMonLogItem
;
typedef
struct
SMonInfo
SMonInfo
;
...
...
include/libs/qcom/query.h
浏览文件 @
1d9119df
...
...
@@ -168,20 +168,18 @@ int32_t queryCreateTableMetaFromMsg(STableMetaRsp* msg, bool isSuperTable, STabl
extern
int32_t
(
*
queryBuildMsg
[
TDMT_MAX
])(
void
*
input
,
char
**
msg
,
int32_t
msgSize
,
int32_t
*
msgLen
);
extern
int32_t
(
*
queryProcessMsgRsp
[
TDMT_MAX
])(
void
*
output
,
char
*
msg
,
int32_t
msgSize
);
#define SET_META_TYPE_NULL(t) (t) = META_TYPE_NULL_TABLE
#define SET_META_TYPE_CTABLE(t) (t) = META_TYPE_CTABLE
#define SET_META_TYPE_TABLE(t) (t) = META_TYPE_TABLE
#define SET_META_TYPE_BOTH_TABLE(t) (t) = META_TYPE_BOTH_TABLE
#define qFatal(...) do { if (qDebugFlag & DEBUG_FATAL) { taosPrintLog("QRY FATAL ", qDebugFlag, __VA_ARGS__); }} while(0)
#define qError(...) do { if (qDebugFlag & DEBUG_ERROR) { taosPrintLog("QRY ERROR ", qDebugFlag, __VA_ARGS__); }} while(0)
#define qWarn(...) do { if (qDebugFlag & DEBUG_WARN) { taosPrintLog("QRY WARN ", qDebugFlag, __VA_ARGS__); }} while(0)
#define qInfo(...) do { if (qDebugFlag & DEBUG_INFO) { taosPrintLog("QRY ", qDebugFlag, __VA_ARGS__); }} while(0)
#define qDebug(...) do { if (qDebugFlag & DEBUG_DEBUG) { taosPrintLog("QRY ", qDebugFlag, __VA_ARGS__); }} while(0)
#define qTrace(...) do { if (qDebugFlag & DEBUG_TRACE) { taosPrintLog("QRY ", qDebugFlag, __VA_ARGS__); }} while(0)
#define qDebugL(...) do { if (qDebugFlag & DEBUG_DEBUG) { taosPrintLongString("QRY ", qDebugFlag, __VA_ARGS__); }} while(0)
#define qFatal(...) do { if (qDebugFlag & DEBUG_FATAL) { taosPrintLog("QRY FATAL ", DEBUG_FATAL, qDebugFlag, __VA_ARGS__); }} while(0)
#define qError(...) do { if (qDebugFlag & DEBUG_ERROR) { taosPrintLog("QRY ERROR ", DEBUG_ERROR, qDebugFlag, __VA_ARGS__); }} while(0)
#define qWarn(...) do { if (qDebugFlag & DEBUG_WARN) { taosPrintLog("QRY WARN ", DEBUG_WARN, qDebugFlag, __VA_ARGS__); }} while(0)
#define qInfo(...) do { if (qDebugFlag & DEBUG_INFO) { taosPrintLog("QRY ", DEBUG_INFO, qDebugFlag, __VA_ARGS__); }} while(0)
#define qDebug(...) do { if (qDebugFlag & DEBUG_DEBUG) { taosPrintLog("QRY ", DEBUG_DEBUG, qDebugFlag, __VA_ARGS__); }} while(0)
#define qTrace(...) do { if (qDebugFlag & DEBUG_TRACE) { taosPrintLog("QRY ", DEBUG_TRACE, qDebugFlag, __VA_ARGS__); }} while(0)
#define qDebugL(...) do { if (qDebugFlag & DEBUG_DEBUG) { taosPrintLongString("QRY ", DEBUG_DEBUG, qDebugFlag, __VA_ARGS__); }} while(0)
#ifdef __cplusplus
}
...
...
include/libs/wal/wal.h
浏览文件 @
1d9119df
...
...
@@ -24,43 +24,41 @@
extern
"C"
{
#endif
extern
int32_t
wDebugFlag
;
#define wFatal(...) \
{ \
if (wDebugFlag & DEBUG_FATAL) { \
taosPrintLog("WAL FATAL ", 255, __VA_ARGS__); \
} \
#define wFatal(...) \
{ \
if (wDebugFlag & DEBUG_FATAL) { \
taosPrintLog("WAL FATAL ", DEBUG_FATAL, 255, __VA_ARGS__); \
} \
}
#define wError(...) \
{ \
if (wDebugFlag & DEBUG_ERROR) { \
taosPrintLog("WAL ERROR ", 255, __VA_ARGS__); \
} \
#define wError(...)
\
{
\
if (wDebugFlag & DEBUG_ERROR) {
\
taosPrintLog("WAL ERROR ",
DEBUG_ERROR,
255, __VA_ARGS__); \
}
\
}
#define wWarn(...) \
{ \
if (wDebugFlag & DEBUG_WARN) { \
taosPrintLog("WAL WARN ", 255, __VA_ARGS__); \
} \
#define wWarn(...)
\
{
\
if (wDebugFlag & DEBUG_WARN) {
\
taosPrintLog("WAL WARN ",
DEBUG_WARN,
255, __VA_ARGS__); \
}
\
}
#define wInfo(...) \
{ \
if (wDebugFlag & DEBUG_INFO) { \
taosPrintLog("WAL ", 255, __VA_ARGS__); \
} \
#define wInfo(...)
\
{
\
if (wDebugFlag & DEBUG_INFO) {
\
taosPrintLog("WAL ",
DEBUG_INFO,
255, __VA_ARGS__); \
}
\
}
#define wDebug(...) \
{ \
if (wDebugFlag & DEBUG_DEBUG) { \
taosPrintLog("WAL ", wDebugFlag, __VA_ARGS__); \
} \
#define wDebug(...)
\
{
\
if (wDebugFlag & DEBUG_DEBUG) {
\
taosPrintLog("WAL ",
DEBUG_DEBUG,
wDebugFlag, __VA_ARGS__); \
}
\
}
#define wTrace(...) \
{ \
if (wDebugFlag & DEBUG_TRACE) { \
taosPrintLog("WAL ", wDebugFlag, __VA_ARGS__); \
} \
#define wTrace(...)
\
{
\
if (wDebugFlag & DEBUG_TRACE) {
\
taosPrintLog("WAL ",
DEBUG_TRACE,
wDebugFlag, __VA_ARGS__); \
}
\
}
#define WAL_HEAD_VER 0
...
...
include/util/tlog.h
浏览文件 @
1d9119df
...
...
@@ -22,15 +22,17 @@
extern
"C"
{
#endif
#define DEBUG_FATAL 1U
#define DEBUG_ERROR DEBUG_FATAL
#define DEBUG_WARN 2U
#define DEBUG_INFO DEBUG_WARN
#define DEBUG_DEBUG 4U
#define DEBUG_TRACE 8U
#define DEBUG_DUMP 16U
#define DEBUG_SCREEN 64U
#define DEBUG_FILE 128U
typedef
enum
{
DEBUG_FATAL
=
1
,
DEBUG_ERROR
=
1
,
DEBUG_WARN
=
2
,
DEBUG_INFO
=
2
,
DEBUG_DEBUG
=
4
,
DEBUG_TRACE
=
8
,
DEBUG_DUMP
=
16
,
DEBUG_SCREEN
=
64
,
DEBUG_FILE
=
128
}
ELogLevel
;
extern
bool
tsLogEmbedded
;
extern
bool
tsAsyncLog
;
...
...
@@ -61,27 +63,27 @@ void taosResetLog();
void
taosSetAllDebugFlag
(
int32_t
flag
);
void
taosDumpData
(
uint8_t
*
msg
,
int32_t
len
);
void
taosPrintLog
(
const
char
*
flags
,
int32_t
dflag
,
const
char
*
format
,
...)
void
taosPrintLog
(
const
char
*
flags
,
ELogLevel
level
,
int32_t
dflag
,
const
char
*
format
,
...)
#ifdef __GNUC__
__attribute__
((
format
(
printf
,
3
,
4
)))
__attribute__
((
format
(
printf
,
4
,
5
)))
#endif
;
void
taosPrintLongString
(
const
char
*
flags
,
int32_t
dflag
,
const
char
*
format
,
...)
void
taosPrintLongString
(
const
char
*
flags
,
ELogLevel
level
,
int32_t
dflag
,
const
char
*
format
,
...)
#ifdef __GNUC__
__attribute__
((
format
(
printf
,
3
,
4
)))
__attribute__
((
format
(
printf
,
4
,
5
)))
#endif
;
#define uFatal(...) { if (uDebugFlag & DEBUG_FATAL) { taosPrintLog("UTL FATAL", tsLogEmbedded ? 255 : uDebugFlag, __VA_ARGS__); }}
#define uError(...) { if (uDebugFlag & DEBUG_ERROR) { taosPrintLog("UTL ERROR ", tsLogEmbedded ? 255 : uDebugFlag, __VA_ARGS__); }}
#define uWarn(...) { if (uDebugFlag & DEBUG_WARN) { taosPrintLog("UTL WARN ", tsLogEmbedded ? 255 : uDebugFlag, __VA_ARGS__); }}
#define uInfo(...) { if (uDebugFlag & DEBUG_INFO) { taosPrintLog("UTL ", tsLogEmbedded ? 255 : uDebugFlag, __VA_ARGS__); }}
#define uDebug(...) { if (uDebugFlag & DEBUG_DEBUG) { taosPrintLog("UTL ", uDebugFlag, __VA_ARGS__); }}
#define uTrace(...) { if (uDebugFlag & DEBUG_TRACE) { taosPrintLog("UTL ", uDebugFlag, __VA_ARGS__); }}
#define uFatal(...) { if (uDebugFlag & DEBUG_FATAL) { taosPrintLog("UTL FATAL",
DEBUG_FATAL,
tsLogEmbedded ? 255 : uDebugFlag, __VA_ARGS__); }}
#define uError(...) { if (uDebugFlag & DEBUG_ERROR) { taosPrintLog("UTL ERROR ",
DEBUG_ERROR,
tsLogEmbedded ? 255 : uDebugFlag, __VA_ARGS__); }}
#define uWarn(...) { if (uDebugFlag & DEBUG_WARN) { taosPrintLog("UTL WARN ",
DEBUG_WARN,
tsLogEmbedded ? 255 : uDebugFlag, __VA_ARGS__); }}
#define uInfo(...) { if (uDebugFlag & DEBUG_INFO) { taosPrintLog("UTL ",
DEBUG_INFO,
tsLogEmbedded ? 255 : uDebugFlag, __VA_ARGS__); }}
#define uDebug(...) { if (uDebugFlag & DEBUG_DEBUG) { taosPrintLog("UTL ",
DEBUG_DEBUG,
uDebugFlag, __VA_ARGS__); }}
#define uTrace(...) { if (uDebugFlag & DEBUG_TRACE) { taosPrintLog("UTL ",
DEBUG_TRACE,
uDebugFlag, __VA_ARGS__); }}
#define pError(...) { taosPrintLog("APP ERROR ", 255, __VA_ARGS__); }
#define pPrint(...) { taosPrintLog("APP ", 255, __VA_ARGS__); }
#define pError(...) { taosPrintLog("APP ERROR ",
DEBUG_ERROR,
255, __VA_ARGS__); }
#define pPrint(...) { taosPrintLog("APP ",
DEBUG_INFO,
255, __VA_ARGS__); }
#ifdef __cplusplus
}
...
...
source/client/inc/clientLog.h
浏览文件 @
1d9119df
...
...
@@ -22,13 +22,13 @@ extern "C" {
#include "tlog.h"
#define tscFatal(...) do { if (cDebugFlag & DEBUG_FATAL) { taosPrintLog("TSC FATAL ", cDebugFlag, __VA_ARGS__); }} while(0)
#define tscError(...) do { if (cDebugFlag & DEBUG_ERROR) { taosPrintLog("TSC ERROR ", cDebugFlag, __VA_ARGS__); }} while(0)
#define tscWarn(...) do { if (cDebugFlag & DEBUG_WARN) { taosPrintLog("TSC WARN ", cDebugFlag, __VA_ARGS__); }} while(0)
#define tscInfo(...) do { if (cDebugFlag & DEBUG_INFO) { taosPrintLog("TSC ", cDebugFlag, __VA_ARGS__); }} while(0)
#define tscDebug(...) do { if (cDebugFlag & DEBUG_DEBUG) { taosPrintLog("TSC ", cDebugFlag, __VA_ARGS__); }} while(0)
#define tscTrace(...) do { if (cDebugFlag & DEBUG_TRACE) { taosPrintLog("TSC ", cDebugFlag, __VA_ARGS__); }} while(0)
#define tscDebugL(...) do { if (cDebugFlag & DEBUG_DEBUG) { taosPrintLongString("TSC ", cDebugFlag, __VA_ARGS__); }} while(0)
#define tscFatal(...) do { if (cDebugFlag & DEBUG_FATAL) { taosPrintLog("TSC FATAL ",
DEBUG_FATAL,
cDebugFlag, __VA_ARGS__); }} while(0)
#define tscError(...) do { if (cDebugFlag & DEBUG_ERROR) { taosPrintLog("TSC ERROR ",
DEBUG_ERROR,
cDebugFlag, __VA_ARGS__); }} while(0)
#define tscWarn(...) do { if (cDebugFlag & DEBUG_WARN) { taosPrintLog("TSC WARN ",
DEBUG_WARN,
cDebugFlag, __VA_ARGS__); }} while(0)
#define tscInfo(...) do { if (cDebugFlag & DEBUG_INFO) { taosPrintLog("TSC ",
DEBUG_INFO,
cDebugFlag, __VA_ARGS__); }} while(0)
#define tscDebug(...) do { if (cDebugFlag & DEBUG_DEBUG) { taosPrintLog("TSC ",
DEBUG_DEBUG,
cDebugFlag, __VA_ARGS__); }} while(0)
#define tscTrace(...) do { if (cDebugFlag & DEBUG_TRACE) { taosPrintLog("TSC ",
DEBUG_TRACE,
cDebugFlag, __VA_ARGS__); }} while(0)
#define tscDebugL(...) do { if (cDebugFlag & DEBUG_DEBUG) { taosPrintLongString("TSC ",
DEBUG_DEBUG,
cDebugFlag, __VA_ARGS__); }} while(0)
#ifdef __cplusplus
}
...
...
source/dnode/mgmt/impl/inc/dndInt.h
浏览文件 @
1d9119df
...
...
@@ -47,14 +47,12 @@ extern "C" {
#include "vnode.h"
#include "tfs.h"
extern
int32_t
dDebugFlag
;
#define dFatal(...) { if (dDebugFlag & DEBUG_FATAL) { taosPrintLog("DND FATAL ", 255, __VA_ARGS__); }}
#define dError(...) { if (dDebugFlag & DEBUG_ERROR) { taosPrintLog("DND ERROR ", 255, __VA_ARGS__); }}
#define dWarn(...) { if (dDebugFlag & DEBUG_WARN) { taosPrintLog("DND WARN ", 255, __VA_ARGS__); }}
#define dInfo(...) { if (dDebugFlag & DEBUG_INFO) { taosPrintLog("DND ", 255, __VA_ARGS__); }}
#define dDebug(...) { if (dDebugFlag & DEBUG_DEBUG) { taosPrintLog("DND ", dDebugFlag, __VA_ARGS__); }}
#define dTrace(...) { if (dDebugFlag & DEBUG_TRACE) { taosPrintLog("DND ", dDebugFlag, __VA_ARGS__); }}
#define dFatal(...) { if (dDebugFlag & DEBUG_FATAL) { taosPrintLog("DND FATAL ", DEBUG_FATAL, 255, __VA_ARGS__); }}
#define dError(...) { if (dDebugFlag & DEBUG_ERROR) { taosPrintLog("DND ERROR ", DEBUG_ERROR, 255, __VA_ARGS__); }}
#define dWarn(...) { if (dDebugFlag & DEBUG_WARN) { taosPrintLog("DND WARN ", DEBUG_WARN, 255, __VA_ARGS__); }}
#define dInfo(...) { if (dDebugFlag & DEBUG_INFO) { taosPrintLog("DND ", DEBUG_INFO, 255, __VA_ARGS__); }}
#define dDebug(...) { if (dDebugFlag & DEBUG_DEBUG) { taosPrintLog("DND ", DEBUG_DEBUG, dDebugFlag, __VA_ARGS__); }}
#define dTrace(...) { if (dDebugFlag & DEBUG_TRACE) { taosPrintLog("DND ", DEBUG_TRACE, dDebugFlag, __VA_ARGS__); }}
typedef
enum
{
DND_STAT_INIT
,
DND_STAT_RUNNING
,
DND_STAT_STOPPED
}
EStat
;
typedef
enum
{
DND_WORKER_SINGLE
,
DND_WORKER_MULTI
}
EWorkerType
;
...
...
source/dnode/mnode/impl/inc/mndDef.h
浏览文件 @
1d9119df
...
...
@@ -34,46 +34,6 @@
extern
"C"
{
#endif
extern
int32_t
mDebugFlag
;
// mnode log function
#define mFatal(...) \
{ \
if (mDebugFlag & DEBUG_FATAL) { \
taosPrintLog("MND FATAL ", 255, __VA_ARGS__); \
} \
}
#define mError(...) \
{ \
if (mDebugFlag & DEBUG_ERROR) { \
taosPrintLog("MND ERROR ", 255, __VA_ARGS__); \
} \
}
#define mWarn(...) \
{ \
if (mDebugFlag & DEBUG_WARN) { \
taosPrintLog("MND WARN ", 255, __VA_ARGS__); \
} \
}
#define mInfo(...) \
{ \
if (mDebugFlag & DEBUG_INFO) { \
taosPrintLog("MND ", 255, __VA_ARGS__); \
} \
}
#define mDebug(...) \
{ \
if (mDebugFlag & DEBUG_DEBUG) { \
taosPrintLog("MND ", mDebugFlag, __VA_ARGS__); \
} \
}
#define mTrace(...) \
{ \
if (mDebugFlag & DEBUG_TRACE) { \
taosPrintLog("MND ", mDebugFlag, __VA_ARGS__); \
} \
}
typedef
enum
{
MND_AUTH_ACCT_START
=
0
,
MND_AUTH_ACCT_USER
,
...
...
source/dnode/mnode/impl/inc/mndInt.h
浏览文件 @
1d9119df
...
...
@@ -31,6 +31,13 @@
extern
"C"
{
#endif
#define mFatal(...) { if (mDebugFlag & DEBUG_FATAL) { taosPrintLog("MND FATAL ", DEBUG_FATAL, 255, __VA_ARGS__); }}
#define mError(...) { if (mDebugFlag & DEBUG_ERROR) { taosPrintLog("MND ERROR ", DEBUG_ERROR, 255, __VA_ARGS__); }}
#define mWarn(...) { if (mDebugFlag & DEBUG_WARN) { taosPrintLog("MND WARN ", DEBUG_WARN, 255, __VA_ARGS__); }}
#define mInfo(...) { if (mDebugFlag & DEBUG_INFO) { taosPrintLog("MND ", DEBUG_INFO, 255, __VA_ARGS__); }}
#define mDebug(...) { if (mDebugFlag & DEBUG_DEBUG) { taosPrintLog("MND ", DEBUG_DEBUG, mDebugFlag, __VA_ARGS__); }}
#define mTrace(...) { if (mDebugFlag & DEBUG_TRACE) { taosPrintLog("MND ", DEBUG_TRACE, mDebugFlag, __VA_ARGS__); }}
typedef
int32_t
(
*
MndMsgFp
)(
SMnodeMsg
*
pMsg
);
typedef
int32_t
(
*
MndInitFp
)(
SMnode
*
pMnode
);
typedef
void
(
*
MndCleanupFp
)(
SMnode
*
pMnode
);
...
...
source/dnode/mnode/sdb/inc/sdbInt.h
浏览文件 @
1d9119df
...
...
@@ -28,12 +28,12 @@
extern
"C"
{
#endif
#define mFatal(...) { if (mDebugFlag & DEBUG_FATAL) { taosPrintLog("MND FATAL ", 255, __VA_ARGS__); }}
#define mError(...) { if (mDebugFlag & DEBUG_ERROR) { taosPrintLog("MND ERROR ", 255, __VA_ARGS__); }}
#define mWarn(...) { if (mDebugFlag & DEBUG_WARN) { taosPrintLog("MND WARN ", 255, __VA_ARGS__); }}
#define mInfo(...) { if (mDebugFlag & DEBUG_INFO) { taosPrintLog("MND ", 255, __VA_ARGS__); }}
#define mDebug(...) { if (mDebugFlag & DEBUG_DEBUG) { taosPrintLog("MND ", mDebugFlag, __VA_ARGS__); }}
#define mTrace(...) { if (mDebugFlag & DEBUG_TRACE) { taosPrintLog("MND ", mDebugFlag, __VA_ARGS__); }}
#define mFatal(...) { if (mDebugFlag & DEBUG_FATAL) { taosPrintLog("MND FATAL ",
DEBUG_FATAL,
255, __VA_ARGS__); }}
#define mError(...) { if (mDebugFlag & DEBUG_ERROR) { taosPrintLog("MND ERROR ",
DEBUG_ERROR,
255, __VA_ARGS__); }}
#define mWarn(...) { if (mDebugFlag & DEBUG_WARN) { taosPrintLog("MND WARN ",
DEBUG_WARN,
255, __VA_ARGS__); }}
#define mInfo(...) { if (mDebugFlag & DEBUG_INFO) { taosPrintLog("MND ",
DEBUG_INFO,
255, __VA_ARGS__); }}
#define mDebug(...) { if (mDebugFlag & DEBUG_DEBUG) { taosPrintLog("MND ",
DEBUG_DEBUG,
mDebugFlag, __VA_ARGS__); }}
#define mTrace(...) { if (mDebugFlag & DEBUG_TRACE) { taosPrintLog("MND ",
DEBUG_TRACE,
mDebugFlag, __VA_ARGS__); }}
#define SDB_MAX_SIZE (32 * 1024)
...
...
source/dnode/vnode/src/inc/tqInt.h
浏览文件 @
1d9119df
...
...
@@ -25,43 +25,41 @@
extern
"C"
{
#endif
extern
int32_t
tqDebugFlag
;
#define tqFatal(...) \
{ \
if (tqDebugFlag & DEBUG_FATAL) { \
taosPrintLog("TQ FATAL ", 255, __VA_ARGS__); \
} \
#define tqFatal(...) \
{ \
if (tqDebugFlag & DEBUG_FATAL) { \
taosPrintLog("TQ FATAL ", DEBUG_FATAL, 255, __VA_ARGS__); \
} \
}
#define tqError(...) \
{ \
if (tqDebugFlag & DEBUG_ERROR) { \
taosPrintLog("TQ ERROR ", 255, __VA_ARGS__); \
} \
#define tqError(...)
\
{
\
if (tqDebugFlag & DEBUG_ERROR) {
\
taosPrintLog("TQ ERROR ",
DEBUG_ERROR,
255, __VA_ARGS__); \
}
\
}
#define tqWarn(...) \
{ \
if (tqDebugFlag & DEBUG_WARN) { \
taosPrintLog("TQ WARN ", 255, __VA_ARGS__); \
} \
#define tqWarn(...)
\
{
\
if (tqDebugFlag & DEBUG_WARN) {
\
taosPrintLog("TQ WARN ",
DEBUG_WARN,
255, __VA_ARGS__); \
}
\
}
#define tqInfo(...) \
{ \
if (tqDebugFlag & DEBUG_INFO) { \
taosPrintLog("TQ ", 255, __VA_ARGS__); \
} \
#define tqInfo(...)
\
{
\
if (tqDebugFlag & DEBUG_INFO) {
\
taosPrintLog("TQ ",
DEBUG_INFO,
255, __VA_ARGS__); \
}
\
}
#define tqDebug(...) \
{ \
if (tqDebugFlag & DEBUG_DEBUG) { \
taosPrintLog("TQ ", tqDebugFlag, __VA_ARGS__); \
} \
#define tqDebug(...)
\
{
\
if (tqDebugFlag & DEBUG_DEBUG) {
\
taosPrintLog("TQ ",
DEBUG_DEBUG,
tqDebugFlag, __VA_ARGS__); \
}
\
}
#define tqTrace(...) \
{ \
if (tqDebugFlag & DEBUG_TRACE) { \
taosPrintLog("TQ ", tqDebugFlag, __VA_ARGS__); \
} \
#define tqTrace(...)
\
{
\
if (tqDebugFlag & DEBUG_TRACE) {
\
taosPrintLog("TQ ",
DEBUG_TRACE,
tqDebugFlag, __VA_ARGS__); \
}
\
}
#define TQ_BUFFER_SIZE 8
...
...
source/dnode/vnode/src/inc/tsdbLog.h
浏览文件 @
1d9119df
...
...
@@ -20,11 +20,11 @@
extern
int32_t
tsdbDebugFlag
;
#define tsdbFatal(...) do { if (tsdbDebugFlag & DEBUG_FATAL) { taosPrintLog("TDB FATAL ", 255, __VA_ARGS__); }} while(0)
#define tsdbError(...) do { if (tsdbDebugFlag & DEBUG_ERROR) { taosPrintLog("TDB ERROR ", 255, __VA_ARGS__); }} while(0)
#define tsdbWarn(...) do { if (tsdbDebugFlag & DEBUG_WARN) { taosPrintLog("TDB WARN ", 255, __VA_ARGS__); }} while(0)
#define tsdbInfo(...) do { if (tsdbDebugFlag & DEBUG_INFO) { taosPrintLog("TDB ", 255, __VA_ARGS__); }} while(0)
#define tsdbDebug(...) do { if (tsdbDebugFlag & DEBUG_DEBUG) { taosPrintLog("TDB ", tsdbDebugFlag, __VA_ARGS__); }} while(0)
#define tsdbTrace(...) do { if (tsdbDebugFlag & DEBUG_TRACE) { taosPrintLog("TDB ", tsdbDebugFlag, __VA_ARGS__); }} while(0)
#define tsdbFatal(...) do { if (tsdbDebugFlag & DEBUG_FATAL) { taosPrintLog("TDB FATAL ",
DEBUG_FATAL,
255, __VA_ARGS__); }} while(0)
#define tsdbError(...) do { if (tsdbDebugFlag & DEBUG_ERROR) { taosPrintLog("TDB ERROR ",
DEBUG_ERROR,
255, __VA_ARGS__); }} while(0)
#define tsdbWarn(...) do { if (tsdbDebugFlag & DEBUG_WARN) { taosPrintLog("TDB WARN ",
DEBUG_WARN,
255, __VA_ARGS__); }} while(0)
#define tsdbInfo(...) do { if (tsdbDebugFlag & DEBUG_INFO) { taosPrintLog("TDB ",
DEBUG_INFO,
255, __VA_ARGS__); }} while(0)
#define tsdbDebug(...) do { if (tsdbDebugFlag & DEBUG_DEBUG) { taosPrintLog("TDB ",
DEBUG_DEBUG,
tsdbDebugFlag, __VA_ARGS__); }} while(0)
#define tsdbTrace(...) do { if (tsdbDebugFlag & DEBUG_TRACE) { taosPrintLog("TDB ",
DEBUG_TRACE,
tsdbDebugFlag, __VA_ARGS__); }} while(0)
#endif
/* _TD_TSDB_LOG_H_ */
\ No newline at end of file
source/dnode/vnode/src/inc/vnd.h
浏览文件 @
1d9119df
...
...
@@ -88,44 +88,41 @@ int vnodeScheduleTask(SVnodeTask* task);
int32_t
vnodePutReqToVQueryQ
(
SVnode
*
pVnode
,
struct
SRpcMsg
*
pReq
);
void
vnodeSendReqToDnode
(
SVnode
*
pVnode
,
struct
SEpSet
*
epSet
,
struct
SRpcMsg
*
pReq
);
// For Log
extern
int32_t
vDebugFlag
;
#define vFatal(...) \
do { \
if (vDebugFlag & DEBUG_FATAL) { \
taosPrintLog("VND FATAL ", 255, __VA_ARGS__); \
} \
#define vFatal(...) \
do { \
if (vDebugFlag & DEBUG_FATAL) { \
taosPrintLog("VND FATAL ", DEBUG_FATAL, 255, __VA_ARGS__); \
} \
} while (0)
#define vError(...) \
do { \
if (vDebugFlag & DEBUG_ERROR) { \
taosPrintLog("VND ERROR ", 255, __VA_ARGS__); \
} \
#define vError(...)
\
do {
\
if (vDebugFlag & DEBUG_ERROR) {
\
taosPrintLog("VND ERROR ",
DEBUG_ERROR,
255, __VA_ARGS__); \
}
\
} while (0)
#define vWarn(...) \
do { \
if (vDebugFlag & DEBUG_WARN) { \
taosPrintLog("VND WARN ", 255, __VA_ARGS__); \
} \
#define vWarn(...)
\
do {
\
if (vDebugFlag & DEBUG_WARN) {
\
taosPrintLog("VND WARN ",
DEBUG_WARN,
255, __VA_ARGS__); \
}
\
} while (0)
#define vInfo(...) \
do { \
if (vDebugFlag & DEBUG_INFO) { \
taosPrintLog("VND ", 255, __VA_ARGS__); \
} \
#define vInfo(...)
\
do {
\
if (vDebugFlag & DEBUG_INFO) {
\
taosPrintLog("VND ",
DEBUG_INFO,
255, __VA_ARGS__); \
}
\
} while (0)
#define vDebug(...) \
do { \
if (vDebugFlag & DEBUG_DEBUG) { \
taosPrintLog("VND ", tsdbDebugFlag, __VA_ARGS__); \
} \
#define vDebug(...)
\
do {
\
if (vDebugFlag & DEBUG_DEBUG) {
\
taosPrintLog("VND ",
DEBUG_DEBUG,
tsdbDebugFlag, __VA_ARGS__); \
}
\
} while (0)
#define vTrace(...) \
do { \
if (vDebugFlag & DEBUG_TRACE) { \
taosPrintLog("VND ", tsdbDebugFlag, __VA_ARGS__); \
} \
#define vTrace(...)
\
do {
\
if (vDebugFlag & DEBUG_TRACE) {
\
taosPrintLog("VND ",
DEBUG_TRACE,
tsdbDebugFlag, __VA_ARGS__); \
}
\
} while (0)
// vnodeCfg.h
...
...
source/libs/index/inc/indexInt.h
浏览文件 @
1d9119df
...
...
@@ -125,41 +125,41 @@ int32_t indexSerialCacheKey(ICacheKey* key, char* buf);
// int32_t indexSerialKey(ICacheKey* key, char* buf);
// int32_t indexSerialTermKey(SIndexTerm* itm, char* buf);
#define indexFatal(...) \
do { \
if (sDebugFlag & DEBUG_FATAL) { \
taosPrintLog("index FATAL ", 255, __VA_ARGS__); \
} \
#define indexFatal(...)
\
do {
\
if (sDebugFlag & DEBUG_FATAL) {
\
taosPrintLog("index FATAL ",
DEBUG_FATAL,
255, __VA_ARGS__); \
}
\
} while (0)
#define indexError(...) \
do { \
if (sDebugFlag & DEBUG_ERROR) { \
taosPrintLog("index ERROR ", 255, __VA_ARGS__); \
} \
#define indexError(...)
\
do {
\
if (sDebugFlag & DEBUG_ERROR) {
\
taosPrintLog("index ERROR ",
DEBUG_ERROR,
255, __VA_ARGS__); \
}
\
} while (0)
#define indexWarn(...) \
do { \
if (sDebugFlag & DEBUG_WARN) { \
taosPrintLog("index WARN ", 255, __VA_ARGS__); \
} \
#define indexWarn(...)
\
do {
\
if (sDebugFlag & DEBUG_WARN) {
\
taosPrintLog("index WARN ",
DEBUG_WARN,
255, __VA_ARGS__); \
}
\
} while (0)
#define indexInfo(...) \
do { \
if (sDebugFlag & DEBUG_INFO) { \
taosPrintLog("index ", 255, __VA_ARGS__); \
} \
#define indexInfo(...)
\
do {
\
if (sDebugFlag & DEBUG_INFO) {
\
taosPrintLog("index ",
DEBUG_INFO,
255, __VA_ARGS__); \
}
\
} while (0)
#define indexDebug(...) \
do { \
if (sDebugFlag & DEBUG_DEBUG) { \
taosPrintLog("index ", sDebugFlag, __VA_ARGS__); \
} \
#define indexDebug(...)
\
do {
\
if (sDebugFlag & DEBUG_DEBUG) {
\
taosPrintLog("index ",
DEBUG_DEBUG,
sDebugFlag, __VA_ARGS__); \
}
\
} while (0)
#define indexTrace(...) \
do { \
if (sDebugFlag & DEBUG_TRACE) { \
taosPrintLog("index ", sDebugFlag, __VA_ARGS__); \
} \
#define indexTrace(...)
\
do {
\
if (sDebugFlag & DEBUG_TRACE) {
\
taosPrintLog("index ",
DEBUG_TRACE,
sDebugFlag, __VA_ARGS__); \
}
\
} while (0)
#define INDEX_TYPE_CONTAIN_EXTERN_TYPE(ty, exTy) (((ty >> 4) & (exTy)) != 0)
...
...
source/libs/monitor/src/monitor.c
浏览文件 @
1d9119df
...
...
@@ -270,15 +270,15 @@ void monSetDiskInfo(SMonInfo *pMonitor, SMonDiskInfo *pInfo) {
tjsonAddDoubleToObject
(
pTempdirJson
,
"total"
,
pInfo
->
tempdir
.
size
.
total
);
}
static
const
char
*
monLogLevelStr
(
E
Mon
LogLevel
level
)
{
static
const
char
*
monLogLevelStr
(
ELogLevel
level
)
{
switch
(
level
)
{
case
MON_LEVEL
_ERROR
:
case
DEBUG
_ERROR
:
return
"error"
;
case
MON_LEVEL
_INFO
:
case
DEBUG
_INFO
:
return
"info"
;
case
MON_LEVEL
_DEBUG
:
case
DEBUG
_DEBUG
:
return
"debug"
;
case
MON_LEVEL
_TRACE
:
case
DEBUG
_TRACE
:
return
"trace"
;
default:
return
"undefine"
;
...
...
@@ -318,25 +318,25 @@ static void monSetLogInfo(SMonInfo *pMonitor) {
SJson
*
pLogError
=
tjsonCreateObject
();
if
(
pLogError
==
NULL
)
return
;
tjsonAddStringToObject
(
pLogError
,
"level"
,
"error"
);
tjsonAddDoubleToObject
(
pLogError
,
"total"
,
1
);
tjsonAddDoubleToObject
(
pLogError
,
"total"
,
tsNumOfErrorLogs
);
if
(
tjsonAddItemToArray
(
pSummaryJson
,
pLogError
)
!=
0
)
tjsonDelete
(
pLogError
);
SJson
*
pLogInfo
=
tjsonCreateObject
();
if
(
pLogInfo
==
NULL
)
return
;
tjsonAddStringToObject
(
pLogInfo
,
"level"
,
"info"
);
tjsonAddDoubleToObject
(
pLogInfo
,
"total"
,
1
);
tjsonAddDoubleToObject
(
pLogInfo
,
"total"
,
tsNumOfInfoLogs
);
if
(
tjsonAddItemToArray
(
pSummaryJson
,
pLogInfo
)
!=
0
)
tjsonDelete
(
pLogInfo
);
SJson
*
pLogDebug
=
tjsonCreateObject
();
if
(
pLogDebug
==
NULL
)
return
;
tjsonAddStringToObject
(
pLogDebug
,
"level"
,
"debug"
);
tjsonAddDoubleToObject
(
pLogDebug
,
"total"
,
1
);
tjsonAddDoubleToObject
(
pLogDebug
,
"total"
,
tsNumOfDebugLogs
);
if
(
tjsonAddItemToArray
(
pSummaryJson
,
pLogDebug
)
!=
0
)
tjsonDelete
(
pLogDebug
);
SJson
*
pLogTrace
=
tjsonCreateObject
();
if
(
pLogTrace
==
NULL
)
return
;
tjsonAddStringToObject
(
pLogTrace
,
"level"
,
"trace"
);
tjsonAddDoubleToObject
(
pLogTrace
,
"total"
,
1
);
tjsonAddDoubleToObject
(
pLogTrace
,
"total"
,
tsNumOfTraceLogs
);
if
(
tjsonAddItemToArray
(
pSummaryJson
,
pLogTrace
)
!=
0
)
tjsonDelete
(
pLogTrace
);
}
...
...
source/libs/monitor/test/monTest.cpp
浏览文件 @
1d9119df
...
...
@@ -195,19 +195,19 @@ void MonitorTest::GetDiskInfo(SMonInfo *pMonitor, SMonDiskInfo *pInfo) {
void
MonitorTest
::
AddLogInfo1
()
{
SMonLogItem
log1
=
{
0
};
log1
.
ts
=
taosGetTimestampMs
();
log1
.
level
=
MON_LEVEL
_INFO
;
log1
.
level
=
DEBUG
_INFO
;
strcpy
(
log1
.
content
,
"1 -------------------------- a"
);
monAddLogItem
(
&
log1
);
SMonLogItem
log2
=
{
0
};
log2
.
ts
=
taosGetTimestampMs
();
log2
.
level
=
MON_LEVEL
_ERROR
;
log2
.
level
=
DEBUG
_ERROR
;
strcpy
(
log2
.
content
,
"1 ------------------------ b"
);
monAddLogItem
(
&
log2
);
SMonLogItem
log3
=
{
0
};
log3
.
ts
=
taosGetTimestampMs
();
log3
.
level
=
MON_LEVEL
_DEBUG
;
log3
.
level
=
DEBUG
_DEBUG
;
strcpy
(
log3
.
content
,
"1 ------- c"
);
monAddLogItem
(
&
log3
);
}
...
...
@@ -215,13 +215,13 @@ void MonitorTest::AddLogInfo1() {
void
MonitorTest
::
AddLogInfo2
()
{
SMonLogItem
log1
;
log1
.
ts
=
taosGetTimestampMs
();
log1
.
level
=
MON_LEVEL
_ERROR
;
log1
.
level
=
DEBUG
_ERROR
;
strcpy
(
log1
.
content
,
"2 ------- a"
);
monAddLogItem
(
&
log1
);
SMonLogItem
log2
;
log2
.
ts
=
taosGetTimestampMs
();
log2
.
level
=
MON_LEVEL
_ERROR
;
log2
.
level
=
DEBUG
_ERROR
;
strcpy
(
log2
.
content
,
"2 ------- b"
);
monAddLogItem
(
&
log2
);
}
...
...
source/libs/sync/inc/syncInt.h
浏览文件 @
1d9119df
...
...
@@ -29,43 +29,41 @@ extern "C" {
#include "tlog.h"
#include "ttimer.h"
extern
int32_t
sDebugFlag
;
#define sFatal(...) \
{ \
if (sDebugFlag & DEBUG_FATAL) { \
taosPrintLog("SYN FATAL ", sDebugFlag, __VA_ARGS__); \
} \
#define sFatal(...) \
{ \
if (sDebugFlag & DEBUG_FATAL) { \
taosPrintLog("SYN FATAL ", DEBUG_FATAL, 255, __VA_ARGS__); \
} \
}
#define sError(...) \
{ \
if (sDebugFlag & DEBUG_ERROR) { \
taosPrintLog("SYN ERROR ",
sDebugFlag
, __VA_ARGS__); \
} \
#define sError(...)
\
{
\
if (sDebugFlag & DEBUG_ERROR) {
\
taosPrintLog("SYN ERROR ",
DEBUG_ERROR, 255
, __VA_ARGS__); \
}
\
}
#define sWarn(...) \
{ \
if (sDebugFlag & DEBUG_WARN) { \
taosPrintLog("SYN WARN ",
sDebugFlag
, __VA_ARGS__); \
} \
#define sWarn(...)
\
{
\
if (sDebugFlag & DEBUG_WARN) {
\
taosPrintLog("SYN WARN ",
DEBUG_WARN, 255
, __VA_ARGS__); \
}
\
}
#define sInfo(...) \
{ \
if (sDebugFlag & DEBUG_INFO) { \
taosPrintLog("SYN INFO ",
sDebugFlag
, __VA_ARGS__); \
} \
#define sInfo(...)
\
{
\
if (sDebugFlag & DEBUG_INFO) {
\
taosPrintLog("SYN INFO ",
DEBUG_INFO, 255
, __VA_ARGS__); \
}
\
}
#define sDebug(...) \
{ \
if (sDebugFlag & DEBUG_DEBUG) { \
taosPrintLog("SYN DEBUG ", sDebugFlag, __VA_ARGS__); \
} \
#define sDebug(...)
\
{
\
if (sDebugFlag & DEBUG_DEBUG) {
\
taosPrintLog("SYN DEBUG ",
DEBUG_DEBUG,
sDebugFlag, __VA_ARGS__); \
}
\
}
#define sTrace(...) \
{ \
if (sDebugFlag & DEBUG_TRACE) { \
taosPrintLog("SYN TRACE ", sDebugFlag, __VA_ARGS__); \
} \
#define sTrace(...)
\
{
\
if (sDebugFlag & DEBUG_TRACE) {
\
taosPrintLog("SYN TRACE ",
DEBUG_TRACE,
sDebugFlag, __VA_ARGS__); \
}
\
}
struct
SRaft
;
...
...
source/libs/tfs/inc/tfsInt.h
浏览文件 @
1d9119df
...
...
@@ -25,15 +25,13 @@
#include "thash.h"
#include "tlog.h"
extern
int32_t
fsDebugFlag
;
// For debug purpose
#define fFatal(...) { if (fsDebugFlag & DEBUG_FATAL) { taosPrintLog("TFS FATAL ", 255, __VA_ARGS__); }}
#define fError(...) { if (fsDebugFlag & DEBUG_ERROR) { taosPrintLog("TFS ERROR ", 255, __VA_ARGS__); }}
#define fWarn(...) { if (fsDebugFlag & DEBUG_WARN) { taosPrintLog("TFS WARN ", 255, __VA_ARGS__); }}
#define fInfo(...) { if (fsDebugFlag & DEBUG_INFO) { taosPrintLog("TFS ", 255, __VA_ARGS__); }}
#define fDebug(...) { if (fsDebugFlag & DEBUG_DEBUG) { taosPrintLog("TFS ", fsDebugFlag, __VA_ARGS__); }}
#define fTrace(...) { if (fsDebugFlag & DEBUG_TRACE) { taosPrintLog("TFS ", fsDebugFlag, __VA_ARGS__); }}
#define fFatal(...) { if (fsDebugFlag & DEBUG_FATAL) { taosPrintLog("TFS FATAL ",
DEBUG_FATAL,
255, __VA_ARGS__); }}
#define fError(...) { if (fsDebugFlag & DEBUG_ERROR) { taosPrintLog("TFS ERROR ",
DEBUG_ERROR,
255, __VA_ARGS__); }}
#define fWarn(...) { if (fsDebugFlag & DEBUG_WARN) { taosPrintLog("TFS WARN ",
DEBUG_WARN,
255, __VA_ARGS__); }}
#define fInfo(...) { if (fsDebugFlag & DEBUG_INFO) { taosPrintLog("TFS ",
DEBUG_INFO,
255, __VA_ARGS__); }}
#define fDebug(...) { if (fsDebugFlag & DEBUG_DEBUG) { taosPrintLog("TFS ",
DEBUG_DEBUG,
fsDebugFlag, __VA_ARGS__); }}
#define fTrace(...) { if (fsDebugFlag & DEBUG_TRACE) { taosPrintLog("TFS ",
DEBUG_TRACE,
fsDebugFlag, __VA_ARGS__); }}
typedef
struct
{
int32_t
level
;
...
...
source/libs/transport/inc/rpcLog.h
浏览文件 @
1d9119df
...
...
@@ -22,44 +22,41 @@ extern "C" {
#include "tlog.h"
extern
int32_t
rpcDebugFlag
;
// rpcDebugFlag = 143
#define tFatal(...) \
{ \
if (rpcDebugFlag & DEBUG_FATAL) { \
taosPrintLog("RPC FATAL ", rpcDebugFlag, __VA_ARGS__); \
} \
#define tFatal(...) \
{ \
if (rpcDebugFlag & DEBUG_FATAL) { \
taosPrintLog("RPC FATAL ", DEBUG_FATAL, rpcDebugFlag, __VA_ARGS__); \
} \
}
#define tError(...) \
{ \
if (rpcDebugFlag & DEBUG_ERROR) { \
taosPrintLog("RPC ERROR ", rpcDebugFlag, __VA_ARGS__); \
} \
#define tError(...)
\
{
\
if (rpcDebugFlag & DEBUG_ERROR) {
\
taosPrintLog("RPC ERROR ",
DEBUG_ERROR,
rpcDebugFlag, __VA_ARGS__); \
}
\
}
#define tWarn(...) \
{ \
if (rpcDebugFlag & DEBUG_WARN) { \
taosPrintLog("RPC WARN ", rpcDebugFlag, __VA_ARGS__); \
} \
#define tWarn(...)
\
{
\
if (rpcDebugFlag & DEBUG_WARN) {
\
taosPrintLog("RPC WARN ",
DEBUG_WARN,
rpcDebugFlag, __VA_ARGS__); \
}
\
}
#define tInfo(...) \
{ \
if (rpcDebugFlag & DEBUG_INFO) { \
taosPrintLog("RPC ", rpcDebugFlag, __VA_ARGS__); \
} \
#define tInfo(...)
\
{
\
if (rpcDebugFlag & DEBUG_INFO) {
\
taosPrintLog("RPC ",
DEBUG_INFO,
rpcDebugFlag, __VA_ARGS__); \
}
\
}
#define tDebug(...) \
{ \
if (rpcDebugFlag & DEBUG_DEBUG) { \
taosPrintLog("RPC ", rpcDebugFlag, __VA_ARGS__); \
} \
#define tDebug(...)
\
{
\
if (rpcDebugFlag & DEBUG_DEBUG) {
\
taosPrintLog("RPC ",
DEBUG_DEBUG,
rpcDebugFlag, __VA_ARGS__); \
}
\
}
#define tTrace(...) \
{ \
if (rpcDebugFlag & DEBUG_TRACE) { \
taosPrintLog("RPC ", rpcDebugFlag, __VA_ARGS__); \
} \
#define tTrace(...)
\
{
\
if (rpcDebugFlag & DEBUG_TRACE) {
\
taosPrintLog("RPC ",
DEBUG_TRACE,
rpcDebugFlag, __VA_ARGS__); \
}
\
}
#define tDump(x, y) \
{ \
...
...
source/util/src/thttp.c
浏览文件 @
1d9119df
...
...
@@ -63,7 +63,7 @@ int32_t taosSendHttpReport(const char* server, uint16_t port, const char* pCont,
goto
SEND_OVER
;
}
u
Info
(
"send http to %s:%u, len:%d content: %s"
,
server
,
port
,
contLen
,
pCont
);
u
Trace
(
"send http to %s:%u, len:%d content: %s"
,
server
,
port
,
contLen
,
pCont
);
code
=
0
;
SEND_OVER:
...
...
source/util/src/tlog.c
浏览文件 @
1d9119df
...
...
@@ -376,7 +376,27 @@ static int32_t taosOpenLogFile(char *fn, int32_t maxLines, int32_t maxFileNum) {
return
0
;
}
void
taosPrintLog
(
const
char
*
flags
,
int32_t
dflag
,
const
char
*
format
,
...)
{
static
void
taosUpdateLogNums
(
ELogLevel
level
)
{
switch
(
level
)
{
case
DEBUG_ERROR
:
atomic_add_fetch_64
(
&
tsNumOfErrorLogs
,
1
);
break
;
case
DEBUG_INFO
:
atomic_add_fetch_64
(
&
tsNumOfInfoLogs
,
1
);
break
;
case
DEBUG_DEBUG
:
atomic_add_fetch_64
(
&
tsNumOfDebugLogs
,
1
);
break
;
case
DEBUG_DUMP
:
case
DEBUG_TRACE
:
atomic_add_fetch_64
(
&
tsNumOfTraceLogs
,
1
);
break
;
default:
break
;
}
}
void
taosPrintLog
(
const
char
*
flags
,
ELogLevel
level
,
int32_t
dflag
,
const
char
*
format
,
...)
{
if
(
!
osLogSpaceAvailable
())
return
;
va_list
argpointer
;
...
...
@@ -414,6 +434,7 @@ void taosPrintLog(const char *flags, int32_t dflag, const char *format, ...) {
buffer
[
len
]
=
0
;
if
((
dflag
&
DEBUG_FILE
)
&&
tsLogObj
.
logHandle
&&
tsLogObj
.
logHandle
->
pFile
!=
NULL
)
{
taosUpdateLogNums
(
level
);
if
(
tsAsyncLog
)
{
taosPushLogBuffer
(
tsLogObj
.
logHandle
,
buffer
,
len
);
}
else
{
...
...
@@ -427,11 +448,14 @@ void taosPrintLog(const char *flags, int32_t dflag, const char *format, ...) {
}
}
if
(
dflag
&
DEBUG_SCREEN
)
write
(
1
,
buffer
,
(
uint32_t
)
len
);
if
(
dflag
&
DEBUG_SCREEN
)
{
write
(
1
,
buffer
,
(
uint32_t
)
len
);
}
}
void
taosDumpData
(
unsigned
char
*
msg
,
int32_t
len
)
{
if
(
!
osLogSpaceAvailable
())
return
;
taosUpdateLogNums
(
DEBUG_DUMP
);
char
temp
[
256
];
int32_t
i
,
pos
=
0
,
c
=
0
;
...
...
@@ -453,7 +477,7 @@ void taosDumpData(unsigned char *msg, int32_t len) {
taosWriteFile
(
tsLogObj
.
logHandle
->
pFile
,
temp
,
(
uint32_t
)
pos
);
}
void
taosPrintLongString
(
const
char
*
flags
,
int32_t
dflag
,
const
char
*
format
,
...)
{
void
taosPrintLongString
(
const
char
*
flags
,
ELogLevel
level
,
int32_t
dflag
,
const
char
*
format
,
...)
{
if
(
!
osLogSpaceAvailable
())
return
;
va_list
argpointer
;
...
...
@@ -481,6 +505,7 @@ void taosPrintLongString(const char *flags, int32_t dflag, const char *format, .
buffer
[
len
]
=
0
;
if
((
dflag
&
DEBUG_FILE
)
&&
tsLogObj
.
logHandle
&&
tsLogObj
.
logHandle
->
pFile
!=
NULL
)
{
taosUpdateLogNums
(
level
);
if
(
tsAsyncLog
)
{
taosPushLogBuffer
(
tsLogObj
.
logHandle
,
buffer
,
len
);
}
else
{
...
...
@@ -494,7 +519,9 @@ void taosPrintLongString(const char *flags, int32_t dflag, const char *format, .
}
}
if
(
dflag
&
DEBUG_SCREEN
)
write
(
1
,
buffer
,
(
uint32_t
)
len
);
if
(
dflag
&
DEBUG_SCREEN
)
{
write
(
1
,
buffer
,
(
uint32_t
)
len
);
}
}
static
void
taosCloseLogByFd
(
TdFilePtr
pFile
)
{
...
...
source/util/src/ttimer.c
浏览文件 @
1d9119df
...
...
@@ -19,41 +19,41 @@
#include "tlog.h"
#include "tsched.h"
#define tmrFatal(...) \
{ \
if (tmrDebugFlag & DEBUG_FATAL) { \
taosPrintLog("TMR FATAL ", tmrDebugFlag, __VA_ARGS__); \
} \
}
#define tmrError(...) \
{ \
if (tmrDebugFlag & DEBUG_ERROR) { \
taosPrintLog("TMR ERROR ", tmrDebugFlag, __VA_ARGS__); \
} \
}
#define tmrWarn(...) \
{ \
if (tmrDebugFlag & DEBUG_WARN) { \
taosPrintLog("TMR WARN ", tmrDebugFlag, __VA_ARGS__); \
} \
}
#define tmrInfo(...) \
{ \
if (tmrDebugFlag & DEBUG_INFO) { \
taosPrintLog("TMR ", tmrDebugFlag, __VA_ARGS__); \
} \
}
#define tmrDebug(...) \
{ \
if (tmrDebugFlag & DEBUG_DEBUG) { \
taosPrintLog("TMR ", tmrDebugFlag, __VA_ARGS__); \
} \
}
#define tmrTrace(...) \
{ \
if (tmrDebugFlag & DEBUG_TRACE) { \
taosPrintLog("TMR ", tmrDebugFlag, __VA_ARGS__); \
} \
#define tmrFatal(...)
\
{
\
if (tmrDebugFlag & DEBUG_FATAL) {
\
taosPrintLog("TMR FATAL ",
DEBUG_FATAL,
tmrDebugFlag, __VA_ARGS__); \
}
\
}
#define tmrError(...)
\
{
\
if (tmrDebugFlag & DEBUG_ERROR) {
\
taosPrintLog("TMR ERROR ",
DEBUG_ERROR,
tmrDebugFlag, __VA_ARGS__); \
}
\
}
#define tmrWarn(...)
\
{
\
if (tmrDebugFlag & DEBUG_WARN) {
\
taosPrintLog("TMR WARN ",
DEBUG_WARN,
tmrDebugFlag, __VA_ARGS__); \
}
\
}
#define tmrInfo(...)
\
{
\
if (tmrDebugFlag & DEBUG_INFO) {
\
taosPrintLog("TMR ",
DEBUG_INFO,
tmrDebugFlag, __VA_ARGS__); \
}
\
}
#define tmrDebug(...)
\
{
\
if (tmrDebugFlag & DEBUG_DEBUG) {
\
taosPrintLog("TMR ",
DEBUG_DEBUG,
tmrDebugFlag, __VA_ARGS__); \
}
\
}
#define tmrTrace(...)
\
{
\
if (tmrDebugFlag & DEBUG_TRACE) {
\
taosPrintLog("TMR ",
DEBUG_TRACE,
tmrDebugFlag, __VA_ARGS__); \
}
\
}
#define TIMER_STATE_WAITING 0
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录