Merge branch 'master' of https://framagit.org/simgrid/simgrid

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

diff --git a/src/msg/msg_task.cpp b/src/msg/msg_task.cpp
index 46adfb4..9094468 100644 (file)
--- a/src/msg/msg_task.cpp
+++ b/src/msg/msg_task.cpp
@@ -81,11 +81,11 @@ msg_error_t Task::execute()
 
     set_not_used();
     XBT_DEBUG("Execution task '%s' finished", get_cname());
-  } catch (HostFailureException& e) {
+  } catch (const HostFailureException&) {
     status = MSG_HOST_FAILURE;
-  } catch (TimeoutError& e) {
+  } catch (const TimeoutError&) {
     status = MSG_TIMEOUT;
-  } catch (CancelException& e) {
+  } catch (const CancelException&) {
     status = MSG_TASK_CANCELED;
   }
 
@@ -111,6 +111,9 @@ s4u::CommPtr Task::send_async(const std::string& alias, void_f_pvoid_t cleanup,
   msg_global->sent_msg++;
 
   s4u::CommPtr s4u_comm = s4u::Mailbox::by_name(alias)->put_init(this, bytes_amount)->set_rate(get_rate());
+  if (TRACE_is_enabled() && has_tracing_category())
+    s4u_comm->set_tracing_category(tracing_category_);
+
   comm                  = s4u_comm;
 
   if (detached)
@@ -118,9 +121,6 @@ s4u::CommPtr Task::send_async(const std::string& alias, void_f_pvoid_t cleanup,
   else
     comm->start();
 
-  if (TRACE_is_enabled() && has_tracing_category())
-    simgrid::simix::simcall([this] { comm->get_impl()->set_category(std::move(tracing_category_)); });
-
   return comm;
 }
 
@@ -133,9 +133,9 @@ msg_error_t Task::send(const std::string& alias, double timeout)
     s4u::CommPtr s4u_comm = send_async(alias, nullptr, false);
     comm                  = s4u_comm;
     comm->wait_for(timeout);
-  } catch (simgrid::TimeoutError& e) {
+  } catch (const simgrid::TimeoutError&) {
     ret = MSG_TIMEOUT;
-  } catch (simgrid::CancelException& e) {
+  } catch (const simgrid::CancelException&) {
     ret = MSG_HOST_FAILURE;
   } catch (xbt_ex& e) {
     if (e.category == network_error)
@@ -167,7 +167,7 @@ void Task::set_priority(double priority)
 
 s4u::Actor* Task::get_sender()
 {
-  return comm ? comm->get_sender().get() : nullptr;
+  return comm ? comm->get_sender() : nullptr;
 }
 
 s4u::Host* Task::get_source()
@@ -184,7 +184,7 @@ void Task::set_used()
 
 void Task::report_multiple_use() const
 {
-  if (msg_global->debug_multiple_use){
+  if (MSG_Global_t::debug_multiple_use) {
     XBT_ERROR("This task is already used in there:");
     // TODO, backtrace
     XBT_ERROR("<missing backtrace>");
@@ -625,11 +625,11 @@ msg_error_t MSG_task_receive_ext_bounded(msg_task_t* task, const char* alias, do
     *task = static_cast<msg_task_t>(payload);
     XBT_DEBUG("Got task %s from %s", (*task)->get_cname(), alias);
     (*task)->set_not_used();
-  } catch (simgrid::HostFailureException& e) {
+  } catch (const simgrid::HostFailureException&) {
     ret = MSG_HOST_FAILURE;
-  } catch (simgrid::TimeoutError& e) {
+  } catch (const simgrid::TimeoutError&) {
     ret = MSG_TIMEOUT;
-  } catch (simgrid::CancelException& e) {
+  } catch (const simgrid::CancelException&) {
     ret = MSG_TASK_CANCELED;
   } catch (xbt_ex& e) {
     if (e.category == network_error)