throw CancelledException earlier

Author: frs69wq

src/FileEngine.cpp

@@ -242,11 +242,8 @@ void FileEngine::end_sub_transaction()
     file_sub_transaction_[self].push(file->read_async(size));
 
   XBT_DEBUG("Wait for the %d subscribe activities for the transaction", file_sub_transaction_[self].size());
-  try {
-    file_sub_transaction_[self].wait_all();
-  } catch (const simgrid::CancelException&) {
-    if (!is_cancelled())
-      throw;
+  file_sub_transaction_[self].wait_all();
+  if (is_cancelled()) {
     file_sub_transaction_[self].clear();
     transport->close_sub_files(self);
     transport->clear_to_read_in_transaction(self);

src/StagingEngine.cpp

@@ -77,20 +77,15 @@ void StagingEngine::begin_pub_transaction()
               current_pub_transaction_id_, current_sub_transaction_id_, get_pub_transaction().size());
     try {
       get_pub_transaction().wait_all();
-    } catch (const simgrid::CancelException&) {
-      if (!is_cancelled())
-        throw;
-      get_pub_transaction().clear();
-      throw TransactionCancelledException(XBT_THROW_POINT);
     } catch (const simgrid::NetworkFailureException&) {
       if (!is_cancelled())
         throw;
-      get_pub_transaction().clear();
-      throw TransactionCancelledException(XBT_THROW_POINT);
     }
     XBT_DEBUG("All on-flight publish activities are completed. Proceed with the current transaction.");
     XBT_DEBUG("%u sub activities pending", get_sub_transaction().size());
     get_pub_transaction().clear();
+    if (is_cancelled())
+      throw TransactionCancelledException(XBT_THROW_POINT);
   }
 
   // Then we wait for all subscribers to be at the same transaction