mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-04-13 04:28:18 +00:00
Code Activity

Added log_spacer()

Browse source
This commit is contained in:
Clifford Wolf 2014-08-16 15:34:00 +02:00
parent 674f421b47
commit dbdf89c705
3 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
kernel/driver.cc
View file

@ -274,7 +274,8 @@ int main(int argc, char **argv)
struct rusage ru_buffer; struct rusage ru_buffer;
getrusage(RUSAGE_SELF, &ru_buffer); getrusage(RUSAGE_SELF, &ru_buffer);
log("\nEnd of script. Logfile hash: %s, CPU: user %.2fs system %.2fs\n", hash.c_str(), log_spacer();
log("End of script. Logfile hash: %s, CPU: user %.2fs system %.2fs\n", hash.c_str(),
ru_buffer.ru_utime.tv_sec + 1e-6 * ru_buffer.ru_utime.tv_usec, ru_buffer.ru_utime.tv_sec + 1e-6 * ru_buffer.ru_utime.tv_usec,
ru_buffer.ru_stime.tv_sec + 1e-6 * ru_buffer.ru_stime.tv_usec); ru_buffer.ru_stime.tv_sec + 1e-6 * ru_buffer.ru_stime.tv_usec);
log("%s\n", yosys_version_str); log("%s\n", yosys_version_str);

18
kernel/log.cc
View file

@ -45,6 +45,7 @@ int string_buf_size = 0;
static struct timeval initial_tv = { 0, 0 }; static struct timeval initial_tv = { 0, 0 };
static bool next_print_log = false; static bool next_print_log = false;
static int log_newline_count = 0;
void logv(const char *format, va_list ap) void logv(const char *format, va_list ap)
{ {
@ -55,6 +56,15 @@ void logv(const char *format, va_list ap)
std::string str = vstringf(format, ap); std::string str = vstringf(format, ap);
if (str.empty())
return;
size_t nnl_pos = str.find_last_not_of('\n');
if (nnl_pos == std::string::npos)
log_newline_count += SIZE(str);
else
log_newline_count = SIZE(str) - nnl_pos - 1;
if (log_hasher) if (log_hasher)
log_hasher->update(str); log_hasher->update(str);
@ -92,7 +102,7 @@ void logv_header(const char *format, va_list ap)
{ {
bool pop_errfile = false; bool pop_errfile = false;
log("\n"); log_spacer();
if (header_count.size() > 0) if (header_count.size() > 0)
header_count.back()++; header_count.back()++;
@ -160,6 +170,12 @@ void log_cmd_error(const char *format, ...)
logv_error(format, ap); logv_error(format, ap);
} }
void log_spacer()
{
while (log_newline_count < 2)
log("\n");
}
void log_push() void log_push()
{ {
header_count.push_back(0); header_count.push_back(0);

1
kernel/log.h
View file

@ -51,6 +51,7 @@ void log_header(const char *format, ...) __attribute__ ((format (printf, 1, 2)))
void log_error(const char *format, ...) __attribute__ ((format (printf, 1, 2))) __attribute__ ((noreturn)); void log_error(const char *format, ...) __attribute__ ((format (printf, 1, 2))) __attribute__ ((noreturn));
void log_cmd_error(const char *format, ...) __attribute__ ((format (printf, 1, 2))) __attribute__ ((noreturn)); void log_cmd_error(const char *format, ...) __attribute__ ((format (printf, 1, 2))) __attribute__ ((noreturn));
void log_spacer();
void log_push(); void log_push();
void log_pop(); void log_pop();