Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
yiicenne
TDengine
提交
53eafcc1
TDengine
项目概览
yiicenne
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
53eafcc1
编写于
4月 23, 2021
作者:
haoranc
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' into test/chr
上级
4573d7f6
82d774b7
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
66 addition
and
12 deletion
+66
-12
src/kit/taosdemo/taosdemo.c
src/kit/taosdemo/taosdemo.c
+53
-0
src/util/src/tlog.c
src/util/src/tlog.c
+2
-1
src/util/src/tnettest.c
src/util/src/tnettest.c
+10
-10
src/util/src/ttimer.c
src/util/src/ttimer.c
+1
-1
未找到文件。
src/kit/taosdemo/taosdemo.c
浏览文件 @
53eafcc1
...
...
@@ -717,9 +717,19 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
if
(
strcmp
(
argv
[
i
],
"-f"
)
==
0
)
{
arguments
->
metaFile
=
argv
[
++
i
];
}
else
if
(
strcmp
(
argv
[
i
],
"-c"
)
==
0
)
{
if
(
argc
==
i
+
1
)
{
printHelp
();
errorPrint
(
"%s"
,
"
\n\t
-c need a valid path following!
\n
"
);
exit
(
EXIT_FAILURE
);
}
tstrncpy
(
configDir
,
argv
[
++
i
],
MAX_FILE_NAME_LEN
);
}
else
if
(
strcmp
(
argv
[
i
],
"-h"
)
==
0
)
{
if
(
argc
==
i
+
1
)
{
printHelp
();
errorPrint
(
"%s"
,
"
\n\t
-h need a valid string following!
\n
"
);
exit
(
EXIT_FAILURE
);
}
arguments
->
host
=
argv
[
++
i
];
}
else
if
(
strcmp
(
argv
[
i
],
"-p"
)
==
0
)
{
if
((
argc
==
i
+
1
)
||
...
...
@@ -730,12 +740,32 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
}
arguments
->
port
=
atoi
(
argv
[
++
i
]);
}
else
if
(
strcmp
(
argv
[
i
],
"-u"
)
==
0
)
{
if
(
argc
==
i
+
1
)
{
printHelp
();
errorPrint
(
"%s"
,
"
\n\t
-u need a valid string following!
\n
"
);
exit
(
EXIT_FAILURE
);
}
arguments
->
user
=
argv
[
++
i
];
}
else
if
(
strcmp
(
argv
[
i
],
"-P"
)
==
0
)
{
if
(
argc
==
i
+
1
)
{
printHelp
();
errorPrint
(
"%s"
,
"
\n\t
-P need a valid string following!
\n
"
);
exit
(
EXIT_FAILURE
);
}
arguments
->
password
=
argv
[
++
i
];
}
else
if
(
strcmp
(
argv
[
i
],
"-o"
)
==
0
)
{
if
(
argc
==
i
+
1
)
{
printHelp
();
errorPrint
(
"%s"
,
"
\n\t
-o need a valid string following!
\n
"
);
exit
(
EXIT_FAILURE
);
}
arguments
->
output_file
=
argv
[
++
i
];
}
else
if
(
strcmp
(
argv
[
i
],
"-s"
)
==
0
)
{
if
(
argc
==
i
+
1
)
{
printHelp
();
errorPrint
(
"%s"
,
"
\n\t
-s need a valid string following!
\n
"
);
exit
(
EXIT_FAILURE
);
}
arguments
->
sqlFile
=
argv
[
++
i
];
}
else
if
(
strcmp
(
argv
[
i
],
"-q"
)
==
0
)
{
if
((
argc
==
i
+
1
)
||
...
...
@@ -762,8 +792,20 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
}
arguments
->
insert_interval
=
atoi
(
argv
[
++
i
]);
}
else
if
(
strcmp
(
argv
[
i
],
"-qt"
)
==
0
)
{
if
((
argc
==
i
+
1
)
||
(
!
isStringNumber
(
argv
[
i
+
1
])))
{
printHelp
();
errorPrint
(
"%s"
,
"
\n\t
-qt need a number following!
\n
"
);
exit
(
EXIT_FAILURE
);
}
arguments
->
query_times
=
atoi
(
argv
[
++
i
]);
}
else
if
(
strcmp
(
argv
[
i
],
"-B"
)
==
0
)
{
if
((
argc
==
i
+
1
)
||
(
!
isStringNumber
(
argv
[
i
+
1
])))
{
printHelp
();
errorPrint
(
"%s"
,
"
\n\t
-B need a number following!
\n
"
);
exit
(
EXIT_FAILURE
);
}
arguments
->
interlace_rows
=
atoi
(
argv
[
++
i
]);
}
else
if
(
strcmp
(
argv
[
i
],
"-r"
)
==
0
)
{
if
((
argc
==
i
+
1
)
||
...
...
@@ -790,6 +832,11 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
}
arguments
->
num_of_DPT
=
atoi
(
argv
[
++
i
]);
}
else
if
(
strcmp
(
argv
[
i
],
"-d"
)
==
0
)
{
if
(
argc
==
i
+
1
)
{
printHelp
();
errorPrint
(
"%s"
,
"
\n\t
-d need a valid string following!
\n
"
);
exit
(
EXIT_FAILURE
);
}
arguments
->
database
=
argv
[
++
i
];
}
else
if
(
strcmp
(
argv
[
i
],
"-l"
)
==
0
)
{
if
((
argc
==
i
+
1
)
||
...
...
@@ -855,6 +902,12 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
}
arguments
->
len_of_binary
=
atoi
(
argv
[
++
i
]);
}
else
if
(
strcmp
(
argv
[
i
],
"-m"
)
==
0
)
{
if
((
argc
==
i
+
1
)
||
(
!
isStringNumber
(
argv
[
i
+
1
])))
{
printHelp
();
errorPrint
(
"%s"
,
"
\n\t
-m need a number following!
\n
"
);
exit
(
EXIT_FAILURE
);
}
arguments
->
tb_prefix
=
argv
[
++
i
];
}
else
if
(
strcmp
(
argv
[
i
],
"-N"
)
==
0
)
{
arguments
->
use_metric
=
false
;
...
...
src/util/src/tlog.c
浏览文件 @
53eafcc1
...
...
@@ -416,7 +416,8 @@ void taosPrintLog(const char *flags, int32_t dflag, const char *format, ...) {
}
}
if
(
dflag
&
DEBUG_SCREEN
)
taosWrite
(
1
,
buffer
,
(
uint32_t
)
len
);
if
(
dflag
&
DEBUG_SCREEN
)
taosWrite
(
1
,
buffer
,
(
uint32_t
)
len
);
if
(
dflag
==
255
)
nInfo
(
buffer
,
len
);
}
...
...
src/util/src/tnettest.c
浏览文件 @
53eafcc1
...
...
@@ -291,16 +291,16 @@ static void taosNetCheckPort(uint32_t hostIp, int32_t startPort, int32_t endPort
info
.
port
=
port
;
ret
=
taosNetCheckTcpPort
(
&
info
);
if
(
ret
!=
0
)
{
uError
(
"failed to test TCP port:%d
"
,
port
);
printf
(
"failed to test TCP port:%d
\n
"
,
port
);
}
else
{
uInfo
(
"successed to test TCP port:%d
"
,
port
);
printf
(
"successed to test TCP port:%d
\n
"
,
port
);
}
ret
=
taosNetCheckUdpPort
(
&
info
);
if
(
ret
!=
0
)
{
uError
(
"failed to test UDP port:%d
"
,
port
);
printf
(
"failed to test UDP port:%d
\n
"
,
port
);
}
else
{
uInfo
(
"successed to test UDP port:%d
"
,
port
);
printf
(
"successed to test UDP port:%d
\n
"
,
port
);
}
}
}
...
...
@@ -464,9 +464,9 @@ static void taosNetTestRpc(char *host, int32_t startPort, int32_t pkgLen) {
int32_t
ret
=
taosNetCheckRpc
(
host
,
port
,
sendpkgLen
,
spi
,
NULL
);
if
(
ret
<
0
)
{
uError
(
"failed to test TCP port:%d
"
,
port
);
printf
(
"failed to test TCP port:%d
\n
"
,
port
);
}
else
{
uInfo
(
"successed to test TCP port:%d
"
,
port
);
printf
(
"successed to test TCP port:%d
\n
"
,
port
);
}
if
(
pkgLen
>=
tsRpcMaxUdpSize
)
{
...
...
@@ -477,9 +477,9 @@ static void taosNetTestRpc(char *host, int32_t startPort, int32_t pkgLen) {
ret
=
taosNetCheckRpc
(
host
,
port
,
pkgLen
,
spi
,
NULL
);
if
(
ret
<
0
)
{
uError
(
"failed to test UDP port:%d
"
,
port
);
printf
(
"failed to test UDP port:%d
\n
"
,
port
);
}
else
{
uInfo
(
"successed to test UDP port:%d
"
,
port
);
printf
(
"successed to test UDP port:%d
\n
"
,
port
);
}
}
...
...
@@ -539,7 +539,7 @@ static void taosNetTestServer(char *host, int32_t startPort, int32_t pkgLen) {
}
void
taosNetTest
(
char
*
role
,
char
*
host
,
int32_t
port
,
int32_t
pkgLen
)
{
tscEmbedded
=
1
;
//
tscEmbedded = 1;
if
(
host
==
NULL
)
host
=
tsLocalFqdn
;
if
(
port
==
0
)
port
=
tsServerPort
;
if
(
pkgLen
<=
10
)
pkgLen
=
1000
;
...
...
@@ -559,5 +559,5 @@ void taosNetTest(char *role, char *host, int32_t port, int32_t pkgLen) {
taosNetTestStartup
(
host
,
port
);
}
tscEmbedded
=
0
;
//
tscEmbedded = 0;
}
src/util/src/ttimer.c
浏览文件 @
53eafcc1
...
...
@@ -538,7 +538,7 @@ static void taosTmrModuleInit(void) {
void
*
taosTmrInit
(
int
maxNumOfTmrs
,
int
resolution
,
int
longest
,
const
char
*
label
)
{
const
char
*
ret
=
monotonicInit
();
tmr
Info
(
"ttimer monotonic clock source:%s"
,
ret
);
tmr
Debug
(
"ttimer monotonic clock source:%s"
,
ret
);
pthread_once
(
&
tmrModuleInit
,
taosTmrModuleInit
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录