[Cleanup] Remove Lock APIs (#217)

coder137 · web-flow · commit 15f2908fbfde · 2022-10-15T21:43:06.000-07:00
diff --git a/buildcc/lib/target/include/target/api/target_getter.h b/buildcc/lib/target/include/target/api/target_getter.h
@@ -38,7 +38,6 @@ template <typename T> class TargetGetter {
   // Target State
   const TargetState &GetState() const;
   bool IsBuilt() const;
-  bool IsLocked() const;
 
   // Target Config
   const TargetConfig &GetConfig() const;
diff --git a/buildcc/lib/target/include/target/target_info.h b/buildcc/lib/target/include/target/target_info.h
@@ -86,7 +86,6 @@ class TargetInfo : public internal::SourceApi<TargetInfo>,
   TargetEnv env_;
 
   //
-  FunctionLock lock_;
   UserTargetSchema user_;
 
 private:
diff --git a/buildcc/lib/target/src/api/deps_api.cpp b/buildcc/lib/target/src/api/deps_api.cpp
@@ -24,14 +24,12 @@ template <typename T>
 void DepsApi<T>::AddCompileDependencyAbsolute(const fs::path &absolute_path) {
   T &t = static_cast<T &>(*this);
 
-  t.lock_.ExpectsUnlock(__FUNCTION__);
   t.user_.compile_dependencies.insert(absolute_path);
 }
 template <typename T>
 void DepsApi<T>::AddLinkDependencyAbsolute(const fs::path &absolute_path) {
   T &t = static_cast<T &>(*this);
 
-  t.lock_.ExpectsUnlock(__FUNCTION__);
   t.user_.link_dependencies.insert(absolute_path);
 }
 
diff --git a/buildcc/lib/target/src/api/flag_api.cpp b/buildcc/lib/target/src/api/flag_api.cpp
@@ -24,55 +24,47 @@ template <typename T>
 void FlagApi<T>::AddPreprocessorFlag(const std::string &flag) {
   T &t = static_cast<T &>(*this);
 
-  t.lock_.ExpectsUnlock(__FUNCTION__);
   t.user_.preprocessor_flags.insert(flag);
 }
 template <typename T>
 void FlagApi<T>::AddCommonCompileFlag(const std::string &flag) {
   T &t = static_cast<T &>(*this);
 
-  t.lock_.ExpectsUnlock(__FUNCTION__);
   t.user_.common_compile_flags.insert(flag);
 }
 template <typename T>
 void FlagApi<T>::AddPchCompileFlag(const std::string &flag) {
   T &t = static_cast<T &>(*this);
 
-  t.lock_.ExpectsUnlock(__FUNCTION__);
   t.user_.pch_compile_flags.insert(flag);
 }
 template <typename T>
 void FlagApi<T>::AddPchObjectFlag(const std::string &flag) {
   T &t = static_cast<T &>(*this);
 
-  t.lock_.ExpectsUnlock(__FUNCTION__);
   t.user_.pch_object_flags.insert(flag);
 }
 template <typename T>
 void FlagApi<T>::AddAsmCompileFlag(const std::string &flag) {
   T &t = static_cast<T &>(*this);
 
-  t.lock_.ExpectsUnlock(__FUNCTION__);
   t.user_.asm_compile_flags.insert(flag);
 }
 template <typename T>
 void FlagApi<T>::AddCCompileFlag(const std::string &flag) {
   T &t = static_cast<T &>(*this);
 
-  t.lock_.ExpectsUnlock(__FUNCTION__);
   t.user_.c_compile_flags.insert(flag);
 }
 template <typename T>
 void FlagApi<T>::AddCppCompileFlag(const std::string &flag) {
   T &t = static_cast<T &>(*this);
 
-  t.lock_.ExpectsUnlock(__FUNCTION__);
   t.user_.cpp_compile_flags.insert(flag);
 }
 template <typename T> void FlagApi<T>::AddLinkFlag(const std::string &flag) {
   T &t = static_cast<T &>(*this);
 
-  t.lock_.ExpectsUnlock(__FUNCTION__);
   t.user_.link_flags.insert(flag);
 }
 
diff --git a/buildcc/lib/target/src/api/include_api.cpp b/buildcc/lib/target/src/api/include_api.cpp
@@ -24,7 +24,6 @@ template <typename T>
 void IncludeApi<T>::AddHeaderAbsolute(const fs::path &absolute_filepath) {
   T &t = static_cast<T &>(*this);
 
-  t.lock_.ExpectsUnlock(__FUNCTION__);
   t.toolchain_.GetConfig().ExpectsValidHeader(absolute_filepath);
   t.user_.headers.insert(absolute_filepath);
 }
@@ -74,7 +73,6 @@ void IncludeApi<T>::AddIncludeDirAbsolute(const fs::path &absolute_include_dir,
                                           bool glob_headers) {
   T &t = static_cast<T &>(*this);
 
-  t.lock_.ExpectsUnlock(__FUNCTION__);
   t.user_.include_dirs.insert(absolute_include_dir);
 
   if (glob_headers) {
diff --git a/buildcc/lib/target/src/api/lib_api.cpp b/buildcc/lib/target/src/api/lib_api.cpp
@@ -25,7 +25,6 @@ template <typename T>
 void LibApi<T>::AddLibDirAbsolute(const fs::path &absolute_lib_dir) {
   T &t = static_cast<T &>(*this);
 
-  t.lock_.ExpectsUnlock(__FUNCTION__);
   t.user_.lib_dirs.insert(absolute_lib_dir);
 }
 
@@ -40,14 +39,12 @@ void LibApi<T>::AddLibDir(const fs::path &relative_lib_dir) {
 template <typename T> void LibApi<T>::AddLibDep(const BaseTarget &lib_dep) {
   T &t = static_cast<T &>(*this);
 
-  t.lock_.ExpectsUnlock(__FUNCTION__);
   t.user_.libs.push_back(lib_dep.GetTargetPath());
 }
 
 template <typename T> void LibApi<T>::AddLibDep(const std::string &lib_dep) {
   T &t = static_cast<T &>(*this);
 
-  t.lock_.ExpectsUnlock(__FUNCTION__);
   t.user_.external_libs.push_back(lib_dep);
 }
 
diff --git a/buildcc/lib/target/src/api/pch_api.cpp b/buildcc/lib/target/src/api/pch_api.cpp
@@ -24,7 +24,6 @@ template <typename T>
 void PchApi<T>::AddPchAbsolute(const fs::path &absolute_filepath) {
   T &t = static_cast<T &>(*this);
 
-  t.lock_.ExpectsUnlock(__FUNCTION__);
   t.toolchain_.GetConfig().ExpectsValidHeader(absolute_filepath);
 
   const fs::path absolute_pch = fs::path(absolute_filepath).make_preferred();
diff --git a/buildcc/lib/target/src/api/source_api.cpp b/buildcc/lib/target/src/api/source_api.cpp
@@ -24,7 +24,6 @@ template <typename T>
 void SourceApi<T>::AddSourceAbsolute(const fs::path &absolute_source) {
   T &t = static_cast<T &>(*this);
 
-  t.lock_.ExpectsUnlock(__FUNCTION__);
   t.toolchain_.GetConfig().ExpectsValidSource(absolute_source);
   t.user_.sources.emplace(fs::path(absolute_source).make_preferred());
 }
diff --git a/buildcc/lib/target/src/api/sync_api.cpp b/buildcc/lib/target/src/api/sync_api.cpp
@@ -41,7 +41,6 @@ template <typename TargetType>
 void SyncApi<T>::SpecializedCopy(TargetType target,
                                  std::initializer_list<SyncOption> options) {
   T &t = static_cast<T &>(*this);
-  t.lock_.ExpectsUnlock(__FUNCTION__);
   for (const SyncOption o : options) {
     switch (o) {
     case SyncOption::PreprocessorFlags:
@@ -122,7 +121,6 @@ template <typename TargetType>
 void SyncApi<T>::SpecializedInsert(TargetType target,
                                    std::initializer_list<SyncOption> options) {
   T &t = static_cast<T &>(*this);
-  t.lock_.ExpectsUnlock(__FUNCTION__);
   for (const SyncOption o : options) {
     switch (o) {
     case SyncOption::PreprocessorFlags:
diff --git a/buildcc/lib/target/src/api/target_getter.cpp b/buildcc/lib/target/src/api/target_getter.cpp
@@ -40,12 +40,6 @@ template <typename T> const TargetConfig &TargetGetter<T>::GetConfig() const {
   return t.config_;
 }
 
-template <typename T> bool TargetGetter<T>::IsLocked() const {
-  const T &t = static_cast<const T &>(*this);
-
-  return t.lock_.IsLocked();
-}
-
 template <typename T> const fs::path &TargetGetter<T>::GetBinaryPath() const {
   const T &t = static_cast<const T &>(*this);
 
@@ -95,22 +89,19 @@ const std::string &
 TargetGetter<T>::GetCompileCommand(const fs::path &source) const {
   const T &t = static_cast<const T &>(*this);
 
-  t.lock_.ExpectsLock(__FUNCTION__);
   return t.compile_object_.GetObjectData(source).command;
 }
 
 template <typename T>
 const std::string &TargetGetter<T>::GetLinkCommand() const {
   const T &t = static_cast<const T &>(*this);
 
-  t.lock_.ExpectsLock(__FUNCTION__);
   return t.link_target_.GetCommand();
 }
 
 template <typename T> tf::Taskflow &TargetGetter<T>::GetTaskflow() {
   T &t = static_cast<T &>(*this);
 
-  t.lock_.ExpectsLock(__FUNCTION__);
   return t.tf_;
 }
 
diff --git a/buildcc/lib/target/src/target/build.cpp b/buildcc/lib/target/src/target/build.cpp
@@ -54,9 +54,6 @@ namespace buildcc {
 void Target::Build() {
   env::log_trace(name_, __FUNCTION__);
 
-  lock_.ExpectsUnlock("Target::Build");
-  lock_.Lock();
-
   // PCH state
   if (!user_.pchs.empty()) {
     state_.PchDetected();
diff --git a/buildcc/lib/target/src/target_info/target_info.cpp b/buildcc/lib/target/src/target_info/target_info.cpp
@@ -21,10 +21,6 @@ namespace buildcc {
 // PRIVATE
 
 void TargetInfo::Initialize() {
-  // TODO, Update this later
-  // toolchain_.GetLockInfo().ExpectsLock(
-  //     "Toolchain should be locked before usage through `Toolchain::Lock`");
-
   std::for_each(toolchain_.GetPreprocessorFlags().begin(),
                 toolchain_.GetPreprocessorFlags().end(),
                 [&](const std::string &flag) { AddPreprocessorFlag(flag); });
diff --git a/buildcc/lib/target/test/target/CMakeLists.txt b/buildcc/lib/target/test/target/CMakeLists.txt
@@ -136,11 +136,6 @@ add_executable(test_target_user_deps
 )
 target_link_libraries(test_target_user_deps PRIVATE target_interface)
 
-add_executable(test_target_lock
-    test_target_lock.cpp
-)
-target_link_libraries(test_target_lock PRIVATE target_interface)
-
 add_executable(test_target_sync
     test_target_sync.cpp
 )
@@ -162,7 +157,6 @@ add_test(NAME test_target_external_lib COMMAND test_target_external_lib)
 
 add_test(NAME test_target_flags COMMAND test_target_flags)
 add_test(NAME test_target_user_deps COMMAND test_target_user_deps)
-add_test(NAME test_target_lock COMMAND test_target_lock)
 
 add_test(NAME test_target_sync COMMAND test_target_sync)
 
diff --git a/buildcc/lib/target/test/target/constants.h.in b/buildcc/lib/target/test/target/constants.h.in
@@ -17,8 +17,6 @@ inline constexpr char const * BUILD_TARGET_FLAG_INTERMEDIATE_DIR = "@CMAKE_CURRE
 
 inline constexpr char const * BUILD_TARGET_USER_DEPS_INTERMEDIATE_DIR = "@CMAKE_CURRENT_SOURCE_DIR@/intermediate/target_user_deps";
 
-inline constexpr char const * BUILD_TARGET_LOCK_INTERMEDIATE_DIR = "@CMAKE_CURRENT_SOURCE_DIR@/intermediate/target_lock";
-
 inline constexpr char const * BUILD_TARGET_SYNC_INTERMEDIATE_DIR = "@CMAKE_CURRENT_SOURCE_DIR@/intermediate/target_sync";
 
 inline constexpr char const * BUILD_TARGET_FAILURE_STATES_BUILD_DIR = "@CMAKE_CURRENT_SOURCE_DIR@/intermediate/target_failure_states";
diff --git a/buildcc/lib/target/test/target/test_target_lock.cpp b/buildcc/lib/target/test/target/test_target_lock.cpp
diff --git a/buildcc/lib/target/test/target/test_target_source.cpp b/buildcc/lib/target/test/target/test_target_source.cpp
@@ -243,6 +243,8 @@ TEST(TargetTestSourceGroup, Target_CompileCommand_Throws) {
 
     // Throws when you call CompileCommand before Build
     CHECK_THROWS(std::exception, simple.GetCompileCommand(p));
+    // Link Command will be empty before Build
+    STRCMP_EQUAL(simple.GetLinkCommand().c_str(), "");
   }
 }
 
diff --git a/buildcc/lib/target/test/target/test_toolchain_flag_api.cpp b/buildcc/lib/target/test/target/test_toolchain_flag_api.cpp
diff --git a/buildcc/lib/toolchain/CMakeLists.txt b/buildcc/lib/toolchain/CMakeLists.txt
diff --git a/buildcc/lib/toolchain/include/toolchain/api/flag_api.h b/buildcc/lib/toolchain/include/toolchain/api/flag_api.h
diff --git a/buildcc/lib/toolchain/include/toolchain/common/function_lock.h b/buildcc/lib/toolchain/include/toolchain/common/function_lock.h
diff --git a/buildcc/lib/toolchain/include/toolchain/toolchain.h b/buildcc/lib/toolchain/include/toolchain/toolchain.h
diff --git a/buildcc/lib/toolchain/src/toolchain/toolchain.cpp b/buildcc/lib/toolchain/src/toolchain/toolchain.cpp

Original file line number	Diff line number	Diff line change
`@@ -24,14 +24,12 @@ template <typename T>`
`24`	`24`	`void DepsApi<T>::AddCompileDependencyAbsolute(const fs::path &absolute_path) {`
`25`	`25`	`T &t = static_cast<T &>(*this);`
`26`	`26`
`27`		`- t.lock_.ExpectsUnlock(__FUNCTION__);`
`28`	`27`	`t.user_.compile_dependencies.insert(absolute_path);`
`29`	`28`	`}`
`30`	`29`	`template <typename T>`
`31`	`30`	`void DepsApi<T>::AddLinkDependencyAbsolute(const fs::path &absolute_path) {`
`32`	`31`	`T &t = static_cast<T &>(*this);`
`33`	`32`
`34`		`- t.lock_.ExpectsUnlock(__FUNCTION__);`
`35`	`33`	`t.user_.link_dependencies.insert(absolute_path);`
`36`	`34`	`}`
`37`	`35`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ template <typename T>`
`25`	`25`	`void LibApi<T>::AddLibDirAbsolute(const fs::path &absolute_lib_dir) {`
`26`	`26`	`T &t = static_cast<T &>(*this);`
`27`	`27`
`28`		`- t.lock_.ExpectsUnlock(__FUNCTION__);`
`29`	`28`	`t.user_.lib_dirs.insert(absolute_lib_dir);`
`30`	`29`	`}`
`31`	`30`
`@@ -40,14 +39,12 @@ void LibApi<T>::AddLibDir(const fs::path &relative_lib_dir) {`
`40`	`39`	`template <typename T> void LibApi<T>::AddLibDep(const BaseTarget &lib_dep) {`
`41`	`40`	`T &t = static_cast<T &>(*this);`
`42`	`41`
`43`		`- t.lock_.ExpectsUnlock(__FUNCTION__);`
`44`	`42`	`t.user_.libs.push_back(lib_dep.GetTargetPath());`
`45`	`43`	`}`
`46`	`44`
`47`	`45`	`template <typename T> void LibApi<T>::AddLibDep(const std::string &lib_dep) {`
`48`	`46`	`T &t = static_cast<T &>(*this);`
`49`	`47`
`50`		`- t.lock_.ExpectsUnlock(__FUNCTION__);`
`51`	`48`	`t.user_.external_libs.push_back(lib_dep);`
`52`	`49`	`}`
`53`	`50`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@ template <typename T>`
`24`	`24`	`void SourceApi<T>::AddSourceAbsolute(const fs::path &absolute_source) {`
`25`	`25`	`T &t = static_cast<T &>(*this);`
`26`	`26`
`27`		`- t.lock_.ExpectsUnlock(__FUNCTION__);`
`28`	`27`	`t.toolchain_.GetConfig().ExpectsValidSource(absolute_source);`
`29`	`28`	`t.user_.sources.emplace(fs::path(absolute_source).make_preferred());`
`30`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -243,6 +243,8 @@ TEST(TargetTestSourceGroup, Target_CompileCommand_Throws) {`
`243`	`243`
`244`	`244`	`// Throws when you call CompileCommand before Build`
`245`	`245`	`CHECK_THROWS(std::exception, simple.GetCompileCommand(p));`
	`246`	`+ // Link Command will be empty before Build`
	`247`	`+ STRCMP_EQUAL(simple.GetLinkCommand().c_str(), "");`
`246`	`248`	`}`
`247`	`249`	`}`
`248`	`250`