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

Merge pull request #10552 from taosdata/feature/config 

fix crash while acquire connection
This commit is contained in:
Shengliang Guan 2022-03-04 16:18:07 +08:00 committed by GitHub
parent d2af3bd970 d414167214
commit 1cdc5afe7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/util/src/tcache.c
View File

@ -940,8 +940,13 @@ bool taosCacheIterNext(SCacheIter* pIter) {
pIter->pCurrent[i] = NULL; pIter->pCurrent[i] = NULL;
} }
while(1) { while (1) {
SCacheEntry *pEntry = &pCacheObj->pEntryList[++pIter->entryIndex]; pIter->entryIndex++;
if (pIter->entryIndex >= pCacheObj->capacity) {
return false;
}
SCacheEntry *pEntry = &pCacheObj->pEntryList[pIter->entryIndex];
taosRLockLatch(&pEntry->latch); taosRLockLatch(&pEntry->latch);
if (pEntry->num == 0) { if (pEntry->num == 0) {

24
source/util/src/tlog.c
View File

@ -17,12 +17,10 @@
#include "tlog.h" #include "tlog.h"
#include "tutil.h" #include "tutil.h"
#define LOG_MAX_LINE_SIZE (1000) #define LOG_MAX_LINE_SIZE (1024)
#define LOG_MAX_LINE_BUFFER_SIZE (LOG_MAX_LINE_SIZE + 10) #define LOG_MAX_LINE_BUFFER_SIZE (LOG_MAX_LINE_SIZE + 3)
#define LOG_MAX_LINE_CONTENT_SIZE (LOG_MAX_LINE_SIZE - 100)
#define LOG_MAX_LINE_DUMP_SIZE (65 * 1024) #define LOG_MAX_LINE_DUMP_SIZE (65 * 1024)
#define LOG_MAX_LINE_DUMP_BUFFER_SIZE (LOG_MAX_LINE_DUMP_SIZE + 10) #define LOG_MAX_LINE_DUMP_BUFFER_SIZE (LOG_MAX_LINE_DUMP_SIZE + 3)
#define LOG_MAX_LINE_DUMP_CONTENT_SIZE (LOG_MAX_LINE_DUMP_SIZE - 100)
#define LOG_FILE_NAME_LEN 300 #define LOG_FILE_NAME_LEN 300
#define LOG_DEFAULT_BUF_SIZE (20 * 1024 * 1024) // 20MB #define LOG_DEFAULT_BUF_SIZE (20 * 1024 * 1024) // 20MB
@ -401,7 +399,7 @@ void taosPrintLog(const char *flags, ELogLevel level, int32_t dflag, const char
if (!osLogSpaceAvailable()) return; if (!osLogSpaceAvailable()) return;
va_list argpointer; va_list argpointer;
char buffer[LOG_MAX_LINE_BUFFER_SIZE] = {0}; char buffer[LOG_MAX_LINE_BUFFER_SIZE];
int32_t len; int32_t len;
struct tm Tm, *ptm; struct tm Tm, *ptm;
struct timeval timeSecs; struct timeval timeSecs;
@ -416,17 +414,7 @@ void taosPrintLog(const char *flags, ELogLevel level, int32_t dflag, const char
len += sprintf(buffer + len, "%s", flags); len += sprintf(buffer + len, "%s", flags);
va_start(argpointer, format); va_start(argpointer, format);
int32_t writeLen = vsnprintf(buffer + len, LOG_MAX_LINE_CONTENT_SIZE, format, argpointer); len += vsnprintf(buffer + len, LOG_MAX_LINE_BUFFER_SIZE - len, format, argpointer);
if (writeLen <= 0) {
char tmp[LOG_MAX_LINE_DUMP_BUFFER_SIZE] = {0};
writeLen = vsnprintf(tmp, LOG_MAX_LINE_DUMP_CONTENT_SIZE, format, argpointer);
strncpy(buffer + len, tmp, LOG_MAX_LINE_CONTENT_SIZE);
len += LOG_MAX_LINE_CONTENT_SIZE;
} else if (writeLen >= LOG_MAX_LINE_CONTENT_SIZE) {
len += LOG_MAX_LINE_CONTENT_SIZE;
} else {
len += writeLen;
}
va_end(argpointer); va_end(argpointer);
if (len > LOG_MAX_LINE_SIZE) len = LOG_MAX_LINE_SIZE; if (len > LOG_MAX_LINE_SIZE) len = LOG_MAX_LINE_SIZE;
@ -497,7 +485,7 @@ void taosPrintLongString(const char *flags, ELogLevel level, int32_t dflag, cons
len += sprintf(buffer + len, "%s", flags); len += sprintf(buffer + len, "%s", flags);
va_start(argpointer, format); va_start(argpointer, format);
len += vsnprintf(buffer + len, LOG_MAX_LINE_DUMP_CONTENT_SIZE, format, argpointer); len += vsnprintf(buffer + len, LOG_MAX_LINE_DUMP_BUFFER_SIZE, format, argpointer);
va_end(argpointer); va_end(argpointer);
if (len > LOG_MAX_LINE_DUMP_SIZE) len = LOG_MAX_LINE_DUMP_SIZE; if (len > LOG_MAX_LINE_DUMP_SIZE) len = LOG_MAX_LINE_DUMP_SIZE;