use TASK_CANCELED rather than HOST_FAILURE for CancelExeption

[simgrid.git] / src / msg / msg_gos.cpp

diff --git a/src/msg/msg_gos.cpp b/src/msg/msg_gos.cpp
index 883360f..b81c975 100644 (file)
--- a/src/msg/msg_gos.cpp
+++ b/src/msg/msg_gos.cpp
@@ -306,8 +306,6 @@ static inline msg_comm_t MSG_task_isend_internal(msg_task_t task, const char* al
   if (TRACE_is_enabled() && task->category != nullptr)
     simgrid::simix::simcall([comm, task] { comm->get_impl()->set_category(task->category); });
 
-  TRACE_msg_task_put_end();
-
   return msg_comm;
 }
 
@@ -459,7 +457,7 @@ int MSG_comm_test(msg_comm_t comm)
     comm->status = MSG_TIMEOUT;
     finished     = true;
   } catch (simgrid::CancelException& e) {
-    comm->status = MSG_HOST_FAILURE;
+    comm->status = MSG_TASK_CANCELED;
     finished     = true;
   }
   catch (xbt_ex& e) {
@@ -502,7 +500,7 @@ int MSG_comm_testany(xbt_dynar_t comms)
     status         = MSG_TIMEOUT;
   } catch (simgrid::CancelException& e) {
     finished_index = e.value;
-    status         = MSG_HOST_FAILURE;
+    status         = MSG_TASK_CANCELED;
   }
   catch (xbt_ex& e) {
     if (e.category != network_error)
@@ -553,7 +551,7 @@ msg_error_t MSG_comm_wait(msg_comm_t comm, double timeout)
   } catch (simgrid::TimeoutError& e) {
     comm->status = MSG_TIMEOUT;
   } catch (simgrid::CancelException& e) {
-    comm->status = MSG_HOST_FAILURE;
+    comm->status = MSG_TASK_CANCELED;
   }
   catch (xbt_ex& e) {
     if (e.category == network_error)
@@ -603,7 +601,7 @@ int MSG_comm_waitany(xbt_dynar_t comms)
     status         = MSG_TIMEOUT;
   } catch (simgrid::CancelException& e) {
     finished_index = e.value;
-    status         = MSG_HOST_FAILURE;
+    status         = MSG_TASK_CANCELED;
   }
   catch(xbt_ex& e) {
     if (e.category == network_error) {