ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2024-10-30 11:29:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

test: more for logging.

Browse Source
This commit is contained in:
Leo Yuriev 2017-04-21 18:34:43 +03:00
parent 2523170806
commit 101e015d2c
2 changed files with 84 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
test/log.cc
View File

@ -55,8 +55,12 @@ const char *level2str(const loglevel level) {
switch (level) {
default:
return "invalid/unknown";
case extra:
return "extra";
case trace:
return "trace";
case verbose:
return "verbose";
case info:
return "info";
case notice:
@ -70,11 +74,29 @@ const char *level2str(const loglevel level) {
}
}
void output(loglevel priority, const char *format, va_list ap) {
if (priority >= level) {
bool output(loglevel priority, const char *format, ...) {
if (priority < level)
return false;
va_list ap;
va_start(ap, format);
output(priority, format, ap);
va_end(ap);
return true;
}
bool output(loglevel priority, const char *format, va_list ap) {
if (last) {
putc('\n', last);
last = nullptr;
}
if (priority < level)
return false;
last = (priority >= error) ? stderr : stdout;
fprintf(last, "[ %u %-10s %6s ] %s" /* TODO */, osal_getpid(),
prefix.c_str(), level2str(priority), suffix.c_str());
fprintf(last, "[ %u%10s %.4s ] %s" /* TODO */, osal_getpid(), prefix.c_str(),
level2str(priority), suffix.c_str());
vfprintf(last, format, ap);
size_t len = strlen(format);
@ -85,7 +107,7 @@ void output(loglevel priority, const char *format, va_list ap) {
case '\n':
if (priority > info)
fflushall();
break;
last = nullptr;
case ' ':
case '_':
case ':':
@ -95,23 +117,31 @@ void output(loglevel priority, const char *format, va_list ap) {
case '\b':
case '\r':
case '\0':
return;
break;
}
}
last = nullptr;
return true;
}
void feed(const char *format, ...) {
if (last) {
va_list ap;
va_start(ap, format);
vfprintf(last, format, ap);
va_end(ap);
bool feed(const char *format, va_list ap) {
if (!last)
return false;
vfprintf(last, format, ap);
size_t len = strlen(format);
if (len && format[len - 1] == '\n')
last = nullptr;
}
return true;
}
bool feed(const char *format, ...) {
if (!last)
return false;
va_list ap;
va_start(ap, format);
feed(format, ap);
va_end(ap);
return true;
}
local_suffix::local_suffix(const char *c_str)
@ -151,6 +181,16 @@ void log_trace(const char *msg, ...) {
logging::last = nullptr;
}
void log_verbose(const char *msg, ...) {
if (logging::verbose >= logging::level) {
va_list ap;
va_start(ap, msg);
logging::output(logging::verbose, msg, ap);
va_end(ap);
} else
logging::last = nullptr;
}
void log_info(const char *msg, ...) {
if (logging::info >= logging::level) {
va_list ap;

9
test/log.h
View File

@ -33,7 +33,9 @@ const char *test_strerror(int errnum);
namespace logging {
enum loglevel {
extra,
trace,
verbose,
info,
notice,
warning,
@ -45,8 +47,10 @@ const char *level2str(const loglevel level);
void setup(loglevel level, const std::string &prefix);
void setup(const std::string &prefix);
void output(loglevel priority, const char *format, va_list ap);
void __printf_args(1, 2) feed(const char *format, ...);
bool output(loglevel priority, const char *format, va_list ap);
bool __printf_args(2, 3) output(loglevel priority, const char *format, ...);
bool feed(const char *format, va_list ap);
bool __printf_args(1, 2) feed(const char *format, ...);
class local_suffix {
protected:
@ -68,6 +72,7 @@ public:
} /* namespace log */
void __printf_args(1, 2) log_trace(const char *msg, ...);
void __printf_args(1, 2) log_verbose(const char *msg, ...);
void __printf_args(1, 2) log_info(const char *msg, ...);
void __printf_args(1, 2) log_notice(const char *msg, ...);
void __printf_args(1, 2) log_warning(const char *msg, ...);