Skip to content

Commit

Permalink
fix: taosbenchmark handle mem better (#563)
Browse files Browse the repository at this point in the history 
* fix: taosbenchmark handle mem better

* fix: dont output if temrinated
  • Loading branch information
@sangshuduo
sangshuduo committed Feb 1, 2023
1 parent a0234fe commit c4a567b
Showing 1 changed file with 22 additions and 22 deletions.
44 changes: 22 additions & 22 deletions inc/bench.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,42 +242,42 @@
fprintf(stdout, "INFO: " fmt, __VA_ARGS__); \
} while (0)

#define infoPrintToFile(fp, fmt, ...) \
#define infoPrintToFile(fp, fmt, ...) \
do { \
struct tm Tm, *ptm; \
struct timeval timeSecs; \
time_t curTime; \
toolsGetTimeOfDay(&timeSecs); \
curTime = timeSecs.tv_sec; \
ptm = toolsLocalTime(&curTime, &Tm); \
ptm = toolsLocalTime(&curTime, &Tm); \
fprintf(fp, "[%02d/%02d %02d:%02d:%02d.%06d] ", ptm->tm_mon + 1, \
ptm->tm_mday, ptm->tm_hour, ptm->tm_min, ptm->tm_sec, \
(int32_t)timeSecs.tv_usec); \
fprintf(fp, "INFO: " fmt, __VA_ARGS__); \
} while (0)

#define perfPrint(fmt, ...) \
do { \
if (g_arguments->performance_print) { \
struct tm Tm, *ptm; \
struct timeval timeSecs; \
time_t curTime; \
toolsGetTimeOfDay(&timeSecs); \
curTime = timeSecs.tv_sec; \
#define perfPrint(fmt, ...) \
do { \
if (g_arguments->performance_print) { \
struct tm Tm, *ptm; \
struct timeval timeSecs; \
time_t curTime; \
toolsGetTimeOfDay(&timeSecs); \
curTime = timeSecs.tv_sec; \
ptm = toolsLocalTime(&curTime, &Tm); \
fprintf(stderr, "[%02d/%02d %02d:%02d:%02d.%06d] ", ptm->tm_mon + 1, \
ptm->tm_mday, ptm->tm_hour, ptm->tm_min, ptm->tm_sec, \
(int32_t)timeSecs.tv_usec); \
fprintf(stderr, "PERF: " fmt, __VA_ARGS__); \
if (g_arguments->fpOfInsertResult) { \
fprintf(stderr, "[%02d/%02d %02d:%02d:%02d.%06d] ", ptm->tm_mon + 1,\
ptm->tm_mday, ptm->tm_hour, ptm->tm_min, ptm->tm_sec, \
(int32_t)timeSecs.tv_usec); \
fprintf(stderr, "PERF: " fmt, __VA_ARGS__); \
if (g_arguments->fpOfInsertResult && !g_arguments->terminate) { \
fprintf(g_arguments->fpOfInsertResult, \
"[%02d/%02d %02d:%02d:%02d.%06d] ", ptm->tm_mon + 1, \
ptm->tm_mday, ptm->tm_hour, ptm->tm_min, ptm->tm_sec, \
(int32_t)timeSecs.tv_usec); \
fprintf(g_arguments->fpOfInsertResult, "PERF: "); \
ptm->tm_mday, ptm->tm_hour, ptm->tm_min, ptm->tm_sec, \
(int32_t)timeSecs.tv_usec); \
fprintf(g_arguments->fpOfInsertResult, "PERF: "); \
fprintf(g_arguments->fpOfInsertResult, "" fmt, __VA_ARGS__); \
} \
} \
} \
} while (0)

#define errorPrint(fmt, ...) \
Expand All @@ -298,7 +298,7 @@
} \
fprintf(stderr, "" fmt, __VA_ARGS__); \
fprintf(stderr, "\033[0m"); \
if (g_arguments->fpOfInsertResult) { \
if (g_arguments->fpOfInsertResult && !g_arguments->terminate) { \
fprintf(g_arguments->fpOfInsertResult, \
"[%02d/%02d %02d:%02d:%02d.%06d] ", ptm->tm_mon + 1, \
ptm->tm_mday, ptm->tm_hour, ptm->tm_min, ptm->tm_sec, \
Expand Down Expand Up @@ -326,7 +326,7 @@
} \
fprintf(stderr, "" fmt, __VA_ARGS__); \
fprintf(stderr, "\033[0m"); \
if (g_arguments->fpOfInsertResult) { \
if (g_arguments->fpOfInsertResult && !g_arguments->terminate) { \
fprintf(g_arguments->fpOfInsertResult, \
"[%02d/%02d %02d:%02d:%02d.%06d] ", ptm->tm_mon + 1, \
ptm->tm_mday, ptm->tm_hour, ptm->tm_min, ptm->tm_sec, \
Expand Down Expand Up @@ -354,7 +354,7 @@
} \
fprintf(stderr, "" fmt, __VA_ARGS__); \
fprintf(stderr, "\033[0m"); \
if (g_arguments->fpOfInsertResult) { \
if (g_arguments->fpOfInsertResult && !g_arguments->terminate) { \
fprintf(g_arguments->fpOfInsertResult, \
"[%02d/%02d %02d:%02d:%02d.%06d] ", ptm->tm_mon + 1, \
ptm->tm_mday, ptm->tm_hour, ptm->tm_min, ptm->tm_sec, \
Expand Down

0 comments on commit c4a567b

Please sign in to comment.