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

fix bug

This commit is contained in:
dapan1121 2021-01-29 14:32:34 +08:00
parent 431ce4615a
commit fcc50d4179
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/util/src/tlog.c
View File

@ -28,9 +28,7 @@
#define MAX_LOGLINE_DUMP_CONTENT_SIZE (MAX_LOGLINE_DUMP_SIZE - 100) #define MAX_LOGLINE_DUMP_CONTENT_SIZE (MAX_LOGLINE_DUMP_SIZE - 100)
#define LOG_FILE_NAME_LEN 300 #define LOG_FILE_NAME_LEN 300
#define TSDB_DEFAULT_LOG_BUF_SIZE (512 * 1024) // 512K #define TSDB_DEFAULT_LOG_BUF_SIZE (4 * 1024 * 1024) // 4MB
#define TSDB_MIN_LOG_BUF_SIZE 1024 // 1K
#define TSDB_MAX_LOG_BUF_SIZE (1024 * 1024) // 1M
#define TSDB_DEFAULT_LOG_BUF_UNIT 1024 // 1K #define TSDB_DEFAULT_LOG_BUF_UNIT 1024 // 1K
#define LOG_BUF_BUFFER(x) ((x)->buffer) #define LOG_BUF_BUFFER(x) ((x)->buffer)
@ -497,8 +495,6 @@ static void taosCloseLogByFd(int32_t fd) {
static SLogBuff *taosLogBuffNew(int32_t bufSize) { static SLogBuff *taosLogBuffNew(int32_t bufSize) {
SLogBuff *tLogBuff = NULL; SLogBuff *tLogBuff = NULL;
if (bufSize < TSDB_MIN_LOG_BUF_SIZE || bufSize > TSDB_MAX_LOG_BUF_SIZE) return NULL;
tLogBuff = calloc(1, sizeof(SLogBuff)); tLogBuff = calloc(1, sizeof(SLogBuff));
if (tLogBuff == NULL) return NULL; if (tLogBuff == NULL) return NULL;
@ -617,14 +613,16 @@ static void *taosAsyncOutputLog(void *param) {
SLogBuff *tLogBuff = (SLogBuff *)param; SLogBuff *tLogBuff = (SLogBuff *)param;
int32_t log_size = 0; int32_t log_size = 0;
char tempBuffer[TSDB_DEFAULT_LOG_BUF_SIZE]; char *tempBuffer = malloc(TSDB_DEFAULT_LOG_BUF_SIZE);
assert(tempBuffer);
while (1) { while (1) {
tsem_wait(&(tLogBuff->buffNotEmpty)); tsem_wait(&(tLogBuff->buffNotEmpty));
// Polling the buffer // Polling the buffer
while (1) { while (1) {
log_size = taosPollLogBuffer(tLogBuff, tempBuffer, sizeof(tempBuffer)); log_size = taosPollLogBuffer(tLogBuff, tempBuffer, TSDB_DEFAULT_LOG_BUF_SIZE);
if (log_size) { if (log_size) {
taosWrite(tLogBuff->fd, tempBuffer, log_size); taosWrite(tLogBuff->fd, tempBuffer, log_size);
LOG_BUF_START(tLogBuff) = (LOG_BUF_START(tLogBuff) + log_size) % LOG_BUF_SIZE(tLogBuff); LOG_BUF_START(tLogBuff) = (LOG_BUF_START(tLogBuff) + log_size) % LOG_BUF_SIZE(tLogBuff);