Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
add a StorageFailureException
[simgrid.git] / src / simix / smx_io.cpp
index 24947e8..4b8ecbc 100644 (file)
@@ -44,19 +44,21 @@ void SIMIX_io_finish(smx_activity_t synchro)
         /* do nothing, synchro done */
         break;
       case SIMIX_FAILED:
-        SMX_EXCEPTION(simcall->issuer, io_error, 0, "IO failed");
+        simcall->issuer->exception_ =
+            std::make_exception_ptr(simgrid::StorageFailureException(XBT_THROW_POINT, "Storage failed"));
         break;
       case SIMIX_CANCELED:
-        SMX_EXCEPTION(simcall->issuer, cancel_error, 0, "Canceled");
+        simcall->issuer->exception_ =
+            std::make_exception_ptr(simgrid::CancelException(XBT_THROW_POINT, "I/O Canceled"));
         break;
       default:
         xbt_die("Internal error in SIMIX_io_finish: unexpected synchro state %d", static_cast<int>(synchro->state_));
     }
 
     simcall->issuer->waiting_synchro = nullptr;
-    if (simcall->issuer->host_->is_off())
-      simcall->issuer->context_->iwannadie = true;
-    else
+    if (simcall->issuer->get_host()->is_on())
       SIMIX_simcall_answer(simcall);
+    else
+      simcall->issuer->context_->iwannadie = true;
   }
 }