matthias/clang-uml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactored verbosity option to counter (none), -v, -vv, -vvv (trace)

Browse Source
This commit is contained in:
Bartek Kryza
2022-12-11 23:08:53 +01:00
parent c7b80297d7
commit 452271fd45
5 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main.cc
View File

@@ -60,7 +60,7 @@ int main(int argc, const char *argv[])
std::optional<std::string> output_directory; std::optional<std::string> output_directory;
unsigned int thread_count{0}; unsigned int thread_count{0};
bool show_version{false}; bool show_version{false};
bool verbose{false}; int verbose{0};
bool list_diagrams{false}; bool list_diagrams{false};
app.add_option( app.add_option(

12
src/sequence_diagram/model/diagram.cc
View File

@@ -265,19 +265,19 @@ diagram::active_participants() const
void diagram::print() const void diagram::print() const
{ {
LOG_DBG(" --- Participants ---"); LOG_TRACE(" --- Participants ---");
for (const auto &[id, participant] : participants_) { for (const auto &[id, participant] : participants_) {
LOG_DBG("{} - {}", id, participant->to_string()); LOG_DBG("{} - {}", id, participant->to_string());
} }
LOG_DBG(" --- Activities ---"); LOG_TRACE(" --- Activities ---");
for (const auto &[from_id, act] : sequences_) { for (const auto &[from_id, act] : sequences_) {
LOG_DBG("Sequence id={}:", from_id); LOG_TRACE("Sequence id={}:", from_id);
const auto &from_activity = *(participants_.at(from_id)); const auto &from_activity = *(participants_.at(from_id));
LOG_DBG(" Activity id={}, from={}:", act.from(), LOG_TRACE(" Activity id={}, from={}:", act.from(),
from_activity.full_name(false)); from_activity.full_name(false));
for (const auto &message : act.messages()) { for (const auto &message : act.messages()) {
@@ -287,7 +287,7 @@ void diagram::print() const
const auto &from_participant = *participants_.at(message.from()); const auto &from_participant = *participants_.at(message.from());
if (participants_.find(message.to()) == participants_.end()) { if (participants_.find(message.to()) == participants_.end()) {
LOG_DBG(" Message from={}, from_id={}, " LOG_TRACE(" Message from={}, from_id={}, "
"to={}, to_id={}, name={}, type={}", "to={}, to_id={}, name={}, type={}",
from_participant.full_name(false), from_participant.id(), from_participant.full_name(false), from_participant.id(),
"__UNRESOLVABLE_ID__", message.to(), message.message_name(), "__UNRESOLVABLE_ID__", message.to(), message.message_name(),
@@ -296,7 +296,7 @@ void diagram::print() const
else { else {
const auto &to_participant = *participants_.at(message.to()); const auto &to_participant = *participants_.at(message.to());
LOG_DBG(" Message from={}, from_id={}, " LOG_TRACE(" Message from={}, from_id={}, "
"to={}, to_id={}, name={}, type={}", "to={}, to_id={}, name={}, type={}",
from_participant.full_name(false), from_participant.id(), from_participant.full_name(false), from_participant.id(),
to_participant.full_name(false), to_participant.id(), to_participant.full_name(false), to_participant.id(),

30
src/sequence_diagram/visitor/translation_unit_visitor.cc
View File

@@ -173,7 +173,7 @@ bool translation_unit_visitor::VisitClassTemplateDecl(
if (!diagram().should_include(cls->getQualifiedNameAsString())) if (!diagram().should_include(cls->getQualifiedNameAsString()))
return true; return true;
LOG_DBG("= Visiting class template declaration {} at {} [{}]", LOG_TRACE("Visiting class template declaration {} at {} [{}]",
cls->getQualifiedNameAsString(), cls->getQualifiedNameAsString(),
cls->getLocation().printToString(source_manager()), (void *)cls); cls->getLocation().printToString(source_manager()), (void *)cls);
@@ -222,7 +222,7 @@ bool translation_unit_visitor::VisitClassTemplateSpecializationDecl(
if (!diagram().should_include(cls->getQualifiedNameAsString())) if (!diagram().should_include(cls->getQualifiedNameAsString()))
return true; return true;
LOG_DBG("Visiting template specialization declaration {} at {}", LOG_TRACE("Visiting template specialization declaration {} at {}",
cls->getQualifiedNameAsString(), cls->getQualifiedNameAsString(),
cls->getLocation().printToString(source_manager())); cls->getLocation().printToString(source_manager()));
@@ -275,7 +275,7 @@ bool translation_unit_visitor::VisitCXXMethodDecl(clang::CXXMethodDecl *m)
static_cast<clang::CXXMethodDecl *>(m->getDefinition())); static_cast<clang::CXXMethodDecl *>(m->getDefinition()));
} }
LOG_DBG("Visiting method {} in class {} [{}]", LOG_TRACE("Visiting method {} in class {} [{}]",
m->getQualifiedNameAsString(), m->getQualifiedNameAsString(),
m->getParent()->getQualifiedNameAsString(), (void *)m->getParent()); m->getParent()->getQualifiedNameAsString(), (void *)m->getParent());
@@ -299,7 +299,7 @@ bool translation_unit_visitor::VisitCXXMethodDecl(clang::CXXMethodDecl *m)
LOG_DBG("Getting method's class with local id {}", parent_decl->getID()); LOG_DBG("Getting method's class with local id {}", parent_decl->getID());
if (!get_participant<model::class_>(parent_decl)) { if (!get_participant<model::class_>(parent_decl)) {
LOG_WARN("Cannot find parent class_ for method {} in class {}", LOG_INFO("Cannot find parent class_ for method {} in class {}",
m->getQualifiedNameAsString(), m->getQualifiedNameAsString(),
m->getParent()->getQualifiedNameAsString()); m->getParent()->getQualifiedNameAsString());
return true; return true;
@@ -336,7 +336,7 @@ bool translation_unit_visitor::VisitCXXMethodDecl(clang::CXXMethodDecl *m)
set_unique_id(m->getID(), m_ptr->id()); // This is probably not necessary? set_unique_id(m->getID(), m_ptr->id()); // This is probably not necessary?
LOG_DBG("Set id {} --> {} for method name {} [{}]", m->getID(), m_ptr->id(), LOG_TRACE("Set id {} --> {} for method name {} [{}]", m->getID(), m_ptr->id(),
method_full_name, m->isThisDeclarationADefinition()); method_full_name, m->isThisDeclarationADefinition());
context().update(m); context().update(m);
@@ -364,7 +364,7 @@ bool translation_unit_visitor::VisitFunctionDecl(clang::FunctionDecl *f)
static_cast<clang::FunctionDecl *>(f->getDefinition())); static_cast<clang::FunctionDecl *>(f->getDefinition()));
} }
LOG_DBG("Visiting function declaration {} at {}", function_name, LOG_TRACE("Visiting function declaration {} at {}", function_name,
f->getLocation().printToString(source_manager())); f->getLocation().printToString(source_manager()));
if (f->isTemplated()) { if (f->isTemplated()) {
@@ -441,7 +441,7 @@ bool translation_unit_visitor::VisitFunctionTemplateDecl(
if (!diagram().should_include(function_name)) if (!diagram().should_include(function_name))
return true; return true;
LOG_DBG("Visiting function template declaration {} at {}", function_name, LOG_TRACE("Visiting function template declaration {} at {}", function_name,
function_template->getLocation().printToString(source_manager())); function_template->getLocation().printToString(source_manager()));
auto f_ptr = std::make_unique<sequence_diagram::model::function_template>( auto f_ptr = std::make_unique<sequence_diagram::model::function_template>(
@@ -753,7 +753,7 @@ bool translation_unit_visitor::VisitCallExpr(clang::CallExpr *expr)
if (!context().valid()) if (!context().valid())
return true; return true;
LOG_DBG("Visiting call expression at {} [caller_id = {}]", LOG_TRACE("Visiting call expression at {} [caller_id = {}]",
expr->getBeginLoc().printToString(source_manager()), expr->getBeginLoc().printToString(source_manager()),
context().caller_id()); context().caller_id());
@@ -912,7 +912,7 @@ bool translation_unit_visitor::process_class_method_call_expression(
method_call_expr->getCallReturnType(*context().get_ast_context()) method_call_expr->getCallReturnType(*context().get_ast_context())
.getAsString()); .getAsString());
LOG_DBG("Set callee method id {} for method name {}", m.to(), LOG_TRACE("Set callee method id {} for method name {}", m.to(),
method_decl->getQualifiedNameAsString()); method_decl->getQualifiedNameAsString());
diagram().add_active_participant(method_decl->getID()); diagram().add_active_participant(method_decl->getID());
@@ -1216,7 +1216,7 @@ bool translation_unit_visitor::process_template_parameters(
{ {
using class_diagram::model::template_parameter; using class_diagram::model::template_parameter;
LOG_DBG("Processing class {} template parameters...", LOG_TRACE("Processing class {} template parameters...",
common::get_qualified_name(template_declaration)); common::get_qualified_name(template_declaration));
if (template_declaration.getTemplateParameters() == nullptr) if (template_declaration.getTemplateParameters() == nullptr)
@@ -1275,7 +1275,7 @@ bool translation_unit_visitor::process_template_parameters(
void translation_unit_visitor::set_unique_id( void translation_unit_visitor::set_unique_id(
int64_t local_id, common::model::diagram_element::id_t global_id) int64_t local_id, common::model::diagram_element::id_t global_id)
{ {
LOG_DBG("== Setting local element mapping {} --> {}", local_id, global_id); LOG_TRACE("Setting local element mapping {} --> {}", local_id, global_id);
local_ast_id_map_[local_id] = global_id; local_ast_id_map_[local_id] = global_id;
} }
@@ -1361,7 +1361,7 @@ void translation_unit_visitor::
arg, argument); arg, argument);
} }
else { else {
LOG_ERROR("Unsupported argument type {}", arg.getKind()); LOG_INFO("Unsupported argument type {}", arg.getKind());
} }
simplify_system_template( simplify_system_template(
@@ -1683,7 +1683,7 @@ void translation_unit_visitor::process_template_specialization_argument(
argument.set_name(type_name); argument.set_name(type_name);
} }
LOG_DBG("Adding template instantiation argument {}", LOG_TRACE("Adding template instantiation argument {}",
argument.to_string(config().using_namespace(), false)); argument.to_string(config().using_namespace(), false));
simplify_system_template( simplify_system_template(
@@ -1720,7 +1720,7 @@ void translation_unit_visitor::process_template_specialization_argument(
} }
} }
else { else {
LOG_ERROR("Unsupported template argument kind {} [{}]", arg.getKind(), LOG_INFO("Unsupported template argument kind {} [{}]", arg.getKind(),
cls->getLocation().printToString(source_manager())); cls->getLocation().printToString(source_manager()));
} }
} }
@@ -1897,7 +1897,7 @@ translation_unit_visitor::build_template_instantiation(
destination = best_match_full_name; destination = best_match_full_name;
} }
else { else {
LOG_DBG("== Cannot determine global id for specialization template {} " LOG_DBG("Cannot determine global id for specialization template {} "
"- delaying until the translation unit is complete ", "- delaying until the translation unit is complete ",
templated_decl_id); templated_decl_id);
} }

13
src/util/util.cc
View File

@@ -26,16 +26,25 @@ namespace util {
const std::string WHITESPACE = " \n\r\t\f\v"; const std::string WHITESPACE = " \n\r\t\f\v";
void setup_logging(bool verbose) void setup_logging(int verbose)
{ {
auto console = auto console =
spdlog::stdout_color_mt("console", spdlog::color_mode::automatic); spdlog::stdout_color_mt("console", spdlog::color_mode::automatic);
console->set_pattern("[%^%l%^] [tid %t] %v"); console->set_pattern("[%^%l%^] [tid %t] %v");
if (verbose) { if (verbose == 0) {
console->set_level(spdlog::level::err);
}
else if(verbose == 1) {
console->set_level(spdlog::level::info);
}
else if(verbose == 2) {
console->set_level(spdlog::level::debug); console->set_level(spdlog::level::debug);
} }
else {
console->set_level(spdlog::level::trace);
}
} }
std::string get_process_output(const std::string &command) std::string get_process_output(const std::string &command)

2
src/util/util.h
View File

@@ -62,7 +62,7 @@ std::string trim(const std::string &s);
* *
* @param verbose Whether the logging should be verbose or not. * @param verbose Whether the logging should be verbose or not.
*/ */
void setup_logging(bool verbose); void setup_logging(int verbose);
std::string get_process_output(const std::string &command); std::string get_process_output(const std::string &command);