xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

[TD-5838]<feature> add function of speed test

This commit is contained in:
wangmm0220 2021-08-11 17:32:01 +08:00
parent 684d9d911c
commit 4ff07fe415
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/kit/shell/src/shellMain.c
View File

@ -118,7 +118,7 @@ int main(int argc, char* argv[]) {
printf("Failed to init taos"); printf("Failed to init taos");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
taosNetTest(args.netTestRole, args.host, args.port, args.pktLen, args.pktLen, args.pktType); taosNetTest(args.netTestRole, args.host, args.port, args.pktLen, args.pktNum, args.pktType);
exit(0); exit(0);
} }

16
src/util/src/tnettest.c
View File

@ -552,7 +552,7 @@ static void taosNetTestSpeed(char *host, int32_t port, int32_t pkgLen,
int32_t pkgNum, char *pkgType) { int32_t pkgNum, char *pkgType) {
char spi = 0; char spi = 0;
uInfo("check spend, host:%s port:%d pkgLen:%d pkgNum:%d pkgType:%s\\n", host, port, pkgLen, pkgNum, pkgType); uInfo("check spend, host:%s port:%d pkgLen:%d pkgNum:%d pkgType:%s", host, port, pkgLen, pkgNum, pkgType);
SRpcEpSet epSet; SRpcEpSet epSet;
SRpcMsg reqMsg; SRpcMsg reqMsg;
@ -579,9 +579,9 @@ static void taosNetTestSpeed(char *host, int32_t port, int32_t pkgLen,
} }
int32_t totalSucc = 0; int32_t totalSucc = 0;
int64_t startT = taosGetTimestampUs(); uint64_t startT = taosGetTimestampUs();
for (int32_t i = 1; i <= pkgNum; i++) { for (int32_t i = 1; i <= pkgNum; i++) {
int64_t startTime = taosGetTimestampUs(); uint64_t startTime = taosGetTimestampUs();
memset(&epSet, 0, sizeof(SRpcEpSet)); memset(&epSet, 0, sizeof(SRpcEpSet));
epSet.inUse = 0; epSet.inUse = 0;
@ -609,13 +609,13 @@ static void taosNetTestSpeed(char *host, int32_t port, int32_t pkgLen,
rpcFreeCont(rspMsg.pCont); rpcFreeCont(rspMsg.pCont);
int64_t endTime = taosGetTimestampUs(); uint64_t endTime = taosGetTimestampUs();
int32_t el = endTime - startTime; uint64_t el = endTime - startTime;
printf("progress: %5d/%d, status: %d, cost: %10d ms, speed: %10.2lf KB/s\n", i, pkgNum, code, el, pkgLen/(el/1000.0)/1024); printf("progress: %5d/%d, status: %d, cost: %8" PRId64 " ms, speed: %8.2lf KB/s\n", i, pkgNum, code, el, pkgLen/(el/1000000.0)/1024);
} }
int64_t endT = taosGetTimestampUs(); int64_t endT = taosGetTimestampUs();
int32_t elT = endT - startT; uint64_t elT = endT - startT;
printf("total: %5d/%d, cost: %10d ms, speed: %10.2lf KB/s\n", totalSucc, pkgNum, elT, pkgLen * totalSucc/(elT/1000.0)/1024); printf("total: %5d/%d, cost: %8" PRId64 " ms, speed: %8.2lf KB/s\n", totalSucc, pkgNum, elT, pkgLen * totalSucc/(elT/1000000.0)/1024);
rpcClose(pRpcConn); rpcClose(pRpcConn);