提交 cafe84d1 编写于 作者: D dapan1121

fix bug

上级 ac25bdef
...@@ -30,11 +30,11 @@ ...@@ -30,11 +30,11 @@
#define LOG_FILE_NAME_LEN 300 #define LOG_FILE_NAME_LEN 300
#define TSDB_DEFAULT_LOG_BUF_SIZE (20 * 1024 * 1024) // 20MB #define TSDB_DEFAULT_LOG_BUF_SIZE (20 * 1024 * 1024) // 20MB
#define DEFAULT_LOG_INTERVAL 25000 #define DEFAULT_LOG_INTERVAL 25
#define LOG_INTERVAL_STEP 5000 #define LOG_INTERVAL_STEP 5
#define MIN_LOG_INTERVAL 5000 #define MIN_LOG_INTERVAL 5
#define MAX_LOG_INTERVAL 25000 #define MAX_LOG_INTERVAL 25
#define LOG_MAX_WAIT_USEC 1000000 #define LOG_MAX_WAIT_MSEC 1000
#define LOG_BUF_BUFFER(x) ((x)->buffer) #define LOG_BUF_BUFFER(x) ((x)->buffer)
#define LOG_BUF_START(x) ((x)->buffStart) #define LOG_BUF_START(x) ((x)->buffStart)
...@@ -122,7 +122,7 @@ static void taosStopLog() { ...@@ -122,7 +122,7 @@ static void taosStopLog() {
void taosCloseLog() { void taosCloseLog() {
taosStopLog(); taosStopLog();
//tsem_post(&(tsLogObj.logHandle->buffNotEmpty)); //tsem_post(&(tsLogObj.logHandle->buffNotEmpty));
usleep(MAX_LOG_INTERVAL); taosMsleep(MAX_LOG_INTERVAL/1000);
if (taosCheckPthreadValid(tsLogObj.logHandle->asyncThread)) { if (taosCheckPthreadValid(tsLogObj.logHandle->asyncThread)) {
pthread_join(tsLogObj.logHandle->asyncThread, NULL); pthread_join(tsLogObj.logHandle->asyncThread, NULL);
} }
...@@ -632,7 +632,7 @@ static void taosWriteLog(SLogBuff *tLogBuff) { ...@@ -632,7 +632,7 @@ static void taosWriteLog(SLogBuff *tLogBuff) {
pollSize = taosGetLogRemainSize(tLogBuff, start, end); pollSize = taosGetLogRemainSize(tLogBuff, start, end);
if (pollSize < tLogBuff->minBuffSize) { if (pollSize < tLogBuff->minBuffSize) {
lastDuration += writeInterval; lastDuration += writeInterval;
if (lastDuration < LOG_MAX_WAIT_USEC) { if (lastDuration < LOG_MAX_WAIT_MSEC) {
break; break;
} }
} }
...@@ -688,7 +688,7 @@ static void *taosAsyncOutputLog(void *param) { ...@@ -688,7 +688,7 @@ static void *taosAsyncOutputLog(void *param) {
while (1) { while (1) {
//tsem_wait(&(tLogBuff->buffNotEmpty)); //tsem_wait(&(tLogBuff->buffNotEmpty));
usleep(writeInterval); taosMsleep(writeInterval);
// Polling the buffer // Polling the buffer
taosWriteLog(tLogBuff); taosWriteLog(tLogBuff);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册