start refactoring

Author: Vladislav Kalugin

server/src/BordersFinder.cpp

@@ -17,7 +17,6 @@ BordersFinder::BordersFinder(const fs::path &filePath,
                              const std::shared_ptr<CompilationDatabase> &compilationDatabase,
                              const fs::path &compileCommandsJsonPath)
         : line(line), classBorder(std::nullopt), clangToolRunner(compilationDatabase) {
-//    buildRootPath = Paths::subtractPath(compileCommandsJsonPath.string(), CompilationUtils::UTBOT_BUILD_DIR_NAME);
     lineInfo.filePath = filePath;
 }
 

server/src/BordersFinder.h

@@ -31,7 +31,6 @@ class BordersFinder : public clang::ast_matchers::MatchFinder::MatchCallback {
 private:
     unsigned line;
     LineInfo lineInfo{};
-//    fs::path buildRootPath;
     struct Borders {
         struct Position {
             unsigned line;

server/src/KleeGenerator.cpp

@@ -16,36 +16,6 @@
 
 using namespace tests;
 
-//KleeGenerator::KleeGenerator(
-//    utbot::testGen.projectContext testGen.projectContext,
-//    utbot::SettingsContext settingsContext,
-//    fs::path serverBuildDir,
-//    std::shared_ptr<CompilationDatabase> compilationDatabase,
-//    types::TypesHandler &typesHandler,
-//    PathSubstitution filePathsSubstitution,
-//    std::shared_ptr<testGen.buildDatabase> testGen.buildDatabase,
-//    ProgressWriter const *progressWriter)
-//    : testGen.projectContext(std::move(testGen.projectContext)),
-//      settingsContext(std::move(settingsContext)),
-//      testGen.serverBuildDir(std::move(serverBuildDir)),
-//      compilationDatabase(std::move(compilationDatabase)),
-//      typesHandler(typesHandler),
-//      pathSubstitution(std::move(filePathsSubstitution)),
-//      testGen.buildDatabase(std::move(testGen.buildDatabase)),
-//      progressWriter(progressWriter) {
-//    try {
-//        fs::create_directories(this->testGen.serverBuildDir);
-//        fs::create_directories(Paths::getLogDir(this->testGen.projectContext.projectName));
-//    } catch (const fs::filesystem_error &e) {
-//        throw FileSystemException("create_directories failed", e);
-//    }
-//}
-//
-//auto generator = std::make_shared<KleeGenerator>(
-//        testGen.testGen.projectContext, testGen.settingsContext,
-//        testGen.serverBuildDir, testGen.testGen.buildDatabase->compilationDatabase, typesHandler,
-//        pathSubstitution, testGen.testGen.buildDatabase, testGen.progressWriter);
-
 KleeGenerator::KleeGenerator(BaseTestGen &_testGen, types::TypesHandler &typesHandler,
                              PathSubstitution filePathsSubstitution)
         : testGen(_testGen), typesHandler(typesHandler),

server/src/KleeGenerator.h

@@ -33,31 +33,16 @@ class KleeGenerator {
     using TestsMap = tests::TestsMap;
 
 public:
-//    /**
-//     * @brief Also creates tmp directories for build files.
-//     * @param projectContext contains context about current project.
-//     * @param settingsContext contains context about settings applied for current request.
-//     * @param serverBuildDir Path to folder on server machine where project build dirs are located.
-//     * @param sourcesFilePaths Paths to project files. Files which are listed in
-//     * [compile_commands.json](https://clang.llvm.org/docs/JSONCompilationDatabase.html), filtered
-//     * by them.
-//     * @param compilationDatabase Pointer to compile_commands.json object.
-//     * @param typesHandler provides additional information about types.
-//     * @param filePathsSubstitution Mapping from source file path to modified file. Required for
-//     * line test generation requests.
-//     * @param buildDatabase Instance of BuildDatabase which handles link and compile commands
-//     * @throws fs::filesystem_error Thrown if it can't create tmp folder for some
-//     * reasons.
-//     */
-//    KleeGenerator(utbot::ProjectContext projectContext,
-//                  utbot::SettingsContext settingsContext,
-//                  fs::path serverBuildDir,
-//                  std::shared_ptr<CompilationDatabase> compilationDatabase,
-//                  types::TypesHandler &typesHandler,
-//                  PathSubstitution filePathsSubstitution,
-//                  std::shared_ptr<BuildDatabase> buildDatabase = nullptr,
-//                  const ProgressWriter *progressWriter = DummyStreamWriter::getInstance());
-
+    /**
+     * @brief Also creates tmp directories for build files.
+     * @param _testGen contains context.
+     * @param typesHandler provides additional information about types.
+     * @param filePathsSubstitution Mapping from source file path to modified file. Required for
+     * line test generation requests.
+     * @param buildDatabase Instance of BuildDatabase which handles link and compile commands
+     * @throws fs::filesystem_error Thrown if it can't create tmp folder for some
+     * reasons.
+     */
     KleeGenerator(BaseTestGen &_testGen, types::TypesHandler &typesHandler,
                   PathSubstitution filePathsSubstitution);
 
@@ -161,15 +146,9 @@ class KleeGenerator {
                               const CollectionUtils::FileSet &stubSources) const;
 
 private:
-//    const utbot::ProjectContext projectContext;
-//    const utbot::SettingsContext settingsContext;
-    BaseTestGen &testGen;;
-//    fs::path projectTmpPath;
-//    std::shared_ptr<CompilationDatabase> compilationDatabase;
+    BaseTestGen &testGen;
     types::TypesHandler typesHandler;
     PathSubstitution pathSubstitution;
-//    std::shared_ptr<BuildDatabase> buildDatabase;
-//    const ProgressWriter *progressWriter;
 
     CollectionUtils::MapFileTo<std::vector<std::string>> failedFunctions;
 

server/src/building/BuildDatabase.cpp

@@ -33,8 +33,7 @@ static std::string tryConvertOptionToPath(const std::string &possibleFilePath,
 
 BuildDatabase::BuildDatabase(fs::path _buildCommandsJsonPath,
                              fs::path _serverBuildDir,
-                             utbot::ProjectContext _projectContext,
-                             bool createClangCC) :
+                             utbot::ProjectContext _projectContext) :
         serverBuildDir(std::move(_serverBuildDir)),
         projectContext(std::move(_projectContext)),
         buildCommandsJsonPath(std::move(_buildCommandsJsonPath)),
@@ -53,9 +52,7 @@ BuildDatabase::BuildDatabase(fs::path _buildCommandsJsonPath,
     filterInstalledFiles();
     addLocalSharedLibraries();
     fillTargetInfoParents();
-//    if (createClangCC) {
-        createClangCompileCommandsJson();
-//    }
+    createClangCompileCommandsJson();
     target = GrpcUtils::UTBOT_AUTO_TARGET_PATH;
 }
 
@@ -131,7 +128,7 @@ std::shared_ptr<BuildDatabase> BuildDatabase::create(const utbot::ProjectContext
             CompilationUtils::substituteRemotePathToCompileCommandsJsonPath(
                     projectContext.projectPath, projectContext.buildDirRelativePath);
     fs::path serverBuildDir = Paths::getUtbotBuildDir(projectContext);
-    std::shared_ptr<BuildDatabase> buildDatabase = std::make_shared<BuildDatabase>(compileCommandsJsonPath, serverBuildDir, projectContext, true);
+    std::shared_ptr<BuildDatabase> buildDatabase = std::make_shared<BuildDatabase>(compileCommandsJsonPath, serverBuildDir, projectContext);
     return buildDatabase;
 }
 

server/src/building/BuildDatabase.h

@@ -97,8 +97,7 @@ class BuildDatabase {
 public:
     BuildDatabase(fs::path _buildCommandsJsonPath,
                   fs::path _serverBuildDir,
-                  utbot::ProjectContext _projectContext,
-                  bool createClangCC);
+                  utbot::ProjectContext _projectContext);
 
     static std::shared_ptr<BuildDatabase> create(const utbot::ProjectContext &projectContext);
     std::shared_ptr<BuildDatabase> createBaseForTarget(const std::string &target);
@@ -197,16 +196,6 @@ class BuildDatabase {
      */
     std::vector<std::shared_ptr<ObjectFileInfo>> getAllCompileCommands() const;
 
-//    /**
-//     * @brief Gets all stub files associated with given link unit
-//     *
-//     * @param linkUnitInfo link unit info (preferably library)
-//     *
-//     * @return set of file paths to stubs
-//     */
-//    CollectionUtils::FileSet
-//    getStubFiles(const std::shared_ptr<const BuildDatabase::TargetInfo> &linkUnitInfo) const;
-
     /**
      * @brief Assign set of file paths to stubs to given link unit
      *

server/src/building/Linker.cpp

@@ -54,7 +54,7 @@ fs::path Linker::getSourceFilePath() {
 Result<Linker::LinkResult> Linker::linkForTarget(const fs::path &target, const fs::path &sourceFilePath,
                            const std::shared_ptr<const BuildDatabase::ObjectFileInfo> &compilationUnitInfo,
                            const fs::path &objectFile) {
-//    testGen.setTargetPath(target);
+    testGen.setTargetPath(target);
 
     auto siblings = testGen.buildDatabase->getArchiveObjectFiles(target);
     auto stubSources = stubGen.getStubSources(target);
@@ -84,14 +84,6 @@ Result<Linker::LinkResult> Linker::linkForTarget(const fs::path &target, const f
     return stubsSetResult;
 }
 
-//std::vector<fs::path> Linker::getTargetList(const fs::path &sourceFile, const fs::path &objectFile) const {
-//    if (testGen.hasAutoTarget()) {
-//        return testGen.buildDatabase->targetListForFile(sourceFile, objectFile);
-//    } else {
-//        return {testGen.buildDatabase->getTargetPath()};
-//    }
-//}
-
 void Linker::linkForOneFile(const fs::path &sourceFilePath) {
     ExecUtils::throwIfCancelled();
 
@@ -104,7 +96,6 @@ void Linker::linkForOneFile(const fs::path &sourceFilePath) {
     if (!testGen.buildDatabase->isFirstObjectFileForSource(objectFile)) {
         return;
     }
-//    std::vector <fs::path> targets = getTargetList(sourceFilePath, objectFile);
     std::vector <fs::path> targets = testGen.buildDatabase->targetListForFile(sourceFilePath, objectFile);
     LOG_S(DEBUG) << "Linking bitcode for file " << sourceFilePath.filename();
     for (size_t i = 0; i < targets.size(); i++) {
@@ -131,7 +122,7 @@ void Linker::linkForOneFile(const fs::path &sourceFilePath) {
 
 Result<Linker::LinkResult> Linker::linkWholeTarget(const fs::path &target) {
     auto requestTarget = testGen.buildDatabase->getTargetPath();
-    LOG_IF_S(ERROR, target != GrpcUtils::UTBOT_AUTO_TARGET_PATH && requestTarget != target)
+    LOG_IF_S(WARNING, !testGen.buildDatabase->hasAutoTarget() && requestTarget != target)
         << "Try link target that not specified by user";
     testGen.setTargetPath(target);
 
@@ -153,11 +144,11 @@ Result<Linker::LinkResult> Linker::linkWholeTarget(const fs::path &target) {
         }
         if (!CollectionUtils::contains(testedFiles, objectInfo->getSourcePath()) && insideFolder) {
             fs::path bitcodeFile = objectInfo->kleeFilesInfo->getKleeBitcodeFile();
-            filesToLink.emplace(objectFile, std::move(bitcodeFile));
+            filesToLink.emplace(objectFile, bitcodeFile);
         } else {
             fs::path bitcodeFile = testGen.buildDatabase->getBitcodeForSource(objectInfo->getSourcePath());
             siblingObjectsToBuild.insert(objectInfo->getOutputFile());
-            filesToLink.emplace(objectFile, std::move(bitcodeFile));
+            filesToLink.emplace(objectFile, bitcodeFile);
         }
     }
 
@@ -184,7 +175,6 @@ void Linker::linkForProject() {
                                    << sourceFile;
                     return;
                 }
-//                std::vector <fs::path> targets = getTargetList(sourceFile, objectFile);
                 std::vector <fs::path> targets = testGen.buildDatabase->targetListForFile(sourceFile, objectFile);
                 bool success = false;
                 for (const auto &target : targets) {

server/src/building/Linker.h

@@ -62,8 +62,6 @@ class Linker {
 
     bool isForOneFile();
 
-//    std::vector<fs::path> getTargetList(const fs::path &sourceFile, const fs::path &objectFile) const;
-
     Result<Linker::LinkResult> linkForTarget(const fs::path &target, const fs::path &sourceFilePath,
                                              const std::shared_ptr<const BuildDatabase::ObjectFileInfo> &compilationUnitInfo,
                                              const fs::path &objectFile);

server/src/printers/NativeMakefilePrinter.cpp

@@ -116,16 +116,13 @@ namespace printer {
     }
 
     NativeMakefilePrinter::NativeMakefilePrinter(
-//        utbot::ProjectContext projectContext,
-//        std::shared_ptr<BuildDatabase> buildDatabase,
         const BaseTestGen& testGen,
         fs::path const &rootPath,
         fs::path primaryCompiler,
         CollectionUtils::FileSet const *stubSources,
         std::map<std::string, fs::path, std::function<bool(const std::string&, const std::string&)>> pathToShellVariable)
         : RelativeMakefilePrinter(pathToShellVariable),
           testGen(testGen),
-//          projectContext(std::move(projectContext)), buildDatabase(std::move(buildDatabase)),
           rootPath(std::move(rootPath)),
           primaryCompiler(std::move(primaryCompiler)),
           primaryCxxCompiler(CompilationUtils::toCppCompiler(this->primaryCompiler)),
@@ -408,8 +405,6 @@ namespace printer {
     NativeMakefilePrinter::NativeMakefilePrinter(const NativeMakefilePrinter &baseMakefilePrinter,
                                                  const fs::path &sourcePath)
         : RelativeMakefilePrinter(baseMakefilePrinter.pathToShellVariable),
-//          projectContext(baseMakefilePrinter.projectContext),
-//          buildDatabase(baseMakefilePrinter.buildDatabase),
           testGen(baseMakefilePrinter.testGen),
           rootPath(baseMakefilePrinter.rootPath),
           primaryCompiler(baseMakefilePrinter.primaryCompiler),

server/src/printers/NativeMakefilePrinter.h

@@ -16,8 +16,6 @@ namespace printer {
         friend class TestMakefilesPrinter;
     private:
         const BaseTestGen& testGen;
-//        const utbot::ProjectContext projectContext;
-//        std::shared_ptr<BuildDatabase> buildDatabase;
         fs::path rootPath;
 
         fs::path primaryCompiler;
@@ -69,8 +67,6 @@ namespace printer {
 
     public:
         NativeMakefilePrinter(const BaseTestGen& testGen,
-//                              utbot::ProjectContext projectContext,
-//                              std::shared_ptr<BuildDatabase> buildDatabase,
                               fs::path const &rootPath,
                               fs::path primaryCompiler,
                               CollectionUtils::FileSet const *stubSources,