pull/18/merge
XuanZe 8 years ago committed by GitHub
commit 2ae09ac01e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -404,7 +404,7 @@ void elog_output(uint8_t level, const char *tag, const char *file, const char *f
if (level > elog.filter.level) { if (level > elog.filter.level) {
return; return;
} else if (!strstr(tag, elog.filter.tag)) { /* tag filter */ } else if (!strstr(tag, elog.filter.tag)) { /* tag filter */
//TODO 可以考虑采用KMP及朴素模式匹配字符串提升性能 //TODO 可以考虑采用KMP及朴素模式匹配字符串提升性能
return; return;
} }
/* args point to the first variable parameter */ /* args point to the first variable parameter */
@ -478,7 +478,7 @@ void elog_output(uint8_t level, const char *tag, const char *file, const char *f
} }
/* package thread info */ /* package thread info */
if (get_fmt_enabled(level, ELOG_FMT_LINE)) { if (get_fmt_enabled(level, ELOG_FMT_LINE)) {
//TODO snprintf资源占用可能较高待优化 //TODO snprintf资源占用可能较高待优化
snprintf(line_num, ELOG_LINE_NUM_MAX_LEN, "%ld", line); snprintf(line_num, ELOG_LINE_NUM_MAX_LEN, "%ld", line);
log_len += elog_strcpy(log_len, log_buf + log_len, line_num); log_len += elog_strcpy(log_len, log_buf + log_len, line_num);
} }
@ -498,7 +498,7 @@ void elog_output(uint8_t level, const char *tag, const char *file, const char *f
/* keyword filter */ /* keyword filter */
if (!strstr(log_buf, elog.filter.keyword)) { if (!strstr(log_buf, elog.filter.keyword)) {
//TODO 可以考虑采用KMP及朴素模式匹配字符串提升性能 //TODO 可以考虑采用KMP及朴素模式匹配字符串提升性能
/* unlock output */ /* unlock output */
elog_output_unlock(); elog_output_unlock();
return; return;
@ -510,7 +510,7 @@ void elog_output(uint8_t level, const char *tag, const char *file, const char *f
} else { } else {
log_len = ELOG_LINE_BUF_SIZE; log_len = ELOG_LINE_BUF_SIZE;
/* copy newline sign */ /* copy newline sign */
strcpy(log_buf + ELOG_LINE_BUF_SIZE - newline_len, ELOG_NEWLINE_SIGN); strcpy(log_buf + ELOG_LINE_BUF_SIZE - (newline_len + 1), ELOG_NEWLINE_SIGN);
} }
/* output log */ /* output log */
#if defined(ELOG_ASYNC_OUTPUT_ENABLE) #if defined(ELOG_ASYNC_OUTPUT_ENABLE)

Loading…
Cancel
Save