Store patch data per target. This prevents rebuilding because patch data was global with patch needed flag.

Author: egorpugin

src/sw/driver/functions.cpp

@@ -49,10 +49,8 @@ static auto set_lwt(const path &from_fn, const path &tsf) {
     fs::last_write_time(tsf, fs::last_write_time(from_fn));
 }
 
-static bool should_patch(const path &fn, const path &hf, const path &hfn)
+static bool should_patch(patch_data_type &to_patch, const path &fn, const path &hf, const path &hfn)
 {
-    static std::map<path, bool> to_patch;
-
     auto tsf = path{ hf } += ".ts"s;
     ScopedFileLock fl(tsf);
 
@@ -68,7 +66,7 @@ static bool should_patch(const path &fn, const path &hf, const path &hfn)
     return false;
 }
 
-void replaceInFileOnce(const path &fn, const String &from, const String &to, const path &lock_dir)
+void replaceInFileOnce(patch_data_type &to_patch, const path &fn, const String &from, const String &to, const path &lock_dir)
 {
     auto hf = sha1(to_string(normalize_path(fn)));
 
@@ -78,16 +76,16 @@ void replaceInFileOnce(const path &fn, const String &from, const String &to, con
 
     const auto lock = lock_dir / hf;
     auto tsf = path{ lock_dir / hf } += ".ts"s;
-    if (!should_patch(fn, lock, hfn))
+    if (!should_patch(to_patch, fn, lock, hfn))
         return;
 
     ScopedFileLock fl(lock);
 
     // double check
-    if (!should_patch(fn, lock, hfn))
+    if (!should_patch(to_patch, fn, lock, hfn))
         return;
 
-    LOG_DEBUG(logger, std::format("patching {} with patch file {}:\nfrom:\n{}\nto:\n{}", fn.string(), hfn.string(), from, to));
+    LOG_DEBUG(logger, std::format("patching\n{}\nwith patch file\n{}\n:\nfrom:\n{}\nto:\n{}\n", fn.string(), hfn.string(), from, to));
 
     auto s = read_file(fn);
     boost::replace_all(s, from, to);
@@ -96,7 +94,7 @@ void replaceInFileOnce(const path &fn, const String &from, const String &to, con
     set_lwt(fn, tsf);
 }
 
-void pushFrontToFileOnce(const path &fn, const String &text, const path &lock_dir)
+void pushFrontToFileOnce(patch_data_type &to_patch, const path &fn, const String &text, const path &lock_dir)
 {
     auto hf = sha1(to_string(normalize_path(fn)));
 
@@ -106,13 +104,13 @@ void pushFrontToFileOnce(const path &fn, const String &text, const path &lock_di
 
     const auto lock = lock_dir / hf;
     auto tsf = path{ lock_dir / hf } += ".ts"s;
-    if (!should_patch(fn, lock, hfn))
+    if (!should_patch(to_patch, fn, lock, hfn))
         return;
 
     ScopedFileLock fl(lock);
 
     // double check
-    if (!should_patch(fn, lock, hfn))
+    if (!should_patch(to_patch, fn, lock, hfn))
         return;
 
     LOG_DEBUG(logger, std::format("pushFrontToFileOnce {} with patch file {}:\n{}", fn.string(), hfn.string(), text));
@@ -124,7 +122,7 @@ void pushFrontToFileOnce(const path &fn, const String &text, const path &lock_di
     set_lwt(fn, tsf);
 }
 
-void pushBackToFileOnce(const path &fn, const String &text, const path &lock_dir)
+void pushBackToFileOnce(patch_data_type &to_patch, const path &fn, const String &text, const path &lock_dir)
 {
     auto hf = sha1(to_string(normalize_path(fn)));
 
@@ -134,13 +132,13 @@ void pushBackToFileOnce(const path &fn, const String &text, const path &lock_dir
 
     const auto lock = lock_dir / hf;
     auto tsf = path{ lock_dir / hf } += ".ts"s;
-    if (!should_patch(fn, lock, hfn))
+    if (!should_patch(to_patch, fn, lock, hfn))
         return;
 
     ScopedFileLock fl(lock);
 
     // double check
-    if (!should_patch(fn, lock, hfn))
+    if (!should_patch(to_patch, fn, lock, hfn))
         return;
 
     LOG_DEBUG(logger, std::format("pushBackToFileOnce {} with patch file {}:\n{}", fn.string(), hfn.string(), text));

src/sw/driver/functions.h

@@ -9,20 +9,22 @@
 namespace sw
 {
 
+using patch_data_type = std::map<path, bool>;
+
 SW_DRIVER_CPP_API
 void writeFileOnce(const path &fn, const String &content, const path &lock_dir);
 
 SW_DRIVER_CPP_API
 void writeFileSafe(const path &fn, const String &content, const path &lock_dir);
 
 SW_DRIVER_CPP_API
-void replaceInFileOnce(const path &fn, const String &from, const String &to, const path &lock_dir);
+void replaceInFileOnce(patch_data_type &, const path &fn, const String &from, const String &to, const path &lock_dir);
 
 SW_DRIVER_CPP_API
-void pushFrontToFileOnce(const path &fn, const String &text, const path &lock_dir);
+void pushFrontToFileOnce(patch_data_type &, const path &fn, const String &text, const path &lock_dir);
 
 SW_DRIVER_CPP_API
-void pushBackToFileOnce(const path &fn, const String &text, const path &lock_dir);
+void pushBackToFileOnce(patch_data_type &, const path &fn, const String &text, const path &lock_dir);
 
 SW_DRIVER_CPP_API
 bool patch(const path &fn, const String &text, const path &lock_dir);

src/sw/driver/target/base.h

@@ -248,6 +248,13 @@ struct SW_DRIVER_CPP_API Target : ITarget, TargetBase, ProgramStorage,
     };
     const TargetSettings *ts = nullptr;*/
 
+    struct predefined_storage_ids {
+        enum {
+            // append only
+            patch_data,
+        };
+    };
+
     // Data storage for objects that must be alive with the target.
     // For example, program clones etc.
     std::vector<std::any> Storage;
@@ -364,6 +371,21 @@ struct SW_DRIVER_CPP_API Target : ITarget, TargetBase, ProgramStorage,
         loader(*this);
     }
 
+    template <typename T>
+    T &add_storage_data_to_slot(T &&d, auto id) {
+        if (Storage.size() != id) {
+            throw SW_LOGIC_ERROR("bad storage slot");
+        }
+        return std::any_cast<T&>(Storage.emplace_back(std::move(d)));
+    }
+    template <typename T>
+    T &get_storage_data_from_slot(auto id) {
+        if (Storage.size() <= id) {
+            throw SW_LOGIC_ERROR("bad storage slot");
+        }
+        return std::any_cast<T&>(Storage[id]);
+    }
+
 private:
     void addTest(Test &cb, const String &name);
     Test addTest1(const String &name, const Target &t);

src/sw/driver/target/native.cpp

@@ -218,6 +218,7 @@ path NativeTarget::getOutputFile() const
 NativeCompiledTarget::NativeCompiledTarget(TargetBase &parent, const PackageId &id)
     : NativeTarget(parent, id), NativeTargetOptionsGroup((Target &)*this)
 {
+    add_storage_data_to_slot(patch_data_type{}, predefined_storage_ids::patch_data);
 }
 
 NativeCompiledTarget::~NativeCompiledTarget()
@@ -5043,7 +5044,7 @@ void NativeCompiledTarget::patch(const path &fn, const String &from, const Strin
     bool source_dir = false;
     path p = fn;
     check_absolute(p, false, &source_dir);
-    ::sw::replaceInFileOnce(p, from, to, getPatchDir(!source_dir));
+    ::sw::replaceInFileOnce(get_storage_data_from_slot<patch_data_type>(predefined_storage_ids::patch_data), p, from, to, getPatchDir(!source_dir));
 
     //File f(p, getFs());
     //f.getFileRecord().load();
@@ -5075,7 +5076,7 @@ void NativeCompiledTarget::pushFrontToFileOnce(const path &fn, const String &tex
     bool source_dir = false;
     path p = fn;
     check_absolute(p, false, &source_dir);
-    ::sw::pushFrontToFileOnce(p, text, getPatchDir(!source_dir));
+    ::sw::pushFrontToFileOnce(get_storage_data_from_slot<patch_data_type>(predefined_storage_ids::patch_data), p, text, getPatchDir(!source_dir));
 
     //File f(p, getFs());
     //f.getFileRecord().load();
@@ -5091,7 +5092,7 @@ void NativeCompiledTarget::pushBackToFileOnce(const path &fn, const String &text
     bool source_dir = false;
     path p = fn;
     check_absolute(p, false, &source_dir);
-    ::sw::pushBackToFileOnce(p, text, getPatchDir(!source_dir));
+    ::sw::pushBackToFileOnce(get_storage_data_from_slot<patch_data_type>(predefined_storage_ids::patch_data), p, text, getPatchDir(!source_dir));
 
     //File f(p, getFs());
     //f.getFileRecord().load();