background-threadify message state saving

diff --git a/lib/sup/modes/thread-index-mode.rb b/lib/sup/modes/thread-index-mode.rb
index 73144db9ea9e03e04ba545b6051d524808020606..a2f19265cc746f90e2a2a31f494802918c4edd5d 100644 (file)
--- a/lib/sup/modes/thread-index-mode.rb
+++ b/lib/sup/modes/thread-index-mode.rb
@@ -68,6 +68,8 @@ EOS
 
     UpdateManager.register self
 
+    @save_thread_mutex = Mutex.new
+
     @last_load_more_size = nil
     to_load_more do |size|
       next if @last_load_more_size == 0
@@ -386,14 +388,18 @@ EOS
   end
 
   def save
-    BufferManager.say("Saving contacts...") { ContactManager.instance.save }
-    dirty_threads = @mutex.synchronize { (@threads + @hidden_threads.keys).select { |t| t.dirty? } }
-    return if dirty_threads.empty?
-
-    BufferManager.say("Saving threads...") do |say_id|
-      dirty_threads.each_with_index do |t, i|
-        BufferManager.say "Saving modified thread #{i + 1} of #{dirty_threads.length}...", say_id
-        t.save Index
+    Redwood::reporting_thread("saving thread") do
+      @save_thread_mutex.synchronize do
+        BufferManager.say("Saving contacts...") { ContactManager.instance.save }
+        dirty_threads = @mutex.synchronize { (@threads + @hidden_threads.keys).select { |t| t.dirty? } }
+        return if dirty_threads.empty?
+
+        BufferManager.say("Saving threads...") do |say_id|
+          dirty_threads.each_with_index do |t, i|
+            BufferManager.say "Saving modified thread #{i + 1} of #{dirty_threads.length}...", say_id
+            t.save Index
+          end
+        end
       end
     end
   end