From 30982688e372b953b47ae9f18a4a4926da9096c0 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Fri, 22 Feb 2019 12:28:01 +0100 Subject: [PATCH] use TASK_CANCELED rather than HOST_FAILURE for CancelExeption --- src/msg/msg_gos.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/msg/msg_gos.cpp b/src/msg/msg_gos.cpp index 95735547af..b81c975642 100644 --- a/src/msg/msg_gos.cpp +++ b/src/msg/msg_gos.cpp @@ -457,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) { @@ -500,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) @@ -551,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) @@ -601,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) { -- 2.20.1