Performance: pipeline-sends.diff

src/allmydata/encode.py

@@ -240 +240 @@
 
         d.addCallback(lambda res: self.finish_hashing())
 
-        d.addCallback(lambda res:
-                      self.send_plaintext_hash_tree_to_all_shareholders())
-        d.addCallback(lambda res:
-                      self.send_crypttext_hash_tree_to_all_shareholders())
-        d.addCallback(lambda res: self.send_all_subshare_hash_trees())
-        d.addCallback(lambda res: self.send_all_share_hash_trees())
-        d.addCallback(lambda res: self.send_uri_extension_to_all_shareholders())
+        d.addCallback(lambda res: self.send_hashes_and_close())
 
-        d.addCallback(lambda res: self.close_all_shareholders())
         d.addCallbacks(lambda res: self.done(), self.err)
         return d
 
@@ -451 +444 @@
         d.addCallback(_got_hashtree_nodes)
         return d
 
+    def send_hashes_and_close(self):
+        dl = []
+        dl.append(self.send_plaintext_hash_tree_to_all_shareholders())
+        dl.append(self.send_crypttext_hash_tree_to_all_shareholders())
+        dl.append(self.send_all_subshare_hash_trees())
+        dl.append(self.send_all_share_hash_trees())
+        dl.append(self.send_uri_extension_to_all_shareholders())
+        dl.append(self.close_all_shareholders())
+        return self._gather_responses(dl)
+
     def send_plaintext_hash_tree_to_all_shareholders(self):
         log.msg("%s sending plaintext hash tree" % self)
         dl = []