caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Expose log_always that will be displayed disregarding quite flag

Browse Source
This commit is contained in:
Miodrag Milanovic 2018-08-09 13:35:18 +02:00
parent 6b6a0c6d3c
commit 0696d62358
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
common/log.cc
View File

@ -30,8 +30,6 @@
NEXTPNR_NAMESPACE_BEGIN NEXTPNR_NAMESPACE_BEGIN
void log_internal(const char *format, ...) NPNR_ATTRIBUTE(format(printf, 1, 2));
std::vector<FILE *> log_files; std::vector<FILE *> log_files;
std::vector<std::ostream *> log_streams; std::vector<std::ostream *> log_streams;
FILE *log_errfile = NULL; FILE *log_errfile = NULL;
@ -81,7 +79,7 @@ void logv(const char *format, va_list ap)
// //
// Trim newlines from the beginning // Trim newlines from the beginning
while (format[0] == '\n' && format[1] != 0) { while (format[0] == '\n' && format[1] != 0) {
log_internal("\n"); log_always("\n");
format++; format++;
} }
@ -109,7 +107,7 @@ void logv_info(const char *format, va_list ap)
{ {
std::string message = vstringf(format, ap); std::string message = vstringf(format, ap);
log_internal("Info: %s", message.c_str()); log_always("Info: %s", message.c_str());
log_flush(); log_flush();
} }
@ -117,7 +115,7 @@ void logv_warning(const char *format, va_list ap)
{ {
std::string message = vstringf(format, ap); std::string message = vstringf(format, ap);
log_internal("Warning: %s", message.c_str()); log_always("Warning: %s", message.c_str());
log_flush(); log_flush();
} }
@ -125,7 +123,7 @@ void logv_warning_noprefix(const char *format, va_list ap)
{ {
std::string message = vstringf(format, ap); std::string message = vstringf(format, ap);
log_internal("%s", message.c_str()); log_always("%s", message.c_str());
} }
void logv_error(const char *format, va_list ap) void logv_error(const char *format, va_list ap)
@ -143,7 +141,7 @@ void logv_error(const char *format, va_list ap)
f = stderr; f = stderr;
log_last_error = vstringf(format, ap); log_last_error = vstringf(format, ap);
log_internal("ERROR: %s", log_last_error.c_str()); log_always("ERROR: %s", log_last_error.c_str());
log_flush(); log_flush();
if (log_error_atexit) if (log_error_atexit)
@ -155,7 +153,7 @@ void logv_error(const char *format, va_list ap)
throw log_execution_error_exception(); throw log_execution_error_exception();
} }
void log_internal(const char *format, ...) void log_always(const char *format, ...)
{ {
va_list ap; va_list ap;
va_start(ap, format); va_start(ap, format);
@ -213,7 +211,7 @@ void log_cmd_error(const char *format, ...)
if (log_cmd_error_throw) { if (log_cmd_error_throw) {
log_last_error = vstringf(format, ap); log_last_error = vstringf(format, ap);
log_internal("ERROR: %s", log_last_error.c_str()); log_always("ERROR: %s", log_last_error.c_str());
log_flush(); log_flush();
throw log_cmd_error_exception(); throw log_cmd_error_exception();
} }
@ -225,9 +223,9 @@ void log_break()
{ {
if (log_quiet_warnings) return; if (log_quiet_warnings) return;
if (log_newline_count < 2) if (log_newline_count < 2)
log_internal("\n"); log_always("\n");
if (log_newline_count < 2) if (log_newline_count < 2)
log_internal("\n"); log_always("\n");
} }
void log_flush() void log_flush()

2
common/log.h
View File

@ -53,7 +53,7 @@ extern void (*log_error_atexit)();
extern std::ostream clog; extern std::ostream clog;
void log(const char *format, ...) NPNR_ATTRIBUTE(format(printf, 1, 2)); void log(const char *format, ...) NPNR_ATTRIBUTE(format(printf, 1, 2));
void log_header(const char *format, ...) NPNR_ATTRIBUTE(format(printf, 1, 2)); void log_always(const char *format, ...) NPNR_ATTRIBUTE(format(printf, 1, 2));
void log_info(const char *format, ...) NPNR_ATTRIBUTE(format(printf, 1, 2)); void log_info(const char *format, ...) NPNR_ATTRIBUTE(format(printf, 1, 2));
void log_warning(const char *format, ...) NPNR_ATTRIBUTE(format(printf, 1, 2)); void log_warning(const char *format, ...) NPNR_ATTRIBUTE(format(printf, 1, 2));
void log_warning_noprefix(const char *format, ...) NPNR_ATTRIBUTE(format(printf, 1, 2)); void log_warning_noprefix(const char *format, ...) NPNR_ATTRIBUTE(format(printf, 1, 2));