Fix infinite loop on new files copied during refreshing.

egorpugin · egorpugin · commit bba30c6bedb6 · 2020-01-01T02:40:57.000+03:00
diff --git a/src/sw/builder/file.cpp b/src/sw/builder/file.cpp
@@ -52,8 +52,11 @@ FileData &FileData::operator=(const FileData &rhs)
     //flags = rhs.flags;
 
     refreshed = rhs.refreshed.load();
-    //if (refreshed == FileData::RefreshType::InProcess)
-        //refreshed = FileData::RefreshType::Unrefreshed;
+
+    // if we copy data during refresh() we get bad state
+    // FIXME: later we must delete file data
+    if (refreshed == FileData::RefreshType::InProcess)
+        refreshed = FileData::RefreshType::Unrefreshed;
 
     return *this;
 }
@@ -93,14 +96,6 @@ void FileData::refresh(const path &file)
     if (!refreshed.compare_exchange_strong(r, FileData::RefreshType::InProcess))
         return;
 
-    // extra protection
-    // some files throw before the last line :(
-    /*SCOPE_EXIT
-    {
-        if (refreshed == FileData::RefreshType::InProcess)
-            refreshed = FileData::RefreshType::Unrefreshed;
-    };*/
-
     bool changed = false;
     auto s = fs::status(file);
     if (s.type() != fs::file_type::regular)
