coder137 · coder137 · Dec 1, 2021 · Nov 29, 2021 · Nov 30, 2021 · Nov 30, 2021
diff --git a/README.md b/README.md
@@ -57,24 +57,6 @@ Build C, C++ and ASM files in C++
   - Users can define their own custom arguments.
   - Argument passing has been made easy using the `buildcc::Args` module.
 
-**Taskflow dependency for hybrid/simple example**
-![Hybrid Simple example](example/hybrid/simple/graph.PNG)
-
-- Build GCC and MSVC Targets simultaneously
-- 1 C and 1 CPP example for both toolchains
-
-**Taskflow dependency for hybrid/pch example**
-![Hybrid PCH example](example/hybrid/pch/graph.PNG)
-
-- Activate PCH for GCC and MSVC Targets
-- 1 C and 1 CPP example for both toolchains
-
-**Taskflow dependency for hybrid/dep_chaining example**
-![Hybrid Dep Chain example](example/hybrid/dep_chaining/graph.PNG)
-
-- Chain **Generator** with **Targets** for Dependency
-- 1 C and 1 CPP example for both toolchains
-
 # Software Architecture
 
 ### Interface lib dependencies
@@ -119,6 +101,26 @@ Build C, C++ and ASM files in C++
 
 Contains **proof of concept** and **real world** [examples](example/README.md).
 
+## Visual hybrid example graphs
+
+**Taskflow dependency for hybrid/simple example**
+![Hybrid Simple example](example/hybrid/simple/graph.PNG)
+
+- Build GCC and MSVC Targets simultaneously
+- 1 C and 1 CPP example for both toolchains
+
+**Taskflow dependency for hybrid/pch example**
+![Hybrid PCH example](example/hybrid/pch/graph.PNG)
+
+- Activate PCH for GCC and MSVC Targets
+- 1 C and 1 CPP example for both toolchains
+
+**Taskflow dependency for hybrid/dep_chaining example**
+![Hybrid Dep Chain example](example/hybrid/dep_chaining/graph.PNG)
+
+- Chain **Generator** with **Targets** for Dependency
+- 1 C and 1 CPP example for both toolchains
+
 # User Guide
 
 Developers interested in using **_BuildCC_**

diff --git a/buildcc/lib/target/cmake/mock_target.cmake b/buildcc/lib/target/cmake/mock_target.cmake
@@ -7,7 +7,7 @@ add_library(mock_target STATIC
     mock/generator/recheck_states.cpp
 
     # Target mocks
-    mock/target/tasks.cpp
+    src/target/tasks.cpp
     mock/target/runner.cpp
     mock/target/recheck_states.cpp
 )

diff --git a/buildcc/lib/target/include/target/base/target_loader.h b/buildcc/lib/target/include/target/base/target_loader.h
@@ -42,52 +42,71 @@ class TargetLoader : public LoaderInterface {
   bool Load() override;
 
   // Getters
-  const path_unordered_set &GetLoadedSources() const { return loaded_sources_; }
-  const path_unordered_set &GetLoadedHeaders() const { return loaded_headers_; }
-  const path_unordered_set &GetLoadedPchs() const { return loaded_pchs_; }
-  const path_unordered_set &GetLoadedLibDeps() const {
+  const path_unordered_set &GetLoadedSources() const noexcept {
+    return loaded_sources_;
+  }
+  const path_unordered_set &GetLoadedHeaders() const noexcept {
+    return loaded_headers_;
+  }
+  const path_unordered_set &GetLoadedPchs() const noexcept {
+    return loaded_pchs_;
+  }
+  const path_unordered_set &GetLoadedLibDeps() const noexcept {
     return loaded_lib_deps_;
   }
-  const std::unordered_set<std::string> &GetLoadedExternalLibDeps() const {
+  const std::unordered_set<std::string> &
+  GetLoadedExternalLibDeps() const noexcept {
     return loaded_external_lib_dirs_;
   }
 
-  const fs_unordered_set &GetLoadedIncludeDirs() const {
+  const fs_unordered_set &GetLoadedIncludeDirs() const noexcept {
     return loaded_include_dirs_;
   }
-  const fs_unordered_set &GetLoadedLibDirs() const { return loaded_lib_dirs_; }
-  const std::unordered_set<std::string> &GetLoadedPreprocessorFlags() const {
+  const fs_unordered_set &GetLoadedLibDirs() const noexcept {
+    return loaded_lib_dirs_;
+  }
+  const std::unordered_set<std::string> &
+  GetLoadedPreprocessorFlags() const noexcept {
     return loaded_preprocessor_flags_;
   }
-  const std::unordered_set<std::string> &GetLoadedCommonCompileFlags() const {
+  const std::unordered_set<std::string> &
+  GetLoadedCommonCompileFlags() const noexcept {
     return loaded_common_compile_flags_;
   }
-  const std::unordered_set<std::string> &GetLoadedPchCompileFlags() const {
+  const std::unordered_set<std::string> &
+  GetLoadedPchCompileFlags() const noexcept {
     return loaded_pch_compile_flags_;
   }
-  const std::unordered_set<std::string> &GetLoadedPchObjectFlags() const {
+  const std::unordered_set<std::string> &
+  GetLoadedPchObjectFlags() const noexcept {
     return loaded_pch_object_flags_;
   }
-  const std::unordered_set<std::string> &GetLoadedAsmCompileFlags() const {
+  const std::unordered_set<std::string> &
+  GetLoadedAsmCompileFlags() const noexcept {
     return loaded_asm_compile_flags_;
   }
-  const std::unordered_set<std::string> &GetLoadedCCompileFlags() const {
+  const std::unordered_set<std::string> &
+  GetLoadedCCompileFlags() const noexcept {
     return loaded_c_compile_flags_;
   }
-  const std::unordered_set<std::string> &GetLoadedCppCompileFlags() const {
+  const std::unordered_set<std::string> &
+  GetLoadedCppCompileFlags() const noexcept {
     return loaded_cpp_compile_flags_;
   }
-  const std::unordered_set<std::string> &GetLoadedLinkFlags() const {
+  const std::unordered_set<std::string> &GetLoadedLinkFlags() const noexcept {
     return loaded_link_flags_;
   }
 
-  const path_unordered_set &GetLoadedCompileDependencies() const {
+  const path_unordered_set &GetLoadedCompileDependencies() const noexcept {
     return loaded_compile_dependencies_;
   }
-  const path_unordered_set &GetLoadedLinkDependencies() const {
+  const path_unordered_set &GetLoadedLinkDependencies() const noexcept {
     return loaded_link_dependencies_;
   }
 
+  bool GetLoadedPchCompiled() const noexcept { return loaded_pch_compiled_; }
+  bool GetLoadedTargetLinked() const noexcept { return loaded_target_linked_; }
+
 private:
   void Initialize();
 
@@ -116,6 +135,9 @@ class TargetLoader : public LoaderInterface {
 
   path_unordered_set loaded_compile_dependencies_;
   path_unordered_set loaded_link_dependencies_;
+
+  bool loaded_pch_compiled_{false};
+  bool loaded_target_linked_{false};
 };
 
 } // namespace buildcc::internal

diff --git a/buildcc/lib/target/include/target/base/target_storer.h b/buildcc/lib/target/include/target/base/target_storer.h
@@ -45,6 +45,9 @@ struct TargetStorer {
 
   internal::RelationalPathFiles current_compile_dependencies;
   internal::RelationalPathFiles current_link_dependencies;
+
+  bool pch_compiled{false};
+  bool target_linked{false};
 };
 
 } // namespace buildcc::internal

diff --git a/buildcc/lib/target/include/target/friend/compile_object.h b/buildcc/lib/target/include/target/friend/compile_object.h
@@ -60,14 +60,14 @@ class CompileObject {
 private:
   fs::path ConstructObjectPath(const fs::path &absolute_source_file) const;
 
-  void BuildObjectCompile(std::vector<fs::path> &source_files,
-                          std::vector<fs::path> &dummy_source_files);
+  void BuildObjectCompile(std::vector<internal::Path> &source_files,
+                          std::vector<internal::Path> &dummy_source_files);
 
   void PreObjectCompile();
 
-  void CompileSources(std::vector<fs::path> &source_files);
-  void RecompileSources(std::vector<fs::path> &source_files,
-                        std::vector<fs::path> &dummy_source_files);
+  void CompileSources(std::vector<internal::Path> &source_files);
+  void RecompileSources(std::vector<internal::Path> &source_files,
+                        std::vector<internal::Path> &dummy_source_files);
 
 private:
   Target &target_;

diff --git a/buildcc/lib/target/include/target/target.h b/buildcc/lib/target/include/target/target.h
@@ -20,9 +20,9 @@
 #include <filesystem>
 #include <functional>
 #include <initializer_list>
+#include <mutex>
 #include <optional>
 #include <string>
-#include <string_view>
 #include <unordered_map>
 #include <unordered_set>
 #include <vector>
@@ -47,9 +47,12 @@
 #include "target/base/target_storer.h"
 #include "target/common/path.h"
 
+// Env
+#include "env/env.h"
+#include "env/task_state.h"
+
 // Components
 #include "command/command.h"
-#include "env/env.h"
 #include "toolchain/toolchain.h"
 
 // Third Party
@@ -82,6 +85,9 @@ class Target : public BuilderInterface,
   // Builders
   void Build() override;
 
+  // Getters
+  env::TaskState GetTaskState() const noexcept { return task_state_; }
+
 private:
   friend class CompilePch;
   friend class CompileObject;
@@ -111,6 +117,14 @@ class Target : public BuilderInterface,
   bool Store() override;
 
   // Tasks
+  void SetTaskStateFailure();
+  int GetTaskStateAsInt() const noexcept {
+    return static_cast<int>(task_state_);
+  }
+
+  void StartTask();
+  void EndTask();
+  tf::Task CheckStateTask();
   void TaskDeps();
 
   // Callbacks for unit tests
@@ -136,6 +150,16 @@ class Target : public BuilderInterface,
   CompileObject compile_object_;
   LinkTarget link_target_;
 
+  // Task states
+  tf::Task target_start_task_;
+  tf::Task target_end_task_;
+
+  std::mutex task_state_mutex_;
+  env::TaskState task_state_{env::TaskState::SUCCESS};
+
+  std::mutex compiled_source_files_mutex_;
+  internal::path_unordered_set compiled_source_files_;
+
   //
   Command command_;
   tf::Taskflow tf_;

diff --git a/buildcc/lib/target/mock/target/tasks.cpp b/buildcc/lib/target/mock/target/tasks.cpp
diff --git a/buildcc/lib/target/src/generator/task.cpp b/buildcc/lib/target/src/generator/task.cpp
@@ -20,7 +20,6 @@
 
 namespace {
 constexpr const char *const kStartGeneratorTaskName = "Start Generator";
-constexpr const char *const kPreGenerateTaskName = "PreGenerate";
 constexpr const char *const kEndGeneratorTaskName = "End Generator";
 
 constexpr const char *const kCommandTaskName = "Command";
@@ -34,6 +33,12 @@ void Generator::GenerateTask() {
   tf::Task start_task = tf_.emplace([this]() {
     switch (env::get_task_state()) {
     case env::TaskState::SUCCESS:
+      try {
+        Convert();
+        BuildGenerate();
+      } catch (...) {
+        task_state_ = env::TaskState::FAILURE;
+      }
       break;
     default:
       task_state_ = env::TaskState::FAILURE;
@@ -43,17 +48,6 @@ void Generator::GenerateTask() {
   });
   start_task.name(kStartGeneratorTaskName);
 
-  tf::Task pregenerate_task = tf_.emplace([&]() {
-    try {
-      Convert();
-      BuildGenerate();
-    } catch (...) {
-      task_state_ = env::TaskState::FAILURE;
-    }
-    return static_cast<int>(task_state_);
-  });
-  pregenerate_task.name(kPreGenerateTaskName);
-
   tf::Task generate_task = tf_.emplace([&](tf::Subflow &subflow) {
     auto run_command = [this](const std::string &command) {
       try {
@@ -124,8 +118,7 @@ void Generator::GenerateTask() {
   end_task.name(kEndGeneratorTaskName);
 
   // Dependencies
-  start_task.precede(pregenerate_task, end_task);
-  pregenerate_task.precede(generate_task, end_task);
+  start_task.precede(generate_task, end_task);
   generate_task.precede(end_task);
 }
 

diff --git a/buildcc/lib/target/src/target/build.cpp b/buildcc/lib/target/src/target/build.cpp
@@ -97,6 +97,10 @@ void Target::Build() {
   // Load the serialized file
   (void)loader_.Load();
 
+  // Target State Tasks
+  StartTask();
+  EndTask();
+
   // PCH Compile
   if (state_.ContainsPch()) {
     command_.AddDefaultArguments({