luke/yosys
1
0
Fork 0
mirror of https://github.com/YosysHQ/yosys.git synced 2026-09-07 12:21:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

log: make initial time as before and some cleanup

Browse Source
This commit is contained in:
Miodrag Milanovic
2026-08-19 17:25:13 +02:00
parent 2e113f5eff
commit 3bd81c2bd2
2 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel/log.cc
+20 -10
View File
@@ -44,6 +44,12 @@ LogManager &logger()
return instance;
}
std::chrono::steady_clock::time_point LogManager::get_initial_time() const
{
static const auto initial_time = std::chrono::steady_clock::now();
return initial_time;
}
void (*log_error_atexit)() = NULL;
void (*log_verific_callback)(int msg_type, const char *message_id, const char* file_path, unsigned int left_line, unsigned int left_col, unsigned int right_line, unsigned int right_col, const char *msg) = NULL;
@@ -184,7 +190,11 @@ void LogManager::logv_string(std::string_view prefix, std::string_view format, s
log_hasher->update(str);
auto msg = LogMessage(severity, prefix, format, str_in);
log(msg);
for (auto &sink : log_sinks) {
if (sink->should_log(msg))
sink->log(msg);
}
static std::string linebuffer;
static bool log_warn_regex_recusion_guard = false;
@@ -253,12 +263,12 @@ void LogManager::log_formatted_header(RTLIL::Design *design, std::string_view fo
if (log_hdump.count(header_id) && design != nullptr)
for (auto &filename : log_hdump.at(header_id)) {
YOSYS_NAMESPACE_PREFIX log("Dumping current design to '%s'.\n", filename);
log("Dumping current design to '%s'.\n", filename);
if (yosys_xtrace)
IdString::xtrace_db_dump();
Pass::call(design, {"dump", "-o", filename});
if (yosys_xtrace)
YOSYS_NAMESPACE_PREFIX log("#X# -- end of dump --\n");
log("#X# -- end of dump --\n");
}
log_stderr_force = false;
}
@@ -275,7 +285,7 @@ void LogManager::log_formatted_warning(std::string_view prefix, std::string mess
if (suppressed)
{
YOSYS_NAMESPACE_PREFIX log("Suppressed %s%s", prefix, message);
log("Suppressed %s%s", prefix, message);
}
else
{
@@ -326,7 +336,7 @@ void LogManager::log_formatted_file_warning(std::string_view filename, int linen
void LogManager::log_formatted_file_info(std::string_view filename, int lineno, std::string str)
{
YOSYS_NAMESPACE_PREFIX log("%s:%d: Info: %s", filename, lineno, str);
log("%s:%d: Info: %s", filename, lineno, str);
}
void LogManager::log_suppressed() {
@@ -422,8 +432,8 @@ void LogManager::log_formatted_cmd_error(std::string message)
void LogManager::log_spacer()
{
if (log_newline_count < 2) YOSYS_NAMESPACE_PREFIX log("\n");
if (log_newline_count < 2) YOSYS_NAMESPACE_PREFIX log("\n");
if (log_newline_count < 2) log("\n");
if (log_newline_count < 2) log("\n");
}
void LogManager::log_push()
@@ -635,7 +645,7 @@ void LogManager::check_expected()
auto check_err = [&](const std::string kind, std::string pattern, LogExpectedItem item) {
if (item.current_count == item.expected_count) {
log_warn_regexes.clear();
YOSYS_NAMESPACE_PREFIX log("Expected %s pattern '%s' found !!!\n", kind, pattern);
log("Expected %s pattern '%s' found !!!\n", kind, pattern);
yosys_shutdown();
#if defined(_MSC_VER)
_exit(0);
@@ -664,10 +674,10 @@ void LogManager::report_unexpected_error()
void LogManager::report_warning_stats()
{
if (log_warnings_count)
YOSYS_NAMESPACE_PREFIX log("Warnings: %d unique messages, %d total\n", GetSize(log_warnings), log_warnings_count);
log("Warnings: %d unique messages, %d total\n", GetSize(log_warnings), log_warnings_count);
if (!log_experimentals.empty())
YOSYS_NAMESPACE_PREFIX log("Warnings: %d experimental features used (not excluded with -x).\n", GetSize(log_experimentals));
log("Warnings: %d experimental features used (not excluded with -x).\n", GetSize(log_experimentals));
}
void LogManager::add_expect(std::string type, std::string pattern, int count)
kernel/log.h
+1 -10
View File
@@ -219,14 +219,6 @@ public:
func(*sink);
}
void log(const LogMessage &msg)
{
for (auto &sink : log_sinks) {
if (sink->should_log(msg))
sink->log(msg);
}
}
bool empty() { return log_sinks.empty(); }
void clear() { log_sinks.clear(); }
void flush() { for (auto &sink : log_sinks) sink->flush(); }
@@ -404,7 +396,7 @@ public:
bool get_error_stderr() const { return log_error_stderr; }
bool get_quiet_warnings() const { return log_quiet_warnings; }
bool get_stderr_force() const { return log_stderr_force; }
std::chrono::steady_clock::time_point get_initial_time() const { return initial_time; }
std::chrono::steady_clock::time_point get_initial_time() const;
void add_hdump(std::string name, std::string value) { log_hdump[name].insert(value); }
@@ -438,7 +430,6 @@ private:
void logv_string(std::string_view prefix, std::string_view format, std::string str_in, LogSeverity severity);
[[noreturn]] void log_error_with_prefix(std::string_view prefix, std::string message);
std::chrono::steady_clock::time_point initial_time = std::chrono::steady_clock::now();
std::vector<std::unique_ptr<LogSink>> log_sinks;
int log_verbose_level = 0;
int log_newline_count = 0;