Skip to content

T
TDengine

taosdata / TDengine
1 年多 前同步成功

通知 1185
Star 22016
Fork 4786
T
TDengine
未验证 提交 5a470e7b 编写于 作者: S Shengliang Guan 提交者： GitHub
浏览文件
操作

Merge pull request #4480 from taosdata/feature/wal 

[TD-2371]<enhance>:Record important information to a separate log file called taoinfo
上级 48ba8aeb b21f78d3
显示空白变更内容
内联 并排
Showing with 243 addition and 265 deletion
src/client/src/tscAsync.c
浏览文件 @ 5a470e7b
...@@ -96,7 +96,7 @@ void taos_query_a(TAOS *taos, const char *sqlstr, __async_cb_func_t fp, void *pa ...@@ -96,7 +96,7 @@ void taos_query_a(TAOS *taos, const char *sqlstr, __async_cb_func_t fp, void *pa
return; return;
} }
taosNotePrintTsc(sqlstr); nPrintTsc(sqlstr);
SSqlObj *pSql = (SSqlObj *)calloc(1, sizeof(SSqlObj)); SSqlObj *pSql = (SSqlObj *)calloc(1, sizeof(SSqlObj));
if (pSql == NULL) { if (pSql == NULL) {
......
src/client/src/tscSql.c
浏览文件 @ 5a470e7b
...@@ -344,7 +344,7 @@ TAOS_RES* taos_query_c(TAOS *taos, const char *sqlstr, uint32_t sqlLen, TAOS_RES ...@@ -344,7 +344,7 @@ TAOS_RES* taos_query_c(TAOS *taos, const char *sqlstr, uint32_t sqlLen, TAOS_RES
return NULL; return NULL;
} }
taosNotePrintTsc(sqlstr); nPrintTsc(sqlstr);
SSqlObj* pSql = calloc(1, sizeof(SSqlObj)); SSqlObj* pSql = calloc(1, sizeof(SSqlObj));
if (pSql == NULL) { if (pSql == NULL) {
......
src/client/src/tscSystem.c
浏览文件 @ 5a470e7b
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include "taosmsg.h" #include "taosmsg.h"
#include "tref.h" #include "tref.h"
#include "trpc.h" #include "trpc.h"
#include "tnote.h"
#include "tsystem.h" #include "tsystem.h"
#include "ttimer.h" #include "ttimer.h"
#include "tutil.h" #include "tutil.h"
...@@ -41,7 +42,6 @@ int tscRefId = -1; ...@@ -41,7 +42,6 @@ int tscRefId = -1;
int tscNumOfThreads; int tscNumOfThreads;
static pthread_once_t tscinit = PTHREAD_ONCE_INIT; static pthread_once_t tscinit = PTHREAD_ONCE_INIT;
void taosInitNote(int numOfNoteLines, int maxNotes, char* lable);
//void tscUpdateEpSet(void *ahandle, SRpcEpSet *pEpSet); //void tscUpdateEpSet(void *ahandle, SRpcEpSet *pEpSet);
void tscCheckDiskUsage(void *UNUSED_PARAM(para), void* UNUSED_PARAM(param)) { void tscCheckDiskUsage(void *UNUSED_PARAM(para), void* UNUSED_PARAM(param)) {
...@@ -78,7 +78,6 @@ int32_t tscInitRpc(const char *user, const char *secretEncrypt, void **pDnodeCon ...@@ -78,7 +78,6 @@ int32_t tscInitRpc(const char *user, const char *secretEncrypt, void **pDnodeCon
return 0; return 0;
} }
void taos_init_imp(void) { void taos_init_imp(void) {
char temp[128] = {0}; char temp[128] = {0};
...@@ -104,6 +103,7 @@ void taos_init_imp(void) { ...@@ -104,6 +103,7 @@ void taos_init_imp(void) {
taosReadGlobalCfg(); taosReadGlobalCfg();
taosCheckGlobalCfg(); taosCheckGlobalCfg();
taosInitNotes();
rpcInit(); rpcInit();
tscDebug("starting to initialize TAOS client ..."); tscDebug("starting to initialize TAOS client ...");
...@@ -111,11 +111,6 @@ void taos_init_imp(void) { ...@@ -111,11 +111,6 @@ void taos_init_imp(void) {
} }
taosSetCoreDump(); taosSetCoreDump();
if (tsTscEnableRecordSql != 0) {
taosInitNote(tsNumOfLogLines / 10, 1, (char*)"tsc_note");
}
tscInitMsgsFp(); tscInitMsgsFp();
int queueSize = tsMaxConnections*2; int queueSize = tsMaxConnections*2;
......
src/dnode/src/dnodeMain.c
浏览文件 @ 5a470e7b
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#define _DEFAULT_SOURCE #define _DEFAULT_SOURCE
#include "os.h" #include "os.h"
#include "taos.h" #include "taos.h"
#include "tnote.h"
#include "tconfig.h" #include "tconfig.h"
#include "tfile.h" #include "tfile.h"
#include "twal.h" #include "twal.h"
...@@ -98,6 +99,7 @@ int32_t dnodeInitSystem() { ...@@ -98,6 +99,7 @@ int32_t dnodeInitSystem() {
taosInitGlobalCfg(); taosInitGlobalCfg();
taosReadGlobalLogCfg(); taosReadGlobalLogCfg();
taosSetCoreDump(); taosSetCoreDump();
taosInitNotes();
signal(SIGPIPE, SIG_IGN); signal(SIGPIPE, SIG_IGN);
if (dnodeCreateDir(tsLogDir) < 0) { if (dnodeCreateDir(tsLogDir) < 0) {
......
src/kit/shell/src/shellLinux.c
浏览文件 @ 5a470e7b
...@@ -46,7 +46,7 @@ static struct argp_option options[] = { ...@@ -46,7 +46,7 @@ static struct argp_option options[] = {
{"thread", 'T', "THREADNUM", 0, "Number of threads when using multi-thread to import data."}, {"thread", 'T', "THREADNUM", 0, "Number of threads when using multi-thread to import data."},
{"database", 'd', "DATABASE", 0, "Database to use when connecting to the server."}, {"database", 'd', "DATABASE", 0, "Database to use when connecting to the server."},
{"timezone", 't', "TIMEZONE", 0, "Time zone of the shell, default is local."}, {"timezone", 't', "TIMEZONE", 0, "Time zone of the shell, default is local."},
{"netrole", 'n', "NETROLE", 0, "Net role when network connectivity test, default is NULL, options: client|server|rpc|startup."}, {"netrole", 'n', "NETROLE", 0, "Net role when network connectivity test, default is startup, options: client|server|rpc|startup."},
{"pktlen", 'l', "PKTLEN", 0, "Packet length used for net test, default is 1000 bytes."}, {"pktlen", 'l', "PKTLEN", 0, "Packet length used for net test, default is 1000 bytes."},
{0}}; {0}};
......
src/plugins/http/src/httpSql.c
浏览文件 @ 5a470e7b
...@@ -181,7 +181,7 @@ void httpProcessMultiSql(HttpContext *pContext) { ...@@ -181,7 +181,7 @@ void httpProcessMultiSql(HttpContext *pContext) {
char *sql = httpGetCmdsString(pContext, cmd->sql); char *sql = httpGetCmdsString(pContext, cmd->sql);
httpTraceL("context:%p, fd:%d, user:%s, process pos:%d, start query, sql:%s", pContext, pContext->fd, pContext->user, httpTraceL("context:%p, fd:%d, user:%s, process pos:%d, start query, sql:%s", pContext, pContext->fd, pContext->user,
multiCmds->pos, sql); multiCmds->pos, sql);
taosNotePrintHttp(sql); nPrintHttp(sql);
taos_query_a(pContext->session->taos, sql, httpProcessMultiSqlCallBack, (void *)pContext); taos_query_a(pContext->session->taos, sql, httpProcessMultiSqlCallBack, (void *)pContext);
} }
...@@ -329,7 +329,7 @@ void httpProcessSingleSqlCmd(HttpContext *pContext) { ...@@ -329,7 +329,7 @@ void httpProcessSingleSqlCmd(HttpContext *pContext) {
} }
httpTraceL("context:%p, fd:%d, user:%s, start query, sql:%s", pContext, pContext->fd, pContext->user, sql); httpTraceL("context:%p, fd:%d, user:%s, start query, sql:%s", pContext, pContext->fd, pContext->user, sql);
taosNotePrintHttp(sql); nPrintHttp(sql);
taos_query_a(pSession->taos, sql, httpProcessSingleSqlCallBack, (void *)pContext); taos_query_a(pSession->taos, sql, httpProcessSingleSqlCallBack, (void *)pContext);
} }
......
src/plugins/http/src/httpSystem.c
浏览文件 @ 5a470e7b
...@@ -37,7 +37,6 @@ void opInitHandle(HttpServer* pServer) {} ...@@ -37,7 +37,6 @@ void opInitHandle(HttpServer* pServer) {}
#endif #endif
HttpServer tsHttpServer; HttpServer tsHttpServer;
void taosInitNote(int32_t numOfNoteLines, int32_t maxNotes, char* lable);
int32_t httpInitSystem() { int32_t httpInitSystem() {
strcpy(tsHttpServer.label, "rest"); strcpy(tsHttpServer.label, "rest");
...@@ -48,9 +47,6 @@ int32_t httpInitSystem() { ...@@ -48,9 +47,6 @@ int32_t httpInitSystem() {
pthread_mutex_init(&tsHttpServer.serverMutex, NULL); pthread_mutex_init(&tsHttpServer.serverMutex, NULL);
if (tsHttpEnableRecordSql != 0) {
taosInitNote(tsNumOfLogLines / 10, 1, (char*)"http_note");
}
restInitHandle(&tsHttpServer); restInitHandle(&tsHttpServer);
adminInitHandle(&tsHttpServer); adminInitHandle(&tsHttpServer);
gcInitHandle(&tsHttpServer); gcInitHandle(&tsHttpServer);
......
src/util/inc/tnote.h
浏览文件 @ 5a470e7b
...@@ -20,40 +20,41 @@ ...@@ -20,40 +20,41 @@
extern "C" { extern "C" {
#endif #endif
#include "os.h"
#include "tutil.h"
#include "tglobal.h"
#define MAX_NOTE_LINE_SIZE 66000 #define MAX_NOTE_LINE_SIZE 66000
#define NOTE_FILE_NAME_LEN 300 #define NOTE_FILE_NAME_LEN 300
typedef struct _taosNoteInfo { typedef struct {
int taosNoteFileNum ; int32_t fileNum;
int taosNoteMaxLines; int32_t maxLines;
int taosNoteLines; int32_t lines;
char taosNoteName[NOTE_FILE_NAME_LEN]; int32_t flag;
int taosNoteFlag; int32_t fd;
int taosNoteFd; int32_t openInProgress;
int taosNoteOpenInProgress; char name[NOTE_FILE_NAME_LEN];
pthread_mutex_t taosNoteMutex; pthread_mutex_t mutex;
}taosNoteInfo; } SNoteObj;
void taosNotePrint(taosNoteInfo * pNote, const char * const format, ...);
extern taosNoteInfo m_HttpNote; extern SNoteObj tsHttpNote;
extern taosNoteInfo m_TscNote; extern SNoteObj tsTscNote;
extern SNoteObj tsInfoNote;
extern int tsHttpEnableRecordSql; void taosInitNotes();
extern int tsTscEnableRecordSql; void taosNotePrint(SNoteObj* pNote, const char* const format, ...);
void taosNotePrintBuffer(SNoteObj *pNote, char *buffer, int32_t len);
#define taosNotePrintHttp(...) \ #define nPrintHttp(...) \
if (tsHttpEnableRecordSql) { \ if (tsHttpEnableRecordSql) { \
taosNotePrint(&m_HttpNote, __VA_ARGS__); \ taosNotePrint(&tsHttpNote, __VA_ARGS__); \
} }
#define taosNotePrintTsc(...) \ #define nPrintTsc(...) \
if (tsTscEnableRecordSql) { \ if (tsTscEnableRecordSql) { \
taosNotePrint(&m_TscNote, __VA_ARGS__); \ taosNotePrint(&tsTscNote, __VA_ARGS__); \
}
#define nInfo(buffer, len) \
if (tscEmbedded == 1) { \
taosNotePrintBuffer(&tsInfoNote, buffer, len); \
} }
#ifdef __cplusplus #ifdef __cplusplus
......
src/util/src/tlog.c
浏览文件 @ 5a470e7b
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include "os.h" #include "os.h"
#include "tulog.h" #include "tulog.h"
#include "tlog.h" #include "tlog.h"
#include "tnote.h"
#include "tutil.h" #include "tutil.h"
#define MAX_LOGLINE_SIZE (1000) #define MAX_LOGLINE_SIZE (1000)
...@@ -287,7 +288,6 @@ static int32_t taosOpenLogFile(char *fn, int32_t maxLines, int32_t maxFileNum) { ...@@ -287,7 +288,6 @@ static int32_t taosOpenLogFile(char *fn, int32_t maxLines, int32_t maxFileNum) {
tsLogObj.fileNum = maxFileNum; tsLogObj.fileNum = maxFileNum;
taosGetLogFileName(fn); taosGetLogFileName(fn);
if (strlen(fn) < LOG_FILE_NAME_LEN + 50 - 2) { if (strlen(fn) < LOG_FILE_NAME_LEN + 50 - 2) {
strcpy(name, fn); strcpy(name, fn);
strcat(name, ".0"); strcat(name, ".0");
...@@ -401,6 +401,7 @@ void taosPrintLog(const char *flags, int32_t dflag, const char *format, ...) { ...@@ -401,6 +401,7 @@ void taosPrintLog(const char *flags, int32_t dflag, const char *format, ...) {
} }
if (dflag & DEBUG_SCREEN) taosWrite(1, buffer, (uint32_t)len); if (dflag & DEBUG_SCREEN) taosWrite(1, buffer, (uint32_t)len);
if (dflag == 255) nInfo(buffer, len);
} }
void taosDumpData(unsigned char *msg, int32_t len) { void taosDumpData(unsigned char *msg, int32_t len) {
......
src/util/src/tnote.c
浏览文件 @ 5a470e7b
...@@ -13,52 +13,57 @@ ...@@ -13,52 +13,57 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#define _DEFAULT_SOURCE
#include "os.h" #include "os.h"
#include "tutil.h"
#include "tglobal.h"
#include "tnote.h" #include "tnote.h"
taosNoteInfo m_HttpNote; SNoteObj tsHttpNote;
taosNoteInfo m_TscNote; SNoteObj tsTscNote;
SNoteObj tsInfoNote;
int taosOpenNoteWithMaxLines(char *fn, int maxLines, int maxNoteNum, taosNoteInfo * pNote); static int32_t taosOpenNoteWithMaxLines(char *fn, int32_t maxLines, int32_t maxNoteNum, SNoteObj *pNote);
static void taosCloseNoteByFd(int32_t oldFd, SNoteObj *pNote);
void taosInitNote(int numOfNoteLines, int maxNotes, char* lable) static void taosInitNote(int32_t numOfLines, int32_t maxNotes, SNoteObj *pNote, char *name) {
{ memset(pNote, 0, sizeof(SNoteObj));
taosNoteInfo * pNote = NULL; pNote->fileNum = 1;
char temp[128] = { 0 }; pNote->fd = -1;
if (strcasecmp(lable, "http_note") == 0) { if (taosOpenNoteWithMaxLines(name, numOfLines, maxNotes, pNote) < 0) {
pNote = &m_HttpNote;
sprintf(temp, "%s/httpnote", tsLogDir);
} else if (strcasecmp(lable, "tsc_note") == 0) {
pNote = &m_TscNote;
sprintf(temp, "%s/tscnote-%d", tsLogDir, getpid());
} else {
return;
}
memset(pNote, 0, sizeof(taosNoteInfo));
pNote->taosNoteFileNum = 1;
//pNote->taosNoteMaxLines = 0;
//pNote->taosNoteLines = 0;
//pNote->taosNoteFlag = 0;
pNote->taosNoteFd = -1;
//pNote->taosNoteOpenInProgress = 0;
if (taosOpenNoteWithMaxLines(temp, numOfNoteLines, maxNotes, pNote) < 0)
fprintf(stderr, "failed to init note file\n"); fprintf(stderr, "failed to init note file\n");
}
taosNotePrint(pNote, "=================================================="); taosNotePrint(pNote, "==================================================");
taosNotePrint(pNote, "=================== new note ==================="); taosNotePrint(pNote, "=================== new note ===================");
taosNotePrint(pNote, "=================================================="); taosNotePrint(pNote, "==================================================");
} }
void taosCloseNoteByFd(int oldFd, taosNoteInfo * pNote); void taosInitNotes() {
bool taosLockNote(int fd, taosNoteInfo * pNote) char name[TSDB_FILENAME_LEN * 2] = {0};
{
if (tsTscEnableRecordSql) {
snprintf(name, TSDB_FILENAME_LEN * 2, "%s/tscsql-%d", tsLogDir, taosGetPId());
taosInitNote(tsNumOfLogLines, 1, &tsTscNote, name);
}
if (tsHttpEnableRecordSql) {
snprintf(name, TSDB_FILENAME_LEN * 2, "%s/httpsql", tsLogDir);
taosInitNote(tsNumOfLogLines, 1, &tsHttpNote, name);
}
if (tscEmbedded == 1) {
snprintf(name, TSDB_FILENAME_LEN * 2, "%s/taosinfo", tsLogDir);
taosInitNote(tsNumOfLogLines, 1, &tsInfoNote, name);
}
}
static bool taosLockNote(int32_t fd, SNoteObj *pNote) {
if (fd < 0) return false; if (fd < 0) return false;
if (pNote->taosNoteFileNum > 1) { if (pNote->fileNum > 1) {
int ret = (int)(flock(fd, LOCK_EX | LOCK_NB)); int32_t ret = (int32_t)(flock(fd, LOCK_EX | LOCK_NB));
if (ret == 0) { if (ret == 0) {
return true; return true;
} }
...@@ -67,27 +72,25 @@ bool taosLockNote(int fd, taosNoteInfo * pNote) ...@@ -67,27 +72,25 @@ bool taosLockNote(int fd, taosNoteInfo * pNote)
return false; return false;
} }
void taosUnLockNote(int fd, taosNoteInfo * pNote) static void taosUnLockNote(int32_t fd, SNoteObj *pNote) {
{
if (fd < 0) return; if (fd < 0) return;
if (pNote->taosNoteFileNum > 1) { if (pNote->fileNum > 1) {
flock(fd, LOCK_UN | LOCK_NB); flock(fd, LOCK_UN | LOCK_NB);
} }
} }
void *taosThreadToOpenNewNote(void *param) static void *taosThreadToOpenNewNote(void *param) {
{
char name[NOTE_FILE_NAME_LEN * 2]; char name[NOTE_FILE_NAME_LEN * 2];
taosNoteInfo * pNote = (taosNoteInfo *)param; SNoteObj *pNote = (SNoteObj *)param;
pNote->taosNoteFlag ^= 1; pNote->flag ^= 1;
pNote->taosNoteLines = 0; pNote->lines = 0;
sprintf(name, "%s.%d", pNote->taosNoteName, pNote->taosNoteFlag); sprintf(name, "%s.%d", pNote->name, pNote->flag);
umask(0); umask(0);
int fd = open(name, O_WRONLY | O_CREAT | O_TRUNC, S_IRWXU | S_IRWXG | S_IRWXO); int32_t fd = open(name, O_WRONLY | O_CREAT | O_TRUNC, S_IRWXU | S_IRWXG | S_IRWXO);
if (fd < 0) { if (fd < 0) {
return NULL; return NULL;
} }
...@@ -95,22 +98,21 @@ void *taosThreadToOpenNewNote(void *param) ...@@ -95,22 +98,21 @@ void *taosThreadToOpenNewNote(void *param)
taosLockNote(fd, pNote); taosLockNote(fd, pNote);
(void)lseek(fd, 0, SEEK_SET); (void)lseek(fd, 0, SEEK_SET);
int oldFd = pNote->taosNoteFd; int32_t oldFd = pNote->fd;
pNote->taosNoteFd = fd; pNote->fd = fd;
pNote->taosNoteLines = 0; pNote->lines = 0;
pNote->taosNoteOpenInProgress = 0; pNote->openInProgress = 0;
taosNotePrint(pNote, "=============== new note is opened ============="); taosNotePrint(pNote, "=============== new note is opened =============");
taosCloseNoteByFd(oldFd, pNote); taosCloseNoteByFd(oldFd, pNote);
return NULL; return NULL;
} }
int taosOpenNewNote(taosNoteInfo * pNote) static int32_t taosOpenNewNote(SNoteObj *pNote) {
{ pthread_mutex_lock(&pNote->mutex);
pthread_mutex_lock(&pNote->taosNoteMutex);
if (pNote->taosNoteLines > pNote->taosNoteMaxLines && pNote->taosNoteOpenInProgress == 0) { if (pNote->lines > pNote->maxLines && pNote->openInProgress == 0) {
pNote->taosNoteOpenInProgress = 1; pNote->openInProgress = 1;
taosNotePrint(pNote, "=============== open new note =================="); taosNotePrint(pNote, "=============== open new note ==================");
pthread_t pattern; pthread_t pattern;
...@@ -118,25 +120,17 @@ int taosOpenNewNote(taosNoteInfo * pNote) ...@@ -118,25 +120,17 @@ int taosOpenNewNote(taosNoteInfo * pNote)
pthread_attr_init(&attr); pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
pthread_create(&pattern, &attr, taosThreadToOpenNewNote, (void*)pNote); pthread_create(&pattern, &attr, taosThreadToOpenNewNote, (void *)pNote);
pthread_attr_destroy(&attr); pthread_attr_destroy(&attr);
} }
pthread_mutex_unlock(&pNote->taosNoteMutex); pthread_mutex_unlock(&pNote->mutex);
return pNote->taosNoteFd; return pNote->fd;
} }
bool taosCheckNoteIsOpen(char *noteName, taosNoteInfo * pNote) static bool taosCheckNoteIsOpen(char *noteName, SNoteObj *pNote) {
{ int32_t fd = open(noteName, O_WRONLY | O_CREAT, S_IRWXU | S_IRWXG | S_IRWXO);
/*
int exist = access(noteName, F_OK);
if (exist != 0) {
return false;
}
*/
int fd = open(noteName, O_WRONLY | O_CREAT, S_IRWXU | S_IRWXG | S_IRWXO);
if (fd < 0) { if (fd < 0) {
fprintf(stderr, "failed to open note:%s reason:%s\n", noteName, strerror(errno)); fprintf(stderr, "failed to open note:%s reason:%s\n", noteName, strerror(errno));
return true; return true;
...@@ -146,17 +140,15 @@ bool taosCheckNoteIsOpen(char *noteName, taosNoteInfo * pNote) ...@@ -146,17 +140,15 @@ bool taosCheckNoteIsOpen(char *noteName, taosNoteInfo * pNote)
taosUnLockNote(fd, pNote); taosUnLockNote(fd, pNote);
close(fd); close(fd);
return false; return false;
} } else {
else {
close(fd); close(fd);
return true; return true;
} }
} }
void taosGetNoteName(char *fn, taosNoteInfo * pNote) static void taosGetNoteName(char *fn, SNoteObj *pNote) {
{ if (pNote->fileNum > 1) {
if (pNote->taosNoteFileNum > 1) { for (int32_t i = 0; i < pNote->fileNum; i++) {
for (int i = 0; i < pNote->taosNoteFileNum; i++) {
char fileName[NOTE_FILE_NAME_LEN]; char fileName[NOTE_FILE_NAME_LEN];
sprintf(fileName, "%s%d.0", fn, i); sprintf(fileName, "%s%d.0", fn, i);
...@@ -166,81 +158,89 @@ void taosGetNoteName(char *fn, taosNoteInfo * pNote) ...@@ -166,81 +158,89 @@ void taosGetNoteName(char *fn, taosNoteInfo * pNote)
bool file2open = taosCheckNoteIsOpen(fileName, pNote); bool file2open = taosCheckNoteIsOpen(fileName, pNote);
if (!file1open && !file2open) { if (!file1open && !file2open) {
sprintf(pNote->taosNoteName, "%s%d", fn, i); sprintf(pNote->name, "%s%d", fn, i);
return; return;
} }
} }
} }
if (strlen(fn) < NOTE_FILE_NAME_LEN) { if (strlen(fn) < NOTE_FILE_NAME_LEN) {
strcpy(pNote->taosNoteName, fn); strcpy(pNote->name, fn);
} }
} }
int taosOpenNoteWithMaxLines(char *fn, int maxLines, int maxNoteNum, taosNoteInfo * pNote) static int32_t taosOpenNoteWithMaxLines(char *fn, int32_t maxLines, int32_t maxNoteNum, SNoteObj *pNote) {
{ char name[NOTE_FILE_NAME_LEN * 2] = {0};
char name[NOTE_FILE_NAME_LEN * 2] = "\0"; int32_t size;
struct stat notestat0, notestat1; struct stat logstat0, logstat1;
int size;
pNote->taosNoteMaxLines = maxLines; pNote->maxLines = maxLines;
pNote->taosNoteFileNum = maxNoteNum; pNote->fileNum = maxNoteNum;
taosGetNoteName(fn, pNote); taosGetNoteName(fn, pNote);
if (strlen(fn) > NOTE_FILE_NAME_LEN * 2 - 2) { if (strlen(fn) < NOTE_FILE_NAME_LEN + 50 - 2) {
fprintf(stderr, "the len of file name overflow:%s\n", fn);
return -1;
}
strcpy(name, fn); strcpy(name, fn);
strcat(name, ".0"); strcat(name, ".0");
}
bool log0Exist = stat(name, &logstat0) >= 0;
// if none of the note files exist, open 0, if both exists, open the old one if (strlen(fn) < NOTE_FILE_NAME_LEN + 50 - 2) {
if (stat(name, &notestat0) < 0) {
pNote->taosNoteFlag = 0;
} else {
strcpy(name, fn); strcpy(name, fn);
strcat(name, ".1"); strcat(name, ".1");
if (stat(name, &notestat1) < 0) {
pNote->taosNoteFlag = 1;
}
else {
pNote->taosNoteFlag = (notestat0.st_mtime > notestat1.st_mtime) ? 0 : 1;
} }
bool log1Exist = stat(name, &logstat1) >= 0;
if (!log0Exist && !log1Exist) {
pNote->flag = 0;
} else if (!log1Exist) {
pNote->flag = 0;
} else if (!log0Exist) {
pNote->flag = 1;
} else {
pNote->flag = (logstat0.st_mtime > logstat1.st_mtime) ? 0 : 1;
} }
char noteName[NOTE_FILE_NAME_LEN * 2] = "\0"; char noteName[NOTE_FILE_NAME_LEN * 2] = {0};
sprintf(noteName, "%s.%d", pNote->taosNoteName, pNote->taosNoteFlag); sprintf(noteName, "%s.%d", pNote->name, pNote->flag);
pthread_mutex_init(&pNote->taosNoteMutex, NULL); pthread_mutex_init(&pNote->mutex, NULL);
umask(0); umask(0);
pNote->taosNoteFd = open(noteName, O_WRONLY | O_CREAT, S_IRWXU | S_IRWXG | S_IRWXO); pNote->fd = open(noteName, O_WRONLY | O_CREAT, S_IRWXU | S_IRWXG | S_IRWXO);
if (pNote->taosNoteFd < 0) { if (pNote->fd < 0) {
fprintf(stderr, "failed to open note file:%s reason:%s\n", noteName, strerror(errno)); fprintf(stderr, "failed to open note file:%s reason:%s\n", noteName, strerror(errno));
return -1; return -1;
} }
taosLockNote(pNote->taosNoteFd, pNote); taosLockNote(pNote->fd, pNote);
// only an estimate for number of lines // only an estimate for number of lines
struct stat filestat; struct stat filestat;
if (fstat(pNote->taosNoteFd, &filestat) < 0) { if (fstat(pNote->fd, &filestat) < 0) {
fprintf(stderr, "failed to fstat note file:%s reason:%s\n", noteName, strerror(errno)); fprintf(stderr, "failed to fstat note file:%s reason:%s\n", noteName, strerror(errno));
return -1; return -1;
} }
size = (int)filestat.st_size; size = (int32_t)filestat.st_size;
pNote->taosNoteLines = size / 60; pNote->lines = size / 60;
lseek(pNote->taosNoteFd, 0, SEEK_END); lseek(pNote->fd, 0, SEEK_END);
return 0; return 0;
} }
void taosNotePrint(taosNoteInfo * pNote, const char * const format, ...) void taosNotePrintBuffer(SNoteObj *pNote, char *buffer, int32_t len) {
{ if (pNote->fd < 0) return;
taosWrite(pNote->fd, buffer, len);
if (pNote->maxLines > 0) {
pNote->lines++;
if ((pNote->lines > pNote->maxLines) && (pNote->openInProgress == 0)) taosOpenNewNote(pNote);
}
}
void taosNotePrint(SNoteObj *pNote, const char *const format, ...) {
va_list argpointer; va_list argpointer;
char buffer[MAX_NOTE_LINE_SIZE+2]; char buffer[MAX_NOTE_LINE_SIZE + 2];
int len; int32_t len;
struct tm Tm, *ptm; struct tm Tm, *ptm;
struct timeval timeSecs; struct timeval timeSecs;
time_t curTime; time_t curTime;
...@@ -248,13 +248,8 @@ void taosNotePrint(taosNoteInfo * pNote, const char * const format, ...) ...@@ -248,13 +248,8 @@ void taosNotePrint(taosNoteInfo * pNote, const char * const format, ...)
gettimeofday(&timeSecs, NULL); gettimeofday(&timeSecs, NULL);
curTime = timeSecs.tv_sec; curTime = timeSecs.tv_sec;
ptm = localtime_r(&curTime, &Tm); ptm = localtime_r(&curTime, &Tm);
#ifndef LINUX len = sprintf(buffer, "%02d/%02d %02d:%02d:%02d.%06d 0x%08" PRIx64 " ", ptm->tm_mon + 1, ptm->tm_mday, ptm->tm_hour,
len = sprintf(buffer, "%02d/%02d %02d:%02d:%02d.%06d 0x%lld ", ptm->tm_mon + 1, ptm->tm_mday, ptm->tm_hour, ptm->tm_min, ptm->tm_sec, (int32_t)timeSecs.tv_usec, taosGetPthreadId());
ptm->tm_min, ptm->tm_sec, (int)timeSecs.tv_usec, taosGetPthreadId());
#else
len = sprintf(buffer, "%02d/%02d %02d:%02d:%02d.%06d %lx ", ptm->tm_mon + 1, ptm->tm_mday, ptm->tm_hour, ptm->tm_min,
ptm->tm_sec, (int)timeSecs.tv_usec, (unsigned long int)pthread_self());
#endif
va_start(argpointer, format); va_start(argpointer, format);
len += vsnprintf(buffer + len, MAX_NOTE_LINE_SIZE - len, format, argpointer); len += vsnprintf(buffer + len, MAX_NOTE_LINE_SIZE - len, format, argpointer);
va_end(argpointer); va_end(argpointer);
...@@ -264,24 +259,12 @@ void taosNotePrint(taosNoteInfo * pNote, const char * const format, ...) ...@@ -264,24 +259,12 @@ void taosNotePrint(taosNoteInfo * pNote, const char * const format, ...)
buffer[len++] = '\n'; buffer[len++] = '\n';
buffer[len] = 0; buffer[len] = 0;
if (pNote->taosNoteFd >= 0) { taosNotePrintBuffer(pNote, buffer, len);
taosWrite(pNote->taosNoteFd, buffer, (unsigned int)len);
if (pNote->taosNoteMaxLines > 0) {
pNote->taosNoteLines++;
if ((pNote->taosNoteLines > pNote->taosNoteMaxLines) && (pNote->taosNoteOpenInProgress == 0))
taosOpenNewNote(pNote);
}
}
} }
void taosCloseNote(taosNoteInfo * pNote) // static void taosCloseNote(SNoteObj *pNote) { taosCloseNoteByFd(pNote->fd, pNote); }
{
taosCloseNoteByFd(pNote->taosNoteFd, pNote);
}
void taosCloseNoteByFd(int fd, taosNoteInfo * pNote) static void taosCloseNoteByFd(int32_t fd, SNoteObj *pNote) {
{
if (fd >= 0) { if (fd >= 0) {
taosUnLockNote(fd, pNote); taosUnLockNote(fd, pNote);
close(fd); close(fd);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或