Merge pull request #2452 from taosdata/hotfix/crash
Increase the speed of creating tables
This commit is contained in:
Shengliang Guan
GitHub
commit
4cf862dcba
|
|
@ -354,7 +354,7 @@ void tsDataSwap(void *pLeft, void *pRight, int32_t type, int32_t size);
|
||||||
#define TSDB_DEFAULT_DBS_HASH_SIZE 100
|
#define TSDB_DEFAULT_DBS_HASH_SIZE 100
|
||||||
#define TSDB_DEFAULT_VGROUPS_HASH_SIZE 100
|
#define TSDB_DEFAULT_VGROUPS_HASH_SIZE 100
|
||||||
#define TSDB_DEFAULT_STABLES_HASH_SIZE 100
|
#define TSDB_DEFAULT_STABLES_HASH_SIZE 100
|
||||||
#define TSDB_DEFAULT_CTABLES_HASH_SIZE 10000
|
#define TSDB_DEFAULT_CTABLES_HASH_SIZE 20000
|
||||||
|
|
||||||
#define TSDB_PORT_DNODESHELL 0
|
#define TSDB_PORT_DNODESHELL 0
|
||||||
#define TSDB_PORT_DNODEDNODE 5
|
#define TSDB_PORT_DNODEDNODE 5
|
||||||
|
|
|
||||||
|
|
@ -782,7 +782,7 @@ void *sdbOpenTable(SSdbTableDesc *pDesc) {
|
||||||
pTable->restoredFp = pDesc->restoredFp;
|
pTable->restoredFp = pDesc->restoredFp;
|
||||||
|
|
||||||
_hash_fn_t hashFp = taosGetDefaultHashFunction(TSDB_DATA_TYPE_INT);
|
_hash_fn_t hashFp = taosGetDefaultHashFunction(TSDB_DATA_TYPE_INT);
|
||||||
if (pTable->keyType == SDB_KEY_STRING) {
|
if (pTable->keyType == SDB_KEY_STRING || pTable->keyType == SDB_KEY_VAR_STRING) {
|
||||||
hashFp = taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY);
|
hashFp = taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY);
|
||||||
}
|
}
|
||||||
pTable->iHandle = taosHashInit(pTable->hashSessions, hashFp, true);
|
pTable->iHandle = taosHashInit(pTable->hashSessions, hashFp, true);
|
||||||
|
|
|
||||||
|
|
@ -7,15 +7,21 @@ INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/common/inc)
|
||||||
INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
|
INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
|
||||||
|
|
||||||
IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
|
IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
|
||||||
add_executable(insertPerTable insertPerTable.c)
|
#add_executable(insertPerTable insertPerTable.c)
|
||||||
target_link_libraries(insertPerTable taos_static pthread)
|
#target_link_libraries(insertPerTable taos_static pthread)
|
||||||
|
|
||||||
add_executable(insertPerRow insertPerRow.c)
|
#add_executable(insertPerRow insertPerRow.c)
|
||||||
target_link_libraries(insertPerRow taos_static pthread)
|
#target_link_libraries(insertPerRow taos_static pthread)
|
||||||
|
|
||||||
add_executable(importOneRow importOneRow.c)
|
#add_executable(importOneRow importOneRow.c)
|
||||||
target_link_libraries(importOneRow taos_static pthread)
|
#target_link_libraries(importOneRow taos_static pthread)
|
||||||
|
|
||||||
add_executable(importPerTable importPerTable.c)
|
#add_executable(importPerTable importPerTable.c)
|
||||||
target_link_libraries(importPerTable taos_static pthread)
|
#target_link_libraries(importPerTable taos_static pthread)
|
||||||
|
|
||||||
|
#add_executable(hashPerformance hashPerformance.c)
|
||||||
|
#target_link_libraries(hashPerformance taos_static tutil common pthread)
|
||||||
|
|
||||||
|
add_executable(createTablePerformance createTablePerformance.c)
|
||||||
|
target_link_libraries(createTablePerformance taos_static tutil common pthread)
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,232 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
|
||||||
|
*
|
||||||
|
* This program is free software: you can use, redistribute, and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License, version 3
|
||||||
|
* or later ("AGPL"), as published by the Free Software Foundation.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful, but WITHOUT
|
||||||
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#define _DEFAULT_SOURCE
|
||||||
|
#include "os.h"
|
||||||
|
#include "taos.h"
|
||||||
|
#include "tulog.h"
|
||||||
|
#include "ttime.h"
|
||||||
|
#include "tutil.h"
|
||||||
|
#include "tglobal.h"
|
||||||
|
#include "hash.h"
|
||||||
|
|
||||||
|
#define MAX_RANDOM_POINTS 20000
|
||||||
|
#define GREEN "\033[1;32m"
|
||||||
|
#define NC "\033[0m"
|
||||||
|
|
||||||
|
char dbName[32] = "db";
|
||||||
|
char stableName[64] = "st";
|
||||||
|
int32_t numOfThreads = 30;
|
||||||
|
int32_t numOfTables = 100000;
|
||||||
|
int32_t maxTables = 5000;
|
||||||
|
int32_t numOfColumns = 2;
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
int32_t tableBeginIndex;
|
||||||
|
int32_t tableEndIndex;
|
||||||
|
int32_t threadIndex;
|
||||||
|
char dbName[32];
|
||||||
|
char stableName[64];
|
||||||
|
float createTableSpeed;
|
||||||
|
pthread_t thread;
|
||||||
|
} SThreadInfo;
|
||||||
|
|
||||||
|
void shellParseArgument(int argc, char *argv[]);
|
||||||
|
void *threadFunc(void *param);
|
||||||
|
void createDbAndSTable();
|
||||||
|
|
||||||
|
int main(int argc, char *argv[]) {
|
||||||
|
shellParseArgument(argc, argv);
|
||||||
|
taos_init();
|
||||||
|
createDbAndSTable();
|
||||||
|
|
||||||
|
pPrint("%d threads are spawned to create table", numOfThreads);
|
||||||
|
|
||||||
|
pthread_attr_t thattr;
|
||||||
|
pthread_attr_init(&thattr);
|
||||||
|
pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_JOINABLE);
|
||||||
|
SThreadInfo *pInfo = (SThreadInfo *)calloc(numOfThreads, sizeof(SThreadInfo));
|
||||||
|
|
||||||
|
int32_t numOfTablesPerThread = numOfTables / numOfThreads;
|
||||||
|
numOfTables = numOfTablesPerThread * numOfThreads;
|
||||||
|
for (int i = 0; i < numOfThreads; ++i) {
|
||||||
|
pInfo[i].tableBeginIndex = i * numOfTablesPerThread;
|
||||||
|
pInfo[i].tableEndIndex = (i + 1) * numOfTablesPerThread;
|
||||||
|
pInfo[i].threadIndex = i;
|
||||||
|
strcpy(pInfo[i].dbName, dbName);
|
||||||
|
strcpy(pInfo[i].stableName, stableName);
|
||||||
|
pthread_create(&(pInfo[i].thread), &thattr, threadFunc, (void *)(pInfo + i));
|
||||||
|
}
|
||||||
|
|
||||||
|
taosMsleep(300);
|
||||||
|
for (int i = 0; i < numOfThreads; i++) {
|
||||||
|
pthread_join(pInfo[i].thread, NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
float createTableSpeed = 0;
|
||||||
|
for (int i = 0; i < numOfThreads; ++i) {
|
||||||
|
createTableSpeed += pInfo[i].createTableSpeed;
|
||||||
|
}
|
||||||
|
|
||||||
|
pPrint("%s total speed:%.1f tables/second, threads:%d %s", GREEN, createTableSpeed, numOfThreads, NC);
|
||||||
|
|
||||||
|
pthread_attr_destroy(&thattr);
|
||||||
|
free(pInfo);
|
||||||
|
}
|
||||||
|
|
||||||
|
void createDbAndSTable() {
|
||||||
|
pPrint("start to create db and stable");
|
||||||
|
char qstr[64000];
|
||||||
|
|
||||||
|
TAOS *con = taos_connect(NULL, "root", "taosdata", NULL, 0);
|
||||||
|
if (con == NULL) {
|
||||||
|
pError("failed to connect to DB, reason:%s", taos_errstr(con));
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
sprintf(qstr, "create database if not exists %s maxtables %d", dbName, maxTables);
|
||||||
|
TAOS_RES *pSql = taos_query(con, qstr);
|
||||||
|
int32_t code = taos_errno(pSql);
|
||||||
|
if (code != 0) {
|
||||||
|
pError("failed to create database:%s, sql:%s, code:%d reason:%s", dbName, qstr, taos_errno(con), taos_errstr(con));
|
||||||
|
exit(0);
|
||||||
|
}
|
||||||
|
taos_free_result(pSql);
|
||||||
|
|
||||||
|
sprintf(qstr, "use %s", dbName);
|
||||||
|
pSql = taos_query(con, qstr);
|
||||||
|
code = taos_errno(pSql);
|
||||||
|
if (code != 0) {
|
||||||
|
pError("failed to use db, code:%d reason:%s", taos_errno(con), taos_errstr(con));
|
||||||
|
exit(0);
|
||||||
|
}
|
||||||
|
taos_free_result(pSql);
|
||||||
|
|
||||||
|
int len = sprintf(qstr, "create table if not exists %s(ts timestamp", stableName);
|
||||||
|
for (int32_t f = 0; f < numOfColumns - 1; ++f) {
|
||||||
|
len += sprintf(qstr + len, ", f%d double", f);
|
||||||
|
}
|
||||||
|
sprintf(qstr + len, ") tags(t int)");
|
||||||
|
|
||||||
|
pSql = taos_query(con, qstr);
|
||||||
|
code = taos_errno(pSql);
|
||||||
|
if (code != 0) {
|
||||||
|
pError("failed to create stable, code:%d reason:%s", taos_errno(con), taos_errstr(con));
|
||||||
|
exit(0);
|
||||||
|
}
|
||||||
|
taos_free_result(pSql);
|
||||||
|
|
||||||
|
taos_close(con);
|
||||||
|
}
|
||||||
|
|
||||||
|
void *threadFunc(void *param) {
|
||||||
|
SThreadInfo *pInfo = (SThreadInfo *)param;
|
||||||
|
char qstr[65000];
|
||||||
|
int code;
|
||||||
|
|
||||||
|
TAOS *con = taos_connect(NULL, "root", "taosdata", NULL, 0);
|
||||||
|
if (con == NULL) {
|
||||||
|
pError("index:%d, failed to connect to DB, reason:%s", pInfo->threadIndex, taos_errstr(con));
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
sprintf(qstr, "use %s", pInfo->dbName);
|
||||||
|
TAOS_RES *pSql = taos_query(con, qstr);
|
||||||
|
taos_free_result(pSql);
|
||||||
|
|
||||||
|
int64_t startMs = taosGetTimestampMs();
|
||||||
|
|
||||||
|
for (int32_t t = pInfo->tableBeginIndex; t < pInfo->tableEndIndex; ++t) {
|
||||||
|
sprintf(qstr, "create table if not exists %s%d using %s tags(%d)", stableName, t, stableName, t);
|
||||||
|
TAOS_RES *pSql = taos_query(con, qstr);
|
||||||
|
code = taos_errno(pSql);
|
||||||
|
if (code != 0) {
|
||||||
|
pError("failed to create table %s%d, reason:%s", stableName, t, taos_errstr(con));
|
||||||
|
}
|
||||||
|
taos_free_result(pSql);
|
||||||
|
}
|
||||||
|
|
||||||
|
float createTableSpeed = 0;
|
||||||
|
for (int i = 0; i < numOfThreads; ++i) {
|
||||||
|
createTableSpeed += pInfo[i].createTableSpeed;
|
||||||
|
}
|
||||||
|
|
||||||
|
int64_t endMs = taosGetTimestampMs();
|
||||||
|
int32_t totalTables = pInfo->tableEndIndex - pInfo->tableBeginIndex;
|
||||||
|
float seconds = (endMs - startMs) / 1000.0;
|
||||||
|
float speed = totalTables / seconds;
|
||||||
|
pInfo->createTableSpeed = speed;
|
||||||
|
|
||||||
|
pPrint("thread:%d, time:%.2f sec, speed:%.1f tables/second, ", pInfo->threadIndex, seconds, speed);
|
||||||
|
taos_close(con);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
void printHelp() {
|
||||||
|
char indent[10] = " ";
|
||||||
|
printf("Used to test the performance while create table\n");
|
||||||
|
|
||||||
|
printf("%s%s\n", indent, "-c");
|
||||||
|
printf("%s%s%s%s\n", indent, indent, "Configuration directory, default is ", configDir);
|
||||||
|
printf("%s%s\n", indent, "-d");
|
||||||
|
printf("%s%s%s%s\n", indent, indent, "The name of the database to be created, default is ", dbName);
|
||||||
|
printf("%s%s\n", indent, "-s");
|
||||||
|
printf("%s%s%s%s\n", indent, indent, "The name of the super table to be created, default is ", stableName);
|
||||||
|
printf("%s%s\n", indent, "-t");
|
||||||
|
printf("%s%s%s%d\n", indent, indent, "numOfThreads, default is ", numOfThreads);
|
||||||
|
printf("%s%s\n", indent, "-n");
|
||||||
|
printf("%s%s%s%d\n", indent, indent, "numOfTables, default is ", numOfTables);
|
||||||
|
printf("%s%s\n", indent, "-columns");
|
||||||
|
printf("%s%s%s%d\n", indent, indent, "numOfColumns, default is ", numOfColumns);
|
||||||
|
printf("%s%s\n", indent, "-tables");
|
||||||
|
printf("%s%s%s%d\n", indent, indent, "Database parameters tables, default is ", maxTables);
|
||||||
|
|
||||||
|
exit(EXIT_SUCCESS);
|
||||||
|
}
|
||||||
|
|
||||||
|
void shellParseArgument(int argc, char *argv[]) {
|
||||||
|
for (int i = 1; i < argc; i++) {
|
||||||
|
if (strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "--help") == 0) {
|
||||||
|
printHelp();
|
||||||
|
exit(0);
|
||||||
|
} else if (strcmp(argv[i], "-d") == 0) {
|
||||||
|
strcpy(dbName, argv[++i]);
|
||||||
|
} else if (strcmp(argv[i], "-c") == 0) {
|
||||||
|
strcpy(configDir, argv[++i]);
|
||||||
|
} else if (strcmp(argv[i], "-s") == 0) {
|
||||||
|
strcpy(stableName, argv[++i]);
|
||||||
|
} else if (strcmp(argv[i], "-t") == 0) {
|
||||||
|
numOfThreads = atoi(argv[++i]);
|
||||||
|
} else if (strcmp(argv[i], "-n") == 0) {
|
||||||
|
numOfTables = atoi(argv[++i]);
|
||||||
|
} else if (strcmp(argv[i], "-tables") == 0) {
|
||||||
|
maxTables = atoi(argv[++i]);
|
||||||
|
} else if (strcmp(argv[i], "-columns") == 0) {
|
||||||
|
numOfColumns = atoi(argv[++i]);
|
||||||
|
} else {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pPrint("%s dbName:%s %s", GREEN, dbName, NC);
|
||||||
|
pPrint("%s stableName:%s %s", GREEN, stableName, NC);
|
||||||
|
pPrint("%s configDir:%s %s", GREEN, configDir, NC);
|
||||||
|
pPrint("%s numOfTables:%d %s", GREEN, numOfTables, NC);
|
||||||
|
pPrint("%s numOfThreads:%d %s", GREEN, numOfThreads, NC);
|
||||||
|
pPrint("%s numOfColumns:%d %s", GREEN, numOfColumns, NC);
|
||||||
|
pPrint("%s dbPara maxTables:%d %s", GREEN, maxTables, NC);
|
||||||
|
|
||||||
|
pPrint("%s start create table performace test %s", GREEN, NC);
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,131 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
|
||||||
|
*
|
||||||
|
* This program is free software: you can use, redistribute, and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License, version 3
|
||||||
|
* or later ("AGPL"), as published by the Free Software Foundation.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful, but WITHOUT
|
||||||
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#define _DEFAULT_SOURCE
|
||||||
|
#include "os.h"
|
||||||
|
#include "taos.h"
|
||||||
|
#include "tulog.h"
|
||||||
|
#include "ttime.h"
|
||||||
|
#include "tutil.h"
|
||||||
|
#include "hash.h"
|
||||||
|
|
||||||
|
#define MAX_RANDOM_POINTS 20000
|
||||||
|
#define GREEN "\033[1;32m"
|
||||||
|
#define NC "\033[0m"
|
||||||
|
|
||||||
|
int32_t capacity = 100000;
|
||||||
|
int32_t q1Times = 1;
|
||||||
|
int32_t q2Times = 1;
|
||||||
|
int32_t keyNum = 100000;
|
||||||
|
int32_t printInterval = 10000;
|
||||||
|
|
||||||
|
typedef struct HashTestRow {
|
||||||
|
int32_t size;
|
||||||
|
void * ptr;
|
||||||
|
} HashTestRow;
|
||||||
|
|
||||||
|
void shellParseArgument(int argc, char *argv[]);
|
||||||
|
|
||||||
|
void testHashPerformance() {
|
||||||
|
int64_t initialMs = taosGetTimestampMs();
|
||||||
|
_hash_fn_t hashFp = taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY);
|
||||||
|
void * hashHandle = taosHashInit(capacity, hashFp, true);
|
||||||
|
|
||||||
|
int64_t startMs = taosGetTimestampMs();
|
||||||
|
float seconds = (startMs - initialMs) / 1000.0;
|
||||||
|
pPrint("initial time %.2f sec", seconds);
|
||||||
|
|
||||||
|
for (int32_t t = 1; t <= keyNum; ++t) {
|
||||||
|
HashTestRow row = {0};
|
||||||
|
char key[100] = {0};
|
||||||
|
int32_t keySize = sprintf(key, "0.db.st%d", t);
|
||||||
|
|
||||||
|
for (int32_t q = 0; q < q1Times; q++) {
|
||||||
|
taosHashGet(hashHandle, &key, keySize);
|
||||||
|
}
|
||||||
|
|
||||||
|
taosHashPut(hashHandle, key, keySize, &row, sizeof(HashTestRow));
|
||||||
|
|
||||||
|
for (int32_t q = 0; q < q2Times; q++) {
|
||||||
|
taosHashGet(hashHandle, &key, keySize);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (t % printInterval == 0) {
|
||||||
|
int64_t endMs = taosGetTimestampMs();
|
||||||
|
int64_t hashSize = taosHashGetSize(hashHandle);
|
||||||
|
float seconds = (endMs - startMs) / 1000.0;
|
||||||
|
float speed = printInterval / seconds;
|
||||||
|
pPrint("time:%.2f sec, speed:%.1f rows/second, hashSize:%ld", seconds, speed, hashSize);
|
||||||
|
startMs = endMs;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
int64_t endMs = taosGetTimestampMs();
|
||||||
|
int64_t hashSize = taosHashGetSize(hashHandle);
|
||||||
|
seconds = (endMs - initialMs) / 1000.0;
|
||||||
|
float speed = hashSize / seconds;
|
||||||
|
|
||||||
|
pPrint("total time:%.2f sec, avg speed:%.1f rows/second, hashSize:%ld", seconds, speed, hashSize);
|
||||||
|
taosHashCleanup(hashHandle);
|
||||||
|
}
|
||||||
|
|
||||||
|
int main(int argc, char *argv[]) {
|
||||||
|
shellParseArgument(argc, argv);
|
||||||
|
testHashPerformance();
|
||||||
|
}
|
||||||
|
|
||||||
|
void printHelp() {
|
||||||
|
char indent[10] = " ";
|
||||||
|
printf("Used to test the performance of cache\n");
|
||||||
|
|
||||||
|
printf("%s%s\n", indent, "-k");
|
||||||
|
printf("%s%s%s%d\n", indent, indent, "key num, default is ", keyNum);
|
||||||
|
printf("%s%s\n", indent, "-p");
|
||||||
|
printf("%s%s%s%d\n", indent, indent, "print interval while put into hash, default is ", printInterval);
|
||||||
|
printf("%s%s\n", indent, "-c");
|
||||||
|
printf("%s%s%s%d\n", indent, indent, "the initial capacity of hash ", capacity);
|
||||||
|
printf("%s%s\n", indent, "-q1");
|
||||||
|
printf("%s%s%s%d\n", indent, indent, "query times before put into hash", q1Times);
|
||||||
|
printf("%s%s\n", indent, "-q2");
|
||||||
|
printf("%s%s%s%d\n", indent, indent, "query times after put into hash", q2Times);
|
||||||
|
|
||||||
|
exit(EXIT_SUCCESS);
|
||||||
|
}
|
||||||
|
|
||||||
|
void shellParseArgument(int argc, char *argv[]) {
|
||||||
|
for (int i = 1; i < argc; i++) {
|
||||||
|
if (strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "--help") == 0) {
|
||||||
|
printHelp();
|
||||||
|
exit(0);
|
||||||
|
} else if (strcmp(argv[i], "-k") == 0) {
|
||||||
|
keyNum = atoi(argv[++i]);
|
||||||
|
} else if (strcmp(argv[i], "-p") == 0) {
|
||||||
|
printInterval = atoi(argv[++i]);
|
||||||
|
} else if (strcmp(argv[i], "-c") == 0) {
|
||||||
|
capacity = atoi(argv[++i]);
|
||||||
|
} else if (strcmp(argv[i], "-q1") == 0) {
|
||||||
|
q1Times = atoi(argv[++i]);
|
||||||
|
} else if (strcmp(argv[i], "-q2") == 0) {
|
||||||
|
q2Times = atoi(argv[++i]);
|
||||||
|
} else {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pPrint("%s capacity:%d %s", GREEN, capacity, NC);
|
||||||
|
pPrint("%s printInterval:%d %s", GREEN, printInterval, NC);
|
||||||
|
pPrint("%s q1Times:%d %s", GREEN, q1Times, NC);
|
||||||
|
pPrint("%s q2Times:%d %s", GREEN, q2Times, NC);
|
||||||
|
pPrint("%s keyNum:%d %s", GREEN, keyNum, NC);
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue