added verbosity_DEBUG to loguru

Alexey Pleshakov · Alexey Pleshakov · commit 5c5a14b6a454 · 2021-10-22T19:21:45.000+03:00
diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
@@ -42,14 +42,18 @@ SET(GCC_COVERAGE_LINK_FLAGS "-lpthread -ldl")
 SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${GCC_COVERAGE_LINK_FLAGS}")
 
 get_filename_component(UTBOT_DIR ${PROJECT_SOURCE_DIR} DIRECTORY)
+
 set(LOGGER_DIR "${UTBOT_DIR}/loguru")
-add_library(loguru ${LOGGER_DIR}/loguru.cpp)
-include_directories(${LOGGER_DIR})
+set(LOGGER_AUX_DIR "${PROJECT_SOURCE_DIR}/logger-aux")
+add_library(loguru ${LOGGER_DIR}/loguru.cpp ${LOGGER_AUX_DIR}/loguru_debug.cpp)
+target_include_directories(loguru PUBLIC ${LOGGER_DIR})
+include_directories(${LOGGER_AUX_DIR})
 
 set(JSON_PATH "${UTBOT_DIR}/json")
 include_directories(${JSON_PATH}/src)
 
 set(TSL_PATH "${UTBOT_DIR}/ordered-map")
+message("tsl include from here: ${TSL_PATH}/include")
 include_directories(${TSL_PATH}/include)
 
 set(PARALLEL_HASHMAP_PATH "${UTBOT_DIR}/parallel-hashmap")
diff --git a/server/logger-aux/loguru.h b/server/logger-aux/loguru.h
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) Huawei Technologies Co., Ltd. 2012-2021. All rights reserved.
+ */
+
+#ifndef UNITTESTBOT_LOGURU_H
+#define UNITTESTBOT_LOGURU_H
+#include "loguru.hpp"
+
+namespace loguru {
+    extern Verbosity Verbosity_DEBUG;
+}
+#endif //UNITTESTBOT_LOGURU_H
diff --git a/server/logger-aux/loguru_debug.cpp b/server/logger-aux/loguru_debug.cpp
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) Huawei Technologies Co., Ltd. 2012-2021. All rights reserved.
+ */
+
+#include "loguru.hpp"
+
+namespace loguru {
+    Verbosity Verbosity_DEBUG = Verbosity_1;
+}
diff --git a/server/main.cpp b/server/main.cpp
@@ -5,7 +5,7 @@
 #include "Server.h"
 #include "utils/CLIUtils.h"
 
-#include "loguru.hpp"
+#include "loguru.h"
 
 #include <cstdlib>
 
diff --git a/server/src/FeaturesFilter.cpp b/server/src/FeaturesFilter.cpp
@@ -8,7 +8,7 @@
 #include "clang-utils/ClangUtils.h"
 #include "exceptions/NoTestGeneratedException.h"
 
-#include "loguru.hpp"
+#include "loguru.h"
 
 static void updateIfNotCompleteType(types::TypeSupport &typeSupport,
                                     bool condition,
diff --git a/server/src/GTestLogger.cpp b/server/src/GTestLogger.cpp
@@ -4,7 +4,7 @@
 
 #include "GTestLogger.h"
 
-#include "loguru.hpp"
+#include "loguru.h"
 
 void GTestLogger::log(std::string_view message) {
     LOG_S(INFO) << message;
diff --git a/server/src/KleeGenerator.cpp b/server/src/KleeGenerator.cpp
@@ -16,7 +16,7 @@
 #include "utils/MakefileUtils.h"
 #include "utils/SanitizerUtils.h"
 
-#include "loguru.hpp"
+#include "loguru.h"
 
 using namespace tests;
 
diff --git a/server/src/KleeRunner.cpp b/server/src/KleeRunner.cpp
@@ -13,7 +13,7 @@
 #include "utils/KleeUtils.h"
 #include "utils/LogUtils.h"
 
-#include "loguru.hpp"
+#include "loguru.h"
 
 #include <unistd.h>
 #include <utility>
diff --git a/server/src/Paths.h b/server/src/Paths.h
@@ -5,7 +5,7 @@
 #ifndef UNITTESTBOT_PATHS_H
 #define UNITTESTBOT_PATHS_H
 
-#include "loguru.hpp"
+#include "loguru.h"
 
 #include "Language.h"
 #include "ProjectContext.h"
diff --git a/server/src/Server.cpp b/server/src/Server.cpp
@@ -320,7 +320,10 @@ void Server::logToClient(void *channel, const loguru::Message &message) {
     if (data == nullptr) {
         throw BaseException("Couldn't handle logging to client, data is null");
     }
-    if (std::string(message.thread_name) == data->client &&
+    vector <char> thread_name(data->client.size());
+    loguru::get_thread_name(thread_name.data(), sizeof(data->client.size()), false);
+
+    if (std::string(thread_name.begin(), thread_name.end()) == data->client &&
         std::string(message.filename) != std::string(GTestLogger::fileName())) {
         LogEntry logEntry;
         std::string extractedMessage = extractMessage(message);
@@ -335,7 +338,10 @@ void Server::gtestLog(void *channel, const loguru::Message &message) {
     if (data == nullptr) {
         throw BaseException("Can't interpret gtest log channel");
     }
-    if (std::string(message.thread_name) == data->client &&
+    vector <char> thread_name(data->client.size());
+    loguru::get_thread_name(thread_name.data(), sizeof(data->client.size()), false);
+
+    if (std::string(thread_name.begin(), thread_name.end()) == data->client &&
         std::string(message.filename) == std::string(GTestLogger::fileName())) {
         LogEntry logEntry;
         logEntry.set_message(message.message);
@@ -366,9 +372,9 @@ Status Server::TestsGenServiceImpl::provideLoggingCallbacks(
         loguru::add_callback(callbackName.c_str(), handler, &data,
                              loguru::get_verbosity_from_name(logLevel.c_str()));
         if (openFiles) {
-            loguru::add_file(allLogPath.c_str(), client.c_str(), loguru::Append,
+            loguru::add_file(allLogPath.c_str(), loguru::Append,
                              loguru::Verbosity_MAX);
-            loguru::add_file(latestLogPath.c_str(), client.c_str(), loguru::Truncate,
+            loguru::add_file(latestLogPath.c_str(), loguru::Truncate,
                              loguru::Verbosity_INFO);
         }
         holdLockFlag[callbackName] = true;
diff --git a/server/src/StmtBordersFinder.cpp b/server/src/StmtBordersFinder.cpp
@@ -10,7 +10,7 @@
 #include "utils/CollectionUtils.h"
 #include "utils/CompilationUtils.h"
 
-#include "loguru.hpp"
+#include "loguru.h"
 
 using namespace clang;
 using namespace llvm;
diff --git a/server/src/TimeExecStatistics.cpp b/server/src/TimeExecStatistics.cpp
@@ -7,7 +7,7 @@
 #include "utils/CollectionUtils.h"
 #include "utils/StringUtils.h"
 
-#include "loguru.hpp"
+#include "loguru.h"
 
 #include <utility>
 
diff --git a/server/src/building/BaseCommand.cpp b/server/src/building/BaseCommand.cpp
@@ -12,7 +12,7 @@
 #include "utils/CollectionUtils.h"
 #include "utils/StringUtils.h"
 
-#include "loguru.hpp"
+#include "loguru.h"
 
 #include <algorithm>
 #include "utils/path/FileSystemPath.h"
diff --git a/server/src/building/BuildDatabase.cpp b/server/src/building/BuildDatabase.cpp
@@ -13,7 +13,7 @@
 #include "utils/JsonUtils.h"
 #include "utils/StringUtils.h"
 
-#include "loguru.hpp"
+#include "loguru.h"
 
 #include <functional>
 #include <queue>
diff --git a/server/src/building/CompileCommand.cpp b/server/src/building/CompileCommand.cpp
@@ -9,7 +9,7 @@
 #include "printers/CCJsonPrinter.h"
 #include "utils/StringUtils.h"
 
-#include "loguru.hpp"
+#include "loguru.h"
 
 #include <algorithm>
 #include <iterator>
diff --git a/server/src/building/IRParser.cpp b/server/src/building/IRParser.cpp
@@ -6,7 +6,7 @@
 
 #include "utils/KleeUtils.h"
 
-#include "loguru.hpp"
+#include "loguru.h"
 
 #include <llvm/BinaryFormat/Magic.h>
 #include <llvm/IR/DebugInfoMetadata.h>
diff --git a/server/src/building/UserProjectConfiguration.cpp b/server/src/building/UserProjectConfiguration.cpp
@@ -14,7 +14,7 @@
 #include "utils/MakefileUtils.h"
 #include "utils/StringUtils.h"
 
-#include "loguru.hpp"
+#include "loguru.h"
 
 Status UserProjectConfiguration::CheckProjectConfiguration(const fs::path &buildDirPath,
                                                            ProjectConfigWriter const &writer) {
diff --git a/server/src/clang-utils/SourceToHeaderRewriter.cpp b/server/src/clang-utils/SourceToHeaderRewriter.cpp
@@ -10,7 +10,7 @@
 #include "utils/Copyright.h"
 #include "utils/LogUtils.h"
 
-#include "loguru.hpp"
+#include "loguru.h"
 
 #include <utility>
 
diff --git a/server/src/commands/Commands.cpp b/server/src/commands/Commands.cpp
@@ -67,7 +67,7 @@ unsigned int Commands::ServerCommandOptions::getThreadsPerUser() {
 
 const std::map<std::string, loguru::NamedVerbosity> Commands::ServerCommandOptions::verbosityMap = {
     { "trace", loguru::NamedVerbosity::Verbosity_MAX },
-    { "debug", loguru::NamedVerbosity::Verbosity_DEBUG },
+    { "debug", loguru::NamedVerbosity::Verbosity_1 },
     { "info", loguru::NamedVerbosity::Verbosity_INFO },
     { "warning", loguru::NamedVerbosity::Verbosity_WARNING },
     { "error", loguru::NamedVerbosity::Verbosity_ERROR }
diff --git a/server/src/commands/Commands.h b/server/src/commands/Commands.h
@@ -7,7 +7,7 @@
 
 #include "Paths.h"
 
-#include "loguru.hpp"
+#include "loguru.h"
 
 #include <protobuf/testgen.grpc.pb.h>
 
diff --git a/server/src/coverage/CoverageAndResultsGenerator.cpp b/server/src/coverage/CoverageAndResultsGenerator.cpp
@@ -8,7 +8,7 @@
 #include "exceptions/CoverageGenerationException.h"
 #include "utils/StringUtils.h"
 
-#include "loguru.hpp"
+#include "loguru.h"
 
 using grpc::Status;
 using grpc::StatusCode;
diff --git a/server/src/coverage/GcovCoverageTool.cpp b/server/src/coverage/GcovCoverageTool.cpp
@@ -17,7 +17,7 @@
 #include "utils/MakefileUtils.h"
 #include "utils/StringUtils.h"
 
-#include "loguru.hpp"
+#include "loguru.h"
 
 #include "json.hpp"
 
diff --git a/server/src/coverage/LlvmCoverageTool.cpp b/server/src/coverage/LlvmCoverageTool.cpp
@@ -16,7 +16,7 @@
 #include "utils/MakefileUtils.h"
 #include "utils/StringUtils.h"
 
-#include "loguru.hpp"
+#include "loguru.h"
 
 #include "utils/path/FileSystemPath.h"
 
diff --git a/server/src/coverage/TestRunner.cpp b/server/src/coverage/TestRunner.cpp
@@ -10,7 +10,7 @@
 #include "utils/FileSystemUtils.h"
 #include "utils/StringUtils.h"
 
-#include "loguru.hpp"
+#include "loguru.h"
 
 using grpc::ServerWriter;
 using grpc::Status;
diff --git a/server/src/fetchers/ArraySubscriptFetcherMatchCallback.cpp b/server/src/fetchers/ArraySubscriptFetcherMatchCallback.cpp
@@ -8,7 +8,7 @@
 #include "clang-utils/Matchers.h"
 #include "utils/CollectionUtils.h"
 
-#include "loguru.hpp"
+#include "loguru.h"
 
 #include "utils/path/FileSystemPath.h"
 
diff --git a/server/src/fetchers/Fetcher.cpp b/server/src/fetchers/Fetcher.cpp
@@ -14,7 +14,7 @@
 #include "TypeDeclsMatchCallback.h"
 #include "clang-utils/SourceToHeaderMatchCallback.h"
 
-#include "loguru.hpp"
+#include "loguru.h"
 
 #include "utils/path/FileSystemPath.h"
 #include <memory>
diff --git a/server/src/fetchers/FetcherUtils.h b/server/src/fetchers/FetcherUtils.h
@@ -9,7 +9,7 @@
 #include "Tests.h"
 #include "utils/CollectionUtils.h"
 #include "TimeExecStatistics.h"
-#include "loguru.hpp"
+#include "loguru.h"
 
 #include <clang/Tooling/Tooling.h>
 
diff --git a/server/src/fetchers/GlobalVariableUsageMatchCallback.cpp b/server/src/fetchers/GlobalVariableUsageMatchCallback.cpp
@@ -8,7 +8,7 @@
 #include "clang-utils/ClangUtils.h"
 #include "clang-utils/Matchers.h"
 
-#include "loguru.hpp"
+#include "loguru.h"
 
 #include <utility>
 
diff --git a/server/src/fetchers/IncludeFetchSourceFileCallback.cpp b/server/src/fetchers/IncludeFetchSourceFileCallback.cpp
@@ -8,7 +8,7 @@
 #include "utils/ExecUtils.h"
 #include "utils/LogUtils.h"
 
-#include "loguru.hpp"
+#include "loguru.h"
 
 #include <clang/Frontend/CompilerInstance.h>
 
diff --git a/server/src/fetchers/TypeDeclsMatchCallback.h b/server/src/fetchers/TypeDeclsMatchCallback.h
@@ -7,7 +7,7 @@
 
 #include "types/TypesResolver.h"
 
-#include "loguru.hpp"
+#include "loguru.h"
 
 #include <clang/ASTMatchers/ASTMatchFinder.h>
 
diff --git a/server/src/printers/KleePrinter.cpp b/server/src/printers/KleePrinter.cpp
@@ -15,7 +15,7 @@
 #include "visitors/KleeAssumeParamVisitor.h"
 #include "visitors/KleeAssumeReturnValueVisitor.h"
 
-#include "loguru.hpp"
+#include "loguru.h"
 
 #include <unordered_set>
 
diff --git a/server/src/printers/Printer.cpp b/server/src/printers/Printer.cpp
@@ -10,7 +10,7 @@
 #include "utils/Copyright.h"
 #include "visitors/VerboseParameterVisitor.h"
 
-#include "loguru.hpp"
+#include "loguru.h"
 
 namespace printer {
     using StringUtils::stringFormat;
diff --git a/server/src/printers/Printer.h b/server/src/printers/Printer.h
@@ -12,7 +12,7 @@
 #include "stubs/Stubs.h"
 #include "types/Types.h"
 
-#include "loguru.hpp"
+#include "loguru.h"
 
 #include <cstdio>
 #include "utils/path/FileSystemPath.h"
diff --git a/server/src/printers/TestsPrinter.h b/server/src/printers/TestsPrinter.h
@@ -13,7 +13,7 @@
 #include "types/Types.h"
 #include "utils/PrinterUtils.h"
 
-#include "loguru.hpp"
+#include "loguru.h"
 
 #include <cstdio>
 #include "utils/path/FileSystemPath.h"
diff --git a/server/src/streams/coverage/CLICoverageAndResultsWriter.cpp b/server/src/streams/coverage/CLICoverageAndResultsWriter.cpp
@@ -5,7 +5,7 @@
 
 #include "CLICoverageAndResultsWriter.h"
 
-#include "loguru.hpp"
+#include "loguru.h"
 
 #include <fstream>
 #include <utils/FileSystemUtils.h>
diff --git a/server/src/streams/coverage/ServerCoverageAndResultsWriter.cpp b/server/src/streams/coverage/ServerCoverageAndResultsWriter.cpp
@@ -7,7 +7,7 @@
 
 #include "../WriterUtils.h"
 
-#include "loguru.hpp"
+#include "loguru.h"
 
 ServerCoverageAndResultsWriter::ServerCoverageAndResultsWriter(
     grpc::ServerWriter<testsgen::CoverageAndResultsResponse> *writer)
diff --git a/server/src/streams/stubs/CLIStubsWriter.cpp b/server/src/streams/stubs/CLIStubsWriter.cpp
@@ -5,7 +5,7 @@
 #include "CLIStubsWriter.h"
 
 #include <utils/FileSystemUtils.h>
-#include "loguru.hpp"
+#include "loguru.h"
 
 void CLIStubsWriter::writeResponse(const vector<Stubs> &synchronizedStubs,
                                    const fs::path &testDirPath) {
diff --git a/server/src/streams/stubs/ServerStubsWriter.cpp b/server/src/streams/stubs/ServerStubsWriter.cpp
@@ -4,7 +4,7 @@
 
 #include "ServerStubsWriter.h"
 
-#include "loguru.hpp"
+#include "loguru.h"
 
 void ServerStubsWriter::writeResponse(const vector<Stubs> &synchronizedStubs,
                                       const fs::path &testDirPath) {
diff --git a/server/src/streams/stubs/StubsWriter.cpp b/server/src/streams/stubs/StubsWriter.cpp
@@ -8,7 +8,7 @@
 #include "stubs/StubGen.h"
 #include "utils/FileSystemUtils.h"
 
-#include "loguru.hpp"
+#include "loguru.h"
 
 StubsWriter::StubsWriter(grpc::ServerWriter<testsgen::StubsResponse> *writer) : ServerWriter(writer) {
 }
diff --git a/server/src/streams/tests/CLITestsWriter.cpp b/server/src/streams/tests/CLITestsWriter.cpp
diff --git a/server/src/streams/tests/ServerTestsWriter.h b/server/src/streams/tests/ServerTestsWriter.h
diff --git a/server/src/streams/tests/TestsWriter.cpp b/server/src/streams/tests/TestsWriter.cpp
diff --git a/server/src/stubs/StubSourcesFinder.cpp b/server/src/stubs/StubSourcesFinder.cpp
diff --git a/server/src/tasks/BaseForkTask.h b/server/src/tasks/BaseForkTask.h
diff --git a/server/src/types/Types.cpp b/server/src/types/Types.cpp
diff --git a/server/src/utils/ArgumentsUtils.cpp b/server/src/utils/ArgumentsUtils.cpp
diff --git a/server/src/utils/CLIUtils.cpp b/server/src/utils/CLIUtils.cpp
diff --git a/server/src/utils/CLIUtils.h b/server/src/utils/CLIUtils.h
diff --git a/server/src/utils/CPipe.cpp b/server/src/utils/CPipe.cpp
diff --git a/server/src/utils/CompilationUtils.cpp b/server/src/utils/CompilationUtils.cpp
diff --git a/server/src/utils/JsonUtils.cpp b/server/src/utils/JsonUtils.cpp
diff --git a/server/src/utils/KleeUtils.cpp b/server/src/utils/KleeUtils.cpp
diff --git a/server/src/utils/LogUtils.cpp b/server/src/utils/LogUtils.cpp
diff --git a/server/src/utils/MakefileUtils.cpp b/server/src/utils/MakefileUtils.cpp
diff --git a/server/src/utils/PrinterUtils.cpp b/server/src/utils/PrinterUtils.cpp
diff --git a/server/src/utils/ServerUtils.cpp b/server/src/utils/ServerUtils.cpp
diff --git a/server/test/framework/main.cpp b/server/test/framework/main.cpp
